counterfact 1.0.2 → 1.1.0

package/bin/counterfact.js

@@ -100,6 +100,7 @@ async function main(source, destination) {
   debug("executing the main function");
 
   const options = program.opts();
+
   const args = process.argv;
 
   const destinationPath = nodePath
@@ -108,12 +109,17 @@ async function main(source, destination) {
 
   const basePath = nodePath.resolve(destinationPath).replaceAll("\\", "/");
 
-  // If no options are provided, default to all options
-  if (!args.some((argument) => argument.startsWith("-"))) {
-    options.repl = true;
-    options.serve = true;
-    options.watch = true;
-    options.generate = true;
+  // If no action-related option is provided, default to all options
+
+  const actions = ["repl", "serve", "watch", "generate"];
+  if (
+    !Object.keys(options).some((argument) =>
+      actions.some((action) => argument.startsWith(action)),
+    )
+  ) {
+    for (const action of actions) {
+      options[action] = true;
+    }
   }
 
   debug("options: %o", options);
@@ -145,7 +151,6 @@ async function main(source, destination) {
         options.watchTypes,
     },
 
-    includeSwaggerUi: true,
     openApiPath: source,
     port: options.port,
     proxyPaths: new Map([["", Boolean(options.proxyUrl)]]),
@@ -248,7 +253,6 @@ program
   )
   .argument("[destination]", "path to generated code", ".")
   .option("-p, --port <number>", "server port number", DEFAULT_PORT)
-  .option("--swagger", "include swagger-ui")
   .option("-o, --open", "open a browser")
   .option("-g, --generate", "generate all code for both routes and types")
   .option("--generate-types", "generate types")

package/dist/server/module-loader.js

@@ -31,7 +31,10 @@ export class ModuleLoader extends EventTarget {
         this.contextRegistry = contextRegistry;
     }
     async watch() {
-        this.watcher = watch(`${this.basePath}/**/*.{js,mjs,ts,mts,cjs,cts}`, CHOKIDAR_OPTIONS).on("all", (eventName, pathNameOriginal) => {
+        this.watcher = watch(this.basePath, CHOKIDAR_OPTIONS).on("all", (eventName, pathNameOriginal) => {
+            const JS_EXTENSIONS = ["js", "mjs", "cjs", "ts", "mts", "cts"];
+            if (!JS_EXTENSIONS.some((extension) => pathNameOriginal.endsWith(`.${extension}`)))
+                return;
             const pathName = pathNameOriginal.replaceAll("\\", "/");
             if (pathName.includes("$.context") && eventName === "add") {
                 process.stdout.write(`\n\n!!! The file at ${pathName} needs a minor update.\n    See https://github.com/pmcelhaney/counterfact/blob/main/docs/context-change.md\n\n\n`);
@@ -106,6 +109,8 @@ export class ModuleLoader extends EventTarget {
                 }
             }
             else {
+                if (url === "/index")
+                    this.registry.add("/", endpoint);
                 this.registry.add(url, endpoint);
             }
         }

package/dist/server/transpiler.js

@@ -25,7 +25,7 @@ export class Transpiler extends EventTarget {
     }
     async watch() {
         debug("transpiler: watch");
-        this.watcher = chokidarWatch(`${this.sourcePath}/**/*.{ts,mts,js,mjs}`, {
+        this.watcher = chokidarWatch(this.sourcePath, {
             ...CHOKIDAR_OPTIONS,
             ignored: `${this.sourcePath}/js`,
             ignoreInitial: false,
@@ -33,6 +33,9 @@ export class Transpiler extends EventTarget {
         const transpiles = [];
         this.watcher.on("all", async (eventName, sourcePathOriginal) => {
             debug("transpiler event: %s <%s>", eventName, sourcePathOriginal);
+            const JS_EXTENSIONS = ["js", "mjs", "ts", "mts"];
+            if (!JS_EXTENSIONS.some((extension) => sourcePathOriginal.endsWith(`.${extension}`)))
+                return;
             const sourcePath = sourcePathOriginal.replaceAll("\\", "/");
             const destinationPath = sourcePath
                 .replace(this.sourcePath, this.destinationPath)

package/dist/typescript-generator/generate.js

@@ -45,9 +45,10 @@ export async function generate(source, destination, generateOptions, repository
     const securitySchemes = Object.values(securityRequirement?.data ?? {});
     paths.forEach((pathDefinition, key) => {
         debug("processing path %s", key);
+        const path = key === "/" ? "/index" : key;
         pathDefinition.forEach((operation, requestMethod) => {
             repository
-                .get(`routes${key}.ts`)
+                .get(`routes${path}.ts`)
                 .export(new OperationCoder(operation, requestMethod, securitySchemes));
         });
     });

package/dist/typescript-generator/operation-coder.js

@@ -1,6 +1,7 @@
 import nodePath from "node:path";
 import { Coder } from "./coder.js";
 import { OperationTypeCoder } from "./operation-type-coder.js";
+import path from "node:path";
 export class OperationCoder extends Coder {
     constructor(requirement, requestMethod, securitySchemes = {}) {
         super(requirement);

package/dist/typescript-generator/operation-type-coder.js

@@ -54,7 +54,7 @@ export class OperationTypeCoder extends TypeCoder {
             .at(-2)
             .replaceAll("~1", "/");
         return `${nodePath
-            .join("types/paths", pathString)
+            .join("types/paths", pathString === "/" ? "/index" : pathString)
             .replaceAll("\\", "/")}.types.ts`;
     }
     userType() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "counterfact",
-  "version": "1.0.2",
+  "version": "1.1.0",
   "description": "a library for building a fake REST API for testing",
   "type": "module",
   "main": "./src/server/counterfact.js",
@@ -35,8 +35,8 @@
     "prepack": "yarn build",
     "release": "npx changeset publish",
     "prepare": "husky install",
-    "lint": "eslint . --plugin file-progress --rule 'file-progress/activate: 1'",
-    "lint:quickfix": "eslint --fix . eslint --fix demo-ts --rule=\"import/namespace: 0,etc/no-deprecated:0,import/no-cycle:0,no-explicit-type-exports/no-explicit-type-exports:0,import/no-deprecated:0,import/no-self-import:0,import/default:0,import/no-named-as-default:0\"",
+    "lint": "eslint . --plugin file-progress --rule 'file-progress/activate: 1' --ignore-pattern dist --ignore-pattern out --ignore-pattern coverage",
+    "lint:quickfix": "eslint --fix . eslint --fix demo-ts --rule=\"import/namespace: 0,etc/no-deprecated:0,import/no-cycle:0,no-explicit-type-exports/no-explicit-type-exports:0,import/no-deprecated:0,import/no-self-import:0,import/default:0,import/no-named-as-default:0\" --ignore-pattern dist --ignore-pattern out",
     "go:petstore": "yarn build && yarn counterfact https://petstore3.swagger.io/api/v3/openapi.json out",
     "go:petstore2": "yarn build && yarn counterfact  https://petstore.swagger.io/v2/swagger.json out",
     "go:example": "yarn build && node ./bin/counterfact.js ./openapi-example.yaml out",
@@ -45,9 +45,9 @@
   },
   "devDependencies": {
     "@changesets/cli": "2.27.8",
-    "@stryker-mutator/core": "8.5.0",
-    "@stryker-mutator/jest-runner": "8.5.0",
-    "@stryker-mutator/typescript-checker": "8.5.0",
+    "@stryker-mutator/core": "8.6.0",
+    "@stryker-mutator/jest-runner": "8.6.0",
+    "@stryker-mutator/typescript-checker": "8.6.0",
     "@swc/core": "1.7.26",
     "@swc/jest": "0.2.36",
     "@testing-library/dom": "10.4.0",
@@ -85,7 +85,7 @@
     "@hapi/accept": "6.0.3",
     "@types/json-schema": "7.0.15",
     "ast-types": "0.14.2",
-    "chokidar": "3.6.0",
+    "chokidar": "4.0.1",
     "commander": "12.1.0",
     "debug": "4.3.7",
     "fetch": "1.1.0",