prisma-nestjs-graphql 19.1.0 → 19.3.0

package/README.md

@@ -70,6 +70,12 @@ Path to `tsconfig.json` (absolute path or relative to current working directory)
 Type: `string | undefined`  
 Default: `tsconfig.json` if exists, `undefined` otherwise
 
+#### `prismaClientImport`
+
+The path to use to import the Prisma Client package
+Type: `string | undefined`
+Default: `@prisma/client`
+
 #### `combineScalarFilters`
 
 Combine nested/nullable scalar filters to single  
@@ -117,16 +123,19 @@ Type: `boolean`
 Default: `false`
 
 #### `emitBlocks`
+
 Emit only selected blocks. Be aware, that some blocks do depend on others, e.g. one can't emit `models` without emitting `enums`.  
 Type: `("args" | "inputs" | "outputs" | "models" | "enums")[]`  
 Default: `["args", "inputs", "outputs", "models", "enums"]`
 
 #### `omitModelsCount`
+
 Omit `_count` field from models.  
 Type: `boolean`  
 Default: `false`
 
 #### `purgeOutput`
+
 Delete all files in `output` folder.  
 Type: `boolean`  
 Default: `false`
@@ -145,6 +154,13 @@ Type: `boolean`
 Default: `false`  
 **Note**: It will break compatiblity between Prisma types and generated classes.
 
+#### `unsafeCompatibleWhereUniqueInput`
+
+Set TypeScript property type as non optional for all fields in `*WhereUniqueInput` classes.
+See [#177](https://github.com/unlight/prisma-nestjs-graphql/issues/177) for more details.  
+Type: `boolean`  
+Default: `false`
+
 #### `useInputType`
 
 Since GraphQL does not support input union type, this setting map

package/generate.cjs

@@ -1,7 +1,5 @@
 'use strict';
 
-Object.defineProperty(exports, '__esModule', { value: true });
-
 var assert = require('assert');
 var AwaitEventEmitter = require('await-event-emitter');
 var lodash = require('lodash');
@@ -15,16 +13,6 @@ var filenamify = require('filenamify');
 var flat = require('flat');
 var pluralize = require('pluralize');
 
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
-
-var AwaitEventEmitter__default = /*#__PURE__*/_interopDefaultLegacy(AwaitEventEmitter);
-var JSON5__default = /*#__PURE__*/_interopDefaultLegacy(JSON5);
-var pupa__default = /*#__PURE__*/_interopDefaultLegacy(pupa);
-var getRelativePath__default = /*#__PURE__*/_interopDefaultLegacy(getRelativePath);
-var outmatch__default = /*#__PURE__*/_interopDefaultLegacy(outmatch);
-var filenamify__default = /*#__PURE__*/_interopDefaultLegacy(filenamify);
-var pluralize__default = /*#__PURE__*/_interopDefaultLegacy(pluralize);
-
 function pascalCase(string) {
   return lodash.startCase(lodash.camelCase(string)).replaceAll(" ", "");
 }
@@ -86,9 +74,11 @@ function argsType(field, args) {
   });
 }
 
+const BeforeGenerateField = "BeforeGenerateField";
+
 function combineScalarFilters(eventEmitter) {
   eventEmitter.on("BeforeInputType", beforeInputType$2);
-  eventEmitter.on("BeforeGenerateField", beforeGenerateField);
+  eventEmitter.on(BeforeGenerateField, beforeGenerateField);
   eventEmitter.on("PostBegin", postBegin);
 }
 function beforeInputType$2(args) {
@@ -393,7 +383,7 @@ function relativePath(from, to) {
   if (!to.startsWith("/")) {
     to = `/${to}`;
   }
-  let result = getRelativePath__default["default"](from, to);
+  let result = getRelativePath(from, to);
   if (!result.startsWith(".")) {
     result = `./${result}`;
   }
@@ -478,7 +468,7 @@ function getGraphqlInputType(inputTypes, pattern) {
   if (pattern) {
     if (pattern.startsWith("matcher:") || pattern.startsWith("match:")) {
       const { 1: patternValue } = pattern.split(":", 2);
-      const isMatch = outmatch__default["default"](patternValue, { separator: false });
+      const isMatch = outmatch(patternValue, { separator: false });
       result = inputTypes.find((x) => isMatch(String(x.type)));
       if (result) {
         return result;
@@ -571,7 +561,7 @@ function getWhereUniqueAtLeastKeys(model) {
   for (const uniqueIndex of model.uniqueIndexes) {
     names.push(createFieldName(uniqueIndex));
   }
-  return names.map((name) => `'${name}'`).join(" | ");
+  return names;
 }
 function createFieldName(args) {
   const { name, fields } = args;
@@ -651,9 +641,10 @@ function inputType(args) {
   const useInputType = config.useInputType.find(
     (x) => inputType2.name.includes(x.typeName)
   );
+  const isWhereUnique = isWhereUniqueInputType(inputType2.name);
   for (const field of inputType2.fields) {
     field.inputTypes = field.inputTypes.filter((t) => !removeTypes.has(String(t.type)));
-    eventEmitter.emitSync("BeforeGenerateField", field, args);
+    eventEmitter.emitSync(BeforeGenerateField, field, args);
     const { inputTypes, isRequired, name } = field;
     if (inputTypes.length === 0) {
       continue;
@@ -669,16 +660,22 @@ 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 atLeastKeys = model && getWhereUniqueAtLeastKeys(model);
+    const whereUniqueInputType = isWhereUniqueInputType(typeName) && atLeastKeys && `Prisma.AtLeast<${typeName}, ${atLeastKeys.map((name2) => `'${name2}'`).join(" | ")}>`;
     const propertyType = lodash.castArray(
       (propertySettings == null ? void 0 : propertySettings.name) || whereUniqueInputType || getPropertyType({
         location,
         type: typeName
       })
     );
+    const hasExclamationToken = Boolean(
+      isWhereUnique && config.unsafeCompatibleWhereUniqueInput && (atLeastKeys == null ? void 0 : atLeastKeys.includes(name))
+    );
     const property = propertyStructure({
       name,
       isNullable: !isRequired,
+      hasExclamationToken: hasExclamationToken || void 0,
+      hasQuestionToken: hasExclamationToken ? false : void 0,
       propertyType,
       isList
     });
@@ -686,16 +683,16 @@ function inputType(args) {
     if (propertySettings) {
       importDeclarations.create({ ...propertySettings });
     } else if (propertyType.includes("Decimal")) {
-      importDeclarations.add("Decimal", "@prisma/client/runtime/library");
+      importDeclarations.add("Decimal", `${config.prismaClientImport}/runtime/library`);
     } else if (propertyType.some((p) => p.startsWith("Prisma."))) {
-      importDeclarations.add("Prisma", "@prisma/client");
+      importDeclarations.add("Prisma", config.prismaClientImport);
     }
     let graphqlType;
     const shouldHideField = (settings == null ? void 0 : settings.shouldHideField({
       name: inputType2.name,
       input: true
     })) || config.decorate.some(
-      (d) => d.name === "HideField" && d.from === "@nestjs/graphql" && d.isMatchField(name) && d.isMatchType(inputType2.name)
+      (d) => d.name === "HideField" && d.from === moduleSpecifier && d.isMatchField(name) && d.isMatchType(inputType2.name)
     );
     const fieldType = settings == null ? void 0 : settings.getFieldType({
       name: inputType2.name,
@@ -726,14 +723,14 @@ function inputType(args) {
     }
     assert.ok(property.decorators, "property.decorators is undefined");
     if (shouldHideField) {
-      importDeclarations.add("HideField", "@nestjs/graphql");
+      importDeclarations.add("HideField", moduleSpecifier);
       property.decorators.push({ name: "HideField", arguments: [] });
     } else {
       property.decorators.push({
         name: "Field",
         arguments: [
           isList ? `() => [${graphqlType}]` : `() => ${graphqlType}`,
-          JSON5__default["default"].stringify({
+          JSON5.stringify({
             ...settings == null ? void 0 : settings.fieldArguments(),
             nullable: !isRequired
           })
@@ -789,7 +786,7 @@ function inputType(args) {
         if (decorate.isMatchField(name) && decorate.isMatchType(inputType2.name)) {
           property.decorators.push({
             name: decorate.name,
-            arguments: (_d = decorate.arguments) == null ? void 0 : _d.map((x) => pupa__default["default"](x, { propertyType }))
+            arguments: (_d = decorate.arguments) == null ? void 0 : _d.map((x) => pupa(x, { propertyType }))
           });
           importDeclarations.create(decorate);
         }
@@ -869,7 +866,7 @@ class ObjectSettings extends Array {
         resultArguments.unshift(name);
       }
     }
-    return resultArguments.map((x) => JSON5__default["default"].stringify(x));
+    return resultArguments.map((x) => JSON5.stringify(x));
   }
   fieldArguments() {
     const item = this.find((item2) => item2.kind === "Field");
@@ -974,7 +971,7 @@ function createSettingElement({
       name,
       namespace: false,
       kind: "Decorator",
-      arguments: Array.isArray(options2.arguments) ? options2.arguments.map((s) => JSON5__default["default"].stringify(s)) : options2.arguments
+      arguments: Array.isArray(options2.arguments) ? options2.arguments.map((s) => JSON5.stringify(s)) : options2.arguments
     });
     return result;
   }
@@ -1001,7 +998,7 @@ function customType(args) {
     result.namespaceImport = namespace;
   }
   if (typeof options.match === "string" || Array.isArray(options.match)) {
-    result.match = outmatch__default["default"](options.match, { separator: false });
+    result.match = outmatch(options.match, { separator: false });
   }
   return result;
 }
@@ -1024,7 +1021,7 @@ function hideFieldDecorator(match) {
     result.output = Boolean(options.output);
     result.input = Boolean(options.input);
     if (typeof options.match === "string" || Array.isArray(options.match)) {
-      result.match = outmatch__default["default"](options.match, { separator: false });
+      result.match = outmatch(options.match, { separator: false });
     }
   } else {
     if (/output:\s*true/.test(match.groups.args)) {
@@ -1038,10 +1035,10 @@ function hideFieldDecorator(match) {
 }
 function parseArgs(string) {
   try {
-    return JSON5__default["default"].parse(string);
+    return JSON5.parse(string);
   } catch {
     try {
-      return JSON5__default["default"].parse(`[${string}]`);
+      return JSON5.parse(`[${string}]`);
     } catch {
       throw new Error(`Failed to parse: ${string}`);
     }
@@ -1223,7 +1220,7 @@ function modelOutputType(outputType, args) {
     if (propertySettings) {
       importDeclarations.create({ ...propertySettings });
     } else if (propertyType.includes("Decimal")) {
-      importDeclarations.add("Decimal", "@prisma/client/runtime/library");
+      importDeclarations.add("Decimal", `${config.prismaClientImport}/runtime/library`);
     }
     assert.ok(property.decorators, "property.decorators is undefined");
     const shouldHideField = (settings == null ? void 0 : settings.shouldHideField({ name: outputType.name, output: true })) || config.decorate.some(
@@ -1237,7 +1234,7 @@ function modelOutputType(outputType, args) {
         name: "Field",
         arguments: [
           isList ? `() => [${graphqlType}]` : `() => ${graphqlType}`,
-          JSON5__default["default"].stringify({
+          JSON5.stringify({
             ...settings == null ? void 0 : settings.fieldArguments(),
             nullable: Boolean(field.isNullable),
             defaultValue: ["number", "string", "boolean"].includes(
@@ -1261,7 +1258,7 @@ function modelOutputType(outputType, args) {
         if (decorate.isMatchField(field.name) && decorate.isMatchType(outputTypeName)) {
           property.decorators.push({
             name: decorate.name,
-            arguments: (_f = decorate.arguments) == null ? void 0 : _f.map((x) => pupa__default["default"](x, { propertyType }))
+            arguments: (_f = decorate.arguments) == null ? void 0 : _f.map((x) => pupa(x, { propertyType }))
           });
           importDeclarations.create(decorate);
         }
@@ -1406,7 +1403,7 @@ function outputType(outputType2, args) {
     if (propertySettings) {
       importDeclarations.create({ ...propertySettings });
     } else if (propertyType.includes("Decimal")) {
-      importDeclarations.add("Decimal", "@prisma/client/runtime/library");
+      importDeclarations.add("Decimal", `${config.prismaClientImport}/runtime/library`);
     }
     let graphqlType;
     const shouldHideField = (settings == null ? void 0 : settings.shouldHideField({
@@ -1453,7 +1450,7 @@ function outputType(outputType2, args) {
         name: "Field",
         arguments: [
           isList ? `() => [${graphqlType}]` : `() => ${graphqlType}`,
-          JSON5__default["default"].stringify({
+          JSON5.stringify({
             ...settings == null ? void 0 : settings.fieldArguments(),
             nullable: Boolean(field.isNullable)
           })
@@ -1686,7 +1683,7 @@ function createConfig(data) {
   const configOutputFilePattern = String(
     config.outputFilePattern || `{model}/{name}.{type}.ts`
   );
-  let outputFilePattern = filenamify__default["default"](configOutputFilePattern, {
+  let outputFilePattern = filenamify(configOutputFilePattern, {
     replacement: "/"
   }).replaceAll("..", "/").replaceAll(/\/+/g, "/");
   outputFilePattern = lodash.trim(outputFilePattern, "/");
@@ -1729,19 +1726,20 @@ function createConfig(data) {
       `Missed 'from' or 'name' part in configuration for decorate`
     );
     decorate.push({
-      isMatchField: outmatch__default["default"](element.field, { separator: false }),
-      isMatchType: outmatch__default["default"](element.type, { separator: false }),
+      isMatchField: outmatch(element.field, { separator: false }),
+      isMatchType: outmatch(element.type, { separator: false }),
       from: element.from,
       name: element.name,
       namedImport: toBoolean(element.namedImport),
       defaultImport: toBoolean(element.defaultImport) ? true : element.defaultImport,
       namespaceImport: element.namespaceImport,
-      arguments: element.arguments ? JSON5__default["default"].parse(element.arguments) : void 0
+      arguments: element.arguments ? JSON5.parse(element.arguments) : void 0
     });
   }
   return {
     outputFilePattern,
     tsConfigFilePath: createTsConfigFilePathValue(config.tsConfigFilePath),
+    prismaClientImport: createPrismaImport(config.prismaClientImport),
     combineScalarFilters: toBoolean(config.combineScalarFilters),
     noAtomicOperations: toBoolean(config.noAtomicOperations),
     reExport: ReExport[String(config.reExport)] || ReExport.None,
@@ -1757,6 +1755,9 @@ function createConfig(data) {
     requireSingleFieldsInWhereUniqueInput: toBoolean(
       config.requireSingleFieldsInWhereUniqueInput
     ),
+    unsafeCompatibleWhereUniqueInput: toBoolean(
+      config.unsafeCompatibleWhereUniqueInput
+    ),
     graphqlScalars: config.graphqlScalars || {},
     decorate
   };
@@ -1770,6 +1771,11 @@ function createTsConfigFilePathValue(value) {
   if (tsConfigFileExists("tsconfig.json"))
     return "tsconfig.json";
 }
+function createPrismaImport(value) {
+  if (typeof value === "string")
+    return value;
+  return "@prisma/client";
+}
 function createUseInputType(data) {
   if (!data) {
     return [];
@@ -1797,7 +1803,7 @@ function toBoolean(value) {
 
 function generateFileName(args) {
   const { template, type, name, getModelName } = args;
-  return pupa__default["default"](template, {
+  return pupa(template, {
     type,
     get model() {
       const result = getModelName(name) || "prisma";
@@ -1815,7 +1821,7 @@ function generateFileName(args) {
     },
     plural: {
       get type() {
-        return pluralize__default["default"](type);
+        return pluralize(type);
       }
     }
   });
@@ -1962,7 +1968,7 @@ async function generate(args) {
   const generatorOutputValue = (_a = generator.output) == null ? void 0 : _a.value;
   assert.ok(generatorOutputValue, "Missing generator configuration: output");
   const config = createConfig(generator.config);
-  const eventEmitter = new AwaitEventEmitter__default["default"]();
+  const eventEmitter = new AwaitEventEmitter();
   eventEmitter.on("Warning", warning);
   config.emitBlocks.models && eventEmitter.on("Model", modelData);
   if (config.emitBlocks.prismaEnums || config.emitBlocks.schemaEnums) {

package/generate.d.ts

@@ -78,7 +78,7 @@ declare namespace DMMF {
         hasDefaultValue: boolean;
         default?: FieldDefault | FieldDefaultScalar | FieldDefaultScalar[];
         relationFromFields?: string[];
-        relationToFields?: any[];
+        relationToFields?: string[];
         relationOnDelete?: string;
         relationName?: string;
         documentation?: string;
@@ -230,6 +230,7 @@ type DecorateElement = {
 declare function createConfig(data: Record<string, unknown>): {
     outputFilePattern: string;
     tsConfigFilePath: string | undefined;
+    prismaClientImport: string;
     combineScalarFilters: boolean;
     noAtomicOperations: boolean;
     reExport: ReExport;
@@ -243,6 +244,7 @@ declare function createConfig(data: Record<string, unknown>): {
     useInputType: ConfigInputItem[];
     noTypeId: boolean;
     requireSingleFieldsInWhereUniqueInput: boolean;
+    unsafeCompatibleWhereUniqueInput: boolean;
     graphqlScalars: Record<string, ImportNameSpec | undefined>;
     decorate: DecorateElement[];
 };

package/index.d.ts

@@ -1,2 +1,2 @@
 
-export { }
+export {  }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prisma-nestjs-graphql",
-  "version": "19.1.0",
+  "version": "19.3.0",
   "license": "MIT",
   "description": "Generate object types, inputs, args, etc. from prisma schema file for usage with @nestjs/graphql module",
   "bin": "bin.js",
@@ -52,8 +52,10 @@
     "eslint:fix": "npm run eslint -- --fix",
     "build": "sh Taskfile build",
     "prisma:g": "node node_modules/prisma/build/index.js generate",
+    "prisma:custom:g": "node node_modules/prisma/build/index.js generate --schema=./custom-package-generator/schema.prisma",
     "format": "npx prettier ./@generated --write",
     "regen": "rm -rf @generated && npm run prisma:g && npm run format",
+    "regen:custom": "rm -rf @generated-custom && npm run prisma:custom:g && npm run format",
     "rt": "npm run regen && npm test",
     "example": "node-dev example/main.ts",
     "clean_cache": "rm -rf node_modules/.cache",
@@ -70,10 +72,10 @@
     }
   },
   "dependencies": {
-    "@prisma/generator-helper": "^5.1.1",
+    "@prisma/generator-helper": "^5.6.0",
     "await-event-emitter": "^2.0.2",
     "filenamify": "4.X",
-    "flat": "^5.0.2",
+    "flat": "5.X",
     "get-relative-path": "^1.0.2",
     "graceful-fs": "^4.2.11",
     "json5": "^2.2.3",
@@ -84,69 +86,66 @@
     "ts-morph": ">=11 <=16"
   },
   "devDependencies": {
-    "@commitlint/cli": "^17.6.7",
-    "@commitlint/config-conventional": "^17.6.7",
-    "@nestjs/apollo": "^12.0.7",
-    "@nestjs/common": "^10.1.3",
-    "@nestjs/core": "^10.1.3",
-    "@nestjs/graphql": "^12.0.8",
-    "@nestjs/platform-express": "^10.1.3",
-    "@paljs/plugins": "^5.3.3",
-    "@prisma/client": "^5.1.1",
+    "@commitlint/cli": "^18.4.3",
+    "@commitlint/config-conventional": "^18.4.3",
+    "@nestjs/apollo": "^12.0.11",
+    "@nestjs/common": "^10.2.10",
+    "@nestjs/core": "^10.2.10",
+    "@nestjs/graphql": "^12.0.11",
+    "@nestjs/platform-express": "^10.2.10",
+    "@paljs/plugins": "^6.0.7",
+    "@prisma/client": "^5.6.0",
     "@semantic-release/changelog": "^6.0.3",
     "@semantic-release/git": "^10.0.1",
-    "@swc/core": "^1.3.74",
-    "@swc/helpers": "^0.5.1",
+    "@swc/core": "^1.3.99",
+    "@swc/helpers": "^0.5.3",
     "@swc/register": "^0.1.10",
-    "@types/flat": "^5.0.2",
-    "@types/graceful-fs": "^4.1.6",
-    "@types/lodash": "^4.14.196",
-    "@types/mocha": "^10.0.1",
-    "@types/node": "^20.4.7",
-    "@types/pluralize": "^0.0.30",
-    "@typescript-eslint/eslint-plugin": "^6.2.1",
-    "@typescript-eslint/parser": "^6.2.1",
-    "apollo-server-express": "^3.10.0",
+    "@types/flat": "^5.0.5",
+    "@types/graceful-fs": "^4.1.9",
+    "@types/lodash": "^4.14.202",
+    "@types/mocha": "^10.0.6",
+    "@types/node": "^20.10.0",
+    "@types/pluralize": "^0.0.33",
+    "@typescript-eslint/eslint-plugin": "^6.12.0",
+    "@typescript-eslint/parser": "^6.12.0",
+    "apollo-server-express": "^3.13.0",
     "c8": "^8.0.1",
     "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.46.0",
-    "eslint-import-resolver-node": "^0.3.7",
+    "eslint": "^8.54.0",
+    "eslint-import-resolver-node": "^0.3.9",
     "eslint-plugin-etc": "^2.0.3",
-    "eslint-plugin-import": "^2.28.0",
+    "eslint-plugin-import": "^2.29.0",
     "eslint-plugin-only-warn": "^1.1.0",
-    "eslint-plugin-prettier": "^5.0.0",
+    "eslint-plugin-prettier": "^5.0.1",
     "eslint-plugin-regexp": "^1.15.0",
     "eslint-plugin-simple-import-sort": "^10.0.0",
-    "eslint-plugin-sort-class-members": "^1.18.0",
-    "eslint-plugin-unicorn": "^48.0.1",
+    "eslint-plugin-sort-class-members": "^1.19.0",
+    "eslint-plugin-unicorn": "^49.0.0",
     "eslint-plugin-wix-editor": "^3.3.0",
-    "expect": "^29.6.2",
+    "expect": "^29.7.0",
     "git-branch-is": "^4.0.0",
-    "graphql": "^16.7.1",
-    "graphql-scalars": "^1.22.2",
+    "graphql": "^16.8.1",
+    "graphql-scalars": "^1.22.4",
     "graphql-type-json": "^0.3.2",
     "mocha": "^10.2.0",
     "ololog": "^1.1.175",
     "precise-commits": "^1.0.2",
-    "prettier": "^3.0.1",
-    "prisma": "^5.1.1",
+    "prettier": "^3.1.0",
+    "prisma": "^5.6.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.7",
+    "semantic-release": "^22.0.8",
     "simplytyped": "^3.3.0",
     "temp-dir": "2.X",
     "ts-node": "^10.9.1",
-    "tslib": "^2.6.1",
-    "typescript": "^5.1.6",
+    "tslib": "^2.6.2",
+    "typescript": "^5.3.2",
     "watchexec-bin": "^1.0.0"
-  },
-  "overrides": {
-    "prisma": "^5.1.1"
   }
 }