Merge pull request #341 from Quramy/fix/issue_307

Sometimes `{}` is not assignable to ModelFactoryInput
Quramy · Jun 24, 2024 · 0464930 · 0464930
2 parents 8057938 + de61ac5
commit 0464930
Show file tree

Hide file tree

Showing 10 changed files with 32 additions and 21 deletions.
diff --git a/examples/example-prj/src/__generated__/fabbrica/index.js b/examples/example-prj/src/__generated__/fabbrica/index.js
diff --git a/packages/artifact-testing/.gitignore b/packages/artifact-testing/.gitignore
@@ -1,5 +1,3 @@
 fixtures/*/__generated__/client
 dmmf.json
 built/
-built_node/
-built_esnext/
diff --git a/packages/artifact-testing/fixtures/relations-one-to-many/__generated__/fabbrica/index.ts b/packages/artifact-testing/fixtures/relations-one-to-many/__generated__/fabbrica/index.ts
diff --git a/packages/artifact-testing/fixtures/relations-one-to-one/__generated__/fabbrica/index.ts b/packages/artifact-testing/fixtures/relations-one-to-one/__generated__/fabbrica/index.ts
diff --git a/packages/artifact-testing/package.json b/packages/artifact-testing/package.json
@@ -3,13 +3,13 @@
  "name": "artifact-testing",
  "version": "2.1.4",
  "scripts": {
- "clean": "rimraf -g \"fixtures/*/__generated__/client\" \"fixtures/*/dmmf.json\" built built_node built_esnext \"*.tsbuildinfo\"",
+ "clean": "rimraf -g \"fixtures/*/__generated__/client\" \"fixtures/*/dmmf.json\" built \"*.tsbuildinfo\"",
  "pretest:compile": "node scripts/generateFixtures.mjs",
  "pretest:compile:ci": "node scripts/generateFixtures.mjs",
  "test": "npm run test:compile && npm run test:functions",
  "test:ci": "npm run test:compile:ci && npm run test:functions",
- "test:compile": "tsc -p tsconfig.json && tsc -p tsconfig.esnext.json && tsc -p tsconfig.node.json",
- "test:compile:ci": "tsc -p tsconfig.json && tsc -p tsconfig.esnext.json && tsc -p tsconfig.node.json",
+ "test:compile": "tsc -p tsconfig.json && tsc -p tsconfig.esnext.json && tsc -p tsconfig.node.json && tsc -p tsconfig.noNullChecks.json",
+ "test:compile:ci": "tsc -p tsconfig.json && tsc -p tsconfig.esnext.json && tsc -p tsconfig.node.json && tsc -p tsconfig.noNullChecks.json",
  "test:functions": "jest"
  },
  "devDependencies": {

diff --git a/packages/artifact-testing/tsconfig.esnext.json b/packages/artifact-testing/tsconfig.esnext.json
@@ -5,8 +5,8 @@
  "moduleResolution": "bundler",
  "allowSyntheticDefaultImports": true,
  "noEmit": false,
- "outDir": "built_esnext"
+ "outDir": "built/esnext"
  },
  "include": ["**/__generated__/**/*"],
- "exclude": ["built", "built_node", "built_esnext"]
+ "exclude": ["built"]
 }
diff --git a/packages/artifact-testing/tsconfig.json b/packages/artifact-testing/tsconfig.json
@@ -3,7 +3,7 @@
  "compilerOptions": {
  "module": "commonjs",
  "noEmit": false,
- "outDir": "built"
+ "outDir": "built/commonjs"
  },
- "exclude": ["built", "built_node", "built_esnext"]
+ "exclude": ["built"]
 }
diff --git a/packages/artifact-testing/tsconfig.noNullChecks.json b/packages/artifact-testing/tsconfig.noNullChecks.json
@@ -0,0 +1,10 @@
+{
+ "extends": "../../tsconfig.json",
+ "compilerOptions": {
+ "module": "commonjs",
+ "noEmit": false,
+ "outDir": "built/noNullChecks",
+ "strictNullChecks": false
+ },
+ "exclude": ["built"]
+}
diff --git a/packages/artifact-testing/tsconfig.node.json b/packages/artifact-testing/tsconfig.node.json
@@ -3,8 +3,8 @@
  "compilerOptions": {
  "module": "nodenext",
  "noEmit": false,
- "outDir": "built_node"
+ "outDir": "built/nodenext"
  },
  "include": ["**/__generated__/**/*"],
- "exclude": ["built", "built_node", "built_esnext"]
+ "exclude": ["built"]
 }
diff --git a/packages/prisma-fabbrica/src/templates/index.ts b/packages/prisma-fabbrica/src/templates/index.ts
@@ -370,7 +370,7 @@ export const defineModelFactoryInternal = (model: DMMF.Model, inputType: DMMF.In
  ) => {
  const seq = getSeq();
  const requiredScalarData = AUTO_GENERATE_MODEL_SCALARS_OR_ENUMS({ seq });
- const resolveValue = normalizeResolver<MODEL_FACTORY_DEFINE_INPUT, BuildDataOptions>(defaultDataResolver ?? {});
+ const resolveValue = normalizeResolver<MODEL_FACTORY_DEFINE_INPUT, BuildDataOptions>(DEFALUT_DATA_RESOLVER);
  const defaultData = await traitKeys.reduce(async (queue, traitKey) => {
  const acc = await queue;
  const resolveTraitValue = normalizeResolver<Partial<MODEL_FACTORY_DEFINE_INPUT>, BuildDataOptions>(traitsDefs[traitKey]?.data ?? {});
@@ -457,6 +457,9 @@ export const defineModelFactoryInternal = (model: DMMF.Model, inputType: DMMF.In
  MODEL_FACTORY_DEFINE_OPTIONS: ast.identifier(`${model.name}FactoryDefineOptions`),
  MODEL_CREATE_INPUT: ast.identifier(`${model.name}CreateInput`),
  AUTO_GENERATE_MODEL_SCALARS_OR_ENUMS: ast.identifier(`autoGenerate${model.name}ScalarsOrEnums`),
+ DEFALUT_DATA_RESOLVER: filterRequiredInputObjectTypeField(inputType).length
+ ? template.expression(`defaultDataResolver`)({})
+ : template.expression(`defaultDataResolver ?? {}`)({}),
  });
 
 export const defineModelFactory = (model: DMMF.Model, inputType: DMMF.InputType) => {