feat(indexes): include block level id

Author: marcjulian

__tests__/fixtures/table.datamodel.ts

@@ -1,5 +1,3 @@
-import { datamodelDbml } from './dbml.datamodel';
-import { datamodelOneToOneAndManyToOne } from './relations.datamodel';
 export const datamodelSingleTable = /* Prisma */ `
   model User {
     id Int @id @default(autoincrement())
@@ -58,3 +56,27 @@ export const datamodelTableWithTwoCompositeUniqueIndex = /* Prisma */ `
     @@unique([e, c])
   }
 `;
+
+export const datamodelTableWithBlockId = /* Prisma */ `
+  model User {
+    firstName String
+    lastName  String
+    email     String  @unique
+    isAdmin   Boolean @default(false)
+
+    @@id([firstName, lastName])
+  }
+`;
+
+export const datamodelTableWithBlockIdAndCompositeUnqiue = /* Prisma */ `
+  model User {
+    firstName String
+    lastName  String
+    email     String
+    role      String
+    isAdmin   Boolean @default(false)
+
+    @@id([firstName, lastName])
+    @@unique([email, role])
+  }
+`;

__tests__/table.test.ts

@@ -1,5 +1,7 @@
 import {
   datamodelSingleTable,
+  datamodelTableWithBlockId,
+  datamodelTableWithBlockIdAndCompositeUnqiue,
   datamodelTableWithOneCompositeUniqueIndex,
   datamodelTableWithSingleCompositeUniqueIndex,
   datamodelTableWithStringDefaults,
@@ -120,4 +122,47 @@ describe('Tables', () => {
     expect(enums.length).toEqual(1);
     expect(enums[0]).toMatch(expected);
   });
+
+  test('generate a table with block id', async () => {
+    const dmmf = await generateDMMF(datamodelTableWithBlockId);
+
+    const expected = `Table User {
+  firstName String [not null]
+  lastName String [not null]
+  email String [unique, not null]
+  isAdmin Boolean [not null, default: false]
+
+  indexes {
+    (firstName, lastName) [pk]
+  }
+}`;
+
+    const enums = generateTables(dmmf.datamodel.models);
+
+    expect(enums.length).toEqual(1);
+    expect(enums[0]).toMatch(expected);
+  });
+  test('generate a table with block id and composite unique index', async () => {
+    const dmmf = await generateDMMF(
+      datamodelTableWithBlockIdAndCompositeUnqiue
+    );
+
+    const expected = `Table User {
+  firstName String [not null]
+  lastName String [not null]
+  email String [not null]
+  role String [not null]
+  isAdmin Boolean [not null, default: false]
+
+  indexes {
+    (firstName, lastName) [pk]
+    (email, role) [unique]
+  }
+}`;
+
+    const enums = generateTables(dmmf.datamodel.models);
+
+    expect(enums.length).toEqual(1);
+    expect(enums[0]).toMatch(expected);
+  });
 });

src/cli/dbml-generator.ts

@@ -17,7 +17,7 @@ export async function generate(options: GeneratorOptions) {
   try {
     await mkdir(outputDir, { recursive: true });
 
-    await writeFile('./test.json', JSON.stringify(options.dmmf.datamodel));
+    // await writeFile('./test.json', JSON.stringify(options.dmmf.datamodel));
 
     const dbmlSchema = generateDBMLSchema(options.dmmf, allowManyToMany);
 

src/generator/table.ts

@@ -13,16 +13,27 @@ export function generateTables(models: DMMF.Model[]): string[] {
 }
 
 const generateTableIndexes = (model: DMMF.Model): string => {
-  const hasTableIndexes =
-    model.idFields.length > 0 || model.uniqueFields.length > 0;
-  return hasTableIndexes
-    ? `\n\n  ${DBMLKeywords.Indexes} {\n${generateTableUniqueFields(
-        model.uniqueFields
-      )}\n  }`
+  const hasIdFields = model.idFields.length > 0;
+  const hasCompositeUniqueIndex = model.uniqueFields.length > 0;
+  return hasIdFields || hasCompositeUniqueIndex
+    ? `\n\n  ${DBMLKeywords.Indexes} {\n${generateTableBlockId(
+        model.idFields
+      )}${
+        hasIdFields && hasCompositeUniqueIndex ? '\n' : ''
+      }${generateTableCompositeUniqueIndex(model.uniqueFields)}\n  }`
     : '';
 };
 
-const generateTableUniqueFields = (uniqueFields: string[][]): string => {
+const generateTableBlockId = (idFields: string[]): string => {
+  if (idFields.length === 0) {
+    return '';
+  }
+  return `    (${idFields.join(', ')}) [${DBMLKeywords.Pk}]`;
+};
+
+const generateTableCompositeUniqueIndex = (
+  uniqueFields: string[][]
+): string => {
   return uniqueFields
     .map(
       (composite) => `    (${composite.join(', ')}) [${DBMLKeywords.Unique}]`