@schmock/cli 1.13.0 → 2.0.1

package/dist/bin.js

@@ -17735,6 +17735,7 @@ import { parseArgs } from "node:util";
 import { createServer } from "node:http";
 
 // ../core/src/constants.ts
+var ROUTE_NOT_FOUND_CODE = "ROUTE_NOT_FOUND";
 var HTTP_METHODS = [
   "GET",
   "POST",
@@ -17761,6 +17762,10 @@ function toRouteKey(method, path) {
   const key = `${method} ${path}`;
   return key;
 }
+function isRouteNotFound(response) {
+  const { status, body } = response;
+  return status === 404 && body !== null && typeof body === "object" && "code" in body && body.code === ROUTE_NOT_FOUND_CODE;
+}
 function isStatusTuple(value) {
   return Array.isArray(value) && (value.length === 2 || value.length === 3) && typeof value[0] === "number" && value[0] >= 100 && value[0] <= 599;
 }
@@ -17894,6 +17899,177 @@ function writeSchmockResponse(res, response, extraHeaders) {
   res.end(responseBody);
 }
 
+// ../core/src/interceptor.ts
+function extractPathname(url) {
+  const queryStart = url.indexOf("?");
+  const urlWithoutQuery = queryStart === -1 ? url : url.slice(0, queryStart);
+  if (urlWithoutQuery.includes("://")) {
+    try {
+      return new URL(urlWithoutQuery).pathname;
+    } catch {}
+  }
+  if (!urlWithoutQuery.startsWith("/")) {
+    return `/${urlWithoutQuery}`;
+  }
+  return urlWithoutQuery;
+}
+function extractQuery(url) {
+  const queryStart = url.indexOf("?");
+  if (queryStart === -1)
+    return {};
+  const params = new URLSearchParams(url.slice(queryStart + 1));
+  const result = {};
+  params.forEach((value, key) => {
+    result[key] = value;
+  });
+  return result;
+}
+function extractHeaders(input, init) {
+  const headers = {};
+  const raw = init?.headers ?? (input instanceof Request ? input.headers : undefined);
+  if (!raw)
+    return headers;
+  if (raw instanceof Headers) {
+    raw.forEach((value, key) => {
+      headers[key] = value;
+    });
+  } else if (Array.isArray(raw)) {
+    for (const [key, value] of raw) {
+      headers[key.toLowerCase()] = value;
+    }
+  } else {
+    for (const key of Object.keys(raw)) {
+      headers[key.toLowerCase()] = raw[key];
+    }
+  }
+  return headers;
+}
+async function extractBody(input, init) {
+  const bodyInit = init?.body ?? (input instanceof Request ? input.body : null);
+  if (bodyInit === null || bodyInit === undefined)
+    return;
+  if (typeof bodyInit === "string") {
+    try {
+      return JSON.parse(bodyInit);
+    } catch {
+      return bodyInit;
+    }
+  }
+  if (bodyInit instanceof URLSearchParams) {
+    const result = {};
+    bodyInit.forEach((value, key) => {
+      result[key] = value;
+    });
+    return result;
+  }
+  if (input instanceof Request && !init?.body && input.body) {
+    try {
+      return await input.clone().json();
+    } catch {
+      try {
+        return await input.clone().text();
+      } catch {
+        return;
+      }
+    }
+  }
+  return;
+}
+function createFetchInterceptor(handle, options = {}) {
+  const {
+    baseUrl,
+    passthrough = true,
+    beforeRequest,
+    beforeResponse,
+    errorFormatter
+  } = options;
+  const originalFetch = globalThis.fetch;
+  let active = true;
+  globalThis.fetch = async (input, init) => {
+    const urlString = input instanceof Request ? input.url : input instanceof URL ? input.href : input;
+    const path = extractPathname(urlString);
+    if (baseUrl) {
+      const normalizedBase = baseUrl.endsWith("/") ? baseUrl.slice(0, -1) : baseUrl;
+      const isMatch = path === normalizedBase || path.startsWith(`${normalizedBase}/`);
+      if (!isMatch) {
+        return originalFetch(input, init);
+      }
+    }
+    const method = input instanceof Request ? input.method : init?.method ?? "GET";
+    const headers = extractHeaders(input, init);
+    const query = extractQuery(urlString);
+    const body = await extractBody(input, init);
+    let adapterRequest = {
+      method,
+      path,
+      headers,
+      body,
+      query
+    };
+    try {
+      if (beforeRequest) {
+        const modified = await beforeRequest(adapterRequest);
+        if (modified) {
+          adapterRequest = modified;
+        }
+      }
+      const schmockResponse = await handle(toHttpMethod(adapterRequest.method), adapterRequest.path, {
+        headers: adapterRequest.headers,
+        body: adapterRequest.body,
+        query: adapterRequest.query
+      });
+      if (isRouteNotFound(schmockResponse)) {
+        if (passthrough) {
+          return originalFetch(input, init);
+        }
+        return new Response(JSON.stringify({
+          error: "No matching mock route found",
+          code: "ROUTE_NOT_FOUND"
+        }), {
+          status: 404,
+          headers: { "content-type": "application/json" }
+        });
+      }
+      let response = schmockResponse;
+      if (beforeResponse) {
+        const modified = await beforeResponse(response, adapterRequest);
+        if (modified) {
+          response = modified;
+        }
+      }
+      const responseHeaders = new Headers(response.headers);
+      if (!responseHeaders.has("content-type") && response.body !== null && response.body !== undefined) {
+        responseHeaders.set("content-type", "application/json");
+      }
+      const responseBody = response.body === null || response.body === undefined ? null : typeof response.body === "string" ? response.body : JSON.stringify(response.body);
+      return new Response(responseBody, {
+        status: response.status,
+        headers: responseHeaders
+      });
+    } catch (error) {
+      if (errorFormatter) {
+        const formatted = errorFormatter(error instanceof Error ? error : new Error(String(error)));
+        return new Response(JSON.stringify(formatted), {
+          status: 500,
+          headers: { "content-type": "application/json" }
+        });
+      }
+      throw error;
+    }
+  };
+  return {
+    restore() {
+      if (active) {
+        globalThis.fetch = originalFetch;
+        active = false;
+      }
+    },
+    get active() {
+      return active;
+    }
+  };
+}
+
 // ../core/src/parser.ts
 function parseRouteKey(routeKey) {
   const match = routeKey.match(/^(GET|POST|PUT|DELETE|PATCH|HEAD|OPTIONS) (.+)$/);
@@ -17928,7 +18104,7 @@ async function runPluginPipeline(plugins, context, initialResponse, logger) {
     logger.log("pipeline", `Processing plugin: ${plugin.name}`);
     try {
       const result = await plugin.process(currentContext, response);
-      if (!result || !result.context) {
+      if (!result?.context) {
         throw new Error(`Plugin ${plugin.name} didn't return valid result`);
       }
       currentContext = result.context;
@@ -18078,6 +18254,7 @@ class CallableMockInstance {
   callableRef;
   server;
   serverInfo;
+  interceptHandle = null;
   listeners = new Map;
   constructor(globalConfig = {}) {
     this.globalConfig = globalConfig;
@@ -18210,6 +18387,8 @@ class CallableMockInstance {
     }
   }
   reset() {
+    this.interceptHandle?.restore();
+    this.interceptHandle = null;
     this.close();
     this.routes = [];
     this.staticRoutes.clear();
@@ -18280,11 +18459,19 @@ class CallableMockInstance {
     if (!this.server) {
       return;
     }
+    this.server.closeAllConnections();
     this.server.close();
     this.server = undefined;
     this.serverInfo = undefined;
     this.logger.log("server", "Server stopped");
   }
+  intercept(options) {
+    if (this.interceptHandle?.active) {
+      throw new SchmockError("Already intercepting. Call restore() first.", "ALREADY_INTERCEPTING");
+    }
+    this.interceptHandle = createFetchInterceptor((method, path, opts) => this.handle(method, path, opts), options);
+    return this.interceptHandle;
+  }
   async handle(method, path, options) {
     const handleStart = performance.now();
     const requestId = this.globalConfig.debug ? crypto.randomUUID() : "";
@@ -18475,13 +18662,14 @@ function schmock(config) {
     getRoutes: instance.getRoutes.bind(instance),
     getState: instance.getState.bind(instance),
     listen: instance.listen.bind(instance),
-    close: instance.close.bind(instance)
+    close: instance.close.bind(instance),
+    intercept: (options) => instance.intercept(options)
   });
   instance.setCallableRef(callableInstance);
   return callableInstance;
 }
 // ../openapi/package.json
-var version = "1.13.0";
+var version = "2.0.1";
 
 // ../openapi/src/utils.ts
 function isRecord(value) {
@@ -18499,14 +18687,16 @@ function getRouteCallbacks(route) {
 function fireCallbacks(callbacks, context, response) {
   for (const callback of callbacks) {
     const url = resolveCallbackUrl(callback.urlExpression, context, response);
-    if (!url || !url.startsWith("http"))
+    if (!url?.startsWith("http"))
       continue;
     const body = Array.isArray(response) ? response[1] : response;
     fetch(url, {
       method: callback.method,
       headers: { "content-type": "application/json" },
       body: body !== undefined ? JSON.stringify(body) : undefined
-    }).catch(() => {});
+    }).catch((error) => {
+      console.warn(`[@schmock/openapi] Callback ${callback.method} ${url} failed:`, error instanceof Error ? error.message : error);
+    });
   }
 }
 function resolveCallbackUrl(expression, context, response) {
@@ -18552,7 +18742,6 @@ function resolveJsonPointer(obj, pointer) {
 
 // ../openapi/src/generators.ts
 import { randomUUID } from "node:crypto";
-
 // ../faker/src/constants.ts
 var MAX_ARRAY_SIZE = 1e4;
 var MAX_NESTING_DEPTH = 10;
@@ -22437,7 +22626,9 @@ function determineArrayCount(schema, explicitCount, random = Math.random) {
     return explicitCount;
   }
   if (schema.minItems !== undefined && schema.maxItems !== undefined) {
-    return Math.floor(random() * (schema.maxItems - schema.minItems + 1)) + schema.minItems;
+    const min = schema.minItems;
+    const max = Math.max(min, schema.maxItems);
+    return Math.floor(random() * (max - min + 1)) + min;
   }
   if (schema.minItems !== undefined) {
     return Math.max(schema.minItems, DEFAULT_ARRAY_COUNT);
@@ -22450,6 +22641,8 @@ function determineArrayCount(schema, explicitCount, random = Math.random) {
 function applyOverrides(data, overrides, params, state, query) {
   if (!overrides)
     return data;
+  if (typeof data !== "object" || data === null)
+    return data;
   const result = structuredClone(data);
   for (const [key, value] of Object.entries(overrides)) {
     if (DANGEROUS_KEYS.has(key))
@@ -22458,10 +22651,11 @@ function applyOverrides(data, overrides, params, state, query) {
       setNestedProperty(result, key, value, { params, state, query });
     } else {
       if (typeof value === "object" && value !== null && !Array.isArray(value)) {
+        const nested = value;
         if (result[key] && typeof result[key] === "object") {
-          result[key] = applyOverrides(result[key], value, params, state, query);
+          result[key] = applyOverrides(result[key], nested, params, state, query);
         } else {
-          result[key] = applyOverrides({}, value, params, state, query);
+          result[key] = applyOverrides({}, nested, params, state, query);
         }
       } else if (typeof value === "string" && value.includes("{{")) {
         result[key] = processTemplate(value, { params, state, query });
@@ -22493,34 +22687,28 @@ function setNestedProperty(obj, path, value, context) {
     current[finalKey] = value;
   }
 }
+function resolveTemplatePath(context, expression) {
+  const parts = expression.trim().split(".");
+  let result = context;
+  for (const part of parts) {
+    if (result && typeof result === "object") {
+      result = result[part];
+    } else {
+      return;
+    }
+  }
+  return result;
+}
 function processTemplate(template, context) {
   const singleTemplateMatch = template.match(/^\{\{\s*([^}]+)\s*\}\}$/);
   if (singleTemplateMatch) {
-    const expression = singleTemplateMatch[1];
-    const parts = expression.trim().split(".");
-    let result = context;
-    for (const part of parts) {
-      if (result && typeof result === "object") {
-        result = result[part];
-      } else {
-        return template;
-      }
-    }
+    const result = resolveTemplatePath(context, singleTemplateMatch[1]);
     return result !== undefined ? result : template;
   }
-  const processed = template.replace(/\{\{\s*([^}]+)\s*\}\}/g, (match, expression) => {
-    const parts = expression.trim().split(".");
-    let result = context;
-    for (const part of parts) {
-      if (result && typeof result === "object") {
-        result = result[part];
-      } else {
-        return match;
-      }
-    }
+  return template.replace(/\{\{\s*([^}]+)\s*\}\}/g, (match, expression) => {
+    const result = resolveTemplatePath(context, expression);
     return result !== undefined ? String(result) : match;
   });
-  return processed;
 }
 
 // ../faker/src/field-mappings.ts
@@ -23992,7 +24180,6 @@ function enhanceFieldSchema(fieldName, fieldSchema) {
 async function generateFromSchema(options) {
   const { schema, count, overrides, params, state, query, seed } = options;
   validateSchema(schema);
-  let generated;
   if (schema.type === "array" && schema.items) {
     const itemCount = determineArrayCount(schema, count);
     if (itemCount > MAX_ARRAY_SIZE) {
@@ -24004,38 +24191,39 @@ async function generateFromSchema(options) {
     }
     const itemSchema = rawItemSchema;
     const enhancedItemSchema = enhanceSchemaWithSmartMapping(itemSchema);
-    generated = [];
+    const items = [];
     for (let i3 = 0;i3 < itemCount; i3++) {
       let item = await generateWithJsf(enhancedItemSchema, seed);
       item = postProcessGenerated(item, enhancedItemSchema);
       item = applyOverrides(item, overrides, params, state, query);
-      generated.push(item);
+      items.push(item);
     }
-  } else {
-    const enhancedSchema = enhanceSchemaWithSmartMapping(schema);
-    generated = await generateWithJsf(enhancedSchema, seed);
-    generated = postProcessGenerated(generated, enhancedSchema);
-    generated = applyOverrides(generated, overrides, params, state, query);
+    return items;
   }
+  const enhancedSchema = enhanceSchemaWithSmartMapping(schema);
+  let generated = await generateWithJsf(enhancedSchema, seed);
+  generated = postProcessGenerated(generated, enhancedSchema);
+  generated = applyOverrides(generated, overrides, params, state, query);
   return generated;
 }
 function postProcessGenerated(data, schema) {
   if (data === null || data === undefined || !schema || typeof schema !== "object") {
     return data;
   }
-  const schemaAny = schema;
-  if (schemaAny.schmockNullable === true) {
+  const schemaExt = schema;
+  if (schemaExt.schmockNullable === true) {
     if (Math.random() < NULLABLE_NULL_PROBABILITY) {
       return null;
     }
   }
-  if (schema.type === "boolean" && typeof schemaAny.schmockTrueProbability === "number") {
-    return Math.random() < schemaAny.schmockTrueProbability;
+  if (schema.type === "boolean" && typeof schemaExt.schmockTrueProbability === "number") {
+    return Math.random() < schemaExt.schmockTrueProbability;
   }
   if (typeof data === "object" && !Array.isArray(data) && schema.properties) {
+    const record = data;
     for (const [key, propSchema] of Object.entries(schema.properties)) {
-      if (key in data && isJSONSchema7(propSchema)) {
-        data[key] = postProcessGenerated(data[key], propSchema);
+      if (key in record && isJSONSchema7(propSchema)) {
+        record[key] = postProcessGenerated(record[key], propSchema);
       }
     }
   }
@@ -24296,7 +24484,9 @@ async function generateErrorResponse(status, meta) {
     try {
       const body = await generateFromSchema({ schema: errorSchema });
       return toTuple(status, body);
-    } catch {}
+    } catch (error) {
+      console.warn(`[@schmock/openapi] Error schema generation failed for status ${status}:`, error instanceof Error ? error.message : error);
+    }
   }
   const defaults = {
     404: { error: "Not found", code: "NOT_FOUND" },
@@ -24308,7 +24498,8 @@ async function generateErrorResponse(status, meta) {
 async function generateWrapperSkeleton(schema) {
   try {
     return await generateFromSchema({ schema });
-  } catch {
+  } catch (error) {
+    console.warn("[@schmock/openapi] Wrapper skeleton generation failed:", error instanceof Error ? error.message : error);
     return {};
   }
 }
@@ -24887,7 +25078,7 @@ async function parseSpec(source) {
   }
   const isSwagger2 = "swagger" in api && typeof api.swagger === "string";
   const title = api.info?.title ?? "Untitled";
-  const version2 = api.info?.version ?? "0.0.0";
+  const version3 = api.info?.version ?? "0.0.0";
   let basePath = "";
   if (isSwagger2 && "basePath" in api) {
     const bp = api.basePath;
@@ -24912,7 +25103,7 @@ async function parseSpec(source) {
   const paths = [];
   const rawPaths = "paths" in api && isRecord(api.paths) ? api.paths : undefined;
   if (!rawPaths) {
-    return { title, version: version2, basePath, paths, securitySchemes, globalSecurity };
+    return { title, version: version3, basePath, paths, securitySchemes, globalSecurity };
   }
   for (const [pathTemplate, pathItemRaw] of Object.entries(rawPaths)) {
     if (!isRecord(pathItemRaw))
@@ -24953,7 +25144,7 @@ async function parseSpec(source) {
       });
     }
   }
-  return { title, version: version2, basePath, paths, securitySchemes, globalSecurity };
+  return { title, version: version3, basePath, paths, securitySchemes, globalSecurity };
 }
 function isValidParamLocation(location2, isSwagger2) {
   const validLocations = isSwagger2 ? ["path", "query", "header", "body"] : ["path", "query", "header"];
@@ -25484,7 +25675,8 @@ async function generateResponseBody(schema, seed, onSchema, context) {
   }
   try {
     return await generateFromSchema({ schema: finalSchema, seed });
-  } catch {
+  } catch (error) {
+    console.warn("[@schmock/openapi] Response body generation failed:", error instanceof Error ? error.message : error);
     return {};
   }
 }
@@ -25698,7 +25890,15 @@ async function createCliServer(options) {
     collectBody(req, headers).then((body) => mock.handle(method, path, { headers, body, query }).then((schmockResponse) => {
       const extra = cors ? CORS_HEADERS : undefined;
       writeSchmockResponse(res, schmockResponse, extra);
-    }));
+    })).catch((error) => {
+      if (!res.headersSent) {
+        res.writeHead(500, { "content-type": "application/json" });
+      }
+      res.end(JSON.stringify({
+        error: error instanceof Error ? error.message : "Internal Server Error",
+        code: "SERVER_ERROR"
+      }));
+    });
   });
   return new Promise((resolve, reject) => {
     httpServer.on("error", reject);
@@ -25716,6 +25916,13 @@ async function createCliServer(options) {
     });
   });
 }
+function validatePort(value) {
+  const port = Number(value);
+  if (!Number.isInteger(port) || port < 0 || port > 65535) {
+    throw new Error(`Invalid port "${value}". Port must be an integer between 0 and 65535.`);
+  }
+  return port;
+}
 function parseCliArgs(args) {
   const { values, positionals } = parseArgs({
     args,
@@ -25738,7 +25945,7 @@ function parseCliArgs(args) {
   const spec = values.spec ?? positionals[0] ?? "";
   return {
     spec,
-    port: values.port ? Number(values.port) : undefined,
+    port: values.port ? validatePort(values.port) : undefined,
     hostname: values.hostname,
     seed: values.seed,
     cors: values.cors,

package/dist/cli.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAaxC,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED,MAAM,WAAW,SAAS;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,IAAI,IAAI,CAAC;CACf;AA0ED,wBAAsB,eAAe,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,SAAS,CAAC,CA0E7E;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,UAAU,GAAG;IAAE,IAAI,EAAE,OAAO,CAAA;CAAE,CAqC3E;AAqBD,MAAM,WAAW,WAAW;IAC1B,KAAK,IAAI,IAAI,CAAC;CACf;AAED;;GAEG;AACH,wBAAsB,YAAY,CAChC,OAAO,EAAE,SAAS,EAClB,OAAO,EAAE,UAAU,GAClB,OAAO,CAAC,SAAS,CAAC,CAQpB;AAED;;GAEG;AACH,wBAAgB,UAAU,CACxB,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,UAAU,EACnB,gBAAgB,EAAE,MAAM,SAAS,EACjC,QAAQ,EAAE,CAAC,MAAM,EAAE,SAAS,KAAK,IAAI,GACpC,WAAW,CA2Bb;AAED,wBAAsB,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAiDvD"}
+{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAaxC,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED,MAAM,WAAW,SAAS;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,IAAI,IAAI,CAAC;CACf;AA0ED,wBAAsB,eAAe,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,SAAS,CAAC,CAuF7E;AAYD,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,UAAU,GAAG;IAAE,IAAI,EAAE,OAAO,CAAA;CAAE,CAqC3E;AAqBD,MAAM,WAAW,WAAW;IAC1B,KAAK,IAAI,IAAI,CAAC;CACf;AAED;;GAEG;AACH,wBAAsB,YAAY,CAChC,OAAO,EAAE,SAAS,EAClB,OAAO,EAAE,UAAU,GAClB,OAAO,CAAC,SAAS,CAAC,CAQpB;AAED;;GAEG;AACH,wBAAgB,UAAU,CACxB,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,UAAU,EACnB,gBAAgB,EAAE,MAAM,SAAS,EACjC,QAAQ,EAAE,CAAC,MAAM,EAAE,SAAS,KAAK,IAAI,GACpC,WAAW,CA2Bb;AAED,wBAAsB,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAiDvD"}

package/dist/cli.js

@@ -92,12 +92,22 @@ export async function createCliServer(options) {
         const method = toHttpMethod(req.method ?? "GET");
         const headers = parseNodeHeaders(req);
         const query = parseNodeQuery(url);
-        void collectBody(req, headers).then((body) => mock
+        void collectBody(req, headers)
+            .then((body) => mock
             .handle(method, path, { headers, body, query })
             .then((schmockResponse) => {
             const extra = cors ? CORS_HEADERS : undefined;
             writeSchmockResponse(res, schmockResponse, extra);
-        }));
+        }))
+            .catch((error) => {
+            if (!res.headersSent) {
+                res.writeHead(500, { "content-type": "application/json" });
+            }
+            res.end(JSON.stringify({
+                error: error instanceof Error ? error.message : "Internal Server Error",
+                code: "SERVER_ERROR",
+            }));
+        });
     });
     return new Promise((resolve, reject) => {
         httpServer.on("error", reject);
@@ -115,6 +125,13 @@ export async function createCliServer(options) {
         });
     });
 }
+function validatePort(value) {
+    const port = Number(value);
+    if (!Number.isInteger(port) || port < 0 || port > 65535) {
+        throw new Error(`Invalid port "${value}". Port must be an integer between 0 and 65535.`);
+    }
+    return port;
+}
 export function parseCliArgs(args) {
     const { values, positionals } = parseArgs({
         args,
@@ -137,7 +154,7 @@ export function parseCliArgs(args) {
     const spec = values.spec ?? positionals[0] ?? "";
     return {
         spec,
-        port: values.port ? Number(values.port) : undefined,
+        port: values.port ? validatePort(values.port) : undefined,
         hostname: values.hostname,
         seed: values.seed,
         cors: values.cors,

package/dist/index.js

@@ -17734,6 +17734,7 @@ import { parseArgs } from "node:util";
 import { createServer } from "node:http";
 
 // ../core/src/constants.ts
+var ROUTE_NOT_FOUND_CODE = "ROUTE_NOT_FOUND";
 var HTTP_METHODS = [
   "GET",
   "POST",
@@ -17760,6 +17761,10 @@ function toRouteKey(method, path) {
   const key = `${method} ${path}`;
   return key;
 }
+function isRouteNotFound(response) {
+  const { status, body } = response;
+  return status === 404 && body !== null && typeof body === "object" && "code" in body && body.code === ROUTE_NOT_FOUND_CODE;
+}
 function isStatusTuple(value) {
   return Array.isArray(value) && (value.length === 2 || value.length === 3) && typeof value[0] === "number" && value[0] >= 100 && value[0] <= 599;
 }
@@ -17893,6 +17898,177 @@ function writeSchmockResponse(res, response, extraHeaders) {
   res.end(responseBody);
 }
 
+// ../core/src/interceptor.ts
+function extractPathname(url) {
+  const queryStart = url.indexOf("?");
+  const urlWithoutQuery = queryStart === -1 ? url : url.slice(0, queryStart);
+  if (urlWithoutQuery.includes("://")) {
+    try {
+      return new URL(urlWithoutQuery).pathname;
+    } catch {}
+  }
+  if (!urlWithoutQuery.startsWith("/")) {
+    return `/${urlWithoutQuery}`;
+  }
+  return urlWithoutQuery;
+}
+function extractQuery(url) {
+  const queryStart = url.indexOf("?");
+  if (queryStart === -1)
+    return {};
+  const params = new URLSearchParams(url.slice(queryStart + 1));
+  const result = {};
+  params.forEach((value, key) => {
+    result[key] = value;
+  });
+  return result;
+}
+function extractHeaders(input, init) {
+  const headers = {};
+  const raw = init?.headers ?? (input instanceof Request ? input.headers : undefined);
+  if (!raw)
+    return headers;
+  if (raw instanceof Headers) {
+    raw.forEach((value, key) => {
+      headers[key] = value;
+    });
+  } else if (Array.isArray(raw)) {
+    for (const [key, value] of raw) {
+      headers[key.toLowerCase()] = value;
+    }
+  } else {
+    for (const key of Object.keys(raw)) {
+      headers[key.toLowerCase()] = raw[key];
+    }
+  }
+  return headers;
+}
+async function extractBody(input, init) {
+  const bodyInit = init?.body ?? (input instanceof Request ? input.body : null);
+  if (bodyInit === null || bodyInit === undefined)
+    return;
+  if (typeof bodyInit === "string") {
+    try {
+      return JSON.parse(bodyInit);
+    } catch {
+      return bodyInit;
+    }
+  }
+  if (bodyInit instanceof URLSearchParams) {
+    const result = {};
+    bodyInit.forEach((value, key) => {
+      result[key] = value;
+    });
+    return result;
+  }
+  if (input instanceof Request && !init?.body && input.body) {
+    try {
+      return await input.clone().json();
+    } catch {
+      try {
+        return await input.clone().text();
+      } catch {
+        return;
+      }
+    }
+  }
+  return;
+}
+function createFetchInterceptor(handle, options = {}) {
+  const {
+    baseUrl,
+    passthrough = true,
+    beforeRequest,
+    beforeResponse,
+    errorFormatter
+  } = options;
+  const originalFetch = globalThis.fetch;
+  let active = true;
+  globalThis.fetch = async (input, init) => {
+    const urlString = input instanceof Request ? input.url : input instanceof URL ? input.href : input;
+    const path = extractPathname(urlString);
+    if (baseUrl) {
+      const normalizedBase = baseUrl.endsWith("/") ? baseUrl.slice(0, -1) : baseUrl;
+      const isMatch = path === normalizedBase || path.startsWith(`${normalizedBase}/`);
+      if (!isMatch) {
+        return originalFetch(input, init);
+      }
+    }
+    const method = input instanceof Request ? input.method : init?.method ?? "GET";
+    const headers = extractHeaders(input, init);
+    const query = extractQuery(urlString);
+    const body = await extractBody(input, init);
+    let adapterRequest = {
+      method,
+      path,
+      headers,
+      body,
+      query
+    };
+    try {
+      if (beforeRequest) {
+        const modified = await beforeRequest(adapterRequest);
+        if (modified) {
+          adapterRequest = modified;
+        }
+      }
+      const schmockResponse = await handle(toHttpMethod(adapterRequest.method), adapterRequest.path, {
+        headers: adapterRequest.headers,
+        body: adapterRequest.body,
+        query: adapterRequest.query
+      });
+      if (isRouteNotFound(schmockResponse)) {
+        if (passthrough) {
+          return originalFetch(input, init);
+        }
+        return new Response(JSON.stringify({
+          error: "No matching mock route found",
+          code: "ROUTE_NOT_FOUND"
+        }), {
+          status: 404,
+          headers: { "content-type": "application/json" }
+        });
+      }
+      let response = schmockResponse;
+      if (beforeResponse) {
+        const modified = await beforeResponse(response, adapterRequest);
+        if (modified) {
+          response = modified;
+        }
+      }
+      const responseHeaders = new Headers(response.headers);
+      if (!responseHeaders.has("content-type") && response.body !== null && response.body !== undefined) {
+        responseHeaders.set("content-type", "application/json");
+      }
+      const responseBody = response.body === null || response.body === undefined ? null : typeof response.body === "string" ? response.body : JSON.stringify(response.body);
+      return new Response(responseBody, {
+        status: response.status,
+        headers: responseHeaders
+      });
+    } catch (error) {
+      if (errorFormatter) {
+        const formatted = errorFormatter(error instanceof Error ? error : new Error(String(error)));
+        return new Response(JSON.stringify(formatted), {
+          status: 500,
+          headers: { "content-type": "application/json" }
+        });
+      }
+      throw error;
+    }
+  };
+  return {
+    restore() {
+      if (active) {
+        globalThis.fetch = originalFetch;
+        active = false;
+      }
+    },
+    get active() {
+      return active;
+    }
+  };
+}
+
 // ../core/src/parser.ts
 function parseRouteKey(routeKey) {
   const match = routeKey.match(/^(GET|POST|PUT|DELETE|PATCH|HEAD|OPTIONS) (.+)$/);
@@ -17927,7 +18103,7 @@ async function runPluginPipeline(plugins, context, initialResponse, logger) {
     logger.log("pipeline", `Processing plugin: ${plugin.name}`);
     try {
       const result = await plugin.process(currentContext, response);
-      if (!result || !result.context) {
+      if (!result?.context) {
         throw new Error(`Plugin ${plugin.name} didn't return valid result`);
       }
       currentContext = result.context;
@@ -18077,6 +18253,7 @@ class CallableMockInstance {
   callableRef;
   server;
   serverInfo;
+  interceptHandle = null;
   listeners = new Map;
   constructor(globalConfig = {}) {
     this.globalConfig = globalConfig;
@@ -18209,6 +18386,8 @@ class CallableMockInstance {
     }
   }
   reset() {
+    this.interceptHandle?.restore();
+    this.interceptHandle = null;
     this.close();
     this.routes = [];
     this.staticRoutes.clear();
@@ -18279,11 +18458,19 @@ class CallableMockInstance {
     if (!this.server) {
       return;
     }
+    this.server.closeAllConnections();
     this.server.close();
     this.server = undefined;
     this.serverInfo = undefined;
     this.logger.log("server", "Server stopped");
   }
+  intercept(options) {
+    if (this.interceptHandle?.active) {
+      throw new SchmockError("Already intercepting. Call restore() first.", "ALREADY_INTERCEPTING");
+    }
+    this.interceptHandle = createFetchInterceptor((method, path, opts) => this.handle(method, path, opts), options);
+    return this.interceptHandle;
+  }
   async handle(method, path, options) {
     const handleStart = performance.now();
     const requestId = this.globalConfig.debug ? crypto.randomUUID() : "";
@@ -18474,13 +18661,14 @@ function schmock(config) {
     getRoutes: instance.getRoutes.bind(instance),
     getState: instance.getState.bind(instance),
     listen: instance.listen.bind(instance),
-    close: instance.close.bind(instance)
+    close: instance.close.bind(instance),
+    intercept: (options) => instance.intercept(options)
   });
   instance.setCallableRef(callableInstance);
   return callableInstance;
 }
 // ../openapi/package.json
-var version = "1.13.0";
+var version = "2.0.1";
 
 // ../openapi/src/utils.ts
 function isRecord(value) {
@@ -18498,14 +18686,16 @@ function getRouteCallbacks(route) {
 function fireCallbacks(callbacks, context, response) {
   for (const callback of callbacks) {
     const url = resolveCallbackUrl(callback.urlExpression, context, response);
-    if (!url || !url.startsWith("http"))
+    if (!url?.startsWith("http"))
       continue;
     const body = Array.isArray(response) ? response[1] : response;
     fetch(url, {
       method: callback.method,
       headers: { "content-type": "application/json" },
       body: body !== undefined ? JSON.stringify(body) : undefined
-    }).catch(() => {});
+    }).catch((error) => {
+      console.warn(`[@schmock/openapi] Callback ${callback.method} ${url} failed:`, error instanceof Error ? error.message : error);
+    });
   }
 }
 function resolveCallbackUrl(expression, context, response) {
@@ -18551,7 +18741,6 @@ function resolveJsonPointer(obj, pointer) {
 
 // ../openapi/src/generators.ts
 import { randomUUID } from "node:crypto";
-
 // ../faker/src/constants.ts
 var MAX_ARRAY_SIZE = 1e4;
 var MAX_NESTING_DEPTH = 10;
@@ -22436,7 +22625,9 @@ function determineArrayCount(schema, explicitCount, random = Math.random) {
     return explicitCount;
   }
   if (schema.minItems !== undefined && schema.maxItems !== undefined) {
-    return Math.floor(random() * (schema.maxItems - schema.minItems + 1)) + schema.minItems;
+    const min = schema.minItems;
+    const max = Math.max(min, schema.maxItems);
+    return Math.floor(random() * (max - min + 1)) + min;
   }
   if (schema.minItems !== undefined) {
     return Math.max(schema.minItems, DEFAULT_ARRAY_COUNT);
@@ -22449,6 +22640,8 @@ function determineArrayCount(schema, explicitCount, random = Math.random) {
 function applyOverrides(data, overrides, params, state, query) {
   if (!overrides)
     return data;
+  if (typeof data !== "object" || data === null)
+    return data;
   const result = structuredClone(data);
   for (const [key, value] of Object.entries(overrides)) {
     if (DANGEROUS_KEYS.has(key))
@@ -22457,10 +22650,11 @@ function applyOverrides(data, overrides, params, state, query) {
       setNestedProperty(result, key, value, { params, state, query });
     } else {
       if (typeof value === "object" && value !== null && !Array.isArray(value)) {
+        const nested = value;
         if (result[key] && typeof result[key] === "object") {
-          result[key] = applyOverrides(result[key], value, params, state, query);
+          result[key] = applyOverrides(result[key], nested, params, state, query);
         } else {
-          result[key] = applyOverrides({}, value, params, state, query);
+          result[key] = applyOverrides({}, nested, params, state, query);
         }
       } else if (typeof value === "string" && value.includes("{{")) {
         result[key] = processTemplate(value, { params, state, query });
@@ -22492,34 +22686,28 @@ function setNestedProperty(obj, path, value, context) {
     current[finalKey] = value;
   }
 }
+function resolveTemplatePath(context, expression) {
+  const parts = expression.trim().split(".");
+  let result = context;
+  for (const part of parts) {
+    if (result && typeof result === "object") {
+      result = result[part];
+    } else {
+      return;
+    }
+  }
+  return result;
+}
 function processTemplate(template, context) {
   const singleTemplateMatch = template.match(/^\{\{\s*([^}]+)\s*\}\}$/);
   if (singleTemplateMatch) {
-    const expression = singleTemplateMatch[1];
-    const parts = expression.trim().split(".");
-    let result = context;
-    for (const part of parts) {
-      if (result && typeof result === "object") {
-        result = result[part];
-      } else {
-        return template;
-      }
-    }
+    const result = resolveTemplatePath(context, singleTemplateMatch[1]);
     return result !== undefined ? result : template;
   }
-  const processed = template.replace(/\{\{\s*([^}]+)\s*\}\}/g, (match, expression) => {
-    const parts = expression.trim().split(".");
-    let result = context;
-    for (const part of parts) {
-      if (result && typeof result === "object") {
-        result = result[part];
-      } else {
-        return match;
-      }
-    }
+  return template.replace(/\{\{\s*([^}]+)\s*\}\}/g, (match, expression) => {
+    const result = resolveTemplatePath(context, expression);
     return result !== undefined ? String(result) : match;
   });
-  return processed;
 }
 
 // ../faker/src/field-mappings.ts
@@ -23991,7 +24179,6 @@ function enhanceFieldSchema(fieldName, fieldSchema) {
 async function generateFromSchema(options) {
   const { schema, count, overrides, params, state, query, seed } = options;
   validateSchema(schema);
-  let generated;
   if (schema.type === "array" && schema.items) {
     const itemCount = determineArrayCount(schema, count);
     if (itemCount > MAX_ARRAY_SIZE) {
@@ -24003,38 +24190,39 @@ async function generateFromSchema(options) {
     }
     const itemSchema = rawItemSchema;
     const enhancedItemSchema = enhanceSchemaWithSmartMapping(itemSchema);
-    generated = [];
+    const items = [];
     for (let i3 = 0;i3 < itemCount; i3++) {
       let item = await generateWithJsf(enhancedItemSchema, seed);
       item = postProcessGenerated(item, enhancedItemSchema);
       item = applyOverrides(item, overrides, params, state, query);
-      generated.push(item);
+      items.push(item);
     }
-  } else {
-    const enhancedSchema = enhanceSchemaWithSmartMapping(schema);
-    generated = await generateWithJsf(enhancedSchema, seed);
-    generated = postProcessGenerated(generated, enhancedSchema);
-    generated = applyOverrides(generated, overrides, params, state, query);
+    return items;
   }
+  const enhancedSchema = enhanceSchemaWithSmartMapping(schema);
+  let generated = await generateWithJsf(enhancedSchema, seed);
+  generated = postProcessGenerated(generated, enhancedSchema);
+  generated = applyOverrides(generated, overrides, params, state, query);
   return generated;
 }
 function postProcessGenerated(data, schema) {
   if (data === null || data === undefined || !schema || typeof schema !== "object") {
     return data;
   }
-  const schemaAny = schema;
-  if (schemaAny.schmockNullable === true) {
+  const schemaExt = schema;
+  if (schemaExt.schmockNullable === true) {
     if (Math.random() < NULLABLE_NULL_PROBABILITY) {
       return null;
     }
   }
-  if (schema.type === "boolean" && typeof schemaAny.schmockTrueProbability === "number") {
-    return Math.random() < schemaAny.schmockTrueProbability;
+  if (schema.type === "boolean" && typeof schemaExt.schmockTrueProbability === "number") {
+    return Math.random() < schemaExt.schmockTrueProbability;
   }
   if (typeof data === "object" && !Array.isArray(data) && schema.properties) {
+    const record = data;
     for (const [key, propSchema] of Object.entries(schema.properties)) {
-      if (key in data && isJSONSchema7(propSchema)) {
-        data[key] = postProcessGenerated(data[key], propSchema);
+      if (key in record && isJSONSchema7(propSchema)) {
+        record[key] = postProcessGenerated(record[key], propSchema);
       }
     }
   }
@@ -24295,7 +24483,9 @@ async function generateErrorResponse(status, meta) {
     try {
       const body = await generateFromSchema({ schema: errorSchema });
       return toTuple(status, body);
-    } catch {}
+    } catch (error) {
+      console.warn(`[@schmock/openapi] Error schema generation failed for status ${status}:`, error instanceof Error ? error.message : error);
+    }
   }
   const defaults = {
     404: { error: "Not found", code: "NOT_FOUND" },
@@ -24307,7 +24497,8 @@ async function generateErrorResponse(status, meta) {
 async function generateWrapperSkeleton(schema) {
   try {
     return await generateFromSchema({ schema });
-  } catch {
+  } catch (error) {
+    console.warn("[@schmock/openapi] Wrapper skeleton generation failed:", error instanceof Error ? error.message : error);
     return {};
   }
 }
@@ -24886,7 +25077,7 @@ async function parseSpec(source) {
   }
   const isSwagger2 = "swagger" in api && typeof api.swagger === "string";
   const title = api.info?.title ?? "Untitled";
-  const version2 = api.info?.version ?? "0.0.0";
+  const version3 = api.info?.version ?? "0.0.0";
   let basePath = "";
   if (isSwagger2 && "basePath" in api) {
     const bp = api.basePath;
@@ -24911,7 +25102,7 @@ async function parseSpec(source) {
   const paths = [];
   const rawPaths = "paths" in api && isRecord(api.paths) ? api.paths : undefined;
   if (!rawPaths) {
-    return { title, version: version2, basePath, paths, securitySchemes, globalSecurity };
+    return { title, version: version3, basePath, paths, securitySchemes, globalSecurity };
   }
   for (const [pathTemplate, pathItemRaw] of Object.entries(rawPaths)) {
     if (!isRecord(pathItemRaw))
@@ -24952,7 +25143,7 @@ async function parseSpec(source) {
       });
     }
   }
-  return { title, version: version2, basePath, paths, securitySchemes, globalSecurity };
+  return { title, version: version3, basePath, paths, securitySchemes, globalSecurity };
 }
 function isValidParamLocation(location2, isSwagger2) {
   const validLocations = isSwagger2 ? ["path", "query", "header", "body"] : ["path", "query", "header"];
@@ -25483,7 +25674,8 @@ async function generateResponseBody(schema, seed, onSchema, context) {
   }
   try {
     return await generateFromSchema({ schema: finalSchema, seed });
-  } catch {
+  } catch (error) {
+    console.warn("[@schmock/openapi] Response body generation failed:", error instanceof Error ? error.message : error);
     return {};
   }
 }
@@ -25697,7 +25889,15 @@ async function createCliServer(options) {
     collectBody(req, headers).then((body) => mock.handle(method, path, { headers, body, query }).then((schmockResponse) => {
       const extra = cors ? CORS_HEADERS : undefined;
       writeSchmockResponse(res, schmockResponse, extra);
-    }));
+    })).catch((error) => {
+      if (!res.headersSent) {
+        res.writeHead(500, { "content-type": "application/json" });
+      }
+      res.end(JSON.stringify({
+        error: error instanceof Error ? error.message : "Internal Server Error",
+        code: "SERVER_ERROR"
+      }));
+    });
   });
   return new Promise((resolve, reject) => {
     httpServer.on("error", reject);
@@ -25715,6 +25915,13 @@ async function createCliServer(options) {
     });
   });
 }
+function validatePort(value) {
+  const port = Number(value);
+  if (!Number.isInteger(port) || port < 0 || port > 65535) {
+    throw new Error(`Invalid port "${value}". Port must be an integer between 0 and 65535.`);
+  }
+  return port;
+}
 function parseCliArgs(args) {
   const { values, positionals } = parseArgs({
     args,
@@ -25737,7 +25944,7 @@ function parseCliArgs(args) {
   const spec = values.spec ?? positionals[0] ?? "";
   return {
     spec,
-    port: values.port ? Number(values.port) : undefined,
+    port: values.port ? validatePort(values.port) : undefined,
     hostname: values.hostname,
     seed: values.seed,
     cors: values.cors,

package/package.json

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