prisma-flare 1.0.0 → 1.1.1

package/dist/index.cjs

@@ -52,7 +52,7 @@ __export(index_exports, {
 module.exports = __toCommonJS(index_exports);
 
 // src/core/extendedPrismaClient.ts
-var import_client = require("@prisma/client");
+var import_client2 = require("@prisma/client");
 
 // src/core/modelRegistry.ts
 var ModelRegistry = class {
@@ -710,53 +710,6 @@ var FlareBuilder = class _FlareBuilder {
   }
 };
 
-// src/core/extendedPrismaClient.ts
-var FlareClient = class extends import_client.PrismaClient {
-  constructor(options = {}) {
-    super(options);
-  }
-  /**
-   * Creates a new FlareBuilder instance for the specified model.
-   * @param modelName - The name of the model.
-   * @returns FlareBuilder instance
-   */
-  from(modelName) {
-    const key = modelName.charAt(0).toLowerCase() + modelName.slice(1);
-    const model = this[key];
-    if (!model) {
-      throw new Error(`Model ${modelName} does not exist on PrismaClient.`);
-    }
-    return new FlareBuilder(model);
-  }
-  /**
-   * Executes a transaction with the FlareClient capabilities.
-   * @param fn - The transaction function.
-   * @param options - Transaction options.
-   * @returns The result of the transaction.
-   */
-  async transaction(fn, options) {
-    return super.$transaction(async (tx) => {
-      const extendedTx = new Proxy(tx, {
-        get: (target, prop, receiver) => {
-          if (prop === "from") {
-            return (modelName) => {
-              const key = modelName.charAt(0).toLowerCase() + modelName.slice(1);
-              const model = target[key];
-              if (!model) {
-                throw new Error(`Model ${modelName} does not exist on TransactionClient.`);
-              }
-              return new FlareBuilder(model);
-            };
-          }
-          return Reflect.get(target, prop, receiver);
-        }
-      });
-      return fn(extendedTx);
-    }, options);
-  }
-};
-var ExtendedPrismaClient = FlareClient;
-
 // src/core/hookRegistry.ts
 function valuesEqual(a, b) {
   if (a == null && b == null) return true;
@@ -928,74 +881,8 @@ var HookRegistry = class {
 var hookRegistry = new HookRegistry();
 var hookRegistry_default = hookRegistry;
 
-// src/core/hooks.ts
-function normalizeModelName(model) {
-  return model.toLowerCase();
-}
-function beforeCreate(model, callback) {
-  hookRegistry_default.addHook(normalizeModelName(model), "create", "before", callback);
-}
-function beforeDelete(model, callback) {
-  hookRegistry_default.addHook(normalizeModelName(model), "delete", "before", callback);
-}
-function afterCreate(model, callback) {
-  hookRegistry_default.addHook(normalizeModelName(model), "create", "after", callback);
-}
-function afterDelete(model, callback) {
-  hookRegistry_default.addHook(normalizeModelName(model), "delete", "after", callback);
-}
-function beforeUpdate(model, callback) {
-  hookRegistry_default.addHook(normalizeModelName(model), "update", "before", callback);
-}
-function afterUpdate(model, callback) {
-  hookRegistry_default.addHook(normalizeModelName(model), "update", "after", callback);
-}
-function afterChange(model, column, callback) {
-  hookRegistry_default.addColumnHook(normalizeModelName(model), column, callback);
-}
-function afterUpsert(model, callback) {
-  hookRegistry_default.addHook(normalizeModelName(model), "upsert", "after", callback);
-}
-
-// src/core/hookMiddleware.ts
-var import_client2 = require("@prisma/client");
-
-// src/cli/config.ts
-var fs = __toESM(require("fs"), 1);
-var path = __toESM(require("path"), 1);
-function findProjectRoot(currentDir) {
-  if (fs.existsSync(path.join(currentDir, "package.json"))) {
-    return currentDir;
-  }
-  const parentDir = path.dirname(currentDir);
-  if (parentDir === currentDir) {
-    throw new Error("Could not find package.json");
-  }
-  return findProjectRoot(parentDir);
-}
-function loadConfig(rootDir) {
-  const projectRoot = rootDir || findProjectRoot(process.cwd());
-  const configPath = path.join(projectRoot, "prisma-flare.config.json");
-  let config = {
-    modelsPath: "prisma/models",
-    dbPath: "prisma/db",
-    callbacksPath: "prisma/callbacks"
-  };
-  if (fs.existsSync(configPath)) {
-    try {
-      const configFile = fs.readFileSync(configPath, "utf-8");
-      const userConfig = JSON.parse(configFile);
-      config = { ...config, ...userConfig };
-    } catch {
-      console.warn("\u26A0\uFE0F Could not read prisma-flare.config.json, using defaults.");
-    }
-  }
-  return {
-    ...config
-  };
-}
-
 // src/core/hookMiddleware.ts
+var import_client = require("@prisma/client");
 var import_fs = __toESM(require("fs"), 1);
 var import_path = __toESM(require("path"), 1);
 function supportsTypeScriptImports() {
@@ -1066,7 +953,7 @@ async function executeHookLogic(prisma, model, action, args, next) {
   const isUpdateAction = action === "update" || action === "updateMany";
   if (hasColumnHooks && isUpdateAction) {
     fields = hookRegistry_default.getRelevantFields(modelName);
-    prevData = await fetchAffectedRecords(prisma, modelName, args.where, fields);
+    prevData = await fetchAffectedRecords(prisma, model, args.where, fields);
     shouldRunColumnHooks = hookRegistry_default.shouldRunColumnHooks(modelName, prevData.length, { __flare: flareOptions });
   }
   await hookRegistry_default.runHooks("before", modelName, action, [args], prisma);
@@ -1074,7 +961,7 @@ async function executeHookLogic(prisma, model, action, args, next) {
   if (shouldRunColumnHooks && prevData.length > 0) {
     let newData = [];
     const ids = prevData.map((r) => r.id);
-    newData = await fetchAffectedRecords(prisma, modelName, { id: { in: ids } }, fields);
+    newData = await fetchAffectedRecords(prisma, model, { id: { in: ids } }, fields);
     for (let i = 0; i < prevData.length; i++) {
       const prevRecord = prevData[i];
       const newRecord = newData.find((record) => record.id === prevRecord.id);
@@ -1094,7 +981,7 @@ function supportsPrisma6Middleware(prisma) {
   return typeof prisma.$use === "function";
 }
 function createHooksExtension(basePrisma) {
-  return import_client2.Prisma.defineExtension({
+  return import_client.Prisma.defineExtension({
     name: "prisma-flare-hooks",
     query: {
       $allModels: {
@@ -1117,23 +1004,102 @@ function registerHooksLegacy(prisma) {
     return executeHookLogic(prisma, model, action, args, () => next(params));
   });
 }
-async function registerHooks(prisma) {
-  let client;
+function registerHooks(prisma) {
   if (supportsPrisma6Middleware(prisma)) {
     registerHooksLegacy(prisma);
-    client = prisma;
+    return prisma;
   } else {
     const extension = createHooksExtension(prisma);
-    client = prisma.$extends(extension);
+    return prisma.$extends(extension);
+  }
+}
+
+// src/core/extendedPrismaClient.ts
+function supportsPrisma6Middleware2(prisma) {
+  return typeof prisma.$use === "function";
+}
+var FlareClient = class extends import_client2.PrismaClient {
+  constructor(options = {}) {
+    const { callbacks = true, ...prismaOptions } = options;
+    super(prismaOptions);
+    if (callbacks) {
+      if (supportsPrisma6Middleware2(this)) {
+        registerHooksLegacy(this);
+      } else {
+        const extension = createHooksExtension(this);
+        return this.$extends(extension);
+      }
+    }
+  }
+  /**
+   * Creates a new FlareBuilder instance for the specified model.
+   * @param modelName - The name of the model.
+   * @returns FlareBuilder instance
+   */
+  from(modelName) {
+    const key = modelName.charAt(0).toLowerCase() + modelName.slice(1);
+    const model = this[key];
+    if (!model) {
+      throw new Error(`Model ${modelName} does not exist on PrismaClient.`);
+    }
+    return new FlareBuilder(model);
   }
-  try {
-    const config = loadConfig();
-    const projectRoot = findProjectRoot(process.cwd());
-    const callbacksPath = import_path.default.join(projectRoot, config.callbacksPath);
-    await loadCallbacks(callbacksPath);
-  } catch {
+  /**
+   * Executes a transaction with the FlareClient capabilities.
+   * @param fn - The transaction function.
+   * @param options - Transaction options.
+   * @returns The result of the transaction.
+   */
+  async transaction(fn, options) {
+    return super.$transaction(async (tx) => {
+      const extendedTx = new Proxy(tx, {
+        get: (target, prop, receiver) => {
+          if (prop === "from") {
+            return (modelName) => {
+              const key = modelName.charAt(0).toLowerCase() + modelName.slice(1);
+              const model = target[key];
+              if (!model) {
+                throw new Error(`Model ${modelName} does not exist on TransactionClient.`);
+              }
+              return new FlareBuilder(model);
+            };
+          }
+          return Reflect.get(target, prop, receiver);
+        }
+      });
+      return fn(extendedTx);
+    }, options);
   }
-  return client;
+};
+var ExtendedPrismaClient = FlareClient;
+
+// src/core/hooks.ts
+function normalizeModelName(model) {
+  return model.toLowerCase();
+}
+function beforeCreate(model, callback) {
+  hookRegistry_default.addHook(normalizeModelName(model), "create", "before", callback);
+}
+function beforeDelete(model, callback) {
+  hookRegistry_default.addHook(normalizeModelName(model), "delete", "before", callback);
+}
+function afterCreate(model, callback) {
+  hookRegistry_default.addHook(normalizeModelName(model), "create", "after", callback);
+}
+function afterDelete(model, callback) {
+  hookRegistry_default.addHook(normalizeModelName(model), "delete", "after", callback);
+}
+function beforeUpdate(model, callback) {
+  hookRegistry_default.addHook(normalizeModelName(model), "update", "before", callback);
+}
+function afterUpdate(model, callback) {
+  hookRegistry_default.addHook(normalizeModelName(model), "update", "after", callback);
+}
+function afterChange(model, column, callback) {
+  hookRegistry_default.addColumnHook(normalizeModelName(model), column, callback);
+}
+function afterUpsert(model, callback) {
+  hookRegistry_default.addHook(normalizeModelName(model), "upsert", "after", callback);
 }
 
 // src/core/adapters/postgres.ts
@@ -1216,8 +1182,8 @@ function parseDatabaseUrl(url) {
 }
 
 // src/core/adapters/sqlite.ts
-var fs3 = __toESM(require("fs"), 1);
-var path3 = __toESM(require("path"), 1);
+var fs2 = __toESM(require("fs"), 1);
+var path2 = __toESM(require("path"), 1);
 var SqliteAdapter = {
   name: "sqlite",
   matches(url) {
@@ -1225,13 +1191,13 @@ var SqliteAdapter = {
   },
   async create(url) {
     const filePath = parseSqliteUrl(url);
-    const dir = path3.dirname(filePath);
+    const dir = path2.dirname(filePath);
     try {
-      if (!fs3.existsSync(dir)) {
-        fs3.mkdirSync(dir, { recursive: true });
+      if (!fs2.existsSync(dir)) {
+        fs2.mkdirSync(dir, { recursive: true });
       }
-      if (!fs3.existsSync(filePath)) {
-        fs3.writeFileSync(filePath, "");
+      if (!fs2.existsSync(filePath)) {
+        fs2.writeFileSync(filePath, "");
         console.log(`\u2705 SQLite database created at "${filePath}"`);
       } else {
         console.log(`\u26A0\uFE0F  SQLite database already exists at "${filePath}"`);
@@ -1244,20 +1210,20 @@ var SqliteAdapter = {
   async drop(url) {
     const filePath = parseSqliteUrl(url);
     try {
-      if (fs3.existsSync(filePath)) {
-        fs3.unlinkSync(filePath);
+      if (fs2.existsSync(filePath)) {
+        fs2.unlinkSync(filePath);
         console.log(`\u2705 SQLite database at "${filePath}" dropped successfully.`);
       } else {
         console.log(`\u26A0\uFE0F  SQLite database does not exist at "${filePath}"`);
       }
-      if (fs3.existsSync(`${filePath}-journal`)) {
-        fs3.unlinkSync(`${filePath}-journal`);
+      if (fs2.existsSync(`${filePath}-journal`)) {
+        fs2.unlinkSync(`${filePath}-journal`);
       }
-      if (fs3.existsSync(`${filePath}-wal`)) {
-        fs3.unlinkSync(`${filePath}-wal`);
+      if (fs2.existsSync(`${filePath}-wal`)) {
+        fs2.unlinkSync(`${filePath}-wal`);
       }
-      if (fs3.existsSync(`${filePath}-shm`)) {
-        fs3.unlinkSync(`${filePath}-shm`);
+      if (fs2.existsSync(`${filePath}-shm`)) {
+        fs2.unlinkSync(`${filePath}-shm`);
       }
     } catch (error) {
       console.error("\u274C Error dropping SQLite database:", error);
@@ -1267,8 +1233,8 @@ var SqliteAdapter = {
 };
 function parseSqliteUrl(url) {
   let cleanPath = url.replace(/^file:/, "");
-  if (!path3.isAbsolute(cleanPath)) {
-    cleanPath = path3.resolve(process.cwd(), cleanPath);
+  if (!path2.isAbsolute(cleanPath)) {
+    cleanPath = path2.resolve(process.cwd(), cleanPath);
   }
   return cleanPath;
 }

package/dist/index.d.cts

@@ -8,8 +8,18 @@ import { M as ModelName, l as PrismaOperation, m as HookTiming, B as BeforeHookC
 export { r as AggregateResult, o as CreateArgs, C as CreateData, p as CreateManyArgs, b as CreateManyData, c as DeleteArgs, n as FindFirstArgs, F as FindManyArgs, a as ModelDelegate, R as RecordType, q as UpdateArgs, f as UpsertArgs } from './prisma.types-nGNe1CG8.cjs';
 export { afterChange, afterCreate, afterDelete, afterUpdate, afterUpsert, beforeCreate, beforeDelete, beforeUpdate } from './core/hooks.cjs';
 
+interface FlareClientOptions extends PrismaClientOptions {
+    /**
+     * Enable callbacks/hooks middleware. When true (default), the middleware
+     * that executes your registered callbacks (beforeCreate, afterUpdate, etc.)
+     * is automatically attached.
+     *
+     * @default true
+     */
+    callbacks?: boolean;
+}
 declare class FlareClient extends PrismaClient {
-    constructor(options?: PrismaClientOptions);
+    constructor(options?: FlareClientOptions);
     /**
      * Creates a new FlareBuilder instance for the specified model.
      * @param modelName - The name of the model.
@@ -186,22 +196,21 @@ declare function createHooksExtension(basePrisma: PrismaClient): (client: any) =
  */
 declare function registerHooksLegacy(prisma: PrismaClient): void;
 /**
- * Registers hooks on the Prisma client and automatically loads callbacks.
- * Automatically detects Prisma version and uses the appropriate API:
- * - Prisma ≤6: Uses $use middleware
- * - Prisma 7+: Returns extended client with hooks extension
- *
- * Callbacks are loaded from the path specified in prisma-flare.config.json
- * (defaults to 'prisma/callbacks'). Set `callbacksPath` in config to customize.
- *
- * @param prisma - The Prisma client instance
- * @returns Promise resolving to the Prisma client (possibly extended for Prisma 7+)
+ * @deprecated Use `new FlareClient()` instead. FlareClient now automatically
+ * attaches the callbacks middleware. This function will be removed in a future version.
  *
  * @example
- * // In your db setup file:
- * export const db = await registerHooks(new FlareClient());
+ * // Old way (deprecated):
+ * import './callbacks';
+ * import { FlareClient, registerHooks } from 'prisma-flare';
+ * export const db = registerHooks(new FlareClient());
+ *
+ * // New way:
+ * import './callbacks';
+ * import { FlareClient } from 'prisma-flare';
+ * export const db = new FlareClient();
  */
-declare function registerHooks<T extends PrismaClient>(prisma: T): Promise<T>;
+declare function registerHooks<T extends PrismaClient>(prisma: T): T;
 
 /**
  * Database Adapter Interface
@@ -234,4 +243,4 @@ declare class AdapterRegistry {
 }
 declare const registry: AdapterRegistry;
 
-export { AfterHookCallback, BeforeHookCallback, ColumnChangeCallback, type DatabaseAdapter, ExtendedPrismaClient, FlareBuilder, FlareClient, type HookConfig, HookTiming, ModelName, PrismaOperation, createHooksExtension, registry as dbAdapterRegistry, hookRegistry, loadCallbacks, modelRegistry, registerHooks, registerHooksLegacy };
+export { AfterHookCallback, BeforeHookCallback, ColumnChangeCallback, type DatabaseAdapter, ExtendedPrismaClient, FlareBuilder, FlareClient, type FlareClientOptions, type HookConfig, HookTiming, ModelName, PrismaOperation, createHooksExtension, registry as dbAdapterRegistry, hookRegistry, loadCallbacks, modelRegistry, registerHooks, registerHooksLegacy };

package/dist/index.d.ts

@@ -8,8 +8,18 @@ import { M as ModelName, l as PrismaOperation, m as HookTiming, B as BeforeHookC
 export { r as AggregateResult, o as CreateArgs, C as CreateData, p as CreateManyArgs, b as CreateManyData, c as DeleteArgs, n as FindFirstArgs, F as FindManyArgs, a as ModelDelegate, R as RecordType, q as UpdateArgs, f as UpsertArgs } from './prisma.types-nGNe1CG8.js';
 export { afterChange, afterCreate, afterDelete, afterUpdate, afterUpsert, beforeCreate, beforeDelete, beforeUpdate } from './core/hooks.js';
 
+interface FlareClientOptions extends PrismaClientOptions {
+    /**
+     * Enable callbacks/hooks middleware. When true (default), the middleware
+     * that executes your registered callbacks (beforeCreate, afterUpdate, etc.)
+     * is automatically attached.
+     *
+     * @default true
+     */
+    callbacks?: boolean;
+}
 declare class FlareClient extends PrismaClient {
-    constructor(options?: PrismaClientOptions);
+    constructor(options?: FlareClientOptions);
     /**
      * Creates a new FlareBuilder instance for the specified model.
      * @param modelName - The name of the model.
@@ -186,22 +196,21 @@ declare function createHooksExtension(basePrisma: PrismaClient): (client: any) =
  */
 declare function registerHooksLegacy(prisma: PrismaClient): void;
 /**
- * Registers hooks on the Prisma client and automatically loads callbacks.
- * Automatically detects Prisma version and uses the appropriate API:
- * - Prisma ≤6: Uses $use middleware
- * - Prisma 7+: Returns extended client with hooks extension
- *
- * Callbacks are loaded from the path specified in prisma-flare.config.json
- * (defaults to 'prisma/callbacks'). Set `callbacksPath` in config to customize.
- *
- * @param prisma - The Prisma client instance
- * @returns Promise resolving to the Prisma client (possibly extended for Prisma 7+)
+ * @deprecated Use `new FlareClient()` instead. FlareClient now automatically
+ * attaches the callbacks middleware. This function will be removed in a future version.
  *
  * @example
- * // In your db setup file:
- * export const db = await registerHooks(new FlareClient());
+ * // Old way (deprecated):
+ * import './callbacks';
+ * import { FlareClient, registerHooks } from 'prisma-flare';
+ * export const db = registerHooks(new FlareClient());
+ *
+ * // New way:
+ * import './callbacks';
+ * import { FlareClient } from 'prisma-flare';
+ * export const db = new FlareClient();
  */
-declare function registerHooks<T extends PrismaClient>(prisma: T): Promise<T>;
+declare function registerHooks<T extends PrismaClient>(prisma: T): T;
 
 /**
  * Database Adapter Interface
@@ -234,4 +243,4 @@ declare class AdapterRegistry {
 }
 declare const registry: AdapterRegistry;
 
-export { AfterHookCallback, BeforeHookCallback, ColumnChangeCallback, type DatabaseAdapter, ExtendedPrismaClient, FlareBuilder, FlareClient, type HookConfig, HookTiming, ModelName, PrismaOperation, createHooksExtension, registry as dbAdapterRegistry, hookRegistry, loadCallbacks, modelRegistry, registerHooks, registerHooksLegacy };
+export { AfterHookCallback, BeforeHookCallback, ColumnChangeCallback, type DatabaseAdapter, ExtendedPrismaClient, FlareBuilder, FlareClient, type FlareClientOptions, type HookConfig, HookTiming, ModelName, PrismaOperation, createHooksExtension, registry as dbAdapterRegistry, hookRegistry, loadCallbacks, modelRegistry, registerHooks, registerHooksLegacy };