prisma-nestjs-graphql 22.0.1 → 23.0.1

package/README.md

@@ -86,13 +86,13 @@ Default: `''` (empty string)
 
 Combine nested/nullable scalar filters to single  
 Type: `boolean`  
-Default: `false`
+Default: `true`
 
 #### `noAtomicOperations`
 
 Remove input types for atomic operations  
 Type: `boolean`  
-Default: `false`
+Default: `true`
 
 #### `reExport`
 
@@ -152,6 +152,13 @@ Disable usage of graphql `ID` type and use `Int/Float` for fields marked as `@id
 Type: `boolean`  
 Default: `false`
 
+#### `typeListNullable`
+
+Adds `nullable: true` for relation list properties out output models,
+it makes graphql field looks like `[Type!]`, default `[Type!]!`
+Type: `boolean`  
+Default: `false`
+
 #### `requireSingleFieldsInWhereUniqueInput`
 
 When a model `*WhereUniqueInput` class has only a single field, mark that field as **required** (TypeScript) and **not nullable** (GraphQL).  
@@ -788,12 +795,11 @@ import { generate } from 'prisma-nestjs-graphql';
 
 ## TODO
 
-- fin Use relation type here and fix
-- run example, get rid of node-dev
-- keyof typeof SortOrder -> `SortOrder`
+- noAtomicOperations = 1, IntFieldUpdateOperationsInput exists
+- CommentUncheckedUpdateManyWithoutAuthorNestedInput and CommentUpdateManyWithoutAuthorNestedInput are same
+- Add logic to detect view models and skip generation of mutation inputs/args for them https://github.com/unlight/prisma-nestjs-graphql/issues/248
 - dummy-createfriends.input.ts -> `create-friends`
 - check 'TODO FIXME'
-- 22.12 node require esm (update all deps to latest)
 
 ## License
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "prisma-nestjs-graphql",
   "type": "module",
-  "version": "22.0.1",
+  "version": "23.0.1",
   "license": "MIT",
   "description": "Generate object types, inputs, args, etc. from prisma schema file for usage with @nestjs/graphql module",
   "bin": "bin.mjs",

package/prisma-nestjs-graphql.d.ts

@@ -47,6 +47,7 @@ declare function createConfig(data: Record<string, unknown>): {
 	reExport: ReExportType;
 	requireSingleFieldsInWhereUniqueInput: boolean;
 	tsConfigFilePath: string | undefined;
+	typeListNullable: boolean;
 	unsafeCompatibleWhereUniqueInput: boolean;
 	useInputType: ConfigInputItem[];
 };

package/prisma-nestjs-graphql.mjs

@@ -138,7 +138,7 @@ function beforeInputType$2(args) {
     inputType.name = replaceBogus(inputType.name);
   }
 }
-function beforeGenerateField(field) {
+function beforeGenerateField(field, args) {
   for (const fieldInput of field.inputTypes) {
     if (fieldInput.location !== 'inputObjectTypes') {
       continue;
@@ -175,13 +175,7 @@ function postBegin(args) {
   } = args;
   const inputTypes = schema.inputObjectTypes.prisma ?? [];
   const enumTypes = schema.enumTypes.model || [];
-  const types = ['Bool', 'Int', 'String', 'DateTime', 'Decimal', 'Float', 'Json', 'Bytes', 'BigInt'];
-  for (const enumType of enumTypes) {
-    const {
-      name
-    } = enumType;
-    types.push(`Enum${name}`);
-  }
+  const types = ['Bool', 'Int', 'String', 'DateTime', 'Decimal', 'Float', 'Json', 'Bytes', 'BigInt', ...enumTypes.map(x => `Enum${x.name}`)];
   const inputTypeByName = keyBy(inputTypes, inputType => inputType.name);
   const replaceBogusFilters = (filterName, filterNameCandidates) => {
     for (const filterNameCandidate of filterNameCandidates) {
@@ -199,9 +193,9 @@ function postBegin(args) {
   };
   for (const type of types) {
     // Scalar filters
-    replaceBogusFilters(`${type}Filter`, [`${type}NullableFilter`, `Nested${type}NullableFilter`]);
-    replaceBogusFilters(`${type}WithAggregatesFilter`, [`${type}NullableWithAggregatesFilter`, `Nested${type}NullableWithAggregatesFilter`]);
-    replaceBogusFilters(`${type}ListFilter`, [`${type}NullableListFilter`, `Nested${type}NullableListFilter`]);
+    replaceBogusFilters(`${type}Filter`, [`${type}NullableFilter`, `Nested${type}NullableFilter`, `Nested${type}Filter`]);
+    replaceBogusFilters(`${type}WithAggregatesFilter`, [`${type}NullableWithAggregatesFilter`, `Nested${type}NullableWithAggregatesFilter`, `Nested${type}WithAggregatesFilter`]);
+    replaceBogusFilters(`${type}ListFilter`, [`${type}NullableListFilter`, `Nested${type}NullableListFilter`, `Nested${type}ListFilter`]);
   }
   for (const modelName of modelNames) {
     replaceBogusFilters(`${modelName}RelationFilter`, [`${modelName}NullableRelationFilter`]);
@@ -471,7 +465,7 @@ function combineToSingle(args) {
   });
 }
 
-const extensions = new Set(['.js', '.mjs', '.ts', '.mts']);
+const extensions = new Set(['.js', '.mjs', '.ts', '.mts', '.cts', '.cjs']);
 function adjustModuleSpecifier(moduleSpecifier, importExtension) {
   if (moduleSpecifier.startsWith('.')) {
     let specifierWithoutExtension = moduleSpecifier;
@@ -840,11 +834,6 @@ function inputType(args) {
   });
   const useInputType = config.useInputType.find(x => inputType.name.includes(x.typeName));
   const isWhereUnique = isWhereUniqueInputType(inputType.name);
-
-  // if (inputType.name.includes('DecimalNullableFilter')) {
-  //   console.log({ importDeclarations, location, property, propertyType });
-  // }
-
   for (const field of inputType.fields) {
     field.inputTypes = field.inputTypes.filter(t => !removeTypes.has(String(t.type)));
     eventEmitter.emitSync(BeforeGenerateField, field, args);
@@ -1467,16 +1456,13 @@ function modelOutputType(outputType, args) {
         name: 'HideField'
       });
     } else {
-      // Generate `@Field()` decorator
-      property.decorators.push({
-        arguments: [isList ? `() => [${graphqlType}]` : `() => ${graphqlType}`, JSON5.stringify({
-          ...settings?.fieldArguments(),
-          defaultValue: ['number', 'string', 'boolean'].includes(typeof modelField?.default) ? modelField?.default : undefined,
-          description: modelField?.documentation,
-          nullable: Boolean(field.isNullable)
-        })],
-        name: 'Field'
-      });
+      property.decorators.push(generateFieldDecorator({
+        config,
+        field,
+        graphqlType,
+        modelField,
+        settings
+      }));
       for (const setting of settings || []) {
         if (shouldBeDecorated(setting) && (setting.match?.(field.name) ?? true)) {
           property.decorators.push({
@@ -1487,15 +1473,15 @@ function modelOutputType(outputType, args) {
           importDeclarations.createFrom(setting);
         }
       }
-      for (const decorate of config.decorate) {
-        if (decorate.isMatchField(field.name) && decorate.isMatchType(outputTypeName)) {
+      for (const d of config.decorate) {
+        if (d.isMatchField(field.name) && d.isMatchType(outputTypeName)) {
           property.decorators.push({
-            arguments: decorate.arguments?.map(x => pupa(x, {
+            arguments: d.arguments?.map(x => pupa(x, {
               propertyType
             })),
-            name: decorate.name
+            name: d.name
           });
-          importDeclarations.createFrom(decorate);
+          importDeclarations.createFrom(d);
         }
       }
     }
@@ -1530,6 +1516,47 @@ function modelOutputType(outputType, args) {
     });
   }
 }
+
+/**
+ * Get structure for `@Field()` decorator
+ */
+function generateFieldDecorator(args) {
+  const {
+    config,
+    field,
+    graphqlType,
+    modelField,
+    settings
+  } = args;
+  const {
+    isList,
+    namespace
+  } = field.outputType;
+  const {
+    typeListNullable
+  } = config;
+  const {
+    isNullable
+  } = field;
+  const firstArgumentType = isList ? `() => [${graphqlType}]` : `() => ${graphqlType}`;
+  const getNullable = () => {
+    if (!typeListNullable && namespace === 'model' && isList && isNullable) {
+      return false;
+    }
+    return Boolean(isNullable);
+  };
+  const defaultValue = ['number', 'string', 'boolean'].includes(typeof modelField?.default) ? modelField?.default : undefined;
+  const secondArgumentOptions = JSON5.stringify({
+    ...settings?.fieldArguments(),
+    defaultValue,
+    description: modelField?.documentation,
+    nullable: getNullable()
+  });
+  return {
+    arguments: [firstArgumentType, secondArgumentOptions],
+    name: 'Field'
+  };
+}
 function shouldBeDecorated(setting) {
   return setting.kind === 'Decorator' && (setting.output || setting.model) && !(setting.output && setting.model);
 }
@@ -1969,7 +1996,7 @@ function createConfig(data) {
     delimiter: '_'
   }));
   const $warnings = [];
-  const configOutputFilePattern = String(config.outputFilePattern || `{model}/{name}.{type}.ts`);
+  const configOutputFilePattern = typeof config.outputFilePattern === 'string' && config.outputFilePattern || `{model}/{name}.{type}.ts`;
   const outputFilePattern = configOutputFilePattern.replaceAll('\\', '/').split('/').map(path => filenamify(path, {
     replacement: ''
   })).filter(Boolean).join('/');
@@ -2025,7 +2052,7 @@ function createConfig(data) {
   }
   return {
     $warnings,
-    combineScalarFilters: toBoolean(config.combineScalarFilters),
+    combineScalarFilters: toBoolean(config.combineScalarFilters ?? 'true'),
     customImport,
     decorate,
     emitBlocks: createEmitBlocks(config.emitBlocks),
@@ -2033,8 +2060,8 @@ function createConfig(data) {
     emitSingle: toBoolean(config.emitSingle),
     fields,
     graphqlScalars: config.graphqlScalars || {},
-    importExtension: String(config.importExtension ?? ''),
-    noAtomicOperations: toBoolean(config.noAtomicOperations),
+    importExtension: typeof config.importExtension === 'string' && config.importExtension || '',
+    noAtomicOperations: toBoolean(config.noAtomicOperations ?? 'true'),
     noTypeId: toBoolean(config.noTypeId),
     omitModelsCount: toBoolean(config.omitModelsCount),
     outputFilePattern,
@@ -2043,6 +2070,7 @@ function createConfig(data) {
     reExport: ReExport[String(config.reExport)] || ReExport.None,
     requireSingleFieldsInWhereUniqueInput: toBoolean(config.requireSingleFieldsInWhereUniqueInput),
     tsConfigFilePath: createTsConfigFilePathValue(config.tsConfigFilePath),
+    typeListNullable: toBoolean(config.typeListNullable ?? 'false'),
     unsafeCompatibleWhereUniqueInput: toBoolean(config.unsafeCompatibleWhereUniqueInput),
     useInputType: createUseInputType(config.useInputType)
   };