chore: update for breaking changes

Author: utkuturunc

test/e2e/deletedAt.test.ts

@@ -1,4 +1,4 @@
-import { PrismaClient, Profile, User } from "@prisma/client";
+import { Prisma, PrismaClient, Profile, User } from "@prisma/client";
 import faker from "faker";
 
 import { createSoftDeleteExtension } from "../../src";
@@ -12,18 +12,17 @@ describe("deletedAt", () => {
   beforeAll(async () => {
     testClient = new PrismaClient();
     testClient = testClient.$extends(
-      createSoftDeleteExtension(
-        {
-          models: {
-            User: {
-              field: "deletedAt",
-              createValue: (deleted) => {
-                return deleted ? new Date() : null;
-              },
+      createSoftDeleteExtension({
+        models: {
+          User: {
+            field: "deletedAt",
+            createValue: (deleted) => {
+              return deleted ? new Date() : null;
             },
           },
         },
-      )
+        dmmf: Prisma.dmmf,
+      })
     );
 
     profile = await client.profile.create({

test/e2e/fluent.test.ts

@@ -1,4 +1,4 @@
-import { PrismaClient, Profile, User } from "@prisma/client";
+import { Prisma, PrismaClient, Profile, User } from "@prisma/client";
 import faker from "faker";
 
 import { createSoftDeleteExtension } from "../../src";
@@ -12,7 +12,10 @@ describe("fluent", () => {
   beforeAll(async () => {
     testClient = new PrismaClient();
     testClient = testClient.$extends(
-      createSoftDeleteExtension({ models: { Comment: true, Profile: true } })
+      createSoftDeleteExtension({
+        models: { Comment: true, Profile: true },
+        dmmf: Prisma.dmmf,
+      })
     );
 
     profile = await client.profile.create({

test/e2e/nestedReads.test.ts

@@ -1,4 +1,4 @@
-import { PrismaClient, User } from "@prisma/client";
+import { Prisma, PrismaClient, User } from "@prisma/client";
 import faker from "faker";
 
 import { createSoftDeleteExtension } from "../../src";
@@ -12,7 +12,7 @@ describe("nested reads", () => {
     testClient = new PrismaClient();
     testClient = testClient.$extends(
       createSoftDeleteExtension(
-        { models: { Comment: true, Profile: true } },
+        { models: { Comment: true, Profile: true }, dmmf: Prisma.dmmf },
         // @ts-expect-error - we don't know what the client is
         { client: testClient }
       )

test/e2e/queries.test.ts

@@ -15,7 +15,7 @@ describe("queries", () => {
   beforeAll(async () => {
     testClient = new PrismaClient();
     testClient = testClient.$extends(
-      createSoftDeleteExtension({ models: { User: true } })
+      createSoftDeleteExtension({ models: { User: true }, dmmf: Prisma.dmmf })
     );
 
     profile = await client.profile.create({
@@ -362,41 +362,42 @@ describe("queries", () => {
       expect(notFoundUser).toBeNull();
     });
 
-    it.failing("does not break interactive transaction", async() => {
+    it.failing("does not break interactive transaction", async () => {
       // eslint-disable-next-line prefer-const
       let localClient = testClient;
 
       // uncomment to make this test succeed
       // localClient = new PrismaClient();
 
-      await localClient.$transaction(async (transactionClient: any) => {
-
-        // read within transaction
-        const userRead1 = await transactionClient.user.findUnique({
-          where: { id: firstUser.id },
-        });
-        expect(userRead1.name).toBe('Jack');
+      await localClient.$transaction(
+        async (transactionClient: any) => {
+          // read within transaction
+          const userRead1 = await transactionClient.user.findUnique({
+            where: { id: firstUser.id },
+          });
+          expect(userRead1.name).toBe("Jack");
 
-        // modify outside of transaction
-        await localClient.user.update({
-          where: { id: firstUser.id },
-          data: {
-            name: 'Jill',
-          },
-        });
+          // modify outside of transaction
+          await localClient.user.update({
+            where: { id: firstUser.id },
+            data: {
+              name: "Jill",
+            },
+          });
 
-        // read again within transaction
-        const userRead2 = await transactionClient.user.findUnique({
-          where: { id: firstUser.id },
-        });
+          // read again within transaction
+          const userRead2 = await transactionClient.user.findUnique({
+            where: { id: firstUser.id },
+          });
 
-        // read is repeatable
-        expect(userRead2.name).toBe('Jack');
-  
-      }, { isolationLevel: Prisma.TransactionIsolationLevel.RepeatableRead });
+          // read is repeatable
+          expect(userRead2.name).toBe("Jack");
+        },
+        { isolationLevel: Prisma.TransactionIsolationLevel.RepeatableRead }
+      );
     });
 
-    it.failing("does not break sequential transaction", async() => {
+    it.failing("does not break sequential transaction", async () => {
       // eslint-disable-next-line prefer-const
       let localClient: PrismaClient = testClient;
 
@@ -406,45 +407,42 @@ describe("queries", () => {
       const [[userRead1, _, userRead2]] = await Promise.all([
         localClient.$transaction(
           [
-
             // read within transaction (userRead1)
             localClient.user.findUniqueOrThrow({
               where: { id: firstUser.id },
             }),
-            
+
             // sleep for 2 seconds to allow concurrent modification
             localClient.$executeRaw`SELECT pg_sleep(1)`,
 
-            
             // read again within transaction (userRead2)
             localClient.user.findUniqueOrThrow({
               where: { id: firstUser.id },
-            })
+            }),
           ],
           {
             isolationLevel: Prisma.TransactionIsolationLevel.RepeatableRead,
           }
         ),
         localClient.$transaction([
-
           // sleep for 1 second to allow first read to happen in other transaction
           localClient.$executeRaw`SELECT pg_sleep(1)`,
 
           // modify
           localClient.user.update({
             where: { id: firstUser.id },
             data: {
-              name: 'Jill',
+              name: "Jill",
             },
-          })
+          }),
         ]),
       ]);
 
       // read is repeatable
-      expect(userRead1.name).toBe('Jack');
-      expect(userRead2.name).toBe('Jack');
+      expect(userRead1.name).toBe("Jack");
+      expect(userRead2.name).toBe("Jack");
     });
-    
+
     it("throws a useful error when invalid where is passed", async () => {
       // throws useful error when no where is passed
       await expect(() => testClient.user.findUnique()).rejects.toThrowError(

test/e2e/where.test.ts

@@ -1,4 +1,4 @@
-import { PrismaClient, Profile, User } from "@prisma/client";
+import { Prisma, PrismaClient, Profile, User } from "@prisma/client";
 import faker from "faker";
 
 import { createSoftDeleteExtension } from "../../src";
@@ -12,7 +12,10 @@ describe("where", () => {
   beforeAll(async () => {
     testClient = new PrismaClient();
     testClient = testClient.$extends(
-      createSoftDeleteExtension({ models: { Comment: true, Profile: true } })
+      createSoftDeleteExtension({
+        models: { Comment: true, Profile: true },
+        dmmf: Prisma.dmmf,
+      })
     );
 
     profile = await client.profile.create({

test/unit/aggregate.test.ts

@@ -1,11 +1,12 @@
 import { createSoftDeleteExtension } from "../../src";
 import { MockClient } from "./utils/mockClient";
+import { Prisma } from "@prisma/client";
 
 describe("aggregate", () => {
   it("does not change aggregate action if model is not in the list", async () => {
     const client = new MockClient();
     const extendedClient = client.$extends(
-      createSoftDeleteExtension({ models: {} })
+      createSoftDeleteExtension({ models: {}, dmmf: Prisma.dmmf })
     );
 
     await extendedClient.user.aggregate({
@@ -27,13 +28,16 @@ describe("aggregate", () => {
         models: {
           User: true,
         },
+        dmmf: Prisma.dmmf,
       })
     );
 
     await extendedClient.user.aggregate({});
 
     // args have been modified
-    expect(extendedClient.user.aggregate.query).toHaveBeenCalledWith({ where: { deleted: false } });
+    expect(extendedClient.user.aggregate.query).toHaveBeenCalledWith({
+      where: { deleted: false },
+    });
   });
 
   it("excludes deleted record from aggregate with where", async () => {
@@ -43,6 +47,7 @@ describe("aggregate", () => {
         models: {
           User: true,
         },
+        dmmf: Prisma.dmmf,
       })
     );
 

test/unit/config.test.ts

@@ -2,6 +2,7 @@ import faker from "faker";
 
 import { createSoftDeleteExtension } from "../../src";
 import { MockClient } from "./utils/mockClient";
+import { Prisma } from "@prisma/client";
 
 describe("config", () => {
   it('does not soft delete models where config is passed as "false"', async () => {
@@ -11,6 +12,7 @@ describe("config", () => {
         models: {
           User: false,
         },
+        dmmf: Prisma.dmmf,
       })
     );
 
@@ -54,6 +56,7 @@ describe("config", () => {
           field: "deletedAt",
           createValue: () => deletedAt,
         },
+        dmmf: Prisma.dmmf,
       })
     );
 
@@ -101,6 +104,7 @@ describe("config", () => {
         defaultConfig: {
           createValue: () => new Date(),
         },
+        dmmf: Prisma.dmmf,
       });
     }).toThrowError(
       "prisma-extension-soft-delete: defaultConfig.field is required"
@@ -117,6 +121,7 @@ describe("config", () => {
         defaultConfig: {
           field: "deletedAt",
         },
+        dmmf: Prisma.dmmf,
       });
     }).toThrowError(
       "prisma-extension-soft-delete: defaultConfig.createValue is required"
@@ -135,6 +140,7 @@ describe("config", () => {
           },
           Comment: true,
         },
+        dmmf: Prisma.dmmf,
       })
     );
 
@@ -186,6 +192,7 @@ describe("config", () => {
             return null;
           },
         },
+        dmmf: Prisma.dmmf,
       })
     );
 

test/unit/count.test.ts

@@ -1,11 +1,12 @@
 import { createSoftDeleteExtension } from "../../src";
 import { MockClient } from "./utils/mockClient";
+import { Prisma } from "@prisma/client";
 
 describe("count", () => {
   it("does not change count action if model is not in the list", async () => {
     const client = new MockClient();
     const extendedClient = client.$extends(
-      createSoftDeleteExtension({ models: {} })
+      createSoftDeleteExtension({ models: {}, dmmf: Prisma.dmmf })
     );
 
     await extendedClient.user.count({});
@@ -19,20 +20,24 @@ describe("count", () => {
     const extendedClient = client.$extends(
       createSoftDeleteExtension({
         models: { User: true },
+        dmmf: Prisma.dmmf,
       })
     );
 
     await extendedClient.user.count(undefined);
 
     // params have been modified
-    expect(extendedClient.user.count.query).toHaveBeenCalledWith({ where: { deleted: false } });
+    expect(extendedClient.user.count.query).toHaveBeenCalledWith({
+      where: { deleted: false },
+    });
   });
 
   it("excludes deleted records from count with empty args", async () => {
     const client = new MockClient();
     const extendedClient = client.$extends(
       createSoftDeleteExtension({
         models: { User: true },
+        dmmf: Prisma.dmmf,
       })
     );
 
@@ -49,6 +54,7 @@ describe("count", () => {
     const extendedClient = client.$extends(
       createSoftDeleteExtension({
         models: { User: true },
+        dmmf: Prisma.dmmf,
       })
     );