@cedarjs/cli 3.0.0-canary.13548 → 3.0.0-canary.13549

package/dist/commands/build.js

@@ -9,7 +9,8 @@ const builder = (yargs) => {
   yargs.positional("workspace", {
     default: ["api", "web", "packages/*"],
     description: "What workspace(s) to build. Valid values are: web, api, packages/*, <package-name>",
-    type: "array"
+    type: "string",
+    array: true
   }).option("verbose", {
     alias: "v",
     default: false,

package/dist/commands/generate.js

@@ -22,12 +22,19 @@ import * as generateService from "./generate/service/service.js";
 const command = "generate <type>";
 const aliases = ["g"];
 const description = "Generate boilerplate code and type definitions";
+const getExitCode = (error) => {
+  if (typeof error !== "object" || error === null) {
+    return void 0;
+  }
+  const exitCode = Reflect.get(error, "exitCode");
+  return typeof exitCode === "number" ? exitCode : void 0;
+};
 const builder = (yargs) => yargs.command("types", "Generate supplementary code", {}, () => {
   recordTelemetryAttributes({ command: "generate types" });
   try {
     execa.sync("yarn", ["rw-gen"], { stdio: "inherit" });
   } catch (error) {
-    process.exitCode = error.exitCode ?? 1;
+    process.exitCode = getExitCode(error) ?? 1;
   }
 }).command(generateCell).command(generateComponent).command(generateDataMigration).command(generateDbAuth).command(generateDirective).command(generateFunction).command(generateJob).command(generateLayout).command(generateModel).command(generateOgImage).command(generatePackage).command(generatePage).command(generateRealtime).command(generateScaffold).command(generateScript).command(generateSdl).command(generateSecret).command(generateService).demandCommand().epilogue(
   `Also see the ${terminalLink(

package/dist/commands/jobsHandler.js

@@ -6,10 +6,12 @@ const handler = async ({
   commands: _commands,
   ...options
 }) => {
-  const args = [_.pop()];
+  const positionalArgs = Array.isArray(_) ? [..._] : [];
+  const commandArg = positionalArgs.pop();
+  const args = [commandArg == null ? "" : String(commandArg)];
   for (const [name, value] of Object.entries(options)) {
     args.push(name.length > 1 ? `--${name}` : `-${name}`);
-    args.push(value);
+    args.push(String(value));
   }
   let command = `yarn rw-jobs ${args.join(" ")}`;
   const originalLogLevel = process.env.LOG_LEVEL;

package/dist/commands/prerenderHandler.js

@@ -1,5 +1,5 @@
 import fs from "node:fs";
-import path from "path";
+import path from "node:path";
 import { Listr } from "listr2";
 import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
 import { getConfig, getPaths, projectIsEsm } from "@cedarjs/project-config";
@@ -9,12 +9,33 @@ import { runScriptFunction } from "../lib/exec.js";
 import { configureBabel } from "../lib/execBabel.js";
 class PathParamError extends Error {
 }
+const hasPath = (route) => {
+  return typeof route.path === "string" && route.path.length > 0;
+};
+const normalizeRoute = (route) => {
+  const normalizedPath = route.path;
+  const normalizedName = typeof route.name === "string" ? route.name : normalizedPath;
+  const normalizedRoutePath = typeof route.routePath === "string" ? route.routePath : normalizedPath;
+  const normalizedFilePath = typeof route.filePath === "string" ? route.filePath : "";
+  return {
+    ...route,
+    name: normalizedName,
+    path: normalizedPath,
+    routePath: normalizedRoutePath,
+    filePath: normalizedFilePath
+  };
+};
+const getErrorMessage = (error) => {
+  return error instanceof Error ? error.message : String(error);
+};
+const getErrorStack = (error) => {
+  return error instanceof Error ? error.stack ?? error.message : String(error);
+};
 const mapRouterPathToHtml = (routerPath) => {
   if (routerPath === "/") {
     return "web/dist/index.html";
-  } else {
-    return `web/dist${routerPath}.html`;
   }
+  return `web/dist${routerPath}.html`;
 };
 function getRouteHooksFilePath(routeFilePath) {
   const routeHooksFilePathTs = routeFilePath.replace(
@@ -49,27 +70,32 @@ async function expandRouteParameters(route) {
         filePath: route.filePath
       }
     });
-    if (routeParameters) {
+    if (Array.isArray(routeParameters)) {
       return routeParameters.map((pathParamValues) => {
         let newPath = route.path;
-        Object.entries(pathParamValues).forEach(([paramName, paramValue]) => {
-          newPath = newPath.replace(
-            new RegExp(`{${paramName}:?[^}]*}`),
-            paramValue
+        if (typeof pathParamValues === "object" && pathParamValues !== null && !Array.isArray(pathParamValues)) {
+          Object.entries(pathParamValues).forEach(
+            ([paramName, paramValue]) => {
+              newPath = newPath.replace(
+                new RegExp(`{${paramName}:?[^}]*}`),
+                String(paramValue)
+              );
+            }
           );
-        });
+        }
         return { ...route, path: newPath };
       });
     }
-  } catch (e) {
-    console.error(c.error(e.stack));
+  } catch (error) {
+    console.error(c.error(getErrorStack(error)));
     return [route];
   }
   return [route];
 }
 const getTasks = async (dryrun, routerPathFilter = null) => {
   const detector = projectIsEsm() ? await import("@cedarjs/prerender/detection") : await import("@cedarjs/prerender/cjs/detection");
-  const prerenderRoutes = detector.detectPrerenderRoutes().filter((route) => route.path);
+  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...");
@@ -103,7 +129,7 @@ const getTasks = async (dryrun, routerPathFilter = null) => {
       return [
         {
           title: title(0),
-          task: async (_, task) => {
+          task: async (_ctx, task) => {
             for (let i = 0; i < routesToPrerender.length; i++) {
               const routeToPrerender = routesToPrerender[i];
               if (routerPathFilter && routeToPrerender.path !== routerPathFilter) {
@@ -125,7 +151,7 @@ const getTasks = async (dryrun, routerPathFilter = null) => {
         }
       ];
     }
-    return routesToPrerender.map((routeToPrerender) => {
+    return routesToPrerender.flatMap((routeToPrerender) => {
       if (routerPathFilter && routeToPrerender.path !== routerPathFilter) {
         return [];
       }
@@ -174,7 +200,7 @@ const diagnosticCheck = () => {
     }
   ];
   console.log("Running diagnostic checks");
-  if (checks.some((checks2) => checks2.failure)) {
+  if (checks.some((check) => check.failure)) {
     console.error(c.error("node_modules are being duplicated in `./web` \n"));
     console.log("\u26A0\uFE0F  Issues found: ");
     console.log("-".repeat(50));
@@ -210,7 +236,7 @@ const prerenderRoute = async (prerenderer, queryCache, routeToPrerender, dryrun,
     if (!dryrun) {
       prerenderer.writePrerenderedHtmlFile(outputHtmlPath, prerenderedHtml);
     }
-  } catch (e) {
+  } catch (error) {
     console.log();
     console.log(
       c.warning("You can use `yarn cedar prerender --dry-run` to debug")
@@ -219,13 +245,20 @@ const prerenderRoute = async (prerenderer, queryCache, routeToPrerender, dryrun,
     console.log(
       `${c.info("-".repeat(10))} Error rendering path "${routeToPrerender.path}" ${c.info("-".repeat(10))}`
     );
-    errorTelemetry(process.argv, `Error prerendering: ${e.message}`);
-    console.error(c.error(e.stack));
+    errorTelemetry(
+      process.argv,
+      `Error prerendering: ${getErrorMessage(error)}`
+    );
+    console.error(c.error(getErrorStack(error)));
     console.log();
     throw new Error(`Failed to render "${routeToPrerender.filePath}"`);
   }
 };
-const handler = async ({ path: routerPath, dryRun, verbose }) => {
+const handler = async ({
+  path: routerPath,
+  dryRun = false,
+  verbose = false
+}) => {
   if (getConfig().experimental?.streamingSsr?.enabled) {
     console.log(
       c.warning(
@@ -239,10 +272,9 @@ const handler = async ({ path: routerPath, dryRun, verbose }) => {
     dryRun,
     verbose
   });
-  const listrTasks = await getTasks(dryRun, routerPath);
+  const listrTasks = await getTasks(dryRun, routerPath ?? null);
   const tasks = new Listr(listrTasks, {
     renderer: verbose ? "verbose" : "default",
-    rendererOptions: { collapseSubtasks: false },
     concurrent: false
   });
   try {
@@ -250,11 +282,11 @@ const handler = async ({ path: routerPath, dryRun, verbose }) => {
       console.log(c.info("::: Dry run, not writing changes :::"));
     }
     await tasks.run();
-  } catch (e) {
+  } catch (error) {
     console.log();
-    await diagnosticCheck();
+    diagnosticCheck();
     console.log(c.warning("Tips:"));
-    if (e instanceof PathParamError) {
+    if (error instanceof PathParamError) {
       console.log(
         c.info(
           "- You most likely need to add or update a *.routeHooks.{js,ts} file next to the Page you're trying to prerender"
@@ -282,6 +314,5 @@ const handler = async ({ path: routerPath, dryRun, verbose }) => {
   }
 };
 export {
-  getTasks,
   handler
 };

package/dist/commands/prismaHandler.js

@@ -1,58 +1,81 @@
 import fs from "node:fs";
-import path from "path";
+import path from "node:path";
 import boxen from "boxen";
 import execa from "execa";
 import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import c from "../lib/colors.js";
 import { getPaths } from "../lib/index.js";
-const handler = async ({ _, $0, commands = [], ...options }) => {
+const getErrorMessage = (error) => {
+  return error instanceof Error ? error.message : String(error);
+};
+function getExitCode(value) {
+  if (!value || typeof value !== "object" || !("exitCode" in value) || typeof value.exitCode !== "number") {
+    return void 0;
+  }
+  return value.exitCode;
+}
+const handler = async ({
+  _: _positionals,
+  $0: _binName,
+  commands = [],
+  ...options
+}) => {
   recordTelemetryAttributes({
     command: "prisma"
   });
-  const rwjsPaths = getPaths();
-  const helpIndex = commands.indexOf("help");
+  const cedarPaths = getPaths();
+  const args = [...Array.isArray(commands) ? commands : []].filter(
+    (value) => typeof value === "string"
+  );
+  const helpIndex = args.indexOf("help");
   if (helpIndex !== -1) {
     options.help = true;
-    commands.splice(helpIndex, 1);
+    args.splice(helpIndex, 1);
   }
   const hasHelpOption = options.help || options.h;
   if (!hasHelpOption) {
-    if (!fs.existsSync(rwjsPaths.api.prismaConfig)) {
+    if (!fs.existsSync(cedarPaths.api.prismaConfig)) {
       console.error();
       console.error(c.error("No Prisma config file found."));
-      console.error(`Cedar searched here '${rwjsPaths.api.prismaConfig}'`);
+      console.error(`Cedar searched here '${cedarPaths.api.prismaConfig}'`);
       console.error();
       process.exit(1);
     }
-    options.config = `${rwjsPaths.api.prismaConfig}`;
+    options.config = `${cedarPaths.api.prismaConfig}`;
   }
-  const args = commands;
   for (const [name, value] of Object.entries(options)) {
     args.push(name.length > 1 ? `--${name}` : `-${name}`);
     if (typeof value === "string") {
-      value.split(" ").length > 1 ? args.push(`"${value}"`) : args.push(value);
+      if (value.split(" ").length > 1) {
+        args.push(`"${value}"`);
+      } else {
+        args.push(value);
+      }
     } else if (typeof value === "number") {
-      args.push(value);
+      args.push(String(value));
     }
   }
   console.log();
   console.log(c.note("Running Prisma CLI..."));
-  console.log(c.underline("$ yarn prisma " + args.join(" ")));
+  console.log(c.underline(`$ yarn prisma ${args.join(" ")}`));
   console.log();
   try {
-    const prismaBin = path.join(rwjsPaths.base, "node_modules/.bin/prisma");
+    const prismaBin = path.join(cedarPaths.base, "node_modules/.bin/prisma");
     execa.sync(prismaBin, args, {
-      cwd: rwjsPaths.base,
+      cwd: cedarPaths.base,
       stdio: "inherit",
       cleanup: true
     });
-    if (hasHelpOption || commands.length === 0) {
+    if (hasHelpOption || args.length === 0) {
       printWrapInfo();
     }
-  } catch (e) {
-    errorTelemetry(process.argv, `Error generating prisma client: ${e.message}`);
-    process.exit(e?.exitCode || 1);
+  } catch (error) {
+    errorTelemetry(
+      process.argv,
+      `Error generating prisma client: ${getErrorMessage(error)}`
+    );
+    process.exit(getExitCode(error) ?? 1);
   }
 };
 const printWrapInfo = () => {

package/dist/commands/testHandler.js

@@ -1,5 +1,5 @@
 import fs from "node:fs";
-import path from "path";
+import path from "node:path";
 import execa from "execa";
 import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
 import { ensurePosixPath } from "@cedarjs/project-config";
@@ -7,6 +7,15 @@ import { errorTelemetry, timedTelemetry } from "@cedarjs/telemetry";
 import c from "../lib/colors.js";
 import { getPaths } from "../lib/index.js";
 import * as project from "../lib/project.js";
+function hasStringMessage(value) {
+  return typeof value === "object" && value !== null && "message" in value && value.message === "string";
+}
+function getExitCode(value) {
+  if (!value || typeof value !== "object" || !("exitCode" in value) || typeof value.exitCode !== "number") {
+    return void 0;
+  }
+  return value.exitCode;
+}
 function isInGitRepository() {
   try {
     execa.commandSync("git rev-parse --is-inside-work-tree");
@@ -24,25 +33,24 @@ function isInMercurialRepository() {
   }
 }
 function isJestConfigFile(sides) {
-  for (let side of sides) {
+  for (const side of sides) {
     try {
-      if (sides.includes(side)) {
-        const jestConfigExists = fs.existsSync(path.join(side, "jest.config.js")) || fs.existsSync(path.join(side, "jest.config.ts"));
-        if (!jestConfigExists) {
-          console.error(
-            c.error(
-              `
+      const jestConfigExists = fs.existsSync(path.join(side, "jest.config.js")) || fs.existsSync(path.join(side, "jest.config.ts"));
+      if (!jestConfigExists) {
+        console.error(
+          c.error(
+            `
 Error: Missing Jest config file ${side}/jest.config.js
 To add this file, run \`npx @cedarjs/codemods update-jest-config\`
 `
-            )
-          );
-          throw new Error(`Error: Jest config file not found in ${side} side`);
-        }
+          )
+        );
+        throw new Error(`Error: Jest config file not found in ${side} side`);
       }
-    } catch (e) {
-      errorTelemetry(process.argv, e.message);
-      process.exit(e?.exitCode || 1);
+    } catch (error) {
+      const message = hasStringMessage(error) ? error.message : `Error: Jest config file not found in ${side} side`;
+      errorTelemetry(process.argv, message);
+      process.exit(getExitCode(error) ?? 1);
     }
   }
 }
@@ -70,15 +78,13 @@ const handler = async ({
       "_"
     ].includes(flagName)) {
       return [];
-    } else {
-      const flag = flagName.length > 1 ? `--${flagName}` : `-${flagName}`;
-      const flagValue = others[flagName];
-      if (Array.isArray(flagValue)) {
-        return flagValue.flatMap((val) => [flag, val]);
-      } else {
-        return [flag, flagValue];
-      }
     }
+    const flag = flagName.length > 1 ? `--${flagName}` : `-${flagName}`;
+    const flagValue = others[flagName];
+    if (Array.isArray(flagValue)) {
+      return flagValue.flatMap((val) => [flag, val]);
+    }
+    return [flag, flagValue];
   });
   const sides = filterParams.filter(
     (filterString) => project.workspaces().includes(filterString)
@@ -117,7 +123,7 @@ const handler = async ({
       await execa("yarn", ["jest", ...jestArgs], {
         cwd: rwjsPaths.base,
         stdio: "inherit",
-        env: { DATABASE_URL }
+        env: { ...process.env, DATABASE_URL }
       });
     };
     if (watch) {
@@ -127,9 +133,10 @@ const handler = async ({
         await runCommand();
       });
     }
-  } catch (e) {
-    errorTelemetry(process.argv, e.message);
-    process.exit(e?.exitCode || 1);
+  } catch (error) {
+    const message = hasStringMessage(error) ? error.message : "Test command failed";
+    errorTelemetry(process.argv, message);
+    process.exit(getExitCode(error) ?? 1);
   }
 };
 export {

package/dist/commands/testHandlerEsm.js

@@ -4,6 +4,15 @@ import { ensurePosixPath } from "@cedarjs/project-config";
 import { errorTelemetry, timedTelemetry } from "@cedarjs/telemetry";
 import { getPaths } from "../lib/index.js";
 import * as project from "../lib/project.js";
+function hasStringMessage(value) {
+  return typeof value === "object" && value !== null && "message" in value && value.message === "string";
+}
+function getExitCode(value) {
+  if (!value || typeof value !== "object" || !("exitCode" in value) || typeof value.exitCode !== "number") {
+    return void 0;
+  }
+  return value.exitCode;
+}
 const handler = async ({
   filter: filterParams = [],
   dbPush = true,
@@ -18,20 +27,18 @@ const handler = async ({
   const forwardVitestFlags = Object.keys(others).flatMap((flagName) => {
     if (["db-push", "loadEnvFiles", "$0", "_"].includes(flagName)) {
       return [];
-    } else {
-      const flag = flagName.length > 1 ? `--${flagName}` : `-${flagName}`;
-      const flagValue = others[flagName];
-      if (flagName === "watch") {
-        watch = flagValue === true;
-      } else if (flagName === "run" && flagValue) {
-        watch = false;
-      }
-      if (Array.isArray(flagValue)) {
-        return flagValue.flatMap((val) => [flag, val]);
-      } else {
-        return [flag, flagValue];
-      }
     }
+    const flag = flagName.length > 1 ? `--${flagName}` : `-${flagName}`;
+    const flagValue = others[flagName];
+    if (flagName === "watch") {
+      watch = flagValue === true;
+    } else if (flagName === "run" && flagValue) {
+      watch = false;
+    }
+    if (Array.isArray(flagValue)) {
+      return flagValue.flatMap((val) => [flag, val]);
+    }
+    return [flag, flagValue];
   });
   const sides = filterParams.filter(
     (filterString) => project.workspaces().includes(filterString)
@@ -65,7 +72,7 @@ const handler = async ({
       await execa("yarn", ["vitest", ...vitestArgs], {
         cwd: rwjsPaths.base,
         stdio: "inherit",
-        env: { DATABASE_URL }
+        env: { ...process.env, DATABASE_URL }
       });
     };
     if (watch) {
@@ -75,9 +82,10 @@ const handler = async ({
         await runCommand();
       });
     }
-  } catch (e) {
-    errorTelemetry(process.argv, e.message);
-    process.exit(e?.exitCode || 1);
+  } catch (error) {
+    const message = hasStringMessage(error) ? error.message : "Test command failed";
+    errorTelemetry(process.argv, message);
+    process.exit(getExitCode(error) ?? 1);
   }
 };
 export {

package/dist/commands/type-checkHandler.js

@@ -5,21 +5,32 @@ import { Listr } from "listr2";
 import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
 import { generatePrismaClient } from "../lib/generatePrismaClient.js";
 import { getPaths } from "../lib/index.js";
-const handler = async ({ sides, verbose, prisma, generate }) => {
+const isConcurrentlyErrorArray = (value) => {
+  return Array.isArray(value);
+};
+const handler = async ({
+  sides,
+  verbose = false,
+  prisma = true,
+  generate = true
+}) => {
+  const selectedSides = (Array.isArray(sides) ? sides : []).filter(
+    (side) => typeof side === "string"
+  );
   recordTelemetryAttributes({
     command: "type-check",
-    sides: JSON.stringify(sides),
+    sides: JSON.stringify(selectedSides),
     verbose,
     prisma,
     generate
   });
   const typeCheck = async () => {
     let conclusiveExitCode = 0;
-    const tscForAllSides = sides.map((side) => {
+    const tscForAllSides = selectedSides.map((side) => {
       const projectDir = path.join(getPaths().base, side);
       return {
         cwd: projectDir,
-        command: `yarn tsc --noEmit --skipLibCheck`
+        command: "yarn tsc --noEmit --skipLibCheck"
       };
     });
     const { result } = concurrently(tscForAllSides, {
@@ -28,9 +39,9 @@ const handler = async ({ sides, verbose, prisma, generate }) => {
     });
     try {
       await result;
-    } catch (err) {
-      if (err.length) {
-        const exitCodes = err.map((e) => e?.exitCode).filter(Boolean);
+    } catch (error) {
+      if (isConcurrentlyErrorArray(error)) {
+        const exitCodes = error.map((entry) => entry.exitCode).filter((exitCode2) => Boolean(exitCode2));
         conclusiveExitCode = Math.max(...exitCodes);
       }
     }
@@ -53,8 +64,7 @@ const handler = async ({ sides, verbose, prisma, generate }) => {
         }
       ],
       {
-        renderer: verbose && "verbose",
-        rendererOptions: { collapseSubtasks: false }
+        renderer: verbose ? "verbose" : void 0
       }
     ).run();
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "3.0.0-canary.13548+640c21b6b",
+  "version": "3.0.0-canary.13549+6a5f903e0",
   "description": "The CedarJS Command Line",
   "repository": {
     "type": "git",
@@ -34,16 +34,16 @@
     "@babel/parser": "7.29.0",
     "@babel/preset-typescript": "7.28.5",
     "@babel/runtime-corejs3": "7.29.0",
-    "@cedarjs/api-server": "3.0.0-canary.13548",
-    "@cedarjs/cli-helpers": "3.0.0-canary.13548",
-    "@cedarjs/fastify-web": "3.0.0-canary.13548",
-    "@cedarjs/internal": "3.0.0-canary.13548",
-    "@cedarjs/prerender": "3.0.0-canary.13548",
-    "@cedarjs/project-config": "3.0.0-canary.13548",
-    "@cedarjs/structure": "3.0.0-canary.13548",
-    "@cedarjs/telemetry": "3.0.0-canary.13548",
-    "@cedarjs/utils": "3.0.0-canary.13548",
-    "@cedarjs/web-server": "3.0.0-canary.13548",
+    "@cedarjs/api-server": "3.0.0-canary.13549",
+    "@cedarjs/cli-helpers": "3.0.0-canary.13549",
+    "@cedarjs/fastify-web": "3.0.0-canary.13549",
+    "@cedarjs/internal": "3.0.0-canary.13549",
+    "@cedarjs/prerender": "3.0.0-canary.13549",
+    "@cedarjs/project-config": "3.0.0-canary.13549",
+    "@cedarjs/structure": "3.0.0-canary.13549",
+    "@cedarjs/telemetry": "3.0.0-canary.13549",
+    "@cedarjs/utils": "3.0.0-canary.13549",
+    "@cedarjs/web-server": "3.0.0-canary.13549",
     "@listr2/prompt-adapter-enquirer": "4.2.1",
     "@opentelemetry/api": "1.9.0",
     "@opentelemetry/core": "1.30.1",
@@ -107,5 +107,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "640c21b6bd150b25ce71903b9d155bf20ceb806b"
+  "gitHead": "6a5f903e06fa7aeeb9cf70876341141cb7e5fc00"
 }