@zuplo/cli 2.2.0 → 2.3.0

package/dist/common/output.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]="c4c27bd6-8cfb-5bb5-86f6-e63b05aa573f")}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]="ce8d0e5c-522c-5fe1-8df5-e8925fcb7a3b")}catch(e){}}();
 import * as Sentry from "@sentry/node";
 import chalk from "chalk";
 import { MAX_WAIT_PENDING_TIME_MS } from "./constants.js";
@@ -7,7 +7,7 @@ export function printDiagnosticsToConsole(message) {
     console.error(chalk.bold.blue(message));
 }
 export function printWarningToConsole(message) {
-    console.error(message);
+    console.error(chalk.yellow(message));
 }
 export async function printCriticalFailureToConsoleAndExit(message) {
     console.error(chalk.bold.red(message));
@@ -54,4 +54,4 @@ export function textOrJson(text) {
     }
 }
 //# sourceMappingURL=output.js.map
-//# debugId=c4c27bd6-8cfb-5bb5-86f6-e63b05aa573f
+//# debugId=ce8d0e5c-522c-5fe1-8df5-e8925fcb7a3b

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

@@ -1,10 +1,10 @@
 
-!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){}}();
+!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]="bbc3a878-c332-5d04-a39e-99fa8ed6ff1c")}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 { printWarningToConsole } from "../output.js";
 import { StandardUpgrader } from "./lib.js";
 export class FailedToParseTSConfigJson extends Error {
     constructor() {
@@ -12,6 +12,24 @@ export class FailedToParseTSConfigJson extends Error {
         Object.setPrototypeOf(this, FailedToParseTSConfigJson.prototype);
     }
 }
+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,
+    },
+};
 export class InvalidTSConfigJson extends Error {
     constructor(message) {
         super(message);
@@ -32,20 +50,28 @@ export class TSConfigUpgrader extends StandardUpgrader {
                 "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 ?? []));
+            if (tsConfigJson.extends) {
+                printWarningToConsole("This project uses an advanced tsconfig.json setup. You will need to manually upgrade this file.");
+                return false;
+            }
+            else {
+                const options = tsConfigJson.compilerOptions;
+                return (options.module?.toLowerCase() !==
+                    tsConfig.compilerOptions.module.toLowerCase() ||
+                    options.target?.toLowerCase() !==
+                        tsConfig.compilerOptions.target.toLowerCase() ||
+                    options.moduleResolution?.toLowerCase() !==
+                        tsConfig.compilerOptions.moduleResolution.toLowerCase() ||
+                    !options.lib ||
+                    options.baseUrl !== undefined ||
+                    !includesAllLibs(tsConfigJson.compilerOptions.lib ?? []));
+            }
         }
         catch (err) {
             return true;
@@ -56,52 +82,11 @@ export class TSConfigUpgrader extends StandardUpgrader {
             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
+//# debugId=bbc3a878-c332-5d04-a39e-99fa8ed6ff1c

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zuplo/cli",
-  "version": "2.2.0",
+  "version": "2.3.0",
   "type": "module",
   "repository": "https://github.com/zuplo/cli",
   "description": "The command-line interface for Zuplo",