@schmock/cli 1.4.0 → 1.8.0

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;AAOxC,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,CA0H7E;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,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"}

package/dist/cli.js

@@ -2,7 +2,7 @@
 import { readFileSync, watch } from "node:fs";
 import { createServer } from "node:http";
 import { parseArgs } from "node:util";
-import { schmock, toHttpMethod } from "@schmock/core";
+import { collectBody, parseNodeHeaders, parseNodeQuery, schmock, toHttpMethod, writeSchmockResponse, } from "@schmock/core";
 import { openapi } from "@schmock/openapi";
 const CORS_HEADERS = {
     "access-control-allow-origin": "*",
@@ -90,56 +90,14 @@ export async function createCliServer(options) {
             return;
         }
         const method = toHttpMethod(req.method ?? "GET");
-        const headers = {};
-        for (const [key, value] of Object.entries(req.headers)) {
-            if (typeof value === "string") {
-                headers[key] = value;
-            }
-        }
-        const query = {};
-        url.searchParams.forEach((value, key) => {
-            query[key] = value;
-        });
-        const chunks = [];
-        req.on("data", (chunk) => chunks.push(chunk));
-        req.on("end", () => {
-            const raw = Buffer.concat(chunks).toString();
-            let body;
-            const contentType = headers["content-type"] ?? "";
-            if (raw && contentType.includes("json")) {
-                try {
-                    body = JSON.parse(raw);
-                }
-                catch {
-                    body = raw;
-                }
-            }
-            else if (raw) {
-                body = raw;
-            }
-            void mock
-                .handle(method, path, { headers, body, query })
-                .then((schmockResponse) => {
-                const responseHeaders = {
-                    ...schmockResponse.headers,
-                };
-                if (cors) {
-                    Object.assign(responseHeaders, CORS_HEADERS);
-                }
-                if (!responseHeaders["content-type"] &&
-                    schmockResponse.body !== undefined &&
-                    typeof schmockResponse.body !== "string") {
-                    responseHeaders["content-type"] = "application/json";
-                }
-                const responseBody = schmockResponse.body === undefined
-                    ? undefined
-                    : typeof schmockResponse.body === "string"
-                        ? schmockResponse.body
-                        : JSON.stringify(schmockResponse.body);
-                res.writeHead(schmockResponse.status, responseHeaders);
-                res.end(responseBody);
-            });
-        });
+        const headers = parseNodeHeaders(req);
+        const query = parseNodeQuery(url);
+        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);
+        }));
     });
     return new Promise((resolve, reject) => {
         httpServer.on("error", reject);

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-#!/usr/bin/env bun
+#!/usr/bin/env node
 export type { CliOptions, CliServer } from "./cli.js";
 export { createCliServer, parseCliArgs, run } from "./cli.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/index.js

@@ -1,5 +1,4 @@
-#!/usr/bin/env bun
-// @bun
+#!/usr/bin/env node
 import { createRequire } from "node:module";
 var __create = Object.create;
 var __getProtoOf = Object.getPrototypeOf;
@@ -23256,6 +23255,59 @@ class ResourceLimitError extends SchmockError {
   }
 }
 
+// ../core/src/http-helpers.ts
+function parseNodeHeaders(req) {
+  const headers = {};
+  for (const [key, value] of Object.entries(req.headers)) {
+    if (typeof value === "string") {
+      headers[key] = value;
+    }
+  }
+  return headers;
+}
+function parseNodeQuery(url) {
+  const query = {};
+  url.searchParams.forEach((value, key) => {
+    query[key] = value;
+  });
+  return query;
+}
+function collectBody(req, headers) {
+  return new Promise((resolve) => {
+    const chunks = [];
+    req.on("data", (chunk) => chunks.push(chunk));
+    req.on("end", () => {
+      const raw = Buffer.concat(chunks).toString();
+      if (!raw) {
+        resolve(undefined);
+        return;
+      }
+      const contentType = headers["content-type"] ?? "";
+      if (contentType.includes("json")) {
+        try {
+          resolve(JSON.parse(raw));
+        } catch {
+          resolve(raw);
+        }
+      } else {
+        resolve(raw);
+      }
+    });
+  });
+}
+function writeSchmockResponse(res, response, extraHeaders) {
+  const responseHeaders = {
+    ...response.headers,
+    ...extraHeaders
+  };
+  if (!responseHeaders["content-type"] && response.body !== undefined && typeof response.body !== "string") {
+    responseHeaders["content-type"] = "application/json";
+  }
+  const responseBody = response.body === undefined ? undefined : typeof response.body === "string" ? response.body : JSON.stringify(response.body);
+  res.writeHead(response.status, responseHeaders);
+  res.end(responseBody);
+}
+
 // ../core/src/parser.ts
 function parseRouteKey(routeKey) {
   const match = routeKey.match(/^(GET|POST|PUT|DELETE|PATCH|HEAD|OPTIONS) (.+)$/);
@@ -23496,43 +23548,11 @@ class CallableMockInstance {
       const url = new URL(req.url ?? "/", `http://${req.headers.host}`);
       const method = toHttpMethod(req.method ?? "GET");
       const path = url.pathname;
-      const headers = {};
-      for (const [key, value] of Object.entries(req.headers)) {
-        if (typeof value === "string") {
-          headers[key] = value;
-        }
-      }
-      const query = {};
-      url.searchParams.forEach((value, key) => {
-        query[key] = value;
-      });
-      const chunks = [];
-      req.on("data", (chunk) => chunks.push(chunk));
-      req.on("end", () => {
-        const raw = Buffer.concat(chunks).toString();
-        let body;
-        const contentType = headers["content-type"] ?? "";
-        if (raw && contentType.includes("json")) {
-          try {
-            body = JSON.parse(raw);
-          } catch {
-            body = raw;
-          }
-        } else if (raw) {
-          body = raw;
-        }
-        this.handle(method, path, { headers, body, query }).then((schmockResponse) => {
-          const responseHeaders = {
-            ...schmockResponse.headers
-          };
-          if (!responseHeaders["content-type"] && schmockResponse.body !== undefined && typeof schmockResponse.body !== "string") {
-            responseHeaders["content-type"] = "application/json";
-          }
-          const responseBody = schmockResponse.body === undefined ? undefined : typeof schmockResponse.body === "string" ? schmockResponse.body : JSON.stringify(schmockResponse.body);
-          res.writeHead(schmockResponse.status, responseHeaders);
-          res.end(responseBody);
-        });
-      });
+      const headers = parseNodeHeaders(req);
+      const query = parseNodeQuery(url);
+      collectBody(req, headers).then((body) => this.handle(method, path, { headers, body, query }).then((schmockResponse) => {
+        writeSchmockResponse(res, schmockResponse);
+      }));
     });
     this.server = httpServer;
     return new Promise((resolve, reject) => {
@@ -33967,46 +33987,12 @@ async function createCliServer(options) {
       return;
     }
     const method = toHttpMethod(req.method ?? "GET");
-    const headers = {};
-    for (const [key, value] of Object.entries(req.headers)) {
-      if (typeof value === "string") {
-        headers[key] = value;
-      }
-    }
-    const query = {};
-    url.searchParams.forEach((value, key) => {
-      query[key] = value;
-    });
-    const chunks = [];
-    req.on("data", (chunk) => chunks.push(chunk));
-    req.on("end", () => {
-      const raw = Buffer.concat(chunks).toString();
-      let body;
-      const contentType = headers["content-type"] ?? "";
-      if (raw && contentType.includes("json")) {
-        try {
-          body = JSON.parse(raw);
-        } catch {
-          body = raw;
-        }
-      } else if (raw) {
-        body = raw;
-      }
-      mock.handle(method, path, { headers, body, query }).then((schmockResponse) => {
-        const responseHeaders = {
-          ...schmockResponse.headers
-        };
-        if (cors) {
-          Object.assign(responseHeaders, CORS_HEADERS);
-        }
-        if (!responseHeaders["content-type"] && schmockResponse.body !== undefined && typeof schmockResponse.body !== "string") {
-          responseHeaders["content-type"] = "application/json";
-        }
-        const responseBody = schmockResponse.body === undefined ? undefined : typeof schmockResponse.body === "string" ? schmockResponse.body : JSON.stringify(schmockResponse.body);
-        res.writeHead(schmockResponse.status, responseHeaders);
-        res.end(responseBody);
-      });
-    });
+    const headers = parseNodeHeaders(req);
+    const query = parseNodeQuery(url);
+    collectBody(req, headers).then((body) => mock.handle(method, path, { headers, body, query }).then((schmockResponse) => {
+      const extra = cors ? CORS_HEADERS : undefined;
+      writeSchmockResponse(res, schmockResponse, extra);
+    }));
   });
   return new Promise((resolve2, reject) => {
     httpServer.on("error", reject);

package/package.json

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