@typespec/spec-api 0.1.0-dev.0 → 0.1.0-dev.1

package/dist/request-validations.js

@@ -1,6 +1,6 @@
 import deepEqual from "deep-equal";
-import * as prettier from "prettier";
 import { parseString } from "xml2js";
+import { matchValues } from "./match-engine.js";
 import { ValidationError } from "./validation-error.js";
 export const BODY_NOT_EQUAL_ERROR_MESSAGE = "Body provided doesn't match expected body";
 export const BODY_EMPTY_ERROR_MESSAGE = "Body should exists";
@@ -24,33 +24,67 @@ export const validateBodyEquals = (request, expectedBody) => {
         }
         return;
     }
-    if (!deepEqual(request.body, expectedBody, { strict: true })) {
-        throw new ValidationError(BODY_NOT_EQUAL_ERROR_MESSAGE, expectedBody, request.body);
+    const result = matchValues(request.body, expectedBody);
+    if (!result.pass) {
+        throw new ValidationError(`${BODY_NOT_EQUAL_ERROR_MESSAGE}: ${result.message}`, expectedBody, request.body);
     }
 };
-export const validateXmlBodyEquals = (request, expectedBody) => {
+export const validateXmlBodyEquals = (request, expectedBody, config) => {
+    const resolvedConfig = config ?? { baseUrl: "" };
+    // When expectedBody is a Resolver (e.g. from xml`...`), serialize() already includes the XML declaration.
+    // When it's a plain string, we need to prepend it.
+    const expectedXml = typeof expectedBody === "string"
+        ? `<?xml version='1.0' encoding='UTF-8'?>` + expectedBody
+        : expectedBody.serialize(resolvedConfig);
     if (request.rawBody === undefined || isBodyEmpty(request.rawBody)) {
-        throw new ValidationError(BODY_EMPTY_ERROR_MESSAGE, expectedBody, request.rawBody);
+        throw new ValidationError(BODY_EMPTY_ERROR_MESSAGE, expectedXml, request.rawBody);
     }
-    expectedBody = `<?xml version='1.0' encoding='UTF-8'?>` + expectedBody;
-    let actualParsedBody = "";
+    let actualParsed;
     parseString(request.rawBody, (err, result) => {
-        if (err !== null) {
+        if (err !== null)
             throw err;
-        }
-        actualParsedBody = result;
+        actualParsed = result;
     });
-    let expectedParsedBody = "";
-    parseString(expectedBody, (err, result) => {
-        if (err !== null) {
+    let expectedParsed;
+    parseString(expectedXml, (err, result) => {
+        if (err !== null)
             throw err;
-        }
-        expectedParsedBody = result;
+        expectedParsed = result;
     });
-    if (!deepEqual(actualParsedBody, expectedParsedBody, { strict: true })) {
-        throw new ValidationError(BODY_NOT_EQUAL_ERROR_MESSAGE, prettier.format(expectedBody), prettier.format(request.body));
+    // If the expected body is a DynValue with matchers, use matcher-aware comparison
+    const matchers = typeof expectedBody !== "string" && "getMatchers" in expectedBody
+        ? expectedBody.getMatchers(resolvedConfig)
+        : [];
+    if (matchers.length > 0) {
+        const matcherMap = new Map();
+        for (const { serialized, matcher } of matchers) {
+            matcherMap.set(serialized, matcher);
+        }
+        expectedParsed = substituteMatchers(expectedParsed, matcherMap);
+        const result = matchValues(actualParsed, expectedParsed);
+        if (!result.pass) {
+            throw new ValidationError(`${BODY_NOT_EQUAL_ERROR_MESSAGE}: ${result.message}`, expectedXml, request.rawBody);
+        }
+    }
+    else {
+        if (!deepEqual(actualParsed, expectedParsed, { strict: true })) {
+            throw new ValidationError(BODY_NOT_EQUAL_ERROR_MESSAGE, expectedXml, request.rawBody);
+        }
     }
 };
+function substituteMatchers(value, matcherMap) {
+    if (typeof value === "string") {
+        return matcherMap.get(value) ?? value;
+    }
+    if (Array.isArray(value)) {
+        return value.map((v) => substituteMatchers(v, matcherMap));
+    }
+    if (typeof value === "object" && value !== null) {
+        const obj = value;
+        return Object.fromEntries(Object.entries(obj).map(([k, v]) => [k, substituteMatchers(v, matcherMap)]));
+    }
+    return value;
+}
 export const validateCoercedDateBodyEquals = (request, expectedBody) => {
     if (expectedBody == null) {
         if (!isBodyEmpty(request.rawBody)) {
@@ -58,8 +92,9 @@ export const validateCoercedDateBodyEquals = (request, expectedBody) => {
         }
         return;
     }
-    if (!deepEqual(coerceDate(request.body), expectedBody, { strict: true })) {
-        throw new ValidationError(BODY_NOT_EQUAL_ERROR_MESSAGE, expectedBody, request.body);
+    const result = matchValues(coerceDate(request.body), expectedBody);
+    if (!result.pass) {
+        throw new ValidationError(`${BODY_NOT_EQUAL_ERROR_MESSAGE}: ${result.message}`, expectedBody, request.body);
     }
 };
 export const validateBodyEmpty = (request) => {

package/dist/request-validations.js.map

@@ -1 +1 @@
-{"version":3,"file":"request-validations.js","sourceRoot":"","sources":["../src/request-validations.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"request-validations.js","sourceRoot":"","sources":["../src/request-validations.ts"],"names":[],"mappings":"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"}

package/dist/response-utils.d.ts

@@ -1,4 +1,5 @@
-import { MockBody, MockMultipartBody, ResolverConfig } from "./types.js";
+import { type MockValueMatcher } from "./match-engine.js";
+import { MockBody, MockMultipartBody, Resolver, ResolverConfig } from "./types.js";
 /**
  * Serialize the provided content as json to use in a MockResponse body.
  * @content Object to return as json.
@@ -6,24 +7,60 @@ import { MockBody, MockMultipartBody, ResolverConfig } from "./types.js";
  */
 export declare function json(content: unknown, contentType?: string): MockBody;
 /**
- * Sends the provided XML string in a MockResponse body.
- * The XML declaration prefix will automatically be added to xmlString.
- * @content Object to return as XML.
+ * Sends the provided XML content in a MockResponse body.
+ * The XML declaration prefix is automatically prepended.
+ *
+ * Can be used as a plain function or as a tagged template literal.
+ * When used as a tagged template, interpolated matchers (e.g. `match.localUrl`)
+ * are resolved at serialization time via `expandDyns`.
+ *
+ * @example
+ * ```ts
+ * // Plain string
+ * xml("<Root>hello</Root>")
+ *
+ * // Tagged template with matcher
+ * xml`<Root><Link>${match.localUrl("/next")}</Link></Root>`
+ * ```
+ *
  * @returns {MockBody} response body with application/xml content type.
  */
-export declare function xml(xmlString: string): MockBody;
+export declare function xml(content: string): MockBody;
+export declare function xml(strings: TemplateStringsArray, ...values: unknown[]): MockBody;
 export declare function multipart(config: Partial<Pick<MockMultipartBody, "contentType" | "parts" | "files">>): MockMultipartBody;
-export interface DynValue<T extends string[]> {
+export interface DynValue extends Resolver {
     readonly isDyn: true;
-    readonly keys: T;
-    (dict: Record<T[number], string>): string;
+    (config: ResolverConfig): string;
+    /** Returns all matchers embedded in this template with their serialized values. */
+    getMatchers(config: ResolverConfig): Array<{
+        serialized: string;
+        matcher: MockValueMatcher;
+    }>;
 }
 export interface DynItem<T extends keyof ResolverConfig> {
     readonly isDyn: true;
     readonly name: T;
 }
 export declare function dynItem<const T extends keyof ResolverConfig>(name: T): DynItem<T>;
-/** Specify that this value is dynamic and needs to be interpolated with the given keys */
-export declare function dyn<const T extends (keyof ResolverConfig)[]>(strings: readonly string[], ...keys: (DynItem<T[number]> | string)[]): DynValue<T>;
-export declare function expandDyns<T>(value: T, config: ResolverConfig): T;
+/**
+ * Tagged template for building strings with deferred resolution.
+ * Interpolated values can be:
+ * - `dynItem("baseUrl")` — resolved from `ResolverConfig`
+ * - Matchers (e.g. `match.localUrl(...)`) — resolved via `expandDyns`
+ * - Other `dyn` templates — recursively resolved
+ * - Plain strings/numbers — used as-is
+ */
+export declare function dyn(strings: readonly string[], ...values: unknown[]): DynValue;
+export interface ExpandDynsOptions {
+    /** When true, matchers are resolved to their `toJSON()` value. Default: true. */
+    resolveMatchers?: boolean;
+}
+/**
+ * Recursively expands all dynamic values.
+ * - Dyn functions are called with the config.
+ * - Resolvable matchers (e.g. `match.localUrl`) are resolved via `resolve(config)`.
+ * - By default, matchers are resolved to their `toJSON()` plain value.
+ *   Pass `{ resolveMatchers: false }` to preserve matchers for use with `matchValues`.
+ */
+export declare function expandDyns<T>(value: T, config: ResolverConfig, options?: ExpandDynsOptions): T;
 //# sourceMappingURL=response-utils.d.ts.map

package/dist/response-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"response-utils.d.ts","sourceRoot":"","sources":["../src/response-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,iBAAiB,EAAY,cAAc,EAAE,MAAM,YAAY,CAAC;AAEnF;;;;GAIG;AACH,wBAAgB,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,WAAW,GAAE,MAA2B,GAAG,QAAQ,CAKzF;AAWD;;;;;GAKG;AACH,wBAAgB,GAAG,CAAC,SAAS,EAAE,MAAM,GAAG,QAAQ,CAK/C;AAED,wBAAgB,SAAS,CACvB,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,iBAAiB,EAAE,aAAa,GAAG,OAAO,GAAG,OAAO,CAAC,CAAC,GAC1E,iBAAiB,CAMnB;AAED,MAAM,WAAW,QAAQ,CAAC,CAAC,SAAS,MAAM,EAAE;IAC1C,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC;IACrB,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;IACjB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,GAAG,MAAM,CAAC;CAC3C;AAED,MAAM,WAAW,OAAO,CAAC,CAAC,SAAS,MAAM,cAAc;IACrD,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC;IACrB,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;CAClB;AAED,wBAAgB,OAAO,CAAC,KAAK,CAAC,CAAC,SAAS,MAAM,cAAc,EAAE,IAAI,EAAE,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAKjF;AAED,0FAA0F;AAC1F,wBAAgB,GAAG,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,MAAM,cAAc,CAAC,EAAE,EAC1D,OAAO,EAAE,SAAS,MAAM,EAAE,EAC1B,GAAG,IAAI,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,MAAM,CAAC,EAAE,GACvC,QAAQ,CAAC,CAAC,CAAC,CAqBb;AAED,wBAAgB,UAAU,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,cAAc,GAAG,CAAC,CAmBjE"}
+{"version":3,"file":"response-utils.d.ts","sourceRoot":"","sources":["../src/response-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,KAAK,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrE,OAAO,EAAE,QAAQ,EAAE,iBAAiB,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAEnF;;;;GAIG;AACH,wBAAgB,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,WAAW,GAAE,MAA2B,GAAG,QAAQ,CAKzF;AAiBD;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,GAAG,CAAC,OAAO,EAAE,MAAM,GAAG,QAAQ,CAAC;AAC/C,wBAAgB,GAAG,CAAC,OAAO,EAAE,oBAAoB,EAAE,GAAG,MAAM,EAAE,OAAO,EAAE,GAAG,QAAQ,CAAC;AAenF,wBAAgB,SAAS,CACvB,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,iBAAiB,EAAE,aAAa,GAAG,OAAO,GAAG,OAAO,CAAC,CAAC,GAC1E,iBAAiB,CAMnB;AAED,MAAM,WAAW,QAAS,SAAQ,QAAQ;IACxC,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC;IACrB,CAAC,MAAM,EAAE,cAAc,GAAG,MAAM,CAAC;IACjC,mFAAmF;IACnF,WAAW,CAAC,MAAM,EAAE,cAAc,GAAG,KAAK,CAAC;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,gBAAgB,CAAA;KAAE,CAAC,CAAC;CAC/F;AAED,MAAM,WAAW,OAAO,CAAC,CAAC,SAAS,MAAM,cAAc;IACrD,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC;IACrB,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;CAClB;AAED,wBAAgB,OAAO,CAAC,KAAK,CAAC,CAAC,SAAS,MAAM,cAAc,EAAE,IAAI,EAAE,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAKjF;AAED;;;;;;;GAOG;AACH,wBAAgB,GAAG,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,EAAE,GAAG,MAAM,EAAE,OAAO,EAAE,GAAG,QAAQ,CAoB9E;AAiBD,MAAM,WAAW,iBAAiB;IAChC,iFAAiF;IACjF,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B;AAED;;;;;;GAMG;AACH,wBAAgB,UAAU,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,cAAc,EAAE,OAAO,CAAC,EAAE,iBAAiB,GAAG,CAAC,CAG9F"}

package/dist/response-utils.js

@@ -1,3 +1,4 @@
+import { isMatcher } from "./match-engine.js";
 /**
  * Serialize the provided content as json to use in a MockResponse body.
  * @content Object to return as json.
@@ -15,18 +16,23 @@ function createResolver(content) {
             const expanded = expandDyns(content, config);
             return JSON.stringify(expanded);
         },
+        resolve: (config) => {
+            // Preserve matchers so matchValues can use them for flexible validation
+            return expandDyns(content, config, { resolveMatchers: false });
+        },
     };
 }
-/**
- * Sends the provided XML string in a MockResponse body.
- * The XML declaration prefix will automatically be added to xmlString.
- * @content Object to return as XML.
- * @returns {MockBody} response body with application/xml content type.
- */
-export function xml(xmlString) {
+const XML_DECLARATION = `<?xml version='1.0' encoding='UTF-8'?>`;
+export function xml(content, ...values) {
+    if (typeof content !== "string") {
+        return {
+            contentType: "application/xml",
+            rawContent: dyn `${XML_DECLARATION}${dyn(content, ...values)}`,
+        };
+    }
     return {
         contentType: "application/xml",
-        rawContent: `<?xml version='1.0' encoding='UTF-8'?>` + xmlString,
+        rawContent: XML_DECLARATION + content,
     };
 }
 export function multipart(config) {
@@ -42,40 +48,74 @@ export function dynItem(name) {
         name,
     };
 }
-/** Specify that this value is dynamic and needs to be interpolated with the given keys */
-export function dyn(strings, ...keys) {
-    const dynKeys = [];
-    const template = (dict) => {
-        const result = [strings[0]];
-        keys.forEach((key, i) => {
-            if (typeof key === "string") {
-                result.push(key);
-            }
-            else {
-                dynKeys.push(key.name);
-                const value = dict[key.name];
-                if (value !== undefined) {
-                    result.push(value);
-                }
-            }
-            result.push(strings[i + 1]);
+/**
+ * Tagged template for building strings with deferred resolution.
+ * Interpolated values can be:
+ * - `dynItem("baseUrl")` — resolved from `ResolverConfig`
+ * - Matchers (e.g. `match.localUrl(...)`) — resolved via `expandDyns`
+ * - Other `dyn` templates — recursively resolved
+ * - Plain strings/numbers — used as-is
+ */
+export function dyn(strings, ...values) {
+    const template = (config) => {
+        let result = strings[0];
+        values.forEach((v, i) => {
+            result += String(expandDyns(v, config));
+            result += strings[i + 1];
         });
-        return result.join("");
+        return result;
     };
-    template.keys = dynKeys;
     template.isDyn = true;
+    template.serialize = template;
+    template.resolve = template;
+    template.getMatchers = (config) => {
+        const result = [];
+        for (const v of values) {
+            collectMatchers(v, config, result);
+        }
+        return result;
+    };
     return template;
 }
-export function expandDyns(value, config) {
+function collectMatchers(value, config, out) {
+    if (isMatcher(value)) {
+        out.push({ serialized: String(value.serialize(config)), matcher: value });
+    }
+    else if (typeof value === "function" && "isDyn" in value && value.isDyn) {
+        const dynVal = value;
+        if (dynVal.getMatchers) {
+            out.push(...dynVal.getMatchers(config));
+        }
+    }
+}
+/**
+ * Recursively expands all dynamic values.
+ * - Dyn functions are called with the config.
+ * - Resolvable matchers (e.g. `match.localUrl`) are resolved via `resolve(config)`.
+ * - By default, matchers are resolved to their `toJSON()` plain value.
+ *   Pass `{ resolveMatchers: false }` to preserve matchers for use with `matchValues`.
+ */
+export function expandDyns(value, config, options) {
+    const resolve = options?.resolveMatchers ?? true;
+    return _expandDyns(value, config, resolve);
+}
+function _expandDyns(value, config, resolveMatchers) {
     if (typeof value === "string") {
         return value;
     }
     else if (Array.isArray(value)) {
-        return value.map((v) => expandDyns(v, config));
+        return value.map((v) => _expandDyns(v, config, resolveMatchers));
     }
     else if (typeof value === "object" && value !== null) {
+        // DynItem — resolve from config
+        if ("isDyn" in value && value.isDyn && "name" in value) {
+            return config[value.name];
+        }
+        if (isMatcher(value)) {
+            return resolveMatchers ? value.serialize(config) : value;
+        }
         const obj = value;
-        return Object.fromEntries(Object.entries(obj).map(([key, v]) => [key, expandDyns(v, config)]));
+        return Object.fromEntries(Object.entries(obj).map(([key, v]) => [key, _expandDyns(v, config, resolveMatchers)]));
     }
     else if (typeof value === "function") {
         if ("isDyn" in value && value.isDyn) {

package/dist/response-utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"response-utils.js","sourceRoot":"","sources":["../src/response-utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"response-utils.js","sourceRoot":"","sources":["../src/response-utils.ts"],"names":[],"mappings":"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"}

package/dist/types.d.ts

@@ -86,6 +86,8 @@ export interface ResolverConfig {
 }
 export interface Resolver {
     serialize(config: ResolverConfig): string;
+    /** Returns the expanded content with matchers preserved (for comparison). */
+    resolve(config: ResolverConfig): unknown;
 }
 export interface MockMultipartBody {
     kind: "multipart";

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typespec/spec-api",
-  "version": "0.1.0-dev.0",
+  "version": "0.1.0-dev.1",
   "description": "Spec api to implement mock api",
   "type": "module",
   "exports": {
@@ -9,7 +9,7 @@
     }
   },
   "engines": {
-    "node": ">=20.0.0"
+    "node": ">=22.0.0"
   },
   "repository": {
     "type": "git",
@@ -22,21 +22,21 @@
   },
   "homepage": "https://github.com/microsoft/typespec#readme",
   "dependencies": {
-    "deep-equal": "^2.2.0",
+    "deep-equal": "^2.2.3",
     "express": "^5.2.1",
     "xml2js": "^0.6.2"
   },
   "devDependencies": {
-    "@types/deep-equal": "^1.0.1",
+    "@types/deep-equal": "^1.0.4",
     "@types/express": "^5.0.6",
-    "@types/multer": "^2.0.0",
-    "@types/node": "~25.0.2",
-    "@types/xml2js": "^0.4.11",
-    "@vitest/coverage-v8": "^4.0.15",
-    "@vitest/ui": "^4.0.15",
-    "rimraf": "~6.1.2",
-    "typescript": "~5.9.2",
-    "vitest": "^4.0.15"
+    "@types/multer": "^2.1.0",
+    "@types/node": "~25.5.0",
+    "@types/xml2js": "^0.4.14",
+    "@vitest/coverage-v8": "^4.1.0",
+    "@vitest/ui": "^4.1.0",
+    "rimraf": "~6.1.3",
+    "typescript": "~5.9.3",
+    "vitest": "^4.1.0"
   },
   "scripts": {
     "watch": "tsc -p ./tsconfig.build.json --watch",

package/src/expectation.ts

@@ -1,4 +1,4 @@
-import deepEqual from "deep-equal";
+import { matchValues } from "./match-engine.js";
 import {
   validateBodyEmpty,
   validateBodyEquals,
@@ -9,7 +9,7 @@ import {
   validateRawBodyEquals,
   validateXmlBodyEquals,
 } from "./request-validations.js";
-import { CollectionFormat, RequestExt } from "./types.js";
+import { CollectionFormat, RequestExt, Resolver, ResolverConfig } from "./types.js";
 import { ValidationError } from "./validation-error.js";
 
 /**
@@ -89,18 +89,22 @@ export class RequestExpectation {
    * @param expected Expected value
    */
   public deepEqual(actual: unknown, expected: unknown, message = "Values not deep equal"): void {
-    if (!deepEqual(actual, expected, { strict: true })) {
-      throw new ValidationError(message, expected, actual);
+    const result = matchValues(actual, expected);
+    if (!result.pass) {
+      throw new ValidationError(`${message}: ${result.message}`, expected, actual);
     }
   }
 
   /**
-   * Expect the body of the request to be semantically equivalent to the provided XML string.
-   * The XML declaration prefix will automatically be added to expectedBody.
-   * @param expectedBody expected value of request body.
+   * Expect the body of the request to be semantically equivalent to the provided XML.
+   * Accepts a plain string or a Resolver (e.g. from `xml\`...\``).
+   * When a Resolver with matchers is provided, matcher-aware comparison is used.
+   * The XML declaration prefix will automatically be added.
+   * @param expectedBody expected XML body as a string or Resolver.
+   * @param config resolver config (required when expectedBody is a Resolver).
    * @throws {ValidationError} if there is an error.
    */
-  public xmlBodyEquals(expectedBody: string): void {
-    validateXmlBodyEquals(this.originalRequest, expectedBody);
+  public xmlBodyEquals(expectedBody: string | Resolver, config?: ResolverConfig): void {
+    validateXmlBodyEquals(this.originalRequest, expectedBody, config);
   }
 }

package/src/index.ts

@@ -1,3 +1,13 @@
+export {
+  createMatcher,
+  err,
+  isMatcher,
+  match,
+  matchValues,
+  ok,
+  type MatchResult,
+  type MockValueMatcher,
+} from "./matchers/index.js";
 export { MockRequest } from "./mock-request.js";
 export {
   BODY_EMPTY_ERROR_MESSAGE,