prisma-nestjs-graphql 15.2.0 → 15.2.3

package/README.md

@@ -66,9 +66,9 @@ Possible tokens:
 
 #### `tsConfigFilePath`
 
-Path to `tsconfig.json`  
+Path to `tsconfig.json` (absolute path or relative to current working directory)  
 Type: `string | undefined`  
-Default: `undefined`
+Default: `tsconfig.json` if exists, `undefined` otherwise
 
 #### `combineScalarFilters`
 
@@ -659,7 +659,7 @@ export class User {}
 ## Resources
 
 -   Todo - https://github.com/unlight/prisma-nestjs-graphql/issues/2
--   https://github.com/prisma/prisma/blob/master/src/packages/client/src/generation/TSClient/TSClient.ts
+-   https://github.com/prisma/prisma/blob/main/packages/client/src/generation/TSClient/TSClient.ts
 -   https://ts-ast-viewer.com/
 -   https://github.com/unlight/nestjs-graphql-prisma-realworld-example-app
 -   https://www.prisma.io/docs/reference/tools-and-interfaces/prisma-schema/data-model

package/index.js

@@ -29,6 +29,7 @@ var import_lodash = require("lodash");
 function pascalCase(string) {
   return (0, import_lodash.startCase)((0, import_lodash.camelCase)(string)).replace(/ /g, "");
 }
+__name(pascalCase, "pascalCase");
 
 // src/handlers/args-type.ts
 function argsType(field, args) {
@@ -101,18 +102,21 @@ function argsType(field, args) {
     classDecoratorName: "ArgsType"
   });
 }
+__name(argsType, "argsType");
 
 // src/handlers/combine-scalar-filters.ts
 function combineScalarFilters(eventEmitter) {
   eventEmitter.on("BeforeInputType", beforeInputType);
   eventEmitter.on("BeforeGenerateField", beforeGenerateField);
 }
+__name(combineScalarFilters, "combineScalarFilters");
 function beforeInputType(args) {
   const { inputType: inputType2 } = args;
   if (isContainBogus(inputType2.name) && isScalarFilter(inputType2)) {
     inputType2.name = replaceBogus(String(inputType2.name));
   }
 }
+__name(beforeInputType, "beforeInputType");
 function beforeGenerateField(field) {
   for (const fieldInput of field.inputTypes) {
     if (fieldInput.location !== "inputObjectTypes") {
@@ -124,12 +128,15 @@ function beforeGenerateField(field) {
     }
   }
 }
+__name(beforeGenerateField, "beforeGenerateField");
 function replaceBogus(name) {
   return name.replace(/(Nullable|Nested)/g, "");
 }
+__name(replaceBogus, "replaceBogus");
 function isContainBogus(name) {
   return name.startsWith("Nested") || name.includes("Nullable") && name.endsWith("Filter") || name.endsWith("NullableFilter");
 }
+__name(isContainBogus, "isContainBogus");
 function isScalarFilter(inputType2) {
   if (!inputType2.name.endsWith("Filter")) {
     return false;
@@ -146,6 +153,7 @@ function isScalarFilter(inputType2) {
   }
   return result;
 }
+__name(isScalarFilter, "isScalarFilter");
 
 // src/handlers/create-aggregate-input.ts
 function createAggregateInput(args) {
@@ -180,11 +188,13 @@ function createAggregateInput(args) {
     classDecoratorName: "InputType"
   });
 }
+__name(createAggregateInput, "createAggregateInput");
 
 // src/handlers/emit-single.ts
 function emitSingle(emitter) {
   emitter.on("ClassProperty", classProperty);
 }
+__name(emitSingle, "emitSingle");
 function classProperty(property, eventArguments) {
   const { location, isList, propertyType } = eventArguments;
   if ([
@@ -198,6 +208,7 @@ function classProperty(property, eventArguments) {
     }
   }
 }
+__name(classProperty, "classProperty");
 
 // src/handlers/generate-files.ts
 var import_assert = require("assert");
@@ -262,6 +273,7 @@ var ImportDeclarationMap = class extends Map {
     }
   }
 };
+__name(ImportDeclarationMap, "ImportDeclarationMap");
 
 // src/handlers/generate-files.ts
 async function generateFiles(args) {
@@ -364,6 +376,7 @@ async function generateFiles(args) {
     await project.save();
   }
 }
+__name(generateFiles, "generateFiles");
 
 // src/handlers/input-type.ts
 var import_assert2 = require("assert");
@@ -384,6 +397,7 @@ function fileTypeByLocation(fieldLocation) {
   }
   return "object";
 }
+__name(fileTypeByLocation, "fileTypeByLocation");
 
 // src/helpers/relative-path.ts
 var import_get_relative_path = __toESM(require("get-relative-path"));
@@ -403,6 +417,7 @@ function relativePath(from, to) {
   }
   return result;
 }
+__name(relativePath, "relativePath");
 
 // src/helpers/get-graphql-import.ts
 function getGraphqlImport(args) {
@@ -468,6 +483,7 @@ function getGraphqlImport(args) {
     specifier
   };
 }
+__name(getGraphqlImport, "getGraphqlImport");
 
 // src/helpers/get-graphql-input-type.ts
 var import_lodash2 = require("lodash");
@@ -517,6 +533,7 @@ function getGraphqlInputType(inputTypes, pattern) {
   }
   throw new TypeError(`Cannot get matching input type from ${inputTypes.map((x) => x.type).join(", ") || "zero length inputTypes"}`);
 }
+__name(getGraphqlInputType, "getGraphqlInputType");
 
 // src/helpers/get-property-type.ts
 function getPropertyType(args) {
@@ -584,6 +601,7 @@ function getPropertyType(args) {
     "unknown"
   ];
 }
+__name(getPropertyType, "getPropertyType");
 
 // src/helpers/property-structure.ts
 var import_ts_morph3 = require("ts-morph");
@@ -600,6 +618,7 @@ function propertyStructure(args) {
     leadingTrivia: "\n"
   };
 }
+__name(propertyStructure, "propertyStructure");
 
 // src/handlers/input-type.ts
 function inputType(args) {
@@ -647,6 +666,9 @@ function inputType(args) {
     field.inputTypes = field.inputTypes.filter((t) => !removeTypes.has(String(t.type)));
     eventEmitter.emitSync("BeforeGenerateField", field, args);
     const { inputTypes, isRequired, name } = field;
+    if (inputTypes.length === 0) {
+      continue;
+    }
     const usePattern = (useInputType == null ? void 0 : useInputType.ALL) || (useInputType == null ? void 0 : useInputType[name]);
     const graphqlInputType = getGraphqlInputType(inputTypes, usePattern);
     const { isList, location, type } = graphqlInputType;
@@ -767,6 +789,7 @@ function inputType(args) {
     ]
   });
 }
+__name(inputType, "inputType");
 
 // src/helpers/object-settings.ts
 var import_json52 = __toESM(require("json5"));
@@ -826,6 +849,7 @@ var ObjectSettings = class extends Array {
     return resultArguments.map((x) => import_json52.default.stringify(x));
   }
 };
+__name(ObjectSettings, "ObjectSettings");
 function createObjectSettings(args) {
   var _a, _b, _c, _d, _e;
   const { config, text } = args;
@@ -898,6 +922,7 @@ function createObjectSettings(args) {
     documentation: documentationLines.filter(Boolean).join("\\n") || void 0
   };
 }
+__name(createObjectSettings, "createObjectSettings");
 function customType(args) {
   var _a;
   const result = {};
@@ -920,6 +945,7 @@ function customType(args) {
   }
   return result;
 }
+__name(customType, "customType");
 function hideFieldDecorator(match) {
   var _a;
   const result = {
@@ -953,6 +979,7 @@ function hideFieldDecorator(match) {
   }
   return result;
 }
+__name(hideFieldDecorator, "hideFieldDecorator");
 function parseArgs(string) {
   try {
     return import_json52.default.parse(string);
@@ -964,6 +991,7 @@ function parseArgs(string) {
     }
   }
 }
+__name(parseArgs, "parseArgs");
 function getNamespace(name) {
   if (name === void 0) {
     return void 0;
@@ -974,6 +1002,7 @@ function getNamespace(name) {
   }
   return result;
 }
+__name(getNamespace, "getNamespace");
 
 // src/handlers/model-data.ts
 function modelData(model, args) {
@@ -996,6 +1025,7 @@ function modelData(model, args) {
     modelFieldsValue.set(field.name, field);
   }
 }
+__name(modelData, "modelData");
 
 // src/handlers/model-output-type.ts
 var import_assert3 = require("assert");
@@ -1008,6 +1038,7 @@ var import_ts_morph5 = require("ts-morph");
 function getOutputTypeName(name) {
   return name.replace(/(?:OutputType|Output)$/, "");
 }
+__name(getOutputTypeName, "getOutputTypeName");
 
 // src/handlers/model-output-type.ts
 var nestjsGraphql = "@nestjs/graphql";
@@ -1213,20 +1244,24 @@ function modelOutputType(outputType2, args) {
     });
   }
 }
+__name(modelOutputType, "modelOutputType");
 function shouldBeDecorated(setting) {
   return setting.kind === "Decorator" && (setting.output || setting.model) && !(setting.output && setting.model);
 }
+__name(shouldBeDecorated, "shouldBeDecorated");
 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);
   });
 }
+__name(getExportDeclaration, "getExportDeclaration");
 
 // src/handlers/no-atomic-operations.ts
 function noAtomicOperations(eventEmitter) {
   eventEmitter.on("BeforeInputType", beforeInputType2);
   eventEmitter.on("BeforeGenerateFiles", beforeGenerateFiles);
 }
+__name(noAtomicOperations, "noAtomicOperations");
 function beforeInputType2(args) {
   const { inputType: inputType1 } = args;
   for (const field of inputType1.fields) {
@@ -1249,9 +1284,11 @@ function beforeGenerateFiles(args) {
     }
   }
 }
+__name(beforeGenerateFiles, "beforeGenerateFiles");
 function isAtomicOperation(name) {
   return name.endsWith("FieldUpdateOperationsInput");
 }
+__name(isAtomicOperation, "isAtomicOperation");
 
 // src/handlers/output-type.ts
 var import_assert4 = require("assert");
@@ -1405,6 +1442,7 @@ function outputType(outputType1, args) {
     ]
   });
 }
+__name(outputType, "outputType");
 
 // src/handlers/purge-output.ts
 var import_fs = require("fs");
@@ -1412,6 +1450,7 @@ function purgeOutput(emitter) {
   emitter.on("Begin", begin);
   emitter.on("End", end);
 }
+__name(purgeOutput, "purgeOutput");
 function begin({ project, output }) {
   var _a;
   const sourceFiles = (_a = project.getDirectory(output)) == null ? void 0 : _a.getDescendantSourceFiles();
@@ -1421,6 +1460,7 @@ function begin({ project, output }) {
     }
   }
 }
+__name(begin, "begin");
 async function end({ project, output }) {
   var _a;
   const directories = (_a = project.getDirectory(output)) == null ? void 0 : _a.getDescendantDirectories().filter((directory) => directory.getSourceFiles().length === 0).map((directory) => directory.getPath());
@@ -1431,6 +1471,7 @@ async function end({ project, output }) {
     }
   }
 }
+__name(end, "end");
 
 // src/handlers/re-export.ts
 var import_ts_morph7 = require("ts-morph");
@@ -1444,6 +1485,7 @@ var ReExport;
 function reExport(emitter) {
   emitter.on("BeforeGenerateFiles", beforeGenerateFiles2);
 }
+__name(reExport, "reExport");
 function beforeGenerateFiles2(args) {
   const { project, output, config } = args;
   const rootDirectory = project.getDirectoryOrThrow(output);
@@ -1514,6 +1556,7 @@ function getNamespaceExportDeclaration(directory, sourceDirectory) {
     moduleSpecifier: directory.getRelativePathAsModuleSpecifierTo(sourceDirectory)
   };
 }
+__name(getNamespaceExportDeclaration, "getNamespaceExportDeclaration");
 
 // src/handlers/register-enum.ts
 var import_ts_morph8 = require("ts-morph");
@@ -1551,11 +1594,13 @@ function registerEnum(enumType, args) {
     ]
   });
 }
+__name(registerEnum, "registerEnum");
 
 // src/handlers/require-single-fields-in-whereunique-input.ts
 function requireSingleFieldsInWhereUniqueInput(eventEmitter) {
   eventEmitter.on("BeforeInputType", beforeInputType3);
 }
+__name(requireSingleFieldsInWhereUniqueInput, "requireSingleFieldsInWhereUniqueInput");
 function beforeInputType3(args) {
   const { inputType: inputType2 } = args;
   if (!isWhereUniqueInputType(inputType2.name) || inputType2.fields.length !== 1) {
@@ -1570,6 +1615,7 @@ __name(beforeInputType3, "beforeInputType");
 function isWhereUniqueInputType(name) {
   return name.endsWith("WhereUniqueInput");
 }
+__name(isWhereUniqueInputType, "isWhereUniqueInputType");
 
 // src/handlers/warning.ts
 function warning(message) {
@@ -1580,11 +1626,13 @@ function warning(message) {
     console.log("prisma-nestjs-graphql:", message);
   }
 }
+__name(warning, "warning");
 
 // src/helpers/create-config.ts
 var import_assert5 = require("assert");
 var import_filenamify = __toESM(require("filenamify"));
 var import_flat = require("flat");
+var import_fs2 = require("fs");
 var import_json55 = __toESM(require("json5"));
 var import_lodash7 = require("lodash");
 var import_outmatch3 = __toESM(require("outmatch"));
@@ -1646,7 +1694,7 @@ function createConfig(data) {
   }
   return {
     outputFilePattern,
-    tsConfigFilePath: void 0,
+    tsConfigFilePath: createTsConfigFilePathValue(config.tsConfigFilePath),
     combineScalarFilters: toBoolean(config.combineScalarFilters),
     noAtomicOperations: toBoolean(config.noAtomicOperations),
     reExport: ReExport[String(config.reExport)] || ReExport.None,
@@ -1662,6 +1710,17 @@ function createConfig(data) {
     decorate
   };
 }
+__name(createConfig, "createConfig");
+var tsConfigFileExists = (0, import_lodash7.memoize)((filePath) => {
+  return (0, import_fs2.existsSync)(filePath);
+});
+function createTsConfigFilePathValue(value) {
+  if (typeof value === "string")
+    return value;
+  if (tsConfigFileExists("tsconfig.json"))
+    return "tsconfig.json";
+}
+__name(createTsConfigFilePathValue, "createTsConfigFilePathValue");
 function createUseInputType(data) {
   if (!data) {
     return [];
@@ -1683,6 +1742,7 @@ function createUseInputType(data) {
   }
   return result;
 }
+__name(createUseInputType, "createUseInputType");
 function toBoolean(value) {
   return [
     "true",
@@ -1690,6 +1750,7 @@ function toBoolean(value) {
     "on"
   ].includes(String(value));
 }
+__name(toBoolean, "toBoolean");
 
 // src/helpers/generate-file-name.ts
 var import_lodash8 = require("lodash");
@@ -1724,11 +1785,12 @@ function generateFileName(args) {
     }
   });
 }
+__name(generateFileName, "generateFileName");
 
 // src/helpers/factory-get-source-file.ts
 function factoryGetSourceFile(args1) {
   const { outputFilePattern, output, getModelName: getModelName2, project } = args1;
-  return function getSourceFile(args) {
+  return /* @__PURE__ */ __name(function getSourceFile(args) {
     const { name, type } = args;
     let filePath = generateFileName({
       getModelName: getModelName2,
@@ -1740,8 +1802,9 @@ function factoryGetSourceFile(args1) {
     return project.getSourceFile(filePath) || project.createSourceFile(filePath, void 0, {
       overwrite: true
     });
-  };
+  }, "getSourceFile");
 }
+__name(factoryGetSourceFile, "factoryGetSourceFile");
 
 // src/helpers/get-model-name.ts
 var import_lodash9 = require("lodash");
@@ -1753,7 +1816,9 @@ function createGetModelName(modelNames) {
       name
     });
   }
+  __name(tryGetName, "tryGetName");
 }
+__name(createGetModelName, "createGetModelName");
 function getModelName(args) {
   const { name, modelNames } = args;
   for (const keyword of splitKeywords) {
@@ -1791,6 +1856,7 @@ function getModelName(args) {
   }
   return void 0;
 }
+__name(getModelName, "getModelName");
 var splitKeywords = [
   "CreateInput",
   "CreateMany",
@@ -1976,6 +2042,9 @@ 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);
+  }
   await eventEmitter.emit("PostBegin", eventArguments);
   for (const enumType of enumTypes.prisma.concat(enumTypes.model || [])) {
     await eventEmitter.emit("EnumType", enumType, eventArguments);
@@ -2021,6 +2090,7 @@ async function generate(args) {
     eventEmitter.off(name);
   }
 }
+__name(generate, "generate");
 
 // src/index.ts
 (0, import_generator_helper.generatorHandler)({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prisma-nestjs-graphql",
-  "version": "15.2.0",
+  "version": "15.2.3",
   "license": "MIT",
   "description": "Generate object types, inputs, args, etc. from prisma schema file for usage with @nestjs/graphql module",
   "main": "index.js",
@@ -22,10 +22,10 @@
   ],
   "scripts": {
     "test": "npm run eslint && npm run tscheck && npm run test:cov",
-    "mocha": "node node_modules/mocha/bin/_mocha",
-    "test:r": "mocha -r @swc/register src/**/*.spec.ts",
+    "mocha": "node node_modules/mocha/bin/mocha",
+    "test:r": "npm run mocha -- -r ts-node/register src/**/*.spec.ts",
     "test:cov": "c8 --reporter text --exclude \"**/*.spec.ts\" --exclude \"**/test/**\"  npm run test:r -- --no-timeouts",
-    "test:w": "mocha -r @swc/register --watch-files src/**/*.ts --no-timeouts --watch src/**/*.spec.ts",
+    "test:w": "npm run test:r -- --watch-files src --watch",
     "test:d": "ndb -r @swc/register node_modules/mocha/bin/_mocha --no-timeouts --watch-files src/**/*.ts --watch src/**/*.spec.ts",
     "tscheck": "tsc --noEmit",
     "tscheck:w": "npm run tscheck -- --watch",
@@ -51,13 +51,13 @@
     }
   },
   "dependencies": {
-    "@nestjs/apollo": "^10.0.7",
-    "@prisma/generator-helper": "^3.11.0",
+    "@nestjs/apollo": "^10.0.9",
+    "@prisma/generator-helper": "^3.13.0",
     "await-event-emitter": "^2.0.2",
     "filenamify": "4.X",
     "flat": "^5.0.2",
     "get-relative-path": "^1.0.2",
-    "json5": "^2.2.0",
+    "json5": "^2.2.1",
     "lodash": "^4.17.21",
     "outmatch": "^0.7.0",
     "pluralize": "^8.0.0",
@@ -65,55 +65,55 @@
     "ts-morph": ">=11"
   },
   "devDependencies": {
-    "@commitlint/cli": "^16.2.3",
-    "@commitlint/config-conventional": "^16.2.1",
-    "@nestjs/common": "^8.4.1",
-    "@nestjs/core": "^8.4.1",
-    "@nestjs/graphql": "^10.0.7",
-    "@nestjs/platform-express": "^8.4.1",
+    "@commitlint/cli": "^16.2.4",
+    "@commitlint/config-conventional": "^16.2.4",
+    "@nestjs/common": "^8.4.4",
+    "@nestjs/core": "^8.4.4",
+    "@nestjs/graphql": "^10.0.10",
+    "@nestjs/platform-express": "^8.4.4",
     "@paljs/plugins": "^4.0.18",
-    "@prisma/client": "^3.11.0",
+    "@prisma/client": "^3.13.0",
     "@semantic-release/changelog": "^6.0.1",
     "@semantic-release/git": "^10.0.1",
-    "@swc/core": "^1.2.156",
-    "@swc/helpers": "^0.3.8",
+    "@swc/core": "^1.2.174",
+    "@swc/helpers": "^0.3.10",
     "@swc/register": "^0.1.10",
     "@types/flat": "^5.0.2",
-    "@types/lodash": "^4.14.180",
-    "@types/mocha": "^9.1.0",
-    "@types/node": "^17.0.21",
+    "@types/lodash": "^4.14.182",
+    "@types/mocha": "^9.1.1",
+    "@types/node": "^17.0.31",
     "@types/pluralize": "^0.0.29",
-    "@typescript-eslint/eslint-plugin": "^5.15.0",
-    "@typescript-eslint/parser": "^5.15.0",
-    "apollo-server-express": "^3.6.4",
-    "c8": "^7.11.0",
+    "@typescript-eslint/eslint-plugin": "^5.21.0",
+    "@typescript-eslint/parser": "^5.21.0",
+    "apollo-server-express": "^3.6.7",
+    "c8": "^7.11.2",
     "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": "^8.11.0",
+    "eslint": "^8.14.0",
     "eslint-import-resolver-node": "^0.3.6",
     "eslint-plugin-etc": "^2.0.2",
-    "eslint-plugin-import": "^2.25.4",
+    "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-only-warn": "^1.0.3",
     "eslint-plugin-prettier": "^4.0.0",
-    "eslint-plugin-regexp": "^1.5.1",
+    "eslint-plugin-regexp": "^1.7.0",
     "eslint-plugin-simple-import-sort": "^7.0.0",
     "eslint-plugin-sort-class-members": "^1.14.1",
-    "eslint-plugin-unicorn": "^41.0.0",
+    "eslint-plugin-unicorn": "^42.0.0",
     "eslint-plugin-wix-editor": "^3.3.0",
-    "expect": "^27.5.1",
+    "expect": "^28.0.2",
     "ghooks": "^2.0.4",
     "git-branch-is": "^4.0.0",
-    "graphql": "^16.3.0",
-    "graphql-scalars": "^1.15.0",
+    "graphql": "^16.4.0",
+    "graphql-scalars": "^1.17.0",
     "graphql-type-json": "^0.3.2",
-    "mocha": "^9.2.2",
+    "mocha": "^10.0.0",
     "ololog": "^1.1.175",
     "precise-commits": "^1.0.2",
-    "prettier": "^2.6.0",
-    "prisma": "^3.11.0",
+    "prettier": "^2.6.2",
+    "prisma": "^3.13.0",
     "prisma-graphql-type-decimal": "^2.0.0",
     "reflect-metadata": "^0.1.13",
     "request": "^2.88.2",
@@ -123,8 +123,8 @@
     "temp-dir": "^2.0.0",
     "ts-node": "^10.7.0",
     "ts-node-dev": "^1.1.8",
-    "tslib": "^2.3.1",
-    "typescript": "^4.6.2",
+    "tslib": "^2.4.0",
+    "typescript": "^4.6.4",
     "watchexec-bin": "^1.0.0"
   }
 }