prisma-flare 1.3.0 → 1.3.2

package/dist/cli/index.js

@@ -1,4 +1,10 @@
 #!/usr/bin/env node
+var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
+  get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
+}) : x)(function(x) {
+  if (typeof require !== "undefined") return require.apply(this, arguments);
+  throw Error('Dynamic require of "' + x + '" is not supported');
+});
 
 // src/cli/generate-queries.ts
 import * as fs3 from "fs";
@@ -207,11 +213,32 @@ function getPrismaProvider(rootDir) {
 }
 function parseModelRelations(schemaContent) {
   const models = [];
-  const modelRegex = /model\s+(\w+)\s*\{([^}]+)\}/g;
+  const modelStartRegex = /model\s+(\w+)\s*\{/g;
   let modelMatch;
-  while ((modelMatch = modelRegex.exec(schemaContent)) !== null) {
+  while ((modelMatch = modelStartRegex.exec(schemaContent)) !== null) {
     const modelName = modelMatch[1];
-    const modelBody = modelMatch[2];
+    const bodyStart = modelMatch.index + modelMatch[0].length;
+    let depth = 1;
+    let i = bodyStart;
+    let inString = false;
+    let stringChar = "";
+    while (i < schemaContent.length && depth > 0) {
+      const ch = schemaContent[i];
+      if (inString) {
+        if (ch === stringChar && schemaContent[i - 1] !== "\\") inString = false;
+      } else {
+        if (ch === '"' || ch === "'") {
+          inString = true;
+          stringChar = ch;
+        } else if (ch === "{") {
+          depth++;
+        } else if (ch === "}") {
+          depth--;
+        }
+      }
+      i++;
+    }
+    const modelBody = schemaContent.slice(bodyStart, i - 1);
     const relations = [];
     const lines = modelBody.split("\n");
     for (const line of lines) {
@@ -271,13 +298,33 @@ ${entries.join(",\n")}
 };`;
 }
 function getRelationModelMap(rootDir) {
+  const dmmfResult = getRelationModelMapFromDMMF(rootDir);
+  if (dmmfResult) return dmmfResult;
   const resolution = resolveSchemaPath(rootDir);
-  if (!resolution) {
-    return null;
-  }
+  if (!resolution) return null;
   const models = parseModelRelations(resolution.content);
   return generateRelationModelMap(models);
 }
+function getRelationModelMapFromDMMF(rootDir) {
+  try {
+    const clientPath = getPrismaClientPath(rootDir);
+    const resolvedPath = clientPath.startsWith("/") ? clientPath : __require.resolve(clientPath, { paths: [rootDir] });
+    const prismaModule = __require(resolvedPath);
+    const dmmf = prismaModule?.Prisma?.dmmf ?? prismaModule?.dmmf;
+    if (!dmmf?.datamodel?.models) return null;
+    const models = dmmf.datamodel.models.map((model) => ({
+      name: model.name,
+      relations: model.fields.filter((f) => f.kind === "object").map((f) => ({
+        fieldName: f.name,
+        targetModel: f.type,
+        isArray: f.isList
+      }))
+    }));
+    return generateRelationModelMap(models);
+  } catch {
+    return null;
+  }
+}
 
 // src/cli/generate-queries.ts
 function toCamelCase(str) {
@@ -788,6 +835,11 @@ ${exportKeyword}type ColumnChangeCallback<T extends ModelName = ModelName> = (
 /**
  * Options for column change hooks (afterChange)
  */
+${exportKeyword}interface HookOptions {
+  /** Tag to group hooks. Tagged hooks can be disabled/enabled via hookRegistry.disable(tag)/enable(tag). */
+  tag?: string;
+}
+
 ${exportKeyword}interface ColumnChangeOptions<T extends ModelName = ModelName> {
   /**
    * Additional fields to include when fetching records for this hook.
@@ -795,6 +847,8 @@ ${exportKeyword}interface ColumnChangeOptions<T extends ModelName = ModelName> {
    * Use this when your callback needs access to other fields.
    */
   includeFields?: FieldName<T>[];
+  /** Tag to group hooks. Tagged hooks can be disabled/enabled via hookRegistry.disable(tag)/enable(tag). */
+  tag?: string;
 }
 `.trimStart();
 }
@@ -804,53 +858,53 @@ var FLARE_BUILDER_METHODS = {
   whereConditions: [
     {
       name: "where",
-      signature: "(condition: WhereInput<T>): FlareBuilder<T, Args & { where: WhereInput<T> }>"
+      signature: "(condition: WhereInput<T>): this"
     },
     {
       name: "andWhere",
-      signature: "(condition: WhereInput<T>): FlareBuilder<T, Args & { where: WhereInput<T> }>"
+      signature: "(condition: WhereInput<T>): this"
     },
     {
       name: "orWhere",
-      signature: "(condition: WhereInput<T>): FlareBuilder<T, Args & { where: WhereInput<T> }>"
+      signature: "(condition: WhereInput<T>): this"
     },
     {
       name: "whereGroup",
-      signature: "(callback: (builder: FlareBuilder<T, Record<string, never>>) => FlareBuilder<T, any>, mode?: 'AND' | 'OR'): FlareBuilder<T, Args & { where: WhereInput<T> }>"
+      signature: "(callback: (builder: FlareBuilder<T, Record<string, never>>) => FlareBuilder<T, any>, mode?: 'AND' | 'OR'): this"
     },
     {
       name: "orWhereGroup",
-      signature: "(callback: (builder: FlareBuilder<T, Record<string, never>>) => FlareBuilder<T, any>): FlareBuilder<T, Args & { where: WhereInput<T> }>"
+      signature: "(callback: (builder: FlareBuilder<T, Record<string, never>>) => FlareBuilder<T, any>): this"
     },
     {
       name: "withId",
-      signature: "(id: number | string): FlareBuilder<T, Args & { where: { id: number | string } }>"
+      signature: "(id: number | string): this"
     }
   ],
   orderingAndLimiting: [
     {
       name: "order",
-      signature: "(orderBy: OrderByInput<T>): FlareBuilder<T, Args & { orderBy: OrderByInput<T> }>"
+      signature: "(orderBy: OrderByInput<T>): this"
     },
     {
       name: "first",
-      signature: "(key?: keyof RecordType<T> | string): FlareBuilder<T, Args & { orderBy: any; take: number }>"
+      signature: "(key?: keyof RecordType<T> | string): this"
     },
     {
       name: "last",
-      signature: "(key?: keyof RecordType<T> | string): FlareBuilder<T, Args & { orderBy: any; take: number }>"
+      signature: "(key?: keyof RecordType<T> | string): this"
     },
     {
       name: "limit",
-      signature: "(count: number): FlareBuilder<T, Args & { take: number }>"
+      signature: "(count: number): this"
     },
     {
       name: "skip",
-      signature: "(count: number): FlareBuilder<T, Args & { skip: number }>"
+      signature: "(count: number): this"
     },
     {
       name: "distinct",
-      signature: "(fields: DistinctInput<T>): FlareBuilder<T, Args & { distinct: DistinctInput<T> }>"
+      signature: "(fields: DistinctInput<T>): this"
     }
   ],
   selection: [
@@ -962,7 +1016,7 @@ var FLARE_BUILDER_METHODS = {
   pagination: [
     {
       name: "paginate",
-      signature: "(page?: number, perPage?: number): Promise<PaginatedResult<RecordType<T>>>"
+      signature: (ns, useFlareResult) => useFlareResult ? `(page?: number, perPage?: number): Promise<PaginatedResult<FlareResult<T, Args>>>` : `(page?: number, perPage?: number): Promise<PaginatedResult<${ns}.Result<ModelDelegate<T>, Args, 'findFirstOrThrow'>>>`
     }
   ],
   existence: [
@@ -974,11 +1028,11 @@ var FLARE_BUILDER_METHODS = {
   utilities: [
     {
       name: "when",
-      signature: "(condition: boolean | (() => boolean), callback: (qb: FlareBuilder<T, Args>) => void): FlareBuilder<T, Args>"
+      signature: "(condition: boolean | (() => boolean), callback: (qb: this) => void): this"
     },
     {
       name: "chunk",
-      signature: "(size: number, callback: (results: RecordType<T>[]) => Promise<void> | void): Promise<void>"
+      signature: (ns, useFlareResult) => useFlareResult ? `(size: number, callback: (results: FlareResultMany<T, Args>) => Promise<void> | void): Promise<void>` : `(size: number, callback: (results: ${ns}.Result<ModelDelegate<T>, Args, 'findMany'>) => Promise<void> | void): Promise<void>`
     },
     {
       name: "clone",
@@ -1177,9 +1231,10 @@ import {
  */
 export function beforeCreate<T extends ModelName>(
   model: T,
-  callback: BeforeHookCallback<T>
+  callback: BeforeHookCallback<T>,
+  options?: HookOptions
 ): void {
-  _beforeCreate(model as any, callback as any);
+  _beforeCreate(model as any, callback as any, options);
 }
 
 /**
@@ -1187,9 +1242,10 @@ export function beforeCreate<T extends ModelName>(
  */
 export function afterCreate<T extends ModelName>(
   model: T,
-  callback: AfterHookCallback<T>
+  callback: AfterHookCallback<T>,
+  options?: HookOptions
 ): void {
-  _afterCreate(model as any, callback as any);
+  _afterCreate(model as any, callback as any, options);
 }
 
 /**
@@ -1197,9 +1253,10 @@ export function afterCreate<T extends ModelName>(
  */
 export function beforeUpdate<T extends ModelName>(
   model: T,
-  callback: BeforeHookCallback<T>
+  callback: BeforeHookCallback<T>,
+  options?: HookOptions
 ): void {
-  _beforeUpdate(model as any, callback as any);
+  _beforeUpdate(model as any, callback as any, options);
 }
 
 /**
@@ -1207,9 +1264,10 @@ export function beforeUpdate<T extends ModelName>(
  */
 export function afterUpdate<T extends ModelName>(
   model: T,
-  callback: AfterHookCallback<T>
+  callback: AfterHookCallback<T>,
+  options?: HookOptions
 ): void {
-  _afterUpdate(model as any, callback as any);
+  _afterUpdate(model as any, callback as any, options);
 }
 
 /**
@@ -1217,9 +1275,10 @@ export function afterUpdate<T extends ModelName>(
  */
 export function beforeDelete<T extends ModelName>(
   model: T,
-  callback: BeforeHookCallback<T>
+  callback: BeforeHookCallback<T>,
+  options?: HookOptions
 ): void {
-  _beforeDelete(model as any, callback as any);
+  _beforeDelete(model as any, callback as any, options);
 }
 
 /**
@@ -1227,9 +1286,10 @@ export function beforeDelete<T extends ModelName>(
  */
 export function afterDelete<T extends ModelName>(
   model: T,
-  callback: AfterHookCallback<T>
+  callback: AfterHookCallback<T>,
+  options?: HookOptions
 ): void {
-  _afterDelete(model as any, callback as any);
+  _afterDelete(model as any, callback as any, options);
 }
 
 /**
@@ -1249,9 +1309,10 @@ export function afterChange<T extends ModelName>(
  */
 export function afterUpsert<T extends ModelName>(
   model: T,
-  callback: AfterHookCallback<T>
+  callback: AfterHookCallback<T>,
+  options?: HookOptions
 ): void {
-  _afterUpsert(model as any, callback as any);
+  _afterUpsert(model as any, callback as any, options);
 }
 
 // Re-export hookRegistry for advanced use cases
@@ -1331,7 +1392,8 @@ import {
  */
 export declare function beforeCreate<T extends ModelName>(
   model: T,
-  callback: BeforeHookCallback<T>
+  callback: BeforeHookCallback<T>,
+  options?: HookOptions
 ): void;
 
 /**
@@ -1339,7 +1401,8 @@ export declare function beforeCreate<T extends ModelName>(
  */
 export declare function afterCreate<T extends ModelName>(
   model: T,
-  callback: AfterHookCallback<T>
+  callback: AfterHookCallback<T>,
+  options?: HookOptions
 ): void;
 
 /**
@@ -1347,7 +1410,8 @@ export declare function afterCreate<T extends ModelName>(
  */
 export declare function beforeUpdate<T extends ModelName>(
   model: T,
-  callback: BeforeHookCallback<T>
+  callback: BeforeHookCallback<T>,
+  options?: HookOptions
 ): void;
 
 /**
@@ -1355,7 +1419,8 @@ export declare function beforeUpdate<T extends ModelName>(
  */
 export declare function afterUpdate<T extends ModelName>(
   model: T,
-  callback: AfterHookCallback<T>
+  callback: AfterHookCallback<T>,
+  options?: HookOptions
 ): void;
 
 /**
@@ -1363,7 +1428,8 @@ export declare function afterUpdate<T extends ModelName>(
  */
 export declare function beforeDelete<T extends ModelName>(
   model: T,
-  callback: BeforeHookCallback<T>
+  callback: BeforeHookCallback<T>,
+  options?: HookOptions
 ): void;
 
 /**
@@ -1371,7 +1437,8 @@ export declare function beforeDelete<T extends ModelName>(
  */
 export declare function afterDelete<T extends ModelName>(
   model: T,
-  callback: AfterHookCallback<T>
+  callback: AfterHookCallback<T>,
+  options?: HookOptions
 ): void;
 
 /**
@@ -1389,7 +1456,8 @@ export declare function afterChange<T extends ModelName>(
  */
 export declare function afterUpsert<T extends ModelName>(
   model: T,
-  callback: AfterHookCallback<T>
+  callback: AfterHookCallback<T>,
+  options?: HookOptions
 ): void;
 
 // Re-export hookRegistry for advanced use cases
@@ -1513,6 +1581,7 @@ import type {
   AfterHookCallback,
   ColumnChangeCallback,
   ColumnChangeOptions,
+  HookOptions,
   FieldName,
   HookConfig
 } from 'prisma-flare';
@@ -1561,7 +1630,8 @@ export declare class FlareClient extends BasePrismaClient {
  */
 export declare function beforeCreate<T extends ModelName>(
   model: T,
-  callback: BeforeHookCallback<T>
+  callback: BeforeHookCallback<T>,
+  options?: HookOptions
 ): void;
 
 /**
@@ -1569,7 +1639,8 @@ export declare function beforeCreate<T extends ModelName>(
  */
 export declare function afterCreate<T extends ModelName>(
   model: T,
-  callback: AfterHookCallback<T>
+  callback: AfterHookCallback<T>,
+  options?: HookOptions
 ): void;
 
 /**
@@ -1577,7 +1648,8 @@ export declare function afterCreate<T extends ModelName>(
  */
 export declare function beforeUpdate<T extends ModelName>(
   model: T,
-  callback: BeforeHookCallback<T>
+  callback: BeforeHookCallback<T>,
+  options?: HookOptions
 ): void;
 
 /**
@@ -1585,7 +1657,8 @@ export declare function beforeUpdate<T extends ModelName>(
  */
 export declare function afterUpdate<T extends ModelName>(
   model: T,
-  callback: AfterHookCallback<T>
+  callback: AfterHookCallback<T>,
+  options?: HookOptions
 ): void;
 
 /**
@@ -1593,7 +1666,8 @@ export declare function afterUpdate<T extends ModelName>(
  */
 export declare function beforeDelete<T extends ModelName>(
   model: T,
-  callback: BeforeHookCallback<T>
+  callback: BeforeHookCallback<T>,
+  options?: HookOptions
 ): void;
 
 /**
@@ -1601,7 +1675,8 @@ export declare function beforeDelete<T extends ModelName>(
  */
 export declare function afterDelete<T extends ModelName>(
   model: T,
-  callback: AfterHookCallback<T>
+  callback: AfterHookCallback<T>,
+  options?: HookOptions
 ): void;
 
 /**
@@ -1619,7 +1694,8 @@ export declare function afterChange<T extends ModelName>(
  */
 export declare function afterUpsert<T extends ModelName>(
   model: T,
-  callback: AfterHookCallback<T>
+  callback: AfterHookCallback<T>,
+  options?: HookOptions
 ): void;
 
 // Re-export hookRegistry for advanced use cases

package/dist/core/flareBuilder.d.cts

@@ -1,5 +1,5 @@
 import { Prisma } from '@prisma/client';
-import { M as ModelName, b as ModelDelegate, Q as QueryArgs, W as WhereInput, O as OrderByInput, R as RecordType, D as DistinctInput, S as SelectInput, I as IncludeKey, G as GroupByInput, c as HavingInput, d as PaginatedResult, e as CreateData, f as CreateManyData, g as DeleteArgs, h as DeleteManyArgs, U as UpdateData, i as UpdateManyData, j as UpsertArgs, k as SumFields, l as AvgFields, m as MinFields, n as MaxFields } from '../prisma.types-CIEFXVL-.cjs';
+import { M as ModelName, b as ModelDelegate, Q as QueryArgs, W as WhereInput, O as OrderByInput, R as RecordType, D as DistinctInput, S as SelectInput, I as IncludeKey, G as GroupByInput, c as HavingInput, d as PaginatedResult, e as CreateData, f as CreateManyData, g as DeleteArgs, h as DeleteManyArgs, U as UpdateData, i as UpdateManyData, j as UpsertArgs, k as SumFields, l as AvgFields, m as MinFields, n as MaxFields } from '../prisma.types-WBv5kOSl.cjs';
 
 /**
  * Global interface for relation-to-model mapping.
@@ -42,9 +42,7 @@ declare class FlareBuilder<T extends ModelName, Args extends Record<string, any>
      *   .findMany()
      * // Equivalent to: { AND: [{ published: true }, { authorId: 1 }] }
      */
-    where(condition: WhereInput<T>): FlareBuilder<T, Args & {
-        where: WhereInput<T>;
-    }>;
+    where(condition: WhereInput<T>): this;
     /**
      * Adds a where condition using AND logic (explicit alias for where())
      * @param condition - Where filter matching your Prisma model
@@ -55,9 +53,7 @@ declare class FlareBuilder<T extends ModelName, Args extends Record<string, any>
      *   .andWhere({ createdAt: { gte: new Date('2024-01-01') } })
      *   .findMany()
      */
-    andWhere(condition: WhereInput<T>): FlareBuilder<T, Args & {
-        where: WhereInput<T>;
-    }>;
+    andWhere(condition: WhereInput<T>): this;
     /**
      * Adds a where condition using OR logic.
      *
@@ -91,9 +87,7 @@ declare class FlareBuilder<T extends ModelName, Args extends Record<string, any>
      *   .findMany()
      * // Result: published AND (category='news' OR category='tech')
      */
-    orWhere(condition: WhereInput<T>): FlareBuilder<T, Args & {
-        where: WhereInput<T>;
-    }>;
+    orWhere(condition: WhereInput<T>): this;
     /**
      * Creates a grouped where condition using a callback.
      * Use this for explicit control over boolean logic grouping.
@@ -122,9 +116,7 @@ declare class FlareBuilder<T extends ModelName, Args extends Record<string, any>
      *   , 'OR')
      *   .findMany()
      */
-    whereGroup(callback: (builder: FlareBuilder<T, Record<string, never>>) => FlareBuilder<T, any>, mode?: 'AND' | 'OR'): FlareBuilder<T, Args & {
-        where: WhereInput<T>;
-    }>;
+    whereGroup(callback: (builder: FlareBuilder<T, Record<string, never>>) => FlareBuilder<T, any>, mode?: 'AND' | 'OR'): this;
     /**
      * Alias for whereGroup with OR mode.
      * Creates a grouped condition that's OR-ed with existing where.
@@ -141,56 +133,38 @@ declare class FlareBuilder<T extends ModelName, Args extends Record<string, any>
      *   )
      *   .findMany()
      */
-    orWhereGroup(callback: (builder: FlareBuilder<T, Record<string, never>>) => FlareBuilder<T, any>): FlareBuilder<T, Args & {
-        where: WhereInput<T>;
-    }>;
+    orWhereGroup(callback: (builder: FlareBuilder<T, Record<string, never>>) => FlareBuilder<T, any>): this;
     /**
      * Adds a where condition to the query for the specified id.
      * Uses the same AND composition as where() for consistency.
      * @param id - The id to search for
      */
-    withId(id: number | string): FlareBuilder<T, Args & {
-        where: {
-            id: number | string;
-        };
-    }>;
+    withId(id: number | string): this;
     /**
      * Adds an order by condition to the query
      * @param orderBy - OrderBy object matching your Prisma model
      */
-    order(orderBy: OrderByInput<T>): FlareBuilder<T, Args & {
-        orderBy: OrderByInput<T>;
-    }>;
+    order(orderBy: OrderByInput<T>): this;
     /**
      * Gets the last record sorted by the specified field
      * @param key - Field to sort by (defaults to 'createdAt')
      */
-    last(key?: keyof RecordType<T> | string): FlareBuilder<T, Args & {
-        orderBy: any;
-        take: number;
-    }>;
+    last(key?: keyof RecordType<T> | string): this;
     /**
      * Gets the first record sorted by the specified field
      * @param key - Field to sort by (defaults to 'createdAt')
      */
-    first(key?: keyof RecordType<T> | string): FlareBuilder<T, Args & {
-        orderBy: any;
-        take: number;
-    }>;
+    first(key?: keyof RecordType<T> | string): this;
     /**
      * Sets a limit on the number of records to retrieve
      * @param limit - Maximum number of records
      */
-    limit(limit: number): FlareBuilder<T, Args & {
-        take: number;
-    }>;
+    limit(limit: number): this;
     /**
      * Sets distinct fields for the query
      * @param distinct - Fields to be distinct
      */
-    distinct(distinct: DistinctInput<T>): FlareBuilder<T, Args & {
-        distinct: DistinctInput<T>;
-    }>;
+    distinct(distinct: DistinctInput<T>): this;
     /**
      * Selects specific fields to retrieve
      * @param fields - Select object matching your Prisma model
@@ -248,9 +222,7 @@ declare class FlareBuilder<T extends ModelName, Args extends Record<string, any>
      * Skips the specified number of records
      * @param offset - Number of records to skip
      */
-    skip(offset: number): FlareBuilder<T, Args & {
-        skip: number;
-    }>;
+    skip(offset: number): this;
     /**
      * Checks if any record exists matching the current query
      * @param existenceKey - Key to check for existence (defaults to 'id')
@@ -261,7 +233,7 @@ declare class FlareBuilder<T extends ModelName, Args extends Record<string, any>
      * @param page - Page number (1-based)
      * @param perPage - Number of records per page
      */
-    paginate(page?: number, perPage?: number): Promise<PaginatedResult<RecordType<T>>>;
+    paginate(page?: number, perPage?: number): Promise<PaginatedResult<Prisma.Result<ModelDelegate<T>, Args, 'findFirstOrThrow'>>>;
     /**
      * Conditionally executes a callback on the query builder
      * @param condition - Boolean or function returning boolean
@@ -273,7 +245,7 @@ declare class FlareBuilder<T extends ModelName, Args extends Record<string, any>
      * @param size - Size of each chunk
      * @param callback - Function to process each chunk
      */
-    chunk(size: number, callback: (results: RecordType<T>[]) => Promise<void> | void): Promise<void>;
+    chunk(size: number, callback: (results: Prisma.Result<ModelDelegate<T>, Args, 'findMany'>) => Promise<void> | void): Promise<void>;
     /**
      * Clones the current query builder instance.
      * Uses structuredClone for proper handling of Date, BigInt, etc.
@@ -285,7 +257,7 @@ declare class FlareBuilder<T extends ModelName, Args extends Record<string, any>
      * @throws {Prisma.NotFoundError} When no record matches the query
      * @returns Promise resolving to the found record
      */
-    findFirstOrThrow(): Promise<NonNullable<RecordType<T>>>;
+    findFirstOrThrow(): Promise<Prisma.Result<ModelDelegate<T>, Args, 'findFirstOrThrow'>>;
     /**
      * Finds a unique record by primary key or throws an error if not found
      * Requires a unique constraint (typically the id field)
@@ -293,7 +265,7 @@ declare class FlareBuilder<T extends ModelName, Args extends Record<string, any>
      * @throws {Prisma.NotFoundError} When no record is found
      * @returns Promise resolving to the found record
      */
-    findUniqueOrThrow(): Promise<NonNullable<RecordType<T>>>;
+    findUniqueOrThrow(): Promise<Prisma.Result<ModelDelegate<T>, Args, 'findUniqueOrThrow'>>;
     /**
      * Finds all records matching the query
      * Respects all previously set query conditions (where, orderBy, take, skip, include, select, distinct)