prisma-nestjs-graphql 20.1.0 → 21.0.1

package/README.md

@@ -389,7 +389,7 @@ export class Product {
   @Field(() => String, {
     description: 'Old description',
     deprecationReason: 'Use new name instead',
-    complexity: 1
+    complexity: 1,
   })
   oldName: string;
 }
@@ -757,3 +757,9 @@ import { generate } from 'prisma-nestjs-graphql/generate';
 - JSON type for the code first approach - https://github.com/nestjs/graphql/issues/111#issuecomment-631452899
 - https://github.com/paljs/prisma-tools/tree/master/packages/plugins
 - https://github.com/wasp-lang/wasp
+
+## TODO
+
+- keyof typeof SortOrder -> `SortOrder`
+- dummy-createfriends.input.ts -> `create-friends`
+- check 'TODO FIXME'

package/generate.cjs

@@ -20,9 +20,9 @@ var require$1 = (
 				: require
 		);
 
-function isCreateManyReturn(name) {
+function isManyAndReturnOutputType(name) {
   const lowerName = name.toLowerCase();
-  if (lowerName.startsWith("createmany") && (lowerName.endsWith("andreturnoutputtype") || lowerName.endsWith("andreturn"))) {
+  if ((lowerName.startsWith("createmany") || lowerName.startsWith("updatemany")) && (lowerName.endsWith("andreturnoutputtype") || lowerName.endsWith("andreturn"))) {
     return true;
   }
   return false;
@@ -36,7 +36,7 @@ function argsType(field, args) {
   if (["queryRaw", "executeRaw"].includes(field.name)) {
     return;
   }
-  if (isCreateManyReturn(field.name)) return;
+  if (isManyAndReturnOutputType(field.name)) return;
   const { eventEmitter, typeNames, getModelName } = args;
   let className = pascalCase(`${field.name}Args`);
   const modelName = getModelName(className) || "";
@@ -60,7 +60,7 @@ function argsType(field, args) {
     const names = ["Count", "Avg", "Sum", "Min", "Max"];
     if (`${modelName}GroupByArgs` === inputType.name) {
       const byField = inputType.fields.find((f) => f.name === "by");
-      if (byField == null ? undefined : byField.inputTypes) {
+      if (byField?.inputTypes) {
         byField.inputTypes = byField.inputTypes.filter((inputType2) => inputType2.isList);
       }
     }
@@ -135,7 +135,7 @@ function isScalarFilter(inputType) {
   return result;
 }
 function postBegin(args) {
-  const { schema, modelNames } = args;
+  const { modelNames, schema } = args;
   const inputTypes = schema.inputObjectTypes.prisma;
   const enumTypes = schema.enumTypes.model || [];
   const types = [
@@ -184,7 +184,14 @@ function postBegin(args) {
       `${modelName}NullableRelationFilter`
     ]);
   }
-  lodash.remove(inputTypes, (inputType) => isContainBogus(inputType.name));
+  for (const modelName of modelNames) {
+    replaceBogusFilters(`${modelName}ScalarRelationFilter`, [
+      `${modelName}NullableScalarRelationFilter`
+    ]);
+  }
+  lodash.remove(inputTypes, (inputType) => {
+    return isContainBogus(inputType.name);
+  });
 }
 
 function createAggregateInput(args) {
@@ -194,21 +201,18 @@ function createAggregateInput(args) {
     // eslint-disable-next-line unicorn/no-null
     constraints: { maxNumFields: null, minNumFields: null },
     name: className,
-    fields: outputType.fields.map((x) => {
-      var _a;
-      return {
-        name: x.name,
-        isNullable: (_a = x.isNullable) != null ? _a : true,
-        isRequired: false,
-        inputTypes: [
-          {
-            isList: false,
-            type: "true",
-            location: "scalar"
-          }
-        ]
-      };
-    })
+    fields: outputType.fields.map((x) => ({
+      name: x.name,
+      isNullable: x.isNullable ?? true,
+      isRequired: false,
+      inputTypes: [
+        {
+          isList: false,
+          type: "true",
+          location: "scalar"
+        }
+      ]
+    }))
   };
   eventEmitter.emitSync("InputType", {
     ...args,
@@ -282,7 +286,6 @@ async function generateFiles(args) {
     const rootDirectory = project.getDirectory(output) || project.createDirectory(output);
     const sourceFile = rootDirectory.getSourceFile("index.ts") || rootDirectory.createSourceFile("index.ts", undefined, { overwrite: true });
     const statements = project.getSourceFiles().flatMap((s) => {
-      var _a, _b;
       if (s === sourceFile) {
         return [];
       }
@@ -295,7 +298,7 @@ async function generateFiles(args) {
           }
           for (const property of statement.properties || []) {
             for (const decorator of property.decorators || []) {
-              const fullName = (_b = (_a = classDeclaration == null ? undefined : classDeclaration.getProperty(property.name)) == null ? undefined : _a.getDecorator(decorator.name)) == null ? undefined : _b.getFullName();
+              const fullName = classDeclaration?.getProperty(property.name)?.getDecorator(decorator.name)?.getFullName();
               assert.ok(
                 fullName,
                 `Cannot get full name of decorator of class ${statement.name}`
@@ -526,7 +529,7 @@ function getGraphqlInputType(inputTypes, pattern) {
 }
 
 function getPropertyType(args) {
-  const { type, location } = args;
+  const { location, type } = args;
   switch (type) {
     case "Float":
     case "Int": {
@@ -551,7 +554,7 @@ function getPropertyType(args) {
       return ["null"];
     }
     case "Bytes": {
-      return ["Buffer"];
+      return ["Uint8Array"];
     }
     case "BigInt": {
       return ["bigint", "number"];
@@ -602,15 +605,14 @@ function propertyStructure(args) {
     kind: tsMorph.StructureKind.Property,
     name,
     type,
-    hasQuestionToken: hasQuestionToken != null ? hasQuestionToken : isNullable,
-    hasExclamationToken: hasExclamationToken != null ? hasExclamationToken : !isNullable,
+    hasQuestionToken: hasQuestionToken ?? isNullable,
+    hasExclamationToken: hasExclamationToken ?? !isNullable,
     decorators: [],
     leadingTrivia: "\n"
   };
 }
 
 function inputType(args) {
-  var _a, _b, _c, _d;
   const {
     classDecoratorName,
     classTransformerTypeModels,
@@ -665,27 +667,27 @@ function inputType(args) {
     if (inputTypes.length === 0) {
       continue;
     }
-    const usePattern = (useInputType == null ? undefined : useInputType.ALL) || (useInputType == null ? undefined : useInputType[name]);
+    const usePattern = useInputType?.ALL || useInputType?.[name];
     const graphqlInputType = getGraphqlInputType(inputTypes, usePattern);
     const { isList, location, type } = graphqlInputType;
     const typeName = String(type);
-    const settings = modelFieldSettings == null ? undefined : modelFieldSettings.get(name);
-    const propertySettings = settings == null ? undefined : settings.getPropertyType({
+    const settings = modelFieldSettings?.get(name);
+    const propertySettings = settings?.getPropertyType({
       name: inputType2.name,
       input: true
     });
-    const modelField = model == null ? undefined : model.fields.find((f) => f.name === name);
-    const isCustomsApplicable = typeName === (modelField == null ? undefined : modelField.type);
+    const modelField = model?.fields.find((f) => f.name === name);
+    const isCustomsApplicable = typeName === modelField?.type;
     const atLeastKeys = model && getWhereUniqueAtLeastKeys(model);
     const whereUniqueInputType = isWhereUniqueInputType(typeName) && atLeastKeys && `Prisma.AtLeast<${typeName}, ${atLeastKeys.map((name2) => `'${name2}'`).join(" | ")}>`;
     const propertyType = lodash.castArray(
-      (propertySettings == null ? undefined : propertySettings.name) || whereUniqueInputType || getPropertyType({
+      propertySettings?.name || whereUniqueInputType || getPropertyType({
         location,
         type: typeName
       })
     );
     const hasExclamationToken = Boolean(
-      isWhereUnique && config.unsafeCompatibleWhereUniqueInput && (atLeastKeys == null ? undefined : atLeastKeys.includes(name))
+      isWhereUnique && config.unsafeCompatibleWhereUniqueInput && atLeastKeys?.includes(name)
     );
     const property = propertyStructure({
       name,
@@ -704,13 +706,13 @@ function inputType(args) {
       importDeclarations.add("Prisma", config.prismaClientImport);
     }
     let graphqlType;
-    const shouldHideField = (settings == null ? undefined : settings.shouldHideField({
+    const shouldHideField = settings?.shouldHideField({
       name: inputType2.name,
       input: true
-    })) || config.decorate.some(
+    }) || config.decorate.some(
       (d) => d.name === "HideField" && d.from === moduleSpecifier && d.isMatchField(name) && d.isMatchType(inputType2.name)
     );
-    const fieldType = settings == null ? undefined : settings.getFieldType({
+    const fieldType = settings?.getFieldType({
       name: inputType2.name,
       input: true
     });
@@ -747,7 +749,7 @@ function inputType(args) {
         arguments: [
           isList ? `() => [${graphqlType}]` : `() => ${graphqlType}`,
           JSON5.stringify({
-            ...settings == null ? undefined : settings.fieldArguments(),
+            ...settings?.fieldArguments(),
             nullable: !isRequired
           })
         ]
@@ -766,7 +768,7 @@ function inputType(args) {
             arguments: ["transformToDecimal"]
           }
         );
-      } else if (location === "inputObjectTypes" && ((modelField == null ? undefined : modelField.type) === "Decimal" || [
+      } else if (location === "inputObjectTypes" && (modelField?.type === "Decimal" || [
         "connect",
         "connectOrCreate",
         "create",
@@ -780,15 +782,15 @@ function inputType(args) {
         "updateMany",
         "upsert",
         "where"
-      ].includes(name) || classTransformerTypeModels.has(getModelName(graphqlType) || "") || (modelField == null ? undefined : modelField.kind) === "object" && models.get(modelField.type) && ((_a = models.get(modelField.type)) == null ? undefined : _a.fields.some(
+      ].includes(name) || classTransformerTypeModels.has(getModelName(graphqlType) || "") || modelField?.kind === "object" && models.get(modelField.type) && models.get(modelField.type)?.fields.some(
         (field2) => field2.kind === "object" && classTransformerTypeModels.has(field2.type)
-      )))) {
+      ))) {
         importDeclarations.add("Type", "class-transformer");
         property.decorators.push({ name: "Type", arguments: [`() => ${graphqlType}`] });
       }
       if (isCustomsApplicable) {
         for (const options of settings || []) {
-          if ((_c = options.kind === "Decorator" && options.input && ((_b = options.match) == null ? undefined : _b.call(options, name))) != null ? _c : true) {
+          if ((options.kind === "Decorator" && options.input && options.match?.(name)) ?? true) {
             property.decorators.push({
               name: options.name,
               arguments: options.arguments
@@ -802,7 +804,7 @@ function inputType(args) {
         if (decorate.isMatchField(name) && decorate.isMatchType(inputType2.name)) {
           property.decorators.push({
             name: decorate.name,
-            arguments: (_d = decorate.arguments) == null ? undefined : _d.map((x) => pupa(x, { propertyType }))
+            arguments: decorate.arguments?.map((x) => pupa(x, { propertyType }))
           });
           importDeclarations.create(decorate);
         }
@@ -825,10 +827,9 @@ class ObjectSettings extends Array {
     input = false,
     output = false
   }) {
-    var _a;
     const hideField = this.find((s) => s.name === "HideField");
     return Boolean(
-      (hideField == null ? undefined : hideField.input) && input || (hideField == null ? undefined : hideField.output) && output || ((_a = hideField == null ? undefined : hideField.match) == null ? undefined : _a.call(hideField, name))
+      hideField?.input && input || hideField?.output && output || hideField?.match?.(name)
     );
   }
   getFieldType({
@@ -930,7 +931,6 @@ function createSettingElement({
   fieldElement,
   match
 }) {
-  var _a, _b, _c, _d, _e;
   const result = {
     documentLine: "",
     element: undefined
@@ -947,7 +947,7 @@ function createSettingElement({
     result.element = fieldElement;
     return result;
   }
-  const name = (_a = match == null ? undefined : match.groups) == null ? undefined : _a.name;
+  const name = match?.groups?.name;
   if (!(match && name)) {
     result.documentLine = line;
     return result;
@@ -966,14 +966,14 @@ function createSettingElement({
     Object.assign(element, hideFieldDecorator(match));
     return result;
   }
-  if (["FieldType", "PropertyType"].includes(name) && ((_b = match.groups) == null ? undefined : _b.args)) {
+  if (["FieldType", "PropertyType"].includes(name) && match.groups?.args) {
     const options2 = customType(match.groups.args);
     lodash.merge(element, options2.namespace && config.fields[options2.namespace], options2, {
       kind: name
     });
     return result;
   }
-  if (name === "ObjectType" && ((_c = match.groups) == null ? undefined : _c.args)) {
+  if (name === "ObjectType" && match.groups?.args) {
     element.kind = "ObjectType";
     const options2 = customType(match.groups.args);
     if (typeof options2[0] === "string" && options2[0]) {
@@ -988,7 +988,7 @@ function createSettingElement({
     };
     return result;
   }
-  if (name === "Directive" && ((_d = match.groups) == null ? undefined : _d.args)) {
+  if (name === "Directive" && match.groups?.args) {
     const options2 = customType(match.groups.args);
     lodash.merge(element, { model: true, from: "@nestjs/graphql" }, options2, {
       name,
@@ -1002,13 +1002,12 @@ function createSettingElement({
   element.namespaceImport = namespace;
   const options = {
     name,
-    arguments: (((_e = match.groups) == null ? undefined : _e.args) || "").split(",").map((s) => lodash.trim(s)).filter(Boolean)
+    arguments: (match.groups?.args || "").split(",").map((s) => lodash.trim(s)).filter(Boolean)
   };
   lodash.merge(element, namespace && config.fields[namespace], options);
   return result;
 }
 function customType(args) {
-  var _a;
   const result = {};
   let options = parseArgs(args);
   if (typeof options === "string") {
@@ -1017,7 +1016,7 @@ function customType(args) {
   Object.assign(result, options);
   const namespace = getNamespace(options.name);
   result.namespace = namespace;
-  if ((_a = options.name) == null ? undefined : _a.includes(".")) {
+  if (options.name?.includes(".")) {
     result.namespaceImport = namespace;
   }
   if (typeof options.match === "string" || Array.isArray(options.match)) {
@@ -1026,7 +1025,6 @@ function customType(args) {
   return result;
 }
 function hideFieldDecorator(match) {
-  var _a;
   const result = {
     name: "HideField",
     arguments: [],
@@ -1035,7 +1033,7 @@ function hideFieldDecorator(match) {
     namespaceImport: undefined,
     match: undefined
   };
-  if (!((_a = match.groups) == null ? undefined : _a.args)) {
+  if (!match.groups?.args) {
     result.output = true;
     return result;
   }
@@ -1110,13 +1108,12 @@ function modelData(model, args) {
 }
 
 function createComment(documentation, settings) {
-  var _a;
   const documentationLines = documentation.split("\n");
   const commentLines = ["/**"];
   for (const line of documentationLines) {
     commentLines.push(` * ${line}`);
   }
-  const deprecationReason = (_a = settings == null ? undefined : settings.fieldArguments()) == null ? undefined : _a.deprecationReason;
+  const deprecationReason = settings?.fieldArguments()?.deprecationReason;
   if (deprecationReason) {
     commentLines.push(` * @deprecated ${deprecationReason}`);
   }
@@ -1130,9 +1127,8 @@ function getOutputTypeName(name) {
 
 const nestjsGraphql$1 = "@nestjs/graphql";
 function modelOutputType(outputType, args) {
-  var _a, _b, _c, _d, _e, _f;
-  const { getSourceFile, models, config, modelFields, fieldSettings, eventEmitter } = args;
-  if (isCreateManyReturn(outputType.name)) return;
+  const { config, eventEmitter, fieldSettings, getSourceFile, modelFields, models } = args;
+  if (isManyAndReturnOutputType(outputType.name)) return;
   const model = models.get(outputType.name);
   assert.ok(model, `Cannot find model by name ${outputType.name}`);
   const sourceFile = getSourceFile({
@@ -1146,15 +1142,15 @@ function modelOutputType(outputType, args) {
   );
   const importDeclarations = new ImportDeclarationMap();
   const classStructure = {
-    kind: tsMorph.StructureKind.Class,
-    isExported: true,
-    name: outputType.name,
     decorators: [
       {
-        name: "ObjectType",
-        arguments: []
+        arguments: [],
+        name: "ObjectType"
       }
     ],
+    isExported: true,
+    kind: tsMorph.StructureKind.Class,
+    name: outputType.name,
     properties: []
   };
   sourceFileStructure.statements.push(classStructure);
@@ -1165,8 +1161,8 @@ function modelOutputType(outputType, args) {
   if (model.documentation) {
     const objectTypeOptions = {};
     const { documentation, settings } = createObjectSettings({
-      text: model.documentation,
-      config
+      config,
+      text: model.documentation
     });
     if (documentation) {
       if (!classStructure.leadingTrivia) {
@@ -1182,24 +1178,24 @@ function modelOutputType(outputType, args) {
   for (const field of outputType.fields) {
     if (config.omitModelsCount && field.name === "_count") continue;
     let fileType = "model";
-    const { location, isList, type, namespace } = field.outputType;
+    const { isList, location, namespace, type } = field.outputType;
     let outputTypeName = String(type);
     if (namespace !== "model") {
       fileType = "output";
       outputTypeName = getOutputTypeName(outputTypeName);
     }
-    const modelField = (_a = modelFields.get(model.name)) == null ? undefined : _a.get(field.name);
-    const settings = (_b = fieldSettings.get(model.name)) == null ? undefined : _b.get(field.name);
-    const fieldType = settings == null ? undefined : settings.getFieldType({
+    const modelField = modelFields.get(model.name)?.get(field.name);
+    const settings = fieldSettings.get(model.name)?.get(field.name);
+    const fieldType = settings?.getFieldType({
       name: outputType.name,
       output: true
     });
-    const propertySettings = settings == null ? undefined : settings.getPropertyType({
+    const propertySettings = settings?.getPropertyType({
       name: outputType.name,
       output: true
     });
     const propertyType = lodash.castArray(
-      (propertySettings == null ? undefined : propertySettings.name) || getPropertyType({
+      propertySettings?.name || getPropertyType({
         location,
         type: outputTypeName
       })
@@ -1215,13 +1211,13 @@ function modelOutputType(outputType, args) {
     } else {
       const graphqlImport = getGraphqlImport({
         config,
-        sourceFile,
         fileType,
+        getSourceFile,
+        isId: modelField?.isId,
         location,
-        isId: modelField == null ? undefined : modelField.isId,
         noTypeId: config.noTypeId,
-        typeName: outputTypeName,
-        getSourceFile
+        sourceFile,
+        typeName: outputTypeName
       });
       graphqlType = graphqlImport.name;
       if (graphqlImport.name !== outputType.name && graphqlImport.specifier) {
@@ -1229,49 +1225,49 @@ function modelOutputType(outputType, args) {
       }
     }
     const property = propertyStructure({
-      name: field.name,
-      isNullable: field.isNullable,
       hasExclamationToken: true,
       hasQuestionToken: location === "outputObjectTypes",
-      propertyType,
-      isList
+      isList,
+      isNullable: field.isNullable,
+      name: field.name,
+      propertyType
     });
-    if (typeof property.leadingTrivia === "string" && (modelField == null ? undefined : modelField.documentation)) {
+    if (typeof property.leadingTrivia === "string" && modelField?.documentation) {
       property.leadingTrivia += createComment(modelField.documentation, settings);
     }
-    (_c = classStructure.properties) == null ? undefined : _c.push(property);
+    classStructure.properties?.push(property);
     if (propertySettings) {
       importDeclarations.create({ ...propertySettings });
     } else if (propertyType.includes("Decimal")) {
       importDeclarations.add("Decimal", `${config.prismaClientImport}/runtime/library`);
     }
     assert.ok(property.decorators, "property.decorators is undefined");
-    const shouldHideField = (settings == null ? undefined : settings.shouldHideField({ name: outputType.name, output: true })) || config.decorate.some(
+    const shouldHideField = settings?.shouldHideField({ name: outputType.name, output: true }) || config.decorate.some(
       (d) => d.name === "HideField" && d.from === "@nestjs/graphql" && d.isMatchField(field.name) && d.isMatchType(outputTypeName)
     );
     if (shouldHideField) {
       importDeclarations.add("HideField", nestjsGraphql$1);
-      property.decorators.push({ name: "HideField", arguments: [] });
+      property.decorators.push({ arguments: [], name: "HideField" });
     } else {
       property.decorators.push({
-        name: "Field",
         arguments: [
           isList ? `() => [${graphqlType}]` : `() => ${graphqlType}`,
           JSON5.stringify({
-            ...settings == null ? undefined : settings.fieldArguments(),
-            nullable: Boolean(field.isNullable),
+            ...settings?.fieldArguments(),
             defaultValue: ["number", "string", "boolean"].includes(
-              typeof (modelField == null ? undefined : modelField.default)
-            ) ? modelField == null ? undefined : modelField.default : undefined,
-            description: modelField == null ? undefined : modelField.documentation
+              typeof modelField?.default
+            ) ? modelField?.default : undefined,
+            description: modelField?.documentation,
+            nullable: Boolean(field.isNullable)
           })
-        ]
+        ],
+        name: "Field"
       });
       for (const setting of settings || []) {
-        if (shouldBeDecorated(setting) && ((_e = (_d = setting.match) == null ? undefined : _d.call(setting, field.name)) != null ? _e : true)) {
+        if (shouldBeDecorated(setting) && (setting.match?.(field.name) ?? true)) {
           property.decorators.push({
-            name: setting.name,
-            arguments: setting.arguments
+            arguments: setting.arguments,
+            name: setting.name
           });
           assert.ok(setting.from, "Missed 'from' part in configuration or field setting");
           importDeclarations.create(setting);
@@ -1280,24 +1276,24 @@ function modelOutputType(outputType, args) {
       for (const decorate of config.decorate) {
         if (decorate.isMatchField(field.name) && decorate.isMatchType(outputTypeName)) {
           property.decorators.push({
-            name: decorate.name,
-            arguments: (_f = decorate.arguments) == null ? undefined : _f.map((x) => pupa(x, { propertyType }))
+            arguments: decorate.arguments?.map((x) => pupa(x, { propertyType })),
+            name: decorate.name
           });
           importDeclarations.create(decorate);
         }
       }
     }
     eventEmitter.emitSync("ClassProperty", property, {
-      location,
       isList,
+      location,
       propertyType
     });
   }
   for (const setting of modelSettings || []) {
     if (shouldBeDecorated(setting)) {
       classStructure.decorators.push({
-        name: setting.name,
-        arguments: setting.arguments
+        arguments: setting.arguments,
+        name: setting.name
       });
       importDeclarations.create(setting);
     }
@@ -1346,10 +1342,9 @@ function beforeInputType$1(args) {
   }
 }
 function beforeGenerateFiles$1(args) {
-  var _a;
   const { project } = args;
   for (const sourceFile of project.getSourceFiles()) {
-    const className = (_a = sourceFile.getClass(() => true)) == null ? undefined : _a.getName();
+    const className = sourceFile.getClass(() => true)?.getName();
     if (className && isAtomicOperation(className)) {
       project.removeSourceFile(sourceFile);
     }
@@ -1367,14 +1362,13 @@ function isListInput(typeName, model, field) {
 
 const nestjsGraphql = "@nestjs/graphql";
 function outputType(outputType2, args) {
-  var _a, _b, _c, _d, _e;
   const { getSourceFile, models, eventEmitter, fieldSettings, getModelName, config } = args;
   const importDeclarations = new ImportDeclarationMap();
   const fileType = "output";
   const modelName = getModelName(outputType2.name) || "";
   const model = models.get(modelName);
   const isAggregateOutput = model && /(?:Count|Avg|Sum|Min|Max)AggregateOutputType$/.test(outputType2.name) && String(outputType2.name).startsWith(model.name);
-  const isCountOutput = (model == null ? undefined : model.name) && outputType2.name === `${model.name}CountOutputType`;
+  const isCountOutput = model?.name && outputType2.name === `${model.name}CountOutputType`;
   if (!config.emitBlocks.outputs && !isCountOutput) return;
   outputType2.name = getOutputTypeName(outputType2.name);
   if (isAggregateOutput) {
@@ -1401,15 +1395,15 @@ function outputType(outputType2, args) {
   for (const field of outputType2.fields) {
     const { location, isList, type } = field.outputType;
     const outputTypeName = getOutputTypeName(String(type));
-    const settings = isCountOutput ? undefined : model && ((_a = fieldSettings.get(model.name)) == null ? undefined : _a.get(field.name));
-    const propertySettings = settings == null ? undefined : settings.getPropertyType({
+    const settings = isCountOutput ? undefined : model && fieldSettings.get(model.name)?.get(field.name);
+    const propertySettings = settings?.getPropertyType({
       name: outputType2.name,
       output: true
     });
-    const isCustomsApplicable = outputTypeName === ((_b = model == null ? undefined : model.fields.find((f) => f.name === field.name)) == null ? undefined : _b.type);
+    const isCustomsApplicable = outputTypeName === model?.fields.find((f) => f.name === field.name)?.type;
     field.outputType.type = outputTypeName;
     const propertyType = lodash.castArray(
-      (propertySettings == null ? undefined : propertySettings.name) || getPropertyType({
+      propertySettings?.name || getPropertyType({
         location,
         type: outputTypeName
       })
@@ -1421,20 +1415,20 @@ function outputType(outputType2, args) {
       propertyType,
       isList
     });
-    (_c = classStructure.properties) == null ? undefined : _c.push(property);
+    classStructure.properties?.push(property);
     if (propertySettings) {
       importDeclarations.create({ ...propertySettings });
     } else if (propertyType.includes("Decimal")) {
       importDeclarations.add("Decimal", `${config.prismaClientImport}/runtime/library`);
     }
     let graphqlType;
-    const shouldHideField = (settings == null ? undefined : settings.shouldHideField({
+    const shouldHideField = settings?.shouldHideField({
       name: outputType2.name,
       output: true
-    })) || config.decorate.some(
+    }) || config.decorate.some(
       (d) => d.name === "HideField" && d.from === "@nestjs/graphql" && d.isMatchField(field.name) && d.isMatchType(outputTypeName)
     );
-    const fieldType = settings == null ? undefined : settings.getFieldType({
+    const fieldType = settings?.getFieldType({
       name: outputType2.name,
       output: true
     });
@@ -1473,14 +1467,14 @@ function outputType(outputType2, args) {
         arguments: [
           isList ? `() => [${graphqlType}]` : `() => ${graphqlType}`,
           JSON5.stringify({
-            ...settings == null ? undefined : settings.fieldArguments(),
+            ...settings?.fieldArguments(),
             nullable: Boolean(field.isNullable)
           })
         ]
       });
       if (isCustomsApplicable) {
         for (const options of settings || []) {
-          if ((_e = options.kind === "Decorator" && options.output && ((_d = options.match) == null ? undefined : _d.call(options, field.name))) != null ? _e : true) {
+          if ((options.kind === "Decorator" && options.output && options.match?.(field.name)) ?? true) {
             property.decorators.push({
               name: options.name,
               arguments: options.arguments
@@ -1507,8 +1501,7 @@ function purgeOutput(emitter) {
   emitter.on("End", end);
 }
 function begin({ project, output }) {
-  var _a;
-  const sourceFiles = (_a = project.getDirectory(output)) == null ? undefined : _a.getDescendantSourceFiles();
+  const sourceFiles = project.getDirectory(output)?.getDescendantSourceFiles();
   if (sourceFiles) {
     for (const sourceFile of sourceFiles) {
       sourceFile.delete();
@@ -1516,8 +1509,7 @@ function begin({ project, output }) {
   }
 }
 function end({ project, output }) {
-  var _a;
-  const directories = (_a = project.getDirectory(output)) == null ? undefined : _a.getDescendantDirectories().filter((directory) => directory.getSourceFiles().length === 0).map((directory) => directory.getPath());
+  const directories = project.getDirectory(output)?.getDescendantDirectories().filter((directory) => directory.getSourceFiles().length === 0).map((directory) => directory.getPath());
   for (const directory of directories || []) {
     try {
       gracefulFs.rmdirSync(directory);
@@ -1646,7 +1638,7 @@ function registerEnum(enumType, args) {
       ...importDeclarations.toStatements(),
       enumStructure,
       "\n",
-      `registerEnumType(${enumType.name}, { name: '${enumType.name}', description: ${JSON.stringify(dataModelEnum == null ? undefined : dataModelEnum.documentation)} })`
+      `registerEnumType(${enumType.name}, { name: '${enumType.name}', description: ${JSON.stringify(dataModelEnum?.documentation)} })`
     ]
   });
 }
@@ -1674,7 +1666,14 @@ function warning(message) {
   }
 }
 
-const allEmmittedBlocks = ["prismaEnums", "schemaEnums", "models", "inputs", "args", "outputs"];
+const allEmmittedBlocks = [
+  "prismaEnums",
+  "schemaEnums",
+  "models",
+  "inputs",
+  "args",
+  "outputs"
+];
 const blocksDependencyMap = {
   enums: ["schemaEnums", "prismaEnums"],
   models: ["models", "schemaEnums"],
@@ -1691,14 +1690,15 @@ function createEmitBlocks(data) {
     if (!Object.keys(blocksDependencyMap).includes(block)) continue;
     blocksToEmit = {
       ...blocksToEmit,
-      ...Object.fromEntries(blocksDependencyMap[block].map((block2) => [block2, true]))
+      ...Object.fromEntries(
+        blocksDependencyMap[block].map((block2) => [block2, true])
+      )
     };
   }
   return blocksToEmit;
 }
 
 function createConfig(data) {
-  var _a;
   const config = lodash.merge({}, flat.unflatten(data, { delimiter: "_" }));
   const $warnings = [];
   const configOutputFilePattern = String(
@@ -1721,7 +1721,7 @@ function createConfig(data) {
   }
   const fields = Object.fromEntries(
     Object.entries(
-      (_a = config.fields) != null ? _a : {}
+      config.fields ?? {}
     ).filter(({ 1: value }) => typeof value === "object").map(([name, value]) => {
       const fieldSetting = {
         arguments: [],
@@ -1866,7 +1866,7 @@ function createGetModelName(modelNames) {
   }
 }
 function getModelName(args) {
-  const { name, modelNames } = args;
+  const { modelNames, name } = args;
   for (const keyword of splitKeywords) {
     const [test] = name.split(keyword, 1);
     if (modelNames.includes(test)) {
@@ -1900,7 +1900,6 @@ function getModelName(args) {
       return test;
     }
   }
-  return undefined;
 }
 const splitKeywords = [
   "CreateInput",
@@ -1944,7 +1943,9 @@ const splitKeywords = [
   "MaxOrderBy",
   "AvgOrderBy",
   "Create",
-  "Update"
+  "Update",
+  "ScalarRelationFilter",
+  "NullableScalarRelationFilter"
 ].sort((a, b) => b.length - a.length);
 const endsWithKeywords = [
   "Aggregate",
@@ -1973,6 +1974,7 @@ const middleKeywords = [
   ["FindOne", "Args"],
   ["FindUnique", "Args"],
   ["UpdateMany", "Args"],
+  ["UpdateMany", "AndReturnOutputType"],
   ["UpdateOne", "Args"],
   ["UpsertOne", "Args"],
   ["GroupBy", "Args"],
@@ -1981,9 +1983,8 @@ const middleKeywords = [
 
 const AwaitEventEmitter = require$1("await-event-emitter").default;
 async function generate(args) {
-  var _a;
   const { connectCallback, generator, skipAddOutputSourceFiles, dmmf } = args;
-  const generatorOutputValue = (_a = generator.output) == null ? undefined : _a.value;
+  const generatorOutputValue = generator.output?.value;
   assert.ok(generatorOutputValue, "Missing generator configuration: output");
   const config = createConfig(generator.config);
   const eventEmitter = new AwaitEventEmitter();

package/generate.d.ts

@@ -50,6 +50,7 @@ declare namespace DMMF {
     export type Model = ReadonlyDeep_2<{
         name: string;
         dbName: string | null;
+        schema: string | null;
         fields: Field[];
         uniqueFields: string[][];
         uniqueIndexes: uniqueIndex[];
@@ -75,6 +76,12 @@ declare namespace DMMF {
          * BigInt, Boolean, Bytes, DateTime, Decimal, Float, Int, JSON, String, $ModelName
          */
         type: string;
+        /**
+         * Native database type, if specified.
+         * For example, `@db.VarChar(191)` is encoded as `['VarChar', ['191']]`,
+         * `@db.Text` is encoded as `['Text', []]`.
+         */
+        nativeType?: [string, string[]] | null;
         dbName?: string | null;
         hasDefaultValue: boolean;
         default?: FieldDefault | FieldDefaultScalar | FieldDefaultScalar[];
@@ -86,7 +93,7 @@ declare namespace DMMF {
     }>;
     export type FieldDefault = ReadonlyDeep_2<{
         name: string;
-        args: any[];
+        args: Array<string | number>;
     }>;
     export type FieldDefaultScalar = string | boolean | number;
     export type Index = ReadonlyDeep_2<{
@@ -200,6 +207,7 @@ declare namespace DMMF {
         createManyAndReturn?: string | null;
         update?: string | null;
         updateMany?: string | null;
+        updateManyAndReturn?: string | null;
         upsert?: string | null;
         delete?: string | null;
         deleteMany?: string | null;
@@ -220,6 +228,7 @@ declare namespace DMMF {
         createManyAndReturn = "createManyAndReturn",
         update = "update",
         updateMany = "updateMany",
+        updateManyAndReturn = "updateManyAndReturn",
         upsert = "upsert",
         delete = "delete",
         deleteMany = "deleteMany",

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "prisma-nestjs-graphql",
-  "version": "20.1.0",
+  "version": "21.0.1",
   "license": "MIT",
   "description": "Generate object types, inputs, args, etc. from prisma schema file for usage with @nestjs/graphql module",
   "bin": "bin.js",
-  "repository": "https://github.com/unlight/nestjs-graphql-prisma.git",
-  "bugs": {
-    "url": "https://github.com/unlight/nestjs-graphql-prisma/issues"
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/unlight/prisma-nestjs-graphql.git"
   },
-  "homepage": "https://github.com/unlight/nestjs-graphql-prisma#readme",
+  "homepage": "https://github.com/unlight/prisma-nestjs-graphql",
   "keywords": [
     "nestjs",
     "graphql",
@@ -62,14 +62,10 @@
   "config": {
     "commitizen": {
       "path": "node_modules/cz-customizable"
-    },
-    "ghooks": {
-      "pre-commit": "precise-commits",
-      "commit-msg": "sh Taskfile commit_lint"
     }
   },
   "dependencies": {
-    "@prisma/generator-helper": "^5.14.0",
+    "@prisma/generator-helper": "5 - 6",
     "await-event-emitter": "^2.0.2",
     "filenamify": "4.X",
     "flat": "5.X",
@@ -77,75 +73,77 @@
     "graceful-fs": "^4.2.11",
     "json5": "^2.2.3",
     "lodash": "^4.17.21",
-    "outmatch": "^0.7.0",
+    "outmatch": "^1.0.0",
     "pluralize": "^8.0.0",
     "pupa": "2.X",
-    "ts-morph": ">=11 <=16"
+    "ts-morph": "11 - 16"
   },
   "devDependencies": {
-    "@commitlint/cli": "^18.4.3",
-    "@commitlint/config-conventional": "^18.4.3",
-    "@nestjs/apollo": "^12.1.0",
-    "@nestjs/common": "^10.3.8",
-    "@nestjs/core": "^10.3.8",
-    "@nestjs/graphql": "^12.1.1",
-    "@nestjs/platform-express": "^10.3.8",
-    "@paljs/plugins": "^6.0.7",
-    "@prisma/client": "^5.14.0",
+    "@eslint/compat": "^1.2.5",
+    "@nestjs/apollo": "^13.0.1",
+    "@nestjs/common": "^11.0.1",
+    "@nestjs/core": "^11.0.1",
+    "@nestjs/graphql": "^13.0.1",
+    "@nestjs/platform-express": "^11.0.1",
+    "@paljs/plugins": "^8.1.0",
+    "@prisma/client": "5 - 6",
     "@semantic-release/changelog": "^6.0.3",
     "@semantic-release/git": "^10.0.1",
-    "@semantic-release/github": "^9.2.5",
-    "@swc/core": "^1.5.7",
-    "@swc/helpers": "^0.5.11",
+    "@semantic-release/github": "^11.0.1",
+    "@swc/core": "^1.10.7",
+    "@swc/helpers": "^0.5.15",
     "@swc/register": "^0.1.10",
     "@types/flat": "^5.0.5",
     "@types/graceful-fs": "^4.1.9",
-    "@types/lodash": "^4.17.4",
-    "@types/mocha": "^10.0.6",
-    "@types/node": "^20.12.12",
+    "@types/lodash": "^4.17.14",
+    "@types/mocha": "^10.0.10",
+    "@types/node": "^22.10.7",
     "@types/pluralize": "^0.0.33",
-    "@typescript-eslint/eslint-plugin": "^6.14.0",
-    "@typescript-eslint/parser": "^6.14.0",
+    "@typescript-eslint/eslint-plugin": "^8.20.0",
+    "@typescript-eslint/parser": "^8.20.0",
     "apollo-server-express": "^3.13.0",
-    "c8": "^9.1.0",
+    "c8": "^10.1.3",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.14.1",
-    "commitizen": "^4.3.0",
-    "cz-customizable": "^7.0.0",
+    "commitizen": "^4.3.1",
+    "conventional-changelog-conventionalcommits": "^8.0.0",
+    "cz-customizable": "^7.4.0",
     "decimal.js": "^10.4.3",
-    "eslint": "^8.55.0",
+    "eslint": "^9.18.0",
+    "eslint-config-prettier": "^10.0.1",
     "eslint-import-resolver-node": "^0.3.9",
     "eslint-plugin-etc": "^2.0.3",
-    "eslint-plugin-import": "^2.29.1",
+    "eslint-plugin-import": "^2.31.0",
     "eslint-plugin-only-warn": "^1.1.0",
-    "eslint-plugin-prettier": "^5.1.3",
-    "eslint-plugin-regexp": "^2.5.0",
-    "eslint-plugin-simple-import-sort": "^10.0.0",
-    "eslint-plugin-sort-class-members": "^1.20.0",
-    "eslint-plugin-unicorn": "^53.0.0",
+    "eslint-plugin-perfectionist": "^4.6.0",
+    "eslint-plugin-prettier": "^5.2.2",
+    "eslint-plugin-regexp": "^2.7.0",
+    "eslint-plugin-simple-import-sort": "^12.1.1",
+    "eslint-plugin-sort-class-members": "^1.21.0",
+    "eslint-plugin-unicorn": "^56.0.1",
     "eslint-plugin-wix-editor": "^3.3.0",
     "expect": "^29.7.0",
-    "git-branch-is": "^4.0.0",
-    "graphql": "^16.8.1",
-    "graphql-scalars": "^1.23.0",
+    "graphql": "^16.10.0",
+    "graphql-scalars": "^1.24.0",
     "graphql-type-json": "^0.3.2",
-    "mocha": "^10.4.0",
+    "mocha": "^11.0.1",
     "ololog": "^1.1.175",
-    "pkgroll": "^2.1.0",
+    "pkgroll": "^2.6.1",
     "precise-commits": "^1.0.2",
-    "prettier": "^3.2.5",
-    "prisma": "^5.14.0",
+    "prettier": "^3.4.2",
+    "prisma": "5 - 6",
     "prisma-graphql-type-decimal": "^3.0.0",
     "reflect-metadata": "^0.2.2",
     "request": "^2.88.2",
     "rxjs": "^7.8.1",
-    "semantic-release": "^22.0.12",
+    "semantic-release": "^24.2.1",
     "simplytyped": "^3.3.0",
     "temp-dir": "2.X",
     "ts-node": "^10.9.2",
-    "tslib": "^2.6.2",
-    "type-fest": "^4.18.2",
-    "typescript": "^5.4.5",
+    "tslib": "^2.8.1",
+    "type-fest": "^4.32.0",
+    "typescript": "^5.7.3",
+    "typescript-eslint": "^8.20.0",
     "watchexec-bin": "^1.0.0"
   }
 }