@cedarjs/cli 5.0.0-canary.2584 → 5.0.0-canary.2586

package/dist/commands/generate/helpers.js

@@ -24,7 +24,7 @@ const validateName = (name) => {
   }
 };
 const relationsForModel = (model) => {
-  return model.fields.filter((f) => f.relationName).map((field) => {
+  return model?.fields.filter((f) => f.relationName).map((field) => {
     return field.name;
   });
 };

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

@@ -271,7 +271,7 @@ const modelRelatedVariables = (model) => {
       listDisplayFunction: "truncate"
     }
   };
-  const relations = relationsForModel(model).map((relation) => relation);
+  const relations = relationsForModel(model)?.map((relation) => relation);
   const columns = model.fields.filter((field) => field.kind !== "object").map((column) => {
     let validation;
     const meta = componentMetadata[column.type];
@@ -283,7 +283,7 @@ const modelRelatedVariables = (model) => {
     } else {
       validation = column.isRequired ? componentMetadata.default.validation : null;
     }
-    const isRelationalField = column.name.endsWith("Id") && relations.some((relation) => column.name.includes(relation));
+    const isRelationalField = column.name.endsWith("Id") && relations?.some((relation) => column.name.includes(relation));
     const isRequired = column.isRequired;
     const isEnum = column.kind === "enum";
     const isList = column.isList;

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

@@ -5,9 +5,18 @@ import { transformTSToJS } from "../../../lib/index.js";
 import { getSchema, verifyModelName } from "../../../lib/schemaHelpers.js";
 import { relationsForModel } from "../helpers.js";
 import { createHandler, templateForFile } from "../yargsHandlerHelpers.js";
+function isServiceModel(schema) {
+  return typeof schema === "object" && schema !== null && "fields" in schema && "name" in schema;
+}
 const DEFAULT_SCENARIO_NAMES = ["one", "two"];
 const parseSchema = async (model) => {
-  const schema = await getSchema(model);
+  const schemaResult = await getSchema(model);
+  if (!isServiceModel(schemaResult)) {
+    throw new Error(
+      `No schema definition found for \`${model}\` in schema.prisma file`
+    );
+  }
+  const schema = schemaResult;
   const relations = {};
   let foreignKeys = [];
   const scalarFields = schema.fields.filter((field) => {
@@ -60,6 +69,7 @@ function scenarioFieldValue(field) {
       }
     }
   }
+  return void 0;
 }
 const fieldsToScenario = async (scalarFields, relations, foreignKeys) => {
   const data = {};
@@ -225,8 +235,11 @@ const fieldsToUpdate = async (model) => {
   return { [fieldName]: newValue };
 };
 const getIdName = async (model) => {
-  const schema = await getSchema(model);
-  return schema.fields.find((field) => field.isId)?.name;
+  const schemaResult = await getSchema(model);
+  if (!isServiceModel(schemaResult)) {
+    return void 0;
+  }
+  return schemaResult.fields.find((field) => field.isId)?.name;
 };
 const files = async ({
   name,
@@ -239,7 +252,15 @@ const files = async ({
   const model = name;
   const idName = await getIdName(model);
   const prismaImportSource = "src/lib/db";
-  const modelRelations = relations || relationsForModel(await getSchema(model));
+  let modelRelations;
+  if (relations) {
+    modelRelations = relations;
+  } else {
+    const schemaResult = await getSchema(model);
+    if (isServiceModel(schemaResult)) {
+      modelRelations = relationsForModel(schemaResult);
+    }
+  }
   const serviceFile = await templateForFile({
     name,
     side: "api",

package/dist/lib/schemaHelpers.js

@@ -51,7 +51,7 @@ const getSchema = async (name) => {
 const getEnum = async (name) => {
   const schema = await getSchemaDefinitions();
   if (!name) {
-    return schema.metadata.datamodel.enums;
+    return [...schema.metadata.datamodel.enums];
   }
   const model = schema.datamodel.enums.find((e) => e.name === name);
   if (!model) {
@@ -66,7 +66,8 @@ const getDataModel = async () => {
   return result.schemas;
 };
 const getSchemaDefinitions = async () => {
-  return getDMMF({ datamodel: await getDataModel() });
+  const document = await getDMMF({ datamodel: await getDataModel() });
+  return document;
 };
 const getSchemaConfig = async () => {
   return getConfig({

package/package.json

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