[pull] master from DefinitelyTyped:master

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 {

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"
     ],

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);

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);

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.

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(

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"
     ],

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;

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;

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:."