Merge pull request #51 from Quramy/fix_nullable_field

fix: Nullable scalar field
Quramy · Nov 28, 2022 · c299c5c · c299c5c
2 parents 93247ec + cb0c906
commit c299c5c
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 3 deletions.
diff --git a/packages/prisma-fabbrica/src/templates/index.ts b/packages/prisma-fabbrica/src/templates/index.ts
@@ -31,7 +31,9 @@ function isInputObjectTypeField(field: DMMF.SchemaArg) {
 }
 
 function filterRequiredScalarOrEnumFields(inputType: DMMF.InputType) {
-  return filterRequiredFields(inputType).filter(isScalarOrEnumField);
+  return filterRequiredFields(inputType)
+    .filter(inputType => !inputType.isNullable)
+    .filter(isScalarOrEnumField);
 }
 
 function filterRequiredInputObjectTypeField(inputType: DMMF.InputType) {
@@ -94,6 +96,8 @@ export const scalarFieldType = (
     throw new Error("Invalid call. This function is allowed for only scalar field.");
   }
   switch (inputType.type) {
+    case "Null":
+      return ast.literalTypeNode(ast.null());
     case "Boolean":
       return ast.keywordTypeNode(ts.SyntaxKind.BooleanKeyword);
     case "String":

diff --git a/packages/prisma-fabbrica/src/templates/modelScalarOrEnumFields.test.ts b/packages/prisma-fabbrica/src/templates/modelScalarOrEnumFields.test.ts
@@ -30,6 +30,20 @@ describe(modelScalarOrEnumFields, () => {
         }
       `,
     },
+    {
+      pattern: "Nullable field",
+      datamodel: `
+        model TestModel {
+          id            Int @id
+          nullableField String?
+        }
+      `,
+      expected: `
+        type TestModelScalarOrEnumFields = {
+          id: number;
+        }
+      `,
+    },
     {
       pattern: "Complex id",
       datamodel: `

diff --git a/packages/ts-compile-testing/fixtures/field-variation/__generated__/fabbrica/index.ts b/packages/ts-compile-testing/fixtures/field-variation/__generated__/fabbrica/index.ts
diff --git a/packages/ts-compile-testing/fixtures/field-variation/schema.prisma b/packages/ts-compile-testing/fixtures/field-variation/schema.prisma
@@ -16,6 +16,7 @@ datasource db {
 
 model User {
   id           String @id
+  nullableStr  String?
   role         Role
   roleDefault  Role @default(USER)
   roles        Role[]

diff --git a/packages/ts-compile-testing/scripts/generateFixtures.ts b/packages/ts-compile-testing/scripts/generateFixtures.ts
@@ -13,8 +13,6 @@ async function main() {
   for (const fixtureDir of dirs) {
     const schemaPath = path.resolve(fixturesDir, fixtureDir, "schema.prisma");
     if (!existsSync(schemaPath)) continue;
-    const { stdout } = await exec(`npx prisma generate --schema=${schemaPath}`);
-    process.stdout.write(stdout);
     const schemaContents = await fs.readFile(schemaPath, "utf8");
     const dmmfDocument = await getDMMF({
       datamodel: schemaContents,
@@ -24,6 +22,8 @@ async function main() {
       JSON.stringify(dmmfDocument, null, 2),
       "utf8",
     );
+    const { stdout } = await exec(`npx prisma generate --schema=${schemaPath}`);
+    process.stdout.write(stdout);
   }
 }