Merge pull request #316 from igoforth/handle-exact-optional-property-types

Handle exact optional property types

Author: chrishoermann

packages/generator/src/functions/contentWriters/index.ts

@@ -14,5 +14,6 @@ export * from './writeModelFields';
 export * from './writeNullableJsonValue';
 export * from './writeOutputObjectType';
 export * from './writePrismaEnum';
+export * from './writeRemoveUndefined';
 export * from './writeSelect';
 export * from './writeTransformJsonNull';

packages/generator/src/functions/contentWriters/writeArgs.ts

@@ -12,8 +12,13 @@ export const writeArgs = (
   }: ContentWriterOptions,
   model: ExtendedDMMFOutputType,
 ) => {
-  const { useMultipleFiles, prismaClientPath, inputTypePath, prismaVersion } =
-    dmmf.generatorConfig;
+  const {
+    useMultipleFiles,
+    useExactOptionalPropertyTypes,
+    prismaClientPath,
+    inputTypePath,
+    prismaVersion,
+  } = dmmf.generatorConfig;
 
   if (useMultipleFiles && !getSingleFileContent) {
     writeImport('{ z }', 'zod');
@@ -22,6 +27,9 @@ export const writeArgs = (
       `{ ${model.name}SelectSchema }`,
       `../${inputTypePath}/${model.name}SelectSchema`,
     );
+    if (useExactOptionalPropertyTypes) {
+      writeImport('ru', `../${inputTypePath}/RemoveUndefined`);
+    }
     if (model.hasRelationField()) {
       writeImport(
         `{ ${model.name}IncludeSchema }`,
@@ -55,7 +63,9 @@ export const writeArgs = (
           `include: z.lazy(() => ${model.name}IncludeSchema).optional(),`,
         );
     })
-    .write(`).strict();`);
+    .write(`).strict()`)
+    .conditionalWrite(useExactOptionalPropertyTypes, '.transform(ru)')
+    .write(`;`);
 
   if (useMultipleFiles && !getSingleFileContent) {
     writer.blankLine().writeLine(`export default ${model.name}ArgsSchema;`);

packages/generator/src/functions/contentWriters/writeCountArgs.ts

@@ -9,12 +9,20 @@ export const writeCountArgs = (
   }: ContentWriterOptions,
   model: ExtendedDMMFOutputType,
 ) => {
-  const { useMultipleFiles, prismaClientPath, prismaVersion } =
-    dmmf.generatorConfig;
+  const {
+    useMultipleFiles,
+    useExactOptionalPropertyTypes,
+    prismaClientPath,
+    inputTypePath,
+    prismaVersion,
+  } = dmmf.generatorConfig;
 
   if (useMultipleFiles && !getSingleFileContent) {
     writeImport('{ z }', 'zod');
     writeImport('type { Prisma }', prismaClientPath);
+    if (useExactOptionalPropertyTypes) {
+      writeImport('ru', `../${inputTypePath}/RemoveUndefined`);
+    }
     writeImport(
       `{ ${model.name}CountOutputTypeSelectSchema }`,
       `./${model.name}CountOutputTypeSelectSchema`,
@@ -42,7 +50,9 @@ export const writeCountArgs = (
         `select: z.lazy(() => ${model.name}CountOutputTypeSelectSchema).nullish(),`,
       );
     })
-    .write(`).strict();`);
+    .write(`).strict()`)
+    .conditionalWrite(useExactOptionalPropertyTypes, '.transform(ru)')
+    .write(`;`);
 
   if (useMultipleFiles && !getSingleFileContent) {
     writer

packages/generator/src/functions/contentWriters/writeCountSelect.ts

@@ -13,11 +13,19 @@ export const writeCountSelect = (
   }: ContentWriterOptions,
   model: ExtendedDMMFOutputType,
 ) => {
-  const { useMultipleFiles, prismaClientPath } = dmmf.generatorConfig;
+  const {
+    useMultipleFiles,
+    useExactOptionalPropertyTypes,
+    prismaClientPath,
+    inputTypePath,
+  } = dmmf.generatorConfig;
 
   if (useMultipleFiles && !getSingleFileContent) {
     writeImport('{ z }', 'zod');
     writeImport('type { Prisma }', prismaClientPath);
+    if (useExactOptionalPropertyTypes) {
+      writeImport('ru', `../${inputTypePath}/RemoveUndefined`);
+    }
   }
 
   writer
@@ -32,7 +40,9 @@ export const writeCountSelect = (
         }
       });
     })
-    .write(`).strict();`);
+    .write(`).strict()`)
+    .conditionalWrite(useExactOptionalPropertyTypes, '.transform(ru)')
+    .write(`;`);
 
   if (useMultipleFiles && !getSingleFileContent) {
     writer

packages/generator/src/functions/contentWriters/writeInclude.ts

@@ -9,11 +9,19 @@ export const writeInclude = (
   model: ExtendedDMMFOutputType,
   getSingleFileContent = false,
 ) => {
-  const { useMultipleFiles, prismaClientPath } = dmmf.generatorConfig;
+  const {
+    useMultipleFiles,
+    useExactOptionalPropertyTypes,
+    prismaClientPath,
+    inputTypePath,
+  } = dmmf.generatorConfig;
 
   if (useMultipleFiles && !getSingleFileContent) {
     writeImport('{ z }', 'zod');
     writeImport('type { Prisma }', prismaClientPath);
+    if (useExactOptionalPropertyTypes) {
+      writeImport('ru', `../${inputTypePath}/RemoveUndefined`);
+    }
     writeImportSet(model.includeImports);
   }
 
@@ -45,7 +53,9 @@ export const writeInclude = (
         }
       });
     })
-    .write(`).strict()`);
+    .write(`).strict()`)
+    .conditionalWrite(useExactOptionalPropertyTypes, '.transform(ru)')
+    .write(`;`);
 
   if (useMultipleFiles && !getSingleFileContent) {
     writer.blankLine().writeLine(`export default ${model.name}IncludeSchema;`);

packages/generator/src/functions/contentWriters/writeInputObjectType.ts

@@ -108,17 +108,24 @@ const writeInputTypeField = ({
 
 export const writeInputObjectType = (
   {
-    fileWriter: { writer, writeImportSet },
+    fileWriter: { writer, writeImportSet, writeImport },
     dmmf,
     getSingleFileContent = false,
   }: ContentWriterOptions,
   inputType: ExtendedDMMFInputType,
 ) => {
-  const { useMultipleFiles, addInputTypeValidation, useTypeAssertions } =
-    dmmf.generatorConfig;
+  const {
+    useMultipleFiles,
+    useExactOptionalPropertyTypes,
+    addInputTypeValidation,
+    useTypeAssertions,
+  } = dmmf.generatorConfig;
 
   if (useMultipleFiles && !getSingleFileContent) {
     writeImportSet(inputType.imports);
+    if (useExactOptionalPropertyTypes) {
+      writeImport('ru', `./RemoveUndefined`);
+    }
   }
 
   // when an omit field is present, the type is not a native prism type
@@ -196,8 +203,11 @@ export const writeInputObjectType = (
         });
       });
     })
-    .conditionalWrite(!writeExtendedWhereUniqueInput, `).strict()`)
-    .conditionalWrite(writeExtendedWhereUniqueInput, `).strict())`)
+    .write(`)`)
+    .conditionalWrite(!writeExtendedWhereUniqueInput, `.strict()`)
+    .conditionalWrite(writeExtendedWhereUniqueInput, `.strict()`)
+    .conditionalWrite(useExactOptionalPropertyTypes, '.transform(ru)')
+    .conditionalWrite(writeExtendedWhereUniqueInput, `)`)
     .conditionalWrite(useTypeAssertions, ` as ${type};`)
     .conditionalWrite(!useTypeAssertions, `;`);
 

packages/generator/src/functions/contentWriters/writeOutputObjectType.ts

@@ -7,13 +7,22 @@ export const writeOutputObjectType = (
   { fileWriter, dmmf, getSingleFileContent = false }: ContentWriterOptions,
   field: ExtendedDMMFSchemaField,
 ) => {
-  const { writer, writeImportSet, writeHeading } = fileWriter;
+  const { writer, writeImportSet, writeImport, writeHeading } = fileWriter;
 
-  const { useMultipleFiles, useTypeAssertions } = dmmf.generatorConfig;
+  const {
+    useMultipleFiles,
+    useExactOptionalPropertyTypes,
+    useTypeAssertions,
+    inputTypePath,
+  } = dmmf.generatorConfig;
 
   if (useMultipleFiles && !getSingleFileContent) {
     writeImportSet(field.argTypeImports);
 
+    if (useExactOptionalPropertyTypes) {
+      writeImport('ru', `../${inputTypePath}/RemoveUndefined`);
+    }
+
     // determine if the outputType should include the "select" or "include" field
     const modelWithSelect = dmmf.schema.getModelWithIncludeAndSelect(field);
 
@@ -135,7 +144,9 @@ export const writeOutputObjectType = (
         writer.newLine();
       });
     })
-    .write(`).strict() `)
+    .write(`)`)
+    .write(`.strict()`)
+    .conditionalWrite(useExactOptionalPropertyTypes, '.transform(ru)')
     .conditionalWrite(useTypeAssertions, `as ${field.customArgType};`)
     .conditionalWrite(!useTypeAssertions, `;`);