@zuplo/cli 1.138.0 → 2.2.0

package/.tool-versions

@@ -0,0 +1 @@
+nodejs 18.20.4

package/README.md

@@ -64,3 +64,12 @@ Commands:
   zup variable update      Updates an existing variable for a branch
 
 ```
+
+# Changelog
+
+## v2
+
+- Removes the use of Deno's test runner. We now use the built-in test runner in
+  Node.js. All features are preserved; however, the output of `zup test` follows
+  the Node.js
+  [spec reporter](https://nodejs.org/docs/latest-v18.x/api/test.html#test-reporters).

package/dist/cli.js

@@ -1,5 +1,5 @@
 
-!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="b7b80df4-c767-5f13-8cfb-0f1e1b3f3d4f")}catch(e){}}();
+!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="56d3c48c-3960-5c1d-adbd-d0a76d0ac940")}catch(e){}}();
 import * as dotenv from "dotenv";
 dotenv.config();
 import * as Sentry from "@sentry/node";
@@ -42,6 +42,12 @@ if (gte(process.versions.node, MIN_NODE_VERSION)) {
     });
     const cli = yargs(hideBin(process.argv))
         .env("ZUPLO")
+        .option("prompt", {
+        type: "boolean",
+        describe: "Bypass confirmation prompts",
+        default: true,
+        hidden: true,
+    })
         .command(compile)
         .command(convert)
         .command(deleteZup)
@@ -84,4 +90,4 @@ else {
     Consider using a Node.js version manager such as https://github.com/nvm-sh/nvm.`);
 }
 //# sourceMappingURL=cli.js.map
-//# debugId=b7b80df4-c767-5f13-8cfb-0f1e1b3f3d4f
+//# debugId=56d3c48c-3960-5c1d-adbd-d0a76d0ac940

package/dist/cmds/project/import-openapi.js

@@ -1,5 +1,5 @@
 
-!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="91ee157c-141d-5381-a1b8-ef9f2f5625d8")}catch(e){}}();
+!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="d280723f-9208-5c26-a757-080dd9217482")}catch(e){}}();
 import { captureEvent } from "../../common/analytics/lib.js";
 import setBlocking from "../../common/output.js";
 import { ZuploProjectValidator } from "../../common/validators/file-system-validator.js";
@@ -16,11 +16,6 @@ export default {
             default: ".",
             normalize: true,
             hidden: true,
-        })
-            .option("prompt", {
-            type: "boolean",
-            describe: "Prompt for confirmation before importing",
-            default: true,
         })
             .option("source", {
             type: "string",
@@ -43,4 +38,4 @@ export default {
     },
 };
 //# sourceMappingURL=import-openapi.js.map
-//# debugId=91ee157c-141d-5381-a1b8-ef9f2f5625d8
+//# debugId=d280723f-9208-5c26-a757-080dd9217482

package/dist/common/args.js

@@ -0,0 +1,5 @@
+
+!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="3d67c996-402a-5927-8ae6-1fb20dee5751")}catch(e){}}();
+export {};
+//# sourceMappingURL=args.js.map
+//# debugId=3d67c996-402a-5927-8ae6-1fb20dee5751

package/dist/common/outdated.test.js

@@ -0,0 +1,66 @@
+
+!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="f4a9a7b0-4a16-5eb9-b752-e61ee1acb33e")}catch(e){}}();
+import { assert } from "chai";
+import { rm, writeFile } from "node:fs/promises";
+import { join } from "node:path";
+import { beforeEach, describe, it } from "node:test";
+import { MockAgent, setGlobalDispatcher } from "undici";
+import { ZUPLO_VERSION_CHECK_FILE } from "./constants.js";
+import { warnIfOutdatedVersion } from "./outdated.js";
+import { ZUPLO_XDG_STATE_HOME } from "./xdg/lib.js";
+const versionCheckPath = join(ZUPLO_XDG_STATE_HOME, ZUPLO_VERSION_CHECK_FILE);
+process.env.ZUPLO_OVERRIDE_CI_TO_TEST = "true";
+describe("Outdated CLI check", function () {
+    let mockAgent;
+    beforeEach(() => {
+        mockAgent = new MockAgent();
+        mockAgent.disableNetConnect();
+        mockAgent
+            .get("https://raw.githubusercontent.com")
+            .intercept({
+            path: "/zuplo/zuplo/main/packages/zuplo/package.json",
+            method: "GET",
+        })
+            .reply(200, {
+            name: "zuplo",
+            dependencies: {
+                "@zuplo/cli": "1.109.0",
+            },
+        });
+        setGlobalDispatcher(mockAgent);
+    });
+    it("should warn on outdated version", async function () {
+        await rm(versionCheckPath, { recursive: true, force: true });
+        const result = await warnIfOutdatedVersion("1.0.0");
+        assert.isTrue(result);
+        assert.equal(mockAgent.pendingInterceptors.length, 0);
+    });
+    it("should not warn if current version", async function () {
+        const result = await warnIfOutdatedVersion("1.109.0");
+        assert.isFalse(result);
+    });
+    it("should not warn if still has cached result", async function () {
+        const state = { lastCheck: Date.now() - 1000, latestVersion: "1.108.0" };
+        await writeFile(versionCheckPath, JSON.stringify(state), "utf-8");
+        const result = await warnIfOutdatedVersion("1.108.0");
+        assert.isFalse(result);
+    });
+    it("should warn when time expired on outdated version", async function () {
+        const state = {
+            lastCheck: Date.now() - 1000 * 60 * 60 * 24 - 100,
+            latestVersion: "1.0.0",
+        };
+        await writeFile(versionCheckPath, JSON.stringify(state), "utf-8");
+        const result = await warnIfOutdatedVersion("1.0.0");
+        assert.isTrue(result);
+        assert.equal(mockAgent.pendingInterceptors.length, 0);
+    });
+    it("should handle invalid state", async function () {
+        await writeFile(versionCheckPath, "hello", "utf-8");
+        const result = await warnIfOutdatedVersion("0.0.1");
+        assert.isTrue(result);
+        assert.equal(mockAgent.pendingInterceptors.length, 0);
+    });
+});
+//# sourceMappingURL=outdated.test.js.map
+//# debugId=f4a9a7b0-4a16-5eb9-b752-e61ee1acb33e

package/dist/common/upgraders/package-json-upgrader.js

@@ -1,5 +1,5 @@
 
-!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="e03e4373-c6b2-5c5e-b73d-fcff6d7d010b")}catch(e){}}();
+!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="7f37d2ec-c9c4-5c18-a196-361f8f5e4924")}catch(e){}}();
 import { readFile, writeFile } from "node:fs/promises";
 import { join } from "node:path";
 import prettier from "prettier";
@@ -30,10 +30,11 @@ export class PackageJsonUpgrader extends StandardUpgrader {
             (packageJson.scripts.build === "zup build" ||
                 packageJson.scripts.build === "zuplo build"))
             delete packageJson.scripts.build;
-        if (packageJson.scripts.test &&
-            (packageJson.scripts.test === "zup test" ||
-                packageJson.scripts.test === "zuplo test")) {
-            delete packageJson.scripts.test;
+        if (packageJson.scripts.test && packageJson.scripts.test === "zuplo test") {
+            packageJson.scripts.test = "zup test";
+        }
+        else if (!packageJson.scripts.test) {
+            packageJson.scripts.test = "zup test";
         }
         if (packageJson.scripts.postinstall &&
             packageJson.scripts.postinstall === "husky install") {
@@ -64,4 +65,4 @@ export class PackageJsonUpgrader extends StandardUpgrader {
     }
 }
 //# sourceMappingURL=package-json-upgrader.js.map
-//# debugId=e03e4373-c6b2-5c5e-b73d-fcff6d7d010b
+//# debugId=7f37d2ec-c9c4-5c18-a196-361f8f5e4924

package/dist/common/upgraders/tsconfig-upgrader.js

@@ -0,0 +1,107 @@
+
+!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="1bf2cbbf-1e6f-586b-86a8-5ce98e9e2358")}catch(e){}}();
+import { parse } from "jsonc-parser";
+import { readFile, writeFile } from "node:fs/promises";
+import { join } from "node:path";
+import prettier from "prettier";
+import ts, { ModuleKind, ModuleResolutionKind, ScriptTarget, } from "typescript";
+import { StandardUpgrader } from "./lib.js";
+export class FailedToParseTSConfigJson extends Error {
+    constructor() {
+        super("Invalid tsconfig.json: Failed to parse the tsconfig.json file.");
+        Object.setPrototypeOf(this, FailedToParseTSConfigJson.prototype);
+    }
+}
+export class InvalidTSConfigJson extends Error {
+    constructor(message) {
+        super(message);
+        Object.setPrototypeOf(this, InvalidTSConfigJson.prototype);
+    }
+}
+export class TSConfigUpgrader extends StandardUpgrader {
+    async isApplicable() {
+        return { ok: true };
+    }
+    async needsUpgrade() {
+        try {
+            const tsFilePath = join(this.normalizedDir, "tsconfig.json");
+            const tsConfigRaw = await readFile(tsFilePath, "utf-8");
+            const tsConfigJson = parse(tsConfigRaw);
+            if (!(tsConfigJson &&
+                typeof tsConfigJson === "object" &&
+                "compilerOptions" in tsConfigJson)) {
+                return true;
+            }
+            const { options, errors } = ts.convertCompilerOptionsFromJson(tsConfigJson.compilerOptions, this.normalizedDir);
+            const libValue = ["ESNext", "WebWorker", "Webworker.Iterable"];
+            const includesAllLibs = (userLibs) => {
+                const a = libValue.map((item) => item.toLowerCase());
+                const b = userLibs.map((item) => item.toLowerCase());
+                return a.every((item) => b.includes(item));
+            };
+            return (errors.length > 0 ||
+                options.module !== ModuleKind.ESNext ||
+                options.target !== ScriptTarget.ES2022 ||
+                options.moduleResolution !== ModuleResolutionKind.Bundler ||
+                !options.lib ||
+                options.baseUrl !== undefined ||
+                !includesAllLibs(tsConfigJson.compilerOptions.lib ?? []));
+        }
+        catch (err) {
+            return true;
+        }
+    }
+    async upgrade() {
+        if (!(await this.needsUpgrade())) {
+            return;
+        }
+        const tsFilePath = join(this.normalizedDir, "tsconfig.json");
+        const tsConfig = {
+            include: ["modules/**/*", ".zuplo/**/*", "tests/**/*"],
+            exclude: ["./node_modules", "./dist"],
+            compilerOptions: {
+                module: "ESNext",
+                target: "ES2022",
+                moduleResolution: "Bundler",
+                lib: ["ESNext", "WebWorker", "Webworker.Iterable"],
+                preserveConstEnums: true,
+                useUnknownInCatchVariables: false,
+                forceConsistentCasingInFileNames: true,
+                importHelpers: true,
+                removeComments: true,
+                esModuleInterop: true,
+                strictNullChecks: true,
+                noEmit: true,
+            },
+        };
+        const formatted = await prettier.format(JSON.stringify(tsConfig), {
+            parser: "json",
+        });
+        await writeFile(tsFilePath, formatted);
+    }
+}
+export const getZuploTsConfigTemplate = () => ({
+    include: ["modules/**/*", ".zuplo/**/*", "tests/**/*"],
+    exclude: ["./node_modules", "./dist"],
+    compilerOptions: {
+        baseUrl: ".",
+        module: ModuleKind.ESNext,
+        target: ScriptTarget.ESNext,
+        moduleResolution: ModuleResolutionKind.Bundler,
+        lib: ["ESNext", "WebWorker", "Webworker.Iterable"],
+        preserveConstEnums: true,
+        useUnknownInCatchVariables: false,
+        forceConsistentCasingInFileNames: true,
+        importHelpers: true,
+        removeComments: true,
+        esModuleInterop: true,
+        strictNullChecks: true,
+        experimentalDecorators: true,
+        noEmit: true,
+        paths: {
+            "@app/*": [".zuplo/*"],
+        },
+    },
+});
+//# sourceMappingURL=tsconfig-upgrader.js.map
+//# debugId=1bf2cbbf-1e6f-586b-86a8-5ce98e9e2358

package/dist/common/upgraders/tsconfig-upgrader.test.js

@@ -0,0 +1,30 @@
+
+!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="6067ec2f-ba9e-552d-86dc-efe5ac6410f1")}catch(e){}}();
+import assert from "node:assert";
+import { describe, test } from "node:test";
+import { TSConfigUpgrader } from "./tsconfig-upgrader.js";
+process.env.ZUPLO_OVERRIDE_CI_TO_TEST = "true";
+describe("TSConfigUpgrader checks", async function () {
+    test("Should not run for a valid tsconfig.json", async function () {
+        const upgrader = new TSConfigUpgrader(new URL("../../../test-fixtures/tsconfig/valid", import.meta.url).pathname);
+        const needsUpgrade = await upgrader.needsUpgrade();
+        assert.equal(needsUpgrade, false);
+    });
+    test("Should run for a legacy tsconfig.json", async function () {
+        const upgrader = new TSConfigUpgrader(new URL("../../../test-fixtures/tsconfig/legacy", import.meta.url).pathname);
+        const needsUpgrade = await upgrader.needsUpgrade();
+        assert.equal(needsUpgrade, true);
+    });
+    test("Should run for a missing prop tsconfig.json", async function () {
+        const upgrader = new TSConfigUpgrader(new URL("../../../test-fixtures/tsconfig/missing-prop", import.meta.url).pathname);
+        const needsUpgrade = await upgrader.needsUpgrade();
+        assert.equal(needsUpgrade, true);
+    });
+    test("Should run when baseUrl set in tsconfig.json", async function () {
+        const upgrader = new TSConfigUpgrader(new URL("../../../test-fixtures/tsconfig/missing-prop", import.meta.url).pathname);
+        const needsUpgrade = await upgrader.needsUpgrade();
+        assert.equal(needsUpgrade, true);
+    });
+});
+//# sourceMappingURL=tsconfig-upgrader.test.js.map
+//# debugId=6067ec2f-ba9e-552d-86dc-efe5ac6410f1

package/dist/convert/engine.test.js

@@ -0,0 +1,302 @@
+
+!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="ef0b2816-b9e6-501e-8d11-6961d4a8afa1")}catch(e){}}();
+import { expect } from "chai";
+import { describe, it } from "node:test";
+import { convertRoutes } from "./engine.js";
+describe("Routes.json Conversion Engine", () => {
+    it("should handle simple route conversion (no version)", () => {
+        const routesConfig = {
+            versions: [
+                {
+                    name: "v1",
+                    pathPrefix: "/v1",
+                },
+                {
+                    name: "none",
+                    pathPrefix: "",
+                },
+            ],
+            routes: [
+                {
+                    methods: ["GET"],
+                    path: "/test",
+                    summary: "Test route",
+                    version: "none",
+                    corsPolicy: "anything-goes",
+                    description: "This is a test route",
+                    operationId: "random",
+                    handler: {
+                        export: "urlRewriteHandler",
+                        module: "$import(@zuplo/runtime)",
+                        options: {
+                            rewritePattern: "https://jsonplaceholder.typicode.com/todos",
+                            forwardSearch: true,
+                        },
+                    },
+                },
+            ],
+        };
+        const expected = {
+            openapi: "3.1.0",
+            info: {
+                title: "Converted from config/routes.json",
+                version: "1.0.0",
+            },
+            paths: {
+                "/test": {
+                    get: {
+                        summary: "Test route",
+                        description: "This is a test route",
+                        operationId: "random",
+                        "x-zuplo-route": {
+                            corsPolicy: "anything-goes",
+                            handler: {
+                                export: "urlRewriteHandler",
+                                module: "$import(@zuplo/runtime)",
+                                options: {
+                                    rewritePattern: "https://jsonplaceholder.typicode.com/todos",
+                                    forwardSearch: true,
+                                },
+                            },
+                        },
+                    },
+                    "x-zuplo-path": {
+                        pathMode: "url-pattern",
+                    },
+                },
+            },
+        };
+        const actual = convertRoutes(routesConfig);
+        expect(actual).to.deep.equal(expected);
+    });
+    it("should handle simple route conversion (with version)", () => {
+        const routesConfig = {
+            versions: [
+                {
+                    name: "v1",
+                    pathPrefix: "/v1",
+                },
+                {
+                    name: "none",
+                    pathPrefix: "",
+                },
+            ],
+            routes: [
+                {
+                    methods: ["GET"],
+                    path: "/test",
+                    summary: "Test route",
+                    version: "v1",
+                    corsPolicy: "anything-goes",
+                    description: "This is a test route",
+                    operationId: "random",
+                    handler: {
+                        export: "urlRewriteHandler",
+                        module: "$import(@zuplo/runtime)",
+                        options: {
+                            rewritePattern: "https://jsonplaceholder.typicode.com/todos",
+                            forwardSearch: true,
+                        },
+                    },
+                },
+            ],
+        };
+        const expected = {
+            openapi: "3.1.0",
+            info: {
+                title: "Converted from config/routes.json",
+                version: "1.0.0",
+            },
+            paths: {
+                "/v1/test": {
+                    get: {
+                        summary: "Test route",
+                        description: "This is a test route",
+                        operationId: "random",
+                        "x-zuplo-route": {
+                            corsPolicy: "anything-goes",
+                            handler: {
+                                export: "urlRewriteHandler",
+                                module: "$import(@zuplo/runtime)",
+                                options: {
+                                    rewritePattern: "https://jsonplaceholder.typicode.com/todos",
+                                    forwardSearch: true,
+                                },
+                            },
+                        },
+                    },
+                    "x-zuplo-path": {
+                        pathMode: "url-pattern",
+                    },
+                },
+            },
+        };
+        const actual = convertRoutes(routesConfig);
+        expect(actual).to.deep.equal(expected);
+    });
+    it("should handle single route with multiple methods", () => {
+        const routesConfig = {
+            versions: [
+                {
+                    name: "v1",
+                    pathPrefix: "/v1",
+                },
+                {
+                    name: "none",
+                    pathPrefix: "",
+                },
+            ],
+            routes: [
+                {
+                    methods: ["GET", "POST", "HEAD"],
+                    path: "/test",
+                    summary: "Test route",
+                    version: "v1",
+                    corsPolicy: "anything-goes",
+                    description: "This is a test route",
+                    operationId: "random",
+                    handler: {
+                        export: "urlRewriteHandler",
+                        module: "$import(@zuplo/runtime)",
+                        options: {
+                            rewritePattern: "https://jsonplaceholder.typicode.com/todos",
+                            forwardSearch: true,
+                        },
+                    },
+                },
+            ],
+        };
+        const expected = {
+            openapi: "3.1.0",
+            info: {
+                title: "Converted from config/routes.json",
+                version: "1.0.0",
+            },
+            paths: {
+                "/v1/test": {
+                    "get,post,head": {
+                        summary: "Test route",
+                        description: "This is a test route",
+                        operationId: "random",
+                        "x-zuplo-route": {
+                            corsPolicy: "anything-goes",
+                            handler: {
+                                export: "urlRewriteHandler",
+                                module: "$import(@zuplo/runtime)",
+                                options: {
+                                    rewritePattern: "https://jsonplaceholder.typicode.com/todos",
+                                    forwardSearch: true,
+                                },
+                            },
+                        },
+                    },
+                    "x-zuplo-path": {
+                        pathMode: "url-pattern",
+                    },
+                },
+            },
+        };
+        const actual = convertRoutes(routesConfig);
+        expect(actual).to.deep.equal(expected);
+    });
+    it("should handle single route with different methods", () => {
+        const routesConfig = {
+            versions: [
+                {
+                    name: "v1",
+                    pathPrefix: "/v1",
+                },
+                {
+                    name: "none",
+                    pathPrefix: "",
+                },
+            ],
+            routes: [
+                {
+                    methods: ["GET"],
+                    path: "/test",
+                    summary: "Test route",
+                    description: "This is a test route",
+                    version: "v1",
+                    corsPolicy: "anything-goes",
+                    handler: {
+                        export: "urlRewriteHandler",
+                        module: "$import(@zuplo/runtime)",
+                        options: {
+                            rewritePattern: "https://welcome.zuplo.io/",
+                            forwardSearch: true,
+                        },
+                    },
+                    operationId: "random1",
+                },
+                {
+                    methods: ["POST"],
+                    path: "/test",
+                    summary: "Test route",
+                    description: "This is a test route",
+                    version: "v1",
+                    corsPolicy: "anything-goes",
+                    handler: {
+                        export: "urlRewriteHandler",
+                        module: "$import(@zuplo/runtime)",
+                        options: {
+                            rewritePattern: "https://welcome.zuplo.io/",
+                            forwardSearch: true,
+                        },
+                    },
+                    operationId: "random2",
+                },
+            ],
+        };
+        const expected = {
+            openapi: "3.1.0",
+            info: {
+                title: "Converted from config/routes.json",
+                version: "1.0.0",
+            },
+            paths: {
+                "/v1/test": {
+                    get: {
+                        summary: "Test route",
+                        description: "This is a test route",
+                        operationId: "random1",
+                        "x-zuplo-route": {
+                            corsPolicy: "anything-goes",
+                            handler: {
+                                export: "urlRewriteHandler",
+                                module: "$import(@zuplo/runtime)",
+                                options: {
+                                    rewritePattern: "https://welcome.zuplo.io/",
+                                    forwardSearch: true,
+                                },
+                            },
+                        },
+                    },
+                    post: {
+                        summary: "Test route",
+                        description: "This is a test route",
+                        operationId: "random2",
+                        "x-zuplo-route": {
+                            corsPolicy: "anything-goes",
+                            handler: {
+                                export: "urlRewriteHandler",
+                                module: "$import(@zuplo/runtime)",
+                                options: {
+                                    rewritePattern: "https://welcome.zuplo.io/",
+                                    forwardSearch: true,
+                                },
+                            },
+                        },
+                    },
+                    "x-zuplo-path": {
+                        pathMode: "url-pattern",
+                    },
+                },
+            },
+        };
+        const actual = convertRoutes(routesConfig);
+        expect(actual).to.deep.equal(expected);
+    });
+});
+//# sourceMappingURL=engine.test.js.map
+//# debugId=ef0b2816-b9e6-501e-8d11-6961d4a8afa1

package/dist/project/import-openapi/handler.js

@@ -1,5 +1,5 @@
 
-!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="c5129a8e-104c-557e-bd58-09f307c47a3f")}catch(e){}}();
+!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="a4e07444-c9b0-5d72-9ff0-ddd4f42e802b")}catch(e){}}();
 import { confirm } from "@inquirer/prompts";
 import jsYaml from "js-yaml";
 import { existsSync, writeFileSync } from "node:fs";
@@ -142,4 +142,4 @@ export async function importOpenApi(argv) {
     await printResultToConsoleAndExitGracefully(`Import successful. File written to ${destinationFilePath}`);
 }
 //# sourceMappingURL=handler.js.map
-//# debugId=c5129a8e-104c-557e-bd58-09f307c47a3f
+//# debugId=a4e07444-c9b0-5d72-9ff0-ddd4f42e802b

package/dist/project/update/handler.js

@@ -1,29 +1,34 @@
 
-!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="621a9145-cc00-51e8-be17-81b63287e71c")}catch(e){}}();
+!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="b240c7b1-8f8c-54c7-b381-3ec9bae18cd4")}catch(e){}}();
 import { confirm } from "@inquirer/prompts";
 import { printDiagnosticsToConsole, printResultToConsoleAndExitGracefully, } from "../../common/output.js";
 import { PackageJsonUpgrader } from "../../common/upgraders/package-json-upgrader.js";
+import { TSConfigUpgrader } from "../../common/upgraders/tsconfig-upgrader.js";
 import { VsCodeSettingsJsonUpgrader } from "../../common/upgraders/vscode-settings-json-upgrader.js";
 export async function update(argv) {
-    printDiagnosticsToConsole("This command will make changes to your source code. Please commit your changes to version control before continuing.");
-    const answer = await confirm({ message: "Continue?", default: true });
+    let answer = !!argv.prompt;
+    if (answer) {
+        printDiagnosticsToConsole("This command will make changes to your source code. Please commit your changes to version control before continuing.");
+        answer = await confirm({ message: "Continue?", default: true });
+    }
     if (answer) {
         const u = new PackageJsonUpgrader(argv.dir);
         if ((await u.isApplicable()).ok) {
             printDiagnosticsToConsole("Updating your package.json...");
             await u.upgrade();
         }
-        else {
-        }
         const v = new VsCodeSettingsJsonUpgrader(argv.dir);
         if ((await v.isApplicable()).ok) {
-            printDiagnosticsToConsole("Updating your .vsode settings...");
+            printDiagnosticsToConsole("Updating your .vscode settings...");
             await v.upgrade();
         }
-        else {
+        const t = new TSConfigUpgrader(argv.dir);
+        if ((await t.isApplicable()).ok) {
+            printDiagnosticsToConsole("Rewriting your tsconfig.json...");
+            await t.upgrade();
         }
         await printResultToConsoleAndExitGracefully("Update completed");
     }
 }
 //# sourceMappingURL=handler.js.map
-//# debugId=621a9145-cc00-51e8-be17-81b63287e71c
+//# debugId=b240c7b1-8f8c-54c7-b381-3ec9bae18cd4

package/dist/test/esbuild-config.js

@@ -1,23 +1,24 @@
 
-!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="f13aec76-f70a-5053-8b92-7e9a9134dbfc")}catch(e){}}();
+!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="5c127662-31c6-5178-a683-322b67f8580c")}catch(e){}}();
 import { TEST_OUT_FOLDER } from "../common/constants.js";
-import { denoTestPrepPlugin } from "./esbuild-plugins/deno-test-prep-plugin.js";
+import { nodeTestPrepPlugin } from "./esbuild-plugins/node-test-prep-plugin.js";
 export function generateBuildOptionsForTest(argv) {
     return {
         outdir: `${argv.dir}/${TEST_OUT_FOLDER}`,
+        external: ["chai", "dotenv/config", "node:test"],
+        platform: "node",
         bundle: true,
         treeShaking: true,
         format: "esm",
         outExtension: {
-            ".js": ".ts",
+            ".js": ".mjs",
         },
         plugins: [
-            denoTestPrepPlugin(argv, {
+            nodeTestPrepPlugin(argv, {
                 "@zuplo/test": "",
-                chai: "https://cdn.skypack.dev/chai@4.3.4?dts",
             }),
         ],
     };
 }
 //# sourceMappingURL=esbuild-config.js.map
-//# debugId=f13aec76-f70a-5053-8b92-7e9a9134dbfc
+//# debugId=5c127662-31c6-5178-a683-322b67f8580c

package/dist/test/esbuild-plugins/node-test-prep-plugin.js

@@ -0,0 +1,65 @@
+
+!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="c847b970-590a-5cd3-b907-2b9fad49c028")}catch(e){}}();
+export function nodeTestPrepPlugin(argv, options) {
+    const aliases = Object.keys(options);
+    const re = new RegExp(`^(${aliases.map((x) => escapeRegExp(x)).join("|")})$`);
+    return {
+        name: "alias",
+        setup(build) {
+            build.onResolve({ filter: re }, (args) => {
+                if (/@zuplo\/test/.test(args.path)) {
+                    return {
+                        path: args.path,
+                        namespace: "zuplo-url",
+                    };
+                }
+                else {
+                    return {
+                        path: options[args.path],
+                        namespace: "zuplo-url",
+                        external: true,
+                    };
+                }
+            });
+            build.onLoad({ filter: /.*/, namespace: "zuplo-url" }, (args) => {
+                if (/@zuplo\/test/.test(args.path)) {
+                    return { contents: generateTestContents(argv), loader: "ts" };
+                }
+            });
+        },
+    };
+}
+function escapeRegExp(value) {
+    return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+function generateTestContents(argv) {
+    return `
+import 'dotenv/config'
+import { after, afterEach, describe, it, before, beforeEach } from "node:test"
+
+export class TestHelper {
+  static get TEST_URL() {
+    const url = "${argv.endpoint}";
+    if (url !== "undefined") {
+      return url;
+    }
+
+    throw new Error("TEST_URL is not set. Pass --endpoint <URL> to \`zuplo test\` on the CLI to set a value.");
+  }
+
+  static get environment() {
+      return process.env;
+  }
+}
+
+const afterAll = after;
+const beforeAll = before;
+
+describe.ignore = describe.skip;
+it.ignore = it.skip;
+
+export {afterAll, afterEach, beforeAll, beforeEach, describe, it};
+  `;
+}
+//# sourceMappingURL=node-test-prep-plugin.js.map
+//# debugId=c847b970-590a-5cd3-b907-2b9fad49c028

package/dist/test/handler.js

@@ -1,5 +1,5 @@
 
-!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="1ca2f9a0-dd2a-5e05-9db2-0a83d26896ad")}catch(e){}}();
+!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="08888ef0-037c-5716-a727-dd52d53a2f00")}catch(e){}}();
 import fg from "fast-glob";
 import { rimrafSync } from "rimraf";
 import { TEST_IN_FOLDER, TEST_OUT_FOLDER } from "../common/constants.js";
@@ -25,4 +25,4 @@ export async function test(argv) {
     }
 }
 //# sourceMappingURL=handler.js.map
-//# debugId=1ca2f9a0-dd2a-5e05-9db2-0a83d26896ad
+//# debugId=08888ef0-037c-5716-a727-dd52d53a2f00

package/dist/test/invoke-test.js

@@ -1,28 +1,27 @@
 
-!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="a86033b8-649a-53cf-9f24-6b9f118258b4")}catch(e){}}();
+!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="91819abd-e850-5b4f-83ac-b91327da0a26")}catch(e){}}();
 import { execa } from "execa";
 import { TEST_OUT_FOLDER } from "../common/constants.js";
-import { locateDenoExecutable, MissingDenoExecutableError, } from "../common/deno-utils/locator.js";
 import { logger } from "../common/logger.js";
+class MissingNodeExecutableError extends Error {
+    constructor() {
+        super("Missing executable: Cannot locate node executable");
+        Object.setPrototypeOf(this, MissingNodeExecutableError.prototype);
+    }
+}
 export async function runTests(argv) {
-    const denoExecutable = await locateDenoExecutable();
-    if (denoExecutable) {
-        const args = [
-            "test",
-            "--allow-env",
-            "--allow-net",
-            "--allow-read=.env,.env.defaults,.env.example,config/",
-            "--no-check",
-        ];
+    const nodeExecutable = process.platform === "win32" ? "node.exe" : "node";
+    if (nodeExecutable) {
+        const args = ["--test", "--test-reporter=spec"];
         if (argv.filter) {
-            args.push("--filter", argv.filter);
+            args.push("--test-name-pattern", argv.filter);
         }
         args.push(`${argv.dir}/${TEST_OUT_FOLDER}`);
-        const denoProcess = execa(denoExecutable, args);
-        denoProcess.stdout?.pipe(process.stdout);
-        denoProcess.stderr?.pipe(process.stderr);
+        const nodeProcess = execa(nodeExecutable, args);
+        nodeProcess.stdout?.pipe(process.stdout);
+        nodeProcess.stderr?.pipe(process.stderr);
         try {
-            const result = await denoProcess;
+            const result = await nodeProcess;
             return result;
         }
         catch (err) {
@@ -31,8 +30,8 @@ export async function runTests(argv) {
         }
     }
     else {
-        throw new MissingDenoExecutableError();
+        throw new MissingNodeExecutableError();
     }
 }
 //# sourceMappingURL=invoke-test.js.map
-//# debugId=a86033b8-649a-53cf-9f24-6b9f118258b4
+//# debugId=91819abd-e850-5b4f-83ac-b91327da0a26

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zuplo/cli",
-  "version": "1.138.0",
+  "version": "2.2.0",
   "type": "module",
   "repository": "https://github.com/zuplo/cli",
   "description": "The command-line interface for Zuplo",
@@ -9,9 +9,11 @@
   "scripts": {
     "update:zuplo-dependencies-safely": "./scripts/update-zuplo-dependencies.sh",
     "build": "tsc --build && node ./scripts/post-build.js",
+    "build:clean": "tsc --build --clean",
     "clean": "git clean -Xfde !.env",
     "sentry:sourcemaps": "sentry-cli sourcemaps inject --org zuplo --project zuplo-cli ./dist",
-    "test": "node --test dist/**/*.spec.js"
+    "test": "find dist -name \"*.test.js\" | xargs node --test --test-only",
+    "test:ci": "find dist -name \"*.test.js\" | xargs node --test"
   },
   "engines": {
     "node": ">=18.0.0"
@@ -59,7 +61,6 @@
     "@sentry/node": "7.69.0",
     "@swc/core": "1.3.78",
     "@zuplo/core": "5.2458.0",
-    "@zuplo/deno-bin": "1.37.1",
     "@zuplo/pino-pretty-configurations": "^1.5.0",
     "@zuplo/runtime": "5.2458.0",
     "chalk": "^5.1.2",

package/dist/common/deno-utils/locator.js

@@ -1,29 +0,0 @@
-
-!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="8edf8105-ebeb-518f-8885-8891eb778b11")}catch(e){}}();
-import { existsSync } from "node:fs";
-import { dirname, resolve } from "node:path";
-import { fileURLToPath } from "node:url";
-import { logger } from "../logger.js";
-export class MissingDenoExecutableError extends Error {
-    constructor() {
-        super("Missing executable: Cannot locate deno executable");
-        Object.setPrototypeOf(this, MissingDenoExecutableError.prototype);
-    }
-}
-export async function locateDenoExecutable() {
-    return locateDeno(dirname(fileURLToPath(import.meta.url)));
-}
-export async function locateDeno(dir) {
-    const DENO_EXECUTABLE = process.platform === "win32" ? "deno.exe" : "deno";
-    if (dir === ".") {
-        return undefined;
-    }
-    const pathToDeno = resolve(dir, "node_modules", "@zuplo/deno-bin", "bin", DENO_EXECUTABLE);
-    if (await existsSync(pathToDeno)) {
-        logger.debug(`Path to deno: ${pathToDeno}`);
-        return pathToDeno;
-    }
-    return locateDeno(dirname(dir));
-}
-//# sourceMappingURL=locator.js.map
-//# debugId=8edf8105-ebeb-518f-8885-8891eb778b11

package/dist/test/esbuild-plugins/deno-test-prep-plugin.js

@@ -1,99 +0,0 @@
-
-!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="327f255c-47ca-568f-9b06-a3716ca6b328")}catch(e){}}();
-export function denoTestPrepPlugin(argv, options) {
-    const aliases = Object.keys(options);
-    const re = new RegExp(`^(${aliases.map((x) => escapeRegExp(x)).join("|")})$`);
-    return {
-        name: "alias",
-        setup(build) {
-            build.onResolve({ filter: re }, (args) => {
-                if (/@zuplo\/test/.test(args.path)) {
-                    return {
-                        path: args.path,
-                        namespace: "deno-url",
-                    };
-                }
-                else {
-                    return {
-                        path: options[args.path],
-                        namespace: "deno-url",
-                        external: true,
-                    };
-                }
-            });
-            build.onLoad({ filter: /.*/, namespace: "deno-url" }, (args) => {
-                if (/@zuplo\/test/.test(args.path)) {
-                    return { contents: generateTestContents(argv), loader: "ts" };
-                }
-            });
-        },
-    };
-}
-function escapeRegExp(value) {
-    return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-}
-function generateTestContents(argv) {
-    return `
-
-  // Load environment variables
-  import { load } from "https://deno.land/std@0.203.0/dotenv/mod.ts";
-  await load();
-
-  export class TestHelper {
-    static get TEST_URL() {
-      const url = "${argv.endpoint}";
-      if (url !== "undefined") {
-        return url;
-      }
-
-      throw new Error("TEST_URL is not set. Pass --endpoint <URL> to \`zuplo test\` on the CLI to set a value.");
-    }
-
-    static get environment() {
-      return Deno.env.toObject();
-    }
-  }
-
-  import {
-    afterAll,
-    afterEach,
-    beforeAll,
-    beforeEach,
-    describe as originalDescribe,
-    it,
-  } from "https://deno.land/std@0.203.0/testing/bdd.ts"; 
-
-  // We want to be able to disable test sanitizers by default to
-  // make tests easier/more familiar to write.
-  
-  function describe<T>(
-    name: string,
-    fn: () => void | Promise<void>,
-  ): TestSuite<T> {
-    return originalDescribe(name, {
-      sanitizeExit: false,
-      sanitizeOps: false,
-      sanitizeResources: false,
-    }, fn);
-  }
-  
-  describe.only = function describeOnly<T>(
-    name: string,
-    fn: () => void | Promise<void>,
-  ): TestSuite<T> {
-    return originalDescribe.only(name, fn);
-  };
-  
-  describe.ignore = function describeIgnore<T>(
-    name: string,
-    fn: () => void | Promise<void>,
-  ): TestSuite<T> {
-    return originalDescribe.ignore(name, fn);
-  };
-
-  export {afterAll, afterEach, beforeAll, beforeEach, describe, it};
-
-  `;
-}
-//# sourceMappingURL=deno-test-prep-plugin.js.map
-//# debugId=327f255c-47ca-568f-9b06-a3716ca6b328