@schmock/cli 1.13.0 → 2.0.0

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,165 @@ 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 = input instanceof Request ? input.headers : init?.headers;
+  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] = value;
+    }
+  } else {
+    Object.assign(headers, raw);
+  }
+  return headers;
+}
+async function extractBody(input, init) {
+  const rawBody = input instanceof Request ? input.body : init?.body;
+  if (rawBody === null || rawBody === undefined)
+    return;
+  const bodyInit = init?.body;
+  if (typeof bodyInit === "string") {
+    try {
+      return JSON.parse(bodyInit);
+    } catch {
+      return bodyInit;
+    }
+  }
+  if (input instanceof Request && 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 && !path.startsWith(baseUrl)) {
+      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 +18092,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 +18242,7 @@ class CallableMockInstance {
   callableRef;
   server;
   serverInfo;
+  interceptHandle = null;
   listeners = new Map;
   constructor(globalConfig = {}) {
     this.globalConfig = globalConfig;
@@ -18285,6 +18450,13 @@ class CallableMockInstance {
     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 +18647,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.0";
 
 // ../openapi/src/utils.ts
 function isRecord(value) {
@@ -18499,7 +18672,7 @@ 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, {

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,165 @@ 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 = input instanceof Request ? input.headers : init?.headers;
+  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] = value;
+    }
+  } else {
+    Object.assign(headers, raw);
+  }
+  return headers;
+}
+async function extractBody(input, init) {
+  const rawBody = input instanceof Request ? input.body : init?.body;
+  if (rawBody === null || rawBody === undefined)
+    return;
+  const bodyInit = init?.body;
+  if (typeof bodyInit === "string") {
+    try {
+      return JSON.parse(bodyInit);
+    } catch {
+      return bodyInit;
+    }
+  }
+  if (input instanceof Request && 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 && !path.startsWith(baseUrl)) {
+      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 +18091,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 +18241,7 @@ class CallableMockInstance {
   callableRef;
   server;
   serverInfo;
+  interceptHandle = null;
   listeners = new Map;
   constructor(globalConfig = {}) {
     this.globalConfig = globalConfig;
@@ -18284,6 +18449,13 @@ class CallableMockInstance {
     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 +18646,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.0";
 
 // ../openapi/src/utils.ts
 function isRecord(value) {
@@ -18498,7 +18671,7 @@ 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, {

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.0",
   "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",