@cedarjs/cli 5.0.0-canary.2501 → 5.0.0-canary.2503

package/dist/commands/build/buildPackagesTask.js

@@ -10,7 +10,7 @@ async function buildPackagesTask(task, nonApiWebWorkspaces) {
   const workspacePaths = nonApiWebWorkspaces.some((w) => w === "packages/*") ? await Array.fromAsync(fs.promises.glob(globPattern)) : nonApiWebWorkspaces.map((w) => {
     const workspacePath = path.join(
       cedarPaths.packages,
-      w.split("/").at(-1)
+      w.split("/").at(-1) ?? ""
     );
     if (!fs.existsSync(workspacePath)) {
       return "";
@@ -30,15 +30,15 @@ async function buildPackagesTask(task, nonApiWebWorkspaces) {
           try {
             await runScript("build", [], { cwd: workspacePath });
           } catch (e) {
+            const message = e instanceof Error ? e.message : String(e);
+            const stderr = e instanceof Error && "stderr" in e && typeof e.stderr === "string" ? e.stderr : void 0;
             errorTelemetry(
               process.argv,
-              `Error building package "${name}": ${e.message}`
+              `Error building package "${name}": ${message}`
             );
-            throw new Error(
-              `Building "${name}" failed
+            throw new Error(`Building "${name}" failed
 
-${e.stderr || e.message}`
-            );
+${stderr || message}`);
           }
         }
       };

package/dist/commands/experimental/setupOpentelemetryHandler.js

@@ -18,7 +18,10 @@ import {
   EXPERIMENTAL_TOPIC_ID
 } from "./setupOpentelemetry.js";
 import { printTaskEpilogue } from "./util.js";
-const handler = async ({ force, verbose }) => {
+const handler = async ({
+  force,
+  verbose
+}) => {
   const ts = isTypeScriptProject();
   const configTomlPath = getConfigPath();
   const configFileName = path.basename(configTomlPath);
@@ -208,9 +211,11 @@ const handler = async ({ force, verbose }) => {
   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);
+    const exitCode = e instanceof Error && "exitCode" in e && typeof e.exitCode === "number" ? e.exitCode : 1;
+    errorTelemetry(process.argv, message);
+    console.error(c.error(message));
+    process.exit(exitCode);
   }
 };
 export {

package/dist/commands/experimental/setupRscHandler.js

@@ -11,7 +11,10 @@ import { getPaths, transformTSToJS, writeFile } from "../../lib/index.js";
 import { isTypeScriptProject } from "../../lib/project.js";
 import { command, description, EXPERIMENTAL_TOPIC_ID } from "./setupRsc.js";
 import { printTaskEpilogue } from "./util.js";
-const handler = async ({ force, verbose }) => {
+const handler = async ({
+  force,
+  verbose
+}) => {
   const rwPaths = getPaths();
   const configTomlPath = getConfigPath();
   const configContent = fs.readFileSync(configTomlPath, "utf-8");
@@ -84,11 +87,9 @@ const handler = async ({ force, verbose }) => {
             ),
             "utf-8"
           );
-          const entryClientContent = isTypeScriptProject() ? entryClientTemplate : await transformTSToJS(
-            rwPaths.web.entryClient,
-            entryClientTemplate
-          );
-          writeFile(rwPaths.web.entryClient, entryClientContent, {
+          const entryClient = rwPaths.web.entryClient ?? "";
+          const entryClientContent = isTypeScriptProject() ? entryClientTemplate : await transformTSToJS(entryClient, entryClientTemplate);
+          writeFile(entryClient, entryClientContent, {
             overwriteExisting: true
           });
         }
@@ -220,7 +221,7 @@ const handler = async ({ force, verbose }) => {
       {
         title: "Adding CSS files...",
         task: async () => {
-          const files = [
+          const cssFiles = [
             {
               template: "Counter.css.template",
               path: ["components", "Counter", "Counter.css"]
@@ -242,7 +243,7 @@ const handler = async ({ force, verbose }) => {
               path: ["pages", "AboutPage", "AboutPage.css"]
             }
           ];
-          files.forEach((file) => {
+          cssFiles.forEach((file) => {
             const template = fs.readFileSync(
               path.resolve(
                 import.meta.dirname,
@@ -398,9 +399,11 @@ const handler = async ({ force, verbose }) => {
   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);
+    const exitCode = e instanceof Error && "exitCode" in e && typeof e.exitCode === "number" ? e.exitCode : 1;
+    errorTelemetry(process.argv, message);
+    console.error(c.error(message));
+    process.exit(exitCode);
   }
 };
 export {

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

@@ -66,7 +66,11 @@ const files = async ({
   }
   return transformTSToJSMap(outputFiles, typescript);
 };
-const handler = async ({ name, force, ...rest }) => {
+const handler = async ({
+  name,
+  force,
+  ...rest
+}) => {
   recordTelemetryAttributes({
     command: "generate job",
     force,
@@ -78,7 +82,7 @@ const handler = async ({ name, force, ...rest }) => {
     const jobsManagerFile = getPaths().api.distJobsConfig;
     const jobManager = await import(pathToFileURL(jobsManagerFile).href);
     queueName = jobManager.jobs?.queues[0] ?? "default";
-  } catch (_e) {
+  } catch {
   }
   let jobFiles = {};
   const tasks = new Listr(
@@ -111,9 +115,11 @@ const handler = async ({ name, force, ...rest }) => {
     }
     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);
+    const exitCode = e instanceof Error && "exitCode" in e && typeof e.exitCode === "number" ? e.exitCode : 1;
+    errorTelemetry(process.argv, message);
+    console.error(c.error(message));
+    process.exit(exitCode);
   }
 };
 export {

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

@@ -49,8 +49,11 @@ const modelFieldToSDL = ({
   types = {},
   docs = false
 }) => {
-  if (Object.entries(types).length) {
-    field.type = field.kind === "object" ? idType(types[field.type]) : field.type;
+  if (Object.entries(types).length && field.kind === "object") {
+    const resolvedType = idType(types[field.type]);
+    if (typeof resolvedType === "string") {
+      field.type = resolvedType;
+    }
   }
   const prismaTypeToGraphqlType = {
     Json: "JSON",
@@ -74,10 +77,10 @@ const inputSDL = (model, required, types = {}, docs = false) => {
   const ignoredFields = DEFAULT_IGNORE_FIELDS_FOR_INPUT;
   return model.fields.filter((field) => {
     const idField = model.fields.find((field2) => field2.isId);
-    if (idField && idField.default) {
+    if (idField?.default) {
       ignoredFields.push(idField.name);
     }
-    return ignoredFields.indexOf(field.name) === -1 && field.kind !== "object";
+    return !ignoredFields.includes(field.name) && field.kind !== "object";
   }).map((field) => modelFieldToSDL({ field, required, types, docs }));
 };
 const idInputSDL = (idType2, docs) => {
@@ -95,12 +98,12 @@ const updateInputSDL = (model, types = {}, docs = false) => {
   return inputSDL(model, false, types, docs);
 };
 const idType = (model, crud) => {
-  if (!crud) {
+  if (!crud || !model) {
     return void 0;
   }
   if (model.primaryKey?.fields.length) {
     const { fields: fieldNames } = model.primaryKey;
-    return fieldNames.map((name) => model.fields.find((f) => f.name === name));
+    return fieldNames.map((name) => model.fields.find((f) => f.name === name)).filter((f) => f !== void 0);
   }
   const idField = model.fields.find((field) => field.isId);
   if (!idField) {
@@ -127,7 +130,10 @@ const sdlFromSchemaModel = async (name, crud, docs = false) => {
       const model2 = await getSchema(field.type);
       return model2;
     })
-  )).reduce((acc, cur) => ({ ...acc, [cur.name]: cur }), {});
+  )).reduce(
+    (acc, cur) => ({ ...acc, [cur.name]: cur }),
+    {}
+  );
   const enums = (await Promise.all(
     model.fields.filter((field) => field.kind === "enum").map(async (field) => {
       const enumDef = await getEnum(field.type);
@@ -237,9 +243,11 @@ const handler = async ({
     }
     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);
+    const exitCode = e instanceof Error && "exitCode" in e && typeof e.exitCode === "number" ? e.exitCode : 1;
+    errorTelemetry(process.argv, message);
+    console.error(c.error(message));
+    process.exit(exitCode);
   }
 };
 export {

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

@@ -10,7 +10,7 @@ const parseSchema = async (model) => {
   const schema = await getSchema(model);
   const relations = {};
   let foreignKeys = [];
-  let scalarFields = schema.fields.filter((field) => {
+  const scalarFields = schema.fields.filter((field) => {
     if (field.relationFromFields) {
       if (field.isRequired && field.relationFromFields.length !== 0) {
         relations[field.name] = {
@@ -27,11 +27,11 @@ const parseSchema = async (model) => {
 };
 function scenarioFieldValue(field) {
   const randFloat = Math.random() * 1e7;
-  const randInt = parseInt(Math.random() * 1e7);
+  const randInt = parseInt(String(Math.random() * 1e7));
   const randIntArray = [
-    parseInt(Math.random() * 300),
-    parseInt(Math.random() * 300),
-    parseInt(Math.random() * 300)
+    parseInt(String(Math.random() * 300)),
+    parseInt(String(Math.random() * 300)),
+    parseInt(String(Math.random() * 300))
   ];
   switch (field.type) {
     case "BigInt":
@@ -55,7 +55,7 @@ function scenarioFieldValue(field) {
     case "Bytes":
       return `new Uint8Array([${randIntArray}])`;
     default: {
-      if (field.kind === "enum" && field.enumValues[0]) {
+      if (field.kind === "enum" && field.enumValues?.[0]) {
         return field.enumValues[0].dbName || field.enumValues[0].name;
       }
     }
@@ -126,15 +126,18 @@ const buildStringifiedScenario = async (model) => {
 };
 const fieldTypes = async (model) => {
   const { scalarFields } = await parseSchema(model);
-  return scalarFields.reduce((acc, value) => {
-    acc[value.name] = value.type;
-    return acc;
-  }, {});
+  return scalarFields.reduce(
+    (acc, value) => {
+      acc[value.name] = value.type;
+      return acc;
+    },
+    {}
+  );
 };
 const fieldsToInput = async (model) => {
   const { scalarFields, foreignKeys } = await parseSchema(model);
   const modelName = camelcase(singularize(model));
-  let inputObj = {};
+  const inputObj = {};
   scalarFields.forEach((field) => {
     if (foreignKeys.includes(field.name)) {
       inputObj[field.name] = `scenario.${modelName}.two.${field.name}`;
@@ -152,7 +155,9 @@ const fieldsToUpdate = async (model) => {
   const { scalarFields, relations, foreignKeys } = await parseSchema(model);
   const modelName = camelcase(singularize(model));
   let field, newValue, fieldName;
-  field = scalarFields.find((scalar) => !foreignKeys.includes(scalar.name));
+  field = scalarFields.find(
+    (scalar) => !foreignKeys.includes(scalar.name)
+  );
   if (!field) {
     field = scalarFields[0];
   }
@@ -168,25 +173,31 @@ const fieldsToUpdate = async (model) => {
     newValue = value;
     switch (field.type) {
       case "BigInt":
-        newValue = `${newValue + 1n}`;
+        if (typeof value === "bigint") {
+          newValue = `${value + 1n}`;
+        }
         break;
       case "Boolean": {
         newValue = !value;
         break;
       }
       case "DateTime": {
-        let date = /* @__PURE__ */ new Date();
+        const date = /* @__PURE__ */ new Date();
         date.setDate(date.getDate() + 1);
         newValue = date;
         break;
       }
       case "Decimal":
       case "Float": {
-        newValue = newValue + 1.1;
+        if (typeof value === "number") {
+          newValue = value + 1.1;
+        }
         break;
       }
       case "Int": {
-        newValue = newValue + 1;
+        if (typeof value === "number") {
+          newValue = value + 1;
+        }
         break;
       }
       case "Json": {
@@ -194,11 +205,13 @@ const fieldsToUpdate = async (model) => {
         break;
       }
       case "String": {
-        newValue = newValue + "2";
+        if (typeof value === "string") {
+          newValue = value + "2";
+        }
         break;
       }
       default: {
-        if (field.kind === "enum" && field.enumValues[field.enumValues.length - 1]) {
+        if (field.kind === "enum" && field.enumValues?.[field.enumValues.length - 1]) {
           const enumVal = field.enumValues[field.enumValues.length - 1];
           newValue = enumVal.dbName || enumVal.name;
         }
@@ -206,6 +219,9 @@ const fieldsToUpdate = async (model) => {
       }
     }
   }
+  if (Array.isArray(fieldName)) {
+    return Object.fromEntries(fieldName.map((key) => [key, newValue]));
+  }
   return { [fieldName]: newValue };
 };
 const getIdName = async (model) => {

package/dist/commands/setup/realtime/realtimeHandler.js

@@ -30,7 +30,7 @@ async function handleExamplesPreference(includeExamples) {
     });
     incl = response.includeExamples;
   }
-  return incl;
+  return incl ?? false;
 }
 async function handler(args) {
   const cedarPaths = getPaths();
@@ -372,9 +372,11 @@ async function handler(args) {
       );
     }
   } 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);
+    const exitCode = e instanceof Error && "exitCode" in e && typeof e.exitCode === "number" ? e.exitCode : 1;
+    errorTelemetry(process.argv, message);
+    console.error(c.error(message));
+    process.exit(exitCode);
   }
 }
 export {

package/dist/commands/setup/uploads/uploadsHandler.js

@@ -141,9 +141,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);
+    const exitCode = e instanceof Error && "exitCode" in e && typeof e.exitCode === "number" ? e.exitCode : 1;
+    errorTelemetry(process.argv, message);
+    console.error(c.error(message));
+    process.exit(exitCode);
   }
 };
 export {

package/package.json

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