@cedarjs/cli 1.0.0-canary.13080 → 1.0.0-canary.13083

package/dist/commands/upgrade.js

@@ -78,15 +78,25 @@ const validateTag = (tag) => {
   }
   return tag;
 };
-const handler = async ({ dryRun, tag, verbose, dedupe, yes, force }) => {
+function isExecaError(e) {
+  return e instanceof Error && ("stdout" in e || "stderr" in e || "exitCode" in e);
+}
+const handler = async ({
+  dryRun,
+  tag,
+  verbose,
+  dedupe,
+  yes,
+  force
+}) => {
   recordTelemetryAttributes({
     command: "upgrade",
-    dryRun,
-    tag,
-    verbose,
-    dedupe,
-    yes,
-    force
+    dryRun: !!dryRun,
+    tag: tag ?? "latest",
+    verbose: !!verbose,
+    dedupe: !!dedupe,
+    yes: !!yes,
+    force: !!force
   });
   let preUpgradeMessage = "";
   let preUpgradeError = "";
@@ -133,10 +143,10 @@ const handler = async ({ dryRun, tag, verbose, dedupe, yes, force }) => {
         task: async (ctx, task) => {
           await runPreUpgradeScripts(ctx, task, { verbose, force });
           if (ctx.preUpgradeMessage) {
-            preUpgradeMessage = ctx.preUpgradeMessage;
+            preUpgradeMessage = String(ctx.preUpgradeMessage);
           }
           if (ctx.preUpgradeError) {
-            preUpgradeError = ctx.preUpgradeError;
+            preUpgradeError = String(ctx.preUpgradeError);
           }
         },
         enabled: (ctx) => !!ctx.versionToUpgradeTo
@@ -149,33 +159,33 @@ const handler = async ({ dryRun, tag, verbose, dedupe, yes, force }) => {
       {
         title: "Updating other packages in your package.json(s)",
         task: (ctx) => updatePackageVersionsFromTemplate(ctx, { dryRun, verbose }),
-        enabled: (ctx) => ctx.versionToUpgradeTo?.includes("canary") && !ctx.preUpgradeError
+        enabled: (ctx) => String(ctx.versionToUpgradeTo).includes("canary") && !ctx.preUpgradeError
       },
       {
         title: "Downloading yarn patches",
         task: (ctx) => downloadYarnPatches(ctx, { dryRun, verbose }),
-        enabled: (ctx) => ctx.versionToUpgradeTo?.includes("canary") && !ctx.preUpgradeError
+        enabled: (ctx) => String(ctx.versionToUpgradeTo).includes("canary") && !ctx.preUpgradeError
       },
       {
         title: "Removing CLI cache",
-        task: (ctx) => removeCliCache(ctx, { dryRun, verbose }),
+        task: () => removeCliCache({ dryRun, verbose }),
         enabled: (ctx) => !ctx.preUpgradeError
       },
       {
         title: "Running yarn install",
-        task: (ctx) => yarnInstall(ctx, { dryRun, verbose }),
+        task: () => yarnInstall({ verbose }),
         enabled: (ctx) => !ctx.preUpgradeError,
-        skip: () => dryRun
+        skip: () => !!dryRun
       },
       {
         title: "Refreshing the Prisma client",
         task: (_ctx, task) => refreshPrismaClient(task, { verbose }),
         enabled: (ctx) => !ctx.preUpgradeError,
-        skip: () => dryRun
+        skip: () => !!dryRun
       },
       {
         title: "De-duplicating dependencies",
-        skip: () => dryRun || !dedupe,
+        skip: () => !!dryRun || !dedupe,
         enabled: (ctx) => !ctx.preUpgradeError,
         task: (_ctx, task) => dedupeDeps(task, { verbose })
       },
@@ -195,8 +205,8 @@ const handler = async ({ dryRun, tag, verbose, dedupe, yes, force }) => {
           if ([void 0, "latest", "rc"].includes(tag)) {
             const ghReleasesLink = terminalLink(
               `GitHub Release notes`,
-              `https://github.com/cedarjs/cedar/releases`
               // intentionally not linking to specific version
+              `https://github.com/cedarjs/cedar/releases`
             );
             const discordLink = terminalLink(
               `Discord`,
@@ -257,13 +267,16 @@ async function yarnInstall({ verbose }) {
       stdio: verbose ? "inherit" : "pipe",
       cwd: getPaths().base
     });
-  } catch (e) {
+  } catch {
     throw new Error(
       "Could not finish installation. Please run `yarn install` and then `yarn dedupe`, before continuing"
     );
   }
 }
-async function removeCliCache(ctx, { dryRun, verbose }) {
+async function removeCliCache({
+  dryRun,
+  verbose
+}) {
   const cliCacheDir = path.join(
     getPaths().generated.base,
     PLUGIN_CACHE_FILENAME
@@ -283,7 +296,7 @@ async function setLatestVersionToContext(ctx, tag) {
     );
     ctx.versionToUpgradeTo = foundVersion;
     return foundVersion;
-  } catch (e) {
+  } catch {
     if (tag) {
       throw new Error("Could not find the latest `" + tag + "` version");
     }
@@ -345,7 +358,7 @@ function updateCedarJSDepsForAllSides(ctx, options) {
         title: `Updating ${pkgJsonPath}`,
         task: (_ctx, task) => updatePackageJsonVersion(
           basePath,
-          ctx.versionToUpgradeTo,
+          String(ctx.versionToUpgradeTo),
           task,
           options
         ),
@@ -432,7 +445,7 @@ async function downloadYarnPatches(ctx, { dryRun, verbose }) {
     "https://api.github.com/repos/cedarjs/cedar/git/trees/main?recursive=1",
     {
       headers: {
-        Authorization: githubToken ? `Bearer ${githubToken}` : void 0,
+        ...githubToken && { Authorization: `Bearer ${githubToken}` },
         ["X-GitHub-Api-Version"]: "2022-11-28",
         Accept: "application/vnd.github+json"
       }
@@ -482,11 +495,12 @@ async function refreshPrismaClient(task, { verbose }) {
       force: false
     });
   } catch (e) {
+    const message = e instanceof Error ? e.message : String(e);
     task.skip("Refreshing the Prisma client caused an Error.");
     console.log(
       "You may need to update your prisma client manually: $ yarn cedar prisma generate"
     );
-    console.log(c.error(e.message));
+    console.log(c.error(message));
   }
 }
 const dedupeDeps = async (_task, { verbose }) => {
@@ -497,7 +511,8 @@ const dedupeDeps = async (_task, { verbose }) => {
       cwd: getPaths().base
     });
   } catch (e) {
-    console.log(c.error(e.message));
+    const message = e instanceof Error ? e.message : String(e);
+    console.log(c.error(message));
     throw new Error(
       "Could not finish de-duplication. For yarn 1.x, please run `npx yarn-deduplicate`, or for yarn >= 3 run `yarn dedupe` before continuing"
     );
@@ -508,7 +523,7 @@ async function runPreUpgradeScripts(ctx, task, { verbose, force }) {
   if (!ctx.versionToUpgradeTo) {
     return;
   }
-  const version = ctx.versionToUpgradeTo;
+  const version = typeof ctx.versionToUpgradeTo === "string" ? ctx.versionToUpgradeTo : void 0;
   const parsed = semver.parse(version);
   const baseUrl = "https://raw.githubusercontent.com/cedarjs/cedar/main/upgrade-scripts/";
   const manifestUrl = `${baseUrl}manifest.json`;
@@ -655,7 +670,7 @@ async function runPreUpgradeScripts(ctx, task, { verbose, force }) {
     try {
       const { stdout } = await execa(
         "node",
-        ["script.mts", "--verbose", verbose, "--force", force],
+        ["script.mts", "--verbose", String(verbose), "--force", String(force)],
         { cwd: tempDir }
       );
       if (stdout) {
@@ -666,15 +681,23 @@ async function runPreUpgradeScripts(ctx, task, { verbose, force }) {
 ${stdout}`;
       }
     } catch (e) {
-      const errorOutput = e.stdout || e.stderr || e.message || "";
-      const verboseErrorMessage = verbose ? `Pre-upgrade check ${scriptName} failed with exit code ${e.exitCode}:
-${e.stderr ? e.stderr + "\n" : ""}` : "";
+      let errorOutput = String(e);
+      let exitCode;
+      let stderr;
+      if (isExecaError(e)) {
+        errorOutput = e.stdout || e.message;
+        stderr = e.stderr;
+        exitCode = e.exitCode;
+      } else if (e instanceof Error) {
+        errorOutput = e.message;
+      }
       if (ctx.preUpgradeError) {
         ctx.preUpgradeError += "\n";
       }
       if (verbose) {
         ctx.preUpgradeError += `
-${verboseErrorMessage}`;
+Pre-upgrade check ${scriptName} failed with exit code ${exitCode}:
+${stderr ? stderr + "\n" : ""}`;
       }
       ctx.preUpgradeError += `
 ${errorOutput}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "1.0.0-canary.13080+a455cced0",
+  "version": "1.0.0-canary.13083+cb44cdf39",
   "description": "The CedarJS Command Line",
   "repository": {
     "type": "git",
@@ -21,6 +21,7 @@
   "scripts": {
     "build": "tsx ./build.mts",
     "build:pack": "yarn pack -o cedarjs-cli.tgz",
+    "build:types": "tsc --build --verbose ./tsconfig.build.json",
     "build:watch": "nodemon --watch src --ext \"js,jsx,ts,tsx,template\" --ignore dist --exec \"yarn build && yarn fix:permissions\"",
     "dev": "RWJS_CWD=../../__fixtures__/example-todo-main node dist/index.js",
     "fix:permissions": "chmod +x dist/index.js dist/cfw.js",
@@ -31,15 +32,15 @@
   "dependencies": {
     "@babel/preset-typescript": "7.28.5",
     "@babel/runtime-corejs3": "7.28.4",
-    "@cedarjs/api-server": "1.0.0-canary.13080",
-    "@cedarjs/cli-helpers": "1.0.0-canary.13080",
-    "@cedarjs/fastify-web": "1.0.0-canary.13080",
-    "@cedarjs/internal": "1.0.0-canary.13080",
-    "@cedarjs/prerender": "1.0.0-canary.13080",
-    "@cedarjs/project-config": "1.0.0-canary.13080",
-    "@cedarjs/structure": "1.0.0-canary.13080",
-    "@cedarjs/telemetry": "1.0.0-canary.13080",
-    "@cedarjs/web-server": "1.0.0-canary.13080",
+    "@cedarjs/api-server": "1.0.0-canary.13083",
+    "@cedarjs/cli-helpers": "1.0.0-canary.13083",
+    "@cedarjs/fastify-web": "1.0.0-canary.13083",
+    "@cedarjs/internal": "1.0.0-canary.13083",
+    "@cedarjs/prerender": "1.0.0-canary.13083",
+    "@cedarjs/project-config": "1.0.0-canary.13083",
+    "@cedarjs/structure": "1.0.0-canary.13083",
+    "@cedarjs/telemetry": "1.0.0-canary.13083",
+    "@cedarjs/web-server": "1.0.0-canary.13083",
     "@listr2/prompt-adapter-enquirer": "2.0.16",
     "@opentelemetry/api": "1.8.0",
     "@opentelemetry/core": "1.22.0",
@@ -101,5 +102,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "a455cced08f75d4c7da246921f9ea66f3ae76f88"
+  "gitHead": "cb44cdf39bfa132dc6e07897372119b81aa038ae"
 }