@typespec/spector 0.1.0-alpha.9 → 0.1.0-dev.0

package/dist/src/actions/server-test.js

@@ -1,114 +1,75 @@
-import * as fs from "fs";
-import * as path from "path";
+import { expandDyns, ValidationError, } from "@typespec/spec-api";
+import deepEqual from "deep-equal";
+import micromatch from "micromatch";
+import { inspect } from "node:util";
 import pc from "picocolors";
 import { logger } from "../logger.js";
 import { loadScenarioMockApis } from "../scenarios-resolver.js";
-import { makeServiceCall, uint8ArrayToString } from "./helper.js";
+import { makeServiceCall } from "./helper.js";
 const DEFAULT_BASE_URL = "http://localhost:3000";
 class ServerTestsGenerator {
     name = "";
     mockApiDefinition;
     serverBasePath = "";
+    resolverConfig;
     constructor(name, mockApiDefinition, serverBasePath) {
         this.name = name;
         this.mockApiDefinition = mockApiDefinition;
         this.serverBasePath = serverBasePath;
-    }
-    getConfigObj() {
-        let config = {};
-        if (this.mockApiDefinition.request.status) {
-            const validStatusCode = this.mockApiDefinition.request.status;
-            config = {
-                validateStatus: function (status) {
-                    return (status >= 200 && status < 300) || validStatusCode === status;
-                },
-            };
-        }
-        if (this.mockApiDefinition.request.params) {
-            config = {
-                ...config,
-                params: this.mockApiDefinition.request.params,
-            };
-        }
-        if (this.mockApiDefinition.request.headers) {
-            config = {
-                ...config,
-                headers: this.mockApiDefinition.request.headers,
-            };
-        }
-        if (["head", "get", "delete"].includes(this.mockApiDefinition.method) &&
-            this.mockApiDefinition.request.body) {
-            config = {
-                ...config,
-                data: this.mockApiDefinition.request.body,
-            };
-        }
-        return config;
+        this.resolverConfig = {
+            baseUrl: serverBasePath,
+        };
     }
     async executeScenario() {
-        logger.info(`Executing ${this.name} endpoint - Method: ${this.mockApiDefinition.method}`);
-        const response = await makeServiceCall(this.mockApiDefinition.method, {
-            endPoint: `${this.serverBasePath}${this.mockApiDefinition.uri}`,
-            options: {
-                requestBody: this.mockApiDefinition.request.body,
-                files: this.mockApiDefinition.request.files,
-                config: this.getConfigObj(),
-            },
-        });
+        log(`Executing ${this.name} endpoint - Method: ${this.mockApiDefinition.method}`);
+        const response = await makeServiceCall({
+            method: this.mockApiDefinition.method,
+            url: `${this.serverBasePath}${this.mockApiDefinition.uri}`,
+            body: this.mockApiDefinition.request?.body,
+            headers: this.mockApiDefinition.request?.headers,
+            query: this.mockApiDefinition.request?.query,
+            pathParams: this.mockApiDefinition.request?.pathParams,
+        }, this.resolverConfig);
         if (this.mockApiDefinition.response.status !== response.status) {
-            logger.error(`Status code mismatch for ${this.name} endpoint`);
-            logger.error(`Expected: ${this.mockApiDefinition.response.status} - Actual: ${response.status}`);
-            throw new Error(`Status code mismatch for ${this.name} endpoint`);
+            throw new ValidationError("Status code mismatch", this.mockApiDefinition.response.status, response.status);
         }
         if (this.mockApiDefinition.response.body) {
-            if (this.mockApiDefinition.response.body.contentType === "application/xml") {
-                if (JSON.stringify(this.mockApiDefinition.response.body.rawContent) !==
-                    JSON.stringify(response.data)) {
-                    logger.error(`Response data mismatch for ${this.name} endpoint`);
-                    logger.error(`Expected: ${this.mockApiDefinition.response.body["rawContent"]} - Actual: ${response.data}`);
-                    throw new Error(`Response data mismatch for ${this.name} endpoint`);
-                }
-            }
-            else if (Buffer.isBuffer(this.mockApiDefinition.response.body.rawContent)) {
-                if (this.mockApiDefinition.request.headers &&
-                    this.mockApiDefinition.request.headers["accept"] === "application/json") {
-                    if (response.data.content !==
-                        this.mockApiDefinition.response.body.rawContent.toString("base64")) {
-                        throw new Error(`Response data mismatch for ${this.name} endpoint`);
-                    }
-                }
-                else {
-                    if (uint8ArrayToString(response.data, "utf-8") !==
-                        this.mockApiDefinition.response.body.rawContent.toString()) {
-                        throw new Error(`Response data mismatch for ${this.name} endpoint`);
-                    }
-                }
-            }
-            else if (this.mockApiDefinition.response.body.contentType === "text/plain") {
-                if (this.mockApiDefinition.response.body.rawContent !== response.data) {
-                    logger.error(`Response data mismatch for ${this.name} endpoint`);
-                    logger.error(`Expected: ${this.mockApiDefinition.response.body} - Actual: ${response.data}`);
-                    throw new Error(`Response data mismatch for ${this.name} endpoint`);
+            await this.#validateBody(response, this.mockApiDefinition.response.body);
+        }
+        if (this.mockApiDefinition.response.headers) {
+            const headers = expandDyns(this.mockApiDefinition.response.headers, this.resolverConfig);
+            for (const key in headers) {
+                if (headers[key] !== response.headers.get(key)) {
+                    throw new ValidationError(`Response headers mismatch`, headers[key], response.headers.get(key));
                 }
             }
-            else {
-                const responseData = JSON.stringify(response.data);
-                if (this.mockApiDefinition.response.body.rawContent !==
-                    responseData.replace(this.serverBasePath, "")) {
-                    logger.error(`Response data mismatch for ${this.name} endpoint`);
-                    logger.error(`Expected: ${this.mockApiDefinition.response.body} - Actual: ${response.data}`);
-                    throw new Error(`Response data mismatch for ${this.name} endpoint`);
-                }
+        }
+    }
+    async #validateBody(response, body) {
+        if (Buffer.isBuffer(body.rawContent)) {
+            const responseData = Buffer.from(await response.arrayBuffer());
+            if (!deepEqual(responseData, body.rawContent)) {
+                throw new ValidationError(`Raw body mismatch`, body.rawContent, responseData);
             }
         }
-        if (this.mockApiDefinition.response.headers) {
-            for (const key in this.mockApiDefinition.response.headers) {
-                if (this.mockApiDefinition.response.headers[key] !==
-                    response.headers[key].replace(this.serverBasePath, "")) {
-                    logger.error(`Response headers mismatch for ${this.name} endpoint`);
-                    logger.error(`Expected: ${this.mockApiDefinition.response.headers[key]} - Actual: ${response.headers[key]}`);
-                    throw new Error(`Response headers mismatch for ${this.name} endpoint`);
-                }
+        else {
+            const responseData = await response.text();
+            const raw = typeof body.rawContent === "string"
+                ? body.rawContent
+                : body.rawContent?.serialize(this.resolverConfig);
+            switch (body.contentType) {
+                case "application/xml":
+                case "text/plain":
+                    if (body.rawContent !== responseData) {
+                        throw new ValidationError("Response data mismatch", raw, responseData);
+                    }
+                    break;
+                case "application/json":
+                    const expected = JSON.parse(raw);
+                    const actual = JSON.parse(responseData);
+                    if (!deepEqual(actual, expected, { strict: true })) {
+                        throw new ValidationError("Response data mismatch", expected, actual);
+                    }
             }
         }
     }
@@ -117,7 +78,7 @@ async function delay(ms) {
     return new Promise((resolve) => setTimeout(resolve, ms));
 }
 async function waitForServer(baseUrl) {
-    logger.info(`Executing server tests with base URL: ${baseUrl}`);
+    logger.debug(`Executing server tests with base URL: ${baseUrl}`);
     let retry = 0;
     while (retry < 3) {
         try {
@@ -135,43 +96,47 @@ async function waitForServer(baseUrl) {
 export async function serverTest(scenariosPath, options = {}) {
     const baseUrl = options.baseUrl ?? DEFAULT_BASE_URL;
     await waitForServer(baseUrl);
-    // 1. Get Testcases to run
-    const testCasesToRun = [];
-    if (options.runSingleScenario) {
-        testCasesToRun.push(options.runSingleScenario);
-    }
-    else if (options.runScenariosFromFile) {
-        const data = fs.readFileSync(path.resolve(options.runScenariosFromFile), "utf8");
-        const lines = data.split("\n");
-        lines.forEach((line) => {
-            testCasesToRun.push(line.trim());
-        });
-    }
-    // 2. Load all the scenarios
     const scenarios = await loadScenarioMockApis(scenariosPath);
-    const success_diagnostics = [];
-    const failure_diagnostics = [];
+    const successfullScenarios = [];
+    const failureDiagnostics = [];
+    const allScenarioEntries = Object.entries(scenarios);
+    const scenarioEntries = allScenarioEntries.filter(([name]) => {
+        const pathlikeName = name.replaceAll("_", "/").toLowerCase();
+        const filter = options.filter?.toLowerCase();
+        if (filter && !micromatch.isMatch(pathlikeName, filter)) {
+            logger.debug(`Skipping scenario: ${pathlikeName}, does not match filter: ${filter}`);
+            return false;
+        }
+        return true;
+    });
     // 3. Execute each scenario
-    for (const [name, scenario] of Object.entries(scenarios)) {
+    for (const [name, scenario] of scenarioEntries) {
         if (!Array.isArray(scenario.apis))
             continue;
         for (const api of scenario.apis) {
             if (api.kind !== "MockApiDefinition")
                 continue;
-            if (testCasesToRun.length === 0 || testCasesToRun.includes(name)) {
-                const obj = new ServerTestsGenerator(name, api, baseUrl);
-                try {
-                    await obj.executeScenario();
-                    success_diagnostics.push({
-                        scenario_name: name,
-                        status: "success",
-                        message: "executed successfully",
+            const obj = new ServerTestsGenerator(name, api, baseUrl);
+            try {
+                await obj.executeScenario();
+                successfullScenarios.push({
+                    name,
+                });
+            }
+            catch (e) {
+                if (e instanceof ValidationError) {
+                    failureDiagnostics.push({
+                        scenarioName: name,
+                        message: [
+                            `Validation failed: ${e.message}:`,
+                            ` Expected:\n    ${inspect(e.expected)}`,
+                            ` Actual:\n    ${inspect(e.actual)}`,
+                        ].join("\n"),
                     });
                 }
-                catch (e) {
-                    failure_diagnostics.push({
-                        scenario_name: name,
-                        status: "failure",
+                else {
+                    failureDiagnostics.push({
+                        scenarioName: name,
                         message: `code = ${e.code} \n message = ${e.message} \n name = ${e.name} \n stack = ${e.stack} \n status = ${e.status}`,
                     });
                 }
@@ -179,21 +144,32 @@ export async function serverTest(scenariosPath, options = {}) {
         }
     }
     // 4. Print diagnostics
-    logger.info("Server Tests Diagnostics Summary");
-    if (success_diagnostics.length > 0)
-        logger.info("Success Scenarios");
-    success_diagnostics.forEach((diagnostic) => {
-        logger.info(`${pc.green("✓")} Scenario: ${diagnostic.scenario_name} - ${diagnostic.message}`);
+    log("");
+    log("Server Tests Diagnostics Summary");
+    if (successfullScenarios.length === 0 && failureDiagnostics.length === 0) {
+        logger.error("No scenarios were executed");
+        process.exit(-1);
+    }
+    if (successfullScenarios.length > 0)
+        log("Successfull scenarios");
+    successfullScenarios.forEach((diagnostic) => {
+        log(`${pc.green("✓")} Scenario: ${pc.cyan(diagnostic.name)}`);
     });
-    if (failure_diagnostics.length > 0)
-        logger.error("Failure Scenarios");
-    if (failure_diagnostics.length > 0) {
-        logger.error("Failed Scenario details");
-        failure_diagnostics.forEach((diagnostic) => {
-            logger.error(`${pc.red("✘")} Scenario: ${diagnostic.scenario_name}`);
-            logger.error(`${diagnostic.message}`);
+    if (failureDiagnostics.length > 0) {
+        log("Failed scenarios");
+        failureDiagnostics.forEach((diagnostic) => {
+            log(`${pc.red("✘")} Scenario: ${pc.cyan(diagnostic.scenarioName)}`);
+            log(`${diagnostic.message}`);
         });
-        process.exit(-1);
     }
+    log(pc.bold(pc.green(`✓ ${scenarioEntries.length} passed`)));
+    if (failureDiagnostics.length > 0) {
+        log(pc.red(`✘ ${failureDiagnostics.length} failed`));
+    }
+    process.exit(failureDiagnostics.length > 0 ? 1 : 0);
+}
+function log(message) {
+    // eslint-disable-next-line no-console
+    console.log(message);
 }
 //# sourceMappingURL=server-test.js.map

package/dist/src/actions/server-test.js.map

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

package/dist/src/actions/upload-scenario-manifest.d.ts

@@ -1,8 +1,9 @@
 export interface UploadScenarioManifestConfig {
-    scenariosPaths: string[];
+    scenariosPath: string;
     storageAccountName: string;
-    setNames: string[];
     containerName: string;
+    manifestName: string;
+    override?: boolean;
 }
-export declare function uploadScenarioManifest({ scenariosPaths, storageAccountName, setNames, containerName, }: UploadScenarioManifestConfig): Promise<void>;
+export declare function uploadScenarioManifest({ scenariosPath, storageAccountName, containerName, manifestName, override, }: UploadScenarioManifestConfig): Promise<void>;
 //# sourceMappingURL=upload-scenario-manifest.d.ts.map

package/dist/src/actions/upload-scenario-manifest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"upload-scenario-manifest.d.ts","sourceRoot":"","sources":["../../../src/actions/upload-scenario-manifest.ts"],"names":[],"mappings":"AAQA,MAAM,WAAW,4BAA4B;IAC3C,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;CACvB;AAED,wBAAsB,sBAAsB,CAAC,EAC3C,cAAc,EACd,kBAAkB,EAClB,QAAQ,EACR,aAAa,GACd,EAAE,4BAA4B,iBAsB9B"}
+{"version":3,"file":"upload-scenario-manifest.d.ts","sourceRoot":"","sources":["../../../src/actions/upload-scenario-manifest.ts"],"names":[],"mappings":"AAQA,MAAM,WAAW,4BAA4B;IAC3C,aAAa,EAAE,MAAM,CAAC;IACtB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,wBAAsB,sBAAsB,CAAC,EAC3C,aAAa,EACb,kBAAkB,EAClB,aAAa,EACb,YAAY,EACZ,QAAgB,GACjB,EAAE,4BAA4B,iBA+B9B"}

package/dist/src/actions/upload-scenario-manifest.js

@@ -5,24 +5,31 @@ import { resolve } from "path";
 import pc from "picocolors";
 import { computeScenarioManifest } from "../coverage/scenario-manifest.js";
 import { logger } from "../logger.js";
-export async function uploadScenarioManifest({ scenariosPaths, storageAccountName, setNames, containerName, }) {
-    const manifests = [];
-    for (let idx = 0; idx < scenariosPaths.length; idx++) {
-        const path = resolve(process.cwd(), scenariosPaths[idx]);
-        logger.info(`Computing scenario manifest for ${path}`);
-        const [manifest, diagnostics] = await computeScenarioManifest(path, setNames[idx]);
-        if (manifest === undefined || diagnostics.length > 0) {
-            process.exit(-1);
-        }
-        manifests.push(manifest);
+export async function uploadScenarioManifest({ scenariosPath, storageAccountName, containerName, manifestName, override = false, }) {
+    const path = resolve(process.cwd(), scenariosPath);
+    logger.info(`Computing scenario manifest for ${path}`);
+    const [manifest, diagnostics] = await computeScenarioManifest(path);
+    if (manifest === undefined || diagnostics.length > 0) {
+        process.exit(-1);
     }
-    await writeFile("manifest.json", JSON.stringify(manifests, null, 2));
+    await writeFile("manifest.json", JSON.stringify(manifest, null, 2));
     const client = new SpecCoverageClient(storageAccountName, {
         credential: new AzureCliCredential(),
         containerName,
     });
     await client.createIfNotExists();
-    await client.manifest.upload(manifests);
-    logger.info(`${pc.green("✓")} Scenario manifest uploaded to ${storageAccountName} storage account.`);
+    if (override) {
+        await client.manifest.upload(manifestName, manifest);
+        logger.info(`${pc.green("✓")} Scenario manifest uploaded to ${storageAccountName} storage account.`);
+    }
+    else {
+        const result = await client.manifest.uploadIfVersionNew(manifestName, manifest);
+        if (result === "uploaded") {
+            logger.info(`${pc.green("✓")} Scenario manifest new version uploaded to ${storageAccountName} storage account.`);
+        }
+        else {
+            logger.info(`${pc.white("-")} Existing scenario manifest in ${storageAccountName} storage account is up to date. No upload needed.`);
+        }
+    }
 }
 //# sourceMappingURL=upload-scenario-manifest.js.map

package/dist/src/actions/upload-scenario-manifest.js.map

@@ -1 +1 @@
-{"version":3,"file":"upload-scenario-manifest.js","sourceRoot":"","sources":["../../../src/actions/upload-scenario-manifest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,EAAE,MAAM,YAAY,CAAC;AAC5B,OAAO,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;AAC3E,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAStC,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAAC,EAC3C,cAAc,EACd,kBAAkB,EAClB,QAAQ,EACR,aAAa,GACgB;IAC7B,MAAM,SAAS,GAAG,EAAE,CAAC;IACrB,KAAK,IAAI,GAAG,GAAG,CAAC,EAAE,GAAG,GAAG,cAAc,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE,CAAC;QACrD,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC;QACzD,MAAM,CAAC,IAAI,CAAC,mCAAmC,IAAI,EAAE,CAAC,CAAC;QACvD,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,MAAM,uBAAuB,CAAC,IAAI,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;QACnF,IAAI,QAAQ,KAAK,SAAS,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACrD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;QACnB,CAAC;QACD,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC3B,CAAC;IACD,MAAM,SAAS,CAAC,eAAe,EAAE,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;IACrE,MAAM,MAAM,GAAG,IAAI,kBAAkB,CAAC,kBAAkB,EAAE;QACxD,UAAU,EAAE,IAAI,kBAAkB,EAAE;QACpC,aAAa;KACd,CAAC,CAAC;IACH,MAAM,MAAM,CAAC,iBAAiB,EAAE,CAAC;IACjC,MAAM,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IAExC,MAAM,CAAC,IAAI,CACT,GAAG,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,kCAAkC,kBAAkB,mBAAmB,CACxF,CAAC;AACJ,CAAC"}
+{"version":3,"file":"upload-scenario-manifest.js","sourceRoot":"","sources":["../../../src/actions/upload-scenario-manifest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,EAAE,MAAM,YAAY,CAAC;AAC5B,OAAO,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;AAC3E,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAUtC,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAAC,EAC3C,aAAa,EACb,kBAAkB,EAClB,aAAa,EACb,YAAY,EACZ,QAAQ,GAAG,KAAK,GACa;IAC7B,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,aAAa,CAAC,CAAC;IACnD,MAAM,CAAC,IAAI,CAAC,mCAAmC,IAAI,EAAE,CAAC,CAAC;IACvD,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,MAAM,uBAAuB,CAAC,IAAI,CAAC,CAAC;IACpE,IAAI,QAAQ,KAAK,SAAS,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACrD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IACnB,CAAC;IACD,MAAM,SAAS,CAAC,eAAe,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;IACpE,MAAM,MAAM,GAAG,IAAI,kBAAkB,CAAC,kBAAkB,EAAE;QACxD,UAAU,EAAE,IAAI,kBAAkB,EAAE;QACpC,aAAa;KACd,CAAC,CAAC;IACH,MAAM,MAAM,CAAC,iBAAiB,EAAE,CAAC;IACjC,IAAI,QAAQ,EAAE,CAAC;QACb,MAAM,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;QACrD,MAAM,CAAC,IAAI,CACT,GAAG,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,kCAAkC,kBAAkB,mBAAmB,CACxF,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,kBAAkB,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;QAEhF,IAAI,MAAM,KAAK,UAAU,EAAE,CAAC;YAC1B,MAAM,CAAC,IAAI,CACT,GAAG,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,8CAA8C,kBAAkB,mBAAmB,CACpG,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,IAAI,CACT,GAAG,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,kCAAkC,kBAAkB,mDAAmD,CACxH,CAAC;QACJ,CAAC;IACH,CAAC;AACH,CAAC"}

package/dist/src/actions/validate-mock-apis.js

@@ -22,7 +22,7 @@ export async function validateMockApis({ scenariosPath, exitDueToPreviousError,
             d.target.kind === "Namespace" &&
             d.target.name === "DPG"));
         if (programDiagnostics.length > 0) {
-            specCompiler.logDiagnostics(programDiagnostics, { log: logger.error });
+            specCompiler.logDiagnostics(programDiagnostics, specCompiler.NodeHost.logSink);
             diagnostics.reportDiagnostic({
                 message: `Scenario ${name} is invalid.`,
             });

package/dist/src/actions/validate-mock-apis.js.map

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

package/dist/src/app/app.d.ts

@@ -10,6 +10,7 @@ export declare class MockApiApp {
     private router;
     private server;
     private coverageTracker;
+    private resolverConfig;
     constructor(config: ApiMockAppConfig);
     start(): Promise<void>;
     private registerScenario;

package/dist/src/app/app.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../../../src/app/app.ts"],"names":[],"mappings":"AAAA,OAAO,EAA8C,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACjG,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAQhE,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAG/C,MAAM,WAAW,6BAA6B;IAC5C,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;IAC3C,iBAAiB,EAAE,iBAAiB,CAAC;CACtC;AAED,qBAAa,UAAU;IAKT,OAAO,CAAC,MAAM;IAJ1B,OAAO,CAAC,MAAM,CAAY;IAC1B,OAAO,CAAC,MAAM,CAAgB;IAC9B,OAAO,CAAC,eAAe,CAAkB;gBAErB,MAAM,EAAE,gBAAgB;IAK/B,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAgCnC,OAAO,CAAC,gBAAgB;CAoCzB"}
+{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../../../src/app/app.ts"],"names":[],"mappings":"AAAA,OAAO,EAQL,eAAe,EAChB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAQhE,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAG/C,MAAM,WAAW,6BAA6B;IAC5C,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;IAC3C,iBAAiB,EAAE,iBAAiB,CAAC;CACtC;AAED,qBAAa,UAAU;IAMT,OAAO,CAAC,MAAM;IAL1B,OAAO,CAAC,MAAM,CAAY;IAC1B,OAAO,CAAC,MAAM,CAAgB;IAC9B,OAAO,CAAC,eAAe,CAAkB;IACzC,OAAO,CAAC,cAAc,CAAkB;gBAEpB,MAAM,EAAE,gBAAgB;IAK/B,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAoCnC,OAAO,CAAC,gBAAgB;CAqBzB"}

package/dist/src/app/app.js

@@ -1,3 +1,4 @@
+import { expandDyns, } from "@typespec/spec-api";
 import { Router } from "express";
 import { getScenarioMetadata } from "../coverage/common.js";
 import { CoverageTracker } from "../coverage/coverage-tracker.js";
@@ -11,6 +12,7 @@ export class MockApiApp {
     router = Router();
     server;
     coverageTracker;
+    resolverConfig;
     constructor(config) {
         this.config = config;
         this.server = new MockApiServer({ port: config.port });
@@ -41,57 +43,60 @@ export class MockApiApp {
             res.json(this.coverageTracker.computeCoverage());
         });
         this.server.use("/", this.router);
-        this.server.start();
+        // Getting the resolved port as setting 0 in the config will have express resolve on of the available ports
+        const port = await this.server.start();
+        this.resolverConfig = {
+            baseUrl: `http://localhost:${port}`,
+        };
     }
     registerScenario(name, scenario) {
         for (const endpoint of scenario.apis) {
-            if (endpoint.kind !== "MockApiDefinition") {
-                this.router.route(endpoint.uri)[endpoint.method]((req, res) => {
-                    processRequest(this.coverageTracker, name, endpoint.uri, req, res, endpoint.handler).catch((e) => {
-                        logger.error("Unexpected request error", e);
-                        res.status(500).end();
-                    });
-                });
+            if (!endpoint.handler) {
+                endpoint.handler = createHandler(endpoint, this.resolverConfig);
             }
-            else {
-                if (!endpoint.handler) {
-                    endpoint.handler = createHandler(endpoint);
-                }
-                this.router.route(endpoint.uri)[endpoint.method]((req, res) => {
-                    processRequest(this.coverageTracker, name, endpoint.uri, req, res, endpoint.handler).catch((e) => {
-                        logger.error("Unexpected request error", e);
-                        res.status(500).end();
-                    });
+            this.router.route(endpoint.uri)[endpoint.method]((req, res) => {
+                processRequest(this.coverageTracker, name, endpoint.uri, req, res, endpoint.handler, this.resolverConfig).catch((e) => {
+                    logger.error("Unexpected request error", e);
+                    res.status(500).end();
                 });
-            }
+            });
         }
     }
 }
-function isObject(value) {
-    return typeof value === "object" && value !== null && !Array.isArray(value);
+function validateBody(req, body, config) {
+    if ("kind" in body) {
+        // custom handler for now.
+    }
+    else {
+        if (Buffer.isBuffer(body.rawContent)) {
+            req.expect.rawBodyEquals(body.rawContent);
+        }
+        else {
+            const raw = typeof body.rawContent === "string" ? body.rawContent : body.rawContent?.serialize(config);
+            switch (body.contentType) {
+                case "application/json":
+                    req.expect.coercedBodyEquals(JSON.parse(raw));
+                    break;
+                case "application/xml":
+                    req.expect.xmlBodyEquals(raw.replace(`<?xml version='1.0' encoding='UTF-8'?>`, ""));
+                    break;
+                default:
+                    req.expect.rawBodyEquals(raw);
+            }
+        }
+    }
 }
-function createHandler(apiDefinition) {
+function createHandler(apiDefinition, config) {
     return (req) => {
+        const body = apiDefinition.request?.body;
         // Validate body if present in the request
-        if (apiDefinition.request.body) {
-            if (apiDefinition.request.headers &&
-                apiDefinition.request.headers["Content-Type"] === "application/xml") {
-                req.expect.xmlBodyEquals(apiDefinition.request.body.rawContent.replace(`<?xml version='1.0' encoding='UTF-8'?>`, ""));
-            }
-            else {
-                if (isObject(apiDefinition.request.body)) {
-                    Object.entries(apiDefinition.request.body).forEach(([key, value]) => {
-                        req.expect.deepEqual(req.body[key], value);
-                    });
-                }
-                else {
-                    req.expect.coercedBodyEquals(apiDefinition.request.body);
-                }
-            }
+        if (body) {
+            validateBody(req, body, config);
         }
         // Validate headers if present in the request
-        if (apiDefinition.request.headers) {
-            Object.entries(apiDefinition.request.headers).forEach(([key, value]) => {
+        if (apiDefinition.request?.headers) {
+            const headers = expandDyns(apiDefinition.request.headers, config);
+            Object.entries(headers).forEach(([key, value]) => {
                 if (key.toLowerCase() !== "content-type") {
                     if (Array.isArray(value)) {
                         req.expect.deepEqual(req.headers[key], value);
@@ -102,24 +107,13 @@ function createHandler(apiDefinition) {
                 }
             });
         }
-        // Validate query params if present in the request
-        if (apiDefinition.request.params) {
-            Object.entries(apiDefinition.request.params).forEach(([key, value]) => {
-                if (!req.query[key]) {
-                    if (Array.isArray(value)) {
-                        req.expect.deepEqual(req.params[key], value);
-                    }
-                    else {
-                        req.expect.deepEqual(req.params[key], String(value));
-                    }
+        if (apiDefinition.request?.query) {
+            Object.entries(apiDefinition.request.query).forEach(([key, value]) => {
+                if (Array.isArray(value)) {
+                    req.expect.deepEqual(req.query[key], value);
                 }
                 else {
-                    if (Array.isArray(value)) {
-                        req.expect.deepEqual(req.query[key], value);
-                    }
-                    else {
-                        req.expect.containsQueryParam(key, String(value));
-                    }
+                    req.expect.containsQueryParam(key, String(value));
                 }
             });
         }