@cedarjs/cli 3.0.0-canary.13612 → 3.0.0-canary.13614

package/dist/commands/build/buildHandler.js

@@ -29,7 +29,9 @@ function checkWorkspacePackageEntryPoints(cedarPaths) {
     if (!fs.existsSync(pkgJsonPath)) {
       continue;
     }
-    const pkgJson = JSON.parse(fs.readFileSync(pkgJsonPath, "utf8"));
+    const pkgJson = JSON.parse(
+      fs.readFileSync(pkgJsonPath, "utf8")
+    );
     const pkgName = pkgJson.name || entry.name;
     const pkgDir = path.join(packagesDir, entry.name);
     const entryFiles = /* @__PURE__ */ new Set();
@@ -82,7 +84,9 @@ const handler = async ({
   const prerenderRoutes = prerender && workspace.includes("web") ? detectPrerenderRoutes() : [];
   const shouldGeneratePrismaClient = prisma && prismaSchemaExists && (workspace.includes("api") || prerenderRoutes.length > 0);
   const packageJsonPath = path.join(cedarPaths.base, "package.json");
-  const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, "utf8"));
+  const packageJson = JSON.parse(
+    fs.readFileSync(packageJsonPath, "utf8")
+  );
   const packageJsonWorkspaces = packageJson.workspaces;
   const nonApiWebWorkspaces = Array.isArray(packageJsonWorkspaces) && packageJsonWorkspaces.length > 2 ? workspace.filter((w) => w !== "api" && w !== "web") : [];
   const gqlFeaturesTaskTitle = `Generating types needed for ${[
@@ -176,7 +180,7 @@ Run ` + c.info("yarn cedar build") + " (without specifying a workspace) to build
         }
       }
     }
-  ].filter(Boolean);
+  ].filter((t) => Boolean(t));
   const triggerPrerender = async () => {
     console.log("Starting prerendering...");
     if (prerenderRoutes.length === 0) {

package/dist/commands/console.js

@@ -1,9 +1,9 @@
 const command = "console";
 const aliases = ["c"];
 const description = "Launch an interactive Redwood shell (experimental)";
-const handler = async (options) => {
+const handler = async () => {
   const { handler: handler2 } = await import("./consoleHandler.js");
-  return handler2(options);
+  return handler2();
 };
 export {
   aliases,

package/dist/commands/consoleHandler.js

@@ -6,6 +6,9 @@ import { registerApiSideBabelHook } from "@cedarjs/babel-config";
 import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
 import { getPaths } from "../lib/index.js";
 const paths = getPaths();
+function isREPLServerWithHistory(replServer) {
+  return "history" in replServer && "lines" in replServer;
+}
 const loadPrismaClient = (replContext) => {
   const createdRequire = createRequire(import.meta.url);
   const { db } = createdRequire(path.join(paths.api.lib, "db"));
@@ -14,16 +17,19 @@ const loadPrismaClient = (replContext) => {
 };
 const consoleHistoryFile = path.join(paths.generated.base, "console_history");
 const persistConsoleHistory = (r) => {
+  const lines = isREPLServerWithHistory(r) ? r.lines : [];
   fs.appendFileSync(
     consoleHistoryFile,
-    r.lines.filter((line) => line.trim()).join("\n") + "\n",
+    lines.filter((line) => line.trim()).join("\n") + "\n",
     "utf8"
   );
 };
 const loadConsoleHistory = async (r) => {
   try {
     const history = await fs.promises.readFile(consoleHistoryFile, "utf8");
-    history.split("\n").reverse().map((line) => r.history.push(line));
+    if (isREPLServerWithHistory(r)) {
+      history.split("\n").reverse().map((line) => r.history.push(line));
+    }
   } catch {
   }
 };
@@ -53,8 +59,8 @@ const handler = (_options) => {
       } else {
         try {
           callback(null, await Promise.resolve(result));
-        } catch (error) {
-          callback(error, null);
+        } catch (err2) {
+          callback(err2 instanceof Error ? err2 : new Error(String(err2)), null);
         }
       }
     });

package/dist/commands/dev/devHandler.js

@@ -83,10 +83,7 @@ const handler = async ({
   }
   if (workspace.includes("api")) {
     try {
-      await generatePrismaClient({
-        verbose: false,
-        force: false
-      });
+      await generatePrismaClient({ verbose: false, force: false });
     } catch (e) {
       const message = getErrorMessage(e);
       errorTelemetry(process.argv, `Error generating prisma client: ${message}`);

package/dist/commands/execHandler.js

@@ -36,15 +36,17 @@ const printAvailableScriptsToConsole = () => {
 const handler = async (args) => {
   recordTelemetryAttributes({
     command: "exec",
-    prisma: args.prisma,
-    list: args.list
+    prisma: !!args.prisma,
+    list: !!args.list
   });
   const { name, prisma, list, ...scriptArgs } = args;
   if (list || !name) {
     printAvailableScriptsToConsole();
     return;
   }
-  scriptArgs._ = (Array.isArray(scriptArgs._) ? scriptArgs._ : []).slice(1);
+  if (Array.isArray(scriptArgs._)) {
+    scriptArgs._ = scriptArgs._.slice(1);
+  }
   delete scriptArgs.$0;
   delete scriptArgs.l;
   delete scriptArgs.s;
@@ -62,11 +64,11 @@ No script called \`${name}\` in the ./scripts folder.
   const scriptTasks = [
     {
       title: "Generating Prisma client",
-      enabled: () => Boolean(prisma),
+      enabled: () => !!prisma,
       task: () => generatePrismaClient({
         force: false,
         verbose: !args.silent,
-        silent: args.silent
+        silent: !!args.silent
       })
     },
     {

package/dist/commands/generate/dataMigration/dataMigration.js

@@ -3,7 +3,6 @@ import { paramCase } from "change-case";
 import { Listr } from "listr2";
 import { terminalLink } from "termi-link";
 import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
-import { dbReexportsPrismaClient } from "@cedarjs/internal/dist/project";
 import { getDataMigrationsPath } from "@cedarjs/project-config";
 import c from "../../../lib/colors.js";
 import {
@@ -44,7 +43,7 @@ const files = async ({ name, typescript }) => {
     getPaths().api.prismaConfig
   );
   const outputPath = path.join(dataMigrationsPath, outputFilename);
-  const prismaImportSource = dbReexportsPrismaClient() ? "src/lib/db" : "@prisma/client";
+  const prismaImportSource = "src/lib/db";
   return {
     [outputPath]: await generateTemplate(TEMPLATE_PATHS[extension], {
       name,

package/dist/commands/generate/service/serviceHandler.js

@@ -1,6 +1,5 @@
 import path from "node:path";
 import camelcase from "camelcase";
-import { dbReexportsPrismaClient } from "@cedarjs/internal/dist/project";
 import { pluralize, singularize } from "@cedarjs/utils/cedarPluralize";
 import { transformTSToJS } from "../../../lib/index.js";
 import { getSchema, verifyModelName } from "../../../lib/schemaHelpers.js";
@@ -223,7 +222,7 @@ const files = async ({
   const componentName = camelcase(pluralize(name));
   const model = name;
   const idName = await getIdName(model);
-  const prismaImportSource = dbReexportsPrismaClient() ? "src/lib/db" : "@prisma/client";
+  const prismaImportSource = "src/lib/db";
   const modelRelations = relations || relationsForModel(await getSchema(model));
   const serviceFile = await templateForFile({
     name,

package/dist/commands/lint.js

@@ -3,7 +3,7 @@ import path from "node:path";
 import execa from "execa";
 import { terminalLink } from "termi-link";
 import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
-import { getPaths, getConfig } from "../lib/index.js";
+import { getPaths, getConfig } from "@cedarjs/project-config";
 function detectLegacyEslintConfig() {
   const projectRoot = getPaths().base;
   const legacyConfigFiles = [
@@ -88,7 +88,7 @@ const handler = async ({
   recordTelemetryAttributes({ command: "lint", fix, format });
   const config = getConfig();
   const legacyConfigFiles = detectLegacyEslintConfig();
-  if (legacyConfigFiles.length > 0 && config.eslintLegacyConfigWarning) {
+  if (legacyConfigFiles.length > 0 && config instanceof Object && "eslintLegacyConfigWarning" in config && config.eslintLegacyConfigWarning) {
     showLegacyEslintDeprecationWarning(legacyConfigFiles);
   }
   try {

package/dist/commands/prerenderHandler.js

@@ -96,7 +96,6 @@ const getTasks = async (dryrun, routerPathFilter = null) => {
   const detector = projectIsEsm() ? await import("@cedarjs/prerender/detection") : await import("@cedarjs/prerender/cjs/detection");
   const detectedRoutes = detector.detectPrerenderRoutes();
   const prerenderRoutes = detectedRoutes.filter(hasPath).map(normalizeRoute);
-  const indexHtmlPath = path.join(getPaths().web.dist, "index.html");
   if (prerenderRoutes.length === 0) {
     console.log("\nSkipping prerender...");
     console.log(
@@ -106,6 +105,7 @@ const getTasks = async (dryrun, routerPathFilter = null) => {
     );
     return [];
   }
+  const indexHtmlPath = path.join(getPaths().web.dist, "index.html");
   if (!fs.existsSync(indexHtmlPath)) {
     console.error(
       "You must run `yarn cedar build web` before trying to prerender."
@@ -129,7 +129,7 @@ const getTasks = async (dryrun, routerPathFilter = null) => {
       return [
         {
           title: title(0),
-          task: async (_ctx, task) => {
+          task: async (_, task) => {
             for (let i = 0; i < routesToPrerender.length; i++) {
               const routeToPrerender = routesToPrerender[i];
               if (routerPathFilter && routeToPrerender.path !== routerPathFilter) {
@@ -216,8 +216,11 @@ const diagnosticCheck = () => {
     console.log("\u2714 Diagnostics checks passed \n");
   }
 };
+const hasUnexpandedPathParams = (routePath) => {
+  return /\{.*}/.test(routePath);
+};
 const prerenderRoute = async (prerenderer, queryCache, routeToPrerender, dryrun, outputHtmlPath) => {
-  if (/\{.*}/.test(routeToPrerender.path)) {
+  if (hasUnexpandedPathParams(routeToPrerender.path)) {
     throw new PathParamError(
       `Could not retrieve route parameters for ${routeToPrerender.path}`
     );
@@ -227,7 +230,7 @@ const prerenderRoute = async (prerenderer, queryCache, routeToPrerender, dryrun,
       queryCache,
       renderPath: routeToPrerender.path
     });
-    if (!dryrun) {
+    if (!dryrun && typeof prerenderedHtml === "string") {
       prerenderer.writePrerenderedHtmlFile(outputHtmlPath, prerenderedHtml);
     }
   } catch (error) {
@@ -236,9 +239,8 @@ const prerenderRoute = async (prerenderer, queryCache, routeToPrerender, dryrun,
       c.warning("You can use `yarn cedar prerender --dry-run` to debug")
     );
     console.log();
-    console.log(
-      `${c.info("-".repeat(10))} Error rendering path "${routeToPrerender.path}" ${c.info("-".repeat(10))}`
-    );
+    const sep = c.info("-".repeat(10));
+    console.log(`${sep} Error rendering path "${routeToPrerender.path}" ${sep}`);
     errorTelemetry(
       process.argv,
       `Error prerendering: ${getErrorMessage(error)}`
@@ -269,6 +271,7 @@ const handler = async ({
   const listrTasks = await getTasks(dryRun, routerPath ?? null);
   const tasks = new Listr(listrTasks, {
     renderer: verbose ? "verbose" : "default",
+    rendererOptions: { collapseSubtasks: false },
     concurrent: false
   });
   try {
@@ -289,7 +292,7 @@ const handler = async ({
     } else {
       console.log(
         c.info(
-          `- This could mean that a library you're using does not support SSR.`
+          "- This could mean that a library you're using does not support SSR."
         )
       );
       console.log(
@@ -308,5 +311,7 @@ const handler = async ({
   }
 };
 export {
-  handler
+  getTasks,
+  handler,
+  hasUnexpandedPathParams
 };

package/dist/commands/type-checkHandler.js

@@ -1,4 +1,4 @@
-import path from "path";
+import path from "node:path";
 import concurrently from "concurrently";
 import execa from "execa";
 import { Listr } from "listr2";
@@ -48,9 +48,7 @@ const handler = async ({
     return conclusiveExitCode;
   };
   if (generate && prisma) {
-    await generatePrismaClient({
-      verbose
-    });
+    await generatePrismaClient({ verbose });
   }
   if (generate) {
     await new Listr(
@@ -64,7 +62,8 @@ const handler = async ({
         }
       ],
       {
-        renderer: verbose ? "verbose" : void 0
+        renderer: verbose ? "verbose" : "default",
+        rendererOptions: { collapseSubtasks: false }
       }
     ).run();
   }

package/dist/commands/upgrade/upgradeHandler.js

@@ -331,6 +331,11 @@ async function updatePackageVersionsFromTemplate(ctx, { dryRun, verbose }) {
         title: `Updating ${pkgJsonPath}`,
         task: async (_ctx, task) => {
           const res = await fetch(url);
+          if (!res.ok) {
+            throw new Error(
+              `Failed to fetch template package.json from ${url}: ` + res.statusText
+            );
+          }
           const text = await res.text();
           const templatePackageJson = JSON.parse(text);
           const localPackageJsonText = fs.readFileSync(pkgJsonPath, "utf-8");
@@ -380,16 +385,19 @@ async function downloadYarnPatches(ctx, { dryRun, verbose }) {
     throw new Error("Failed to upgrade");
   }
   const githubToken = process.env.GH_TOKEN || process.env.GITHUB_TOKEN || process.env.REDWOOD_GITHUB_TOKEN;
-  const res = await fetch(
-    "https://api.github.com/repos/cedarjs/cedar/git/trees/main?recursive=1",
-    {
-      headers: {
-        ...githubToken && { Authorization: `Bearer ${githubToken}` },
-        ["X-GitHub-Api-Version"]: "2022-11-28",
-        Accept: "application/vnd.github+json"
-      }
+  const url = "https://api.github.com/repos/cedarjs/cedar/git/trees/main?recursive=1";
+  const res = await fetch(url, {
+    headers: {
+      ...githubToken && { Authorization: `Bearer ${githubToken}` },
+      ["X-GitHub-Api-Version"]: "2022-11-28",
+      Accept: "application/vnd.github+json"
     }
-  );
+  });
+  if (!res.ok) {
+    throw new Error(
+      `Failed to fetch list of yarn patches from ${url}: ` + res.statusText
+    );
+  }
   const json = await res.json();
   const patches = json.tree?.filter(
     (patchInfo) => patchInfo.path.startsWith(
@@ -409,6 +417,11 @@ async function downloadYarnPatches(ctx, { dryRun, verbose }) {
         title: `Downloading ${patch.path}`,
         task: async () => {
           const res2 = await fetch(patch.url);
+          if (!res2.ok) {
+            throw new Error(
+              `Failed to fetch patch metadata from ${patch.url}: ` + res2.statusText
+            );
+          }
           const patchMeta = await res2.json();
           const patchPath = path.join(
             getPaths().base,

package/dist/lib/generatePrismaClient.js

@@ -20,8 +20,8 @@ const generatePrismaClient = async ({
   silent = false
 } = {}) => {
   if (!force) {
-    const prismaClientPath = await resolveGeneratedPrismaClient();
-    const prismaClientFile = prismaClientPath && fs.existsSync(prismaClientPath) ? fs.readFileSync(prismaClientPath, "utf8") : "";
+    const { clientPath } = await resolveGeneratedPrismaClient();
+    const prismaClientFile = clientPath && fs.existsSync(clientPath) ? fs.readFileSync(clientPath, "utf8") : "";
     if (!prismaClientFile.includes("@prisma/client did not initialize yet.") && prismaClientFile.includes("exports.Prisma.")) {
       return;
     }

package/dist/testLib/cells.js

@@ -117,9 +117,11 @@ const getCellGqlQuery = (ast) => {
   traverse(ast, {
     ExportNamedDeclaration({ node }) {
       if (node.exportKind === "value" && types.isVariableDeclaration(node.declaration)) {
-        const exportedQueryNode = node.declaration.declarations.find((d) => {
-          return types.isIdentifier(d.id) && d.id.name === "QUERY" && types.isTaggedTemplateExpression(d.init);
-        });
+        const exportedQueryNode = node.declaration.declarations.find(
+          (d) => {
+            return types.isIdentifier(d.id) && d.id.name === "QUERY" && types.isTaggedTemplateExpression(d.init);
+          }
+        );
         if (exportedQueryNode) {
           const templateExpression = exportedQueryNode.init;
           cellQuery = templateExpression.quasi.quasis[0].value.raw;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "3.0.0-canary.13612+d0187ae49",
+  "version": "3.0.0-canary.13614+99cf90d23",
   "description": "The CedarJS Command Line",
   "repository": {
     "type": "git",
@@ -33,16 +33,16 @@
   "dependencies": {
     "@babel/parser": "7.29.0",
     "@babel/preset-typescript": "7.28.5",
-    "@cedarjs/api-server": "3.0.0-canary.13612",
-    "@cedarjs/cli-helpers": "3.0.0-canary.13612",
-    "@cedarjs/fastify-web": "3.0.0-canary.13612",
-    "@cedarjs/internal": "3.0.0-canary.13612",
-    "@cedarjs/prerender": "3.0.0-canary.13612",
-    "@cedarjs/project-config": "3.0.0-canary.13612",
-    "@cedarjs/structure": "3.0.0-canary.13612",
-    "@cedarjs/telemetry": "3.0.0-canary.13612",
-    "@cedarjs/utils": "3.0.0-canary.13612",
-    "@cedarjs/web-server": "3.0.0-canary.13612",
+    "@cedarjs/api-server": "3.0.0-canary.13614",
+    "@cedarjs/cli-helpers": "3.0.0-canary.13614",
+    "@cedarjs/fastify-web": "3.0.0-canary.13614",
+    "@cedarjs/internal": "3.0.0-canary.13614",
+    "@cedarjs/prerender": "3.0.0-canary.13614",
+    "@cedarjs/project-config": "3.0.0-canary.13614",
+    "@cedarjs/structure": "3.0.0-canary.13614",
+    "@cedarjs/telemetry": "3.0.0-canary.13614",
+    "@cedarjs/utils": "3.0.0-canary.13614",
+    "@cedarjs/web-server": "3.0.0-canary.13614",
     "@listr2/prompt-adapter-enquirer": "4.2.1",
     "@opentelemetry/api": "1.9.0",
     "@opentelemetry/core": "1.30.1",
@@ -105,5 +105,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "d0187ae49d6230bf844cb017d87bce7c49b9140c"
+  "gitHead": "99cf90d2348c5ba8f3f2f6883bfb629566114ad5"
 }