@fluidframework/test-runtime-utils 2.63.0-359461 → 2.63.0-359962

package/dist/validateAssertionError.d.ts

@@ -13,7 +13,7 @@
  * it either returns true or throws an error (the behavior expected by NodeJS' `assert.throws()`).
  *
  * @param error - The error object thrown by our `assert()` function. Its `message` property could
- * be a short code, or the original string message coded into the `asert()`.
+ * be a short code, or the original string message coded into the `assert()`.
  * @param expectedErrorMessage - The message that the error object should match (either explicitly,
  * or because it contains a short code which maps to that message).
  * @returns `true` if the message in the error object that was passed in matches the expected

package/dist/validateAssertionError.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validateAssertionError.d.ts","sourceRoot":"","sources":["../src/validateAssertionError.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,sBAAsB,CACrC,KAAK,EAAE,KAAK,EACZ,gBAAgB,EAAE,MAAM,GAAG,MAAM,GAC/B,OAAO,CAgBT"}
+{"version":3,"file":"validateAssertionError.d.ts","sourceRoot":"","sources":["../src/validateAssertionError.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,sBAAsB,CACrC,KAAK,EAAE,KAAK,EACZ,gBAAgB,EAAE,MAAM,GAAG,MAAM,GAC/B,OAAO,CAqBT"}

package/dist/validateAssertionError.js

@@ -17,7 +17,7 @@ const assertionShortCodesMap_js_1 = require("./assertionShortCodesMap.js");
  * it either returns true or throws an error (the behavior expected by NodeJS' `assert.throws()`).
  *
  * @param error - The error object thrown by our `assert()` function. Its `message` property could
- * be a short code, or the original string message coded into the `asert()`.
+ * be a short code, or the original string message coded into the `assert()`.
  * @param expectedErrorMessage - The message that the error object should match (either explicitly,
  * or because it contains a short code which maps to that message).
  * @returns `true` if the message in the error object that was passed in matches the expected
@@ -25,15 +25,20 @@ const assertionShortCodesMap_js_1 = require("./assertionShortCodesMap.js");
  * @internal
  */
 function validateAssertionError(error, expectedErrorMsg) {
-    const mappedMsg = assertionShortCodesMap_js_1.shortCodeMap[error.message] ?? error.message;
+    // Asserts with custom debugMessageBuilder put extra content on the second line of the message, even when tagged.
+    // Thus extract the first line, which will be the assert tag if there is one, and replace it with the message from the shortCodeMap.
+    const split = error.message.split("\n");
+    const possibleShortCode = split[0].trim();
+    if (possibleShortCode in assertionShortCodesMap_js_1.shortCodeMap) {
+        split[0] = assertionShortCodesMap_js_1.shortCodeMap[possibleShortCode];
+    }
+    const mappedMsg = split.join("\n");
     if (typeof expectedErrorMsg === "string"
         ? mappedMsg !== expectedErrorMsg
         : !expectedErrorMsg.test(mappedMsg)) {
         // This throws an Error instead of an AssertionError because AssertionError would require a dependency on the
         // node assert library, which we don't want to do for this library because it's used in the browser.
-        const message = assertionShortCodesMap_js_1.shortCodeMap[error.message] === undefined
-            ? `Unexpected assertion thrown\nActual: ${error.message}\nExpected: ${expectedErrorMsg}`
-            : `Unexpected assertion thrown\nActual: ${error.message} ('${mappedMsg}')\nExpected: ${expectedErrorMsg}`;
+        const message = `Unexpected assertion thrown\nActual: ${error.message === mappedMsg ? error.message : `${error.message} ('${mappedMsg}')}`}\nExpected: ${expectedErrorMsg}`;
         throw new Error(message);
     }
     return true;

package/dist/validateAssertionError.js.map

@@ -1 +1 @@
-{"version":3,"file":"validateAssertionError.js","sourceRoot":"","sources":["../src/validateAssertionError.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAEH,2EAA2D;AAE3D;;;;;;;;;;;;;;;;;GAiBG;AACH,SAAgB,sBAAsB,CACrC,KAAY,EACZ,gBAAiC;IAEjC,MAAM,SAAS,GAAI,wCAAY,CAAC,KAAK,CAAC,OAAO,CAAY,IAAI,KAAK,CAAC,OAAO,CAAC;IAC3E,IACC,OAAO,gBAAgB,KAAK,QAAQ;QACnC,CAAC,CAAC,SAAS,KAAK,gBAAgB;QAChC,CAAC,CAAC,CAAC,gBAAgB,CAAC,IAAI,CAAC,SAAS,CAAC,EACnC,CAAC;QACF,6GAA6G;QAC7G,oGAAoG;QACpG,MAAM,OAAO,GACZ,wCAAY,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,SAAS;YACxC,CAAC,CAAC,wCAAwC,KAAK,CAAC,OAAO,eAAe,gBAAgB,EAAE;YACxF,CAAC,CAAC,wCAAwC,KAAK,CAAC,OAAO,MAAM,SAAS,iBAAiB,gBAAgB,EAAE,CAAC;QAC5G,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;IAC1B,CAAC;IACD,OAAO,IAAI,CAAC;AACb,CAAC;AAnBD,wDAmBC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { shortCodeMap } from \"./assertionShortCodesMap.js\";\n\n/**\n * Validates that an error thrown by our assert() function has the expected message, or a\n * short code that corresponds to that message.\n *\n * @remarks\n * The main use case for this is so tests that expect specific assert() calls to fail can\n * always do comparisons based on the original string message, and work whether they run\n * before the policy-check tool replaces those strings with short codes, or after. Note that\n * it either returns true or throws an error (the behavior expected by NodeJS' `assert.throws()`).\n *\n * @param error - The error object thrown by our `assert()` function. Its `message` property could\n * be a short code, or the original string message coded into the `asert()`.\n * @param expectedErrorMessage - The message that the error object should match (either explicitly,\n * or because it contains a short code which maps to that message).\n * @returns `true` if the message in the error object that was passed in matches the expected\n * message. Otherwise it throws an error.\n * @internal\n */\nexport function validateAssertionError(\n\terror: Error,\n\texpectedErrorMsg: string | RegExp,\n): boolean {\n\tconst mappedMsg = (shortCodeMap[error.message] as string) ?? error.message;\n\tif (\n\t\ttypeof expectedErrorMsg === \"string\"\n\t\t\t? mappedMsg !== expectedErrorMsg\n\t\t\t: !expectedErrorMsg.test(mappedMsg)\n\t) {\n\t\t// This throws an Error instead of an AssertionError because AssertionError would require a dependency on the\n\t\t// node assert library, which we don't want to do for this library because it's used in the browser.\n\t\tconst message =\n\t\t\tshortCodeMap[error.message] === undefined\n\t\t\t\t? `Unexpected assertion thrown\\nActual: ${error.message}\\nExpected: ${expectedErrorMsg}`\n\t\t\t\t: `Unexpected assertion thrown\\nActual: ${error.message} ('${mappedMsg}')\\nExpected: ${expectedErrorMsg}`;\n\t\tthrow new Error(message);\n\t}\n\treturn true;\n}\n"]}
+{"version":3,"file":"validateAssertionError.js","sourceRoot":"","sources":["../src/validateAssertionError.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAEH,2EAA2D;AAE3D;;;;;;;;;;;;;;;;;GAiBG;AACH,SAAgB,sBAAsB,CACrC,KAAY,EACZ,gBAAiC;IAEjC,iHAAiH;IACjH,oIAAoI;IACpI,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACxC,MAAM,iBAAiB,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IAC1C,IAAI,iBAAiB,IAAI,wCAAY,EAAE,CAAC;QACvC,KAAK,CAAC,CAAC,CAAC,GAAG,wCAAY,CAAC,iBAAiB,CAAC,CAAC;IAC5C,CAAC;IACD,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAEnC,IACC,OAAO,gBAAgB,KAAK,QAAQ;QACnC,CAAC,CAAC,SAAS,KAAK,gBAAgB;QAChC,CAAC,CAAC,CAAC,gBAAgB,CAAC,IAAI,CAAC,SAAS,CAAC,EACnC,CAAC;QACF,6GAA6G;QAC7G,oGAAoG;QACpG,MAAM,OAAO,GAAG,wCAAwC,KAAK,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,OAAO,MAAM,SAAS,KAAK,eAAe,gBAAgB,EAAE,CAAC;QAC5K,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;IAC1B,CAAC;IACD,OAAO,IAAI,CAAC;AACb,CAAC;AAxBD,wDAwBC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { shortCodeMap } from \"./assertionShortCodesMap.js\";\n\n/**\n * Validates that an error thrown by our assert() function has the expected message, or a\n * short code that corresponds to that message.\n *\n * @remarks\n * The main use case for this is so tests that expect specific assert() calls to fail can\n * always do comparisons based on the original string message, and work whether they run\n * before the policy-check tool replaces those strings with short codes, or after. Note that\n * it either returns true or throws an error (the behavior expected by NodeJS' `assert.throws()`).\n *\n * @param error - The error object thrown by our `assert()` function. Its `message` property could\n * be a short code, or the original string message coded into the `assert()`.\n * @param expectedErrorMessage - The message that the error object should match (either explicitly,\n * or because it contains a short code which maps to that message).\n * @returns `true` if the message in the error object that was passed in matches the expected\n * message. Otherwise it throws an error.\n * @internal\n */\nexport function validateAssertionError(\n\terror: Error,\n\texpectedErrorMsg: string | RegExp,\n): boolean {\n\t// Asserts with custom debugMessageBuilder put extra content on the second line of the message, even when tagged.\n\t// Thus extract the first line, which will be the assert tag if there is one, and replace it with the message from the shortCodeMap.\n\tconst split = error.message.split(\"\\n\");\n\tconst possibleShortCode = split[0].trim();\n\tif (possibleShortCode in shortCodeMap) {\n\t\tsplit[0] = shortCodeMap[possibleShortCode];\n\t}\n\tconst mappedMsg = split.join(\"\\n\");\n\n\tif (\n\t\ttypeof expectedErrorMsg === \"string\"\n\t\t\t? mappedMsg !== expectedErrorMsg\n\t\t\t: !expectedErrorMsg.test(mappedMsg)\n\t) {\n\t\t// This throws an Error instead of an AssertionError because AssertionError would require a dependency on the\n\t\t// node assert library, which we don't want to do for this library because it's used in the browser.\n\t\tconst message = `Unexpected assertion thrown\\nActual: ${error.message === mappedMsg ? error.message : `${error.message} ('${mappedMsg}')}`}\\nExpected: ${expectedErrorMsg}`;\n\t\tthrow new Error(message);\n\t}\n\treturn true;\n}\n"]}

package/lib/validateAssertionError.d.ts

@@ -13,7 +13,7 @@
  * it either returns true or throws an error (the behavior expected by NodeJS' `assert.throws()`).
  *
  * @param error - The error object thrown by our `assert()` function. Its `message` property could
- * be a short code, or the original string message coded into the `asert()`.
+ * be a short code, or the original string message coded into the `assert()`.
  * @param expectedErrorMessage - The message that the error object should match (either explicitly,
  * or because it contains a short code which maps to that message).
  * @returns `true` if the message in the error object that was passed in matches the expected

package/lib/validateAssertionError.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validateAssertionError.d.ts","sourceRoot":"","sources":["../src/validateAssertionError.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,sBAAsB,CACrC,KAAK,EAAE,KAAK,EACZ,gBAAgB,EAAE,MAAM,GAAG,MAAM,GAC/B,OAAO,CAgBT"}
+{"version":3,"file":"validateAssertionError.d.ts","sourceRoot":"","sources":["../src/validateAssertionError.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,sBAAsB,CACrC,KAAK,EAAE,KAAK,EACZ,gBAAgB,EAAE,MAAM,GAAG,MAAM,GAC/B,OAAO,CAqBT"}

package/lib/validateAssertionError.js

@@ -14,7 +14,7 @@ import { shortCodeMap } from "./assertionShortCodesMap.js";
  * it either returns true or throws an error (the behavior expected by NodeJS' `assert.throws()`).
  *
  * @param error - The error object thrown by our `assert()` function. Its `message` property could
- * be a short code, or the original string message coded into the `asert()`.
+ * be a short code, or the original string message coded into the `assert()`.
  * @param expectedErrorMessage - The message that the error object should match (either explicitly,
  * or because it contains a short code which maps to that message).
  * @returns `true` if the message in the error object that was passed in matches the expected
@@ -22,15 +22,20 @@ import { shortCodeMap } from "./assertionShortCodesMap.js";
  * @internal
  */
 export function validateAssertionError(error, expectedErrorMsg) {
-    const mappedMsg = shortCodeMap[error.message] ?? error.message;
+    // Asserts with custom debugMessageBuilder put extra content on the second line of the message, even when tagged.
+    // Thus extract the first line, which will be the assert tag if there is one, and replace it with the message from the shortCodeMap.
+    const split = error.message.split("\n");
+    const possibleShortCode = split[0].trim();
+    if (possibleShortCode in shortCodeMap) {
+        split[0] = shortCodeMap[possibleShortCode];
+    }
+    const mappedMsg = split.join("\n");
     if (typeof expectedErrorMsg === "string"
         ? mappedMsg !== expectedErrorMsg
         : !expectedErrorMsg.test(mappedMsg)) {
         // This throws an Error instead of an AssertionError because AssertionError would require a dependency on the
         // node assert library, which we don't want to do for this library because it's used in the browser.
-        const message = shortCodeMap[error.message] === undefined
-            ? `Unexpected assertion thrown\nActual: ${error.message}\nExpected: ${expectedErrorMsg}`
-            : `Unexpected assertion thrown\nActual: ${error.message} ('${mappedMsg}')\nExpected: ${expectedErrorMsg}`;
+        const message = `Unexpected assertion thrown\nActual: ${error.message === mappedMsg ? error.message : `${error.message} ('${mappedMsg}')}`}\nExpected: ${expectedErrorMsg}`;
         throw new Error(message);
     }
     return true;

package/lib/validateAssertionError.js.map

@@ -1 +1 @@
-{"version":3,"file":"validateAssertionError.js","sourceRoot":"","sources":["../src/validateAssertionError.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAE3D;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,UAAU,sBAAsB,CACrC,KAAY,EACZ,gBAAiC;IAEjC,MAAM,SAAS,GAAI,YAAY,CAAC,KAAK,CAAC,OAAO,CAAY,IAAI,KAAK,CAAC,OAAO,CAAC;IAC3E,IACC,OAAO,gBAAgB,KAAK,QAAQ;QACnC,CAAC,CAAC,SAAS,KAAK,gBAAgB;QAChC,CAAC,CAAC,CAAC,gBAAgB,CAAC,IAAI,CAAC,SAAS,CAAC,EACnC,CAAC;QACF,6GAA6G;QAC7G,oGAAoG;QACpG,MAAM,OAAO,GACZ,YAAY,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,SAAS;YACxC,CAAC,CAAC,wCAAwC,KAAK,CAAC,OAAO,eAAe,gBAAgB,EAAE;YACxF,CAAC,CAAC,wCAAwC,KAAK,CAAC,OAAO,MAAM,SAAS,iBAAiB,gBAAgB,EAAE,CAAC;QAC5G,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;IAC1B,CAAC;IACD,OAAO,IAAI,CAAC;AACb,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { shortCodeMap } from \"./assertionShortCodesMap.js\";\n\n/**\n * Validates that an error thrown by our assert() function has the expected message, or a\n * short code that corresponds to that message.\n *\n * @remarks\n * The main use case for this is so tests that expect specific assert() calls to fail can\n * always do comparisons based on the original string message, and work whether they run\n * before the policy-check tool replaces those strings with short codes, or after. Note that\n * it either returns true or throws an error (the behavior expected by NodeJS' `assert.throws()`).\n *\n * @param error - The error object thrown by our `assert()` function. Its `message` property could\n * be a short code, or the original string message coded into the `asert()`.\n * @param expectedErrorMessage - The message that the error object should match (either explicitly,\n * or because it contains a short code which maps to that message).\n * @returns `true` if the message in the error object that was passed in matches the expected\n * message. Otherwise it throws an error.\n * @internal\n */\nexport function validateAssertionError(\n\terror: Error,\n\texpectedErrorMsg: string | RegExp,\n): boolean {\n\tconst mappedMsg = (shortCodeMap[error.message] as string) ?? error.message;\n\tif (\n\t\ttypeof expectedErrorMsg === \"string\"\n\t\t\t? mappedMsg !== expectedErrorMsg\n\t\t\t: !expectedErrorMsg.test(mappedMsg)\n\t) {\n\t\t// This throws an Error instead of an AssertionError because AssertionError would require a dependency on the\n\t\t// node assert library, which we don't want to do for this library because it's used in the browser.\n\t\tconst message =\n\t\t\tshortCodeMap[error.message] === undefined\n\t\t\t\t? `Unexpected assertion thrown\\nActual: ${error.message}\\nExpected: ${expectedErrorMsg}`\n\t\t\t\t: `Unexpected assertion thrown\\nActual: ${error.message} ('${mappedMsg}')\\nExpected: ${expectedErrorMsg}`;\n\t\tthrow new Error(message);\n\t}\n\treturn true;\n}\n"]}
+{"version":3,"file":"validateAssertionError.js","sourceRoot":"","sources":["../src/validateAssertionError.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAE3D;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,UAAU,sBAAsB,CACrC,KAAY,EACZ,gBAAiC;IAEjC,iHAAiH;IACjH,oIAAoI;IACpI,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACxC,MAAM,iBAAiB,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IAC1C,IAAI,iBAAiB,IAAI,YAAY,EAAE,CAAC;QACvC,KAAK,CAAC,CAAC,CAAC,GAAG,YAAY,CAAC,iBAAiB,CAAC,CAAC;IAC5C,CAAC;IACD,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAEnC,IACC,OAAO,gBAAgB,KAAK,QAAQ;QACnC,CAAC,CAAC,SAAS,KAAK,gBAAgB;QAChC,CAAC,CAAC,CAAC,gBAAgB,CAAC,IAAI,CAAC,SAAS,CAAC,EACnC,CAAC;QACF,6GAA6G;QAC7G,oGAAoG;QACpG,MAAM,OAAO,GAAG,wCAAwC,KAAK,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,OAAO,MAAM,SAAS,KAAK,eAAe,gBAAgB,EAAE,CAAC;QAC5K,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;IAC1B,CAAC;IACD,OAAO,IAAI,CAAC;AACb,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { shortCodeMap } from \"./assertionShortCodesMap.js\";\n\n/**\n * Validates that an error thrown by our assert() function has the expected message, or a\n * short code that corresponds to that message.\n *\n * @remarks\n * The main use case for this is so tests that expect specific assert() calls to fail can\n * always do comparisons based on the original string message, and work whether they run\n * before the policy-check tool replaces those strings with short codes, or after. Note that\n * it either returns true or throws an error (the behavior expected by NodeJS' `assert.throws()`).\n *\n * @param error - The error object thrown by our `assert()` function. Its `message` property could\n * be a short code, or the original string message coded into the `assert()`.\n * @param expectedErrorMessage - The message that the error object should match (either explicitly,\n * or because it contains a short code which maps to that message).\n * @returns `true` if the message in the error object that was passed in matches the expected\n * message. Otherwise it throws an error.\n * @internal\n */\nexport function validateAssertionError(\n\terror: Error,\n\texpectedErrorMsg: string | RegExp,\n): boolean {\n\t// Asserts with custom debugMessageBuilder put extra content on the second line of the message, even when tagged.\n\t// Thus extract the first line, which will be the assert tag if there is one, and replace it with the message from the shortCodeMap.\n\tconst split = error.message.split(\"\\n\");\n\tconst possibleShortCode = split[0].trim();\n\tif (possibleShortCode in shortCodeMap) {\n\t\tsplit[0] = shortCodeMap[possibleShortCode];\n\t}\n\tconst mappedMsg = split.join(\"\\n\");\n\n\tif (\n\t\ttypeof expectedErrorMsg === \"string\"\n\t\t\t? mappedMsg !== expectedErrorMsg\n\t\t\t: !expectedErrorMsg.test(mappedMsg)\n\t) {\n\t\t// This throws an Error instead of an AssertionError because AssertionError would require a dependency on the\n\t\t// node assert library, which we don't want to do for this library because it's used in the browser.\n\t\tconst message = `Unexpected assertion thrown\\nActual: ${error.message === mappedMsg ? error.message : `${error.message} ('${mappedMsg}')}`}\\nExpected: ${expectedErrorMsg}`;\n\t\tthrow new Error(message);\n\t}\n\treturn true;\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluidframework/test-runtime-utils",
-  "version": "2.63.0-359461",
+  "version": "2.63.0-359962",
   "description": "Fluid runtime test utilities",
   "homepage": "https://fluidframework.com",
   "repository": {
@@ -69,26 +69,26 @@
     "temp-directory": "nyc/.nyc_output"
   },
   "dependencies": {
-    "@fluid-internal/client-utils": "2.63.0-359461",
-    "@fluidframework/container-definitions": "2.63.0-359461",
-    "@fluidframework/container-runtime-definitions": "2.63.0-359461",
-    "@fluidframework/core-interfaces": "2.63.0-359461",
-    "@fluidframework/core-utils": "2.63.0-359461",
-    "@fluidframework/datastore-definitions": "2.63.0-359461",
-    "@fluidframework/driver-definitions": "2.63.0-359461",
-    "@fluidframework/driver-utils": "2.63.0-359461",
-    "@fluidframework/id-compressor": "2.63.0-359461",
-    "@fluidframework/routerlicious-driver": "2.63.0-359461",
-    "@fluidframework/runtime-definitions": "2.63.0-359461",
-    "@fluidframework/runtime-utils": "2.63.0-359461",
-    "@fluidframework/telemetry-utils": "2.63.0-359461",
+    "@fluid-internal/client-utils": "2.63.0-359962",
+    "@fluidframework/container-definitions": "2.63.0-359962",
+    "@fluidframework/container-runtime-definitions": "2.63.0-359962",
+    "@fluidframework/core-interfaces": "2.63.0-359962",
+    "@fluidframework/core-utils": "2.63.0-359962",
+    "@fluidframework/datastore-definitions": "2.63.0-359962",
+    "@fluidframework/driver-definitions": "2.63.0-359962",
+    "@fluidframework/driver-utils": "2.63.0-359962",
+    "@fluidframework/id-compressor": "2.63.0-359962",
+    "@fluidframework/routerlicious-driver": "2.63.0-359962",
+    "@fluidframework/runtime-definitions": "2.63.0-359962",
+    "@fluidframework/runtime-utils": "2.63.0-359962",
+    "@fluidframework/telemetry-utils": "2.63.0-359962",
     "jsrsasign": "^11.0.0",
     "uuid": "^11.1.0"
   },
   "devDependencies": {
     "@arethetypeswrong/cli": "^0.17.1",
     "@biomejs/biome": "~1.9.3",
-    "@fluid-internal/mocha-test-setup": "2.63.0-359461",
+    "@fluid-internal/mocha-test-setup": "2.63.0-359962",
     "@fluid-tools/build-cli": "^0.58.3",
     "@fluidframework/build-common": "^2.0.3",
     "@fluidframework/build-tools": "^0.58.3",

package/src/validateAssertionError.ts

@@ -16,7 +16,7 @@ import { shortCodeMap } from "./assertionShortCodesMap.js";
  * it either returns true or throws an error (the behavior expected by NodeJS' `assert.throws()`).
  *
  * @param error - The error object thrown by our `assert()` function. Its `message` property could
- * be a short code, or the original string message coded into the `asert()`.
+ * be a short code, or the original string message coded into the `assert()`.
  * @param expectedErrorMessage - The message that the error object should match (either explicitly,
  * or because it contains a short code which maps to that message).
  * @returns `true` if the message in the error object that was passed in matches the expected
@@ -27,7 +27,15 @@ export function validateAssertionError(
 	error: Error,
 	expectedErrorMsg: string | RegExp,
 ): boolean {
-	const mappedMsg = (shortCodeMap[error.message] as string) ?? error.message;
+	// Asserts with custom debugMessageBuilder put extra content on the second line of the message, even when tagged.
+	// Thus extract the first line, which will be the assert tag if there is one, and replace it with the message from the shortCodeMap.
+	const split = error.message.split("\n");
+	const possibleShortCode = split[0].trim();
+	if (possibleShortCode in shortCodeMap) {
+		split[0] = shortCodeMap[possibleShortCode];
+	}
+	const mappedMsg = split.join("\n");
+
 	if (
 		typeof expectedErrorMsg === "string"
 			? mappedMsg !== expectedErrorMsg
@@ -35,10 +43,7 @@ export function validateAssertionError(
 	) {
 		// This throws an Error instead of an AssertionError because AssertionError would require a dependency on the
 		// node assert library, which we don't want to do for this library because it's used in the browser.
-		const message =
-			shortCodeMap[error.message] === undefined
-				? `Unexpected assertion thrown\nActual: ${error.message}\nExpected: ${expectedErrorMsg}`
-				: `Unexpected assertion thrown\nActual: ${error.message} ('${mappedMsg}')\nExpected: ${expectedErrorMsg}`;
+		const message = `Unexpected assertion thrown\nActual: ${error.message === mappedMsg ? error.message : `${error.message} ('${mappedMsg}')}`}\nExpected: ${expectedErrorMsg}`;
 		throw new Error(message);
 	}
 	return true;