@schmock/cli 2.0.2 → 2.1.0

package/dist/bin.js

@@ -23820,6 +23820,26 @@ function extractPathname(url) {
   }
   return urlWithoutQuery;
 }
+function extractOrigin(url) {
+  if (!url.includes("://"))
+    return null;
+  try {
+    return new URL(url).origin;
+  } catch {
+    return null;
+  }
+}
+function parseBaseUrl(baseUrl) {
+  if (baseUrl.includes("://")) {
+    try {
+      const parsed = new URL(baseUrl);
+      const rawPath = parsed.pathname;
+      const path = rawPath === "/" ? "" : rawPath.replace(/\/$/, "");
+      return { origin: parsed.origin, path };
+    } catch {}
+  }
+  return { origin: null, path: baseUrl.replace(/\/$/, "") };
+}
 function extractQuery(url) {
   const queryStart = url.indexOf("?");
   if (queryStart === -1)
@@ -23896,10 +23916,18 @@ function createFetchInterceptor(handle, options = {}) {
     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 { origin: baseOrigin, path: basePath } = parseBaseUrl(baseUrl);
+      if (baseOrigin) {
+        const reqOrigin = extractOrigin(urlString);
+        if (reqOrigin !== baseOrigin) {
+          return originalFetch(input, init);
+        }
+      }
+      if (basePath) {
+        const isMatch = path === basePath || path.startsWith(`${basePath}/`);
+        if (!isMatch) {
+          return originalFetch(input, init);
+        }
       }
     }
     const method = input instanceof Request ? input.method : init?.method ?? "GET";
@@ -23985,14 +24013,14 @@ function parseRouteKey(routeKey) {
   }
   const [, method, path] = match;
   const params = [];
-  const paramPattern = /:([^/]+)/g;
-  let paramMatch;
-  paramMatch = paramPattern.exec(path);
-  while (paramMatch !== null) {
-    params.push(paramMatch[1]);
-    paramMatch = paramPattern.exec(path);
-  }
-  const regexPath = path.replace(/[.*+?^${}()|[\]\\]/g, "\\$&").replace(/:([^/]+)/g, "([^/]+)");
+  const regexPath = path.split(/(:[a-zA-Z0-9_-]+)/g).map((segment) => {
+    const paramMatch = segment.match(/^:([a-zA-Z0-9_-]+)$/);
+    if (paramMatch) {
+      params.push(paramMatch[1]);
+      return "([^/]+)";
+    }
+    return segment.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+  }).join("");
   const pattern = new RegExp(`^${regexPath}$`);
   return {
     method: toHttpMethod(method),
@@ -24198,6 +24226,7 @@ class CallableMockInstance {
     const existing = this.routes.find((r) => r.method === parsed.method && r.path === parsed.path);
     if (existing) {
       this.logger.log("warning", `Duplicate route: ${route} — first registration wins`);
+      return this;
     }
     const compiledRoute = {
       pattern: parsed.pattern,
@@ -24210,9 +24239,7 @@ class CallableMockInstance {
     this.routes.push(compiledRoute);
     if (parsed.params.length === 0) {
       const key = `${parsed.method} ${normalizePath(parsed.path)}`;
-      if (!this.staticRoutes.has(key)) {
-        this.staticRoutes.set(key, compiledRoute);
-      }
+      this.staticRoutes.set(key, compiledRoute);
     }
     this.logger.log("route", `Route defined: ${route}`, {
       contentType: config.contentType,
@@ -24494,6 +24521,10 @@ class CallableMockInstance {
         timestamp: Date.now(),
         response: { status: response.status, body: response.body }
       });
+      const maxHistorySize = this.globalConfig.maxHistorySize;
+      if (typeof maxHistorySize === "number" && maxHistorySize >= 0 && this.requestHistory.length > maxHistorySize) {
+        this.requestHistory.splice(0, this.requestHistory.length - maxHistorySize);
+      }
       this.emit("request:end", {
         method,
         path: requestPath,
@@ -24576,7 +24607,7 @@ function schmock(config) {
   return callableInstance;
 }
 // ../openapi/package.json
-var version = "2.0.2";
+var version = "2.1.0";
 
 // ../openapi/src/utils.ts
 function isRecord(value) {
@@ -30005,19 +30036,21 @@ function validateSchema(schema, path = "$") {
       validateSchema(schema.items, `${path}.items`);
     }
   }
-  if (hasCircularReference(schema)) {
-    throw new SchemaValidationError(path, "Schema contains circular references which are not supported");
-  }
-  const depth = calculateNestingDepth(schema);
-  if (depth > MAX_NESTING_DEPTH) {
-    throw new ResourceLimitError("schema_nesting_depth", MAX_NESTING_DEPTH, depth);
-  }
-  if (depth >= DEEP_NESTING_THRESHOLD) {
-    checkForDeepNestingWithArrays(schema, path);
-  }
-  checkArraySizeLimits(schema, path);
-  if (schema.$ref === "#") {
-    throw new SchemaValidationError(path, "Self-referencing schemas are not supported");
+  if (path === "$") {
+    if (hasCircularReference(schema)) {
+      throw new SchemaValidationError(path, "Schema contains circular references which are not supported");
+    }
+    if (schema.$ref === "#") {
+      throw new SchemaValidationError(path, "Self-referencing schemas are not supported");
+    }
+    const depth = calculateNestingDepth(schema);
+    if (depth > MAX_NESTING_DEPTH) {
+      throw new ResourceLimitError("schema_nesting_depth", MAX_NESTING_DEPTH, depth);
+    }
+    if (depth >= DEEP_NESTING_THRESHOLD) {
+      checkForDeepNestingWithArrays(schema, path);
+    }
+    checkArraySizeLimits(schema, path);
   }
 }
 function hasCircularReference(schema, currentPath = new Set) {
@@ -31636,17 +31669,21 @@ function processContentNegotiation(context) {
   }
   return;
 }
-var ajv = new import_ajv.default({ allErrors: true });
-var schemaCache = new WeakMap;
-function validateRequestBody(context) {
+function createBodyValidatorContext() {
+  return {
+    ajv: new import_ajv.default({ allErrors: true }),
+    cache: new WeakMap
+  };
+}
+function validateRequestBody(context, validatorCtx) {
   const requestBodySchema = getRouteRequestBody(context.route);
   if (!requestBodySchema || context.body === undefined) {
     return;
   }
-  let validate = schemaCache.get(requestBodySchema);
+  let validate = validatorCtx.cache.get(requestBodySchema);
   if (!validate) {
-    validate = ajv.compile(requestBodySchema);
-    schemaCache.set(requestBodySchema, validate);
+    validate = validatorCtx.ajv.compile(requestBodySchema);
+    validatorCtx.cache.set(requestBodySchema, validate);
   }
   if (!validate(context.body)) {
     const errors = validate.errors?.map((e3) => ({
@@ -31766,6 +31803,7 @@ async function openapi(options) {
   }
   const securitySchemes = spec.securitySchemes;
   const globalSecurity = spec.globalSecurity;
+  const bodyValidatorCtx = createBodyValidatorContext();
   return {
     name: "@schmock/openapi",
     version,
@@ -31827,7 +31865,7 @@ async function openapi(options) {
       if (contentResult)
         return contentResult;
       if (options.validateRequests) {
-        const validationResult = validateRequestBody(context);
+        const validationResult = validateRequestBody(context, bodyValidatorCtx);
         if (validationResult) {
           return validationResult;
         }

package/dist/index.js

@@ -23819,6 +23819,26 @@ function extractPathname(url) {
   }
   return urlWithoutQuery;
 }
+function extractOrigin(url) {
+  if (!url.includes("://"))
+    return null;
+  try {
+    return new URL(url).origin;
+  } catch {
+    return null;
+  }
+}
+function parseBaseUrl(baseUrl) {
+  if (baseUrl.includes("://")) {
+    try {
+      const parsed = new URL(baseUrl);
+      const rawPath = parsed.pathname;
+      const path = rawPath === "/" ? "" : rawPath.replace(/\/$/, "");
+      return { origin: parsed.origin, path };
+    } catch {}
+  }
+  return { origin: null, path: baseUrl.replace(/\/$/, "") };
+}
 function extractQuery(url) {
   const queryStart = url.indexOf("?");
   if (queryStart === -1)
@@ -23895,10 +23915,18 @@ function createFetchInterceptor(handle, options = {}) {
     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 { origin: baseOrigin, path: basePath } = parseBaseUrl(baseUrl);
+      if (baseOrigin) {
+        const reqOrigin = extractOrigin(urlString);
+        if (reqOrigin !== baseOrigin) {
+          return originalFetch(input, init);
+        }
+      }
+      if (basePath) {
+        const isMatch = path === basePath || path.startsWith(`${basePath}/`);
+        if (!isMatch) {
+          return originalFetch(input, init);
+        }
       }
     }
     const method = input instanceof Request ? input.method : init?.method ?? "GET";
@@ -23984,14 +24012,14 @@ function parseRouteKey(routeKey) {
   }
   const [, method, path] = match;
   const params = [];
-  const paramPattern = /:([^/]+)/g;
-  let paramMatch;
-  paramMatch = paramPattern.exec(path);
-  while (paramMatch !== null) {
-    params.push(paramMatch[1]);
-    paramMatch = paramPattern.exec(path);
-  }
-  const regexPath = path.replace(/[.*+?^${}()|[\]\\]/g, "\\$&").replace(/:([^/]+)/g, "([^/]+)");
+  const regexPath = path.split(/(:[a-zA-Z0-9_-]+)/g).map((segment) => {
+    const paramMatch = segment.match(/^:([a-zA-Z0-9_-]+)$/);
+    if (paramMatch) {
+      params.push(paramMatch[1]);
+      return "([^/]+)";
+    }
+    return segment.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+  }).join("");
   const pattern = new RegExp(`^${regexPath}$`);
   return {
     method: toHttpMethod(method),
@@ -24197,6 +24225,7 @@ class CallableMockInstance {
     const existing = this.routes.find((r) => r.method === parsed.method && r.path === parsed.path);
     if (existing) {
       this.logger.log("warning", `Duplicate route: ${route} — first registration wins`);
+      return this;
     }
     const compiledRoute = {
       pattern: parsed.pattern,
@@ -24209,9 +24238,7 @@ class CallableMockInstance {
     this.routes.push(compiledRoute);
     if (parsed.params.length === 0) {
       const key = `${parsed.method} ${normalizePath(parsed.path)}`;
-      if (!this.staticRoutes.has(key)) {
-        this.staticRoutes.set(key, compiledRoute);
-      }
+      this.staticRoutes.set(key, compiledRoute);
     }
     this.logger.log("route", `Route defined: ${route}`, {
       contentType: config.contentType,
@@ -24493,6 +24520,10 @@ class CallableMockInstance {
         timestamp: Date.now(),
         response: { status: response.status, body: response.body }
       });
+      const maxHistorySize = this.globalConfig.maxHistorySize;
+      if (typeof maxHistorySize === "number" && maxHistorySize >= 0 && this.requestHistory.length > maxHistorySize) {
+        this.requestHistory.splice(0, this.requestHistory.length - maxHistorySize);
+      }
       this.emit("request:end", {
         method,
         path: requestPath,
@@ -24575,7 +24606,7 @@ function schmock(config) {
   return callableInstance;
 }
 // ../openapi/package.json
-var version = "2.0.2";
+var version = "2.1.0";
 
 // ../openapi/src/utils.ts
 function isRecord(value) {
@@ -30004,19 +30035,21 @@ function validateSchema(schema, path = "$") {
       validateSchema(schema.items, `${path}.items`);
     }
   }
-  if (hasCircularReference(schema)) {
-    throw new SchemaValidationError(path, "Schema contains circular references which are not supported");
-  }
-  const depth = calculateNestingDepth(schema);
-  if (depth > MAX_NESTING_DEPTH) {
-    throw new ResourceLimitError("schema_nesting_depth", MAX_NESTING_DEPTH, depth);
-  }
-  if (depth >= DEEP_NESTING_THRESHOLD) {
-    checkForDeepNestingWithArrays(schema, path);
-  }
-  checkArraySizeLimits(schema, path);
-  if (schema.$ref === "#") {
-    throw new SchemaValidationError(path, "Self-referencing schemas are not supported");
+  if (path === "$") {
+    if (hasCircularReference(schema)) {
+      throw new SchemaValidationError(path, "Schema contains circular references which are not supported");
+    }
+    if (schema.$ref === "#") {
+      throw new SchemaValidationError(path, "Self-referencing schemas are not supported");
+    }
+    const depth = calculateNestingDepth(schema);
+    if (depth > MAX_NESTING_DEPTH) {
+      throw new ResourceLimitError("schema_nesting_depth", MAX_NESTING_DEPTH, depth);
+    }
+    if (depth >= DEEP_NESTING_THRESHOLD) {
+      checkForDeepNestingWithArrays(schema, path);
+    }
+    checkArraySizeLimits(schema, path);
   }
 }
 function hasCircularReference(schema, currentPath = new Set) {
@@ -31635,17 +31668,21 @@ function processContentNegotiation(context) {
   }
   return;
 }
-var ajv = new import_ajv.default({ allErrors: true });
-var schemaCache = new WeakMap;
-function validateRequestBody(context) {
+function createBodyValidatorContext() {
+  return {
+    ajv: new import_ajv.default({ allErrors: true }),
+    cache: new WeakMap
+  };
+}
+function validateRequestBody(context, validatorCtx) {
   const requestBodySchema = getRouteRequestBody(context.route);
   if (!requestBodySchema || context.body === undefined) {
     return;
   }
-  let validate = schemaCache.get(requestBodySchema);
+  let validate = validatorCtx.cache.get(requestBodySchema);
   if (!validate) {
-    validate = ajv.compile(requestBodySchema);
-    schemaCache.set(requestBodySchema, validate);
+    validate = validatorCtx.ajv.compile(requestBodySchema);
+    validatorCtx.cache.set(requestBodySchema, validate);
   }
   if (!validate(context.body)) {
     const errors = validate.errors?.map((e3) => ({
@@ -31765,6 +31802,7 @@ async function openapi(options) {
   }
   const securitySchemes = spec.securitySchemes;
   const globalSecurity = spec.globalSecurity;
+  const bodyValidatorCtx = createBodyValidatorContext();
   return {
     name: "@schmock/openapi",
     version,
@@ -31826,7 +31864,7 @@ async function openapi(options) {
       if (contentResult)
         return contentResult;
       if (options.validateRequests) {
-        const validationResult = validateRequestBody(context);
+        const validationResult = validateRequestBody(context, bodyValidatorCtx);
         if (validationResult) {
           return validationResult;
         }

package/package.json

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