@cedarjs/cli 5.0.0-canary.2522 → 5.0.0-canary.2523

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

@@ -12,7 +12,6 @@ import {
 } from "../../../lib/index.js";
 import { prepareForRollback } from "../../../lib/rollback.js";
 import { validateName } from "../helpers.js";
-import { getYargsDefaults } from "../yargsCommandHelpers.js";
 function getPostRunInstructions() {
   const text = c.warning("After writing your migration, you can run it with:");
   const command2 = formatCedarCommand(["dataMigrate", "up"]);
@@ -57,22 +56,30 @@ const command = "data-migration <name>";
 const aliases = ["dataMigration", "dm"];
 const description = "Generate a data migration";
 const builder = (yargs) => {
-  yargs.positional("name", {
+  return yargs.positional("name", {
     description: "A descriptor of what this data migration does",
-    type: "string"
+    type: "string",
+    demandOption: true
   }).option("rollback", {
     description: "Revert all generator actions if an error occurs",
     type: "boolean",
     default: true
+  }).option("force", {
+    alias: "f",
+    default: false,
+    description: "Overwrite existing files",
+    type: "boolean"
+  }).option("typescript", {
+    alias: "ts",
+    default: false,
+    description: "Generate TypeScript files",
+    type: "boolean"
   }).epilogue(
     `Also see the ${terminalLink(
       "CedarJS CLI Reference",
       "https://cedarjs.com/docs/cli-commands#generate-datamigration"
     )}`
   );
-  Object.entries(getYargsDefaults()).forEach(([option, config]) => {
-    yargs.option(option, config);
-  });
 };
 const handler = async (args) => {
   recordTelemetryAttributes({

package/dist/commands/generate/dbAuth/dbAuth.js

@@ -45,6 +45,7 @@ const builder = (yargs) => {
   Object.entries(getYargsDefaults()).forEach(([option, config]) => {
     yargs.option(option, config);
   });
+  return yargs;
 };
 const handler = createHandler("dbAuth");
 export {

package/dist/commands/generate/function/function.js

@@ -19,6 +19,7 @@ const builder = (yargs) => {
   Object.entries(getYargsDefaults()).forEach(([option, config]) => {
     yargs.option(option, config);
   });
+  return yargs;
 };
 const handler = createHandler("function");
 export {

package/dist/commands/generate/job/job.js

@@ -29,6 +29,7 @@ const builder = (yargs) => {
   Object.entries(getYargsDefaults()).forEach(([option, config]) => {
     yargs.option(option, config);
   });
+  return yargs;
 };
 const handler = createHandler("job");
 export {

package/dist/commands/generate/model/model.js

@@ -19,6 +19,7 @@ const builder = (yargs) => {
   Object.entries(getYargsDefaults()).forEach(([option, config]) => {
     yargs.option(option, config);
   });
+  return yargs;
 };
 const handler = createHandler("model");
 export {

package/dist/commands/generate/ogImage/ogImage.js

@@ -32,6 +32,7 @@ const builder = (yargs) => {
     type: "boolean",
     default: true
   });
+  return yargs;
 };
 const handler = createHandler("ogImage");
 export {

package/dist/commands/generate/realtime/realtime.js

@@ -2,7 +2,7 @@ import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
 const command = "realtime <name>";
 const description = "Generate a subscription or live query used with RedwoodJS Realtime";
 function builder(yargs) {
-  yargs.positional("name", {
+  return yargs.positional("name", {
     type: "string",
     description: "Name of the realtime event to setup. This should be a type or model name like: Widget, Sprocket, etc.",
     demandOption: true

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

@@ -28,6 +28,7 @@ const builder = (yargs) => {
   Object.entries(getYargsDefaults()).forEach(([option, config]) => {
     yargs.option(option, config);
   });
+  return yargs;
 };
 const handler = createHandler("scaffold");
 export {

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

@@ -19,6 +19,7 @@ const builder = (yargs) => {
   Object.entries(getYargsDefaults()).forEach(([option, config]) => {
     yargs.option(option, config);
   });
+  return yargs;
 };
 const handler = createHandler("script");
 export {

package/dist/commands/generate/sdl/sdl.js

@@ -37,6 +37,7 @@ const builder = (yargs) => {
   Object.entries(getDefaults()).forEach(([option, config]) => {
     yargs.option(option, config);
   });
+  return yargs;
 };
 const handler = createHandler("sdl");
 export {

package/dist/commands/generate/secret/secret.js

@@ -7,23 +7,24 @@ const generateSecret = (length = DEFAULT_LENGTH) => {
 };
 const command = "secret";
 const description = "Generates a secret key using a cryptographically-secure source of entropy";
-const builder = (yargs) => yargs.option("length", {
-  description: "Length of the generated secret",
-  type: "number",
-  required: false,
-  default: DEFAULT_LENGTH
-}).option("raw", {
-  description: "Prints just the raw secret",
-  type: "boolean",
-  required: false,
-  default: false
-}).epilogue(
-  `Also see the ${terminalLink(
-    "CedarJS CLI Reference",
-    "https://cedarjs.com/docs/cli-commands#generate-secret"
-  )}`
-);
-const handler = ({ length, raw }) => {
+function builder(yargs) {
+  return yargs.option("length", {
+    description: "Length of the generated secret",
+    type: "number",
+    default: DEFAULT_LENGTH
+  }).option("raw", {
+    description: "Prints just the raw secret",
+    type: "boolean",
+    default: false
+  }).epilogue(
+    `Also see the ${terminalLink(
+      "CedarJS CLI Reference",
+      "https://cedarjs.com/docs/cli-commands#generate-secret"
+    )}`
+  );
+}
+function handler(options) {
+  const { length, raw } = options;
   recordTelemetryAttributes({
     command: "generate secret",
     length,
@@ -41,7 +42,7 @@ const handler = ({ length, raw }) => {
   );
   console.info("");
   console.info("Keep it secret, keep it safe!");
-};
+}
 export {
   DEFAULT_LENGTH,
   builder,

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

@@ -39,6 +39,7 @@ const builder = (yargs) => {
   Object.entries(defaults()).forEach(([option, config]) => {
     yargs.option(option, config);
   });
+  return yargs;
 };
 const handler = createHandler("service");
 export {

package/dist/commands/generate/yargsCommandHelpers.js

@@ -70,6 +70,7 @@ function createBuilder({
     Object.entries(opts).forEach(([option, config]) => {
       yargs.option(option, config);
     });
+    return yargs;
   };
 }
 function createHandler(componentName) {

package/dist/commands/generate.js

@@ -22,19 +22,12 @@ 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 {
     runBinSync("cedar-gen", [], { stdio: "inherit" });
   } catch (error) {
-    process.exitCode = getExitCode(error) ?? 1;
+    process.exitCode = typeof error === "object" && error !== null && "exitCode" in error && typeof error.exitCode === "number" ? error.exitCode : 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/setup/cache/cacheHandler.js

@@ -14,15 +14,18 @@ const CLIENT_HOST_MAP = {
   memcached: "localhost:11211",
   redis: "redis://localhost:6379"
 };
-const handler = async ({ client, force }) => {
-  const extension = isTypeScriptProject ? "ts" : "js";
+const handler = async ({
+  client,
+  force
+}) => {
+  const extension = isTypeScriptProject() ? "ts" : "js";
   const tasks = new Listr([
     await addPackagesTask({
       packages: [CLIENT_PACKAGE_MAP[client]],
       side: "api"
     }),
     {
-      title: `Writing api/src/lib/cache.js`,
+      title: `Writing api/src/lib/cache.${extension}`,
       task: () => {
         const template = fs.readFileSync(
           path.join(
@@ -59,9 +62,11 @@ const handler = async ({ client, force }) => {
   try {
     await tasks.run();
   } catch (e) {
-    errorTelemetry(process.argv, e.message);
-    console.error(c.error(e.message));
-    process.exit(e?.exitCode || 1);
+    const message = e instanceof Error ? e.message : String(e);
+    errorTelemetry(process.argv, message);
+    console.error(c.error(message));
+    const exitCode = e instanceof Error && "exitCode" in e && typeof e.exitCode === "number" ? e.exitCode : 1;
+    process.exit(exitCode);
   }
 };
 export {

package/dist/commands/setup/deploy/providers/netlifyHandler.js

@@ -123,15 +123,17 @@ const handler = async ({ force, ud }) => {
       !ud && updateApiURLTask("/.netlify/functions"),
       addFilesTask({ files: ud ? filesUd : files, force }),
       printSetupNotes(ud ? udNotes : notes)
-    ].filter(Boolean),
+    ].filter((task) => Boolean(task)),
     { rendererOptions: { collapseSubtasks: false } }
   );
   try {
     await tasks.run();
   } catch (e) {
-    errorTelemetry(process.argv, e.message);
-    console.error(c.error(e.message));
-    process.exit(e?.exitCode || 1);
+    const message = e instanceof Error ? e.message : String(e);
+    errorTelemetry(process.argv, message);
+    console.error(c.error(message));
+    const exitCode = e instanceof Error && "exitCode" in e && typeof e.exitCode === "number" ? e.exitCode : 1;
+    process.exit(exitCode);
   }
 };
 export {

package/dist/commands/setup/deploy/providers/renderHandler.js

@@ -63,7 +63,10 @@ const additionalFiles = [
     content: RENDER_HEALTH_CHECK
   }
 ];
-const handler = async ({ force, database }) => {
+const handler = async ({
+  force,
+  database
+}) => {
   recordTelemetryAttributes({
     command: "setup deploy render",
     force,
@@ -75,7 +78,7 @@ const handler = async ({ force, database }) => {
         title: "Adding render.yaml",
         task: async () => {
           const fileData = await getRenderYamlContent(database);
-          let files = {};
+          const files = {};
           files[fileData.path] = fileData.content;
           return writeFilesTask(files, { overwriteExisting: force });
         }
@@ -92,9 +95,11 @@ const handler = async ({ force, database }) => {
   try {
     await tasks.run();
   } catch (e) {
-    errorTelemetry(process.argv, e.message);
-    console.error(c.error(e.message));
-    process.exit(e?.exitCode || 1);
+    const message = e instanceof Error ? e.message : String(e);
+    errorTelemetry(process.argv, message);
+    console.error(c.error(message));
+    const exitCode = e instanceof Error && "exitCode" in e && typeof e.exitCode === "number" ? e.exitCode : 1;
+    process.exit(exitCode);
   }
 };
 export {

package/dist/commands/setup/deploy/providers/vercelHandler.js

@@ -28,7 +28,7 @@ async function handler({ force, ud }) {
       !ud && updateApiURLTask("/api"),
       ud ? writeVercelUDConfigTask({ overwriteExisting: force }) : writeVercelConfigTask({ overwriteExisting: force }),
       printSetupNotes(ud ? udNotes : notes)
-    ].filter(Boolean),
+    ].filter((task) => Boolean(task)),
     {
       rendererOptions: { collapseSubtasks: false }
     }
@@ -36,9 +36,11 @@ async function handler({ force, ud }) {
   try {
     await tasks.run();
   } catch (e) {
-    errorTelemetry(process.argv, e.message);
-    console.error(c.error(e.message));
-    process.exit(e?.exitCode || 1);
+    const message = e instanceof Error ? e.message : String(e);
+    errorTelemetry(process.argv, message);
+    console.error(c.error(message));
+    const exitCode = e instanceof Error && "exitCode" in e && typeof e.exitCode === "number" ? e.exitCode : 1;
+    process.exit(exitCode);
   }
 }
 function addVercelPluginToViteConfigTask() {
@@ -89,7 +91,9 @@ function installVercelPackagesTask() {
     devDependency: true
   });
 }
-function writeVercelConfigTask({ overwriteExisting = false } = {}) {
+function writeVercelConfigTask({
+  overwriteExisting = false
+} = {}) {
   return {
     title: "Writing vercel.json...",
     task: (_ctx, task) => {
@@ -126,7 +130,9 @@ const udNotes = [
   "Build with: yarn cedar build --ud",
   "See: https://cedarjs.com/docs/deploy#vercel-deploy"
 ];
-function writeVercelUDConfigTask({ overwriteExisting = false } = {}) {
+function writeVercelUDConfigTask({
+  overwriteExisting = false
+} = {}) {
   return {
     title: "Writing vercel.json for Universal Deploy...",
     task: (_ctx, task) => {

package/dist/commands/setup/generator/generatorHandler.js

@@ -36,7 +36,7 @@ const tasks = ({ name, force }) => {
       },
       {
         title: "Destination:",
-        task: (ctx, task) => {
+        task: (_ctx, task) => {
           task.title = `  Wrote templates to ${destination.replace(
             getPaths().base,
             ""
@@ -44,7 +44,7 @@ const tasks = ({ name, force }) => {
         }
       }
     ],
-    { rendererOptions: { collapseSubtasks: false }, errorOnExist: true }
+    { rendererOptions: { collapseSubtasks: false } }
   );
 };
 const handler = async ({ name, force }) => {
@@ -52,7 +52,8 @@ const handler = async ({ name, force }) => {
   try {
     await t.run();
   } catch (e) {
-    console.log(c.error(e.message));
+    const message = e instanceof Error ? e.message : String(e);
+    console.log(c.error(message));
   }
 };
 export {

package/dist/commands/setup/i18n/i18nHandler.js

@@ -10,13 +10,13 @@ import { fileIncludes } from "../../../lib/extendFile.js";
 import { getPaths, writeFile } from "../../../lib/index.js";
 const APP_JS_PATH = getPaths().web.app;
 const i18nImportExist = (appJS) => {
-  let content = appJS.toString();
+  const content = appJS.toString();
   const hasBaseImport = () => /import '.\/i18n'/.test(content);
   return hasBaseImport();
 };
 const addI18nImport = (appJS) => {
-  var content = appJS.toString().split("\n").reverse();
-  const index = content.findIndex((value) => /import/.test(value));
+  const content = appJS.toString().split("\n").reverse();
+  const index = content.findIndex((value) => value.includes("import"));
   content.splice(index, 0, "import './i18n'");
   return content.reverse().join(`
 `);
@@ -124,7 +124,7 @@ const handler = async ({ force }) => {
       {
         title: "Adding import to App.{jsx,tsx}...",
         task: (_ctx, task) => {
-          let appJS = fs.readFileSync(APP_JS_PATH);
+          const appJS = fs.readFileSync(APP_JS_PATH);
           if (i18nImportExist(appJS)) {
             task.skip("Import already exists in App.js");
           } else {
@@ -161,9 +161,11 @@ const handler = async ({ force }) => {
   try {
     await tasks.run();
   } catch (e) {
-    errorTelemetry(process.argv, e.message);
-    console.error(c.error(e.message));
-    process.exit(e?.exitCode || 1);
+    const message = e instanceof Error ? e.message : String(e);
+    errorTelemetry(process.argv, message);
+    console.error(c.error(message));
+    const exitCode = e instanceof Error && "exitCode" in e && typeof e.exitCode === "number" ? e.exitCode : 1;
+    process.exit(exitCode);
   }
 };
 export {

package/dist/commands/setup/mailer/mailerHandler.js

@@ -1,18 +1,18 @@
 import fs from "node:fs";
 import path from "node:path";
-import { pathToFileURL } from "node:url";
 import { Listr } from "listr2";
 import { addApiPackages, colors as c } from "@cedarjs/cli-helpers";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import { getPaths, transformTSToJS, writeFile } from "../../../lib/index.js";
 import { isTypeScriptProject } from "../../../lib/project.js";
-const handler = async ({ force, skipExamples }) => {
+const handler = async ({
+  force,
+  skipExamples
+}) => {
   const projectIsTypescript = isTypeScriptProject();
   const pkgJsonPath = path.join(getPaths().base, "package.json");
-  const { default: pkgJson } = await import(pathToFileURL(pkgJsonPath), {
-    with: { type: "json" }
-  });
-  const cedarVersion = pkgJson.devDependencies["@cedarjs/core"] ?? "latest";
+  const pkgJson = JSON.parse(fs.readFileSync(pkgJsonPath, "utf-8"));
+  const cedarVersion = pkgJson.devDependencies?.["@cedarjs/core"] ?? "latest";
   const extension = projectIsTypescript ? "ts" : "js";
   const tasks = new Listr(
     [
@@ -99,9 +99,11 @@ const handler = async ({ force, skipExamples }) => {
   try {
     await tasks.run();
   } catch (e) {
-    errorTelemetry(process.argv, e.message);
-    console.error(c.error(e.message));
-    process.exit(e?.exitCode || 1);
+    const message = e instanceof Error ? e.message : String(e);
+    errorTelemetry(process.argv, message);
+    console.error(c.error(message));
+    const exitCode = e instanceof Error && "exitCode" in e && typeof e.exitCode === "number" ? e.exitCode : 1;
+    process.exit(exitCode);
   }
 };
 export {

package/dist/commands/setup/tsconfig/tsconfigHandler.js

@@ -50,9 +50,11 @@ const handler = async ({ force }) => {
   try {
     await tasks.run();
   } catch (e) {
-    errorTelemetry(process.argv, e.message);
-    console.error(c.error(e.message));
-    process.exit(e?.exitCode || 1);
+    const message = e instanceof Error ? e.message : String(e);
+    errorTelemetry(process.argv, message);
+    console.error(c.error(message));
+    const exitCode = e instanceof Error && "exitCode" in e && typeof e.exitCode === "number" ? e.exitCode : 1;
+    process.exit(exitCode);
   }
 };
 export {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "5.0.0-canary.2522",
+  "version": "5.0.0-canary.2523",
   "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.2522",
-    "@cedarjs/cli-helpers": "5.0.0-canary.2522",
-    "@cedarjs/fastify-web": "5.0.0-canary.2522",
-    "@cedarjs/internal": "5.0.0-canary.2522",
-    "@cedarjs/prerender": "5.0.0-canary.2522",
-    "@cedarjs/project-config": "5.0.0-canary.2522",
-    "@cedarjs/structure": "5.0.0-canary.2522",
-    "@cedarjs/telemetry": "5.0.0-canary.2522",
-    "@cedarjs/utils": "5.0.0-canary.2522",
-    "@cedarjs/vite": "5.0.0-canary.2522",
-    "@cedarjs/web-server": "5.0.0-canary.2522",
+    "@cedarjs/api-server": "5.0.0-canary.2523",
+    "@cedarjs/cli-helpers": "5.0.0-canary.2523",
+    "@cedarjs/fastify-web": "5.0.0-canary.2523",
+    "@cedarjs/internal": "5.0.0-canary.2523",
+    "@cedarjs/prerender": "5.0.0-canary.2523",
+    "@cedarjs/project-config": "5.0.0-canary.2523",
+    "@cedarjs/structure": "5.0.0-canary.2523",
+    "@cedarjs/telemetry": "5.0.0-canary.2523",
+    "@cedarjs/utils": "5.0.0-canary.2523",
+    "@cedarjs/vite": "5.0.0-canary.2523",
+    "@cedarjs/web-server": "5.0.0-canary.2523",
     "@listr2/prompt-adapter-enquirer": "4.2.1",
     "@opentelemetry/api": "1.9.1",
     "@opentelemetry/core": "1.30.1",