diff --git a/types/mparticle__web-sdk/index.d.ts b/types/mparticle__web-sdk/index.d.ts index 8cad608bd01c96..747d767aee4af5 100644 --- a/types/mparticle__web-sdk/index.d.ts +++ b/types/mparticle__web-sdk/index.d.ts @@ -155,7 +155,8 @@ export interface SDKEventCustomFlags { } export interface SDKEventOptions { - shouldUploadEvent: boolean; + shouldUploadEvent?: boolean; + sourceMessageId?: string; } export interface DataPlanConfig { diff --git a/types/mparticle__web-sdk/package.json b/types/mparticle__web-sdk/package.json index 9651d22da6aabb..2402850de7a120 100644 --- a/types/mparticle__web-sdk/package.json +++ b/types/mparticle__web-sdk/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@types/mparticle__web-sdk", - "version": "2.54.9999", + "version": "2.58.9999", "projects": [ "https://github.com/mParticle/mparticle-web-sdk" ], diff --git a/types/mparticle__web-sdk/test/mparticle__web-sdk-instance-tests.ts b/types/mparticle__web-sdk/test/mparticle__web-sdk-instance-tests.ts index f04f10efa5d68e..3209cc29471220 100644 --- a/types/mparticle__web-sdk/test/mparticle__web-sdk-instance-tests.ts +++ b/types/mparticle__web-sdk/test/mparticle__web-sdk-instance-tests.ts @@ -26,8 +26,19 @@ const customFlags: mParticle.SDKEventCustomFlags = { const eventOptions: mParticle.SDKEventOptions = { shouldUploadEvent: false, + sourceMessageId: "sourceMessageId", }; +const eventOptionsOnlyShouldUpload: mParticle.SDKEventOptions = { + shouldUploadEvent: true, +}; + +const eventOptionsOnlySourceMessageId: mParticle.SDKEventOptions = { + sourceMessageId: "test-message-id", +}; + +const eventOptionsEmpty: mParticle.SDKEventOptions = {}; + const identifyRequest: mParticle.IdentifyRequest = { userIdentities: { customerid: "test", @@ -178,6 +189,9 @@ instance.logEvent("eventName", instance.EventType.Location); instance.logEvent("eventName", instance.EventType.Location, customAttrs); instance.logEvent("eventName", instance.EventType.Location, customAttrs, customFlags); instance.logEvent("eventName", mParticle.EventType.Location, customAttrs, customFlags, eventOptions); +instance.logEvent("eventName", mParticle.EventType.Location, customAttrs, customFlags, eventOptionsOnlyShouldUpload); +instance.logEvent("eventName", mParticle.EventType.Location, customAttrs, customFlags, eventOptionsOnlySourceMessageId); +instance.logEvent("eventName", mParticle.EventType.Location, customAttrs, customFlags, eventOptionsEmpty); instance.logForm("click", "eventName"); instance.logForm("click", "eventName", instance.EventType.Location); diff --git a/types/mparticle__web-sdk/test/mparticle__web-sdk-tests.ts b/types/mparticle__web-sdk/test/mparticle__web-sdk-tests.ts index 31723b4cadd5b4..bf15f34ee8cea8 100644 --- a/types/mparticle__web-sdk/test/mparticle__web-sdk-tests.ts +++ b/types/mparticle__web-sdk/test/mparticle__web-sdk-tests.ts @@ -24,8 +24,19 @@ const customFlags: mParticle.SDKEventCustomFlags = { const eventOptions: mParticle.SDKEventOptions = { shouldUploadEvent: false, + sourceMessageId: "sourceMessageId", }; +const eventOptionsOnlyShouldUpload: mParticle.SDKEventOptions = { + shouldUploadEvent: true, +}; + +const eventOptionsOnlySourceMessageId: mParticle.SDKEventOptions = { + sourceMessageId: "test-message-id", +}; + +const eventOptionsEmpty: mParticle.SDKEventOptions = {}; + const identifyRequest: mParticle.IdentifyRequest = { userIdentities: { customerid: "test", @@ -200,6 +211,15 @@ mParticle.logEvent("eventName", mParticle.EventType.Location); mParticle.logEvent("eventName", mParticle.EventType.Location, customAttrs); mParticle.logEvent("eventName", mParticle.EventType.Location, customAttrs, customFlags); mParticle.logEvent("eventName", mParticle.EventType.Location, customAttrs, customFlags, eventOptions); +mParticle.logEvent("eventName", mParticle.EventType.Location, customAttrs, customFlags, eventOptionsOnlyShouldUpload); +mParticle.logEvent( + "eventName", + mParticle.EventType.Location, + customAttrs, + customFlags, + eventOptionsOnlySourceMessageId, +); +mParticle.logEvent("eventName", mParticle.EventType.Location, customAttrs, customFlags, eventOptionsEmpty); mParticle.logForm("click", "eventName"); mParticle.logForm("click", "eventName", mParticle.EventType.Location); diff --git a/types/multer/index.d.ts b/types/multer/index.d.ts index d9431a17f26e75..e6ee81a9df85ea 100644 --- a/types/multer/index.d.ts +++ b/types/multer/index.d.ts @@ -211,6 +211,12 @@ declare namespace multer { } | undefined; /** Preserve the full path of the original filename rather than the basename. (Default: false) */ preservePath?: boolean | undefined; + /** + * For multipart forms, the default character set to use for values of + * part header parameters (e.g. filename) that are not extended + * parameters (that contain an explicit charset). (Default: latin1) + */ + defParamCharset?: string | undefined; /** * Optional function to control which files are uploaded. This is called * for every file that is processed. diff --git a/types/multer/multer-tests.ts b/types/multer/multer-tests.ts index 07166a336166d0..5397c67dd6c40c 100644 --- a/types/multer/multer-tests.ts +++ b/types/multer/multer-tests.ts @@ -15,6 +15,19 @@ const upload = multer({ upload; // $ExpectType Multer assert.strictEqual(upload.constructor.name, "Multer"); +const upload_with_defParamCharset = multer({ + dest: "uploads/", + fileFilter: (req, file, cb) => { + cb(null, false); + cb(null, true); + cb(new Error(`I don't have a clue!`)); + }, + defParamCharset: "utf8", +}); + +upload_with_defParamCharset; // $ExpectType Multer +assert.strictEqual(upload_with_defParamCharset.constructor.name, "Multer"); + const app = express(); app.post( diff --git a/types/multer/package.json b/types/multer/package.json index 078565e6aa3990..09fffe8b4ef162 100644 --- a/types/multer/package.json +++ b/types/multer/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@types/multer", - "version": "2.0.9999", + "version": "2.1.9999", "projects": [ "https://github.com/expressjs/multer" ], diff --git a/types/office-js-preview/index.d.ts b/types/office-js-preview/index.d.ts index 9ec79da1d451c2..ad1932b96b4a3b 100644 --- a/types/office-js-preview/index.d.ts +++ b/types/office-js-preview/index.d.ts @@ -104378,12 +104378,12 @@ declare namespace Word { /** Sets multiple properties on the object at the same time, based on an existing loaded object. */ set(properties: Word.CommentContentRange): void; /** - * Inserts text into at the specified location. **Note**: For the modern comment, the content range tracked across context turns to empty if any revision to the comment is posted through the UI. + * Inserts text at the specified location. **Note**: For the modern comment, the content range tracked across context turns to empty if any revision to the comment is posted through the UI. * * @remarks * [Api set: WordApi 1.4] * - * @param text The text to be inserted in to the `CommentContentRange`. + * @param text The text to be inserted into the `CommentContentRange` object. * @param insertLocation The value must be `replace`, `start`, `end`, `before`, or `after`. */ insertText(text: string, insertLocation: Word.InsertLocation | "Replace" | "Start" | "End" | "Before" | "After"): Word.CommentContentRange; diff --git a/types/office-js/index.d.ts b/types/office-js/index.d.ts index 972b1bb16843db..afe476aba76f04 100644 --- a/types/office-js/index.d.ts +++ b/types/office-js/index.d.ts @@ -97983,12 +97983,12 @@ declare namespace Word { /** Sets multiple properties on the object at the same time, based on an existing loaded object. */ set(properties: Word.CommentContentRange): void; /** - * Inserts text into at the specified location. **Note**: For the modern comment, the content range tracked across context turns to empty if any revision to the comment is posted through the UI. + * Inserts text at the specified location. **Note**: For the modern comment, the content range tracked across context turns to empty if any revision to the comment is posted through the UI. * * @remarks * [Api set: WordApi 1.4] * - * @param text The text to be inserted in to the `CommentContentRange`. + * @param text The text to be inserted into the `CommentContentRange` object. * @param insertLocation The value must be `replace`, `start`, `end`, `before`, or `after`. */ insertText(text: string, insertLocation: Word.InsertLocation | "Replace" | "Start" | "End" | "Before" | "After"): Word.CommentContentRange; diff --git a/types/sanitize-html/package.json b/types/sanitize-html/package.json index 6bfcd300afcbd3..d949682c0f21ae 100644 --- a/types/sanitize-html/package.json +++ b/types/sanitize-html/package.json @@ -6,7 +6,7 @@ "https://github.com/punkave/sanitize-html" ], "dependencies": { - "htmlparser2": "^8.0.0" + "htmlparser2": "^10.1" }, "devDependencies": { "@types/sanitize-html": "workspace:."