prisma-flare 1.1.7 → 1.1.8

package/dist/cli/index.cjs

@@ -386,23 +386,32 @@ function generateClient() {
     prismaClientImport = getPrismaClientPath(rootDir);
   }
   const isCustomOutput = hasCustomPrismaOutput(rootDir);
+  generateInNodeModules(rootDir, prismaClientImport, isCustomOutput);
   if (isCustomOutput || config.prismaClientPath && config.prismaClientPath !== "@prisma/client") {
     generateNextToPrismaClient(rootDir, prismaClientImport);
-    generateErrorStubInNodeModules(rootDir, prismaClientImport);
-  } else {
-    generateInNodeModules(rootDir);
   }
 }
-function generateInNodeModules(rootDir) {
+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;
+  if (prismaClientImport === "@prisma/client") {
+    resolvedImport = "@prisma/client";
+  } else {
+    resolvedImport = path5.relative(prismaFlareDir, prismaClientImport);
+    if (!resolvedImport.startsWith(".")) {
+      resolvedImport = "./" + resolvedImport;
+    }
+    resolvedImport = resolvedImport.replace(/\\/g, "/");
+  }
   const esmContent = `// Generated by prisma-flare - DO NOT EDIT
 // This file provides FlareClient configured for your Prisma client output path
+// Import path: ${prismaClientImport}
 
-import { PrismaClient, Prisma } from '@prisma/client';
+import { PrismaClient, Prisma } from '${resolvedImport}';
 import { createFlareClient } from 'prisma-flare';
 
 // Create and export FlareClient using the factory
@@ -413,8 +422,9 @@ export { PrismaClient, Prisma };
 `;
   const cjsContent = `// Generated by prisma-flare - DO NOT EDIT
 // This file provides FlareClient configured for your Prisma client output path
+// Import path: ${prismaClientImport}
 
-const { PrismaClient, Prisma } = require('@prisma/client');
+const { PrismaClient, Prisma } = require('${resolvedImport}');
 const { createFlareClient } = require('prisma-flare');
 
 // Create FlareClient using the factory
@@ -429,7 +439,7 @@ module.exports = {
   const dtsContent = `// Generated by prisma-flare - DO NOT EDIT
 // This file provides FlareClient configured for your Prisma client output path
 
-import { PrismaClient as BasePrismaClient, Prisma as BasePrisma } from '@prisma/client';
+import { PrismaClient as BasePrismaClient, Prisma as BasePrisma } from '${resolvedImport}';
 import type { FlareClientOptions } from 'prisma-flare';
 import type { ModelName } from 'prisma-flare';
 import type FlareBuilder from 'prisma-flare/flareBuilder';
@@ -482,83 +492,17 @@ export declare class FlareClient extends BasePrismaClient {
     path5.join(prismaFlareDir, "package.json"),
     JSON.stringify(packageJson, null, 2)
   );
-  console.log(`\u2705 Generated prisma-flare client using @prisma/client`);
-  console.log(`   Location: ${prismaFlareDir}`);
-  console.log(`
+  if (isCustomOutput) {
+    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';`);
-}
-function generateErrorStubInNodeModules(rootDir, prismaClientImport) {
-  const nodeModulesDir = path5.join(rootDir, "node_modules");
-  const prismaFlareDir = path5.join(nodeModulesDir, ".prisma-flare");
-  if (!fs5.existsSync(prismaFlareDir)) {
-    fs5.mkdirSync(prismaFlareDir, { recursive: true });
-  }
-  let prismaOutputDir = prismaClientImport;
-  if (prismaOutputDir.endsWith("/client") || prismaOutputDir.endsWith("\\client")) {
-    prismaOutputDir = path5.dirname(prismaOutputDir);
   }
-  const relativeFlareDir = path5.relative(rootDir, prismaOutputDir);
-  const correctImportPath = "./" + path5.join(relativeFlareDir, "flare").replace(/\\/g, "/");
-  const errorMessage = `
-You are using a custom Prisma output path.
-
-Instead of importing from 'prisma-flare', import from your generated flare file:
-
-  import { FlareClient } from '${correctImportPath}';
-
-Run 'npx prisma-flare generate' after 'npx prisma generate' to regenerate.
-`.trim();
-  const esmContent = `// Generated by prisma-flare - DO NOT EDIT
-// This project uses a custom Prisma output path.
-// You must import from the generated flare.ts file instead.
-
-throw new Error(\`${errorMessage.replace(/`/g, "\\`")}\`);
-`;
-  const cjsContent = `// Generated by prisma-flare - DO NOT EDIT
-// This project uses a custom Prisma output path.
-// You must import from the generated flare.ts file instead.
-
-throw new Error(\`${errorMessage.replace(/`/g, "\\`")}\`);
-`;
-  const dtsContent = `// Generated by prisma-flare - DO NOT EDIT
-// This project uses a custom Prisma output path.
-//
-// DO NOT import from 'prisma-flare' - import from your generated flare file:
-//
-//   import { FlareClient } from '${correctImportPath}';
-//
-
-/** @deprecated Import from '${correctImportPath}' instead */
-export declare const FlareClient: never;
-
-/** @deprecated Import from '${correctImportPath}' instead */
-export declare const PrismaClient: never;
-
-/** @deprecated Import from '${correctImportPath}' instead */
-export declare const Prisma: never;
-`;
-  fs5.writeFileSync(path5.join(prismaFlareDir, "index.js"), esmContent);
-  fs5.writeFileSync(path5.join(prismaFlareDir, "index.cjs"), cjsContent);
-  fs5.writeFileSync(path5.join(prismaFlareDir, "index.d.ts"), dtsContent);
-  const packageJson = {
-    name: ".prisma-flare",
-    version: "0.0.0",
-    main: "./index.cjs",
-    module: "./index.js",
-    types: "./index.d.ts",
-    type: "module",
-    exports: {
-      ".": {
-        types: "./index.d.ts",
-        import: "./index.js",
-        require: "./index.cjs"
-      }
-    }
-  };
-  fs5.writeFileSync(
-    path5.join(prismaFlareDir, "package.json"),
-    JSON.stringify(packageJson, null, 2)
-  );
 }
 function generateNextToPrismaClient(rootDir, prismaClientImport) {
   let prismaOutputDir = prismaClientImport;

package/dist/cli/index.js

@@ -363,23 +363,32 @@ function generateClient() {
     prismaClientImport = getPrismaClientPath(rootDir);
   }
   const isCustomOutput = hasCustomPrismaOutput(rootDir);
+  generateInNodeModules(rootDir, prismaClientImport, isCustomOutput);
   if (isCustomOutput || config.prismaClientPath && config.prismaClientPath !== "@prisma/client") {
     generateNextToPrismaClient(rootDir, prismaClientImport);
-    generateErrorStubInNodeModules(rootDir, prismaClientImport);
-  } else {
-    generateInNodeModules(rootDir);
   }
 }
-function generateInNodeModules(rootDir) {
+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;
+  if (prismaClientImport === "@prisma/client") {
+    resolvedImport = "@prisma/client";
+  } else {
+    resolvedImport = path5.relative(prismaFlareDir, prismaClientImport);
+    if (!resolvedImport.startsWith(".")) {
+      resolvedImport = "./" + resolvedImport;
+    }
+    resolvedImport = resolvedImport.replace(/\\/g, "/");
+  }
   const esmContent = `// Generated by prisma-flare - DO NOT EDIT
 // This file provides FlareClient configured for your Prisma client output path
+// Import path: ${prismaClientImport}
 
-import { PrismaClient, Prisma } from '@prisma/client';
+import { PrismaClient, Prisma } from '${resolvedImport}';
 import { createFlareClient } from 'prisma-flare';
 
 // Create and export FlareClient using the factory
@@ -390,8 +399,9 @@ export { PrismaClient, Prisma };
 `;
   const cjsContent = `// Generated by prisma-flare - DO NOT EDIT
 // This file provides FlareClient configured for your Prisma client output path
+// Import path: ${prismaClientImport}
 
-const { PrismaClient, Prisma } = require('@prisma/client');
+const { PrismaClient, Prisma } = require('${resolvedImport}');
 const { createFlareClient } = require('prisma-flare');
 
 // Create FlareClient using the factory
@@ -406,7 +416,7 @@ module.exports = {
   const dtsContent = `// Generated by prisma-flare - DO NOT EDIT
 // This file provides FlareClient configured for your Prisma client output path
 
-import { PrismaClient as BasePrismaClient, Prisma as BasePrisma } from '@prisma/client';
+import { PrismaClient as BasePrismaClient, Prisma as BasePrisma } from '${resolvedImport}';
 import type { FlareClientOptions } from 'prisma-flare';
 import type { ModelName } from 'prisma-flare';
 import type FlareBuilder from 'prisma-flare/flareBuilder';
@@ -459,83 +469,17 @@ export declare class FlareClient extends BasePrismaClient {
     path5.join(prismaFlareDir, "package.json"),
     JSON.stringify(packageJson, null, 2)
   );
-  console.log(`\u2705 Generated prisma-flare client using @prisma/client`);
-  console.log(`   Location: ${prismaFlareDir}`);
-  console.log(`
+  if (isCustomOutput) {
+    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';`);
-}
-function generateErrorStubInNodeModules(rootDir, prismaClientImport) {
-  const nodeModulesDir = path5.join(rootDir, "node_modules");
-  const prismaFlareDir = path5.join(nodeModulesDir, ".prisma-flare");
-  if (!fs5.existsSync(prismaFlareDir)) {
-    fs5.mkdirSync(prismaFlareDir, { recursive: true });
-  }
-  let prismaOutputDir = prismaClientImport;
-  if (prismaOutputDir.endsWith("/client") || prismaOutputDir.endsWith("\\client")) {
-    prismaOutputDir = path5.dirname(prismaOutputDir);
   }
-  const relativeFlareDir = path5.relative(rootDir, prismaOutputDir);
-  const correctImportPath = "./" + path5.join(relativeFlareDir, "flare").replace(/\\/g, "/");
-  const errorMessage = `
-You are using a custom Prisma output path.
-
-Instead of importing from 'prisma-flare', import from your generated flare file:
-
-  import { FlareClient } from '${correctImportPath}';
-
-Run 'npx prisma-flare generate' after 'npx prisma generate' to regenerate.
-`.trim();
-  const esmContent = `// Generated by prisma-flare - DO NOT EDIT
-// This project uses a custom Prisma output path.
-// You must import from the generated flare.ts file instead.
-
-throw new Error(\`${errorMessage.replace(/`/g, "\\`")}\`);
-`;
-  const cjsContent = `// Generated by prisma-flare - DO NOT EDIT
-// This project uses a custom Prisma output path.
-// You must import from the generated flare.ts file instead.
-
-throw new Error(\`${errorMessage.replace(/`/g, "\\`")}\`);
-`;
-  const dtsContent = `// Generated by prisma-flare - DO NOT EDIT
-// This project uses a custom Prisma output path.
-//
-// DO NOT import from 'prisma-flare' - import from your generated flare file:
-//
-//   import { FlareClient } from '${correctImportPath}';
-//
-
-/** @deprecated Import from '${correctImportPath}' instead */
-export declare const FlareClient: never;
-
-/** @deprecated Import from '${correctImportPath}' instead */
-export declare const PrismaClient: never;
-
-/** @deprecated Import from '${correctImportPath}' instead */
-export declare const Prisma: never;
-`;
-  fs5.writeFileSync(path5.join(prismaFlareDir, "index.js"), esmContent);
-  fs5.writeFileSync(path5.join(prismaFlareDir, "index.cjs"), cjsContent);
-  fs5.writeFileSync(path5.join(prismaFlareDir, "index.d.ts"), dtsContent);
-  const packageJson = {
-    name: ".prisma-flare",
-    version: "0.0.0",
-    main: "./index.cjs",
-    module: "./index.js",
-    types: "./index.d.ts",
-    type: "module",
-    exports: {
-      ".": {
-        types: "./index.d.ts",
-        import: "./index.js",
-        require: "./index.cjs"
-      }
-    }
-  };
-  fs5.writeFileSync(
-    path5.join(prismaFlareDir, "package.json"),
-    JSON.stringify(packageJson, null, 2)
-  );
 }
 function generateNextToPrismaClient(rootDir, prismaClientImport) {
   let prismaOutputDir = prismaClientImport;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prisma-flare",
-  "version": "1.1.7",
+  "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,7 +149,7 @@ Example with custom plurals:
 
 ### Custom Prisma Output Path
 
-If you use a custom `output` in your Prisma schema (common with Prisma 7+), prisma-flare automatically detects it and generates the FlareClient next to your Prisma client for full bundler compatibility (Turbopack, Webpack, Vite, etc.):
+If you use a custom `output` in your Prisma schema (common with Prisma 7+), prisma-flare automatically detects it:
 
 ```prisma
 // schema.prisma
@@ -166,26 +166,29 @@ npx prisma generate
 npx prisma-flare generate
 ```
 
-This creates `flare.ts` next to your Prisma client:
-```
-prisma/
-  generated/
-    client.ts     ← Prisma generates this
-    flare.ts      ← prisma-flare generates this
-    flare.d.ts    ← TypeScript declarations
-```
+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)
 
-**Import from the generated flare file:**
+**For Turbopack / Next.js 15+ users:** Import from the generated `flare.ts`:
 
 ```typescript
 // prisma/db.ts
 import './callbacks';
-import { FlareClient } from './generated/flare';  // ← Different import path!
+import { FlareClient } from './generated/flare';  // ← Bundler-compatible path
 
 export const db = new FlareClient();
 ```
 
-> **Note:** With custom outputs, importing from `'prisma-flare'` directly will throw an error guiding you to the correct import path.
+**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`: