@cedarjs/cli 5.0.0-canary.2566 → 5.0.0-canary.2569

package/dist/commands/deploy/baremetal/baremetalHandler.js

@@ -50,20 +50,20 @@ const verifyServerConfig = (config) => {
   if (!config.repo) {
     throwMissingConfig("repo");
   }
-  if (!/^\d+$/.test(config.freeSpaceRequired)) {
+  if (!/^\d+$/.test(String(config.freeSpaceRequired))) {
     throw new Error('"freeSpaceRequired" must be an integer >= 0');
   }
   return true;
 };
-const symlinkCurrentCommand = async (dir, ssh, path2) => {
-  return await ssh.exec(path2, "ln", [
+const symlinkCurrentCommand = async (dir, ssh, deployPath) => {
+  return await ssh.exec(deployPath, "ln", [
     SYMLINK_FLAGS,
     dir,
     CURRENT_RELEASE_SYMLINK_NAME
   ]);
 };
-const restartProcessCommand = async (processName, ssh, serverConfig, path2) => {
-  return await ssh.exec(path2, serverConfig.monitorCommand, [
+const restartProcessCommand = async (processName, ssh, serverConfig, deployPath) => {
+  return await ssh.exec(deployPath, serverConfig.monitorCommand, [
     "restart",
     processName
   ]);
@@ -106,7 +106,7 @@ const maintenanceTasks = (status, ssh, serverConfig) => {
     }
   } else if (status === "down") {
     tasks.push({
-      title: `Starting ${serverConfig.processNames.join(", ")} processes...`,
+      title: `Starting ${serverConfig.processNames?.join(", ")} processes...`,
       task: async () => {
         await ssh.exec(serverConfig.path, serverConfig.monitorCommand, [
           "start",
@@ -133,7 +133,7 @@ const maintenanceTasks = (status, ssh, serverConfig) => {
 };
 const rollbackTasks = (count, ssh, serverConfig) => {
   let rollbackCount = 1;
-  if (parseInt(count) === count) {
+  if (parseInt(String(count)) === count) {
     rollbackCount = count;
   }
   const tasks = [
@@ -142,7 +142,7 @@ const rollbackTasks = (count, ssh, serverConfig) => {
       task: async () => {
         const currentLink = (await ssh.exec(serverConfig.path, "readlink", ["-f", "current"])).stdout.split("/").pop();
         const dirs = (await ssh.exec(serverConfig.path, "ls", ["-t"])).stdout.split("\n").filter((dirs2) => !dirs2.match(/current/));
-        const deployedIndex = dirs.indexOf(currentLink);
+        const deployedIndex = dirs.indexOf(currentLink ?? "");
         const rollbackIndex = deployedIndex + rollbackCount;
         if (dirs[rollbackIndex]) {
           console.info("Setting symlink");
@@ -153,7 +153,7 @@ const rollbackTasks = (count, ssh, serverConfig) => {
           );
         } else {
           throw new Error(
-            `Cannot rollback ${rollbackCount} release(s): ${dirs.length - dirs.indexOf(currentLink) - 1} previous release(s) available`
+            `Cannot rollback ${rollbackCount} release(s): ${dirs.length - dirs.indexOf(currentLink ?? "") - 1} previous release(s) available`
           );
         }
       }
@@ -191,19 +191,30 @@ const lifecycleTask = (lifecycle, task, skip, { serverLifecycle, ssh, cmdPath })
     return tasks;
   }
 };
-const commandWithLifecycleEvents = ({ name, config, skip, command }) => {
+const commandWithLifecycleEvents = ({
+  name,
+  config,
+  skip,
+  command
+}) => {
   const tasks = [];
   tasks.push(lifecycleTask("before", name, skip, config));
   tasks.push({ ...command, skip: () => skip });
   tasks.push(lifecycleTask("after", name, skip, config));
-  return tasks.flat().filter((t) => t);
+  return tasks.flat().filter((t) => Boolean(t));
 };
 const deployTasks = (yargs, ssh, serverConfig, serverLifecycle) => {
   const cmdPath = pathJoin(serverConfig.path, yargs.releaseDir);
-  const config = { yargs, ssh, serverConfig, serverLifecycle, cmdPath };
+  const config = {
+    yargs,
+    ssh,
+    serverConfig,
+    serverLifecycle,
+    cmdPath
+  };
   const tasks = [];
   tasks.push(
-    commandWithLifecycleEvents({
+    ...commandWithLifecycleEvents({
       name: "df",
       config: { ...config, cmdPath: serverConfig.path },
       skip: !yargs.df || serverConfig.freeSpaceRequired === 0 || serverConfig.freeSpaceRequired === "0",
@@ -230,7 +241,7 @@ const deployTasks = (yargs, ssh, serverConfig, serverLifecycle) => {
           }
           task.output = `Available disk space: ${dfMb}MB`;
           const freeSpaceRequired = parseInt(
-            serverConfig.freeSpaceRequired ?? 2048,
+            String(serverConfig.freeSpaceRequired ?? 2048),
             10
           );
           if (dfMb < freeSpaceRequired) {
@@ -243,7 +254,7 @@ const deployTasks = (yargs, ssh, serverConfig, serverLifecycle) => {
     })
   );
   tasks.push(
-    commandWithLifecycleEvents({
+    ...commandWithLifecycleEvents({
       name: "update",
       config: { ...config, cmdPath: serverConfig.path },
       skip: !yargs.update,
@@ -262,7 +273,7 @@ const deployTasks = (yargs, ssh, serverConfig, serverLifecycle) => {
     })
   );
   tasks.push(
-    commandWithLifecycleEvents({
+    ...commandWithLifecycleEvents({
       name: "symlinkEnv",
       config,
       skip: !yargs.update,
@@ -275,7 +286,7 @@ const deployTasks = (yargs, ssh, serverConfig, serverLifecycle) => {
     })
   );
   tasks.push(
-    commandWithLifecycleEvents({
+    ...commandWithLifecycleEvents({
       name: "install",
       config,
       skip: !yargs.install,
@@ -290,7 +301,7 @@ const deployTasks = (yargs, ssh, serverConfig, serverLifecycle) => {
     })
   );
   tasks.push(
-    commandWithLifecycleEvents({
+    ...commandWithLifecycleEvents({
       name: "migrate",
       config,
       skip: !yargs.migrate || serverConfig?.migrate === false,
@@ -322,7 +333,7 @@ const deployTasks = (yargs, ssh, serverConfig, serverLifecycle) => {
   );
   for (const side of serverConfig.sides) {
     tasks.push(
-      commandWithLifecycleEvents({
+      ...commandWithLifecycleEvents({
         name: "build",
         config,
         skip: !yargs.build,
@@ -341,7 +352,7 @@ const deployTasks = (yargs, ssh, serverConfig, serverLifecycle) => {
     );
   }
   tasks.push(
-    commandWithLifecycleEvents({
+    ...commandWithLifecycleEvents({
       name: "symlinkCurrent",
       config,
       skip: !yargs.update,
@@ -358,7 +369,7 @@ const deployTasks = (yargs, ssh, serverConfig, serverLifecycle) => {
     for (const processName of serverConfig.processNames) {
       if (yargs.firstRun) {
         tasks.push(
-          commandWithLifecycleEvents({
+          ...commandWithLifecycleEvents({
             name: "restart",
             config,
             skip: !yargs.restart,
@@ -386,7 +397,7 @@ const deployTasks = (yargs, ssh, serverConfig, serverLifecycle) => {
         });
       } else {
         tasks.push(
-          commandWithLifecycleEvents({
+          ...commandWithLifecycleEvents({
             name: "restart",
             config,
             skip: !yargs.restart,
@@ -407,7 +418,7 @@ const deployTasks = (yargs, ssh, serverConfig, serverLifecycle) => {
     }
   }
   tasks.push(
-    commandWithLifecycleEvents({
+    ...commandWithLifecycleEvents({
       name: "cleanup",
       config: { ...config, cmdPath: serverConfig.path },
       skip: !yargs.cleanup,
@@ -423,14 +434,15 @@ const deployTasks = (yargs, ssh, serverConfig, serverLifecycle) => {
       }
     })
   );
-  return tasks.flat().filter((e) => e);
+  return tasks;
 };
 const mergeLifecycleEvents = (lifecycle, other) => {
-  let lifecycleCopy = JSON.parse(JSON.stringify(lifecycle));
+  const lifecycleCopy = JSON.parse(JSON.stringify(lifecycle));
   for (const hook of LIFECYCLE_HOOKS) {
-    for (const key in other[hook]) {
+    const otherHook = other[hook] ?? {};
+    for (const key in otherHook) {
       lifecycleCopy[hook][key] = (lifecycleCopy[hook][key] || []).concat(
-        other[hook][key]
+        otherHook[key]
       );
     }
   }
@@ -439,26 +451,26 @@ const mergeLifecycleEvents = (lifecycle, other) => {
 const parseConfig = (yargs, rawConfigToml) => {
   const configToml = envInterpolation(rawConfigToml);
   const config = toml.parse(configToml);
-  let envConfig;
-  const emptyLifecycle = {};
+  const emptyLifecycle = { before: {}, after: {} };
   verifyConfig(config, yargs);
-  for (const hook of LIFECYCLE_HOOKS) {
-    emptyLifecycle[hook] = {};
-  }
   let envLifecycle = mergeLifecycleEvents(emptyLifecycle, config);
-  envConfig = config[yargs.environment];
+  const envConfig = config[yargs.environment];
   envLifecycle = mergeLifecycleEvents(envLifecycle, envConfig);
   return { envConfig, envLifecycle };
 };
 const commands = (yargs, ssh) => {
   const deployConfig = fs.readFileSync(pathJoin(getPaths().base, CONFIG_FILENAME)).toString();
-  let { envConfig, envLifecycle } = parseConfig(yargs, deployConfig);
-  let servers = [];
+  const { envConfig, envLifecycle } = parseConfig(yargs, deployConfig);
+  const servers = [];
   let tasks = [];
-  for (const config of envConfig.servers) {
+  const serverList = envConfig.servers ?? [];
+  for (const config of serverList) {
     const serverConfig = serverConfigWithDefaults(config, yargs);
     verifyServerConfig(serverConfig);
-    const serverLifecycle = mergeLifecycleEvents(envLifecycle, serverConfig);
+    const serverLifecycle = mergeLifecycleEvents(
+      envLifecycle,
+      serverConfig
+    );
     tasks.push({
       title: "Connecting...",
       task: () => ssh.connect({
@@ -467,9 +479,10 @@ const commands = (yargs, ssh) => {
         username: serverConfig.username,
         password: serverConfig.password,
         privateKey: serverConfig.privateKey,
+        // @ts-expect-error - node-ssh Config doesn't expose privateKeyPath but it is supported at runtime
         privateKeyPath: serverConfig.privateKeyPath,
         passphrase: serverConfig.passphrase,
-        agent: serverConfig.agentForward && process.env.SSH_AUTH_SOCK,
+        agent: serverConfig.agentForward ? process.env.SSH_AUTH_SOCK : void 0,
         agentForward: serverConfig.agentForward
       })
     });
@@ -488,12 +501,14 @@ const commands = (yargs, ssh) => {
       title: "Disconnecting...",
       task: () => ssh.dispose()
     });
+    const tasksCopy = [...tasks];
     servers.push({
       title: serverConfig.host,
       task: () => {
-        return new Listr(tasks);
+        return new Listr(tasksCopy);
       }
     });
+    tasks = [];
   }
   return servers;
 };
@@ -548,24 +563,26 @@ const handler = async (yargs) => {
   if (yargs.gitCheck) {
     await warnIfUnpushedCommits();
   }
-  const ssh = new SshExecutor(yargs.verbose);
+  const ssh = new SshExecutor(yargs.verbose ?? false);
   try {
-    const tasks = new Listr(commands(yargs, ssh), {
+    const listrTasks = new Listr(commands(yargs, ssh), {
       concurrent: true,
       exitOnError: true,
-      renderer: yargs.verbose && "verbose"
+      renderer: yargs.verbose ? "verbose" : void 0
     });
-    await tasks.run();
+    await listrTasks.run();
   } catch (e) {
     console.error(c.error("\nDeploy failed:"));
+    const errMessage = e instanceof Error && "stderr" in e ? e.stderr ?? e.message : e instanceof Error ? e.message : String(e);
+    const exitCode = e instanceof Error && "exitCode" in e ? e.exitCode ?? 1 : 1;
     console.error(
-      boxen(e.stderr || e.message, {
+      boxen(errMessage, {
         padding: { top: 0, bottom: 0, right: 1, left: 1 },
         margin: 0,
         borderColor: "red"
       })
     );
-    process.exit(e?.exitCode || 1);
+    process.exit(exitCode);
   }
 };
 export {

package/dist/commands/deploy/baremetal.js

@@ -100,10 +100,7 @@ async function handler(yargs) {
     verbose: yargs.verbose,
     gitCheck: yargs.gitCheck
   });
-  const { handler: baremetalHandler } = (
-    // @ts-expect-error - baremetalHandler.js has no type declarations yet
-    await import("./baremetal/baremetalHandler.js")
-  );
+  const { handler: baremetalHandler } = await import("./baremetal/baremetalHandler.js");
   return baremetalHandler(yargs);
 }
 export {

package/dist/commands/generate/scaffold/scaffoldHandler.js

@@ -50,7 +50,7 @@ const getIdName = (model) => {
 };
 const isAutoGeneratedColumnForScaffold = (column) => {
   const autoGeneratedFunctions = ["now", "autoincrement"];
-  const columnDefaultFunction = typeof column.default === "object" && "name" in column.default ? column.default?.name : "";
+  const columnDefaultFunction = typeof column.default === "object" && column.default !== null && "name" in column.default ? column.default.name : "";
   return column.isId || column.isUpdatedAt || column.name === "createdAt" || autoGeneratedFunctions.includes(columnDefaultFunction);
 };
 const getImportComponentNames = (name, scaffoldPath, nestScaffoldByModel = true) => {
@@ -149,7 +149,7 @@ const files = async ({
   };
 };
 const assetFiles = async (name, tailwind) => {
-  let fileList = {};
+  const fileList = {};
   const assets = fs.readdirSync(
     customOrDefaultTemplatePath({
       side: "web",
@@ -274,12 +274,14 @@ const modelRelatedVariables = (model) => {
   const relations = relationsForModel(model).map((relation) => relation);
   const columns = model.fields.filter((field) => field.kind !== "object").map((column) => {
     let validation;
-    if (componentMetadata[column.type]?.validation) {
-      validation = componentMetadata[column.type]?.validation(
-        column?.isRequired
-      );
+    const meta = componentMetadata[column.type];
+    const validationDef = meta?.validation;
+    if (typeof validationDef === "function") {
+      validation = validationDef(column.isRequired);
+    } else if (validationDef !== void 0) {
+      validation = column.isRequired ? validationDef : null;
     } else {
-      validation = column?.isRequired ? componentMetadata.default.validation : null;
+      validation = column.isRequired ? componentMetadata.default.validation : null;
     }
     const isRelationalField = column.name.endsWith("Id") && relations.some((relation) => column.name.includes(relation));
     const isRequired = column.isRequired;
@@ -308,7 +310,9 @@ const modelRelatedVariables = (model) => {
   );
   const fieldsToImport = Object.keys(
     editableColumns.reduce((accumulator, column) => {
-      accumulator[column.component] = true;
+      if (column.component) {
+        accumulator[column.component] = true;
+      }
       return accumulator;
     }, {})
   );
@@ -326,7 +330,7 @@ const modelRelatedVariables = (model) => {
   };
 };
 const layoutFiles = async (name, force, generateTypescript, templateStrings) => {
-  let fileList = {};
+  const fileList = {};
   const layouts = fs.readdirSync(
     customOrDefaultTemplatePath({
       side: "web",
@@ -369,7 +373,7 @@ const pageFiles = async (name, pascalScaffoldPath = "", generateTypescript, nest
   const idType = getIdType(model);
   const idTsType = mapPrismaScalarToPagePropTsType(idType);
   const idName = getIdName(model);
-  let fileList = {};
+  const fileList = {};
   const pages = fs.readdirSync(
     customOrDefaultTemplatePath({
       side: "web",
@@ -411,9 +415,9 @@ const componentFiles = async (name, pascalScaffoldPath = "", generateTypescript,
   const model = await getSchema(singularName);
   const idType = getIdType(model);
   const idName = getIdName(model);
-  const pascalIdName = pascalcase(idName);
+  const pascalIdName = pascalcase(idName ?? "");
   const intForeignKeys = intForeignKeysForModel(model);
-  let fileList = {};
+  const fileList = {};
   const components = fs.readdirSync(
     customOrDefaultTemplatePath({
       side: "web",
@@ -531,15 +535,15 @@ const addSetImport = (task) => {
   writeFile(routesPath, newRoutesContent, { overwriteExisting: true });
   return "Added Set import to Routes.{jsx,tsx}";
 };
-const addScaffoldSetToRouter = async (model, path2) => {
-  const templateNames = getTemplateStrings(model, path2);
+const addScaffoldSetToRouter = async (model, scaffoldPath) => {
+  const templateNames = getTemplateStrings(model, scaffoldPath);
   const nameVars = nameVariants(model);
   const title = nameVars.pluralPascalName;
   const titleTo = templateNames.pluralRouteName;
   const buttonLabel = `New ${nameVars.singularPascalName}`;
   const buttonTo = templateNames.newRouteName;
   return addRoutesToRouterTask(
-    await routes({ model, path: path2 }),
+    await routes({ model, path: scaffoldPath }),
     "ScaffoldLayout",
     { title, titleTo, buttonLabel, buttonTo }
   );
@@ -551,7 +555,7 @@ const tasks = ({
   force,
   tests,
   typescript,
-  javascript,
+  javascript: _javascript,
   tailwind
 }) => {
   return new Listr(
@@ -565,7 +569,6 @@ const tasks = ({
             path: path2,
             tests,
             typescript,
-            javascript,
             tailwind,
             force
           });
@@ -648,8 +651,10 @@ const handler = async ({
     }
     await t.run();
   } catch (e) {
-    console.log(c.error(e.message));
-    process.exit(e?.existCode || 1);
+    const message = e instanceof Error ? e.message : String(e);
+    const exitCode = e instanceof Error && "exitCode" in e ? e.exitCode ?? 1 : 1;
+    console.log(c.error(message));
+    process.exit(exitCode);
   }
 };
 const splitPathAndModel = (pathSlashModel) => {

package/dist/index.js

@@ -38,7 +38,12 @@ import { exitWithError } from "./lib/exit.js";
 import * as updateCheck from "./lib/updateCheck.js";
 import { loadPlugins } from "./plugin.js";
 import { startTelemetry, shutdownTelemetry } from "./telemetry/index.js";
-let { cwd, telemetry, help, version } = Parser(hideBin(process.argv), {
+const {
+  telemetry,
+  help,
+  version,
+  cwd: parsedCwd
+} = Parser(hideBin(process.argv), {
   // Telemetry is enabled by default, but can be disabled in two ways
   // - by passing a `--telemetry false` option
   // - by setting a `CEDAR_DISABLE_TELEMETRY` env var
@@ -47,6 +52,7 @@ let { cwd, telemetry, help, version } = Parser(hideBin(process.argv), {
     telemetry: (process.env.CEDAR_DISABLE_TELEMETRY === void 0 || process.env.CEDAR_DISABLE_TELEMETRY === "") && (process.env.REDWOOD_DISABLE_TELEMETRY === void 0 || process.env.REDWOOD_DISABLE_TELEMETRY === "")
   }
 });
+let cwd = parsedCwd;
 cwd ??= process.env.CEDAR_CWD;
 cwd ??= process.env.RWJS_CWD;
 cwd = getTomlDir(cwd);
@@ -168,7 +174,7 @@ function getTomlDir(cwd2) {
       tomlDir = path.dirname(configTomlPath);
     }
   } catch (error) {
-    console.error(error.message);
+    console.error(error instanceof Error ? error.message : String(error));
     process.exit(1);
   }
   return tomlDir;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "5.0.0-canary.2566",
+  "version": "5.0.0-canary.2569",
   "description": "The CedarJS Command Line",
   "repository": {
     "type": "git",
@@ -33,17 +33,17 @@
   "dependencies": {
     "@babel/parser": "7.29.7",
     "@babel/preset-typescript": "7.29.7",
-    "@cedarjs/api-server": "5.0.0-canary.2566",
-    "@cedarjs/cli-helpers": "5.0.0-canary.2566",
-    "@cedarjs/fastify-web": "5.0.0-canary.2566",
-    "@cedarjs/internal": "5.0.0-canary.2566",
-    "@cedarjs/prerender": "5.0.0-canary.2566",
-    "@cedarjs/project-config": "5.0.0-canary.2566",
-    "@cedarjs/structure": "5.0.0-canary.2566",
-    "@cedarjs/telemetry": "5.0.0-canary.2566",
-    "@cedarjs/utils": "5.0.0-canary.2566",
-    "@cedarjs/vite": "5.0.0-canary.2566",
-    "@cedarjs/web-server": "5.0.0-canary.2566",
+    "@cedarjs/api-server": "5.0.0-canary.2569",
+    "@cedarjs/cli-helpers": "5.0.0-canary.2569",
+    "@cedarjs/fastify-web": "5.0.0-canary.2569",
+    "@cedarjs/internal": "5.0.0-canary.2569",
+    "@cedarjs/prerender": "5.0.0-canary.2569",
+    "@cedarjs/project-config": "5.0.0-canary.2569",
+    "@cedarjs/structure": "5.0.0-canary.2569",
+    "@cedarjs/telemetry": "5.0.0-canary.2569",
+    "@cedarjs/utils": "5.0.0-canary.2569",
+    "@cedarjs/vite": "5.0.0-canary.2569",
+    "@cedarjs/web-server": "5.0.0-canary.2569",
     "@listr2/prompt-adapter-enquirer": "4.2.1",
     "@opentelemetry/api": "1.9.1",
     "@opentelemetry/core": "1.30.1",