@cedarjs/cli 3.0.0-canary.13426 → 3.0.0-canary.13428

package/dist/commands/consoleHandler.js

@@ -24,10 +24,10 @@ const loadConsoleHistory = async (r) => {
   try {
     const history = await fs.promises.readFile(consoleHistoryFile, "utf8");
     history.split("\n").reverse().map((line) => r.history.push(line));
-  } catch (e) {
+  } catch {
   }
 };
-const handler = () => {
+const handler = (_options) => {
   recordTelemetryAttributes({
     command: "console"
   });
@@ -46,19 +46,20 @@ const handler = () => {
   });
   const r = repl.start();
   const defaultEval = r.eval;
-  r.eval = (cmd, context, filename, callback) => {
-    defaultEval(cmd, context, filename, async (err, result) => {
+  const asyncEval = (cmd, context, filename, callback) => {
+    defaultEval.call(r, cmd, context, filename, async (err, result) => {
       if (err) {
-        callback(err);
+        callback(err, null);
       } else {
         try {
           callback(null, await Promise.resolve(result));
-        } catch (err2) {
-          callback(err2);
+        } catch (error) {
+          callback(error, null);
         }
       }
     });
   };
+  r.eval = asyncEval;
   loadConsoleHistory(r);
   r.addListener("close", () => persistConsoleHistory(r));
   loadPrismaClient(r.context);

package/dist/commands/deploy/render.js

@@ -1,6 +1,6 @@
 import { terminalLink } from "termi-link";
 if (process.argv.slice(2).includes("api")) {
-  process.env.REDWOOD_DISABLE_TELEMETRY = 1;
+  process.env.REDWOOD_DISABLE_TELEMETRY = "1";
 }
 const command = "render <side>";
 const description = "Build, migrate, and serve command for Render deploy";

package/dist/commands/execHandler.js

@@ -10,18 +10,21 @@ import { runScriptFunction } from "../lib/exec.js";
 import { generatePrismaClient } from "../lib/generatePrismaClient.js";
 import { getPaths } from "../lib/index.js";
 const printAvailableScriptsToConsole = () => {
-  const scripts = findScripts(getPaths().scripts).reduce((acc, scriptPath) => {
-    const relativePath = path.relative(getPaths().scripts, scriptPath);
-    const ext = path.parse(relativePath).ext;
-    const pathNoExt = relativePath.slice(0, -ext.length);
-    acc[pathNoExt] ||= [];
-    acc[pathNoExt].push(relativePath);
-    return acc;
-  }, {});
+  const scripts = findScripts(getPaths().scripts).reduce(
+    (acc, scriptPath) => {
+      const relativePath = path.relative(getPaths().scripts, scriptPath);
+      const ext = path.parse(relativePath).ext;
+      const pathNoExt = relativePath.slice(0, -ext.length);
+      acc[pathNoExt] ||= [];
+      acc[pathNoExt].push(relativePath);
+      return acc;
+    },
+    {}
+  );
   console.log("Available scripts:");
-  Object.entries(scripts).forEach(([name, paths]) => {
-    if (paths.length > 1) {
-      paths.forEach((scriptPath) => {
+  Object.entries(scripts).forEach(([name, scriptPaths]) => {
+    if (scriptPaths.length > 1) {
+      scriptPaths.forEach((scriptPath) => {
         console.log(c.info(`- ${scriptPath}`));
       });
     } else {
@@ -41,7 +44,7 @@ const handler = async (args) => {
     printAvailableScriptsToConsole();
     return;
   }
-  scriptArgs._ = scriptArgs._.slice(1);
+  scriptArgs._ = (Array.isArray(scriptArgs._) ? scriptArgs._ : []).slice(1);
   delete scriptArgs.$0;
   delete scriptArgs.l;
   delete scriptArgs.s;
@@ -59,7 +62,7 @@ No script called \`${name}\` in the ./scripts folder.
   const scriptTasks = [
     {
       title: "Generating Prisma client",
-      enabled: () => prisma,
+      enabled: () => Boolean(prisma),
       task: () => generatePrismaClient({
         force: false,
         verbose: !args.silent,
@@ -75,15 +78,15 @@ No script called \`${name}\` in the ./scripts folder.
             functionName: "default",
             args: { args: scriptArgs }
           });
-        } catch (e) {
-          console.error(c.error(`Error in script: ${e.message}`));
-          throw e;
+        } catch (error) {
+          const message = error instanceof Error ? error.message : String(error);
+          console.error(c.error(`Error in script: ${message}`));
+          throw error;
         }
       }
     }
   ];
   const tasks = new Listr(scriptTasks, {
-    rendererOptions: { collapseSubtasks: false },
     renderer: args.silent ? "silent" : "verbose"
   });
   await context.with(suppressTracing(context.active()), async () => {
@@ -98,9 +101,9 @@ function resolveScriptPath(name) {
   const extensions = [".js", ".jsx", ".ts", ".tsx"];
   const matches = [];
   for (const extension of extensions) {
-    const p = scriptPath + extension;
-    if (fs.existsSync(p)) {
-      matches.push(p);
+    const candidate = scriptPath + extension;
+    if (fs.existsSync(candidate)) {
+      matches.push(candidate);
     }
   }
   if (matches.length === 1) {

package/dist/commands/generate/script/scriptHandler.js

@@ -35,7 +35,10 @@ const files = async ({ name, typescript = false }) => {
     }
   };
 };
-const handler = async ({ force, ...args }) => {
+const handler = async ({
+  force,
+  ...args
+}) => {
   recordTelemetryAttributes({
     command: "generate script",
     force,
@@ -74,9 +77,10 @@ const handler = async ({ force, ...args }) => {
       prepareForRollback(tasks);
     }
     await tasks.run();
-  } catch (e) {
-    errorTelemetry(process.argv, e.message);
-    console.log(c.error(e.message));
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    errorTelemetry(process.argv, message);
+    console.log(c.error(message));
     process.exit(1);
   }
 };

package/dist/commands/lint.js

@@ -111,7 +111,7 @@ const handler = async ({
     process.exitCode = result.exitCode;
   } catch (error) {
     if (error && typeof error === "object" && "exitCode" in error) {
-      process.exitCode = error.exitCode ?? 1;
+      process.exitCode = typeof error.exitCode === "number" ? error.exitCode : 1;
       return;
     }
     process.exitCode = 1;

package/dist/commands/record/init.js

@@ -1,5 +1,5 @@
 import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
-const handler = async () => {
+const handler = async (_argv) => {
   recordTelemetryAttributes({
     command: "record"
   });

package/dist/commands/record.js

@@ -11,7 +11,7 @@ const builder = (yargs) => yargs.command(command, description, () => {
 );
 async function handler(argv) {
   const recordInit = await import("./record/init.js");
-  recordInit(argv);
+  return recordInit.handler(argv);
 }
 export {
   builder,

package/dist/commands/serveApiHandler.js

@@ -3,9 +3,10 @@ import { getPaths } from "@cedarjs/project-config";
 const apiServerFileHandler = async (argv) => {
   const args = ["node", "server.js", "--apiRootPath", argv.apiRootPath];
   if (argv.port) {
-    args.push("--apiPort", argv.port);
+    args.push("--apiPort", String(argv.port));
   }
-  await execa("yarn", args, {
+  const filteredArgs = args.filter((arg) => Boolean(arg));
+  await execa("yarn", filteredArgs, {
     cwd: getPaths().api.dist,
     stdio: "inherit"
   });

package/dist/commands/serveBothHandler.js

@@ -11,6 +11,10 @@ import {
 import { getConfig, getPaths } from "@cedarjs/project-config";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import { exitWithError } from "../lib/exit.js";
+const hasStringMessage = (error) => {
+  const message = typeof error === "object" && error !== null ? Reflect.get(error, "message") : void 0;
+  return typeof error === "object" && error !== null && "message" in error && typeof message === "string";
+};
 const bothServerFileHandler = async (argv) => {
   if (getConfig().experimental?.rsc?.enabled || getConfig().experimental?.streamingSsr?.enabled) {
     logSkippingFastifyWebServer();
@@ -54,10 +58,11 @@ const bothServerFileHandler = async (argv) => {
     try {
       await result;
     } catch (error) {
-      if (typeof error?.message !== "undefined") {
+      const message = hasStringMessage(error) ? error.message : void 0;
+      if (typeof message !== "undefined") {
         errorTelemetry(
           process.argv,
-          `Error concurrently starting sides: ${error.message}`
+          `Error concurrently starting sides: ${message}`
         );
         exitWithError(error);
       }
@@ -74,6 +79,7 @@ const bothSsrRscServerHandler = async (argv, rscEnabled) => {
     cwd: getPaths().web.base,
     stdio: "inherit",
     env: rscEnabled ? {
+      ...process.env,
       // TODO (RSC): Is this how we want to do it? If so, we need to find a way
       // to merge this with users' NODE_OPTIONS
       NODE_OPTIONS: "--conditions react-server"

package/dist/commands/serveWebHandler.js

@@ -5,6 +5,7 @@ const webSsrServerHandler = async (rscEnabled) => {
     cwd: getPaths().web.base,
     stdio: "inherit",
     env: rscEnabled ? {
+      ...process.env,
       // TODO (RSC): Is this how we want to do it? If so, we need to find a way
       // to merge this with users' NODE_OPTIONS
       NODE_OPTIONS: "--conditions react-server"

package/dist/commands/studioHandler.js

@@ -22,9 +22,9 @@ const handler = async (options) => {
     }
     const { serve } = await import("@cedarjs/studio");
     await serve({ open: options.open, enableWeb: true });
-  } catch (e) {
+  } catch (error) {
     console.log("Cannot start the development studio");
-    console.log(e);
+    console.log(error);
     process.exit(1);
   }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "3.0.0-canary.13426+7e88480dd",
+  "version": "3.0.0-canary.13428+fde92dd19",
   "description": "The CedarJS Command Line",
   "repository": {
     "type": "git",
@@ -34,15 +34,15 @@
     "@babel/parser": "7.29.0",
     "@babel/preset-typescript": "7.28.5",
     "@babel/runtime-corejs3": "7.29.0",
-    "@cedarjs/api-server": "3.0.0-canary.13426",
-    "@cedarjs/cli-helpers": "3.0.0-canary.13426",
-    "@cedarjs/fastify-web": "3.0.0-canary.13426",
-    "@cedarjs/internal": "3.0.0-canary.13426",
-    "@cedarjs/prerender": "3.0.0-canary.13426",
-    "@cedarjs/project-config": "3.0.0-canary.13426",
-    "@cedarjs/structure": "3.0.0-canary.13426",
-    "@cedarjs/telemetry": "3.0.0-canary.13426",
-    "@cedarjs/web-server": "3.0.0-canary.13426",
+    "@cedarjs/api-server": "3.0.0-canary.13428",
+    "@cedarjs/cli-helpers": "3.0.0-canary.13428",
+    "@cedarjs/fastify-web": "3.0.0-canary.13428",
+    "@cedarjs/internal": "3.0.0-canary.13428",
+    "@cedarjs/prerender": "3.0.0-canary.13428",
+    "@cedarjs/project-config": "3.0.0-canary.13428",
+    "@cedarjs/structure": "3.0.0-canary.13428",
+    "@cedarjs/telemetry": "3.0.0-canary.13428",
+    "@cedarjs/web-server": "3.0.0-canary.13428",
     "@listr2/prompt-adapter-enquirer": "2.0.16",
     "@opentelemetry/api": "1.9.0",
     "@opentelemetry/core": "1.30.1",
@@ -106,5 +106,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7e88480dd70cb2367db9a6f656e6dc43a6859bf3"
+  "gitHead": "fde92dd19c42fb2ef91dac69981649c3fa07e7f7"
 }