fix: No atomic operations for scalar input list

resident-advisor · May 22, 2022 · e55767b · e55767b
1 parent 4be5d49
commit e55767b
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 17 deletions.
diff --git a/src/handlers/no-atomic-operations.ts b/src/handlers/no-atomic-operations.ts
@@ -1,6 +1,5 @@
 import AwaitEventEmitter from 'await-event-emitter';
 
-import { isListInput } from '../helpers/is-list-input';
 import { EventArguments, InputType } from '../types';
 
 export function noAtomicOperations(eventEmitter: AwaitEventEmitter) {
@@ -12,12 +11,14 @@ function beforeInputType(args: EventArguments & { inputType: InputType }) {
   const { inputType, getModelName } = args;
 
   for (const field of inputType.fields) {
+    const fieldName = field.name;
     field.inputTypes = field.inputTypes.filter(inputType => {
       const inputTypeName = String(inputType.type);
       const modelName = getModelName(inputTypeName);
+
       if (
         isAtomicOperation(inputTypeName) ||
-        (modelName && isListInput(inputTypeName, modelName))
+        (modelName && isListInput(inputTypeName, modelName, fieldName))
       ) {
         return false;
       }
@@ -44,3 +45,10 @@ function isAtomicOperation(typeName: string) {
   }
   return false;
 }
+
+function isListInput(typeName: string, model: string, field: string) {
+  return (
+    typeName === `${model}Create${field}Input` ||
+    typeName === `${model}Update${field}Input`
+  );
+}
diff --git a/src/helpers/get-model-name.ts b/src/helpers/get-model-name.ts
@@ -1,7 +1,5 @@
 import { first, memoize } from 'lodash';
 
-import { isListInput } from './is-list-input';
-
 export function createGetModelName(modelNames: string[]) {
   return memoize(tryGetName);
 
@@ -55,14 +53,6 @@ function getModelName(args: {
     }
   }
 
-  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;
 }
@@ -107,6 +97,8 @@ const splitKeywords = [
   'MinOrderBy',
   'MaxOrderBy',
   'AvgOrderBy',
+  'Create',
+  'Update',
 ].sort((a, b) => b.length - a.length);
 
 const endsWithKeywords = [

diff --git a/src/helpers/is-list-input.ts b/src/helpers/is-list-input.ts
diff --git a/src/test/generate.spec.ts b/src/test/generate.spec.ts
@@ -1284,9 +1284,15 @@ describe('scalar arrays with noAtomicOperations', () => {
   before(async () => {
     ({ project } = await testGenerate({
       schema: `
-        model Dummy {
+        model User {
           id String @id
           ints Int[]
+          articles Article[] @relation("ArticleAuthor")
+        }
+        model Article {
+          id String @id
+          author   User   @relation(name: "ArticleAuthor", fields: [authorId], references: [id])
+          authorId String
         }
         `,
       options: [
@@ -1298,7 +1304,7 @@ describe('scalar arrays with noAtomicOperations', () => {
   });
 
   describe('ints should be array', () => {
-    for (const className of ['DummyCreateInput']) {
+    for (const className of ['UserCreateInput']) {
       it(className, () => {
         const s = testSourceFile({
           project,
@@ -1310,6 +1316,16 @@ describe('scalar arrays with noAtomicOperations', () => {
       });
     }
   });
+
+  it('create many inputs should not be deleted', () => {
+    const s = testSourceFile({
+      project,
+      class: 'UserCreateInput',
+      property: 'articles',
+    });
+
+    expect(s.property?.type).toBe('ArticleCreateNestedManyWithoutAuthorInput');
+  });
 });
 
 describe('combine scalar filters', () => {