prisma-nestjs-graphql 14.4.1 → 14.6.2

package/README.md

@@ -128,10 +128,11 @@ Default: `false`
 
 #### `requireSingleFieldsInWhereUniqueInput`
 
-When a `Model`s `WhereUniqueInput` class has only a single field, mark that field as **required** (TypeScript) and **not nullable** (GraphQL).
+When a model `*WhereUniqueInput` class has only a single field, mark that field as **required** (TypeScript) and **not nullable** (GraphQL).  
 See [#58](https://github.com/unlight/prisma-nestjs-graphql/issues/58) for more details.  
 Type: `boolean`  
-Default: `false`
+Default: `false`  
+**Note**: It will break compatiblity between Prisma types and generated classes.
 
 #### `useInputType`
 
@@ -345,6 +346,7 @@ generator nestgraphql {
     fields_{namespace}_from = "module specifier"
     fields_{namespace}_input = true | false
     fields_{namespace}_output = true | false
+    fields_{namespace}_model = true | false
     fields_{namespace}_defaultImport = "default import name" | true
     fields_{namespace}_namespaceImport = "namespace import name"
     fields_{namespace}_namedImport = true | false
@@ -367,7 +369,14 @@ Default: `false`
 
 ##### `fields_{namespace}_output`
 
-Means that it will be applied on output types (classes decorated by `ObjectType`)  
+Means that it will be applied on output types (classes decorated by `ObjectType`),
+including models  
+Type: `boolean`  
+Default: `false`
+
+##### `fields_{namespace}_model`
+
+Means that it will be applied only on model types (classes decorated by `ObjectType`)  
 Type: `boolean`  
 Default: `false`
 
@@ -420,6 +429,36 @@ export class UserCreateInput {
 }
 ```
 
+Custom decorators can be applied on classes (models):
+
+```
+/// @NG.Directive('@extends')
+/// @NG.Directive('@key(fields: "id")')
+model User {
+    /// @NG.Directive('@external')
+    id String @id
+}
+
+generator nestgraphql {
+    fields_NG_from = "@nestjs/graphql"
+    fields_NG_output = false
+    fields_NG_model = true
+}
+```
+
+May generate:
+
+```ts
+import * as NG from '@nestjs/graphql';
+
+@NG.Directive('@extends')
+@NG.Directive('@key(fields: "id")')
+export class User {
+    @Field(() => ID, { nullable: false })
+    @NG.Directive('@external')
+    id!: string;
+```
+
 #### @FieldType()
 
 Allow set custom GraphQL scalar type for field
@@ -533,6 +572,34 @@ export class User {
 }
 ```
 
+### @Directive()
+
+Allow attach `@Directive` decorator from `@nestjs/graphql`
+
+GraphQL federation example:
+
+```
+/// @Directive({ arguments: ['@extends'] })
+/// @Directive({ arguments: ['@key(fields: "id")'] })
+model User {
+    /// @Directive({ arguments: ['@external'] })
+    id String @id
+}
+```
+
+May generate:
+
+```ts
+@ObjectType()
+@Directive('@extends')
+@Directive('@key(fields: "id")')
+export class User {
+    @Field(() => ID, { nullable: false })
+    @Directive('@external')
+    id!: string;
+}
+```
+
 #### @ObjectType()
 
 Allow rename type in schema and mark as abstract.
@@ -569,6 +636,7 @@ export class User {}
 
 ## Similar Projects
 
+-   https://github.com/kimjbstar/prisma-class-generator
 -   https://github.com/odroe/nest-gql-mix
 -   https://github.com/rfermann/nestjs-prisma-graphql-generator
 -   https://github.com/madscience/graphql-codegen-nestjs

package/index.js

@@ -22,32 +22,29 @@ var __spreadValues = (a, b) => {
 };
 var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 var __markAsModule = (target) => __defProp(target, "__esModule", { value: true });
-var __reExport = (target, module2, desc) => {
+var __reExport = (target, module2, copyDefault, desc) => {
   if (module2 && typeof module2 === "object" || typeof module2 === "function") {
     for (let key of __getOwnPropNames(module2))
-      if (!__hasOwnProp.call(target, key) && key !== "default")
+      if (!__hasOwnProp.call(target, key) && (copyDefault || key !== "default"))
         __defProp(target, key, { get: () => module2[key], enumerable: !(desc = __getOwnPropDesc(module2, key)) || desc.enumerable });
   }
   return target;
 };
-var __toModule = (module2) => {
-  return __reExport(__markAsModule(__defProp(module2 != null ? __create(__getProtoOf(module2)) : {}, "default", module2 && module2.__esModule && "default" in module2 ? { get: () => module2.default, enumerable: true } : { value: module2, enumerable: true })), module2);
+var __toESM = (module2, isNodeMode) => {
+  return __reExport(__markAsModule(__defProp(module2 != null ? __create(__getProtoOf(module2)) : {}, "default", !isNodeMode && module2 && module2.__esModule ? { get: () => module2.default, enumerable: true } : { value: module2, enumerable: true })), module2);
 };
 
-// ../../../../.npm/_npx/7d72304e626f8399/node_modules/tsup/assets/cjs_shims.js
-var importMetaUrlShim = typeof document === "undefined" ? new (require("url")).URL("file:" + __filename).href : document.currentScript && document.currentScript.src || new URL("main.js", document.baseURI).href;
-
 // src/index.ts
-var import_generator_helper = __toModule(require("@prisma/generator-helper"));
+var import_generator_helper = require("@prisma/generator-helper");
 
 // src/generate.ts
-var import_assert6 = __toModule(require("assert"));
-var import_await_event_emitter = __toModule(require("await-event-emitter"));
-var import_lodash10 = __toModule(require("lodash"));
-var import_ts_morph9 = __toModule(require("ts-morph"));
+var import_assert6 = require("assert");
+var import_await_event_emitter = __toESM(require("await-event-emitter"));
+var import_lodash10 = require("lodash");
+var import_ts_morph9 = require("ts-morph");
 
 // src/helpers/pascal-case.ts
-var import_lodash = __toModule(require("lodash"));
+var import_lodash = require("lodash");
 function pascalCase(string) {
   return (0, import_lodash.startCase)((0, import_lodash.camelCase)(string)).replace(/ /g, "");
 }
@@ -194,11 +191,11 @@ function classProperty(property, eventArguments) {
 }
 
 // src/handlers/generate-files.ts
-var import_assert = __toModule(require("assert"));
-var import_ts_morph2 = __toModule(require("ts-morph"));
+var import_assert = require("assert");
+var import_ts_morph2 = require("ts-morph");
 
 // src/helpers/import-declaration-map.ts
-var import_ts_morph = __toModule(require("ts-morph"));
+var import_ts_morph = require("ts-morph");
 var ImportDeclarationMap = class extends Map {
   add(name, value) {
     if (!this.has(name)) {
@@ -341,11 +338,11 @@ async function generateFiles(args) {
 }
 
 // src/handlers/input-type.ts
-var import_assert2 = __toModule(require("assert"));
-var import_json5 = __toModule(require("json5"));
-var import_lodash3 = __toModule(require("lodash"));
-var import_pupa = __toModule(require("pupa"));
-var import_ts_morph4 = __toModule(require("ts-morph"));
+var import_assert2 = require("assert");
+var import_json5 = __toESM(require("json5"));
+var import_lodash3 = require("lodash");
+var import_pupa = __toESM(require("pupa"));
+var import_ts_morph4 = require("ts-morph");
 
 // src/helpers/file-type-by-location.ts
 function fileTypeByLocation(fieldLocation) {
@@ -361,7 +358,7 @@ function fileTypeByLocation(fieldLocation) {
 }
 
 // src/helpers/relative-path.ts
-var import_get_relative_path = __toModule(require("get-relative-path"));
+var import_get_relative_path = __toESM(require("get-relative-path"));
 function relativePath(from, to) {
   if (!from.startsWith("/")) {
     from = `/${from}`;
@@ -417,8 +414,8 @@ function getGraphqlImport(args) {
 }
 
 // src/helpers/get-graphql-input-type.ts
-var import_lodash2 = __toModule(require("lodash"));
-var import_outmatch = __toModule(require("outmatch"));
+var import_lodash2 = require("lodash");
+var import_outmatch = __toESM(require("outmatch"));
 function getGraphqlInputType(inputTypes, pattern) {
   let result;
   inputTypes = inputTypes.filter((t) => !["null", "Null"].includes(String(t.type)));
@@ -496,7 +493,7 @@ function getPropertyType(args) {
 }
 
 // src/helpers/property-structure.ts
-var import_ts_morph3 = __toModule(require("ts-morph"));
+var import_ts_morph3 = require("ts-morph");
 function propertyStructure(args) {
   const {
     isNullable,
@@ -520,7 +517,7 @@ function propertyStructure(args) {
 
 // src/handlers/input-type.ts
 function inputType(args) {
-  var _a, _b;
+  var _a, _b, _c, _d;
   const {
     inputType: inputType2,
     fileType,
@@ -612,7 +609,11 @@ function inputType(args) {
         getSourceFile
       });
       graphqlType = graphqlImport.name;
-      if (graphqlImport.specifier && !importDeclarations.has(graphqlImport.name) && (graphqlImport.name !== inputType2.name && !shouldHideField || shouldHideField && propertyType[0] === graphqlImport.name)) {
+      let referenceName = propertyType[0];
+      if (location === "enumTypes") {
+        referenceName = (0, import_lodash3.last)(referenceName.split(" "));
+      }
+      if (graphqlImport.specifier && !importDeclarations.has(graphqlImport.name) && (graphqlImport.name !== inputType2.name && !shouldHideField || shouldHideField && referenceName === graphqlImport.name)) {
         importDeclarations.set(graphqlImport.name, {
           namedImports: [{ name: graphqlImport.name }],
           moduleSpecifier: graphqlImport.specifier
@@ -635,22 +636,21 @@ function inputType(args) {
       });
       if (isCustomsApplicable) {
         for (const options of settings || []) {
-          if (!options.input || options.kind !== "Decorator") {
-            continue;
+          if ((_c = options.kind === "Decorator" && options.input && ((_b = options.match) == null ? void 0 : _b.call(options, name))) != null ? _c : true) {
+            property.decorators.push({
+              name: options.name,
+              arguments: options.arguments
+            });
+            (0, import_assert2.ok)(options.from, "Missed 'from' part in configuration or field setting");
+            importDeclarations.create(options);
           }
-          property.decorators.push({
-            name: options.name,
-            arguments: options.arguments
-          });
-          (0, import_assert2.ok)(options.from, "Missed 'from' part in configuration or field setting");
-          importDeclarations.create(options);
         }
       }
       for (const decorate of config.decorate) {
         if (decorate.isMatchField(name) && decorate.isMatchType(inputType2.name)) {
           property.decorators.push({
             name: decorate.name,
-            arguments: (_b = decorate.arguments) == null ? void 0 : _b.map((x) => (0, import_pupa.default)(x, { propertyType }))
+            arguments: (_d = decorate.arguments) == null ? void 0 : _d.map((x) => (0, import_pupa.default)(x, { propertyType }))
           });
           importDeclarations.create(decorate);
         }
@@ -668,9 +668,9 @@ function inputType(args) {
 }
 
 // src/helpers/object-settings.ts
-var import_json52 = __toModule(require("json5"));
-var import_lodash4 = __toModule(require("lodash"));
-var import_outmatch2 = __toModule(require("outmatch"));
+var import_json52 = __toESM(require("json5"));
+var import_lodash4 = require("lodash");
+var import_outmatch2 = __toESM(require("outmatch"));
 var ObjectSettings = class extends Array {
   shouldHideField({
     name,
@@ -726,7 +726,7 @@ var ObjectSettings = class extends Array {
   }
 };
 function createObjectSettings(args) {
-  var _a, _b, _c, _d;
+  var _a, _b, _c, _d, _e;
   const { config, text } = args;
   const result = new ObjectSettings();
   const textLines = text.split("\n");
@@ -744,6 +744,7 @@ function createObjectSettings(args) {
       arguments: [],
       input: false,
       output: false,
+      model: false,
       from: ""
     };
     if (name === "TypeGraphQL.omit" || name === "HideField") {
@@ -751,9 +752,6 @@ function createObjectSettings(args) {
     } else if (["FieldType", "PropertyType"].includes(name) && ((_b = match.groups) == null ? void 0 : _b.args)) {
       const options = customType(match.groups.args);
       (0, import_lodash4.merge)(element, options.namespace && config.fields[options.namespace], options, { kind: name });
-    } else if (name === "IsAbstract") {
-      element.kind = "ObjectType";
-      element.arguments = { isAbstract: true };
     } else if (name === "ObjectType" && ((_c = match.groups) == null ? void 0 : _c.args)) {
       element.kind = "ObjectType";
       const options = customType(match.groups.args);
@@ -767,14 +765,22 @@ function createObjectSettings(args) {
         name: options.name,
         isAbstract: options.isAbstract
       };
+    } else if (name === "Directive" && ((_d = match.groups) == null ? void 0 : _d.args)) {
+      const options = customType(match.groups.args);
+      (0, import_lodash4.merge)(element, { model: true, from: "@nestjs/graphql" }, options, {
+        name,
+        namespace: false,
+        kind: "Decorator",
+        arguments: Array.isArray(options.arguments) ? options.arguments.map((s) => import_json52.default.stringify(s)) : options.arguments
+      });
     } else {
       const namespace = getNamespace(name);
       element.namespaceImport = namespace;
       const options = {
         name,
-        arguments: (((_d = match.groups) == null ? void 0 : _d.args) || "").split(",").map((s) => (0, import_lodash4.trim)(s)).filter(Boolean)
+        arguments: (((_e = match.groups) == null ? void 0 : _e.args) || "").split(",").map((s) => (0, import_lodash4.trim)(s)).filter(Boolean)
       };
-      (0, import_lodash4.merge)(element, config.fields[namespace], options);
+      (0, import_lodash4.merge)(element, namespace && config.fields[namespace], options);
     }
     result.push(element);
   }
@@ -844,6 +850,9 @@ function parseArgs(string) {
   }
 }
 function getNamespace(name) {
+  if (name === void 0) {
+    return void 0;
+  }
   let result = String(name);
   if (result.includes(".")) {
     [result] = result.split(".");
@@ -856,9 +865,9 @@ function modelData(model, args) {
   const { config, modelNames, models, modelFields, fieldSettings } = args;
   modelNames.push(model.name);
   models.set(model.name, model);
-  const modelFieldsValue = new Map();
+  const modelFieldsValue = /* @__PURE__ */ new Map();
   modelFields.set(model.name, modelFieldsValue);
-  const fieldSettingsValue = new Map();
+  const fieldSettingsValue = /* @__PURE__ */ new Map();
   fieldSettings.set(model.name, fieldSettingsValue);
   for (const field of model.fields) {
     if (field.documentation) {
@@ -874,11 +883,11 @@ function modelData(model, args) {
 }
 
 // src/handlers/model-output-type.ts
-var import_assert3 = __toModule(require("assert"));
-var import_json53 = __toModule(require("json5"));
-var import_lodash5 = __toModule(require("lodash"));
-var import_pupa2 = __toModule(require("pupa"));
-var import_ts_morph5 = __toModule(require("ts-morph"));
+var import_assert3 = require("assert");
+var import_json53 = __toESM(require("json5"));
+var import_lodash5 = require("lodash");
+var import_pupa2 = __toESM(require("pupa"));
+var import_ts_morph5 = require("ts-morph");
 
 // src/helpers/get-output-type-name.ts
 function getOutputTypeName(name) {
@@ -888,7 +897,7 @@ function getOutputTypeName(name) {
 // src/handlers/model-output-type.ts
 var nestjsGraphql = "@nestjs/graphql";
 function modelOutputType(outputType2, args) {
-  var _a, _b, _c, _d, _e;
+  var _a, _b, _c, _d, _e, _f;
   const { getSourceFile, models, config, modelFields, fieldSettings, eventEmitter } = args;
   const model = models.get(outputType2.name);
   (0, import_assert3.ok)(model, `Cannot find model by name ${outputType2.name}`);
@@ -912,8 +921,10 @@ function modelOutputType(outputType2, args) {
     properties: []
   };
   sourceFileStructure.statements.push(classStructure);
-  const decorator = (_a = classStructure.decorators) == null ? void 0 : _a.find((d) => d.name === "ObjectType");
+  (0, import_assert3.ok)(classStructure.decorators, "classStructure.decorators is undefined");
+  const decorator = classStructure.decorators.find((d) => d.name === "ObjectType");
   (0, import_assert3.ok)(decorator, "ObjectType decorator not found");
+  let modelSettings;
   if (model.documentation) {
     const objectTypeOptions = {};
     const { documentation, settings } = createObjectSettings({
@@ -928,6 +939,7 @@ function modelOutputType(outputType2, args) {
       objectTypeOptions.description = documentation;
     }
     decorator.arguments = settings.getObjectTypeArguments(objectTypeOptions);
+    modelSettings = settings;
   }
   importDeclarations.add("Field", nestjsGraphql);
   importDeclarations.add("ObjectType", nestjsGraphql);
@@ -939,8 +951,8 @@ function modelOutputType(outputType2, args) {
       fileType = "output";
       outputTypeName = getOutputTypeName(outputTypeName);
     }
-    const modelField = (_b = modelFields.get(model.name)) == null ? void 0 : _b.get(field.name);
-    const settings = (_c = fieldSettings.get(model.name)) == null ? void 0 : _c.get(field.name);
+    const modelField = (_a = modelFields.get(model.name)) == null ? void 0 : _a.get(field.name);
+    const settings = (_b = fieldSettings.get(model.name)) == null ? void 0 : _b.get(field.name);
     const fieldType = settings == null ? void 0 : settings.getFieldType({
       name: outputType2.name,
       output: true
@@ -988,7 +1000,7 @@ function modelOutputType(outputType2, args) {
       property.leadingTrivia += `/** ${modelField.documentation} */
 `;
     }
-    (_d = classStructure.properties) == null ? void 0 : _d.push(property);
+    (_c = classStructure.properties) == null ? void 0 : _c.push(property);
     if (propertySettings) {
       importDeclarations.create(__spreadValues({}, propertySettings));
     }
@@ -1008,22 +1020,21 @@ function modelOutputType(outputType2, args) {
           })
         ]
       });
-      for (const options of settings || []) {
-        if (!options.output || options.kind !== "Decorator") {
-          continue;
+      for (const setting of settings || []) {
+        if (shouldBeDecorated(setting) && ((_e = (_d = setting.match) == null ? void 0 : _d.call(setting, field.name)) != null ? _e : true)) {
+          property.decorators.push({
+            name: setting.name,
+            arguments: setting.arguments
+          });
+          (0, import_assert3.ok)(setting.from, "Missed 'from' part in configuration or field setting");
+          importDeclarations.create(setting);
         }
-        property.decorators.push({
-          name: options.name,
-          arguments: options.arguments
-        });
-        (0, import_assert3.ok)(options.from, "Missed 'from' part in configuration or field setting");
-        importDeclarations.create(options);
       }
       for (const decorate of config.decorate) {
         if (decorate.isMatchField(field.name) && decorate.isMatchType(outputTypeName)) {
           property.decorators.push({
             name: decorate.name,
-            arguments: (_e = decorate.arguments) == null ? void 0 : _e.map((x) => (0, import_pupa2.default)(x, { propertyType }))
+            arguments: (_f = decorate.arguments) == null ? void 0 : _f.map((x) => (0, import_pupa2.default)(x, { propertyType }))
           });
           importDeclarations.create(decorate);
         }
@@ -1035,6 +1046,15 @@ function modelOutputType(outputType2, args) {
       propertyType
     });
   }
+  for (const setting of modelSettings || []) {
+    if (shouldBeDecorated(setting)) {
+      classStructure.decorators.push({
+        name: setting.name,
+        arguments: setting.arguments
+      });
+      importDeclarations.create(setting);
+    }
+  }
   if (exportDeclaration) {
     sourceFile.set({
       statements: [exportDeclaration, "\n", classStructure]
@@ -1049,6 +1069,9 @@ function modelOutputType(outputType2, args) {
     });
   }
 }
+function shouldBeDecorated(setting) {
+  return setting.kind === "Decorator" && (setting.output || setting.model) && !(setting.output && setting.model);
+}
 function getExportDeclaration(name, statements) {
   return statements.find((structure) => {
     return structure.kind === import_ts_morph5.StructureKind.ExportDeclaration && structure.namedExports.some((o) => (o.alias || o.name) === name);
@@ -1086,13 +1109,13 @@ function isAtomicOperation(name) {
 }
 
 // src/handlers/output-type.ts
-var import_assert4 = __toModule(require("assert"));
-var import_json54 = __toModule(require("json5"));
-var import_lodash6 = __toModule(require("lodash"));
-var import_ts_morph6 = __toModule(require("ts-morph"));
+var import_assert4 = require("assert");
+var import_json54 = __toESM(require("json5"));
+var import_lodash6 = require("lodash");
+var import_ts_morph6 = require("ts-morph");
 var nestjsGraphql2 = "@nestjs/graphql";
 function outputType(outputType2, args) {
-  var _a, _b, _c;
+  var _a, _b, _c, _d, _e;
   const { getSourceFile, models, eventEmitter, fieldSettings, getModelName: getModelName2 } = args;
   const importDeclarations = new ImportDeclarationMap();
   const fileType = "output";
@@ -1139,6 +1162,7 @@ function outputType(outputType2, args) {
     const property = propertyStructure({
       name: field.name,
       isNullable: field.isNullable,
+      hasQuestionToken: isCountOutput ? true : void 0,
       propertyType,
       isList
     });
@@ -1168,7 +1192,11 @@ function outputType(outputType2, args) {
         getSourceFile
       });
       graphqlType = graphqlImport.name;
-      if (graphqlImport.specifier && !importDeclarations.has(graphqlImport.name) && (graphqlImport.name !== outputType2.name && !shouldHideField || shouldHideField && propertyType[0] === graphqlImport.name)) {
+      let referenceName = propertyType[0];
+      if (location === "enumTypes") {
+        referenceName = (0, import_lodash6.last)(referenceName.split(" "));
+      }
+      if (graphqlImport.specifier && !importDeclarations.has(graphqlImport.name) && (graphqlImport.name !== outputType2.name && !shouldHideField || shouldHideField && referenceName === graphqlImport.name)) {
         importDeclarations.set(graphqlImport.name, {
           namedImports: [{ name: graphqlImport.name }],
           moduleSpecifier: graphqlImport.specifier
@@ -1191,15 +1219,14 @@ function outputType(outputType2, args) {
       });
       if (isCustomsApplicable) {
         for (const options of settings || []) {
-          if (!options.output || options.kind !== "Decorator") {
-            continue;
+          if ((_e = options.kind === "Decorator" && options.output && ((_d = options.match) == null ? void 0 : _d.call(options, field.name))) != null ? _e : true) {
+            property.decorators.push({
+              name: options.name,
+              arguments: options.arguments
+            });
+            (0, import_assert4.ok)(options.from, "Missed 'from' part in configuration or field setting");
+            importDeclarations.create(options);
           }
-          property.decorators.push({
-            name: options.name,
-            arguments: options.arguments
-          });
-          (0, import_assert4.ok)(options.from, "Missed 'from' part in configuration or field setting");
-          importDeclarations.create(options);
         }
       }
     }
@@ -1215,7 +1242,7 @@ function outputType(outputType2, args) {
 }
 
 // src/handlers/purge-output.ts
-var import_fs = __toModule(require("fs"));
+var import_fs = require("fs");
 function purgeOutput(emitter) {
   emitter.on("Begin", begin);
   emitter.on("End", end);
@@ -1241,21 +1268,21 @@ async function end({ project, output }) {
 }
 
 // src/handlers/re-export.ts
-var import_ts_morph7 = __toModule(require("ts-morph"));
-var ReExport;
-(function(ReExport2) {
+var import_ts_morph7 = require("ts-morph");
+var ReExport = /* @__PURE__ */ ((ReExport2) => {
   ReExport2["None"] = "None";
   ReExport2["Directories"] = "Directories";
   ReExport2["Single"] = "Single";
   ReExport2["All"] = "All";
-})(ReExport || (ReExport = {}));
+  return ReExport2;
+})(ReExport || {});
 function reExport(emitter) {
   emitter.on("BeforeGenerateFiles", beforeGenerateFiles3);
 }
 function beforeGenerateFiles3(args) {
   const { project, output, config } = args;
   const rootDirectory = project.getDirectoryOrThrow(output);
-  if ([ReExport.Directories, ReExport.All].includes(config.reExport)) {
+  if (["Directories" /* Directories */, "All" /* All */].includes(config.reExport)) {
     for (const directory of rootDirectory.getDirectories()) {
       const exportDeclarations = directory.getSourceFiles().filter((sourceFile) => {
         return sourceFile.getBaseName() !== "index.ts";
@@ -1267,7 +1294,7 @@ function beforeGenerateFiles3(args) {
       });
     }
   }
-  if (config.reExport === ReExport.Single) {
+  if (config.reExport === "Single" /* Single */) {
     const exportDeclarations = project.getSourceFiles().filter((sourceFile) => {
       return sourceFile.getBaseName() !== "index.ts";
     }).map((sourceFile) => getExportDeclaration2(rootDirectory, sourceFile));
@@ -1277,7 +1304,7 @@ function beforeGenerateFiles3(args) {
       overwrite: true
     });
   }
-  if (config.reExport === ReExport.All) {
+  if (config.reExport === "All" /* All */) {
     const exportDeclarations = [];
     for (const directory of rootDirectory.getDirectories()) {
       const sourceFile = directory.getSourceFileOrThrow("index.ts");
@@ -1299,7 +1326,7 @@ function getExportDeclaration2(directory, sourceFile) {
 }
 
 // src/handlers/register-enum.ts
-var import_ts_morph8 = __toModule(require("ts-morph"));
+var import_ts_morph8 = require("ts-morph");
 function registerEnum(enumType, args) {
   const { getSourceFile, enums } = args;
   const dataModelEnum = enums[enumType.name];
@@ -1360,12 +1387,12 @@ function warning(message) {
 }
 
 // src/helpers/create-config.ts
-var import_assert5 = __toModule(require("assert"));
-var import_filenamify = __toModule(require("filenamify"));
-var import_flat = __toModule(require("flat"));
-var import_json55 = __toModule(require("json5"));
-var import_lodash7 = __toModule(require("lodash"));
-var import_outmatch3 = __toModule(require("outmatch"));
+var import_assert5 = require("assert");
+var import_filenamify = __toESM(require("filenamify"));
+var import_flat = require("flat");
+var import_json55 = __toESM(require("json5"));
+var import_lodash7 = require("lodash");
+var import_outmatch3 = __toESM(require("outmatch"));
 function createConfig(data) {
   var _a;
   const config = (0, import_lodash7.merge)({}, (0, import_flat.unflatten)(data, { delimiter: "_" }));
@@ -1389,6 +1416,7 @@ function createConfig(data) {
       arguments: [],
       output: toBoolean(value.output),
       input: toBoolean(value.input),
+      model: toBoolean(value.model),
       from: value.from,
       defaultImport: toBoolean(value.defaultImport) ? true : value.defaultImport,
       namespaceImport: value.namespaceImport
@@ -1417,7 +1445,7 @@ function createConfig(data) {
     tsConfigFilePath: void 0,
     combineScalarFilters: toBoolean(config.combineScalarFilters),
     noAtomicOperations: toBoolean(config.noAtomicOperations),
-    reExport: ReExport[String(config.reExport)] || ReExport.None,
+    reExport: ReExport[String(config.reExport)] || "None" /* None */,
     emitSingle: toBoolean(config.emitSingle),
     emitCompiled: toBoolean(config.emitCompiled),
     $warnings,
@@ -1455,9 +1483,9 @@ function toBoolean(value) {
 }
 
 // src/helpers/generate-file-name.ts
-var import_lodash8 = __toModule(require("lodash"));
-var import_pluralize = __toModule(require("pluralize"));
-var import_pupa3 = __toModule(require("pupa"));
+var import_lodash8 = require("lodash");
+var import_pluralize = __toESM(require("pluralize"));
+var import_pupa3 = __toESM(require("pupa"));
 function generateFileName(args) {
   const { template, type, name, getModelName: getModelName2 } = args;
   return (0, import_pupa3.default)(template, {
@@ -1501,7 +1529,7 @@ function factoryGetSourceFile(args) {
 }
 
 // src/helpers/get-model-name.ts
-var import_lodash9 = __toModule(require("lodash"));
+var import_lodash9 = require("lodash");
 function createGetModelName(modelNames) {
   return (0, import_lodash9.memoize)(tryGetName);
   function tryGetName(name) {
@@ -1652,14 +1680,14 @@ async function generate(args) {
   }
   config.combineScalarFilters && combineScalarFilters(eventEmitter);
   config.noAtomicOperations && noAtomicOperations(eventEmitter);
-  config.reExport !== ReExport.None && reExport(eventEmitter);
+  config.reExport !== "None" /* None */ && reExport(eventEmitter);
   config.emitSingle && emitSingle(eventEmitter);
   config.purgeOutput && purgeOutput(eventEmitter);
   config.requireSingleFieldsInWhereUniqueInput && requireSingleFieldsInWhereUniqueInput(eventEmitter);
-  const models = new Map();
+  const models = /* @__PURE__ */ new Map();
   const modelNames = [];
-  const modelFields = new Map();
-  const fieldSettings = new Map();
+  const modelFields = /* @__PURE__ */ new Map();
+  const fieldSettings = /* @__PURE__ */ new Map();
   const getModelName2 = createGetModelName(modelNames);
   const getSourceFile = factoryGetSourceFile({
     output: generatorOutputValue,
@@ -1672,7 +1700,7 @@ async function generate(args) {
     datamodel,
     schema: { inputObjectTypes, outputObjectTypes, enumTypes }
   } = JSON.parse(JSON.stringify(dmmf));
-  const removeTypes = new Set();
+  const removeTypes = /* @__PURE__ */ new Set();
   const eventArguments = {
     models,
     config,
@@ -1683,7 +1711,7 @@ async function generate(args) {
     output: generatorOutputValue,
     getSourceFile,
     eventEmitter,
-    typeNames: new Set(),
+    typeNames: /* @__PURE__ */ new Set(),
     enums: (0, import_lodash10.mapKeys)(datamodel.enums, (x) => x.name),
     getModelName: getModelName2,
     removeTypes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prisma-nestjs-graphql",
-  "version": "14.4.1",
+  "version": "14.6.2",
   "license": "MIT",
   "description": "Generate object types, inputs, args, etc. from prisma schema file for usage with @nestjs/graphql module",
   "main": "index.js",
@@ -47,12 +47,11 @@
     },
     "ghooks": {
       "pre-commit": "precise-commits",
-      "commit-msg": "sh Taskfile commit_lint",
-      "pre-push": "ultra test"
+      "commit-msg": "sh Taskfile commit_lint"
     }
   },
   "dependencies": {
-    "@prisma/generator-helper": "^3.2.0",
+    "@prisma/generator-helper": "^3.9.2",
     "await-event-emitter": "^2.0.2",
     "filenamify": "4.X",
     "flat": "^5.0.2",
@@ -65,65 +64,63 @@
     "ts-morph": ">=11"
   },
   "devDependencies": {
-    "@commitlint/cli": "^13.2.0",
-    "@commitlint/config-conventional": "^13.2.0",
-    "@nestjs/common": "^8.0.10",
-    "@nestjs/core": "^8.0.10",
-    "@nestjs/graphql": "^9.0.5",
-    "@nestjs/platform-express": "^8.0.10",
-    "@paljs/plugins": "^4.0.8",
-    "@prisma/client": "^3.2.0",
-    "@semantic-release/changelog": "^6.0.0",
-    "@semantic-release/git": "^10.0.0",
+    "@commitlint/cli": "^16.2.1",
+    "@commitlint/config-conventional": "^16.2.1",
+    "@nestjs/common": "^8.3.1",
+    "@nestjs/core": "^8.3.1",
+    "@nestjs/graphql": "^10.0.4",
+    "@nestjs/platform-express": "^8.3.1",
+    "@paljs/plugins": "^4.0.13",
+    "@prisma/client": "^3.9.2",
+    "@semantic-release/changelog": "^6.0.1",
+    "@semantic-release/git": "^10.0.1",
     "@types/flat": "^5.0.2",
-    "@types/lodash": "^4.14.175",
-    "@types/mocha": "^9.0.0",
-    "@types/node": "^16.10.2",
+    "@types/lodash": "^4.14.178",
+    "@types/mocha": "^9.1.0",
+    "@types/node": "^17.0.18",
     "@types/pluralize": "^0.0.29",
-    "@typescript-eslint/eslint-plugin": "^4.33.0",
-    "@typescript-eslint/parser": "^4.33.0",
-    "apollo-server-express": "^3.3.0",
-    "c8": "^7.9.0",
-    "class-transformer": "^0.4.0",
-    "class-validator": "^0.13.1",
+    "@typescript-eslint/eslint-plugin": "^5.12.0",
+    "@typescript-eslint/parser": "^5.12.0",
+    "apollo-server-express": "^3.6.3",
+    "c8": "^7.11.0",
+    "class-transformer": "^0.5.1",
+    "class-validator": "^0.13.2",
     "commitizen": "^4.2.4",
     "cz-customizable": "^6.3.0",
     "decimal.js": "^10.3.1",
-    "eslint": "^7.32.0",
+    "eslint": "^8.9.0",
     "eslint-import-resolver-node": "^0.3.6",
-    "eslint-plugin-etc": "^1.5.4",
-    "eslint-plugin-import": "^2.24.2",
+    "eslint-plugin-etc": "^2.0.2",
+    "eslint-plugin-import": "^2.25.4",
     "eslint-plugin-only-warn": "^1.0.3",
     "eslint-plugin-prettier": "^4.0.0",
-    "eslint-plugin-promise": "^5.1.0",
-    "eslint-plugin-regexp": "^1.3.1",
+    "eslint-plugin-regexp": "^1.5.1",
     "eslint-plugin-simple-import-sort": "^7.0.0",
-    "eslint-plugin-sonarjs": "^0.10.0",
-    "eslint-plugin-sort-class-members": "^1.11.0",
-    "eslint-plugin-total-functions": "^4.10.1",
-    "eslint-plugin-unicorn": "^36.0.0",
+    "eslint-plugin-sort-class-members": "^1.14.1",
+    "eslint-plugin-unicorn": "^41.0.0",
     "eslint-plugin-wix-editor": "^3.3.0",
-    "expect": "^27.2.4",
+    "expect": "^27.5.1",
     "ghooks": "^2.0.4",
     "git-branch-is": "^4.0.0",
-    "graphql": "^15.6.1",
-    "graphql-scalars": "^1.11.0",
+    "graphql": "^16.3.0",
+    "graphql-scalars": "^1.14.1",
     "graphql-type-json": "^0.3.2",
-    "mocha": "^9.1.2",
+    "mocha": "^9.2.1",
     "ololog": "^1.1.175",
     "precise-commits": "^1.0.2",
-    "prettier": "^2.4.1",
-    "prisma": "^3.2.0",
-    "prisma-graphql-type-decimal": "^1.0.0",
+    "prettier": "^2.5.1",
+    "prisma": "^3.9.2",
+    "prisma-graphql-type-decimal": "^2.0.0",
     "reflect-metadata": "^0.1.13",
-    "rxjs": "^7.3.1",
-    "semantic-release": "^18.0.0",
+    "request": "^2.88.2",
+    "rxjs": "^7.5.4",
+    "semantic-release": "^19.0.2",
     "simplytyped": "^3.3.0",
     "temp-dir": "^2.0.0",
-    "ts-node": "^10.2.1",
+    "ts-node": "^10.5.0",
     "ts-node-dev": "^1.1.8",
     "tslib": "^2.3.1",
-    "typescript": "^4.4.3",
+    "typescript": "^4.5.5",
     "watchexec-bin": "^1.0.0"
   }
 }