fix: No atomic operations for scalar input list

resident-advisor · May 22, 2022 · d32b03c · d32b03c
1 parent f692ebd
commit d32b03c
Show file tree

Hide file tree

Showing 13 changed files with 125 additions and 30 deletions.
diff --git a/@generated/dummy/dummy-create-many.input.ts b/@generated/dummy/dummy-create-many.input.ts
@@ -5,7 +5,7 @@ import { Int } from '@nestjs/graphql';
 import { Decimal } from '@prisma/client/runtime';
 import { GraphQLDecimal } from 'prisma-graphql-type-decimal';
 import { GraphQLJSON } from 'graphql-type-json';
-import { DummyCreatefriendsInput } from '../prisma/dummy-createfriends.input';
+import { DummyCreatefriendsInput } from './dummy-createfriends.input';
 
 @InputType()
 export class DummyCreateManyInput {

diff --git a/@generated/dummy/dummy-create.input.ts b/@generated/dummy/dummy-create.input.ts
@@ -5,7 +5,7 @@ import { Int } from '@nestjs/graphql';
 import { Decimal } from '@prisma/client/runtime';
 import { GraphQLDecimal } from 'prisma-graphql-type-decimal';
 import { GraphQLJSON } from 'graphql-type-json';
-import { DummyCreatefriendsInput } from '../prisma/dummy-createfriends.input';
+import { DummyCreatefriendsInput } from './dummy-createfriends.input';
 
 @InputType()
 export class DummyCreateInput {

diff --git a/...rated/prisma/dummy-createfriends.input.ts → ...erated/dummy/dummy-createfriends.input.ts b/...rated/prisma/dummy-createfriends.input.ts → ...erated/dummy/dummy-createfriends.input.ts
diff --git a/@generated/dummy/dummy-unchecked-create.input.ts b/@generated/dummy/dummy-unchecked-create.input.ts
@@ -5,7 +5,7 @@ import { Int } from '@nestjs/graphql';
 import { Decimal } from '@prisma/client/runtime';
 import { GraphQLDecimal } from 'prisma-graphql-type-decimal';
 import { GraphQLJSON } from 'graphql-type-json';
-import { DummyCreatefriendsInput } from '../prisma/dummy-createfriends.input';
+import { DummyCreatefriendsInput } from './dummy-createfriends.input';
 
 @InputType()
 export class DummyUncheckedCreateInput {

diff --git a/@generated/dummy/dummy-unchecked-update-many.input.ts b/@generated/dummy/dummy-unchecked-update-many.input.ts
@@ -9,7 +9,7 @@ import { NullableBytesFieldUpdateOperationsInput } from '../prisma/nullable-byte
 import { NullableDecimalFieldUpdateOperationsInput } from '../prisma/nullable-decimal-field-update-operations.input';
 import { NullableBigIntFieldUpdateOperationsInput } from '../prisma/nullable-big-int-field-update-operations.input';
 import { GraphQLJSON } from 'graphql-type-json';
-import { DummyUpdatefriendsInput } from '../prisma/dummy-updatefriends.input';
+import { DummyUpdatefriendsInput } from './dummy-updatefriends.input';
 
 @InputType()
 export class DummyUncheckedUpdateManyInput {

diff --git a/@generated/dummy/dummy-unchecked-update.input.ts b/@generated/dummy/dummy-unchecked-update.input.ts
@@ -9,7 +9,7 @@ import { NullableBytesFieldUpdateOperationsInput } from '../prisma/nullable-byte
 import { NullableDecimalFieldUpdateOperationsInput } from '../prisma/nullable-decimal-field-update-operations.input';
 import { NullableBigIntFieldUpdateOperationsInput } from '../prisma/nullable-big-int-field-update-operations.input';
 import { GraphQLJSON } from 'graphql-type-json';
-import { DummyUpdatefriendsInput } from '../prisma/dummy-updatefriends.input';
+import { DummyUpdatefriendsInput } from './dummy-updatefriends.input';
 
 @InputType()
 export class DummyUncheckedUpdateInput {

diff --git a/@generated/dummy/dummy-update-many-mutation.input.ts b/@generated/dummy/dummy-update-many-mutation.input.ts
@@ -9,7 +9,7 @@ import { NullableBytesFieldUpdateOperationsInput } from '../prisma/nullable-byte
 import { NullableDecimalFieldUpdateOperationsInput } from '../prisma/nullable-decimal-field-update-operations.input';
 import { NullableBigIntFieldUpdateOperationsInput } from '../prisma/nullable-big-int-field-update-operations.input';
 import { GraphQLJSON } from 'graphql-type-json';
-import { DummyUpdatefriendsInput } from '../prisma/dummy-updatefriends.input';
+import { DummyUpdatefriendsInput } from './dummy-updatefriends.input';
 
 @InputType()
 export class DummyUpdateManyMutationInput {

diff --git a/@generated/dummy/dummy-update.input.ts b/@generated/dummy/dummy-update.input.ts
@@ -9,7 +9,7 @@ import { NullableBytesFieldUpdateOperationsInput } from '../prisma/nullable-byte
 import { NullableDecimalFieldUpdateOperationsInput } from '../prisma/nullable-decimal-field-update-operations.input';
 import { NullableBigIntFieldUpdateOperationsInput } from '../prisma/nullable-big-int-field-update-operations.input';
 import { GraphQLJSON } from 'graphql-type-json';
-import { DummyUpdatefriendsInput } from '../prisma/dummy-updatefriends.input';
+import { DummyUpdatefriendsInput } from './dummy-updatefriends.input';
 
 @InputType()
 export class DummyUpdateInput {

diff --git a/...rated/prisma/dummy-updatefriends.input.ts → ...erated/dummy/dummy-updatefriends.input.ts b/...rated/prisma/dummy-updatefriends.input.ts → ...erated/dummy/dummy-updatefriends.input.ts
diff --git a/src/handlers/no-atomic-operations.ts b/src/handlers/no-atomic-operations.ts
@@ -1,5 +1,6 @@
 import AwaitEventEmitter from 'await-event-emitter';
 
+import { isListInput } from '../helpers/is-list-input';
 import { EventArguments, InputType } from '../types';
 
 export function noAtomicOperations(eventEmitter: AwaitEventEmitter) {
@@ -8,11 +9,16 @@ export function noAtomicOperations(eventEmitter: AwaitEventEmitter) {
 }
 
 function beforeInputType(args: EventArguments & { inputType: InputType }) {
-  const { inputType } = args;
+  const { inputType, getModelName } = args;
 
   for (const field of inputType.fields) {
     field.inputTypes = field.inputTypes.filter(inputType => {
-      if (isAtomicOperation(String(inputType.type))) {
+      const inputTypeName = String(inputType.type);
+      const modelName = getModelName(inputTypeName);
+      if (
+        isAtomicOperation(inputTypeName) ||
+        (modelName && isListInput(inputTypeName, modelName))
+      ) {
         return false;
       }
       return true;
@@ -25,12 +31,16 @@ function beforeGenerateFiles(args: EventArguments) {
 
   for (const sourceFile of project.getSourceFiles()) {
     const className = sourceFile.getClass(() => true)?.getName();
+
     if (className && isAtomicOperation(className)) {
       project.removeSourceFile(sourceFile);
     }
   }
 }
 
-function isAtomicOperation(name: string) {
-  return name.endsWith('FieldUpdateOperationsInput');
+function isAtomicOperation(typeName: string) {
+  if (typeName.endsWith('FieldUpdateOperationsInput')) {
+    return true;
+  }
+  return false;
 }
diff --git a/src/helpers/get-model-name.ts b/src/helpers/get-model-name.ts
@@ -1,5 +1,7 @@
 import { first, memoize } from 'lodash';
 
+import { isListInput } from './is-list-input';
+
 export function createGetModelName(modelNames: string[]) {
   return memoize(tryGetName);
 
@@ -52,6 +54,15 @@ function getModelName(args: {
       return test;
     }
   }
+
+  if (name.slice(-5) === 'Input') {
+    for (const model of modelNames) {
+      if (isListInput(name, model)) {
+        return model;
+      }
+    }
+  }
+
   // eslint-disable-next-line consistent-return, unicorn/no-useless-undefined
   return undefined;
 }

diff --git a/src/helpers/is-list-input.ts b/src/helpers/is-list-input.ts
@@ -0,0 +1,3 @@
+export function isListInput(typeName: string, model: string) {
+  return typeName.startsWith(`${model}Create`) || typeName.startsWith(`${model}Update`);
+}
diff --git a/src/test/generate.spec.ts b/src/test/generate.spec.ts
@@ -24,7 +24,6 @@ let sourceFiles: SourceFile[];
 let importDeclarations: ImportDeclarationStructure[] = [];
 
 const p = (name: string) => getPropertyStructure(sourceFile, name);
-const d = (name: string) => getPropertyStructure(sourceFile, name)?.decorators?.[0];
 const f = (name: string) =>
   getPropertyStructure(sourceFile, name)?.decorators?.find(d => d.name === 'Field')
     ?.arguments;
@@ -1148,7 +1147,12 @@ describe('get rid of atomic number operations', () => {
               friends String[]
             }
             `,
-      options: [`outputFilePattern = "{name}.{type}.ts"`, `noAtomicOperations = true`],
+      options: [
+        `
+        outputFilePattern = "{name}.{type}.ts"
+        noAtomicOperations = true
+      `,
+      ],
     }));
   });
 
@@ -1165,48 +1169,82 @@ describe('get rid of atomic number operations', () => {
     });
 
     it('id should be regular string', () => {
-      expect(getPropertyStructure(sourceFile, 'id')?.type).toEqual('string');
+      it('rating should be regular string', () => {
+        const s = testSourceFile({
+          project,
+          class: 'UserUpdateInput',
+          property: 'id',
+        });
+        expect(s.property?.type).toEqual('string');
+      });
     });
 
     it('id field type should be string', () => {
-      expect(t('id')).toEqual('() => String');
+      const s = testSourceFile({
+        project,
+        class: 'UserUpdateInput',
+        property: 'id',
+      });
+      expect(s.fieldDecoratorType).toEqual('() => String');
     });
 
     it('age should be regular string', () => {
-      expect(getPropertyStructure(sourceFile, 'age')?.type).toEqual('number');
+      it('rating should be regular string', () => {
+        const s = testSourceFile({
+          project,
+          class: 'UserUpdateInput',
+          property: 'age',
+        });
+        expect(s.property?.type).toEqual('number');
+      });
     });
 
     it('age field type should be string', () => {
-      expect(t('age')).toEqual('() => Int');
+      const s = testSourceFile({
+        project,
+        class: 'UserUpdateInput',
+        property: 'age',
+      });
+      expect(s.fieldDecoratorType).toEqual('() => Int');
     });
 
     it('rating should be regular string', () => {
-      expect(getPropertyStructure(sourceFile, 'rating')?.type).toEqual('number');
+      const s = testSourceFile({
+        project,
+        class: 'UserUpdateInput',
+        property: 'rating',
+      });
+      expect(s.property?.type).toEqual('number');
     });
 
     it('rating field type should be string', () => {
-      expect(t('rating')).toEqual('() => Float');
+      const s = testSourceFile({
+        project,
+        class: 'UserUpdateInput',
+        property: 'rating',
+      });
+      expect(s.fieldDecoratorType).toEqual('() => Float');
     });
 
     it('scalar array', () => {
-      expect(t('friends')).toEqual('() => UserUpdatefriendsInput');
-    });
-  });
-
-  describe('UserUpdatefriendsInput', () => {
-    before(() => {
-      setSourceFile('user-updatefriends.input.ts');
+      const s = testSourceFile({
+        project,
+        class: 'UserUpdateInput',
+        property: 'friends',
+      });
+      expect(s.fieldDecoratorType).toEqual('() => [String]');
     });
   });
 
   describe('date field files', () => {
     const dateFieldFiles = ['user-create.input.ts', 'user-unchecked-update.input.ts'];
 
     for (const file of dateFieldFiles) {
-      it(`date field files ${file}`, () => {
-        setSourceFile(file);
-        expect(p('born')?.type).toEqual('Date | string');
-        expect(t('born')).toEqual('() => Date');
+      it(`date field files [${file}]`, () => {
+        const s = testSourceFile({ project, file, property: 'born' });
+
+        expect(s.fieldDecoratorType).toEqual('() => Date');
+        expect(s.property?.type).toEqual('Date | string');
       });
     }
   });
@@ -1241,6 +1279,39 @@ describe('noAtomicOperations with emitSingle and combineScalarFilters', () => {
   });
 });
 
+describe('scalar arrays with noAtomicOperations', () => {
+  let project: Project;
+  before(async () => {
+    ({ project } = await testGenerate({
+      schema: `
+        model Dummy {
+          id String @id
+          ints Int[]
+        }
+        `,
+      options: [
+        `
+        noAtomicOperations = true
+      `,
+      ],
+    }));
+  });
+
+  describe('ints should be array', () => {
+    for (const className of ['DummyCreateInput']) {
+      it(className, () => {
+        const s = testSourceFile({
+          project,
+          class: className,
+          property: 'ints',
+        });
+
+        expect(s.fieldDecoratorType).toEqual('() => [Int]');
+      });
+    }
+  });
+});
+
 describe('combine scalar filters', () => {
   before(async () => {
     ({ project, sourceFiles } = await testGenerate({