prisma-flare 1.1.5 → 1.1.7

package/dist/cli/index.cjs

@@ -349,6 +349,11 @@ function resolvePrismaClientPath(rootDir, output) {
   }
   const schemaDir = path4.join(rootDir, "prisma");
   const absolutePath = path4.resolve(schemaDir, output);
+  const clientEntryPath = path4.join(absolutePath, "client.ts");
+  const clientEntryPathJs = path4.join(absolutePath, "client.js");
+  if (fs4.existsSync(clientEntryPath) || fs4.existsSync(clientEntryPathJs)) {
+    return path4.join(absolutePath, "client");
+  }
   return absolutePath;
 }
 function getPrismaClientPath(rootDir) {
@@ -380,27 +385,24 @@ function generateClient() {
   } else {
     prismaClientImport = getPrismaClientPath(rootDir);
   }
+  const isCustomOutput = hasCustomPrismaOutput(rootDir);
+  if (isCustomOutput || config.prismaClientPath && config.prismaClientPath !== "@prisma/client") {
+    generateNextToPrismaClient(rootDir, prismaClientImport);
+    generateErrorStubInNodeModules(rootDir, prismaClientImport);
+  } else {
+    generateInNodeModules(rootDir);
+  }
+}
+function generateInNodeModules(rootDir) {
   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 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}
 
-import { PrismaClient, Prisma } from '${resolvedImport}';
+import { PrismaClient, Prisma } from '@prisma/client';
 import { createFlareClient } from 'prisma-flare';
 
 // Create and export FlareClient using the factory
@@ -411,9 +413,8 @@ 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('${resolvedImport}');
+const { PrismaClient, Prisma } = require('@prisma/client');
 const { createFlareClient } = require('prisma-flare');
 
 // Create FlareClient using the factory
@@ -428,7 +429,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 '${resolvedImport}';
+import { PrismaClient as BasePrismaClient, Prisma as BasePrisma } from '@prisma/client';
 import type { FlareClientOptions } from 'prisma-flare';
 import type { ModelName } from 'prisma-flare';
 import type FlareBuilder from 'prisma-flare/flareBuilder';
@@ -481,15 +482,145 @@ export declare class FlareClient extends BasePrismaClient {
     path5.join(prismaFlareDir, "package.json"),
     JSON.stringify(packageJson, null, 2)
   );
-  if (isCustomOutput) {
-    console.log(`\u2705 Generated prisma-flare client with custom Prisma output: ${prismaClientImport}`);
-  } else {
-    console.log(`\u2705 Generated prisma-flare client using @prisma/client`);
-  }
+  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;
+  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 '${relativeImportPath}';`);
+}
 
 // src/cli/index.ts
 var import_child_process = require("child_process");

package/dist/cli/index.js

@@ -326,6 +326,11 @@ function resolvePrismaClientPath(rootDir, output) {
   }
   const schemaDir = path4.join(rootDir, "prisma");
   const absolutePath = path4.resolve(schemaDir, output);
+  const clientEntryPath = path4.join(absolutePath, "client.ts");
+  const clientEntryPathJs = path4.join(absolutePath, "client.js");
+  if (fs4.existsSync(clientEntryPath) || fs4.existsSync(clientEntryPathJs)) {
+    return path4.join(absolutePath, "client");
+  }
   return absolutePath;
 }
 function getPrismaClientPath(rootDir) {
@@ -357,27 +362,24 @@ function generateClient() {
   } else {
     prismaClientImport = getPrismaClientPath(rootDir);
   }
+  const isCustomOutput = hasCustomPrismaOutput(rootDir);
+  if (isCustomOutput || config.prismaClientPath && config.prismaClientPath !== "@prisma/client") {
+    generateNextToPrismaClient(rootDir, prismaClientImport);
+    generateErrorStubInNodeModules(rootDir, prismaClientImport);
+  } else {
+    generateInNodeModules(rootDir);
+  }
+}
+function generateInNodeModules(rootDir) {
   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 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}
 
-import { PrismaClient, Prisma } from '${resolvedImport}';
+import { PrismaClient, Prisma } from '@prisma/client';
 import { createFlareClient } from 'prisma-flare';
 
 // Create and export FlareClient using the factory
@@ -388,9 +390,8 @@ 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('${resolvedImport}');
+const { PrismaClient, Prisma } = require('@prisma/client');
 const { createFlareClient } = require('prisma-flare');
 
 // Create FlareClient using the factory
@@ -405,7 +406,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 '${resolvedImport}';
+import { PrismaClient as BasePrismaClient, Prisma as BasePrisma } from '@prisma/client';
 import type { FlareClientOptions } from 'prisma-flare';
 import type { ModelName } from 'prisma-flare';
 import type FlareBuilder from 'prisma-flare/flareBuilder';
@@ -458,15 +459,145 @@ export declare class FlareClient extends BasePrismaClient {
     path5.join(prismaFlareDir, "package.json"),
     JSON.stringify(packageJson, null, 2)
   );
-  if (isCustomOutput) {
-    console.log(`\u2705 Generated prisma-flare client with custom Prisma output: ${prismaClientImport}`);
-  } else {
-    console.log(`\u2705 Generated prisma-flare client using @prisma/client`);
-  }
+  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;
+  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 '${relativeImportPath}';`);
+}
 
 // src/cli/index.ts
 import { spawn } from "child_process";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prisma-flare",
-  "version": "1.1.5",
+  "version": "1.1.7",
   "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,43 @@ 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 and generates the FlareClient next to your Prisma client for full bundler compatibility (Turbopack, Webpack, Vite, etc.):
 
 ```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 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
+```
+
+**Import from the generated flare file:**
+
+```typescript
+// prisma/db.ts
+import './callbacks';
+import { FlareClient } from './generated/flare';  // ← Different import 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.
 
 **Manual override:** If auto-detection doesn't work, add to `prisma-flare.config.json`: