fix: Compound primary key generated type

close #182

Author: unlight

src/helpers/get-where-unique-at-least-keys.ts

@@ -5,11 +5,19 @@ export function getWhereUniqueAtLeastKeys(model: DMMF.Model) {
     .filter(field => field.isUnique || field.isId)
     .map(field => field.name);
 
-  for (const uniqueIndex of model.uniqueIndexes) {
-    const name = uniqueIndex.name || uniqueIndex.fields.join('_');
+  if (model.primaryKey) {
+    names.push(createFieldName(model.primaryKey));
+  }
 
-    names.push(name);
+  for (const uniqueIndex of model.uniqueIndexes) {
+    names.push(createFieldName(uniqueIndex));
   }
 
   return names.map(name => `'${name}'`).join(' | ');
 }
+
+function createFieldName(args: { name?: string | null; fields: string[] }) {
+  const { name, fields } = args;
+
+  return name || fields.join('_');
+}

src/test/compound.spec.ts

@@ -0,0 +1,85 @@
+import expect from 'expect';
+import { Project, SourceFile } from 'ts-morph';
+
+import { testSourceFile } from './helpers';
+import { testGenerate } from './test-generate';
+
+let project: Project;
+let sourceFiles: SourceFile[];
+
+describe('compound index', () => {
+  before(async () => {
+    ({ project, sourceFiles } = await testGenerate({
+      schema: `
+                model User {
+                  id    Int    @id
+                  /// @Validator.MinLength(3)
+                  name String
+                  /// @PropertyType({ name: 'G.Email', from: 'graphql-type-email' })
+                  email String?
+
+                  @@unique([email, name])
+                }
+                model Us {
+                  id    Int    @id
+                }
+                `,
+      options: [
+        `outputFilePattern = "{name}.{type}.ts"`,
+        `fields_Validator_from = "class-validator"`,
+        `fields_Validator_input = true`,
+      ],
+    }));
+  });
+
+  it('user unique input compound', () => {
+    const s = testSourceFile({
+      project,
+      class: 'UserEmailNameCompoundUniqueInput',
+    });
+
+    const minLength = s.classFile.getProperty('name')?.getDecorator('MinLength');
+    expect(minLength?.getText()).toEqual('@Validator.MinLength(3)');
+  });
+
+  it('compound uniq where must be wrapped to prisma atleast', () => {
+    const s = testSourceFile({
+      project,
+      class: 'FindManyUserArgs',
+      property: 'cursor',
+    });
+
+    expect(s.property?.type).toEqual(
+      `Prisma.AtLeast<UserWhereUniqueInput, 'id' | 'email_name'>`,
+    );
+  });
+});
+
+describe('compound primary key', () => {
+  before(async () => {
+    ({ project, sourceFiles } = await testGenerate({
+      schema: `
+                model User {
+                  firstname String
+                  surname String
+                  email String
+
+                  @@id([firstname, surname])
+                }
+                `,
+      options: [`outputFilePattern = "{name}.{type}.ts"`],
+    }));
+  });
+
+  it('compound primary key atleast keys', () => {
+    const s = testSourceFile({
+      project,
+      class: 'FindFirstUserArgs',
+      property: 'cursor',
+    });
+
+    expect(s.property?.type).toEqual(
+      "Prisma.AtLeast<UserWhereUniqueInput, 'firstname_surname'>",
+    );
+  });
+});

src/test/generate.spec.ts

@@ -1905,54 +1905,6 @@ describe('object model options', () => {
   });
 });
 
-describe('compound index', () => {
-  before(async () => {
-    ({ project, sourceFiles } = await testGenerate({
-      schema: `
-                model User {
-                  id    Int    @id
-                  /// @Validator.MinLength(3)
-                  name String
-                  /// @PropertyType({ name: 'G.Email', from: 'graphql-type-email' })
-                  email String?
-
-                  @@unique([email, name])
-                }
-                model Us {
-                  id    Int    @id
-                }
-                `,
-      options: [
-        `outputFilePattern = "{name}.{type}.ts"`,
-        `fields_Validator_from = "class-validator"`,
-        `fields_Validator_input = true`,
-      ],
-    }));
-  });
-
-  it('user unique input compound', () => {
-    const s = testSourceFile({
-      project,
-      class: 'UserEmailNameCompoundUniqueInput',
-    });
-
-    const minLength = s.classFile.getProperty('name')?.getDecorator('MinLength');
-    expect(minLength?.getText()).toEqual('@Validator.MinLength(3)');
-  });
-
-  it('compound uniq where must be wrapped to prisma atleast', () => {
-    const s = testSourceFile({
-      project,
-      class: 'FindManyUserArgs',
-      property: 'cursor',
-    });
-
-    expect(s.property?.type).toEqual(
-      `Prisma.AtLeast<UserWhereUniqueInput, 'id' | 'email_name'>`,
-    );
-  });
-});
-
 describe('field type', () => {
   describe('it overwrites field type based on match expression', () => {
     before(async () => {