prisma-nestjs-graphql 18.1.0 → 18.1.2

package/README.md

@@ -701,6 +701,12 @@ model User {
 export class User {}
 ```
 
+### Using lirary in other generators
+
+```ts
+import { generate } from 'prisma-nestjs-graphql/generate';
+```
+
 ## Similar Projects
 
 - https://github.com/jasonraimondi/prisma-generator-nestjs-graphql

package/generate.cjs

@@ -26,7 +26,7 @@ var filenamify__default = /*#__PURE__*/_interopDefaultLegacy(filenamify);
 var pluralize__default = /*#__PURE__*/_interopDefaultLegacy(pluralize);
 
 function pascalCase(string) {
-  return lodash.startCase(lodash.camelCase(string)).replace(/ /g, "");
+  return lodash.startCase(lodash.camelCase(string)).replaceAll(" ", "");
 }
 
 function argsType(field, args) {
@@ -110,7 +110,7 @@ function beforeGenerateField(field) {
   }
 }
 function replaceBogus(name) {
-  return name.replace(/(Nullable|Nested)/g, "");
+  return name.replaceAll(/Nullable|Nested/g, "");
 }
 function isContainBogus(name) {
   return name.startsWith("Nested") || name.includes("Nullable") && name.endsWith("Filter") || name.endsWith("NullableFilter");
@@ -129,7 +129,7 @@ function isScalarFilter(inputType) {
   return result;
 }
 function postBegin(args) {
-  const { schema } = args;
+  const { schema, modelNames } = args;
   const inputTypes = schema.inputObjectTypes.prisma;
   const enumTypes = schema.enumTypes.model || [];
   const types = [
@@ -173,6 +173,11 @@ function postBegin(args) {
       `Nested${type}NullableListFilter`
     ]);
   }
+  for (const modelName of modelNames) {
+    replaceBogusFilters(`${modelName}RelationFilter`, [
+      `${modelName}NullableRelationFilter`
+    ]);
+  }
   lodash.remove(inputTypes, (inputType) => isContainBogus(inputType.name));
 }
 
@@ -213,11 +218,12 @@ function emitSingle(emitter) {
 function classProperty(property, eventArguments) {
   const { location, isList, propertyType } = eventArguments;
   if (["inputObjectTypes", "outputObjectTypes"].includes(location) && !isList) {
-    const types = propertyType.filter((t) => t !== "null");
-    property.type = types.map((t) => `InstanceType<typeof ${t}>`).join(" | ");
-    if (types.length !== propertyType.length) {
-      property.type += " | null";
-    }
+    const [safeTypes, instanceofTypes] = lodash.partition(
+      propertyType,
+      (t) => t === "null" || t.startsWith("Prisma.")
+    );
+    const mappedInstanceofTypes = instanceofTypes.map((t) => `InstanceType<typeof ${t}>`);
+    property.type = [...mappedInstanceofTypes, ...safeTypes].join(" | ");
   }
 }
 
@@ -557,6 +563,19 @@ function getPropertyType(args) {
   return ["unknown"];
 }
 
+function getWhereUniqueAtLeastKeys(model) {
+  const names = model.fields.filter((field) => field.isUnique || field.isId).map((field) => field.name);
+  for (const uniqueIndex of model.uniqueIndexes) {
+    const name = uniqueIndex.name || uniqueIndex.fields.join("_");
+    names.push(name);
+  }
+  return names.map((name) => `'${name}'`).join(" | ");
+}
+
+function isWhereUniqueInputType(name) {
+  return name.endsWith("WhereUniqueInput");
+}
+
 function propertyStructure(args) {
   const {
     isNullable,
@@ -644,8 +663,9 @@ function inputType(args) {
     });
     const modelField = model == null ? void 0 : model.fields.find((f) => f.name === name);
     const isCustomsApplicable = typeName === (modelField == null ? void 0 : modelField.type);
+    const whereUniqueInputType = isWhereUniqueInputType(typeName) && model && `Prisma.AtLeast<${typeName}, ${getWhereUniqueAtLeastKeys(model)}>`;
     const propertyType = lodash.castArray(
-      (propertySettings == null ? void 0 : propertySettings.name) || getPropertyType({
+      (propertySettings == null ? void 0 : propertySettings.name) || whereUniqueInputType || getPropertyType({
         location,
         type: typeName
       })
@@ -661,6 +681,8 @@ function inputType(args) {
       importDeclarations.create({ ...propertySettings });
     } else if (propertyType.includes("Decimal")) {
       importDeclarations.add("Decimal", "@prisma/client/runtime/library");
+    } else if (propertyType.some((p) => p.startsWith("Prisma."))) {
+      importDeclarations.add("Prisma", "@prisma/client");
     }
     let graphqlType;
     const shouldHideField = (settings == null ? void 0 : settings.shouldHideField({
@@ -1611,9 +1633,6 @@ function beforeInputType(args) {
     field.isNullable = false;
   }
 }
-function isWhereUniqueInputType(name) {
-  return name.endsWith("WhereUniqueInput");
-}
 
 function warning(message) {
   if (Array.isArray(message)) {
@@ -1633,7 +1652,7 @@ function createConfig(data) {
   );
   let outputFilePattern = filenamify__default["default"](configOutputFilePattern, {
     replacement: "/"
-  }).replace(/\.\./g, "/").replace(/\/+/g, "/");
+  }).replaceAll("..", "/").replaceAll(/\/+/g, "/");
   outputFilePattern = lodash.trim(outputFilePattern, "/");
   if (outputFilePattern !== configOutputFilePattern) {
     $warnings.push(
@@ -1801,11 +1820,11 @@ function getModelName(args) {
   }
   for (const [start, end] of middleKeywords) {
     let test = name.slice(start.length).slice(0, -end.length);
-    if (modelNames.includes(test)) {
+    if (modelNames.includes(test) && name.startsWith(start) && name.endsWith(end)) {
       return test;
     }
     test = name.slice(0, -(start + end).length);
-    if (modelNames.includes(test)) {
+    if (modelNames.includes(test) && name.endsWith(start + end)) {
       return test;
     }
   }
@@ -1834,6 +1853,7 @@ const splitKeywords = [
   "ManyWithout",
   "OrderByInput",
   "RelationFilter",
+  "NullableRelationFilter",
   "ListRelationFilter",
   "ScalarWhereInput",
   "UpdateInput",
@@ -1869,6 +1889,7 @@ const endsWithKeywords = [
   "Aggregate",
   "GroupBy",
   "CreateOne",
+  "CreateMany",
   "DeleteMany",
   "DeleteOne",
   "FindMany",
@@ -1883,6 +1904,7 @@ const middleKeywords = [
   ["FindUnique", "OrThrowArgs"],
   ["Aggregate", "Args"],
   ["CreateOne", "Args"],
+  ["CreateMany", "Args"],
   ["DeleteMany", "Args"],
   ["DeleteOne", "Args"],
   ["FindMany", "Args"],

package/generate.d.ts

@@ -70,7 +70,7 @@ declare namespace DMMF {
         isGenerated?: boolean;
         isUpdatedAt?: boolean;
         /**
-         * Describes the data type in the same the way is is defined in the Prisma schema:
+         * Describes the data type in the same the way it is defined in the Prisma schema:
          * BigInt, Boolean, Bytes, DateTime, Decimal, Float, Int, JSON, String, $ModelName
          */
         type: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prisma-nestjs-graphql",
-  "version": "18.1.0",
+  "version": "18.1.2",
   "license": "MIT",
   "description": "Generate object types, inputs, args, etc. from prisma schema file for usage with @nestjs/graphql module",
   "bin": "bin.js",
@@ -70,7 +70,7 @@
     }
   },
   "dependencies": {
-    "@prisma/generator-helper": "^4.14.0",
+    "@prisma/generator-helper": "^5.0.0",
     "await-event-emitter": "^2.0.2",
     "filenamify": "4.X",
     "flat": "^5.0.2",
@@ -84,67 +84,69 @@
     "ts-morph": ">=11 <=16"
   },
   "devDependencies": {
-    "@commitlint/cli": "^17.6.3",
-    "@commitlint/config-conventional": "^17.6.3",
-    "@nestjs/apollo": "^11.0.5",
-    "@nestjs/common": "^9.4.0",
-    "@nestjs/core": "^9.4.0",
-    "@nestjs/graphql": "^11.0.5",
-    "@nestjs/platform-express": "^9.4.0",
-    "@paljs/plugins": "^5.3.0",
-    "@prisma/client": "^4.14.0",
+    "@commitlint/cli": "^17.6.7",
+    "@commitlint/config-conventional": "^17.6.7",
+    "@nestjs/apollo": "^12.0.7",
+    "@nestjs/common": "^10.1.0",
+    "@nestjs/core": "^10.1.0",
+    "@nestjs/graphql": "^12.0.8",
+    "@nestjs/platform-express": "^10.1.0",
+    "@paljs/plugins": "^5.3.3",
+    "@prisma/client": "^5.0.0",
     "@semantic-release/changelog": "^6.0.3",
     "@semantic-release/git": "^10.0.1",
-    "@swc/core": "^1.3.57",
+    "@swc/core": "^1.3.70",
     "@swc/helpers": "^0.5.1",
     "@swc/register": "^0.1.10",
     "@types/flat": "^5.0.2",
     "@types/graceful-fs": "^4.1.6",
-    "@types/lodash": "^4.14.194",
+    "@types/lodash": "^4.14.195",
     "@types/mocha": "^10.0.1",
-    "@types/node": "^20.1.1",
-    "@types/pluralize": "^0.0.29",
-    "@typescript-eslint/eslint-plugin": "^5.59.5",
-    "@typescript-eslint/parser": "^5.59.5",
+    "@types/node": "^20.4.4",
+    "@types/pluralize": "^0.0.30",
+    "@typescript-eslint/eslint-plugin": "^6.1.0",
+    "@typescript-eslint/parser": "^6.1.0",
     "apollo-server-express": "^3.10.0",
-    "c8": "^7.13.0",
+    "c8": "^8.0.0",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.14.0",
     "commitizen": "^4.3.0",
     "cz-customizable": "^7.0.0",
     "decimal.js": "^10.4.3",
-    "eslint": "^8.40.0",
+    "eslint": "^8.45.0",
     "eslint-import-resolver-node": "^0.3.7",
-    "eslint-plugin-etc": "^2.0.2",
+    "eslint-plugin-etc": "^2.0.3",
     "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-only-warn": "^1.1.0",
-    "eslint-plugin-prettier": "^4.2.1",
+    "eslint-plugin-prettier": "^5.0.0",
     "eslint-plugin-regexp": "^1.15.0",
     "eslint-plugin-simple-import-sort": "^10.0.0",
-    "eslint-plugin-sort-class-members": "^1.17.1",
-    "eslint-plugin-unicorn": "^47.0.0",
+    "eslint-plugin-sort-class-members": "^1.18.0",
+    "eslint-plugin-unicorn": "^48.0.0",
     "eslint-plugin-wix-editor": "^3.3.0",
-    "expect": "^29.5.0",
-    "ghooks": "^2.0.4",
+    "expect": "^29.6.1",
     "git-branch-is": "^4.0.0",
-    "graphql": "^16.6.0",
-    "graphql-scalars": "^1.21.3",
+    "graphql": "^16.7.1",
+    "graphql-scalars": "^1.22.2",
     "graphql-type-json": "^0.3.2",
     "mocha": "^10.2.0",
     "ololog": "^1.1.175",
     "precise-commits": "^1.0.2",
-    "prettier": "^2.8.8",
-    "prisma": "^4.14.0",
+    "prettier": "^3.0.0",
+    "prisma": "^5.0.0",
     "prisma-graphql-type-decimal": "^3.0.0",
     "reflect-metadata": "^0.1.13",
     "request": "^2.88.2",
     "rxjs": "^7.8.1",
-    "semantic-release": "^21.0.2",
+    "semantic-release": "^21.0.7",
     "simplytyped": "^3.3.0",
     "temp-dir": "2.X",
     "ts-node": "^10.9.1",
-    "tslib": "^2.5.0",
-    "typescript": "^5.0.4",
+    "tslib": "^2.6.0",
+    "typescript": "^5.1.6",
     "watchexec-bin": "^1.0.0"
+  },
+  "overrides": {
+    "prisma": "^5.0.0"
   }
 }