@decohere/scaffold 0.0.1-dev.110 → 0.0.1-dev.111

package/commonjs/src/cli.js

@@ -4,4 +4,5 @@ Object.defineProperty(exports, "__esModule", {
     value: true
 });
 const _program = require("./program.js");
-void (0, _program.runCli)();
+// Exit as soon as the command is done, without waiting for handles it left open.
+process.exit(await (0, _program.runCli)());

package/commonjs/src/program.js

@@ -51,14 +51,14 @@ async function runCli(argv = process.argv) {
         await createProgram().parseAsync(argv);
     } catch (err) {
         if (err instanceof _commander.CommanderError) {
-            process.exit(err.exitCode);
+            return err.exitCode;
         }
         if (err instanceof _apiname.CreateCliError) {
             console.error(`\n  ${err.message}\n`);
-            process.exit(1);
+            return 1;
         }
         console.error(err);
-        process.exit(1);
+        return 1;
     }
-    process.exit(process.exitCode ?? 0);
+    return typeof process.exitCode === "number" ? process.exitCode : 0;
 }

package/commonjs/src/webapi/postman/openapi-to-postman.js

@@ -19,15 +19,53 @@ _export(exports, {
         return openApiToPostmanCollection;
     }
 });
-const _openapitopostmanv2 = /*#__PURE__*/ _interop_require_default(require("openapi-to-postmanv2"));
-function _interop_require_default(obj) {
-    return obj && obj.__esModule ? obj : {
-        default: obj
+function _getRequireWildcardCache(nodeInterop) {
+    if (typeof WeakMap !== "function") return null;
+    var cacheBabelInterop = new WeakMap();
+    var cacheNodeInterop = new WeakMap();
+    return (_getRequireWildcardCache = function(nodeInterop) {
+        return nodeInterop ? cacheNodeInterop : cacheBabelInterop;
+    })(nodeInterop);
+}
+function _interop_require_wildcard(obj, nodeInterop) {
+    if (!nodeInterop && obj && obj.__esModule) {
+        return obj;
+    }
+    if (obj === null || typeof obj !== "object" && typeof obj !== "function") {
+        return {
+            default: obj
+        };
+    }
+    var cache = _getRequireWildcardCache(nodeInterop);
+    if (cache && cache.has(obj)) {
+        return cache.get(obj);
+    }
+    var newObj = {
+        __proto__: null
     };
+    var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
+    for(var key in obj){
+        if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
+            var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;
+            if (desc && (desc.get || desc.set)) {
+                Object.defineProperty(newObj, key, desc);
+            } else {
+                newObj[key] = obj[key];
+            }
+        }
+    }
+    newObj.default = obj;
+    if (cache) {
+        cache.set(obj, newObj);
+    }
+    return newObj;
 }
-function convertAsync(data, options) {
+async function convertAsync(data, options) {
+    // Loaded here, not at the top: the converter pulls in about 700 modules (lodash, faker, ajv,
+    // …), which every scaffolder run paid for even with `--postman none`.
+    const { default: converter } = await Promise.resolve().then(()=>/*#__PURE__*/ _interop_require_wildcard(require("openapi-to-postmanv2")));
     return new Promise((resolve, reject)=>{
-        _openapitopostmanv2.default.convert({
+        converter.convert({
             type: "json",
             data
         }, options, (err, result)=>{

package/es6/src/cli.js

@@ -1,3 +1,4 @@
 #!/usr/bin/env node
 import { runCli } from "./program.js";
-void runCli();
+// Exit as soon as the command is done, without waiting for handles it left open.
+process.exit(await runCli());

package/es6/src/program.js

@@ -28,19 +28,23 @@ export function createProgram() {
     });
     return program;
 }
-export async function runCli(argv = process.argv) {
+/**
+ * Runs the CLI and returns its exit code; the bin (`cli.ts`) exits with it. Returning instead
+ * of calling `process.exit` here lets tests run it in process: a run that finished after its
+ * test had timed out used to call `process.exit` in whichever test came next (#662).
+ */ export async function runCli(argv = process.argv) {
     try {
         await createProgram().parseAsync(argv);
     } catch (err) {
         if (err instanceof CommanderError) {
-            process.exit(err.exitCode);
+            return err.exitCode;
         }
         if (err instanceof CreateCliError) {
             console.error(`\n  ${err.message}\n`);
-            process.exit(1);
+            return 1;
         }
         console.error(err);
-        process.exit(1);
+        return 1;
     }
-    process.exit(process.exitCode ?? 0);
+    return typeof process.exitCode === "number" ? process.exitCode : 0;
 }

package/es6/src/webapi/postman/openapi-to-postman.js

@@ -1,5 +1,7 @@
-import converter from "openapi-to-postmanv2";
-function convertAsync(data, options) {
+async function convertAsync(data, options) {
+    // Loaded here, not at the top: the converter pulls in about 700 modules (lodash, faker, ajv,
+    // …), which every scaffolder run paid for even with `--postman none`.
+    const { default: converter } = await import("openapi-to-postmanv2");
     return new Promise((resolve, reject)=>{
         converter.convert({
             type: "json",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@decohere/scaffold",
-  "version": "0.0.1-dev.110",
+  "version": "0.0.1-dev.111",
   "description": "Decohere project scaffolder (runs inside ghcr.io/typesmiths/decohere/create)",
   "keywords": [
     "decohere",
@@ -22,8 +22,8 @@
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "dependencies": {
-    "@decohere/crucible": "0.0.1-dev.110",
-    "@decohere/nexus": "0.0.1-dev.110",
+    "@decohere/crucible": "0.0.1-dev.111",
+    "@decohere/nexus": "0.0.1-dev.111",
     "commander": "^13.1.0",
     "openapi-to-postmanv2": "^5.0.0",
     "yaml": "^2.9.1"

package/types/src/program.d.ts

@@ -1,3 +1,8 @@
 import { Command } from "commander";
 export declare function createProgram(): Command;
-export declare function runCli(argv?: string[]): Promise<void>;
+/**
+ * Runs the CLI and returns its exit code; the bin (`cli.ts`) exits with it. Returning instead
+ * of calling `process.exit` here lets tests run it in process: a run that finished after its
+ * test had timed out used to call `process.exit` in whichever test came next (#662).
+ */
+export declare function runCli(argv?: string[]): Promise<number>;