arkormx 2.8.1 → 2.9.1

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { $ as applyOperationsToPersistedColumnMappingsState, $t as resolvePrismaType, A as getRuntimePrismaClient, An as writeAppliedMigrationsStateToStore, At as buildInverseRelationLine, B as getRegisteredModels, Bt as deriveRelationFieldName, C as getActiveTransactionClient, Cn as markMigrationRun, Ct as applyMigrationRollbackToPrismaSchema, D as getRuntimeDebugHandler, Dn as resolveMigrationStateFilePath, Dt as buildEnumBlock, E as getRuntimeClient, En as removeAppliedMigration, Et as applyOperationsToPrismaSchema, F as loadArkormConfig, Fn as RelationResolutionException, Ft as buildUniqueConstraintLine, G as loadModelsFrom, Gt as formatDefaultValue, H as getRegisteredSeeders, Ht as escapeRegex, I as resetArkormRuntimeForTests, In as ArkormCollection, It as createMigrationTimestamp, J as registerMigrations, Jt as generateMigrationFile, K as loadSeedersFrom, Kt as formatEnumDefaultValue, L as runArkormTransaction, Ln as ArkormException, Lt as deriveCollectionFieldName, M as isDelegateLike, Mn as UnsupportedAdapterFeatureException, Mt as buildModelBlock, N as isQuerySchemaLike, Nn as SetBasedEagerLoader, Nt as buildPrimaryKeyLine, O as getRuntimePaginationCurrentPageResolver, On as supportsDatabaseMigrationState, Ot as buildFieldLine, P as isTransactionCapableClient, Pt as buildRelationLine, Q as resetRuntimeRegistryForTests, Qt as resolveMigrationClassName, R as getRegisteredFactories, Rt as deriveInverseRelationAlias, S as getActiveTransactionAdapter, Sn as markMigrationApplied, St as applyMigrationRollbackToDatabase, T as getRuntimeAdapter, Tn as readAppliedMigrationsStateFromStore, Tt as applyMigrationToPrismaSchema, U as loadFactoriesFrom, Ut as findEnumBlock, V as getRegisteredPaths, Vt as deriveSingularFieldName, W as loadMigrationsFrom, Wt as findModelBlock, X as registerPaths, Xt as pad, Y as registerModels, Yt as getMigrationPlan, Z as registerSeeders, Zt as resolveEnumName, _ as bindAdapterToModels, _n as deleteAppliedMigrationsStateFromStore, _t as PRISMA_ENUM_REGEX, a as HasOneThroughRelation, an as supportsDatabaseReset, at as getPersistedPrimaryKeyGeneration, b as emitRuntimeDebugEvent, bn as getLatestAppliedMigrations, bt as applyCreateTableOperation, c as HasManyRelation, cn as SchemaBuilder, ct as readPersistedColumnMappingsState, d as BelongsToManyRelation, dn as PrimaryKeyGenerationPlanner, dt as resolveColumnMappingsFilePath, en as runMigrationWithPrisma, et as createEmptyPersistedColumnMappingsState, f as Relation, fn as ForeignKeyBuilder, ft as resolvePersistedMetadataFeatures, g as awaitConfiguredModelsRegistration, gn as createEmptyAppliedMigrationsState, gt as PRISMA_ENUM_MEMBER_REGEX, h as URLDriver, hn as computeMigrationChecksum, ht as writePersistedColumnMappingsState, i as MorphManyRelation, in as supportsDatabaseMigrationExecution, it as getPersistedEnumTsType, j as getUserConfig, jn as RuntimeModuleLoader, jt as buildMigrationSource, k as getRuntimePaginationURLDriverFactory, kn as writeAppliedMigrationsState, kt as buildIndexLine, l as BelongsToRelation, ln as EnumBuilder, lt as rebuildPersistedColumnMappingsState, m as Paginator, mn as buildMigrationRunId, mt as validatePersistedMetadataFeaturesForMigrations, n as MorphToManyRelation, nn as stripPrismaSchemaModelsAndEnums, nt as getPersistedColumnMap, o as HasOneRelation, on as toMigrationFileSlug, ot as getPersistedTableMetadata, p as LengthAwarePaginator, pn as buildMigrationIdentity, pt as syncPersistedColumnMappingsFromState, q as registerFactories, qt as formatRelationAction, r as MorphOneRelation, rn as supportsDatabaseCreation, rt as getPersistedEnumMap, s as HasManyThroughRelation, sn as toModelName, st as getPersistedTimestampColumns, t as MorphToRelation, tn as runPrismaCommand, tt as deletePersistedColumnMappingsState, un as TableBuilder, ut as resetPersistedColumnMappingsCache, v as configureArkormRuntime, vn as findAppliedMigration, vt as PRISMA_MODEL_REGEX, w as getDefaultStubsPath, wn as readAppliedMigrationsState, wt as applyMigrationToDatabase, x as ensureArkormConfigLoading, xn as isMigrationApplied, xt as applyDropTableOperation, y as defineConfig, yn as getLastMigrationRun, yt as applyAlterTableOperation, z as getRegisteredMigrations, zt as deriveRelationAlias } from "./relationship--l8RA_yy.mjs";
+import { $ as applyOperationsToPersistedColumnMappingsState, $t as resolvePrismaType, A as getRuntimePrismaClient, An as writeAppliedMigrationsStateToStore, At as buildInverseRelationLine, B as getRegisteredModels, Bt as deriveRelationFieldName, C as getActiveTransactionClient, Cn as markMigrationRun, Ct as applyMigrationRollbackToPrismaSchema, D as getRuntimeDebugHandler, Dn as resolveMigrationStateFilePath, Dt as buildEnumBlock, E as getRuntimeClient, En as removeAppliedMigration, Et as applyOperationsToPrismaSchema, F as loadArkormConfig, Fn as RelationResolutionException, Ft as buildUniqueConstraintLine, G as loadModelsFrom, Gt as formatDefaultValue, H as getRegisteredSeeders, Ht as escapeRegex, I as resetArkormRuntimeForTests, In as ArkormCollection, It as createMigrationTimestamp, J as registerMigrations, Jt as generateMigrationFile, K as loadSeedersFrom, Kt as formatEnumDefaultValue, L as runArkormTransaction, Ln as ArkormException, Lt as deriveCollectionFieldName, M as isDelegateLike, Mn as UnsupportedAdapterFeatureException, Mt as buildModelBlock, N as isQuerySchemaLike, Nn as SetBasedEagerLoader, Nt as buildPrimaryKeyLine, O as getRuntimePaginationCurrentPageResolver, On as supportsDatabaseMigrationState, Ot as buildFieldLine, P as isTransactionCapableClient, Pt as buildRelationLine, Q as resetRuntimeRegistryForTests, Qt as resolveMigrationClassName, R as getRegisteredFactories, Rt as deriveInverseRelationAlias, S as getActiveTransactionAdapter, Sn as markMigrationApplied, St as applyMigrationRollbackToDatabase, T as getRuntimeAdapter, Tn as readAppliedMigrationsStateFromStore, Tt as applyMigrationToPrismaSchema, U as loadFactoriesFrom, Ut as findEnumBlock, V as getRegisteredPaths, Vt as deriveSingularFieldName, W as loadMigrationsFrom, Wt as findModelBlock, X as registerPaths, Xt as pad, Y as registerModels, Yt as getMigrationPlan, Z as registerSeeders, Zt as resolveEnumName, _ as bindAdapterToModels, _n as deleteAppliedMigrationsStateFromStore, _t as PRISMA_ENUM_REGEX, a as HasOneThroughRelation, an as supportsDatabaseReset, at as getPersistedPrimaryKeyGeneration, b as emitRuntimeDebugEvent, bn as getLatestAppliedMigrations, bt as applyCreateTableOperation, c as HasManyRelation, cn as SchemaBuilder, ct as readPersistedColumnMappingsState, d as BelongsToManyRelation, dn as PrimaryKeyGenerationPlanner, dt as resolveColumnMappingsFilePath, en as runMigrationWithPrisma, et as createEmptyPersistedColumnMappingsState, f as Relation, fn as ForeignKeyBuilder, ft as resolvePersistedMetadataFeatures, g as awaitConfiguredModelsRegistration, gn as createEmptyAppliedMigrationsState, gt as PRISMA_ENUM_MEMBER_REGEX, h as URLDriver, hn as computeMigrationChecksum, ht as writePersistedColumnMappingsState, i as MorphManyRelation, in as supportsDatabaseMigrationExecution, it as getPersistedEnumTsType, j as getUserConfig, jn as RuntimeModuleLoader, jt as buildMigrationSource, k as getRuntimePaginationURLDriverFactory, kn as writeAppliedMigrationsState, kt as buildIndexLine, l as BelongsToRelation, ln as EnumBuilder, lt as rebuildPersistedColumnMappingsState, m as Paginator, mn as buildMigrationRunId, mt as validatePersistedMetadataFeaturesForMigrations, n as MorphToManyRelation, nn as stripPrismaSchemaModelsAndEnums, nt as getPersistedColumnMap, o as HasOneRelation, on as toMigrationFileSlug, ot as getPersistedTableMetadata, p as LengthAwarePaginator, pn as buildMigrationIdentity, pt as syncPersistedColumnMappingsFromState, q as registerFactories, qt as formatRelationAction, r as MorphOneRelation, rn as supportsDatabaseCreation, rt as getPersistedEnumMap, s as HasManyThroughRelation, sn as toModelName, st as getPersistedTimestampColumns, t as MorphToRelation, tn as runPrismaCommand, tt as deletePersistedColumnMappingsState, un as TableBuilder, ut as resetPersistedColumnMappingsCache, v as configureArkormRuntime, vn as findAppliedMigration, vt as PRISMA_MODEL_REGEX, w as getDefaultStubsPath, wn as readAppliedMigrationsState, wt as applyMigrationToDatabase, x as ensureArkormConfigLoading, xn as isMigrationApplied, xt as applyDropTableOperation, y as defineConfig, yn as getLastMigrationRun, yt as applyAlterTableOperation, z as getRegisteredMigrations, zt as deriveRelationAlias } from "./relationship-DtNgcxxv.mjs";
 import { Pool } from "pg";
 import { join, resolve } from "node:path";
 import { createRequire } from "module";
@@ -614,6 +614,10 @@ var KyselyDatabaseAdapter = class KyselyDatabaseAdapter {
 		if (!groupBy || groupBy.length === 0) return sql``;
 		return sql` group by ${sql.join(groupBy.map((column) => sql.ref(this.mapColumn(target, column))), sql`, `)}`;
 	}
+	buildHavingClause(target, having) {
+		if (!having) return sql``;
+		return sql` having ${this.buildWhereCondition(target, having)}`;
+	}
 	buildJoinClause(target, joins) {
 		if (!joins || joins.length === 0) return sql``;
 		return sql` ${sql.join(joins.map((join) => this.buildSingleJoin(target, join)), sql` `)}`;
@@ -739,6 +743,24 @@ var KyselyDatabaseAdapter = class KyselyDatabaseAdapter {
 			return sql`coalesce(${sql.ref(this.mapColumn(target, column))}::text, '')`;
 		}), sql` || ' ' || `)}) @@ plainto_tsquery(${language}, ${condition.value})`;
 	}
+	buildJsonAccessor(target, column, path) {
+		const base = sql`${sql.ref(this.mapColumn(target, column))}::jsonb`;
+		if (!path || path.length === 0) return base;
+		return sql`(${base} #> ${`{${path.join(",")}}`}::text[])`;
+	}
+	buildJsonCondition(target, condition) {
+		const accessor = this.buildJsonAccessor(target, condition.column, condition.path);
+		if (condition.kind === "contains-key") return condition.not ? sql`${accessor} is null` : sql`${accessor} is not null`;
+		if (condition.kind === "length") return sql`jsonb_array_length(${accessor}) ${sql.raw(condition.operator ?? "=")} ${condition.value}`;
+		const jsonValue = JSON.stringify(condition.value ?? null);
+		if (condition.kind === "overlaps") return sql`exists (
+                select 1
+                from jsonb_array_elements(${accessor}) as _arkorm_overlap
+                where _arkorm_overlap in (select jsonb_array_elements(${jsonValue}::jsonb))
+            )`;
+		const contains = sql`${accessor} @> ${jsonValue}::jsonb`;
+		return condition.not ? sql`not (${contains})` : contains;
+	}
 	buildWhereCondition(target, condition) {
 		if (!condition) return sql`1 = 1`;
 		if (condition.type === "comparison") return this.buildComparisonCondition(target, condition);
@@ -747,6 +769,7 @@ var KyselyDatabaseAdapter = class KyselyDatabaseAdapter {
 		if (condition.type === "day") return this.buildDayCondition(target, condition);
 		if (condition.type === "exists") return this.buildExistsCondition(condition);
 		if (condition.type === "full-text") return this.buildFullTextCondition(target, condition);
+		if (condition.type === "json") return this.buildJsonCondition(target, condition);
 		if (condition.type === "group") {
 			const group = condition;
 			const conditions = group.conditions.map((entry) => {
@@ -974,6 +997,7 @@ var KyselyDatabaseAdapter = class KyselyDatabaseAdapter {
             ${this.buildJoinClause(spec.target, spec.joins)}
             ${this.buildCombinedWhereClause(spec.target, spec.where, spec.relationFilters)}
             ${this.buildGroupBy(spec.target, spec.groupBy)}
+            ${this.buildHavingClause(spec.target, spec.having)}
             ${this.buildOrderBy(spec.target, spec.orderBy)}
             ${this.buildPaginationClause(spec)}
         `;
@@ -1723,6 +1747,10 @@ var PrismaDatabaseAdapter = class PrismaDatabaseAdapter {
 			operation: "adapter.select",
 			meta: { feature: "groupBy" }
 		});
+		if (spec.having) throw new UnsupportedAdapterFeatureException("Having clauses are not supported by the Prisma compatibility adapter; use a SQL-backed adapter.", {
+			operation: "adapter.select",
+			meta: { feature: "having" }
+		});
 		if (spec.joins?.length) throw new UnsupportedAdapterFeatureException("Join clauses are not supported by the Prisma compatibility adapter; use a SQL-backed adapter or DB.raw().", {
 			operation: "adapter.select",
 			meta: { feature: "joins" }
@@ -4377,24 +4405,37 @@ var QueryBuilder = class QueryBuilder {
 		if (typeof resolvedPage !== "number" || !Number.isFinite(resolvedPage)) return 1;
 		return Math.max(1, resolvedPage);
 	}
+	where(whereOrCallback) {
+		if (typeof whereOrCallback === "function") return this.appendNestedWhere("AND", whereOrCallback);
+		return this.addLogicalWhere("AND", whereOrCallback);
+	}
+	orWhere(whereOrCallback) {
+		if (typeof whereOrCallback === "function") return this.appendNestedWhere("OR", whereOrCallback);
+		return this.addLogicalWhere("OR", whereOrCallback);
+	}
 	/**
-	* Adds a where clause to the query. Multiple calls to where will combine 
-	* the clauses with AND logic.
-	* 
-	* @param where 
-	* @returns 
+	* Resolve a callback into a parenthesized group condition and append it.
 	*/
-	where(where) {
-		return this.addLogicalWhere("AND", where);
+	appendNestedWhere(boolean, callback) {
+		const nested = new QueryBuilder(this.model, this.adapter);
+		callback(nested);
+		const condition = nested.getNestedWhereCondition();
+		if (!condition) return this;
+		const grouped = condition.type === "group" ? condition : {
+			type: "group",
+			operator: "and",
+			conditions: [condition]
+		};
+		this.appendQueryCondition(boolean, grouped);
+		return this;
 	}
 	/**
-	* Adds an OR where clause to the query.
-	*
-	* @param where
-	* @returns
+	* Returns the user-authored where condition for nesting, excluding any
+	* soft-delete predicate (the parent query owns that).
 	*/
-	orWhere(where) {
-		return this.addLogicalWhere("OR", where);
+	getNestedWhereCondition() {
+		if (this.legacyWhere) return this.tryBuildQueryCondition(this.legacyWhere) ?? void 0;
+		return this.queryWhere;
 	}
 	/**
 	* Adds a NOT where clause to the query.
@@ -4669,6 +4710,27 @@ var QueryBuilder = class QueryBuilder {
 		return this;
 	}
 	/**
+	* Adds an OR fulltext clause for columns that have full text indexes.
+	*
+	* @param columns
+	* @param value
+	* @param options
+	* @returns
+	*/
+	orWhereFullText(columns, value, options = {}) {
+		const normalizedColumns = Array.isArray(columns) ? columns : [columns];
+		if (normalizedColumns.length === 0) throw new ArkormException("orWhereFullText() expects at least one column.");
+		const language = options.language ?? "simple";
+		if (!/^[a-z][a-z0-9_]*$/i.test(language)) throw new ArkormException("orWhereFullText() language must be a valid PostgreSQL text search configuration name.");
+		this.appendQueryCondition("OR", {
+			type: "full-text",
+			columns: normalizedColumns,
+			value,
+			language
+		});
+		return this;
+	}
+	/**
 	* Adds a strongly-typed inequality where clause for a single attribute key.
 	*
 	* @param key
@@ -4709,6 +4771,188 @@ var QueryBuilder = class QueryBuilder {
 		return this.where({ [key]: { contains: value } });
 	}
 	/**
+	* Adds an OR string contains clause for a single attribute key.
+	*
+	* @param key
+	* @param value
+	* @returns
+	*/
+	orWhereLike(key, value) {
+		return this.orWhere({ [key]: { contains: value } });
+	}
+	/**
+	* Adds a negated string contains (NOT LIKE) clause for a single attribute key.
+	*
+	* @param key
+	* @param value
+	* @returns
+	*/
+	whereNotLike(key, value) {
+		return this.where({ NOT: { [key]: { contains: value } } });
+	}
+	/**
+	* Adds an OR negated string contains (NOT LIKE) clause for a single attribute key.
+	*
+	* @param key
+	* @param value
+	* @returns
+	*/
+	orWhereNotLike(key, value) {
+		return this.orWhere({ NOT: { [key]: { contains: value } } });
+	}
+	/**
+	* Append a structured JSON predicate, splitting a `column->path->key`
+	* expression into its base column and nested path segments.
+	* 
+	* @param boolean 
+	* @param kind 
+	* @param column 
+	* @param options 
+	* @returns 
+	*/
+	appendJsonCondition(boolean, kind, column, options = {}) {
+		const [base, ...path] = column.split("->").map((segment) => segment.trim());
+		if (!base) throw new ArkormException("JSON where clauses require a column name.");
+		this.appendQueryCondition(boolean, {
+			type: "json",
+			kind,
+			column: base,
+			path: path.length > 0 ? path : void 0,
+			not: options.not,
+			value: options.value,
+			operator: options.operator
+		});
+		return this;
+	}
+	/**
+	* Adds a clause asserting the JSON column contains the given value
+	* (PostgreSQL `@>` containment).
+	*
+	* @param column
+	* @param value
+	* @returns
+	*/
+	whereJsonContains(column, value) {
+		return this.appendJsonCondition("AND", "contains", column, { value });
+	}
+	/**
+	* OR variant of whereJsonContains().
+	* 
+	* @param column 
+	* @param value 
+	* @returns 
+	*/
+	orWhereJsonContains(column, value) {
+		return this.appendJsonCondition("OR", "contains", column, { value });
+	}
+	/**
+	* Adds a clause asserting the JSON column does not contain the given value.
+	*
+	* @param column
+	* @param value
+	* @returns
+	*/
+	whereJsonDoesntContain(column, value) {
+		return this.appendJsonCondition("AND", "contains", column, {
+			value,
+			not: true
+		});
+	}
+	/**
+	* OR variant of whereJsonDoesntContain().
+	* 
+	* @param column 
+	* @param value 
+	* @returns 
+	*/
+	orWhereJsonDoesntContain(column, value) {
+		return this.appendJsonCondition("OR", "contains", column, {
+			value,
+			not: true
+		});
+	}
+	/**
+	* Adds a clause asserting the JSON document contains the given key/path.
+	*
+	* @param column
+	* @returns
+	*/
+	whereJsonContainsKey(column) {
+		return this.appendJsonCondition("AND", "contains-key", column);
+	}
+	/**
+	* OR variant of whereJsonContainsKey().
+	* 
+	* @param column 
+	* @returns 
+	*/
+	orWhereJsonContainsKey(column) {
+		return this.appendJsonCondition("OR", "contains-key", column);
+	}
+	/**
+	* Adds a clause asserting the JSON document does not contain the given key/path.
+	*
+	* @param column
+	* @returns
+	*/
+	whereJsonDoesntContainKey(column) {
+		return this.appendJsonCondition("AND", "contains-key", column, { not: true });
+	}
+	/**
+	* OR variant of whereJsonDoesntContainKey().
+	* 
+	* @param column 
+	* @returns 
+	*/
+	orWhereJsonDoesntContainKey(column) {
+		return this.appendJsonCondition("OR", "contains-key", column, { not: true });
+	}
+	whereJsonLength(column, operatorOrValue, maybeValue) {
+		const { operator, value } = this.resolveJsonLengthArgs(operatorOrValue, maybeValue);
+		return this.appendJsonCondition("AND", "length", column, {
+			operator,
+			value
+		});
+	}
+	orWhereJsonLength(column, operatorOrValue, maybeValue) {
+		const { operator, value } = this.resolveJsonLengthArgs(operatorOrValue, maybeValue);
+		return this.appendJsonCondition("OR", "length", column, {
+			operator,
+			value
+		});
+	}
+	resolveJsonLengthArgs(operatorOrValue, maybeValue) {
+		const hasOperator = maybeValue !== void 0;
+		const operator = hasOperator ? operatorOrValue : "=";
+		const value = hasOperator ? maybeValue : operatorOrValue;
+		if (!Number.isInteger(value) || value < 0) throw new ArkormException("whereJsonLength() expects a non-negative integer length.");
+		return {
+			operator,
+			value
+		};
+	}
+	/**
+	* Adds a clause asserting the JSON array column overlaps with the given
+	* array (shares at least one element).
+	*
+	* @param column
+	* @param value
+	* @returns
+	*/
+	whereJsonOverlaps(column, value) {
+		return this.appendJsonCondition("AND", "overlaps", column, { value });
+	}
+	/**
+	* OR variant of whereJsonOverlaps().
+	* 
+	* @param column 
+	* @param value 
+	* @returns 
+	*/
+	orWhereJsonOverlaps(column, value) {
+		return this.appendJsonCondition("OR", "overlaps", column, { value });
+	}
+	/**
 	* Adds a string starts-with clause for a single attribute key.
 	*
 	* @param key
@@ -5253,6 +5497,65 @@ var QueryBuilder = class QueryBuilder {
 		this.queryGroupBy = [...normalized];
 		return this;
 	}
+	appendHavingCondition(boolean, condition) {
+		if (!this.queryHaving) {
+			this.queryHaving = condition;
+			return;
+		}
+		this.queryHaving = {
+			type: "group",
+			operator: boolean === "AND" ? "and" : "or",
+			conditions: [this.queryHaving, condition]
+		};
+	}
+	buildHavingComparison(operatorOrValue, maybeValue, column) {
+		const hasOperator = maybeValue !== void 0;
+		return {
+			type: "comparison",
+			column,
+			operator: hasOperator ? operatorOrValue : "=",
+			value: hasOperator ? maybeValue : operatorOrValue
+		};
+	}
+	having(column, operatorOrValue, maybeValue) {
+		this.appendHavingCondition("AND", this.buildHavingComparison(operatorOrValue, maybeValue, column));
+		return this;
+	}
+	orHaving(column, operatorOrValue, maybeValue) {
+		this.appendHavingCondition("OR", this.buildHavingComparison(operatorOrValue, maybeValue, column));
+		return this;
+	}
+	/**
+	* Adds a raw HAVING clause, useful for filtering on aggregate expressions
+	* such as `count(*)`. Combines with previous HAVING clauses using AND.
+	*
+	* @param sql
+	* @param bindings
+	* @returns
+	*/
+	havingRaw(sql, bindings = []) {
+		this.appendHavingCondition("AND", {
+			type: "raw",
+			sql,
+			bindings
+		});
+		return this;
+	}
+	/**
+	* Adds a raw OR HAVING clause.
+	*
+	* @param sql
+	* @param bindings
+	* @returns
+	*/
+	orHavingRaw(sql, bindings = []) {
+		this.appendHavingCondition("OR", {
+			type: "raw",
+			sql,
+			bindings
+		});
+		return this;
+	}
 	/**
 	* Adds a join clause to the query.
 	*
@@ -6305,6 +6608,7 @@ var QueryBuilder = class QueryBuilder {
 		builder.querySelect = this.querySelect ? [...this.querySelect] : void 0;
 		builder.queryDistinct = this.queryDistinct;
 		builder.queryGroupBy = this.queryGroupBy ? [...this.queryGroupBy] : void 0;
+		builder.queryHaving = this.queryHaving;
 		builder.offsetValue = this.offsetValue;
 		builder.limitValue = this.limitValue;
 		builder.includeTrashed = this.includeTrashed;
@@ -6829,6 +7133,7 @@ var QueryBuilder = class QueryBuilder {
 			columns,
 			distinct: this.queryDistinct || void 0,
 			groupBy: this.queryGroupBy ? [...this.queryGroupBy] : void 0,
+			having: this.queryHaving,
 			joins: this.queryJoins ? [...this.queryJoins] : void 0,
 			where: condition,
 			orderBy,

package/dist/relationship/index.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
-const require_relationship = require('../relationship-WiXlopzY.cjs');
+const require_relationship = require('../relationship-BVYP9lU2.cjs');
 
 exports.BelongsToManyRelation = require_relationship.BelongsToManyRelation;
 exports.BelongsToRelation = require_relationship.BelongsToRelation;

package/dist/relationship/index.d.cts

@@ -1,2 +1,2 @@
-import { Ao as MorphManyRelation, Do as MorphToRelation, Eo as SetBasedEagerLoader, Fo as BelongsToRelation, Io as SingleResultRelation, Lo as BelongsToManyRelation, Mo as HasOneRelation, No as HasManyThroughRelation, Oo as MorphToManyRelation, Po as HasManyRelation, Ro as Relation, jo as HasOneThroughRelation, ko as MorphOneRelation, zo as RelationTableLoader } from "../index-4mi5sLRA.cjs";
+import { Ao as HasOneRelation, Do as MorphOneRelation, Eo as MorphToManyRelation, Fo as BelongsToManyRelation, Io as Relation, Lo as RelationTableLoader, Mo as HasManyRelation, No as BelongsToRelation, Oo as MorphManyRelation, Po as SingleResultRelation, To as MorphToRelation, jo as HasManyThroughRelation, ko as HasOneThroughRelation, wo as SetBasedEagerLoader } from "../index-18M5gEFk.cjs";
 export { BelongsToManyRelation, BelongsToRelation, HasManyRelation, HasManyThroughRelation, HasOneRelation, HasOneThroughRelation, MorphManyRelation, MorphOneRelation, MorphToManyRelation, MorphToRelation, Relation, RelationTableLoader, SetBasedEagerLoader, SingleResultRelation };

package/dist/relationship/index.d.mts

@@ -1,2 +1,2 @@
-import { Ao as MorphManyRelation, Do as MorphToRelation, Eo as SetBasedEagerLoader, Fo as BelongsToRelation, Io as SingleResultRelation, Lo as BelongsToManyRelation, Mo as HasOneRelation, No as HasManyThroughRelation, Oo as MorphToManyRelation, Po as HasManyRelation, Ro as Relation, jo as HasOneThroughRelation, ko as MorphOneRelation, zo as RelationTableLoader } from "../index-De8zXqTD.mjs";
+import { Ao as HasOneRelation, Do as MorphOneRelation, Eo as MorphToManyRelation, Fo as BelongsToManyRelation, Io as Relation, Lo as RelationTableLoader, Mo as HasManyRelation, No as BelongsToRelation, Oo as MorphManyRelation, Po as SingleResultRelation, To as MorphToRelation, jo as HasManyThroughRelation, ko as HasOneThroughRelation, wo as SetBasedEagerLoader } from "../index-CFXreeV7.mjs";
 export { BelongsToManyRelation, BelongsToRelation, HasManyRelation, HasManyThroughRelation, HasOneRelation, HasOneThroughRelation, MorphManyRelation, MorphOneRelation, MorphToManyRelation, MorphToRelation, Relation, RelationTableLoader, SetBasedEagerLoader, SingleResultRelation };

package/dist/relationship/index.mjs

@@ -1,3 +1,3 @@
-import { Nn as SetBasedEagerLoader, Pn as RelationTableLoader, a as HasOneThroughRelation, c as HasManyRelation, d as BelongsToManyRelation, f as Relation, i as MorphManyRelation, l as BelongsToRelation, n as MorphToManyRelation, o as HasOneRelation, r as MorphOneRelation, s as HasManyThroughRelation, t as MorphToRelation, u as SingleResultRelation } from "../relationship--l8RA_yy.mjs";
+import { Nn as SetBasedEagerLoader, Pn as RelationTableLoader, a as HasOneThroughRelation, c as HasManyRelation, d as BelongsToManyRelation, f as Relation, i as MorphManyRelation, l as BelongsToRelation, n as MorphToManyRelation, o as HasOneRelation, r as MorphOneRelation, s as HasManyThroughRelation, t as MorphToRelation, u as SingleResultRelation } from "../relationship-DtNgcxxv.mjs";
 
 export { BelongsToManyRelation, BelongsToRelation, HasManyRelation, HasManyThroughRelation, HasOneRelation, HasOneThroughRelation, MorphManyRelation, MorphOneRelation, MorphToManyRelation, MorphToRelation, Relation, RelationTableLoader, SetBasedEagerLoader, SingleResultRelation };

package/dist/{relationship-WiXlopzY.cjs → relationship-BVYP9lU2.cjs}

@@ -4015,6 +4015,17 @@ var Relation = class {
 		return this.constrain((query) => query.whereFullText(columns, value, options));
 	}
 	/**
+	* Add an OR fulltext clause to the relationship query.
+	*
+	* @param columns
+	* @param value
+	* @param options
+	* @returns
+	*/
+	orWhereFullText(columns, value, options = {}) {
+		return this.constrain((query) => query.orWhereFullText(columns, value, options));
+	}
+	/**
 	* Add a strongly-typed where key clause to the relationship query.
 	*
 	* @param key
@@ -4085,6 +4096,155 @@ var Relation = class {
 		return this.constrain((query) => query.whereLike(key, value));
 	}
 	/**
+	* Add an OR string contains clause to the relationship query.
+	* 
+	* @param key 
+	* @param value 
+	* @returns 
+	*/
+	orWhereLike(key, value) {
+		return this.constrain((query) => query.orWhereLike(key, value));
+	}
+	/**
+	* Add a negated string contains (NOT LIKE) clause to the relationship query.
+	* 
+	* @param key 
+	* @param value 
+	* @returns 
+	*/
+	whereNotLike(key, value) {
+		return this.constrain((query) => query.whereNotLike(key, value));
+	}
+	/**
+	* Add an OR negated string contains (NOT LIKE) clause to the relationship query.
+	* 
+	* @param key 
+	* @param value 
+	* @returns 
+	*/
+	orWhereNotLike(key, value) {
+		return this.constrain((query) => query.orWhereNotLike(key, value));
+	}
+	/**
+	* Add a JSON containment clause to the relationship query.
+	* 
+	* @param key 
+	* @param value 
+	* @returns 
+	*/
+	whereJsonContains(column, value) {
+		return this.constrain((query) => query.whereJsonContains(column, value));
+	}
+	/**
+	* OR variant of whereJsonContains().
+	* 
+	* @param column 
+	* @param value 
+	* @returns 
+	*/
+	orWhereJsonContains(column, value) {
+		return this.constrain((query) => query.orWhereJsonContains(column, value));
+	}
+	/**
+	* Add a negated JSON containment clause to the relationship query.
+	* 
+	* @param column 
+	* @param value 
+	* @returns 
+	*/
+	whereJsonDoesntContain(column, value) {
+		return this.constrain((query) => query.whereJsonDoesntContain(column, value));
+	}
+	/**
+	* OR variant of whereJsonDoesntContain().
+	* 
+	* @param column 
+	* @param value 
+	* @returns 
+	*/
+	orWhereJsonDoesntContain(column, value) {
+		return this.constrain((query) => query.orWhereJsonDoesntContain(column, value));
+	}
+	/**
+	* Add a JSON key-existence clause to the relationship query.
+	* 
+	* @param column 
+	* @param value 
+	* @returns 
+	*/
+	whereJsonContainsKey(column) {
+		return this.constrain((query) => query.whereJsonContainsKey(column));
+	}
+	/**
+	* OR variant of whereJsonContainsKey().
+	* 
+	* @param column 
+	* @returns 
+	*/
+	orWhereJsonContainsKey(column) {
+		return this.constrain((query) => query.orWhereJsonContainsKey(column));
+	}
+	/**
+	* Add a negated JSON key-existence clause to the relationship query.
+	* 
+	* @param column 
+	* @returns 
+	*/
+	whereJsonDoesntContainKey(column) {
+		return this.constrain((query) => query.whereJsonDoesntContainKey(column));
+	}
+	/**
+	* OR variant of whereJsonDoesntContainKey().
+	* 
+	* @param column 
+	* @returns 
+	*/
+	orWhereJsonDoesntContainKey(column) {
+		return this.constrain((query) => query.orWhereJsonDoesntContainKey(column));
+	}
+	whereJsonLength(column, operatorOrValue, maybeValue) {
+		return this.constrain((query) => maybeValue === void 0 ? query.whereJsonLength(column, operatorOrValue) : query.whereJsonLength(column, operatorOrValue, maybeValue));
+	}
+	orWhereJsonLength(column, operatorOrValue, maybeValue) {
+		return this.constrain((query) => maybeValue === void 0 ? query.orWhereJsonLength(column, operatorOrValue) : query.orWhereJsonLength(column, operatorOrValue, maybeValue));
+	}
+	/**
+	* Add a JSON array overlap clause to the relationship query.
+	* 
+	* @param column 
+	* @param value 
+	*/
+	whereJsonOverlaps(column, value) {
+		return this.constrain((query) => query.whereJsonOverlaps(column, value));
+	}
+	/**
+	* OR variant of whereJsonOverlaps().
+	* 
+	* @param column 
+	* @param value 
+	*/
+	orWhereJsonOverlaps(column, value) {
+		return this.constrain((query) => query.orWhereJsonOverlaps(column, value));
+	}
+	having(column, operatorOrValue, maybeValue) {
+		return this.constrain((query) => maybeValue === void 0 ? query.having(column, operatorOrValue) : query.having(column, operatorOrValue, maybeValue));
+	}
+	orHaving(column, operatorOrValue, maybeValue) {
+		return this.constrain((query) => maybeValue === void 0 ? query.orHaving(column, operatorOrValue) : query.orHaving(column, operatorOrValue, maybeValue));
+	}
+	/**
+	* Add a raw HAVING clause to the relationship query.
+	*/
+	havingRaw(sql, bindings = []) {
+		return this.constrain((query) => query.havingRaw(sql, bindings));
+	}
+	/**
+	* Add a raw OR HAVING clause to the relationship query.
+	*/
+	orHavingRaw(sql, bindings = []) {
+		return this.constrain((query) => query.orHavingRaw(sql, bindings));
+	}
+	/**
 	* Add a string starts-with clause to the relationship query.
 	*
 	* @param key