@cedarjs/cli 8.0.0-canary.3410 → 8.0.0-canary.3411

package/dist/commands/generate/dbAuth/templates/login.webAuthn.tsx.template

@@ -17,7 +17,7 @@ import { useAuth } from 'src/auth'
 const WELCOME_MESSAGE = 'Welcome back!'
 const REDIRECT = routes.home()
 
-const LoginPage = ({ type }) => {
+const LoginPage = ({ type }: { type?: string }) => {
   const {
     isAuthenticated,
     client: webAuthn,
@@ -27,12 +27,12 @@ const LoginPage = ({ type }) => {
   } = useAuth()
   const [shouldShowWebAuthn, setShouldShowWebAuthn] = useState(false)
   const [showWebAuthn, setShowWebAuthn] = useState(
-    webAuthn.isEnabled() && type !== 'password'
+    !!webAuthn?.isEnabled() && type !== 'password'
   )
 
   // should redirect right after login or wait to show the webAuthn prompts?
   useEffect(() => {
-    if (isAuthenticated && (!shouldShowWebAuthn || webAuthn.isEnabled())) {
+    if (isAuthenticated && (!shouldShowWebAuthn || webAuthn?.isEnabled())) {
       navigate(REDIRECT)
     }
   }, [isAuthenticated, shouldShowWebAuthn])
@@ -45,13 +45,13 @@ const LoginPage = ({ type }) => {
   }, [loading, isAuthenticated])
 
   // focus on the ${usernameLowerCase} field as soon as the page loads
-  const ${usernameCamelCase}Ref = useRef()
+  const ${usernameCamelCase}Ref = useRef<HTMLInputElement>(null)
   useEffect(() => {
-    ${usernameCamelCase}Ref.current && ${usernameCamelCase}Ref.current.focus()
+    ${usernameCamelCase}Ref.current?.focus()
   }, [])
 
-  const onSubmit = async (data) => {
-    const webAuthnSupported = await webAuthn.isSupported()
+  const onSubmit = async (data: Record<string, string>) => {
+    const webAuthnSupported = !!(await webAuthn?.isSupported())
 
     if (webAuthnSupported) {
       setShouldShowWebAuthn(true)
@@ -75,30 +75,38 @@ const LoginPage = ({ type }) => {
   }
 
   const onAuthenticate = async () => {
+    if (!webAuthn) {
+      return
+    }
+
     try {
       await webAuthn.authenticate()
       await reauthenticate()
       toast.success(WELCOME_MESSAGE)
       navigate(REDIRECT)
     } catch (e) {
-      if (e.name === 'WebAuthnDeviceNotFoundError') {
+      if (e instanceof Error && e.name === 'WebAuthnDeviceNotFoundError') {
         toast.error(
           'Device not found, log in with ${usernameTitleCase}/${passwordTitleCase} to continue'
         )
         setShowWebAuthn(false)
       } else {
-        toast.error(e.message)
+        toast.error(e instanceof Error ? e.message : String(e))
       }
     }
   }
 
   const onRegister = async () => {
+    if (!webAuthn) {
+      return
+    }
+
     try {
       await webAuthn.register()
       toast.success(WELCOME_MESSAGE)
       navigate(REDIRECT)
     } catch (e) {
-      toast.error(e.message)
+      toast.error(e instanceof Error ? e.message : String(e))
     }
   }
 
@@ -200,7 +208,7 @@ const LoginPage = ({ type }) => {
 
   const formToRender = () => {
     if (showWebAuthn) {
-      if (webAuthn.isEnabled()) {
+      if (webAuthn?.isEnabled()) {
         return <AuthWebAuthnPrompt />
       } else {
         return <RegisterWebAuthnPrompt />
@@ -212,7 +220,7 @@ const LoginPage = ({ type }) => {
 
   const linkToRender = () => {
     if (showWebAuthn) {
-      if (webAuthn.isEnabled()) {
+      if (webAuthn?.isEnabled()) {
         return (
           <div className="rw-login-link">
             <span>or login with </span>{' '}

package/dist/commands/generate/helpers.js

@@ -37,11 +37,33 @@ const redactedModelFields = (fieldNames) => {
   }
   return sensitive;
 };
+const DEFAULT_IGNORE_FIELDS_FOR_INPUT = ["createdAt", "updatedAt"];
+const requiredFieldsInUpdateInput = (model) => {
+  return inputFields(model).filter((field) => {
+    return field.isRequired && !field.isList && !field.isId;
+  }).map((field) => field.name);
+};
+const nullableJsonFieldsInInput = (model) => {
+  return inputFields(model).filter((field) => {
+    return field.type === "Json" && !field.isRequired && !field.isList;
+  }).map((field) => field.name);
+};
+const inputFields = (model) => {
+  const redactedFields = redactedModelFields(
+    model.fields.map((field) => field.name)
+  );
+  return model.fields.filter((field) => {
+    return field.kind !== "object" && !DEFAULT_IGNORE_FIELDS_FOR_INPUT.includes(field.name) && !redactedFields.includes(field.name);
+  });
+};
 const relationsForModel = (model) => {
   return model?.fields.filter((f) => f.relationName).map((field) => {
     return field.name;
   });
 };
+const nullableRelationsForModel = (model) => {
+  return model.fields.filter((f) => f.kind === "object" && !f.isList && !f.isRequired).map((f) => f.name);
+};
 const intForeignKeysForModel = (model) => {
   return model.fields.filter((f) => f.name.match(/Id$/) && f.type === "Int").map((f) => f.name);
 };
@@ -74,14 +96,18 @@ const mapPrismaScalarToPagePropTsType = (scalarType) => {
   return prismaScalarToTsType[scalarType] || "unknown";
 };
 export {
+  DEFAULT_IGNORE_FIELDS_FOR_INPUT,
   SENSITIVE_FIELDS,
   forcePluralizeWord,
   intForeignKeysForModel,
   mapPrismaScalarToPagePropTsType,
   mapRouteParamTypeToTsType,
+  nullableJsonFieldsInInput,
+  nullableRelationsForModel,
   pathName,
   redactedModelFields,
   relationsForModel,
   removeGeneratorName,
+  requiredFieldsInUpdateInput,
   validateName
 };

package/dist/commands/generate/ogImage/templates/ogImage.og.tsx.template

@@ -2,7 +2,7 @@ export const data = async () => {
   return new Date()
 }
 
-export const output = ({ data }) => {
+export const output = ({ data }: { data: Date }) => {
   return (
     <>
       <h1>${pageName} og:image</h1>

package/dist/commands/generate/package/templates/tsconfig.json.template

@@ -4,6 +4,7 @@
     "target": "es2023",
     "module": "node20",
     "esModuleInterop": true,
+    "strict": true,
     "skipLibCheck": true,
     "baseUrl": ".",
     "rootDir": "src",

package/dist/commands/generate/realtime/templates/liveQueries/blank/blank.service.ts.template

@@ -1,9 +1,17 @@
 // api/src/services/${name}s/${name}s.ts
+import type { ${typeName}ItemInput } from 'types/graphql'
+
 import type { LiveQueryStorageMechanism } from '@cedarjs/realtime'
 
 import { logger } from 'src/lib/logger'
 
-const ${collectionName} = [
+interface ${typeName}Data {
+  id: string
+  title: string
+  items: { amount: number }[]
+}
+
+const ${collectionName}: ${typeName}Data[] = [
   { id: '1', title: 'First ${modelName}', items: [{ amount: 11 }] },
   { id: '2', title: '2nd ${modelName}', items: [{ amount: 22 }] },
   { id: '3', title: 'Third ${modelName}',  items: [{ amount: 33 }] },
@@ -35,14 +43,14 @@ const ${collectionName} = [
  *   }
  * }
  */
-export const ${liveQueryName} = async ({ id }) => {
+export const ${liveQueryName} = async ({ id }: { id: string }) => {
   const found${modelName} = ${collectionName}.find((a) => a.id === id)
   logger.debug({ id, ${name}: found${modelName} }, `${name} details`)
   return found${modelName}
 }
 
 export const create${typeName}Item = async (
-  { input },
+  { input }: { input: ${typeName}ItemInput },
   { context }: { context: { liveQueryStore: LiveQueryStorageMechanism } }
 ) => {
   const { ${camelName}Id, amount } = input
@@ -63,7 +71,7 @@ export const create${typeName}Item = async (
 }
 
 export const ${modelName} = {
-  largest${typeName}Item: (obj, { root }) => {
+  largest${typeName}Item: (obj: unknown, { root }: { root: ${typeName}Data }) => {
     const [largest] = root.items.sort((a, b) => b.amount - a.amount)
 
     logger.debug({ obj, root }, 'largest ${typeName}Item')

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

@@ -1,9 +1,9 @@
 import type { ${subscriptionInputType} } from 'types/graphql'
 
 import { logger } from 'src/lib/logger'
-import type { Publish${typeName}ChannelType } from 'src/subscriptions/${name}/${name}.service.js'
+import type { Publish${typeName}ChannelType } from 'src/subscriptions/${name}/${name}.js'
 
-export const ${subscriptionQueryName} = ({ id }) => [id]
+export const ${subscriptionQueryName} = ({ id }: { id: string }) => [id]
 
 export const ${subscriptionServiceResolver} = async (
   { input }: { input: ${subscriptionInputType} },

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

@@ -39,15 +39,15 @@ export type Publish${typeName}ChannelType = PubSub<Publish${typeName}Channel>
 const ${subscriptionName}Subscription = {
   ${subscriptionName}: {
     subscribe: (
-      _,
-      { id },
+      _: unknown,
+      { id }: { id: string },
       { pubSub }: { pubSub: Publish${typeName}ChannelType }
     ) => {
       logger.debug({ id }, '${name} subscription')
 
       return pubSub.subscribe('${typeName}', id)
     },
-    resolve: (payload) => {
+    resolve: (payload: Publish${typeName}Channel['${typeName}'][1]) => {
       logger.debug({ payload }, '${name} subscription resolve')
 
       return payload

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

@@ -1,6 +1,7 @@
 ${useClientDirective}import type {
   Edit${singularPascalName}By${pascalIdName},
   Update${singularPascalName}Input,
+  Update${singularPascalName}Mutation,
   Update${singularPascalName}MutationVariables
 } from 'types/graphql'
 
@@ -24,7 +25,7 @@ export const QUERY: TypedDocumentNode<Edit${singularPascalName}By${pascalIdName}
 `
 
 const UPDATE_${singularConstantName}_MUTATION: TypedDocumentNode<
-  Edit${singularPascalName}ById,
+  Update${singularPascalName}Mutation,
   Update${singularPascalName}MutationVariables
 > = gql`
   mutation Update${singularPascalName}Mutation($${idName}: ${idType}!, $input: Update${singularPascalName}Input!) {
@@ -54,17 +55,14 @@ export const Success = ({ ${singularCamelName} }: CellSuccessProps<Edit${singula
     }
   )
 
-  const onSave = (
-    input: Update${singularPascalName}Input,
-    id: Edit${singularPascalName}By${pascalIdName}['${singularCamelName}']['id']
-  ) => {
-    update${singularPascalName}({ variables: { id, input } })
+  const onSave = (input: Update${singularPascalName}Input) => {
+    update${singularPascalName}({ variables: { ${idName}: ${singularCamelName}.${idName}, input } })
   }
 
   return (
     <div className="rw-segment">
       <header className="rw-segment-header">
-        <h2 className="rw-heading rw-heading-secondary">Edit ${singularPascalName} {${singularCamelName}?.id}</h2>
+        <h2 className="rw-heading rw-heading-secondary">Edit ${singularPascalName} {${singularCamelName}.${idName}}</h2>
       </header>
       <div className="rw-segment-main">
         <${singularPascalName}Form ${singularCamelName}={${singularCamelName}} onSave={onSave} error={error} loading={loading} />

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

@@ -1,4 +1,4 @@
-import type { Edit${singularPascalName}By${pascalIdName}, Update${singularPascalName}Input } from 'types/graphql'
+import type { Edit${singularPascalName}By${pascalIdName}, Create${singularPascalName}Input } from 'types/graphql'
 
 import type { RWGqlError } from '@cedarjs/forms'
 import {
@@ -48,8 +48,8 @@ type Form${singularPascalName} = NonNullable<Edit${singularPascalName}By${pascal
 
 interface ${singularPascalName}FormProps {
   ${singularCamelName}?: Edit${singularPascalName}By${pascalIdName}['${singularCamelName}']
-  onSave: (data: Update${singularPascalName}Input, ${idName}?: Form${singularPascalName}['${idName}']) => void
-  error: RWGqlError
+  onSave: (data: Create${singularPascalName}Input) => void
+  error?: RWGqlError
   loading: boolean
 }
 
@@ -70,7 +70,8 @@ const ${singularPascalName}Form = (props: ${singularPascalName}FormProps) => {
       }
     <% } %>
     <% if (column.isEnum && !column.isList && !column.isRequired) { %>
-      if (data.${column.name} === '') {
+      // The "None" option has an empty value
+      if (!data.${column.name}) {
         data.${column.name} = null
       }
     <% } %>
@@ -80,7 +81,7 @@ const ${singularPascalName}Form = (props: ${singularPascalName}FormProps) => {
       }
     <% } %>
   <% }) %>
-    props.onSave(data, props?.${singularCamelName}?.${idName})
+    props.onSave(data)
   }
 
   return (
@@ -136,7 +137,7 @@ const ${singularPascalName}Form = (props: ${singularPascalName}FormProps) => {
         <% } else { %>
           <${column.component}
             name="${column.name}"
-            ${column.defaultProp}={${column.deserializeFunction && column.deserializeFunction + '('}props.${singularCamelName}?.<%= column.name %>${column.deserializeFunction && ')'}}
+            ${column.defaultProp}={${column.deserializeFunction && column.deserializeFunction + '('}props.${singularCamelName}?.<%= column.name %>${column.deserializeFunction && ')'}<%= !column.deserializeFunction && !column.isRequired ? ' ?? undefined' : '' %>}
             className="rw-input"
             errorClassName="rw-input rw-input-error"
             <%= !column.validation ? '' : `validation=${column.validation}` %>

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

@@ -25,7 +25,7 @@ export const jsonDisplay = (obj: unknown) => {
   )
 }
 
-export const truncate = (value: string | number) => {
+export const truncate = (value: string | number | null | undefined) => {
   let output = value?.toString() ?? ''
 
   if (output.length > MAX_STRING_LENGTH) {
@@ -65,6 +65,6 @@ export function timeTag(dateTime: <%= parsedDateTime ? 'Date' : 'string' %> | un
   return output
 }
 
-export const checkboxInputTag = (checked: boolean) => {
-  return <input type="checkbox" checked={checked} disabled />
+export const checkboxInputTag = (checked: boolean | null | undefined) => {
+  return <input type="checkbox" checked={!!checked} disabled />
 }

package/dist/commands/generate/script/templates/tsconfig.json.template

@@ -2,6 +2,7 @@
   "compilerOptions": {
     "noEmit": true,
     "allowJs": true,
+    "strict": true,
     "esModuleInterop": true,
     "baseUrl": "./",
     "rootDirs": [

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

@@ -19,7 +19,11 @@ import {
   getEnum,
   verifyModelName
 } from "../../../lib/schemaHelpers.js";
-import { redactedModelFields, relationsForModel } from "../helpers.js";
+import {
+  DEFAULT_IGNORE_FIELDS_FOR_INPUT,
+  redactedModelFields,
+  relationsForModel
+} from "../helpers.js";
 import { files as serviceFiles } from "../service/serviceHandler.js";
 import { templateForFile } from "../yargsHandlerHelpers.js";
 import {
@@ -27,7 +31,6 @@ import {
   missingRelatedModels,
   writeFilesWithStubsTask
 } from "./stubFiles.js";
-const DEFAULT_IGNORE_FIELDS_FOR_INPUT = ["createdAt", "updatedAt"];
 const missingIdConsoleMessage = () => {
   const line1 = ansis.bold.yellow("WARNING") + ": Cannot generate CRUD SDL without an `@id` database column.";
   const line2 = "If you are trying to generate for a many-to-many join table ";
@@ -61,7 +64,8 @@ const modelFieldToSDL = ({
     Bytes: "Byte"
   };
   const gqlType = prismaTypeToGraphqlType[field.type] || field.type;
-  const type = field.isList ? `[${gqlType}]` : gqlType;
+  const listItemType = field.kind === "object" ? gqlType : `${gqlType}!`;
+  const type = field.isList ? `[${listItemType}]` : gqlType;
   const isRequired = field.isRequired && required || field.isList || field.isId;
   const fieldContent = `${field.name}: ${type}${isRequired ? "!" : ""}`;
   if (docs) {
@@ -332,6 +336,7 @@ const handler = async ({
 export {
   files,
   handler,
+  modelFieldToSDL,
   printRedactedFieldsNote,
   redactedSensitiveFields,
   stubFiles

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

@@ -3,7 +3,14 @@ import camelcase from "camelcase";
 import { pluralize, singularize } from "@cedarjs/utils/cedarPluralize";
 import { transformTSToJS } from "../../../lib/index.js";
 import { getSchema, verifyModelName } from "../../../lib/schemaHelpers.js";
-import { redactedModelFields, relationsForModel } from "../helpers.js";
+import {
+  DEFAULT_IGNORE_FIELDS_FOR_INPUT,
+  nullableJsonFieldsInInput,
+  nullableRelationsForModel,
+  redactedModelFields,
+  relationsForModel,
+  requiredFieldsInUpdateInput
+} from "../helpers.js";
 import { createHandler, templateForFile } from "../yargsHandlerHelpers.js";
 function isServiceModel(schema) {
   return typeof schema === "object" && schema !== null && "fields" in schema && "name" in schema;
@@ -59,11 +66,13 @@ function scenarioFieldValue(field) {
       return randInt;
     case "Json":
       return { foo: "bar" };
-    case "String":
+    case "String": {
+      const isUnique = field.isUnique || field.isId;
       if (field.name?.toLowerCase().includes("email")) {
-        return field.isUnique ? `foo${randInt}@bar.com` : "foo@bar.com";
+        return isUnique ? `foo${randInt}@bar.com` : "foo@bar.com";
       }
-      return field.isUnique ? `String${randInt}` : "String";
+      return isUnique ? `String${randInt}` : "String";
+    }
     case "Bytes":
       return `new Uint8Array([${randIntArray}])`;
     default: {
@@ -152,11 +161,14 @@ const fieldsToInput = async (model) => {
   const modelName = camelcase(singularize(model));
   const inputObj = {};
   if (scalarFields.some(
-    (field) => redactedFields.includes(field.name)
+    (field) => redactedFields.includes(field.name) || DEFAULT_IGNORE_FIELDS_FOR_INPUT.includes(field.name) && !field.isUpdatedAt
   )) {
     return false;
   }
   scalarFields.forEach((field) => {
+    if (DEFAULT_IGNORE_FIELDS_FOR_INPUT.includes(field.name)) {
+      return;
+    }
     if (foreignKeys.includes(field.name)) {
       inputObj[field.name] = `scenario.${modelName}.two.${field.name}`;
     } else {
@@ -174,7 +186,7 @@ const fieldsToUpdate = async (model) => {
   const modelName = camelcase(singularize(model));
   let field, newValue, fieldName;
   const updatableFields = scalarFields.filter(
-    (scalar) => !redactedFields.includes(scalar.name)
+    (scalar) => !redactedFields.includes(scalar.name) && !DEFAULT_IGNORE_FIELDS_FOR_INPUT.includes(scalar.name)
   );
   field = updatableFields.find(
     (scalar) => !foreignKeys.includes(scalar.name)
@@ -273,13 +285,19 @@ const files = async ({
   }
   const prismaImportSource = "src/lib/db";
   let modelRelations;
+  let updateInputRequiredFields = [];
+  let nullableJsonFields = [];
+  let nullableRelations = [];
+  const schemaResult = await getSchema(model);
+  if (isServiceModel(schemaResult)) {
+    updateInputRequiredFields = requiredFieldsInUpdateInput(schemaResult);
+    nullableJsonFields = nullableJsonFieldsInInput(schemaResult);
+    nullableRelations = nullableRelationsForModel(schemaResult);
+  }
   if (relations) {
     modelRelations = relations;
-  } else {
-    const schemaResult = await getSchema(model);
-    if (isServiceModel(schemaResult)) {
-      modelRelations = relationsForModel(schemaResult);
-    }
+  } else if (isServiceModel(schemaResult)) {
+    modelRelations = relationsForModel(schemaResult);
   }
   const serviceFile = await templateForFile({
     name,
@@ -292,6 +310,9 @@ const files = async ({
       relations: modelRelations,
       idName,
       prismaImportSource,
+      updateInputRequiredFields,
+      nullableJsonFields,
+      nullableRelations,
       ...rest
     }
   });

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

@@ -1,6 +1,6 @@
 import type { QueryResolvers<% if (crud) { %>, MutationResolvers<% } %><% if (relations.length) { %>, ${singularPascalName}RelationResolvers<% } %> } from 'types/graphql'
 
-import { db } from 'src/lib/db'
+import { db<% if (crud && nullableJsonFields.length) { %>, Prisma<% } %> } from 'src/lib/db'
 <%
   // A compound `@@id([...])` key comes through as `{ fields, whereArg }`
   // instead of a single field name -- build the destructure/where-clause
@@ -13,8 +13,8 @@ import { db } from 'src/lib/db'
     ? `${idName.whereArg}: { ${idFields.join(', ')} }`
     : idName
   const idWhereFromRoot = idIsComposite
-    ? `${idName.whereArg}: { ${idFields.map((f) => `${f}: root?.${f}`).join(', ')} }`
-    : `${idName}: root?.${idName}`
+    ? `${idName.whereArg}: { ${idFields.map((f) => `${f}: root.${f}`).join(', ')} }`
+    : `${idName}: root.${idName}`
 %>
 export const ${pluralCamelName}: QueryResolvers['${pluralCamelName}'] = () => {
   return db.${singularCamelName}.findMany()
@@ -27,14 +27,27 @@ export const ${singularCamelName}: QueryResolvers['${singularCamelName}'] = ({ $
 }<% } %><% if (crud) { %>
 
 export const create${singularPascalName}: MutationResolvers['create${singularPascalName}'] = ({ input }) => {
-  return db.${singularCamelName}.create({
-    data: input,
+  return db.${singularCamelName}.create({<% if (nullableJsonFields.length) { %>
+    data: {
+      ...input,
+      // Prisma uses Prisma.DbNull, not null, to set a Json field to NULL<% nullableJsonFields.forEach((field) => { %>
+      ${field}: input.${field} === null ? Prisma.DbNull : input.${field},<% }) %>
+    },<% } else { %>
+    data: input,<% } %>
   })
 }
 
 export const update${singularPascalName}: MutationResolvers['update${singularPascalName}'] = ({ ${idArgs}, input }) => {
-  return db.${singularCamelName}.update({
-    data: input,
+  return db.${singularCamelName}.update({<% if (updateInputRequiredFields.length || nullableJsonFields.length) { %>
+    data: {
+      ...input,<% if (updateInputRequiredFields.length) { %>
+      // Every field in the GraphQL input is nullable, but Prisma doesn't
+      // accept null for required fields. undefined leaves the field unchanged<% updateInputRequiredFields.forEach((field) => { %>
+      ${field}: input.${field} ?? undefined,<% }) %><% } %><% if (nullableJsonFields.length) { %>
+      // Prisma uses Prisma.DbNull, not null, to set a Json field to NULL<% nullableJsonFields.forEach((field) => { %>
+      ${field}: input.${field} === null ? Prisma.DbNull : input.${field},<% }) %><% } %>
+    },<% } else { %>
+    data: input,<% } %>
     where: { ${idWhere} },
   })
 }
@@ -47,6 +60,6 @@ export const delete${singularPascalName}: MutationResolvers['delete${singularPas
 
 export const ${singularPascalName}: ${singularPascalName}RelationResolvers = {<% relations.forEach(relation => { %>
   ${relation}: (_obj, { root }) => {
-    return db.${singularCamelName}.findUnique({ where: { ${idWhereFromRoot} } }).${relation}()
+    return db.${singularCamelName}.findUnique<%= nullableRelations.includes(relation) ? '' : 'OrThrow' %>({ where: { ${idWhereFromRoot} } }).${relation}()
   },<% }) %>
 }<% } %>

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

@@ -7,8 +7,10 @@
    // Looks for quoted strings, either by single (') or double (") quotes.
    // When found
    // - Removes the quotes around `scenario` variables.
-   // - Removes the quotes around `BigInt` fields.
-  const transformValue = (obj, type) => {
+   // - Removes the quotes around `BigInt` fields. GraphQL inputs type BigInt
+   //   values as numbers, so the `n` suffix is also removed when `asInput` is
+   //   set
+  const transformValue = (obj, type, asInput = false) => {
     if (type === 'DateTime') {
       return `new Date('${obj.toISOString()}')`
     } else if (type === 'Decimal') {
@@ -22,7 +24,7 @@
 
       // BigInt
       if (string.match(/^\"\d+n\"$/)) {
-        return string.slice(1, string.length - 1)
+        return string.slice(1, string.length - (asInput ? 2 : 1))
       }
 
       return string
@@ -57,7 +59,7 @@ describe('${pluralCamelName}', () => {
 
   <% if (create) { %>scenario('creates a ${singularCamelName}', async (${transformValue(create).includes('scenario.') ? 'scenario: StandardScenario' : ''}) => {
     const result = await create${singularPascalName}({
-      input: ${transformValue(create)},
+      input: ${transformValue(create, undefined, true)},
     })
 
     <% for (const [name, value] of Object.entries(create)) { %>
@@ -68,7 +70,7 @@ describe('${pluralCamelName}', () => {
     const original = await (${singularCamelName}({ ${idName}: scenario.${singularCamelName}.one.${idName} })) as ${prismaModel}
     const result = await update${singularPascalName}({
       ${idName}: original.${idName},
-      input: ${transformValue(update)},
+      input: ${transformValue(update, undefined, true)},
     })
 
     <% for (const [name, value] of Object.entries(update)) { %>

package/package.json

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