prisma-flare 1.1.8 → 1.1.9

package/dist/cli/index.cjs

@@ -386,120 +386,12 @@ function generateClient() {
     prismaClientImport = getPrismaClientPath(rootDir);
   }
   const isCustomOutput = hasCustomPrismaOutput(rootDir);
-  generateInNodeModules(rootDir, prismaClientImport, isCustomOutput);
-  if (isCustomOutput || config.prismaClientPath && config.prismaClientPath !== "@prisma/client") {
+  const isExplicitCustomPath = config.prismaClientPath && config.prismaClientPath !== "@prisma/client";
+  if (isCustomOutput || isExplicitCustomPath) {
     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;
-  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 '${resolvedImport}';
-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 };
-`;
-  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 { createFlareClient } = require('prisma-flare');
-
-// Create FlareClient using the factory
-const FlareClient = createFlareClient(PrismaClient, Prisma);
-
-module.exports = {
-  FlareClient,
-  PrismaClient,
-  Prisma
-};
-`;
-  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 type { FlareClientOptions } from 'prisma-flare';
-import type { ModelName } from 'prisma-flare';
-import type FlareBuilder from 'prisma-flare/flareBuilder';
-
-// Re-export PrismaClient and Prisma from the configured path
-export { BasePrismaClient as PrismaClient, BasePrisma as Prisma };
-
-// FlareClient type that extends the project's PrismaClient
-export declare class FlareClient extends BasePrismaClient {
-  constructor(options?: FlareClientOptions);
-
-  /**
-   * Creates a new FlareBuilder instance for the specified model.
-   * @param modelName - The name of the model.
-   * @returns FlareBuilder instance
-   */
-  from<T extends ModelName>(modelName: T): FlareBuilder<T>;
-
-  /**
-   * Executes a transaction with the FlareClient capabilities.
-   * @param fn - The transaction function.
-   * @param options - Transaction options.
-   * @returns The result of the transaction.
-   */
-  transaction<R>(
-    fn: (tx: FlareClient) => Promise<R>,
-    options?: { maxWait?: number; timeout?: number; isolationLevel?: any }
-  ): Promise<R>;
-}
-`;
-  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)
-  );
-  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(`\u2705 Using default @prisma/client`);
+    console.log(`   No client generation needed - prisma-flare works out of the box!`);
     console.log(`
    Import: import { FlareClient } from 'prisma-flare';`);
   }
@@ -509,6 +401,11 @@ function generateNextToPrismaClient(rootDir, prismaClientImport) {
   if (prismaOutputDir.endsWith("/client") || prismaOutputDir.endsWith("\\client")) {
     prismaOutputDir = path5.dirname(prismaOutputDir);
   }
+  if (!fs5.existsSync(prismaOutputDir)) {
+    console.error(`\u274C Prisma output directory not found: ${prismaOutputDir}`);
+    console.error(`   Run 'npx prisma generate' first.`);
+    process.exit(1);
+  }
   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");
@@ -527,7 +424,7 @@ 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';
+export { FlareBuilder } from 'prisma-flare';
 `;
   const flareDtsPath = path5.join(prismaOutputDir, "flare.d.ts");
   const flareDtsContent = `// Generated by prisma-flare - DO NOT EDIT
@@ -535,7 +432,7 @@ export { default as FlareBuilder } from 'prisma-flare/flareBuilder';
 
 import { PrismaClient as BasePrismaClient, Prisma as BasePrisma } from '${prismaImportPath}';
 import type { FlareClientOptions, ModelName } from 'prisma-flare';
-import type FlareBuilder from 'prisma-flare/flareBuilder';
+import type { FlareBuilder } from 'prisma-flare';
 
 // Re-export PrismaClient and Prisma
 export { BasePrismaClient as PrismaClient, BasePrisma as Prisma };
@@ -559,7 +456,7 @@ export declare const FlareClient: {
   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(`\u2705 Generated prisma-flare client for custom Prisma output`);
   console.log(`   Location: ${prismaOutputDir}`);
   console.log(`   Files: flare.ts, flare.d.ts`);
   console.log(`

package/dist/cli/index.js

@@ -363,120 +363,12 @@ function generateClient() {
     prismaClientImport = getPrismaClientPath(rootDir);
   }
   const isCustomOutput = hasCustomPrismaOutput(rootDir);
-  generateInNodeModules(rootDir, prismaClientImport, isCustomOutput);
-  if (isCustomOutput || config.prismaClientPath && config.prismaClientPath !== "@prisma/client") {
+  const isExplicitCustomPath = config.prismaClientPath && config.prismaClientPath !== "@prisma/client";
+  if (isCustomOutput || isExplicitCustomPath) {
     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;
-  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 '${resolvedImport}';
-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 };
-`;
-  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 { createFlareClient } = require('prisma-flare');
-
-// Create FlareClient using the factory
-const FlareClient = createFlareClient(PrismaClient, Prisma);
-
-module.exports = {
-  FlareClient,
-  PrismaClient,
-  Prisma
-};
-`;
-  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 type { FlareClientOptions } from 'prisma-flare';
-import type { ModelName } from 'prisma-flare';
-import type FlareBuilder from 'prisma-flare/flareBuilder';
-
-// Re-export PrismaClient and Prisma from the configured path
-export { BasePrismaClient as PrismaClient, BasePrisma as Prisma };
-
-// FlareClient type that extends the project's PrismaClient
-export declare class FlareClient extends BasePrismaClient {
-  constructor(options?: FlareClientOptions);
-
-  /**
-   * Creates a new FlareBuilder instance for the specified model.
-   * @param modelName - The name of the model.
-   * @returns FlareBuilder instance
-   */
-  from<T extends ModelName>(modelName: T): FlareBuilder<T>;
-
-  /**
-   * Executes a transaction with the FlareClient capabilities.
-   * @param fn - The transaction function.
-   * @param options - Transaction options.
-   * @returns The result of the transaction.
-   */
-  transaction<R>(
-    fn: (tx: FlareClient) => Promise<R>,
-    options?: { maxWait?: number; timeout?: number; isolationLevel?: any }
-  ): Promise<R>;
-}
-`;
-  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)
-  );
-  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(`\u2705 Using default @prisma/client`);
+    console.log(`   No client generation needed - prisma-flare works out of the box!`);
     console.log(`
    Import: import { FlareClient } from 'prisma-flare';`);
   }
@@ -486,6 +378,11 @@ function generateNextToPrismaClient(rootDir, prismaClientImport) {
   if (prismaOutputDir.endsWith("/client") || prismaOutputDir.endsWith("\\client")) {
     prismaOutputDir = path5.dirname(prismaOutputDir);
   }
+  if (!fs5.existsSync(prismaOutputDir)) {
+    console.error(`\u274C Prisma output directory not found: ${prismaOutputDir}`);
+    console.error(`   Run 'npx prisma generate' first.`);
+    process.exit(1);
+  }
   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");
@@ -504,7 +401,7 @@ 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';
+export { FlareBuilder } from 'prisma-flare';
 `;
   const flareDtsPath = path5.join(prismaOutputDir, "flare.d.ts");
   const flareDtsContent = `// Generated by prisma-flare - DO NOT EDIT
@@ -512,7 +409,7 @@ export { default as FlareBuilder } from 'prisma-flare/flareBuilder';
 
 import { PrismaClient as BasePrismaClient, Prisma as BasePrisma } from '${prismaImportPath}';
 import type { FlareClientOptions, ModelName } from 'prisma-flare';
-import type FlareBuilder from 'prisma-flare/flareBuilder';
+import type { FlareBuilder } from 'prisma-flare';
 
 // Re-export PrismaClient and Prisma
 export { BasePrismaClient as PrismaClient, BasePrisma as Prisma };
@@ -536,7 +433,7 @@ export declare const FlareClient: {
   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(`\u2705 Generated prisma-flare client for custom Prisma output`);
   console.log(`   Location: ${prismaOutputDir}`);
   console.log(`   Files: flare.ts, flare.d.ts`);
   console.log(`

package/dist/index.cjs

@@ -31,9 +31,9 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var index_exports = {};
 __export(index_exports, {
   FlareBuilder: () => FlareBuilder,
-  FlareClient: () => import__.FlareClient,
-  Prisma: () => import__.Prisma,
-  PrismaClient: () => import__.PrismaClient,
+  FlareClient: () => FlareClient,
+  Prisma: () => import_client.Prisma,
+  PrismaClient: () => import_client.PrismaClient,
   afterChange: () => afterChange,
   afterCreate: () => afterCreate,
   afterDelete: () => afterDelete,
@@ -52,7 +52,7 @@ __export(index_exports, {
   registerHooksLegacy: () => registerHooksLegacy
 });
 module.exports = __toCommonJS(index_exports);
-var import__ = require(".prisma-flare");
+var import_client = require("@prisma/client");
 
 // src/core/modelRegistry.ts
 var ModelRegistry = class {
@@ -1281,6 +1281,9 @@ var AdapterRegistry = class {
 var registry = new AdapterRegistry();
 registry.register(PostgresAdapter);
 registry.register(SqliteAdapter);
+
+// src/index.ts
+var FlareClient = createFlareClient(import_client.PrismaClient, import_client.Prisma);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   FlareBuilder,

package/dist/index.d.cts

@@ -1,6 +1,6 @@
-export { FlareClient, Prisma, PrismaClient } from '.prisma-flare';
 import * as _prisma_client from '@prisma/client';
 import { PrismaClient } from '@prisma/client';
+export { Prisma, PrismaClient } from '@prisma/client';
 import * as _prisma_client_runtime_library from '@prisma/client/runtime/library';
 import { DriverAdapter } from '@prisma/client/runtime/library';
 import FlareBuilder from './core/flareBuilder.cjs';
@@ -280,4 +280,6 @@ declare class AdapterRegistry {
 }
 declare const registry: AdapterRegistry;
 
-export { AfterHookCallback, BeforeHookCallback, ColumnChangeCallback, type DatabaseAdapter, FlareBuilder, type FactoryFlareClientOptions as FlareClientOptions, type HookConfig, HookTiming, ModelName, PrismaOperation, createFlareClient, createHooksExtension, registry as dbAdapterRegistry, hookRegistry, loadCallbacks, modelRegistry, registerHooks, registerHooksLegacy };
+declare const FlareClient: FlareClientClass;
+
+export { AfterHookCallback, BeforeHookCallback, ColumnChangeCallback, type DatabaseAdapter, FlareBuilder, FlareClient, type FactoryFlareClientOptions as FlareClientOptions, type HookConfig, HookTiming, ModelName, PrismaOperation, createFlareClient, createHooksExtension, registry as dbAdapterRegistry, hookRegistry, loadCallbacks, modelRegistry, registerHooks, registerHooksLegacy };

package/dist/index.d.ts

@@ -1,6 +1,6 @@
-export { FlareClient, Prisma, PrismaClient } from '.prisma-flare';
 import * as _prisma_client from '@prisma/client';
 import { PrismaClient } from '@prisma/client';
+export { Prisma, PrismaClient } from '@prisma/client';
 import * as _prisma_client_runtime_library from '@prisma/client/runtime/library';
 import { DriverAdapter } from '@prisma/client/runtime/library';
 import FlareBuilder from './core/flareBuilder.js';
@@ -280,4 +280,6 @@ declare class AdapterRegistry {
 }
 declare const registry: AdapterRegistry;
 
-export { AfterHookCallback, BeforeHookCallback, ColumnChangeCallback, type DatabaseAdapter, FlareBuilder, type FactoryFlareClientOptions as FlareClientOptions, type HookConfig, HookTiming, ModelName, PrismaOperation, createFlareClient, createHooksExtension, registry as dbAdapterRegistry, hookRegistry, loadCallbacks, modelRegistry, registerHooks, registerHooksLegacy };
+declare const FlareClient: FlareClientClass;
+
+export { AfterHookCallback, BeforeHookCallback, ColumnChangeCallback, type DatabaseAdapter, FlareBuilder, FlareClient, type FactoryFlareClientOptions as FlareClientOptions, type HookConfig, HookTiming, ModelName, PrismaOperation, createFlareClient, createHooksExtension, registry as dbAdapterRegistry, hookRegistry, loadCallbacks, modelRegistry, registerHooks, registerHooksLegacy };

package/dist/index.js

@@ -1,5 +1,5 @@
 // src/index.ts
-import { FlareClient, Prisma, PrismaClient } from ".prisma-flare";
+import { PrismaClient, Prisma } from "@prisma/client";
 
 // src/core/modelRegistry.ts
 var ModelRegistry = class {
@@ -1228,6 +1228,9 @@ var AdapterRegistry = class {
 var registry = new AdapterRegistry();
 registry.register(PostgresAdapter);
 registry.register(SqliteAdapter);
+
+// src/index.ts
+var FlareClient = createFlareClient(PrismaClient, Prisma);
 export {
   FlareBuilder,
   FlareClient,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prisma-flare",
-  "version": "1.1.8",
+  "version": "1.1.9",
   "description": "Prisma utilities package with callback system and query builder for chained operations",
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",
@@ -78,11 +78,6 @@
       "import": "./dist/index.js",
       "require": "./dist/index.cjs"
     },
-    "./generated": {
-      "types": "./dist/generated.d.ts",
-      "import": "./dist/generated.js",
-      "require": "./dist/generated.cjs"
-    },
     "./flareBuilder": {
       "types": "./dist/core/flareBuilder.d.ts",
       "import": "./dist/core/flareBuilder.js",
@@ -96,9 +91,6 @@
   },
   "typesVersions": {
     "*": {
-      "generated": [
-        "./dist/generated.d.ts"
-      ],
       "flareBuilder": [
         "./dist/core/flareBuilder.d.ts"
       ],

package/dist/generated.cjs

@@ -1,31 +0,0 @@
-"use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-
-// src/generated.ts
-var generated_exports = {};
-__export(generated_exports, {
-  DB: () => DB
-});
-module.exports = __toCommonJS(generated_exports);
-var DB = class {
-};
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  DB
-});

package/dist/generated.d.cts

@@ -1,4 +0,0 @@
-declare class DB {
-}
-
-export { DB };

package/dist/generated.d.ts

@@ -1,4 +0,0 @@
-declare class DB {
-}
-
-export { DB };

package/dist/generated.js

@@ -1,6 +0,0 @@
-// src/generated.ts
-var DB = class {
-};
-export {
-  DB
-};