@vaharoni/devops 1.2.14 → 1.2.16

package/dist/src/target-templates/lang-variants-prisma/typescript/db/db-client-test.ts

@@ -107,16 +107,6 @@ export const prismaClientSingleton = () => {
   return client as unknown as ExtendedTransactionClient | FlatTransactionClient;
 };
 
-// Use the same global singleton key as db-client.ts (prismaGlobal)
-// This ensures all code importing from "db" uses the same transactional client
-declare global {
-  // eslint-disable-next-line no-var
-  var prismaGlobal:
-    | ExtendedTransactionClient
-    | FlatTransactionClient
-    | undefined;
-}
-
 export type ExtendedTransactionClient = Prisma.TransactionClient & {
   $begin: () => Promise<FlatTransactionClient>;
 };
@@ -126,10 +116,16 @@ export type FlatTransactionClient = Prisma.TransactionClient & {
   $rollback: () => Promise<void>;
 };
 
+// Use the same global singleton key as db-client.ts (prismaGlobal)
+// This ensures all code importing from "db" uses the same transactional client
+// Note: We don't redeclare the global type here to avoid conflicts with db-client.ts
+// when the IDE loads both files. We use type assertions instead.
+type TestPrismaGlobal = ExtendedTransactionClient | FlatTransactionClient | undefined;
+
 const prisma: ExtendedTransactionClient | FlatTransactionClient =
-  globalThis.prismaGlobal ?? prismaClientSingleton();
+  (globalThis.prismaGlobal as TestPrismaGlobal) ?? prismaClientSingleton();
 
-globalThis.prismaGlobal = prisma;
+(globalThis as { prismaGlobal: TestPrismaGlobal }).prismaGlobal = prisma;
 
 export { prisma };
 

package/dist/src/target-templates/lang-variants-prisma/typescript/db/prisma-setup-vitest.ts

@@ -2,21 +2,35 @@ import { afterEach, beforeEach, vi } from 'vitest';
 import { prisma, rollbackTx, startTx } from './db-client-test';
 
 /**
+ * Vitest setup for Prisma transactional tests.
+ *
+ * Each test runs inside a transaction that is rolled back after the test completes,
+ * ensuring test isolation without persisting data to the database.
+ *
  * Usage:
- *  Create a `vitest.config.ts` in the project's folder with the following content.
- *  Adjust the path to the setup file based on the nesting of the project's folder.
- 
-  import { defineConfig } from 'vitest/config'
-
-  export default defineConfig({
-    test: {
-      setupFiles: ['../../db/prisma-setup-vitest.ts']
-    },
-  })
-  
+ *   Create a `vitest.config.ts` in the project's folder:
+ *
+ *   import { defineConfig } from 'vitest/config'
+ *   export default defineConfig({
+ *     test: {
+ *       setupFiles: ['../../db/prisma-setup-vitest.ts']  // adjust path as needed
+ *     },
+ *   })
+ *
+ * How it works:
+ *   - db-client-test.ts creates a transactional Prisma client and stores it in globalThis.prismaGlobal
+ *   - This is the same singleton key used by db/db-client.ts
+ *   - All code importing from "db" gets the transactional client
+ *   - beforeEach starts a transaction, afterEach rolls it back
  */
 
-vi.mock('db', () => ({ prisma }));
+vi.mock('db', async () => {
+  const prismaClient = await import('@prisma/client');
+  return {
+    ...prismaClient,
+    prisma,
+  };
+});
 
 beforeEach(async () => {
   await startTx();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vaharoni/devops",
   "type": "module",
-  "version": "1.2.14",
+  "version": "1.2.16",
   "description": "Devops utility",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",

package/src/target-templates/lang-variants-prisma/typescript/db/db-client-test.ts

@@ -107,16 +107,6 @@ export const prismaClientSingleton = () => {
   return client as unknown as ExtendedTransactionClient | FlatTransactionClient;
 };
 
-// Use the same global singleton key as db-client.ts (prismaGlobal)
-// This ensures all code importing from "db" uses the same transactional client
-declare global {
-  // eslint-disable-next-line no-var
-  var prismaGlobal:
-    | ExtendedTransactionClient
-    | FlatTransactionClient
-    | undefined;
-}
-
 export type ExtendedTransactionClient = Prisma.TransactionClient & {
   $begin: () => Promise<FlatTransactionClient>;
 };
@@ -126,10 +116,16 @@ export type FlatTransactionClient = Prisma.TransactionClient & {
   $rollback: () => Promise<void>;
 };
 
+// Use the same global singleton key as db-client.ts (prismaGlobal)
+// This ensures all code importing from "db" uses the same transactional client
+// Note: We don't redeclare the global type here to avoid conflicts with db-client.ts
+// when the IDE loads both files. We use type assertions instead.
+type TestPrismaGlobal = ExtendedTransactionClient | FlatTransactionClient | undefined;
+
 const prisma: ExtendedTransactionClient | FlatTransactionClient =
-  globalThis.prismaGlobal ?? prismaClientSingleton();
+  (globalThis.prismaGlobal as TestPrismaGlobal) ?? prismaClientSingleton();
 
-globalThis.prismaGlobal = prisma;
+(globalThis as { prismaGlobal: TestPrismaGlobal }).prismaGlobal = prisma;
 
 export { prisma };
 

package/src/target-templates/lang-variants-prisma/typescript/db/prisma-setup-vitest.ts

@@ -2,21 +2,35 @@ import { afterEach, beforeEach, vi } from 'vitest';
 import { prisma, rollbackTx, startTx } from './db-client-test';
 
 /**
+ * Vitest setup for Prisma transactional tests.
+ *
+ * Each test runs inside a transaction that is rolled back after the test completes,
+ * ensuring test isolation without persisting data to the database.
+ *
  * Usage:
- *  Create a `vitest.config.ts` in the project's folder with the following content.
- *  Adjust the path to the setup file based on the nesting of the project's folder.
- 
-  import { defineConfig } from 'vitest/config'
-
-  export default defineConfig({
-    test: {
-      setupFiles: ['../../db/prisma-setup-vitest.ts']
-    },
-  })
-  
+ *   Create a `vitest.config.ts` in the project's folder:
+ *
+ *   import { defineConfig } from 'vitest/config'
+ *   export default defineConfig({
+ *     test: {
+ *       setupFiles: ['../../db/prisma-setup-vitest.ts']  // adjust path as needed
+ *     },
+ *   })
+ *
+ * How it works:
+ *   - db-client-test.ts creates a transactional Prisma client and stores it in globalThis.prismaGlobal
+ *   - This is the same singleton key used by db/db-client.ts
+ *   - All code importing from "db" gets the transactional client
+ *   - beforeEach starts a transaction, afterEach rolls it back
  */
 
-vi.mock('db', () => ({ prisma }));
+vi.mock('db', async () => {
+  const prismaClient = await import('@prisma/client');
+  return {
+    ...prismaClient,
+    prisma,
+  };
+});
 
 beforeEach(async () => {
   await startTx();