@cedarjs/cli 7.0.0-canary.3031 → 7.0.0-canary.3032

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

@@ -250,6 +250,10 @@ const getIdName = async (model) => {
   if (!isServiceModel(schemaResult)) {
     return void 0;
   }
+  if (schemaResult.primaryKey?.fields.length) {
+    const { fields, name } = schemaResult.primaryKey;
+    return { fields, whereArg: name || fields.join("_") };
+  }
   return schemaResult.fields.find((field) => field.isId)?.name;
 };
 const files = async ({
@@ -262,6 +266,11 @@ const files = async ({
   const componentName = camelcase(pluralize(name));
   const model = name;
   const idName = await getIdName(model);
+  if (tests && rest.crud && idName !== void 0 && typeof idName !== "string") {
+    throw new Error(
+      `Cannot generate CRUD tests for "${model}": it has a compound primary key (@@id([${idName.fields.join(", ")}])), which isn't supported by the generated test file yet. Re-run with \`--tests=false\`.`
+    );
+  }
   const prismaImportSource = "src/lib/db";
   let modelRelations;
   if (relations) {
@@ -286,46 +295,46 @@ const files = async ({
       ...rest
     }
   });
-  const testFile = await templateForFile({
-    name,
-    side: "api",
-    sidePathSection: "services",
-    generator: "service",
-    outputPath: path.join(componentName, componentName + ".test.ts"),
-    templatePath: "test.ts.template",
-    templateVars: {
-      relations: relations || [],
-      create: await fieldsToInput(model),
-      update: await fieldsToUpdate(model),
-      types: await fieldTypes(model),
-      prismaImport: (await parseSchema(model)).scalarFields.some(
-        (field) => field.type === "Decimal"
-      ),
-      prismaModel: model,
-      idName,
-      prismaImportSource,
-      ...rest
-    }
-  });
-  const scenariosFile = await templateForFile({
-    name,
-    side: "api",
-    sidePathSection: "services",
-    generator: "service",
-    outputPath: path.join(componentName, componentName + ".scenarios.ts"),
-    templatePath: "scenarios.ts.template",
-    templateVars: {
-      scenario: await buildScenario(model),
-      stringifiedScenario: await buildStringifiedScenario(model),
-      prismaModel: model,
-      idName,
-      relations: modelRelations,
-      prismaImportSource,
-      ...rest
-    }
-  });
   const files2 = [serviceFile];
   if (tests) {
+    const testFile = await templateForFile({
+      name,
+      side: "api",
+      sidePathSection: "services",
+      generator: "service",
+      outputPath: path.join(componentName, componentName + ".test.ts"),
+      templatePath: "test.ts.template",
+      templateVars: {
+        relations: relations || [],
+        create: await fieldsToInput(model),
+        update: await fieldsToUpdate(model),
+        types: await fieldTypes(model),
+        prismaImport: (await parseSchema(model)).scalarFields.some(
+          (field) => field.type === "Decimal"
+        ),
+        prismaModel: model,
+        idName,
+        prismaImportSource,
+        ...rest
+      }
+    });
+    const scenariosFile = await templateForFile({
+      name,
+      side: "api",
+      sidePathSection: "services",
+      generator: "service",
+      outputPath: path.join(componentName, componentName + ".scenarios.ts"),
+      templatePath: "scenarios.ts.template",
+      templateVars: {
+        scenario: await buildScenario(model),
+        stringifiedScenario: await buildStringifiedScenario(model),
+        prismaModel: model,
+        idName,
+        relations: modelRelations,
+        prismaImportSource,
+        ...rest
+      }
+    });
     files2.push(testFile);
     files2.push(scenariosFile);
   }

package/dist/commands/generate/service/templates/service.ts.template

@@ -1,14 +1,28 @@
 import type { QueryResolvers<% if (crud) { %>, MutationResolvers<% } %><% if (relations.length) { %>, ${singularPascalName}RelationResolvers<% } %> } from 'types/graphql'
 
 import { db } from 'src/lib/db'
-
+<%
+  // A compound `@@id([...])` key comes through as `{ fields, whereArg }`
+  // instead of a single field name -- build the destructure/where-clause
+  // snippets for both shapes here so the rest of the template can stay
+  // shape-agnostic.
+  const idIsComposite = idName != null && typeof idName === 'object'
+  const idFields = idIsComposite ? idName.fields : [idName]
+  const idArgs = idFields.join(', ')
+  const idWhere = idIsComposite
+    ? `${idName.whereArg}: { ${idFields.join(', ')} }`
+    : idName
+  const idWhereFromRoot = idIsComposite
+    ? `${idName.whereArg}: { ${idFields.map((f) => `${f}: root?.${f}`).join(', ')} }`
+    : `${idName}: root?.${idName}`
+%>
 export const ${pluralCamelName}: QueryResolvers['${pluralCamelName}'] = () => {
   return db.${singularCamelName}.findMany()
 }<% if (crud || relations.length) { %>
 
-export const ${singularCamelName}: QueryResolvers['${singularCamelName}'] = ({ ${idName} }) => {
+export const ${singularCamelName}: QueryResolvers['${singularCamelName}'] = ({ ${idArgs} }) => {
   return db.${singularCamelName}.findUnique({
-    where: { ${idName} },
+    where: { ${idWhere} },
   })
 }<% } %><% if (crud) { %>
 
@@ -18,21 +32,21 @@ export const create${singularPascalName}: MutationResolvers['create${singularPas
   })
 }
 
-export const update${singularPascalName}: MutationResolvers['update${singularPascalName}'] = ({ ${idName}, input }) => {
+export const update${singularPascalName}: MutationResolvers['update${singularPascalName}'] = ({ ${idArgs}, input }) => {
   return db.${singularCamelName}.update({
     data: input,
-    where: { ${idName} },
+    where: { ${idWhere} },
   })
 }
 
-export const delete${singularPascalName}: MutationResolvers['delete${singularPascalName}'] = ({ ${idName} }) => {
+export const delete${singularPascalName}: MutationResolvers['delete${singularPascalName}'] = ({ ${idArgs} }) => {
   return db.${singularCamelName}.delete({
-    where: { ${idName} },
+    where: { ${idWhere} },
   })
 }<% } %><% if (relations.length) { %>
 
 export const ${singularPascalName}: ${singularPascalName}RelationResolvers = {<% relations.forEach(relation => { %>
   ${relation}: (_obj, { root }) => {
-    return db.${singularCamelName}.findUnique({ where: { ${idName}: root?.${idName} } }).${relation}()
+    return db.${singularCamelName}.findUnique({ where: { ${idWhereFromRoot} } }).${relation}()
   },<% }) %>
 }<% } %>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "7.0.0-canary.3031",
+  "version": "7.0.0-canary.3032",
   "description": "The CedarJS Command Line",
   "repository": {
     "type": "git",
@@ -36,17 +36,17 @@
     "@babel/preset-typescript": "7.29.7",
     "@babel/traverse": "7.29.8",
     "@babel/types": "7.29.8",
-    "@cedarjs/api-server": "7.0.0-canary.3031",
-    "@cedarjs/babel-config": "7.0.0-canary.3031",
-    "@cedarjs/cli-helpers": "7.0.0-canary.3031",
-    "@cedarjs/internal": "7.0.0-canary.3031",
-    "@cedarjs/prerender": "7.0.0-canary.3031",
-    "@cedarjs/project-config": "7.0.0-canary.3031",
-    "@cedarjs/structure": "7.0.0-canary.3031",
-    "@cedarjs/telemetry": "7.0.0-canary.3031",
-    "@cedarjs/utils": "7.0.0-canary.3031",
-    "@cedarjs/vite": "7.0.0-canary.3031",
-    "@cedarjs/web-server": "7.0.0-canary.3031",
+    "@cedarjs/api-server": "7.0.0-canary.3032",
+    "@cedarjs/babel-config": "7.0.0-canary.3032",
+    "@cedarjs/cli-helpers": "7.0.0-canary.3032",
+    "@cedarjs/internal": "7.0.0-canary.3032",
+    "@cedarjs/prerender": "7.0.0-canary.3032",
+    "@cedarjs/project-config": "7.0.0-canary.3032",
+    "@cedarjs/structure": "7.0.0-canary.3032",
+    "@cedarjs/telemetry": "7.0.0-canary.3032",
+    "@cedarjs/utils": "7.0.0-canary.3032",
+    "@cedarjs/vite": "7.0.0-canary.3032",
+    "@cedarjs/web-server": "7.0.0-canary.3032",
     "@listr2/prompt-adapter-enquirer": "4.3.0",
     "@opentelemetry/api": "1.9.1",
     "@opentelemetry/core": "1.30.1",
@@ -94,7 +94,7 @@
     "yargs": "17.7.3"
   },
   "devDependencies": {
-    "@cedarjs/framework-tools": "7.0.0-canary.3031",
+    "@cedarjs/framework-tools": "7.0.0-canary.3032",
     "@prisma/dmmf": "7.8.0",
     "@types/archiver": "^7.0.0",
     "memfs": "4.68.1",