feat: Generate aggregate input types

unlight · unlight · commit 66239bbc4238 · 2020-08-31T00:03:21.000+04:00
diff --git a/package.json b/package.json
@@ -52,7 +52,7 @@
     "get-relative-path": "^1.0.2",
     "pupa": "^2.0.1",
     "to-kebab": "^1.0.7",
-    "ts-morph": "^8.0.0",
+    "ts-morph": "^8.1.0",
     "typescript-equals": "^1.0.0"
   },
   "peerDependencies": {
@@ -61,26 +61,26 @@
   "devDependencies": {
     "@commitlint/cli": "^9.1.2",
     "@commitlint/config-conventional": "^9.1.2",
-    "@nestjs/common": "^7.4.2",
-    "@nestjs/core": "^7.4.2",
+    "@nestjs/common": "^7.4.3",
+    "@nestjs/core": "^7.4.3",
     "@nestjs/graphql": "^7.6.0",
-    "@nestjs/platform-express": "^7.4.2",
+    "@nestjs/platform-express": "^7.4.3",
     "@paljs/plugins": "^1.2.6",
     "@prisma/cli": "^2.5.1",
     "@prisma/client": "^2.5.1",
     "@semantic-release/changelog": "^5.0.1",
     "@semantic-release/git": "^9.0.0",
     "@types/mocha": "^8.0.3",
-    "@types/node": "^14.6.0",
-    "@typescript-eslint/eslint-plugin": "^3.9.1",
-    "@typescript-eslint/parser": "^3.9.1",
-    "apollo-server-express": "^2.16.1",
+    "@types/node": "^14.6.2",
+    "@typescript-eslint/eslint-plugin": "^3.10.1",
+    "@typescript-eslint/parser": "^3.10.1",
+    "apollo-server-express": "^2.17.0",
     "c8": "^7.3.0",
     "class-transformer": "^0.3.1",
     "class-validator": "^0.12.2",
     "eslint": "^7.7.0",
     "eslint-import-resolver-node": "^0.3.4",
-    "eslint-plugin-etc": "0.0.1-beta.43",
+    "eslint-plugin-etc": "0.0.1-beta.44",
     "eslint-plugin-import": "^2.22.0",
     "eslint-plugin-only-warn": "^1.0.2",
     "eslint-plugin-prettier": "^3.1.4",
@@ -97,9 +97,9 @@
     "graphql": "^15.3.0",
     "graphql-type-json": "^0.3.2",
     "husky": "^4.2.5",
-    "mocha": "^8.1.1",
+    "mocha": "^8.1.3",
     "precise-commits": "^1.0.2",
-    "prettier": "^2.0.5",
+    "prettier": "^2.1.1",
     "reflect-metadata": "^0.1.13",
     "rxjs": "^6.6.2",
     "semantic-release": "^17.1.1",
diff --git a/src/@generated/article/article-avg-aggregate.input.ts b/src/@generated/article/article-avg-aggregate.input.ts
@@ -0,0 +1,10 @@
+import { Field, InputType } from '@nestjs/graphql';
+
+@InputType({})
+export class ArticleAvgAggregateInput {
+    @Field(() => Boolean, {
+        nullable: true,
+        description: undefined,
+    })
+    favoritesCount?: true;
+}
diff --git a/src/@generated/article/article-max-aggregate.input.ts b/src/@generated/article/article-max-aggregate.input.ts
@@ -0,0 +1,10 @@
+import { Field, InputType } from '@nestjs/graphql';
+
+@InputType({})
+export class ArticleMaxAggregateInput {
+    @Field(() => Boolean, {
+        nullable: true,
+        description: undefined,
+    })
+    favoritesCount?: true;
+}
diff --git a/src/@generated/article/article-min-aggregate.input.ts b/src/@generated/article/article-min-aggregate.input.ts
@@ -0,0 +1,10 @@
+import { Field, InputType } from '@nestjs/graphql';
+
+@InputType({})
+export class ArticleMinAggregateInput {
+    @Field(() => Boolean, {
+        nullable: true,
+        description: undefined,
+    })
+    favoritesCount?: true;
+}
diff --git a/src/@generated/article/article-sum-aggregate.input.ts b/src/@generated/article/article-sum-aggregate.input.ts
@@ -0,0 +1,10 @@
+import { Field, InputType } from '@nestjs/graphql';
+
+@InputType({})
+export class ArticleSumAggregateInput {
+    @Field(() => Boolean, {
+        nullable: true,
+        description: undefined,
+    })
+    favoritesCount?: true;
+}
diff --git a/src/@generated/user/user-avg-aggregate.input.ts b/src/@generated/user/user-avg-aggregate.input.ts
@@ -0,0 +1,16 @@
+import { Field, InputType } from '@nestjs/graphql';
+
+@InputType({})
+export class UserAvgAggregateInput {
+    @Field(() => Boolean, {
+        nullable: true,
+        description: undefined,
+    })
+    countComments?: true | null;
+
+    @Field(() => Boolean, {
+        nullable: true,
+        description: undefined,
+    })
+    rating?: true | null;
+}
diff --git a/src/@generated/user/user-max-aggregate.input.ts b/src/@generated/user/user-max-aggregate.input.ts
@@ -0,0 +1,16 @@
+import { Field, InputType } from '@nestjs/graphql';
+
+@InputType({})
+export class UserMaxAggregateInput {
+    @Field(() => Boolean, {
+        nullable: true,
+        description: undefined,
+    })
+    countComments?: true | null;
+
+    @Field(() => Boolean, {
+        nullable: true,
+        description: undefined,
+    })
+    rating?: true | null;
+}
diff --git a/src/@generated/user/user-min-aggregate.input.ts b/src/@generated/user/user-min-aggregate.input.ts
@@ -0,0 +1,16 @@
+import { Field, InputType } from '@nestjs/graphql';
+
+@InputType({})
+export class UserMinAggregateInput {
+    @Field(() => Boolean, {
+        nullable: true,
+        description: undefined,
+    })
+    countComments?: true | null;
+
+    @Field(() => Boolean, {
+        nullable: true,
+        description: undefined,
+    })
+    rating?: true | null;
+}
diff --git a/src/@generated/user/user-sum-aggregate.input.ts b/src/@generated/user/user-sum-aggregate.input.ts
@@ -0,0 +1,16 @@
+import { Field, InputType } from '@nestjs/graphql';
+
+@InputType({})
+export class UserSumAggregateInput {
+    @Field(() => Boolean, {
+        nullable: true,
+        description: undefined,
+    })
+    countComments?: true | null;
+
+    @Field(() => Boolean, {
+        nullable: true,
+        description: undefined,
+    })
+    rating?: true | null;
+}
diff --git a/src/generate-file-name.ts b/src/generate-file-name.ts
@@ -24,8 +24,14 @@ const splitKeywords = [
     'UpsertWithout',
     'WhereInput',
     'WhereUniqueInput',
+    'AvgAggregate',
+    'SumAggregate',
+    'MinAggregate',
+    'MaxAggregate',
 ].sort((a, b) => b.length - a.length);
 
+const endsWithKeywords = ['Aggregate'];
+
 type GenerateFileNameArgs = {
     type: FileType;
     name: string;
@@ -68,7 +74,14 @@ export function getFeatureName(args: GetFeatureNameArgs) {
         const [test] = name.split(keyword, 1);
         if (models.includes(test)) {
             result = test;
-            break;
+            return result;
+        }
+    }
+    for (const keyword of endsWithKeywords) {
+        const [test] = name.split(keyword).slice(-1);
+        if (models.includes(test)) {
+            result = test;
+            return result;
         }
     }
     return result;
diff --git a/src/generate-input.spec.ts b/src/generate-input.spec.ts
@@ -3,6 +3,7 @@ import { Project, QuoteKind, SourceFile } from 'ts-morph';
 
 import { generateInput } from './generate-input';
 import { generatorOptions, stringContains, stringNotContains } from './testing';
+import { schemaOutputToInput } from './type-utils';
 
 describe('generate inputs', () => {
     let sourceFile: SourceFile;
diff --git a/src/generate-input.ts b/src/generate-input.ts
@@ -1,5 +1,4 @@
 import { DMMF as PrismaDMMF } from '@prisma/client/runtime/dmmf-types';
-import assert from 'assert';
 import { ClassDeclaration, SourceFile } from 'ts-morph';
 
 import { generateClass, generateClassProperty } from './generate-class';
@@ -115,16 +114,12 @@ function getPropertyType(args: GetPropertyTypeArgs): string {
         })
         .join(' | ');
     if (inputTypes.every((t) => t.isList)) {
-        if (['AND', 'NOT', 'in', 'notIn'].includes(field.name)) {
-            result = `${result} | Array<${result}>`;
-        } else {
-            result = `Array<${result}>`;
-        }
+        result = ['AND', 'NOT', 'in', 'notIn'].includes(field.name)
+            ? `${result} | Array<${result}>`
+            : `Array<${result}>`;
     }
-    if (!inputTypes.find((t) => t.type === 'null')) {
-        if (nullable) {
-            result = `${result} | null`;
-        }
+    if (!inputTypes.find((t) => t.type === 'null') && nullable) {
+        result = `${result} | null`;
     }
     return result;
 }
diff --git a/src/generate.spec.ts b/src/generate.spec.ts
@@ -5,7 +5,7 @@ import { generate } from './generate';
 import { generatorOptions, stringContains } from './testing';
 
 describe('main generate', () => {
-    let sourceFile: SourceFile;
+    let sourceFile: SourceFile | undefined;
     let sourceFiles: SourceFile[];
     let sourceText: string;
     async function getResult(args: { schema: string } & Record<string, any>) {
@@ -149,4 +149,27 @@ describe('main generate', () => {
                 assert.notStrictEqual(argument, '() => null');
             });
     });
+
+    it('user avg aggregate input', async () => {
+        await getResult({
+            schema: `
+            model User {
+              id     String      @id
+              age    Int
+            }
+            `,
+        });
+        sourceFile = sourceFiles.find((s) =>
+            s.getFilePath().endsWith('user-avg-aggregate.input.ts'),
+        );
+        assert(sourceFile);
+        const classDeclaration = sourceFile.getClass('UserAvgAggregateInput');
+        assert(classDeclaration, 'class not found');
+        const propertyDeclaration = classDeclaration.getProperty('age');
+        assert(propertyDeclaration, 'age');
+        const decorator = propertyDeclaration.getDecorator('Field');
+        assert(decorator);
+        const struct = decorator.getStructure();
+        assert.strictEqual(struct.arguments?.[0], '() => Boolean');
+    });
 });
diff --git a/src/generate.ts b/src/generate.ts
@@ -9,6 +9,7 @@ import { FileType, generateFileName, getFeatureName } from './generate-file-name
 import { generateInput } from './generate-input';
 import { generateModel } from './generate-model';
 import { mutateScalarInputs } from './mutate-scalar-inputs';
+import { schemaOutputToInput } from './type-utils';
 
 type GenerateArgs = GeneratorOptions & {
     prismaClientDmmf?: PrismaDMMF.Document;
@@ -65,7 +66,11 @@ export async function generate(args: GenerateArgs) {
     const inputTypes = prismaClientDmmf.schema.inputTypes.filter(
         mutateScalarInputs(prismaClientDmmf.schema.inputTypes),
     );
-    for (const inputType of inputTypes) {
+    // Create aggregate inputs
+    const aggregateInputs = prismaClientDmmf.schema.outputTypes
+        .filter((o) => o.name.endsWith('AggregateOutputType'))
+        .map(schemaOutputToInput);
+    for (const inputType of inputTypes.concat(aggregateInputs)) {
         let model: PrismaDMMF.Model | undefined;
         const feature = getFeatureName({ name: inputType.name, models, fallback: '' });
         if (feature) {
@@ -74,6 +79,5 @@ export async function generate(args: GenerateArgs) {
         const sourceFile = await createSourceFile({ type: 'input', name: inputType.name });
         generateInput({ inputType, sourceFile, projectFilePath, model });
     }
-
     return project;
 }
diff --git a/src/testing/generator-options.ts b/src/testing/generator-options.ts
@@ -4,9 +4,8 @@ import { exec } from 'child_process';
 import crypto from 'crypto';
 import findCacheDir from 'find-cache-dir';
 import fs from 'fs';
-import { resolve } from 'path';
 
-const cachePath = findCacheDir({ name: 'createGeneratorOptions', create: true });
+const cachePath: string = findCacheDir({ name: 'createGeneratorOptions', create: true });
 
 /**
  * Get generator options after run prisma generate.
diff --git a/src/testing/seed.ts b/src/testing/seed.ts
@@ -6,6 +6,18 @@ const prisma = new PrismaClient();
     console.log('Seeding...');
     await prisma.$connect();
 
+    // prisma.user.aggregate({
+    //     max: { countComments: true },
+    //     min: { countComments: true },
+    // });
+
+    const data = await prisma.user.aggregate({
+        where: { id: '1' },
+        avg: { countComments: true },
+        sum: { countComments: true },
+    });
+    console.log('data', data);
+
     // await prisma.user.findMany({ where: { NOT: { id: '1' } } });
     // await prisma.user.findOne({ where: { id: '1' } });
 
diff --git a/src/type-utils.ts b/src/type-utils.ts
@@ -1,3 +1,5 @@
+import { DMMF as PrismaDMMF } from '@prisma/client/runtime/dmmf-types';
+
 type ToGraphqlImportTypeArgs = {
     isId: boolean;
     type: string;
@@ -19,6 +21,8 @@ export function toGraphqlImportType(args: ToGraphqlImportTypeArgs) {
     }
     if (name === 'DateTime') {
         name = 'String';
+    } else if (name === 'true') {
+        name = 'Boolean';
     }
     return { name, moduleSpecifier: undefined };
 }
@@ -47,3 +51,31 @@ export function toPropertyType(field: { type: string; kind: string }): string {
     // console.log('field', field);
     throw new TypeError(`Cannot get property type from ${field.kind}/${field.type}`);
 }
+
+/**
+ * See client/src/generation/TSClient.ts @ getAggregationTypes
+ */
+export function schemaOutputToInput(outputType: PrismaDMMF.OutputType): PrismaDMMF.InputType {
+    return {
+        name: getAggregateInputType(outputType.name),
+        fields: outputType.fields.map((field) => {
+            return {
+                ...field,
+                name: field.name,
+                inputType: [
+                    {
+                        isList: false,
+                        isNullable: false,
+                        isRequired: false,
+                        kind: 'scalar',
+                        type: 'true',
+                    },
+                ],
+            };
+        }),
+    };
+}
+
+function getAggregateInputType(aggregateOutputType: string): string {
+    return aggregateOutputType.replace(/OutputType$/, 'Input');
+}
