prisma-flare 1.1.6 → 1.1.8

package/dist/cli/index.cjs

@@ -376,25 +376,6 @@ function hasCustomPrismaOutput(rootDir) {
 }
 
 // src/cli/generate-client.ts
-function createSymlinkSafe(target, linkPath) {
-  try {
-    if (fs5.existsSync(linkPath)) {
-      const stats = fs5.lstatSync(linkPath);
-      if (stats.isSymbolicLink()) {
-        fs5.unlinkSync(linkPath);
-      } else if (stats.isDirectory()) {
-        fs5.rmSync(linkPath, { recursive: true });
-      } else {
-        fs5.unlinkSync(linkPath);
-      }
-    }
-    const linkType = process.platform === "win32" ? "junction" : "dir";
-    fs5.symlinkSync(target, linkPath, linkType);
-    return true;
-  } catch (error) {
-    return false;
-  }
-}
 function generateClient() {
   const rootDir = findProjectRoot(process.cwd());
   const config = loadConfig(rootDir);
@@ -404,35 +385,28 @@ function generateClient() {
   } else {
     prismaClientImport = getPrismaClientPath(rootDir);
   }
+  const isCustomOutput = hasCustomPrismaOutput(rootDir);
+  generateInNodeModules(rootDir, prismaClientImport, isCustomOutput);
+  if (isCustomOutput || config.prismaClientPath && config.prismaClientPath !== "@prisma/client") {
+    generateNextToPrismaClient(rootDir, prismaClientImport);
+  }
+}
+function generateInNodeModules(rootDir, prismaClientImport, isCustomOutput) {
   const nodeModulesDir = path5.join(rootDir, "node_modules");
   const prismaFlareDir = path5.join(nodeModulesDir, ".prisma-flare");
   if (!fs5.existsSync(prismaFlareDir)) {
     fs5.mkdirSync(prismaFlareDir, { recursive: true });
   }
   let resolvedImport;
-  let useSymlink = false;
   if (prismaClientImport === "@prisma/client") {
     resolvedImport = "@prisma/client";
   } else {
-    const symlinkPath = path5.join(prismaFlareDir, "prisma-client");
-    let targetDir = prismaClientImport;
-    if (targetDir.endsWith("/client") || targetDir.endsWith("\\client")) {
-      targetDir = path5.dirname(targetDir);
-    }
-    if (createSymlinkSafe(targetDir, symlinkPath)) {
-      useSymlink = true;
-      const hasClientEntry = fs5.existsSync(path5.join(targetDir, "client.ts")) || fs5.existsSync(path5.join(targetDir, "client.js"));
-      resolvedImport = hasClientEntry ? "./prisma-client/client" : "./prisma-client";
-    } else {
-      console.warn("\u26A0\uFE0F  Could not create symlink. Some bundlers may have issues with the generated import path.");
-      resolvedImport = path5.relative(prismaFlareDir, prismaClientImport);
-      if (!resolvedImport.startsWith(".")) {
-        resolvedImport = "./" + resolvedImport;
-      }
-      resolvedImport = resolvedImport.replace(/\\/g, "/");
+    resolvedImport = path5.relative(prismaFlareDir, prismaClientImport);
+    if (!resolvedImport.startsWith(".")) {
+      resolvedImport = "./" + resolvedImport;
     }
+    resolvedImport = resolvedImport.replace(/\\/g, "/");
   }
-  const isCustomOutput = hasCustomPrismaOutput(rootDir);
   const esmContent = `// Generated by prisma-flare - DO NOT EDIT
 // This file provides FlareClient configured for your Prisma client output path
 // Import path: ${prismaClientImport}
@@ -519,16 +493,77 @@ export declare class FlareClient extends BasePrismaClient {
     JSON.stringify(packageJson, null, 2)
   );
   if (isCustomOutput) {
-    console.log(`\u2705 Generated prisma-flare client with custom Prisma output: ${prismaClientImport}`);
-    if (useSymlink) {
-      console.log(`   Using symlink for bundler compatibility`);
-    }
+    console.log(`\u2705 Generated .prisma-flare with custom Prisma output: ${prismaClientImport}`);
+    console.log(`   Location: ${prismaFlareDir}`);
+    console.log(`
+   \u26A0\uFE0F  For Turbopack/bundler compatibility, import from the generated flare.ts instead.`);
   } else {
     console.log(`\u2705 Generated prisma-flare client using @prisma/client`);
+    console.log(`   Location: ${prismaFlareDir}`);
+    console.log(`
+   Import: import { FlareClient } from 'prisma-flare';`);
   }
-  console.log(`   Location: ${prismaFlareDir}`);
+}
+function generateNextToPrismaClient(rootDir, prismaClientImport) {
+  let prismaOutputDir = prismaClientImport;
+  if (prismaOutputDir.endsWith("/client") || prismaOutputDir.endsWith("\\client")) {
+    prismaOutputDir = path5.dirname(prismaOutputDir);
+  }
+  const hasClientEntry = fs5.existsSync(path5.join(prismaOutputDir, "client.ts")) || fs5.existsSync(path5.join(prismaOutputDir, "client.js"));
+  const prismaImportPath = hasClientEntry ? "./client" : "./index";
+  const flareFilePath = path5.join(prismaOutputDir, "flare.ts");
+  const flareContent = `// Generated by prisma-flare - DO NOT EDIT
+// This file provides FlareClient configured for your Prisma client
+// Re-run 'npx prisma-flare generate' after 'npx prisma generate'
+
+import { PrismaClient, Prisma } from '${prismaImportPath}';
+import { createFlareClient } from 'prisma-flare';
+
+// Create and export FlareClient using the factory
+export const FlareClient = createFlareClient(PrismaClient, Prisma);
+
+// Re-export PrismaClient and Prisma for convenience
+export { PrismaClient, Prisma };
+
+// Re-export types from prisma-flare for convenience
+export type { FlareClientOptions, ModelName } from 'prisma-flare';
+export { default as FlareBuilder } from 'prisma-flare/flareBuilder';
+`;
+  const flareDtsPath = path5.join(prismaOutputDir, "flare.d.ts");
+  const flareDtsContent = `// Generated by prisma-flare - DO NOT EDIT
+// TypeScript declarations for FlareClient
+
+import { PrismaClient as BasePrismaClient, Prisma as BasePrisma } from '${prismaImportPath}';
+import type { FlareClientOptions, ModelName } from 'prisma-flare';
+import type FlareBuilder from 'prisma-flare/flareBuilder';
+
+// Re-export PrismaClient and Prisma
+export { BasePrismaClient as PrismaClient, BasePrisma as Prisma };
+
+// Re-export types from prisma-flare
+export type { FlareClientOptions, ModelName };
+export { FlareBuilder };
+
+// FlareClient type that extends the project's PrismaClient
+export declare const FlareClient: {
+  new (options?: FlareClientOptions): BasePrismaClient & {
+    from<T extends ModelName>(modelName: T): FlareBuilder<T>;
+    transaction<R>(
+      fn: (tx: BasePrismaClient) => Promise<R>,
+      options?: { maxWait?: number; timeout?: number; isolationLevel?: any }
+    ): Promise<R>;
+  };
+};
+`;
+  fs5.writeFileSync(flareFilePath, flareContent);
+  fs5.writeFileSync(flareDtsPath, flareDtsContent);
+  const relativeFlareDir = path5.relative(rootDir, prismaOutputDir);
+  const relativeImportPath = "./" + path5.join(relativeFlareDir, "flare").replace(/\\/g, "/");
+  console.log(`\u2705 Generated prisma-flare client with custom Prisma output`);
+  console.log(`   Location: ${prismaOutputDir}`);
+  console.log(`   Files: flare.ts, flare.d.ts`);
   console.log(`
-   Import: import { FlareClient } from 'prisma-flare';`);
+   Import: import { FlareClient } from '${relativeImportPath}';`);
 }
 
 // src/cli/index.ts

package/dist/cli/index.js

@@ -353,25 +353,6 @@ function hasCustomPrismaOutput(rootDir) {
 }
 
 // src/cli/generate-client.ts
-function createSymlinkSafe(target, linkPath) {
-  try {
-    if (fs5.existsSync(linkPath)) {
-      const stats = fs5.lstatSync(linkPath);
-      if (stats.isSymbolicLink()) {
-        fs5.unlinkSync(linkPath);
-      } else if (stats.isDirectory()) {
-        fs5.rmSync(linkPath, { recursive: true });
-      } else {
-        fs5.unlinkSync(linkPath);
-      }
-    }
-    const linkType = process.platform === "win32" ? "junction" : "dir";
-    fs5.symlinkSync(target, linkPath, linkType);
-    return true;
-  } catch (error) {
-    return false;
-  }
-}
 function generateClient() {
   const rootDir = findProjectRoot(process.cwd());
   const config = loadConfig(rootDir);
@@ -381,35 +362,28 @@ function generateClient() {
   } else {
     prismaClientImport = getPrismaClientPath(rootDir);
   }
+  const isCustomOutput = hasCustomPrismaOutput(rootDir);
+  generateInNodeModules(rootDir, prismaClientImport, isCustomOutput);
+  if (isCustomOutput || config.prismaClientPath && config.prismaClientPath !== "@prisma/client") {
+    generateNextToPrismaClient(rootDir, prismaClientImport);
+  }
+}
+function generateInNodeModules(rootDir, prismaClientImport, isCustomOutput) {
   const nodeModulesDir = path5.join(rootDir, "node_modules");
   const prismaFlareDir = path5.join(nodeModulesDir, ".prisma-flare");
   if (!fs5.existsSync(prismaFlareDir)) {
     fs5.mkdirSync(prismaFlareDir, { recursive: true });
   }
   let resolvedImport;
-  let useSymlink = false;
   if (prismaClientImport === "@prisma/client") {
     resolvedImport = "@prisma/client";
   } else {
-    const symlinkPath = path5.join(prismaFlareDir, "prisma-client");
-    let targetDir = prismaClientImport;
-    if (targetDir.endsWith("/client") || targetDir.endsWith("\\client")) {
-      targetDir = path5.dirname(targetDir);
-    }
-    if (createSymlinkSafe(targetDir, symlinkPath)) {
-      useSymlink = true;
-      const hasClientEntry = fs5.existsSync(path5.join(targetDir, "client.ts")) || fs5.existsSync(path5.join(targetDir, "client.js"));
-      resolvedImport = hasClientEntry ? "./prisma-client/client" : "./prisma-client";
-    } else {
-      console.warn("\u26A0\uFE0F  Could not create symlink. Some bundlers may have issues with the generated import path.");
-      resolvedImport = path5.relative(prismaFlareDir, prismaClientImport);
-      if (!resolvedImport.startsWith(".")) {
-        resolvedImport = "./" + resolvedImport;
-      }
-      resolvedImport = resolvedImport.replace(/\\/g, "/");
+    resolvedImport = path5.relative(prismaFlareDir, prismaClientImport);
+    if (!resolvedImport.startsWith(".")) {
+      resolvedImport = "./" + resolvedImport;
     }
+    resolvedImport = resolvedImport.replace(/\\/g, "/");
   }
-  const isCustomOutput = hasCustomPrismaOutput(rootDir);
   const esmContent = `// Generated by prisma-flare - DO NOT EDIT
 // This file provides FlareClient configured for your Prisma client output path
 // Import path: ${prismaClientImport}
@@ -496,16 +470,77 @@ export declare class FlareClient extends BasePrismaClient {
     JSON.stringify(packageJson, null, 2)
   );
   if (isCustomOutput) {
-    console.log(`\u2705 Generated prisma-flare client with custom Prisma output: ${prismaClientImport}`);
-    if (useSymlink) {
-      console.log(`   Using symlink for bundler compatibility`);
-    }
+    console.log(`\u2705 Generated .prisma-flare with custom Prisma output: ${prismaClientImport}`);
+    console.log(`   Location: ${prismaFlareDir}`);
+    console.log(`
+   \u26A0\uFE0F  For Turbopack/bundler compatibility, import from the generated flare.ts instead.`);
   } else {
     console.log(`\u2705 Generated prisma-flare client using @prisma/client`);
+    console.log(`   Location: ${prismaFlareDir}`);
+    console.log(`
+   Import: import { FlareClient } from 'prisma-flare';`);
   }
-  console.log(`   Location: ${prismaFlareDir}`);
+}
+function generateNextToPrismaClient(rootDir, prismaClientImport) {
+  let prismaOutputDir = prismaClientImport;
+  if (prismaOutputDir.endsWith("/client") || prismaOutputDir.endsWith("\\client")) {
+    prismaOutputDir = path5.dirname(prismaOutputDir);
+  }
+  const hasClientEntry = fs5.existsSync(path5.join(prismaOutputDir, "client.ts")) || fs5.existsSync(path5.join(prismaOutputDir, "client.js"));
+  const prismaImportPath = hasClientEntry ? "./client" : "./index";
+  const flareFilePath = path5.join(prismaOutputDir, "flare.ts");
+  const flareContent = `// Generated by prisma-flare - DO NOT EDIT
+// This file provides FlareClient configured for your Prisma client
+// Re-run 'npx prisma-flare generate' after 'npx prisma generate'
+
+import { PrismaClient, Prisma } from '${prismaImportPath}';
+import { createFlareClient } from 'prisma-flare';
+
+// Create and export FlareClient using the factory
+export const FlareClient = createFlareClient(PrismaClient, Prisma);
+
+// Re-export PrismaClient and Prisma for convenience
+export { PrismaClient, Prisma };
+
+// Re-export types from prisma-flare for convenience
+export type { FlareClientOptions, ModelName } from 'prisma-flare';
+export { default as FlareBuilder } from 'prisma-flare/flareBuilder';
+`;
+  const flareDtsPath = path5.join(prismaOutputDir, "flare.d.ts");
+  const flareDtsContent = `// Generated by prisma-flare - DO NOT EDIT
+// TypeScript declarations for FlareClient
+
+import { PrismaClient as BasePrismaClient, Prisma as BasePrisma } from '${prismaImportPath}';
+import type { FlareClientOptions, ModelName } from 'prisma-flare';
+import type FlareBuilder from 'prisma-flare/flareBuilder';
+
+// Re-export PrismaClient and Prisma
+export { BasePrismaClient as PrismaClient, BasePrisma as Prisma };
+
+// Re-export types from prisma-flare
+export type { FlareClientOptions, ModelName };
+export { FlareBuilder };
+
+// FlareClient type that extends the project's PrismaClient
+export declare const FlareClient: {
+  new (options?: FlareClientOptions): BasePrismaClient & {
+    from<T extends ModelName>(modelName: T): FlareBuilder<T>;
+    transaction<R>(
+      fn: (tx: BasePrismaClient) => Promise<R>,
+      options?: { maxWait?: number; timeout?: number; isolationLevel?: any }
+    ): Promise<R>;
+  };
+};
+`;
+  fs5.writeFileSync(flareFilePath, flareContent);
+  fs5.writeFileSync(flareDtsPath, flareDtsContent);
+  const relativeFlareDir = path5.relative(rootDir, prismaOutputDir);
+  const relativeImportPath = "./" + path5.join(relativeFlareDir, "flare").replace(/\\/g, "/");
+  console.log(`\u2705 Generated prisma-flare client with custom Prisma output`);
+  console.log(`   Location: ${prismaOutputDir}`);
+  console.log(`   Files: flare.ts, flare.d.ts`);
   console.log(`
-   Import: import { FlareClient } from 'prisma-flare';`);
+   Import: import { FlareClient } from '${relativeImportPath}';`);
 }
 
 // src/cli/index.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prisma-flare",
-  "version": "1.1.6",
+  "version": "1.1.8",
   "description": "Prisma utilities package with callback system and query builder for chained operations",
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",

package/readme.md

@@ -149,17 +149,46 @@ Example with custom plurals:
 
 ### Custom Prisma Output Path
 
-If you use a custom `output` in your Prisma schema, prisma-flare automatically detects and supports it:
+If you use a custom `output` in your Prisma schema (common with Prisma 7+), prisma-flare automatically detects it:
 
 ```prisma
 // schema.prisma
 generator client {
   provider = "prisma-client-js"
-  output   = "./generated/client"  // Custom output path
+  output   = "./generated"  // Custom output path
 }
 ```
 
-Just run `npx prisma-flare generate` - it parses your `schema.prisma` and configures everything automatically. No extra configuration needed.
+Run `npx prisma-flare generate` after `npx prisma generate`:
+
+```bash
+npx prisma generate
+npx prisma-flare generate
+```
+
+This generates FlareClient in **two locations**:
+1. `node_modules/.prisma-flare/` - for Node.js and general use
+2. `prisma/generated/flare.ts` - for bundler compatibility (Turbopack, Webpack, Vite)
+
+**For Turbopack / Next.js 15+ users:** Import from the generated `flare.ts`:
+
+```typescript
+// prisma/db.ts
+import './callbacks';
+import { FlareClient } from './generated/flare';  // ← Bundler-compatible path
+
+export const db = new FlareClient();
+```
+
+**For Node.js / non-Turbopack users:** You can still import from `prisma-flare`:
+
+```typescript
+// prisma/db.ts
+import './callbacks';
+import { FlareClient } from 'prisma-flare';  // ← Works in Node.js
+
+export const db = new FlareClient();
+```
 
 **Manual override:** If auto-detection doesn't work, add to `prisma-flare.config.json`: