prisma-nestjs-graphql 17.1.0 → 18.0.1

package/index.js

@@ -15,6 +15,10 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));
@@ -57,6 +61,7 @@ function argsType(field, args) {
     }
   }
   const inputType2 = {
+    // eslint-disable-next-line unicorn/no-null
     constraints: {
       maxNumFields: null,
       minNumFields: null
@@ -220,6 +225,7 @@ function createAggregateInput(args) {
   const { eventEmitter, outputType: outputType2 } = args;
   const className = `${outputType2.name}Input`;
   const inputType2 = {
+    // eslint-disable-next-line unicorn/no-null
     constraints: {
       maxNumFields: null,
       minNumFields: null
@@ -599,13 +605,18 @@ function getGraphqlInputType(inputTypes, pattern) {
       return result;
     }
   }
-  if ((countTypes.scalar === 1 || countTypes.enumTypes === 1) && countTypes.fieldRefTypes === 1) {
+  if ((countTypes.scalar >= 1 || countTypes.enumTypes >= 1) && countTypes.fieldRefTypes === 1) {
+    result = inputTypes.find((x) => (x.location === "scalar" || x.location === "enumTypes") && x.isList);
+    if (result) {
+      return result;
+    }
     result = inputTypes.find((x) => x.location === "scalar" || x.location === "enumTypes");
     if (result) {
       return result;
     }
   }
   throw new TypeError(
+    // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
     `Cannot get matching input type from ${inputTypes.map((x) => x.type).join(", ") || "zero length inputTypes"}`
   );
 }
@@ -780,7 +791,7 @@ function inputType(args) {
         ...propertySettings
       });
     } else if (propertyType.includes("Decimal")) {
-      importDeclarations.add("Decimal", "@prisma/client/runtime");
+      importDeclarations.add("Decimal", "@prisma/client/runtime/library");
     }
     let graphqlType;
     const shouldHideField = settings?.shouldHideField({
@@ -1046,24 +1057,24 @@ function createSettingElement({ line, config, fieldElement, match }) {
     "FieldType",
     "PropertyType"
   ].includes(name) && match.groups?.args) {
-    const options = customType(match.groups.args);
-    (0, import_lodash5.merge)(element, options.namespace && config.fields[options.namespace], options, {
+    const options2 = customType(match.groups.args);
+    (0, import_lodash5.merge)(element, options2.namespace && config.fields[options2.namespace], options2, {
       kind: name
     });
     return result;
   }
   if (name === "ObjectType" && match.groups?.args) {
     element.kind = "ObjectType";
-    const options1 = customType(match.groups.args);
-    if (typeof options1[0] === "string" && options1[0]) {
-      options1.name = options1[0];
+    const options2 = customType(match.groups.args);
+    if (typeof options2[0] === "string" && options2[0]) {
+      options2.name = options2[0];
     }
-    if ((0, import_lodash5.isObject)(options1[1])) {
-      (0, import_lodash5.merge)(options1, options1[1]);
+    if ((0, import_lodash5.isObject)(options2[1])) {
+      (0, import_lodash5.merge)(options2, options2[1]);
     }
     element.arguments = {
-      name: options1.name,
-      isAbstract: options1.isAbstract
+      name: options2.name,
+      isAbstract: options2.isAbstract
     };
     return result;
   }
@@ -1082,11 +1093,11 @@ function createSettingElement({ line, config, fieldElement, match }) {
   }
   const namespace = getNamespace(name);
   element.namespaceImport = namespace;
-  const options3 = {
+  const options = {
     name,
     arguments: (match.groups?.args || "").split(",").map((s) => (0, import_lodash5.trim)(s)).filter(Boolean)
   };
-  (0, import_lodash5.merge)(element, namespace && config.fields[namespace], options3);
+  (0, import_lodash5.merge)(element, namespace && config.fields[namespace], options);
   return result;
 }
 __name(createSettingElement, "createSettingElement");
@@ -1282,12 +1293,12 @@ function modelOutputType(outputType2, args) {
       outputTypeName = getOutputTypeName(outputTypeName);
     }
     const modelField = modelFields.get(model.name)?.get(field.name);
-    const settings1 = fieldSettings.get(model.name)?.get(field.name);
-    const fieldType = settings1?.getFieldType({
+    const settings = fieldSettings.get(model.name)?.get(field.name);
+    const fieldType = settings?.getFieldType({
       name: outputType2.name,
       output: true
     });
-    const propertySettings = settings1?.getPropertyType({
+    const propertySettings = settings?.getPropertyType({
       name: outputType2.name,
       output: true
     });
@@ -1330,7 +1341,7 @@ function modelOutputType(outputType2, args) {
       isList
     });
     if (typeof property.leadingTrivia === "string" && modelField?.documentation) {
-      property.leadingTrivia += createComment(modelField.documentation, settings1);
+      property.leadingTrivia += createComment(modelField.documentation, settings);
     }
     classStructure.properties?.push(property);
     if (propertySettings) {
@@ -1338,10 +1349,10 @@ function modelOutputType(outputType2, args) {
         ...propertySettings
       });
     } else if (propertyType.includes("Decimal")) {
-      importDeclarations.add("Decimal", "@prisma/client/runtime");
+      importDeclarations.add("Decimal", "@prisma/client/runtime/library");
     }
     (0, import_assert3.ok)(property.decorators, "property.decorators is undefined");
-    const shouldHideField = settings1?.shouldHideField({
+    const shouldHideField = settings?.shouldHideField({
       name: outputType2.name,
       output: true
     }) || config.decorate.some((d) => d.name === "HideField" && d.from === "@nestjs/graphql" && d.isMatchField(field.name) && d.isMatchType(outputTypeName));
@@ -1357,7 +1368,7 @@ function modelOutputType(outputType2, args) {
         arguments: [
           isList ? `() => [${graphqlType}]` : `() => ${graphqlType}`,
           import_json53.default.stringify({
-            ...settings1?.fieldArguments(),
+            ...settings?.fieldArguments(),
             nullable: Boolean(field.isNullable),
             defaultValue: [
               "number",
@@ -1368,7 +1379,7 @@ function modelOutputType(outputType2, args) {
           })
         ]
       });
-      for (const setting of settings1 || []) {
+      for (const setting of settings || []) {
         if (shouldBeDecorated(setting) && (setting.match?.(field.name) ?? true)) {
           property.decorators.push({
             name: setting.name,
@@ -1396,13 +1407,13 @@ function modelOutputType(outputType2, args) {
       propertyType
     });
   }
-  for (const setting1 of modelSettings || []) {
-    if (shouldBeDecorated(setting1)) {
+  for (const setting of modelSettings || []) {
+    if (shouldBeDecorated(setting)) {
       classStructure.decorators.push({
-        name: setting1.name,
-        arguments: setting1.arguments
+        name: setting.name,
+        arguments: setting.arguments
       });
-      importDeclarations.create(setting1);
+      importDeclarations.create(setting);
     }
   }
   if (exportDeclaration) {
@@ -1550,7 +1561,7 @@ function outputType(outputType2, args) {
         ...propertySettings
       });
     } else if (propertyType.includes("Decimal")) {
-      importDeclarations.add("Decimal", "@prisma/client/runtime");
+      importDeclarations.add("Decimal", "@prisma/client/runtime/library");
     }
     let graphqlType;
     const shouldHideField = settings?.shouldHideField({
@@ -1709,23 +1720,23 @@ function beforeGenerateFiles2(args) {
     }
   }
   if (config.reExport === ReExport.Single) {
-    const exportDeclarations1 = project.getSourceFiles().filter((sourceFile) => {
+    const exportDeclarations = project.getSourceFiles().filter((sourceFile) => {
       return sourceFile.getBaseName() !== "index.ts";
     }).map((sourceFile) => getExportDeclaration2(rootDirectory, sourceFile));
     rootDirectory.createSourceFile("index.ts", {
-      statements: exportDeclarations1
+      statements: exportDeclarations
     }, {
       overwrite: true
     });
   }
   if (config.reExport === ReExport.All) {
-    const exportDeclarations2 = [];
-    for (const directory1 of rootDirectory.getDirectories()) {
-      const sourceFile = directory1.getSourceFileOrThrow("index.ts");
-      exportDeclarations2.push(getExportDeclaration2(rootDirectory, sourceFile));
+    const exportDeclarations = [];
+    for (const directory of rootDirectory.getDirectories()) {
+      const sourceFile = directory.getSourceFileOrThrow("index.ts");
+      exportDeclarations.push(getExportDeclaration2(rootDirectory, sourceFile));
     }
     rootDirectory.createSourceFile("index.ts", {
-      statements: exportDeclarations2
+      statements: exportDeclarations
     }, {
       overwrite: true
     });
@@ -1956,18 +1967,18 @@ function generateFileName(args) {
       return (0, import_lodash9.kebabCase)(result);
     },
     get name() {
-      let result1 = (0, import_lodash9.kebabCase)(name);
+      let result = (0, import_lodash9.kebabCase)(name);
       for (const suffix of [
         "input",
         "args",
         "enum"
       ]) {
         const ending = `-${suffix}`;
-        if (type === suffix && result1.endsWith(ending)) {
-          result1 = result1.slice(0, -ending.length);
+        if (type === suffix && result.endsWith(ending)) {
+          result = result.slice(0, -ending.length);
         }
       }
-      return result1;
+      return result;
     },
     plural: {
       get type() {
@@ -2018,31 +2029,31 @@ function getModelName(args) {
       return test;
     }
   }
-  for (const keyword1 of endsWithKeywords) {
-    const [test1] = name.split(keyword1).slice(-1);
-    if (modelNames.includes(test1)) {
-      return test1;
+  for (const keyword of endsWithKeywords) {
+    const [test] = name.split(keyword).slice(-1);
+    if (modelNames.includes(test)) {
+      return test;
     }
   }
   for (const [start, end2] of middleKeywords) {
-    let test2 = name.slice(start.length).slice(0, -end2.length);
-    if (modelNames.includes(test2)) {
-      return test2;
+    let test = name.slice(start.length).slice(0, -end2.length);
+    if (modelNames.includes(test)) {
+      return test;
     }
-    test2 = name.slice(0, -(start + end2).length);
-    if (modelNames.includes(test2)) {
-      return test2;
+    test = name.slice(0, -(start + end2).length);
+    if (modelNames.includes(test)) {
+      return test;
     }
   }
   if (name.slice(-19) === "CompoundUniqueInput") {
-    const test3 = name.slice(0, -19);
-    const models = modelNames.filter((x) => test3.startsWith(x)).sort((a, b) => b.length - a.length);
+    const test = name.slice(0, -19);
+    const models = modelNames.filter((x) => test.startsWith(x)).sort((a, b) => b.length - a.length);
     return (0, import_lodash10.first)(models);
   }
   if (name.slice(-5) === "Count") {
-    const test4 = name.slice(0, -5);
-    if (modelNames.includes(test4)) {
-      return test4;
+    const test = name.slice(0, -5);
+    if (modelNames.includes(test)) {
+      return test;
     }
   }
   return void 0;
@@ -2244,16 +2255,16 @@ async function generate(args) {
   for (const model of datamodel.models) {
     await eventEmitter.emit("Model", model, eventArguments);
   }
-  for (const model1 of datamodel.types || []) {
-    await eventEmitter.emit("Model", model1, eventArguments);
+  for (const model of datamodel.types || []) {
+    await eventEmitter.emit("Model", model, eventArguments);
   }
   const { inputObjectTypes, outputObjectTypes, enumTypes } = schema;
   await eventEmitter.emit("PostBegin", eventArguments);
   for (const enumType of enumTypes.prisma.concat(enumTypes.model || [])) {
     await eventEmitter.emit("EnumType", enumType, eventArguments);
   }
-  for (const outputType1 of outputObjectTypes.model) {
-    await eventEmitter.emit("ModelOutputType", outputType1, eventArguments);
+  for (const outputType2 of outputObjectTypes.model) {
+    await eventEmitter.emit("ModelOutputType", outputType2, eventArguments);
   }
   const queryOutputTypes = [];
   for (const outputType2 of outputObjectTypes.prisma) {
@@ -2267,22 +2278,22 @@ async function generate(args) {
     await eventEmitter.emit("OutputType", outputType2, eventArguments);
   }
   const inputTypes = inputObjectTypes.prisma.concat(inputObjectTypes.model || []);
-  for (const inputType1 of inputTypes) {
+  for (const inputType2 of inputTypes) {
     const event = {
       ...eventArguments,
-      inputType: inputType1,
+      inputType: inputType2,
       fileType: "input",
       classDecoratorName: "InputType"
     };
-    if (inputType1.fields.length === 0) {
-      removeTypes.add(inputType1.name);
+    if (inputType2.fields.length === 0) {
+      removeTypes.add(inputType2.name);
       continue;
     }
     await eventEmitter.emit("BeforeInputType", event);
     await eventEmitter.emit("InputType", event);
   }
-  for (const outputType3 of queryOutputTypes) {
-    for (const field of outputType3.fields) {
+  for (const outputType2 of queryOutputTypes) {
+    for (const field of outputType2.fields) {
       await eventEmitter.emit("ArgsType", field, eventArguments);
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prisma-nestjs-graphql",
-  "version": "17.1.0",
+  "version": "18.0.1",
   "license": "MIT",
   "description": "Generate object types, inputs, args, etc. from prisma schema file for usage with @nestjs/graphql module",
   "main": "index.js",
@@ -52,12 +52,12 @@
     }
   },
   "dependencies": {
-    "@prisma/generator-helper": "^4.7.1",
+    "@prisma/generator-helper": "^4.12.0",
     "await-event-emitter": "^2.0.2",
     "filenamify": "4.X",
     "flat": "^5.0.2",
     "get-relative-path": "^1.0.2",
-    "json5": "^2.2.1",
+    "json5": "^2.2.3",
     "lodash": "^4.17.21",
     "outmatch": "^0.7.0",
     "pluralize": "^8.0.0",
@@ -65,66 +65,66 @@
     "ts-morph": ">=11 <=16"
   },
   "devDependencies": {
-    "@commitlint/cli": "^17.3.0",
-    "@commitlint/config-conventional": "^17.3.0",
+    "@commitlint/cli": "^17.5.1",
+    "@commitlint/config-conventional": "^17.4.4",
     "@nestjs/apollo": "^10.1.7",
-    "@nestjs/common": "^9.2.1",
-    "@nestjs/core": "^9.2.1",
+    "@nestjs/common": "^9.3.12",
+    "@nestjs/core": "^9.3.12",
     "@nestjs/graphql": "^10.1.7",
-    "@nestjs/platform-express": "^9.2.1",
-    "@paljs/plugins": "^5.1.0",
-    "@prisma/client": "^4.7.1",
-    "@semantic-release/changelog": "^6.0.2",
+    "@nestjs/platform-express": "^9.3.12",
+    "@paljs/plugins": "^5.3.0",
+    "@prisma/client": "^4.12.0",
+    "@semantic-release/changelog": "^6.0.3",
     "@semantic-release/git": "^10.0.1",
-    "@swc/core": "^1.3.23",
+    "@swc/core": "^1.3.44",
     "@swc/helpers": "^0.4.14",
     "@swc/register": "^0.1.10",
     "@types/flat": "^5.0.2",
-    "@types/lodash": "^4.14.191",
+    "@types/lodash": "^4.14.192",
     "@types/mocha": "^10.0.1",
-    "@types/node": "^18.11.15",
+    "@types/node": "^18.15.11",
     "@types/pluralize": "^0.0.29",
-    "@typescript-eslint/eslint-plugin": "^5.46.1",
-    "@typescript-eslint/parser": "^5.46.1",
+    "@typescript-eslint/eslint-plugin": "^5.57.0",
+    "@typescript-eslint/parser": "^5.57.0",
     "apollo-server-express": "^3.10.0",
-    "c8": "^7.12.0",
+    "c8": "^7.13.0",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.14.0",
-    "commitizen": "^4.2.6",
+    "commitizen": "^4.3.0",
     "cz-customizable": "^7.0.0",
     "decimal.js": "^10.4.3",
-    "eslint": "^8.29.0",
-    "eslint-import-resolver-node": "^0.3.6",
+    "eslint": "^8.37.0",
+    "eslint-import-resolver-node": "^0.3.7",
     "eslint-plugin-etc": "^2.0.2",
-    "eslint-plugin-import": "^2.26.0",
+    "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-only-warn": "^1.1.0",
     "eslint-plugin-prettier": "^4.2.1",
-    "eslint-plugin-regexp": "^1.11.0",
-    "eslint-plugin-simple-import-sort": "^8.0.0",
+    "eslint-plugin-regexp": "^1.14.0",
+    "eslint-plugin-simple-import-sort": "^10.0.0",
     "eslint-plugin-sort-class-members": "^1.16.0",
-    "eslint-plugin-unicorn": "^45.0.2",
+    "eslint-plugin-unicorn": "^46.0.0",
     "eslint-plugin-wix-editor": "^3.3.0",
-    "expect": "^29.3.1",
+    "expect": "^29.5.0",
     "ghooks": "^2.0.4",
     "git-branch-is": "^4.0.0",
     "graphql": "^16.6.0",
-    "graphql-scalars": "^1.20.1",
+    "graphql-scalars": "^1.21.3",
     "graphql-type-json": "^0.3.2",
     "mocha": "^10.2.0",
     "ololog": "^1.1.175",
     "precise-commits": "^1.0.2",
-    "prettier": "^2.8.1",
-    "prisma": "^4.7.1",
-    "prisma-graphql-type-decimal": "^2.0.4",
+    "prettier": "^2.8.7",
+    "prisma": "^4.12.0",
+    "prisma-graphql-type-decimal": "^3.0.0",
     "reflect-metadata": "^0.1.13",
     "request": "^2.88.2",
-    "rxjs": "^7.6.0",
-    "semantic-release": "^19.0.5",
+    "rxjs": "^7.8.0",
+    "semantic-release": "^21.0.1",
     "simplytyped": "^3.3.0",
     "temp-dir": "2.X",
     "ts-node": "^10.9.1",
-    "tslib": "^2.4.1",
-    "typescript": "^4.9.4",
+    "tslib": "^2.5.0",
+    "typescript": "^5.0.3",
     "watchexec-bin": "^1.0.0"
   }
 }