prisma-flare 1.3.0 → 1.3.2

package/dist/cli/index.cjs

@@ -230,11 +230,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) {
@@ -294,13 +315,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) {
@@ -811,6 +852,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.
@@ -818,6 +864,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();
 }
@@ -827,53 +875,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: [
@@ -985,7 +1033,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: [
@@ -997,11 +1045,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",
@@ -1200,9 +1248,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);
 }
 
 /**
@@ -1210,9 +1259,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);
 }
 
 /**
@@ -1220,9 +1270,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);
 }
 
 /**
@@ -1230,9 +1281,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);
 }
 
 /**
@@ -1240,9 +1292,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);
 }
 
 /**
@@ -1250,9 +1303,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);
 }
 
 /**
@@ -1272,9 +1326,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
@@ -1354,7 +1409,8 @@ import {
  */
 export declare function beforeCreate<T extends ModelName>(
   model: T,
-  callback: BeforeHookCallback<T>
+  callback: BeforeHookCallback<T>,
+  options?: HookOptions
 ): void;
 
 /**
@@ -1362,7 +1418,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;
 
 /**
@@ -1370,7 +1427,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;
 
 /**
@@ -1378,7 +1436,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;
 
 /**
@@ -1386,7 +1445,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;
 
 /**
@@ -1394,7 +1454,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;
 
 /**
@@ -1412,7 +1473,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
@@ -1536,6 +1598,7 @@ import type {
   AfterHookCallback,
   ColumnChangeCallback,
   ColumnChangeOptions,
+  HookOptions,
   FieldName,
   HookConfig
 } from 'prisma-flare';
@@ -1584,7 +1647,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;
 
 /**
@@ -1592,7 +1656,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;
 
 /**
@@ -1600,7 +1665,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;
 
 /**
@@ -1608,7 +1674,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;
 
 /**
@@ -1616,7 +1683,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;
 
 /**
@@ -1624,7 +1692,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;
 
 /**
@@ -1642,7 +1711,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