@cedarjs/cli 1.0.0-canary.13037 → 1.0.0-canary.13040

package/dist/commands/upgrade.js

@@ -1,9 +1,12 @@
+import { builtinModules } from "node:module";
+import os from "node:os";
 import path from "node:path";
 import { ListrEnquirerPromptAdapter } from "@listr2/prompt-adapter-enquirer";
 import execa from "execa";
 import fs from "fs-extra";
 import latestVersion from "latest-version";
 import { Listr } from "listr2";
+import semver from "semver";
 import { terminalLink } from "termi-link";
 import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
 import { getConfig } from "@cedarjs/project-config";
@@ -41,6 +44,11 @@ const builder = (yargs) => {
     describe: "Skip prompts and use defaults",
     default: false,
     type: "boolean"
+  }).option("force", {
+    alias: "f",
+    describe: "Force upgrade even if pre-upgrade checks fail",
+    default: false,
+    type: "boolean"
   }).epilogue(
     `Also see the ${terminalLink(
       "CedarJS CLI Reference for the upgrade command",
@@ -70,15 +78,18 @@ const validateTag = (tag) => {
   }
   return tag;
 };
-const handler = async ({ dryRun, tag, verbose, dedupe, yes }) => {
+const handler = async ({ dryRun, tag, verbose, dedupe, yes, force }) => {
   recordTelemetryAttributes({
     command: "upgrade",
     dryRun,
     tag,
     verbose,
     dedupe,
-    yes
+    yes,
+    force
   });
+  let preUpgradeMessage = "";
+  let preUpgradeError = "";
   const tasks = new Listr(
     [
       {
@@ -117,38 +128,55 @@ const handler = async ({ dryRun, tag, verbose, dedupe, yes }) => {
         title: "Checking latest version",
         task: async (ctx) => setLatestVersionToContext(ctx, tag)
       },
+      {
+        title: "Running pre-upgrade scripts",
+        task: async (ctx, task) => {
+          await runPreUpgradeScripts(ctx, task, { verbose, force });
+          if (ctx.preUpgradeMessage) {
+            preUpgradeMessage = ctx.preUpgradeMessage;
+          }
+          if (ctx.preUpgradeError) {
+            preUpgradeError = ctx.preUpgradeError;
+          }
+        },
+        enabled: (ctx) => !!ctx.versionToUpgradeTo
+      },
       {
         title: "Updating your CedarJS version",
         task: (ctx) => updateCedarJSDepsForAllSides(ctx, { dryRun, verbose }),
-        enabled: (ctx) => !!ctx.versionToUpgradeTo
+        enabled: (ctx) => !!ctx.versionToUpgradeTo && !ctx.preUpgradeError
       },
       {
         title: "Updating other packages in your package.json(s)",
         task: (ctx) => updatePackageVersionsFromTemplate(ctx, { dryRun, verbose }),
-        enabled: (ctx) => ctx.versionToUpgradeTo?.includes("canary")
+        enabled: (ctx) => ctx.versionToUpgradeTo?.includes("canary") && !ctx.preUpgradeError
       },
       {
         title: "Downloading yarn patches",
         task: (ctx) => downloadYarnPatches(ctx, { dryRun, verbose }),
-        enabled: (ctx) => ctx.versionToUpgradeTo?.includes("canary")
+        enabled: (ctx) => ctx.versionToUpgradeTo?.includes("canary") && !ctx.preUpgradeError
       },
       {
         title: "Removing CLI cache",
-        task: (ctx) => removeCliCache(ctx, { dryRun, verbose })
+        task: (ctx) => removeCliCache(ctx, { dryRun, verbose }),
+        enabled: (ctx) => !ctx.preUpgradeError
       },
       {
         title: "Running yarn install",
         task: (ctx) => yarnInstall(ctx, { dryRun, verbose }),
+        enabled: (ctx) => !ctx.preUpgradeError,
         skip: () => dryRun
       },
       {
         title: "Refreshing the Prisma client",
         task: (_ctx, task) => refreshPrismaClient(task, { verbose }),
+        enabled: (ctx) => !ctx.preUpgradeError,
         skip: () => dryRun
       },
       {
         title: "De-duplicating dependencies",
         skip: () => dryRun || !dedupe,
+        enabled: (ctx) => !ctx.preUpgradeError,
         task: (_ctx, task) => dedupeDeps(task, { verbose })
       },
       {
@@ -208,6 +236,21 @@ const handler = async ({ dryRun, tag, verbose, dedupe, yes }) => {
     }
   );
   await tasks.run();
+  if (preUpgradeError) {
+    console.error("");
+    console.error(`   \u274C ${c.error("Pre-upgrade Error:")}
+`);
+    console.error("  " + preUpgradeError.replace(/\n/g, "\n   "));
+    if (!force) {
+      process.exit(1);
+    }
+  }
+  if (preUpgradeMessage) {
+    console.log("");
+    console.log(`   \u{1F4E3} ${c.info("Pre-upgrade Message:")}
+`);
+    console.log("  " + preUpgradeMessage.replace(/\n/g, "\n   "));
+  }
 };
 async function yarnInstall({ verbose }) {
   try {
@@ -459,10 +502,212 @@ const dedupeDeps = async (_task, { verbose }) => {
   }
   await yarnInstall({ verbose });
 };
+async function runPreUpgradeScripts(ctx, task, { verbose, force }) {
+  if (!ctx.versionToUpgradeTo) {
+    return;
+  }
+  const version = ctx.versionToUpgradeTo;
+  const parsed = semver.parse(version);
+  const baseUrl = "https://raw.githubusercontent.com/cedarjs/cedar/main/upgrade-scripts/";
+  const manifestUrl = `${baseUrl}manifest.json`;
+  let manifest = [];
+  try {
+    const res = await fetch(manifestUrl);
+    if (res.status === 200) {
+      manifest = await res.json();
+    } else {
+      if (verbose) {
+        console.log("No upgrade script manifest found.");
+      }
+    }
+  } catch (e) {
+    if (verbose) {
+      console.log("Failed to fetch upgrade script manifest", e);
+    }
+  }
+  if (!Array.isArray(manifest) || manifest.length === 0) {
+    return;
+  }
+  const checkLevels = [];
+  if (parsed) {
+    checkLevels.push({
+      id: "exact",
+      candidates: [`${version}.ts`, `${version}/index.ts`]
+    });
+    checkLevels.push({
+      id: "patch",
+      candidates: [
+        `${parsed.major}.${parsed.minor}.x.ts`,
+        `${parsed.major}.${parsed.minor}.x/index.ts`
+      ]
+    });
+    checkLevels.push({
+      id: "minor",
+      candidates: [`${parsed.major}.x.ts`, `${parsed.major}.x/index.ts`]
+    });
+  } else {
+    checkLevels.push({
+      id: "tag",
+      candidates: [`${version}.ts`, `${version}/index.ts`]
+    });
+  }
+  const scriptsToRun = [];
+  for (const level of checkLevels) {
+    for (const candidate of level.candidates) {
+      if (manifest.includes(candidate)) {
+        scriptsToRun.push(candidate);
+        break;
+      }
+    }
+  }
+  if (scriptsToRun.length === 0) {
+    if (verbose) {
+      console.log(`No upgrade scripts found for ${version}`);
+    }
+    return;
+  }
+  ctx.preUpgradeMessage = "";
+  ctx.preUpgradeError = "";
+  for (const scriptName of scriptsToRun) {
+    task.output = `Found upgrade check script: ${scriptName}. Downloading...`;
+    const tempDir = await fs.mkdtemp(path.join(os.tmpdir(), "cedar-upgrade-"));
+    const scriptPath = path.join(tempDir, "script.ts");
+    const isDirectoryScript = scriptName.includes("/");
+    if (isDirectoryScript) {
+      const dirName = scriptName.split("/")[0];
+      const githubApiUrl = `https://api.github.com/repos/cedarjs/cedar/contents/upgrade-scripts/${dirName}`;
+      try {
+        const dirRes = await fetch(githubApiUrl, {
+          headers: {
+            Accept: "application/vnd.github.v3+json"
+          }
+        });
+        if (dirRes.status !== 200) {
+          throw new Error(
+            `Failed to fetch directory contents: ${dirRes.statusText}`
+          );
+        }
+        const files = await dirRes.json();
+        for (const file of files) {
+          if (file.type === "file") {
+            task.output = `Downloading ${file.name}...`;
+            const fileRes = await fetch(file.download_url);
+            if (fileRes.status !== 200) {
+              throw new Error(`Failed to download ${file.name}`);
+            }
+            const fileContent = await fileRes.text();
+            const filePath = path.join(tempDir, file.name);
+            await fs.writeFile(filePath, fileContent);
+            if (file.name === "index.ts") {
+              await fs.rename(filePath, scriptPath);
+            }
+          }
+        }
+      } catch (e) {
+        if (verbose) {
+          console.error(e);
+        }
+        throw new Error(
+          `Failed to download upgrade script directory from ${githubApiUrl}`
+        );
+      }
+    } else {
+      const scriptUrl = `${baseUrl}${scriptName}`;
+      try {
+        const res = await fetch(scriptUrl);
+        if (res.status !== 200) {
+          throw new Error(`Failed to download script: ${res.statusText}`);
+        }
+        const scriptContent2 = await res.text();
+        await fs.writeFile(scriptPath, scriptContent2);
+      } catch (e) {
+        if (verbose) {
+          console.error(e);
+        }
+        throw new Error(`Failed to download upgrade script from ${scriptUrl}`);
+      }
+    }
+    const scriptContent = await fs.readFile(scriptPath, "utf8");
+    const deps = extractDependencies(scriptContent);
+    if (deps.length > 0) {
+      const depList = deps.join(", ");
+      task.output = `Installing dependencies for ${scriptName}: ${depList}...`;
+      await fs.writeJson(path.join(tempDir, "package.json"), {
+        name: "pre-upgrade-script",
+        version: "0.0.0",
+        dependencies: {}
+      });
+      await execa("yarn", ["add", ...deps], { cwd: tempDir });
+    }
+    task.output = `Running pre-upgrade script: ${scriptName}...`;
+    let shouldCleanup = true;
+    try {
+      const { stdout } = await execa(
+        "node",
+        ["script.ts", "--verbose", verbose, "--force", force],
+        { cwd: tempDir }
+      );
+      if (stdout) {
+        if (ctx.preUpgradeMessage) {
+          ctx.preUpgradeMessage += "\n\n";
+        }
+        ctx.preUpgradeMessage += `
+${stdout}`;
+      }
+    } catch (e) {
+      const errorOutput = e.stdout || e.stderr || e.message || "";
+      const errorMessage = `Pre-upgrade check ${scriptName} failed:
+${errorOutput}`;
+      if (ctx.preUpgradeError) {
+        ctx.preUpgradeError += "\n\n";
+      }
+      ctx.preUpgradeError += errorMessage;
+      if (!force) {
+        await fs.remove(tempDir);
+        shouldCleanup = false;
+        return;
+      }
+    } finally {
+      if (shouldCleanup) {
+        await fs.remove(tempDir);
+      }
+    }
+  }
+}
+const extractDependencies = (content) => {
+  const deps = /* @__PURE__ */ new Map();
+  const commentRegex = /\/\/\s*@dependency:\s*(\S+)/g;
+  let match;
+  while ((match = commentRegex.exec(content)) !== null) {
+    const spec = match[1];
+    const nameMatch = spec.match(/^(@?[^@\s]+)(?:@.+)?$/);
+    if (nameMatch) {
+      deps.set(nameMatch[1], spec);
+    }
+  }
+  const importRegex = /(?:import|from)\s*\(?['"]([^'"]+)['"]\)?/g;
+  while ((match = importRegex.exec(content)) !== null) {
+    let name = match[1];
+    if (name.startsWith(".") || name.startsWith("/") || name.startsWith("node:") || builtinModules.includes(name)) {
+      continue;
+    }
+    const parts = name.split("/");
+    if (name.startsWith("@") && parts.length >= 2) {
+      name = parts.slice(0, 2).join("/");
+    } else if (parts.length >= 1) {
+      name = parts[0];
+    }
+    if (!deps.has(name)) {
+      deps.set(name, name);
+    }
+  }
+  return Array.from(deps.values());
+};
 export {
   builder,
   command,
   description,
   handler,
+  runPreUpgradeScripts,
   validateTag
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "1.0.0-canary.13037+c8e9cd2b2",
+  "version": "1.0.0-canary.13040+853b364fd",
   "description": "The CedarJS Command Line",
   "repository": {
     "type": "git",
@@ -31,15 +31,15 @@
   "dependencies": {
     "@babel/preset-typescript": "7.28.5",
     "@babel/runtime-corejs3": "7.28.4",
-    "@cedarjs/api-server": "1.0.0-canary.13037",
-    "@cedarjs/cli-helpers": "1.0.0-canary.13037",
-    "@cedarjs/fastify-web": "1.0.0-canary.13037",
-    "@cedarjs/internal": "1.0.0-canary.13037",
-    "@cedarjs/prerender": "1.0.0-canary.13037",
-    "@cedarjs/project-config": "1.0.0-canary.13037",
-    "@cedarjs/structure": "1.0.0-canary.13037",
-    "@cedarjs/telemetry": "1.0.0-canary.13037",
-    "@cedarjs/web-server": "1.0.0-canary.13037",
+    "@cedarjs/api-server": "1.0.0-canary.13040",
+    "@cedarjs/cli-helpers": "1.0.0-canary.13040",
+    "@cedarjs/fastify-web": "1.0.0-canary.13040",
+    "@cedarjs/internal": "1.0.0-canary.13040",
+    "@cedarjs/prerender": "1.0.0-canary.13040",
+    "@cedarjs/project-config": "1.0.0-canary.13040",
+    "@cedarjs/structure": "1.0.0-canary.13040",
+    "@cedarjs/telemetry": "1.0.0-canary.13040",
+    "@cedarjs/web-server": "1.0.0-canary.13040",
     "@listr2/prompt-adapter-enquirer": "2.0.16",
     "@opentelemetry/api": "1.8.0",
     "@opentelemetry/core": "1.22.0",
@@ -94,6 +94,7 @@
     "@types/archiver": "^6",
     "memfs": "4.51.1",
     "node-ssh": "13.2.1",
+    "ts-dedent": "2.2.0",
     "tsx": "4.21.0",
     "typescript": "5.9.3",
     "vitest": "3.2.4"
@@ -101,5 +102,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "c8e9cd2b280fba5e83e4b666d2c2c8adbe04e2c9"
+  "gitHead": "853b364fd7336788a4a48b99a6c879b17ac3824b"
 }