prisma-nestjs-graphql 19.0.1 → 19.2.0

package/README.md

@@ -116,9 +116,18 @@ with temporal dead zone when generating merged file.
 Type: `boolean`  
 Default: `false`
 
-#### `purgeOutput`
+#### `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"]`
 
-Delete all files in `output` folder  
+#### `omitModelsCount`
+Omit `_count` field from models.  
+Type: `boolean`  
+Default: `false`
+
+#### `purgeOutput`
+Delete all files in `output` folder.  
 Type: `boolean`  
 Default: `false`
 
@@ -136,6 +145,13 @@ Type: `boolean`
 Default: `false`  
 **Note**: It will break compatiblity between Prisma types and generated classes.
 
+#### `unsafeCompatibleWhereUniqueInput`
+
+This trick TypeScript and set property 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

@@ -86,9 +86,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) {
@@ -571,7 +573,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 +653,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 +672,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
     });
@@ -695,7 +704,7 @@ function inputType(args) {
       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,7 +735,7 @@ 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({
@@ -1159,6 +1168,8 @@ function modelOutputType(outputType, args) {
   importDeclarations.add("Field", nestjsGraphql$1);
   importDeclarations.add("ObjectType", nestjsGraphql$1);
   for (const field of outputType.fields) {
+    if (config.omitModelsCount && field.name === "_count")
+      continue;
     let fileType = "model";
     const { location, isList, type, namespace } = field.outputType;
     let outputTypeName = String(type);
@@ -1353,6 +1364,8 @@ function outputType(outputType2, args) {
   const model = models.get(modelName);
   const isAggregateOutput = model && /(?:Count|Avg|Sum|Min|Max)AggregateOutputType$/.test(outputType2.name) && String(outputType2.name).startsWith(model.name);
   const isCountOutput = (model == null ? void 0 : model.name) && outputType2.name === `${model.name}CountOutputType`;
+  if (!config.emitBlocks.outputs && !isCountOutput)
+    return;
   outputType2.name = getOutputTypeName(outputType2.name);
   if (isAggregateOutput) {
     eventEmitter.emitSync("AggregateOutput", { ...args, outputType: outputType2 });
@@ -1596,7 +1609,9 @@ function getNamespaceExportDeclaration(directory, sourceDirectory) {
 }
 
 function registerEnum(enumType, args) {
-  const { getSourceFile, enums } = args;
+  const { getSourceFile, enums, config } = args;
+  if (!config.emitBlocks.prismaEnums && !enums[enumType.name])
+    return;
   const dataModelEnum = enums[enumType.name];
   const sourceFile = getSourceFile({
     name: enumType.name,
@@ -1649,6 +1664,30 @@ function warning(message) {
   }
 }
 
+const allEmmittedBlocks = ["prismaEnums", "schemaEnums", "models", "inputs", "args", "outputs"];
+const blocksDependencyMap = {
+  enums: ["schemaEnums", "prismaEnums"],
+  models: ["models", "schemaEnums"],
+  inputs: ["inputs", "prismaEnums"],
+  outputs: ["outputs"],
+  args: ["args", "inputs", "prismaEnums"]
+};
+function createEmitBlocks(data) {
+  if (!data) {
+    return Object.fromEntries(allEmmittedBlocks.map((block) => [block, true]));
+  }
+  let blocksToEmit = {};
+  for (const block of data) {
+    if (!Object.keys(blocksDependencyMap).includes(block))
+      continue;
+    blocksToEmit = {
+      ...blocksToEmit,
+      ...Object.fromEntries(blocksDependencyMap[block].map((block2) => [block2, true]))
+    };
+  }
+  return blocksToEmit;
+}
+
 function createConfig(data) {
   var _a;
   const config = lodash.merge({}, flat.unflatten(data, { delimiter: "_" }));
@@ -1717,6 +1756,8 @@ function createConfig(data) {
     reExport: ReExport[String(config.reExport)] || ReExport.None,
     emitSingle: toBoolean(config.emitSingle),
     emitCompiled: toBoolean(config.emitCompiled),
+    emitBlocks: createEmitBlocks(config.emitBlocks),
+    omitModelsCount: toBoolean(config.omitModelsCount),
     $warnings,
     fields,
     purgeOutput: toBoolean(config.purgeOutput),
@@ -1725,6 +1766,9 @@ function createConfig(data) {
     requireSingleFieldsInWhereUniqueInput: toBoolean(
       config.requireSingleFieldsInWhereUniqueInput
     ),
+    unsafeCompatibleWhereUniqueInput: toBoolean(
+      config.unsafeCompatibleWhereUniqueInput
+    ),
     graphqlScalars: config.graphqlScalars || {},
     decorate
   };
@@ -1929,17 +1973,21 @@ async function generate(args) {
   const { connectCallback, generator, skipAddOutputSourceFiles, dmmf } = 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"]();
   eventEmitter.on("Warning", warning);
-  eventEmitter.on("Model", modelData);
-  eventEmitter.on("EnumType", registerEnum);
-  eventEmitter.on("OutputType", outputType);
-  eventEmitter.on("ModelOutputType", modelOutputType);
-  eventEmitter.on("AggregateOutput", createAggregateInput);
-  eventEmitter.on("InputType", inputType);
-  eventEmitter.on("ArgsType", argsType);
+  config.emitBlocks.models && eventEmitter.on("Model", modelData);
+  if (config.emitBlocks.prismaEnums || config.emitBlocks.schemaEnums) {
+    eventEmitter.on("EnumType", registerEnum);
+  }
+  if (config.emitBlocks.outputs || config.emitBlocks.models && !config.omitModelsCount) {
+    eventEmitter.on("OutputType", outputType);
+  }
+  config.emitBlocks.models && eventEmitter.on("ModelOutputType", modelOutputType);
+  config.emitBlocks.outputs && eventEmitter.on("AggregateOutput", createAggregateInput);
+  config.emitBlocks.inputs && eventEmitter.on("InputType", inputType);
+  config.emitBlocks.args && eventEmitter.on("ArgsType", argsType);
   eventEmitter.on("GenerateFiles", generateFiles);
-  const config = createConfig(generator.config);
   for (const message of config.$warnings) {
     eventEmitter.emitSync("Warning", message);
   }

package/generate.d.ts

@@ -82,7 +82,6 @@ declare namespace DMMF {
         relationOnDelete?: string;
         relationName?: string;
         documentation?: string;
-        [key: string]: any;
     }
     export interface FieldDefault {
         name: string;
@@ -118,25 +117,24 @@ declare namespace DMMF {
         isRequired: boolean;
         isList: boolean;
     }
-    export type ArgType = string | InputType | SchemaEnum;
-    export interface SchemaArgInputType {
+    export type TypeRef<AllowedLocations extends FieldLocation> = {
         isList: boolean;
-        type: ArgType;
-        location: FieldLocation;
+        type: string;
+        location: AllowedLocations;
         namespace?: FieldNamespace;
-    }
+    };
+    export type InputTypeRef = TypeRef<'scalar' | 'inputObjectTypes' | 'enumTypes' | 'fieldRefTypes'>;
     export interface SchemaArg {
         name: string;
         comment?: string;
         isNullable: boolean;
         isRequired: boolean;
-        inputTypes: SchemaArgInputType[];
+        inputTypes: InputTypeRef[];
         deprecation?: Deprecation;
     }
     export interface OutputType {
         name: string;
         fields: SchemaField[];
-        fieldMap?: Record<string, SchemaField>;
     }
     export interface SchemaField {
         name: string;
@@ -146,23 +144,7 @@ declare namespace DMMF {
         deprecation?: Deprecation;
         documentation?: string;
     }
-    export type TypeRefCommon = {
-        isList: boolean;
-        namespace?: FieldNamespace;
-    };
-    export type TypeRefScalar = TypeRefCommon & {
-        location: 'scalar';
-        type: string;
-    };
-    export type TypeRefOutputObject = TypeRefCommon & {
-        location: 'outputObjectTypes';
-        type: OutputType | string;
-    };
-    export type TypeRefEnum = TypeRefCommon & {
-        location: 'enumTypes';
-        type: SchemaEnum | string;
-    };
-    export type OutputTypeRef = TypeRefScalar | TypeRefOutputObject | TypeRefEnum;
+    export type OutputTypeRef = TypeRef<'scalar' | 'outputObjectTypes' | 'enumTypes'>;
     export interface Deprecation {
         sinceVersion: string;
         reason: string;
@@ -179,14 +161,13 @@ declare namespace DMMF {
             source?: string;
         };
         fields: SchemaArg[];
-        fieldMap?: Record<string, SchemaArg>;
     }
     export interface FieldRefType {
         name: string;
         allowTypes: FieldRefAllowType[];
         fields: SchemaArg[];
     }
-    export type FieldRefAllowType = TypeRefScalar | TypeRefEnum;
+    export type FieldRefAllowType = TypeRef<'scalar' | 'enumTypes'>;
     export interface ModelMapping {
         model: string;
         plural: string;
@@ -254,12 +235,15 @@ declare function createConfig(data: Record<string, unknown>): {
     reExport: ReExport;
     emitSingle: boolean;
     emitCompiled: boolean;
+    emitBlocks: Record<"models" | "inputs" | "args" | "outputs" | "prismaEnums" | "schemaEnums", boolean>;
+    omitModelsCount: boolean;
     $warnings: string[];
     fields: Record<string, Partial<Omit<ObjectSetting, "name">> | undefined>;
     purgeOutput: boolean;
     useInputType: ConfigInputItem[];
     noTypeId: boolean;
     requireSingleFieldsInWhereUniqueInput: boolean;
+    unsafeCompatibleWhereUniqueInput: boolean;
     graphqlScalars: Record<string, ImportNameSpec | undefined>;
     decorate: DecorateElement[];
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prisma-nestjs-graphql",
-  "version": "19.0.1",
+  "version": "19.2.0",
   "license": "MIT",
   "description": "Generate object types, inputs, args, etc. from prisma schema file for usage with @nestjs/graphql module",
   "bin": "bin.js",
@@ -70,10 +70,10 @@
     }
   },
   "dependencies": {
-    "@prisma/generator-helper": "^5.1.1",
+    "@prisma/generator-helper": "^5.3.1",
     "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,28 +84,28 @@
     "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": "^17.7.1",
+    "@commitlint/config-conventional": "^17.7.0",
+    "@nestjs/apollo": "^12.0.9",
+    "@nestjs/common": "^10.2.6",
+    "@nestjs/core": "^10.2.6",
+    "@nestjs/graphql": "^12.0.9",
+    "@nestjs/platform-express": "^10.2.6",
+    "@paljs/plugins": "^6.0.7",
+    "@prisma/client": "^5.3.1",
     "@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.87",
+    "@swc/helpers": "^0.5.2",
     "@swc/register": "^0.1.10",
-    "@types/flat": "^5.0.2",
-    "@types/graceful-fs": "^4.1.6",
-    "@types/lodash": "^4.14.196",
+    "@types/flat": "^5.0.3",
+    "@types/graceful-fs": "^4.1.7",
+    "@types/lodash": "^4.14.199",
     "@types/mocha": "^10.0.1",
-    "@types/node": "^20.4.7",
+    "@types/node": "^20.6.3",
     "@types/pluralize": "^0.0.30",
-    "@typescript-eslint/eslint-plugin": "^6.2.1",
-    "@typescript-eslint/parser": "^6.2.1",
+    "@typescript-eslint/eslint-plugin": "^6.7.2",
+    "@typescript-eslint/parser": "^6.7.2",
     "apollo-server-express": "^3.10.0",
     "c8": "^8.0.1",
     "class-transformer": "^0.5.1",
@@ -113,10 +113,10 @@
     "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.50.0",
+    "eslint-import-resolver-node": "^0.3.9",
     "eslint-plugin-etc": "^2.0.3",
-    "eslint-plugin-import": "^2.28.0",
+    "eslint-plugin-import": "^2.28.1",
     "eslint-plugin-only-warn": "^1.1.0",
     "eslint-plugin-prettier": "^5.0.0",
     "eslint-plugin-regexp": "^1.15.0",
@@ -124,29 +124,26 @@
     "eslint-plugin-sort-class-members": "^1.18.0",
     "eslint-plugin-unicorn": "^48.0.1",
     "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": "^16.8.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": "^3.0.1",
-    "prisma": "^5.1.1",
+    "prettier": "^3.0.3",
+    "prisma": "^5.3.1",
     "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.4",
     "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.2.2",
     "watchexec-bin": "^1.0.0"
-  },
-  "overrides": {
-    "prisma": "^5.1.1"
   }
 }