@schmock/cli 2.2.0 → 2.2.1

package/dist/bin.js

@@ -24058,7 +24058,7 @@ async function runPluginPipeline(plugins, context, initialResponse, logger) {
             if (errorResult instanceof Error) {
               throw new PluginError(plugin.name, errorResult);
             }
-            if (typeof errorResult === "object" && errorResult !== null && "status" in errorResult) {
+            if (isStatusTuple(errorResult) || typeof errorResult === "object" && errorResult !== null && "status" in errorResult) {
               response = errorResult;
               break;
             }
@@ -24079,7 +24079,7 @@ async function runPluginPipeline(plugins, context, initialResponse, logger) {
 
 // ../core/src/response-parser.ts
 function isResponseObject(value) {
-  return typeof value === "object" && value !== null && "status" in value && "body" in value;
+  return typeof value === "object" && value !== null && "status" in value && typeof value.status === "number" && "body" in value;
 }
 function parseResponse(result, routeConfig) {
   let status = 200;
@@ -24201,18 +24201,19 @@ class CallableMockInstance {
     });
   }
   defineRoute(route, generator, config) {
-    if (!config.contentType) {
+    const routeConfig = { ...config };
+    if (!routeConfig.contentType) {
       if (typeof generator === "function") {
-        config.contentType = "application/json";
+        routeConfig.contentType = "application/json";
       } else if (typeof generator === "string" || typeof generator === "number" || typeof generator === "boolean") {
-        config.contentType = "text/plain";
+        routeConfig.contentType = "text/plain";
       } else if (Buffer.isBuffer(generator)) {
-        config.contentType = "application/octet-stream";
+        routeConfig.contentType = "application/octet-stream";
       } else {
-        config.contentType = "application/json";
+        routeConfig.contentType = "application/json";
       }
     }
-    if (typeof generator !== "function" && config.contentType === "application/json") {
+    if (typeof generator !== "function" && routeConfig.contentType === "application/json") {
       try {
         JSON.stringify(generator);
       } catch (_error) {
@@ -24220,7 +24221,8 @@ class CallableMockInstance {
       }
     }
     const parsed = parseRouteKey(route);
-    const existing = this.routes.find((r) => r.method === parsed.method && r.path === parsed.path);
+    const normalizedParsedPath = normalizePath(parsed.path);
+    const existing = this.routes.find((r) => r.method === parsed.method && normalizePath(r.path) === normalizedParsedPath);
     if (existing) {
       this.logger.log("warning", `Duplicate route: ${route} — first registration wins`);
       return this;
@@ -24231,7 +24233,7 @@ class CallableMockInstance {
       method: parsed.method,
       path: parsed.path,
       generator,
-      config
+      config: routeConfig
     };
     this.routes.push(compiledRoute);
     if (parsed.params.length === 0) {
@@ -24239,7 +24241,7 @@ class CallableMockInstance {
       this.staticRoutes.set(key, compiledRoute);
     }
     this.logger.log("route", `Route defined: ${route}`, {
-      contentType: config.contentType,
+      contentType: routeConfig.contentType,
       generatorType: typeof generator,
       hasParams: parsed.params.length > 0
     });
@@ -24261,11 +24263,21 @@ class CallableMockInstance {
     }
     return this;
   }
+  cloneRecord(r) {
+    try {
+      return structuredClone(r);
+    } catch {
+      return {
+        ...r,
+        response: { ...r.response }
+      };
+    }
+  }
   history(method, path) {
     if (method || path) {
-      return this.requestHistory.filter((r) => (!method || r.method === method) && (!path || r.path === path));
+      return this.requestHistory.filter((r) => (!method || r.method === method) && (!path || r.path === path)).map((r) => this.cloneRecord(r));
     }
-    return [...this.requestHistory];
+    return this.requestHistory.map((r) => this.cloneRecord(r));
   }
   called(method, path) {
     if (method || path) {
@@ -24282,9 +24294,11 @@ class CallableMockInstance {
   lastRequest(method, path) {
     if (method || path) {
       const filtered = this.requestHistory.filter((r) => (!method || r.method === method) && (!path || r.path === path));
-      return filtered[filtered.length - 1];
+      const last2 = filtered[filtered.length - 1];
+      return last2 ? this.cloneRecord(last2) : undefined;
     }
-    return this.requestHistory[this.requestHistory.length - 1];
+    const last = this.requestHistory[this.requestHistory.length - 1];
+    return last ? this.cloneRecord(last) : undefined;
   }
   getRoutes() {
     return this.routes.map((r) => ({
@@ -24327,9 +24341,7 @@ class CallableMockInstance {
     this.requestHistory = [];
     this.listeners.clear();
     if (this.globalConfig.state) {
-      for (const key of Object.keys(this.globalConfig.state)) {
-        delete this.globalConfig.state[key];
-      }
+      this.globalConfig.state = {};
     }
     this.logger.log("lifecycle", "Mock fully reset");
   }
@@ -24339,9 +24351,7 @@ class CallableMockInstance {
   }
   resetState() {
     if (this.globalConfig.state) {
-      for (const key of Object.keys(this.globalConfig.state)) {
-        delete this.globalConfig.state[key];
-      }
+      this.globalConfig.state = {};
     }
     this.logger.log("lifecycle", "State cleared");
   }
@@ -24607,7 +24617,7 @@ function schmock(config) {
   return callableInstance;
 }
 // ../openapi/package.json
-var version = "2.2.0";
+var version = "2.2.1";
 
 // ../openapi/src/utils.ts
 function isRecord(value) {
@@ -30221,7 +30231,9 @@ function enhanceSchemaWithSmartMapping(schema) {
 function enhanceFieldSchema(fieldName, fieldSchema) {
   const enhanced = { ...fieldSchema };
   if (enhanced.faker) {
-    validateFakerMethod(enhanced.faker);
+    if (typeof enhanced.faker === "string") {
+      validateFakerMethod(enhanced.faker);
+    }
     return enhanced;
   }
   const hasComposition = enhanced.allOf || enhanced.anyOf || enhanced.oneOf;
@@ -30237,12 +30249,17 @@ function enhanceFieldSchema(fieldName, fieldSchema) {
   }
   const match = findBestMapping(fieldName, enhanced);
   if (match) {
-    enhanced.faker = match.mapping.fakerMethod;
-    if (match.mapping.format) {
-      enhanced.format = match.mapping.format;
+    const { fakerMethod, format, trueProbability, fakerArgs } = match.mapping;
+    if (fakerArgs) {
+      enhanced.faker = { [fakerMethod]: [fakerArgs] };
+    } else {
+      enhanced.faker = fakerMethod;
+    }
+    if (format) {
+      enhanced.format = format;
     }
-    if (match.mapping.trueProbability !== undefined) {
-      enhanced.schmockTrueProbability = match.mapping.trueProbability;
+    if (trueProbability !== undefined) {
+      enhanced.schmockTrueProbability = trueProbability;
     }
   }
   return enhanced;

package/dist/index.js

@@ -24057,7 +24057,7 @@ async function runPluginPipeline(plugins, context, initialResponse, logger) {
             if (errorResult instanceof Error) {
               throw new PluginError(plugin.name, errorResult);
             }
-            if (typeof errorResult === "object" && errorResult !== null && "status" in errorResult) {
+            if (isStatusTuple(errorResult) || typeof errorResult === "object" && errorResult !== null && "status" in errorResult) {
               response = errorResult;
               break;
             }
@@ -24078,7 +24078,7 @@ async function runPluginPipeline(plugins, context, initialResponse, logger) {
 
 // ../core/src/response-parser.ts
 function isResponseObject(value) {
-  return typeof value === "object" && value !== null && "status" in value && "body" in value;
+  return typeof value === "object" && value !== null && "status" in value && typeof value.status === "number" && "body" in value;
 }
 function parseResponse(result, routeConfig) {
   let status = 200;
@@ -24200,18 +24200,19 @@ class CallableMockInstance {
     });
   }
   defineRoute(route, generator, config) {
-    if (!config.contentType) {
+    const routeConfig = { ...config };
+    if (!routeConfig.contentType) {
       if (typeof generator === "function") {
-        config.contentType = "application/json";
+        routeConfig.contentType = "application/json";
       } else if (typeof generator === "string" || typeof generator === "number" || typeof generator === "boolean") {
-        config.contentType = "text/plain";
+        routeConfig.contentType = "text/plain";
       } else if (Buffer.isBuffer(generator)) {
-        config.contentType = "application/octet-stream";
+        routeConfig.contentType = "application/octet-stream";
       } else {
-        config.contentType = "application/json";
+        routeConfig.contentType = "application/json";
       }
     }
-    if (typeof generator !== "function" && config.contentType === "application/json") {
+    if (typeof generator !== "function" && routeConfig.contentType === "application/json") {
       try {
         JSON.stringify(generator);
       } catch (_error) {
@@ -24219,7 +24220,8 @@ class CallableMockInstance {
       }
     }
     const parsed = parseRouteKey(route);
-    const existing = this.routes.find((r) => r.method === parsed.method && r.path === parsed.path);
+    const normalizedParsedPath = normalizePath(parsed.path);
+    const existing = this.routes.find((r) => r.method === parsed.method && normalizePath(r.path) === normalizedParsedPath);
     if (existing) {
       this.logger.log("warning", `Duplicate route: ${route} — first registration wins`);
       return this;
@@ -24230,7 +24232,7 @@ class CallableMockInstance {
       method: parsed.method,
       path: parsed.path,
       generator,
-      config
+      config: routeConfig
     };
     this.routes.push(compiledRoute);
     if (parsed.params.length === 0) {
@@ -24238,7 +24240,7 @@ class CallableMockInstance {
       this.staticRoutes.set(key, compiledRoute);
     }
     this.logger.log("route", `Route defined: ${route}`, {
-      contentType: config.contentType,
+      contentType: routeConfig.contentType,
       generatorType: typeof generator,
       hasParams: parsed.params.length > 0
     });
@@ -24260,11 +24262,21 @@ class CallableMockInstance {
     }
     return this;
   }
+  cloneRecord(r) {
+    try {
+      return structuredClone(r);
+    } catch {
+      return {
+        ...r,
+        response: { ...r.response }
+      };
+    }
+  }
   history(method, path) {
     if (method || path) {
-      return this.requestHistory.filter((r) => (!method || r.method === method) && (!path || r.path === path));
+      return this.requestHistory.filter((r) => (!method || r.method === method) && (!path || r.path === path)).map((r) => this.cloneRecord(r));
     }
-    return [...this.requestHistory];
+    return this.requestHistory.map((r) => this.cloneRecord(r));
   }
   called(method, path) {
     if (method || path) {
@@ -24281,9 +24293,11 @@ class CallableMockInstance {
   lastRequest(method, path) {
     if (method || path) {
       const filtered = this.requestHistory.filter((r) => (!method || r.method === method) && (!path || r.path === path));
-      return filtered[filtered.length - 1];
+      const last2 = filtered[filtered.length - 1];
+      return last2 ? this.cloneRecord(last2) : undefined;
     }
-    return this.requestHistory[this.requestHistory.length - 1];
+    const last = this.requestHistory[this.requestHistory.length - 1];
+    return last ? this.cloneRecord(last) : undefined;
   }
   getRoutes() {
     return this.routes.map((r) => ({
@@ -24326,9 +24340,7 @@ class CallableMockInstance {
     this.requestHistory = [];
     this.listeners.clear();
     if (this.globalConfig.state) {
-      for (const key of Object.keys(this.globalConfig.state)) {
-        delete this.globalConfig.state[key];
-      }
+      this.globalConfig.state = {};
     }
     this.logger.log("lifecycle", "Mock fully reset");
   }
@@ -24338,9 +24350,7 @@ class CallableMockInstance {
   }
   resetState() {
     if (this.globalConfig.state) {
-      for (const key of Object.keys(this.globalConfig.state)) {
-        delete this.globalConfig.state[key];
-      }
+      this.globalConfig.state = {};
     }
     this.logger.log("lifecycle", "State cleared");
   }
@@ -24606,7 +24616,7 @@ function schmock(config) {
   return callableInstance;
 }
 // ../openapi/package.json
-var version = "2.2.0";
+var version = "2.2.1";
 
 // ../openapi/src/utils.ts
 function isRecord(value) {
@@ -30220,7 +30230,9 @@ function enhanceSchemaWithSmartMapping(schema) {
 function enhanceFieldSchema(fieldName, fieldSchema) {
   const enhanced = { ...fieldSchema };
   if (enhanced.faker) {
-    validateFakerMethod(enhanced.faker);
+    if (typeof enhanced.faker === "string") {
+      validateFakerMethod(enhanced.faker);
+    }
     return enhanced;
   }
   const hasComposition = enhanced.allOf || enhanced.anyOf || enhanced.oneOf;
@@ -30236,12 +30248,17 @@ function enhanceFieldSchema(fieldName, fieldSchema) {
   }
   const match = findBestMapping(fieldName, enhanced);
   if (match) {
-    enhanced.faker = match.mapping.fakerMethod;
-    if (match.mapping.format) {
-      enhanced.format = match.mapping.format;
+    const { fakerMethod, format, trueProbability, fakerArgs } = match.mapping;
+    if (fakerArgs) {
+      enhanced.faker = { [fakerMethod]: [fakerArgs] };
+    } else {
+      enhanced.faker = fakerMethod;
+    }
+    if (format) {
+      enhanced.format = format;
     }
-    if (match.mapping.trueProbability !== undefined) {
-      enhanced.schmockTrueProbability = match.mapping.trueProbability;
+    if (trueProbability !== undefined) {
+      enhanced.schmockTrueProbability = trueProbability;
     }
   }
   return enhanced;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@schmock/cli",
   "description": "CLI for running Schmock mock servers from OpenAPI specs",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -32,8 +32,8 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@schmock/core": "^2.2.0",
-    "@schmock/openapi": "^2.2.0"
+    "@schmock/core": "^2.2.1",
+    "@schmock/openapi": "^2.2.1"
   },
   "devDependencies": {
     "@amiceli/vitest-cucumber": "^6.5.0",