prisma-nestjs-graphql 14.5.0 → 14.6.0

package/README.md

@@ -571,6 +571,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.

package/index.js

@@ -520,7 +520,7 @@ function propertyStructure(args) {
 
 // src/handlers/input-type.ts
 function inputType(args) {
-  var _a, _b;
+  var _a, _b, _c, _d;
   const {
     inputType: inputType2,
     fileType,
@@ -635,22 +635,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);
         }
@@ -726,7 +725,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");
@@ -765,14 +764,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);
   }
@@ -842,6 +849,9 @@ function parseArgs(string) {
   }
 }
 function getNamespace(name) {
+  if (name === void 0) {
+    return void 0;
+  }
   let result = String(name);
   if (result.includes(".")) {
     [result] = result.split(".");
@@ -886,7 +896,7 @@ function getOutputTypeName(name) {
 // src/handlers/model-output-type.ts
 var nestjsGraphql = "@nestjs/graphql";
 function modelOutputType(outputType2, args) {
-  var _a, _b, _c, _d;
+  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}`);
@@ -1010,21 +1020,20 @@ function modelOutputType(outputType2, args) {
         ]
       });
       for (const setting of settings || []) {
-        if (!shouldBeDecorated(setting)) {
-          continue;
+        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: setting.name,
-          arguments: setting.arguments
-        });
-        (0, import_assert3.ok)(setting.from, "Missed 'from' part in configuration or field setting");
-        importDeclarations.create(setting);
       }
       for (const decorate of config.decorate) {
         if (decorate.isMatchField(field.name) && decorate.isMatchType(outputTypeName)) {
           property.decorators.push({
             name: decorate.name,
-            arguments: (_d = decorate.arguments) == null ? void 0 : _d.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);
         }
@@ -1037,14 +1046,13 @@ function modelOutputType(outputType2, args) {
     });
   }
   for (const setting of modelSettings || []) {
-    if (!shouldBeDecorated(setting)) {
-      continue;
+    if (shouldBeDecorated(setting)) {
+      classStructure.decorators.push({
+        name: setting.name,
+        arguments: setting.arguments
+      });
+      importDeclarations.create(setting);
     }
-    classStructure.decorators.push({
-      name: setting.name,
-      arguments: setting.arguments
-    });
-    importDeclarations.create(setting);
   }
   if (exportDeclaration) {
     sourceFile.set({
@@ -1106,7 +1114,7 @@ var import_lodash6 = __toModule(require("lodash"));
 var import_ts_morph6 = __toModule(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";
@@ -1205,15 +1213,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);
         }
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prisma-nestjs-graphql",
-  "version": "14.5.0",
+  "version": "14.6.0",
   "license": "MIT",
   "description": "Generate object types, inputs, args, etc. from prisma schema file for usage with @nestjs/graphql module",
   "main": "index.js",
@@ -67,10 +67,10 @@
   "devDependencies": {
     "@commitlint/cli": "^13.2.1",
     "@commitlint/config-conventional": "^13.2.0",
-    "@nestjs/common": "^8.0.11",
-    "@nestjs/core": "^8.0.11",
+    "@nestjs/common": "^8.1.1",
+    "@nestjs/core": "^8.1.1",
     "@nestjs/graphql": "^9.0.6",
-    "@nestjs/platform-express": "^8.0.11",
+    "@nestjs/platform-express": "^8.1.1",
     "@paljs/plugins": "^4.0.8",
     "@prisma/client": "^3.2.1",
     "@semantic-release/changelog": "^6.0.0",
@@ -78,12 +78,12 @@
     "@types/flat": "^5.0.2",
     "@types/lodash": "^4.14.175",
     "@types/mocha": "^9.0.0",
-    "@types/node": "^16.10.4",
+    "@types/node": "^16.11.0",
     "@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",
+    "apollo-server-express": "^3.4.0",
+    "c8": "^7.10.0",
     "class-transformer": "^0.4.0",
     "class-validator": "^0.13.1",
     "commitizen": "^4.2.4",
@@ -92,7 +92,7 @@
     "eslint": "^7.32.0",
     "eslint-import-resolver-node": "^0.3.6",
     "eslint-plugin-etc": "^1.5.4",
-    "eslint-plugin-import": "^2.25.1",
+    "eslint-plugin-import": "^2.25.2",
     "eslint-plugin-only-warn": "^1.0.3",
     "eslint-plugin-prettier": "^4.0.0",
     "eslint-plugin-promise": "^5.1.0",
@@ -107,9 +107,9 @@
     "ghooks": "^2.0.4",
     "git-branch-is": "^4.0.0",
     "graphql": "^15.6.1",
-    "graphql-scalars": "^1.11.1",
+    "graphql-scalars": "^1.12.0",
     "graphql-type-json": "^0.3.2",
-    "mocha": "^9.1.2",
+    "mocha": "^9.1.3",
     "ololog": "^1.1.175",
     "precise-commits": "^1.0.2",
     "prettier": "^2.4.1",