@cedarjs/cli 7.0.0-canary.3259 → 7.0.0-rc.123

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

@@ -2,9 +2,8 @@ import path from "node:path";
 import { paramCase } from "change-case";
 import { Listr } from "listr2";
 import { terminalLink } from "termi-link";
-import { colors as c } from "@cedarjs/cli-helpers/colors";
+import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
 import { formatCedarCommand } from "@cedarjs/cli-helpers/packageManager/display";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
 import { getDataMigrationsPath } from "@cedarjs/project-config";
 import {
   generateTemplate,

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

@@ -4,10 +4,9 @@ import { ListrEnquirerPromptAdapter } from "@listr2/prompt-adapter-enquirer";
 import { camelCase } from "camel-case";
 import { Listr } from "listr2";
 import { titleCase } from "title-case";
-import { colors as c } from "@cedarjs/cli-helpers/colors";
+import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
 import { formatCedarCommand } from "@cedarjs/cli-helpers/packageManager/display";
 import { runBinSync } from "@cedarjs/cli-helpers/packageManager/exec";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
 import {
   addRoutesToRouterTask,
   addScaffoldImport,
@@ -76,14 +75,12 @@ const files = async ({
   skipReset,
   skipSignup,
   webauthn,
-  oauth,
   usernameLabel,
   passwordLabel
 }) => {
   const filesList = [];
   usernameLabel = usernameLabel || "username";
   passwordLabel = passwordLabel || "password";
-  const oauthEnabled = oauth ?? isOAuthEnabled();
   const templateVars = {
     usernameLowerCase: usernameLabel.toLowerCase(),
     usernameCamelCase: camelCase(usernameLabel),
@@ -113,7 +110,7 @@ const files = async ({
         extension: typescript ? ".tsx" : ".jsx",
         webPathSection: "pages",
         generator: "dbAuth",
-        templatePath: loginTemplatePath(webauthn, oauthEnabled),
+        templatePath: webauthn ? "login.webAuthn.tsx.template" : "login.tsx.template",
         templateVars
       })
     );
@@ -139,7 +136,7 @@ const files = async ({
         extension: typescript ? ".tsx" : ".jsx",
         webPathSection: "pages",
         generator: "dbAuth",
-        templatePath: oauthEnabled ? "signup.oauth.tsx.template" : "signup.tsx.template",
+        templatePath: "signup.tsx.template",
         templateVars
       })
     );
@@ -381,23 +378,6 @@ function isWebAuthnEnabled() {
   );
   return webPackageJson.includes('"@simplewebauthn/browser": ');
 }
-function isOAuthEnabled() {
-  const apiPackageJsonPath = path.join(getPaths().base, "api", "package.json");
-  if (!fs.existsSync(apiPackageJsonPath)) {
-    return false;
-  }
-  const apiPackageJson = fs.readFileSync(apiPackageJsonPath, "utf-8");
-  return apiPackageJson.includes('"@cedarjs/auth-dbauth-oauth": ');
-}
-function loginTemplatePath(webauthn, oauth) {
-  if (webauthn) {
-    return "login.webAuthn.tsx.template";
-  }
-  if (oauth) {
-    return "login.oauth.tsx.template";
-  }
-  return "login.tsx.template";
-}
 export {
   files,
   handler

package/dist/commands/generate/directive/directiveHandler.js

@@ -1,9 +1,8 @@
 import camelcase from "camelcase";
 import { Listr } from "listr2";
 import prompts from "prompts";
-import { colors as c } from "@cedarjs/cli-helpers/colors";
+import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
 import { runBin } from "@cedarjs/cli-helpers/packageManager/exec";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
 import { getConfig } from "@cedarjs/project-config";
 import { writeFilesTask, transformTSToJSMap } from "../../../lib/index.js";
 import {

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

@@ -1,7 +1,6 @@
 import { Listr } from "listr2";
 import { terminalLink } from "termi-link";
-import { colors as c } from "@cedarjs/cli-helpers/colors";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
+import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import { transformTSToJSMap, writeFilesTask } from "../../../lib/index.js";
 import { prepareForRollback } from "../../../lib/rollback.js";

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

@@ -2,9 +2,8 @@ import path from "node:path";
 import { pathToFileURL } from "node:url";
 import * as changeCase from "change-case";
 import { Listr } from "listr2";
-import { colors as c } from "@cedarjs/cli-helpers/colors";
+import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
 import { runBinSync } from "@cedarjs/cli-helpers/packageManager/exec";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import {
   getPaths,

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

@@ -1,7 +1,6 @@
 import path from "path";
 import { Listr } from "listr2";
-import { colors as c } from "@cedarjs/cli-helpers/colors";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
+import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
 import {
   getPaths,
   writeFilesTask,

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

@@ -2,8 +2,7 @@ import fs from "node:fs";
 import path from "node:path";
 import fg from "fast-glob";
 import { Listr } from "listr2";
-import { colors as c } from "@cedarjs/cli-helpers/colors";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
+import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
 import { ensurePosixPath } from "@cedarjs/project-config";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import {

package/dist/commands/generate/package/filesTask.js

@@ -8,6 +8,7 @@ const files = async ({
   fileName,
   typescript,
   tests: generateTests = true,
+  esm = false,
   ...rest
 }) => {
   const extension = typescript ? ".ts" : ".js";
@@ -58,15 +59,17 @@ const files = async ({
       outputPath: path.join(folderName, "src", `${fileName}.test${extension}`)
     });
     outputFiles.push(testFile);
-    const vitestConfigFile = await templateForFile({
-      name,
-      side: "packages",
-      generator: "package",
-      templatePath: "vitest.config.ts.template",
-      templateVars: { folderName, ...rest },
-      outputPath: path.join(folderName, `vitest.config${extension}`)
-    });
-    outputFiles.push(vitestConfigFile);
+    if (esm) {
+      const vitestConfigFile = await templateForFile({
+        name,
+        side: "packages",
+        generator: "package",
+        templatePath: "vitest.config.ts.template",
+        templateVars: { folderName, ...rest },
+        outputPath: path.join(folderName, `vitest.config${extension}`)
+      });
+      outputFiles.push(vitestConfigFile);
+    }
   }
   return outputFiles.reduce(async (accP, [outputPath, content]) => {
     const acc = await accP;

package/dist/commands/generate/package/packageHandler.js

@@ -6,13 +6,12 @@ import { modify, applyEdits } from "jsonc-parser";
 import { Listr } from "listr2";
 import { terminalLink } from "termi-link";
 import ts from "typescript";
-import { colors as c } from "@cedarjs/cli-helpers/colors";
+import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
 import { workspacePackageSpecifier } from "@cedarjs/cli-helpers/packageManager";
 import { runScript, runBinSync } from "@cedarjs/cli-helpers/packageManager/exec";
 import { installPackages } from "@cedarjs/cli-helpers/packageManager/packages";
 import { addWorkspaceDir } from "@cedarjs/cli-helpers/packageManager/workspaces";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
-import { getConfig } from "@cedarjs/project-config";
+import { getConfig, projectIsEsm } from "@cedarjs/project-config";
 import { getPackageManager } from "@cedarjs/project-config/packageManager";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import { getPaths, writeFilesTask } from "../../../lib/index.js";
@@ -343,6 +342,8 @@ const handler = async ({
         task: async (ctx) => {
           packageFiles = await files({
             ...ctx.nameVariants,
+            // Only Vitest projects get a config generated for them
+            esm: projectIsEsm(),
             ...rest
           });
           return writeFilesTask(packageFiles, { overwriteExisting: force });

package/dist/commands/generate/page/pageHandler.js

@@ -2,8 +2,7 @@ import { execSync } from "child_process";
 import camelcase from "camelcase";
 import { Listr } from "listr2";
 import pascalcase from "pascalcase";
-import { colors as c } from "@cedarjs/cli-helpers/colors";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
+import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
 import { generate as generateTypes } from "@cedarjs/internal/dist/generate/generate";
 import { getConfig } from "@cedarjs/project-config";
 import { errorTelemetry } from "@cedarjs/telemetry";

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

@@ -1,4 +1,4 @@
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
+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) {

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

@@ -4,8 +4,9 @@ import { Listr } from "listr2";
 import pascalcase from "pascalcase";
 import pluralize from "pluralize";
 import prompts from "prompts";
-import { colors as c } from "@cedarjs/cli-helpers/colors";
+import { colors as c } from "@cedarjs/cli-helpers";
 import { generate as generateTypes } from "@cedarjs/internal/dist/generate/generate";
+import { projectIsEsm } from "@cedarjs/project-config";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import {
   generateTemplate,
@@ -119,10 +120,16 @@ async function handler({
             exampleFile,
             exampleSubscriptionTemplateContent
           );
-          const blankTemplateContent = await generateTemplate(
+          let blankTemplateContent = await generateTemplate(
             setupScriptContent,
             templateVariables(name)
           );
+          if (projectIsEsm()) {
+            blankTemplateContent = blankTemplateContent.replace(
+              "import gql from 'graphql-tag'",
+              "import { gql } from 'graphql-tag'"
+            );
+          }
           return [
             writeFile(
               sdlFile,

package/dist/commands/generate/realtime/templates/subscriptions/blank/blank.ts.template

@@ -1,4 +1,4 @@
-import { gql } from 'graphql-tag'
+import gql from 'graphql-tag'
 
 import type { PubSub } from '@cedarjs/realtime'
 

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

@@ -5,15 +5,14 @@ import { paramCase } from "change-case";
 import humanize from "humanize-string";
 import { Listr } from "listr2";
 import pascalcase from "pascalcase";
-import { colors as c } from "@cedarjs/cli-helpers/colors";
+import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
 import { formatCedarCommand } from "@cedarjs/cli-helpers/packageManager/display";
 import {
   addWorkspacePackages,
   removeWorkspacePackages
 } from "@cedarjs/cli-helpers/packageManager/packages";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
 import { generate as generateTypes } from "@cedarjs/internal/dist/generate/generate";
-import { getConfig, getParsedScalars } from "@cedarjs/project-config";
+import { getConfig } from "@cedarjs/project-config";
 import { pluralize, singularize } from "@cedarjs/utils/cedarPluralize";
 import {
   generateTemplate,
@@ -190,7 +189,6 @@ const assetFiles = async (name, tailwind) => {
   }
   return fileList;
 };
-const isDateTimeParsed = () => getParsedScalars().DateTime === "Date";
 const formatters = async (name, isTypescript) => {
   const outputPath = path.join(
     getPaths().web.src,
@@ -212,8 +210,7 @@ const formatters = async (name, isTypescript) => {
       templatePath: path.join("lib", "formatters.tsx.template")
     }),
     {
-      name,
-      parsedDateTime: isDateTimeParsed()
+      name
     }
   );
   const templateTest = await generateTemplate(
@@ -223,8 +220,7 @@ const formatters = async (name, isTypescript) => {
       templatePath: path.join("lib", "formatters.test.tsx.template")
     }),
     {
-      name,
-      parsedDateTime: isDateTimeParsed()
+      name
     }
   );
   return {
@@ -344,8 +340,7 @@ const modelRelatedVariables = (model) => {
     fieldsToImport,
     editableColumns,
     listFormattersImports,
-    formattersImports,
-    parsedDateTime: isDateTimeParsed()
+    formattersImports
   };
 };
 const layoutFiles = async (name, force, generateTypescript, templateStrings) => {

package/dist/commands/generate/scaffold/templates/components/NameForm.tsx.template

@@ -12,17 +12,17 @@ import {
 
 <% if (fieldsToImport.includes('DatetimeLocalField')) { %>
 /**
- * Formats a DateTime <%= parsedDateTime ? 'Date object' : 'string' %> from the API, which is a UTC timestamp, for use as
+ * Formats a DateTime string from the API, which is a UTC timestamp, for use as
  * the value of a `datetime-local` input. The input takes `YYYY-MM-DDTHH:mm` in
  * the user's local time, with no seconds, milliseconds or timezone, and the
  * form reads its value back as local time when it is submitted.
  */
-function formatDatetime(value: <%= parsedDateTime ? 'Date' : 'string' %> | undefined | null) {
+function formatDatetime(value: string | undefined | null) {
   if (!value) {
     return undefined
   }
 
-  const date = <%= parsedDateTime ? 'value' : 'new Date(value)' %>
+  const date = new Date(value)
 
   if (Number.isNaN(date.getTime())) {
     return undefined

package/dist/commands/generate/scaffold/templates/lib/formatters.test.tsx.template

@@ -83,25 +83,14 @@ describe('jsonTruncate', () => {
 
 describe('timeTag', () => {
   it('renders a date', async () => {
-<% if (parsedDateTime) { %>
-    render(<div>{timeTag(new Date('1970-08-20'))}</div>)
-<% } else { %>
     render(<div>{timeTag(new Date('1970-08-20').toUTCString())}</div>)
-<% } %>
 
     await waitFor(() => screen.getByText(/1970.*00:00:00/))
   })
 
-<% if (parsedDateTime) { %>
-  it('can take an empty input', async () => {
-    expect(timeTag(null)).toEqual('')
-    expect(timeTag(undefined)).toEqual('')
-  })
-<% } else { %>
   it('can take an empty input string', async () => {
     expect(timeTag('')).toEqual('')
   })
-<% } %>
 })
 
 describe('jsonDisplay', () => {

package/dist/commands/generate/scaffold/templates/lib/formatters.tsx.template

@@ -39,27 +39,15 @@ export const jsonTruncate = (obj: unknown) => {
   return truncate(JSON.stringify(obj, null, 2))
 }
 
-export function timeTag(dateTime: <%= parsedDateTime ? 'Date' : 'string' %> | undefined | null) {
+export function timeTag(dateTime: string | undefined | null) {
   let output: string | React.JSX.Element = ''
 
   if (dateTime) {
-<% if (parsedDateTime) { %>
-    if (!Number.isNaN(dateTime.getTime())) {
-      const isoString = dateTime.toISOString()
-
-      output = (
-        <time dateTime={isoString} title={isoString}>
-          {dateTime.toUTCString()}
-        </time>
-      )
-    }
-<% } else { %>
     output = (
       <time dateTime={dateTime} title={dateTime}>
         {new Date(dateTime).toUTCString()}
       </time>
     )
-<% } %>
   }
 
   return output

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

@@ -1,8 +1,7 @@
 import fs from "node:fs";
 import path from "node:path";
 import { Listr } from "listr2";
-import { colors as c } from "@cedarjs/cli-helpers/colors";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
+import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import {
   getPaths,

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

@@ -2,9 +2,8 @@ import ansis from "ansis";
 import boxen from "boxen";
 import camelcase from "camelcase";
 import { Listr } from "listr2";
-import { colors as c } from "@cedarjs/cli-helpers/colors";
+import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
 import { formatCedarCommand } from "@cedarjs/cli-helpers/packageManager/display";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
 import { generate as generateTypes } from "@cedarjs/internal/dist/generate/generate";
 import { getConfig } from "@cedarjs/project-config";
 import { errorTelemetry } from "@cedarjs/telemetry";

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

@@ -1,6 +1,6 @@
 import crypto from "node:crypto";
 import { terminalLink } from "termi-link";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
 const DEFAULT_LENGTH = 32;
 const generateSecret = (length = DEFAULT_LENGTH) => {
   return crypto.randomBytes(Math.trunc(length)).toString("base64");

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

@@ -250,10 +250,6 @@ 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 ({
@@ -266,11 +262,6 @@ 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) {
@@ -295,46 +286,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,28 +1,14 @@
 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}'] = ({ ${idArgs} }) => {
+export const ${singularCamelName}: QueryResolvers['${singularCamelName}'] = ({ ${idName} }) => {
   return db.${singularCamelName}.findUnique({
-    where: { ${idWhere} },
+    where: { ${idName} },
   })
 }<% } %><% if (crud) { %>
 
@@ -32,21 +18,21 @@ export const create${singularPascalName}: MutationResolvers['create${singularPas
   })
 }
 
-export const update${singularPascalName}: MutationResolvers['update${singularPascalName}'] = ({ ${idArgs}, input }) => {
+export const update${singularPascalName}: MutationResolvers['update${singularPascalName}'] = ({ ${idName}, input }) => {
   return db.${singularCamelName}.update({
     data: input,
-    where: { ${idWhere} },
+    where: { ${idName} },
   })
 }
 
-export const delete${singularPascalName}: MutationResolvers['delete${singularPascalName}'] = ({ ${idArgs} }) => {
+export const delete${singularPascalName}: MutationResolvers['delete${singularPascalName}'] = ({ ${idName} }) => {
   return db.${singularCamelName}.delete({
-    where: { ${idWhere} },
+    where: { ${idName} },
   })
 }<% } %><% if (relations.length) { %>
 
 export const ${singularPascalName}: ${singularPascalName}RelationResolvers = {<% relations.forEach(relation => { %>
   ${relation}: (_obj, { root }) => {
-    return db.${singularCamelName}.findUnique({ where: { ${idWhereFromRoot} } }).${relation}()
+    return db.${singularCamelName}.findUnique({ where: { ${idName}: root?.${idName} } }).${relation}()
   },<% }) %>
 }<% } %>

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

@@ -40,7 +40,7 @@ import type { StandardScenario } from './${pluralCamelName}.scenarios.js'
 // and can fail without adjustments, e.g. Float.
 //           Please refer to the RedwoodJS Testing Docs:
 //       https://cedarjs.com/docs/testing#testing-services
-// https://cedarjs.com/docs/testing#expect-type-considerations
+// https://cedarjs.com/docs/testing#jest-expect-type-considerations
 
 describe('${pluralCamelName}', () => {
   scenario('returns all ${pluralCamelName}', async (scenario: StandardScenario) => {

package/dist/commands/generate/yargsCommandHelpers.js

@@ -1,5 +1,5 @@
 import { terminalLink } from "termi-link";
-import { isTypeScriptProject } from "@cedarjs/cli-helpers/project";
+import { isTypeScriptProject } from "@cedarjs/cli-helpers";
 function getYargsDefaults() {
   return {
     force: {

package/dist/commands/generate/yargsHandlerHelpers.js

@@ -3,8 +3,7 @@ import path from "node:path";
 import { camelCase } from "change-case";
 import { Listr } from "listr2";
 import pascalcase from "pascalcase";
-import { colors as c } from "@cedarjs/cli-helpers/colors";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
+import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
 import { ensurePosixPath, getConfig } from "@cedarjs/project-config";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import { generateTemplate, getPaths, writeFilesTask } from "../../lib/index.js";

package/dist/commands/generate.js

@@ -1,6 +1,6 @@
 import { terminalLink } from "termi-link";
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
 import { runBinSync } from "@cedarjs/cli-helpers/packageManager/exec";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
 import * as generateCell from "./generate/cell/cell.js";
 import * as generateComponent from "./generate/component/component.js";
 import * as generateDataMigration from "./generate/dataMigration/dataMigration.js";

package/dist/commands/info.js

@@ -2,7 +2,7 @@ import fs from "node:fs";
 import path from "node:path";
 import envinfo from "envinfo";
 import { terminalLink } from "termi-link";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
 import { getConfigPath } from "@cedarjs/project-config";
 const command = "info";
 const description = "Print your system environment information";

package/dist/commands/lint.js

@@ -1,7 +1,7 @@
 import fs from "node:fs";
 import { terminalLink } from "termi-link";
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
 import { runBin } from "@cedarjs/cli-helpers/packageManager/exec";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
 import { getPaths } from "@cedarjs/project-config";
 const command = "lint [paths..]";
 const description = "Lint your files";