bigal 15.6.0 → 15.7.0

package/CHANGELOG.md

@@ -1,3 +1,9 @@
+# [15.7.0](https://github.com/bigalorm/bigal/compare/v15.6.0...v15.7.0) (2026-01-19)
+
+### Features
+
+- Support contains for json columns ([#279](https://github.com/bigalorm/bigal/issues/279)) ([229ea23](https://github.com/bigalorm/bigal/commit/229ea23b9dc90e48913f08578d6be1258df84896))
+
 # [15.6.0](https://github.com/bigalorm/bigal/compare/v15.5.0...v15.6.0) (2026-01-18)
 
 ### Features

package/dist/index.cjs

@@ -1296,7 +1296,21 @@ function buildWhere({
         params,
         joins
       });
-    case "contains":
+    case "contains": {
+      const containsColumn = propertyName ? model.columnsByPropertyName[propertyName] : null;
+      const containsColumnType = containsColumn?.type?.toLowerCase();
+      if (containsColumnType === "json") {
+        return buildJsonContainmentStatement({
+          repositoriesByModelNameLowered,
+          model,
+          // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+          propertyName,
+          isNegated,
+          value,
+          params,
+          joins
+        });
+      }
       if (Array.isArray(value)) {
         const values = value.map((val) => {
           if (typeof val !== "string") {
@@ -1328,6 +1342,7 @@ function buildWhere({
         });
       }
       throw new QueryError(`Expected value to be a string for "contains" constraint. Property (${propertyName ?? ""}) in model (${model.name}).`, model);
+    }
     case "startsWith":
       if (Array.isArray(value)) {
         const values = value.map((val) => {
@@ -1800,6 +1815,70 @@ function resolvePropertyPath({
     tableAlias: matchingJoin.alias
   };
 }
+function buildArrayOrSingleStatement({
+  repositoriesByModelNameLowered,
+  model,
+  propertyName,
+  isNegated,
+  value,
+  params,
+  joins,
+  buildNonNullStatement
+}) {
+  if (Array.isArray(value)) {
+    if (!value.length) {
+      return isNegated ? "1=1" : "1<>1";
+    }
+    if (value.length > 1) {
+      const orConstraints = [];
+      for (const item of value) {
+        orConstraints.push(
+          buildArrayOrSingleStatement({
+            repositoriesByModelNameLowered,
+            model,
+            propertyName,
+            isNegated,
+            value: item,
+            params,
+            joins,
+            buildNonNullStatement
+          })
+        );
+      }
+      if (orConstraints.length === 1) {
+        return orConstraints[0] ?? "";
+      }
+      if (isNegated) {
+        return orConstraints.join(" AND ");
+      }
+      return orConstraints.length ? `(${orConstraints.join(" OR ")})` : "";
+    }
+    value = value[0];
+  }
+  const resolved = resolvePropertyPath({
+    propertyPath: propertyName,
+    model,
+    joins,
+    repositoriesByModelNameLowered
+  });
+  let column;
+  let tablePrefix;
+  if (resolved) {
+    column = resolved.column;
+    tablePrefix = `"${resolved.tableAlias}".`;
+  } else {
+    const localColumn = model.columnsByPropertyName[propertyName];
+    if (!localColumn) {
+      throw new QueryError(`Unable to find property ${propertyName} on model ${model.name}`, model);
+    }
+    column = localColumn;
+    tablePrefix = "";
+  }
+  if (value === null) {
+    return `${tablePrefix}"${column.name}" ${isNegated ? "IS NOT" : "IS"} NULL`;
+  }
+  return buildNonNullStatement({ column, tablePrefix }, value, params);
+}
 function resolveJoinAlias({
   aliasOrPropertyName,
   model,
@@ -1866,21 +1945,64 @@ function buildNestedJoinWhere({
         if (op === "!") {
           if (opValue === null) {
             andClauses.push(`"${tableAlias}"."${column.name}" IS NOT NULL`);
+          } else if (typeof opValue === "object" && !Array.isArray(opValue)) {
+            for (const [nestedOp, nestedOpValue] of Object.entries(opValue)) {
+              if (nestedOp === "like" || nestedOp === "contains" || nestedOp === "startsWith" || nestedOp === "endsWith") {
+                const negatedColumnType = column.type?.toLowerCase();
+                if (negatedColumnType === "json") {
+                  if (nestedOp !== "contains") {
+                    throw new QueryError(
+                      `"${nestedOp}" operator is not supported for JSON columns. Use "contains" with an object value for JSON containment. Property (${key}) in model (${joinedModel.name}).`,
+                      joinedModel
+                    );
+                  }
+                  params.push(nestedOpValue);
+                  andClauses.push(`NOT "${tableAlias}"."${column.name}"@>$${params.length}::jsonb`);
+                } else {
+                  let likeValue = nestedOpValue;
+                  if (nestedOp === "contains") {
+                    likeValue = `%${likeValue}%`;
+                  } else if (nestedOp === "startsWith") {
+                    likeValue = `${likeValue}%`;
+                  } else if (nestedOp === "endsWith") {
+                    likeValue = `%${likeValue}`;
+                  }
+                  params.push(likeValue);
+                  andClauses.push(`"${tableAlias}"."${column.name}" NOT ILIKE $${params.length}`);
+                }
+              } else if (nestedOp === ">" || nestedOp === ">=" || nestedOp === "<" || nestedOp === "<=") {
+                params.push(nestedOpValue);
+                const negatedComparisonOps = { ">": "<=", ">=": "<", "<": ">=", "<=": ">" };
+                andClauses.push(`"${tableAlias}"."${column.name}"${negatedComparisonOps[nestedOp]}$${params.length}`);
+              }
+            }
           } else {
             params.push(opValue);
             andClauses.push(`"${tableAlias}"."${column.name}"<>$${params.length}`);
           }
         } else if (op === "like" || op === "contains" || op === "startsWith" || op === "endsWith") {
-          let likeValue = opValue;
-          if (op === "contains") {
-            likeValue = `%${likeValue}%`;
-          } else if (op === "startsWith") {
-            likeValue = `${likeValue}%`;
-          } else if (op === "endsWith") {
-            likeValue = `%${likeValue}`;
+          const nestedColumnType = column.type?.toLowerCase();
+          if (nestedColumnType === "json") {
+            if (op !== "contains") {
+              throw new QueryError(
+                `"${op}" operator is not supported for JSON columns. Use "contains" with an object value for JSON containment. Property (${key}) in model (${joinedModel.name}).`,
+                joinedModel
+              );
+            }
+            params.push(opValue);
+            andClauses.push(`"${tableAlias}"."${column.name}"@>$${params.length}::jsonb`);
+          } else {
+            let likeValue = opValue;
+            if (op === "contains") {
+              likeValue = `%${likeValue}%`;
+            } else if (op === "startsWith") {
+              likeValue = `${likeValue}%`;
+            } else if (op === "endsWith") {
+              likeValue = `%${likeValue}`;
+            }
+            params.push(likeValue);
+            andClauses.push(`"${tableAlias}"."${column.name}" ILIKE $${params.length}`);
           }
-          params.push(likeValue);
-          andClauses.push(`"${tableAlias}"."${column.name}" ILIKE $${params.length}`);
         } else if (op === ">" || op === ">=" || op === "<" || op === "<=") {
           params.push(opValue);
           andClauses.push(`"${tableAlias}"."${column.name}"${op}$${params.length}`);
@@ -1900,76 +2022,51 @@ function buildNestedJoinWhere({
   }
   return andClauses.join(" AND ");
 }
-function buildLikeOperatorStatement({ repositoriesByModelNameLowered, model, propertyName, isNegated, value, params, joins }) {
-  if (Array.isArray(value)) {
-    if (!value.length) {
-      if (isNegated) {
-        return "1=1";
-      }
-      return "1<>1";
-    }
-    if (value.length > 1) {
-      const orConstraints = [];
-      for (const item of value) {
-        orConstraints.push(
-          buildLikeOperatorStatement({
-            repositoriesByModelNameLowered,
-            model,
-            propertyName,
-            isNegated,
-            value: item,
-            params,
-            joins
-          })
-        );
-      }
-      if (orConstraints.length === 1) {
-        return orConstraints[0] ?? "";
-      }
-      if (isNegated) {
-        return orConstraints.join(" AND ");
-      }
-      if (orConstraints.length) {
-        return `(${orConstraints.join(" OR ")})`;
-      }
-      return "";
-    }
-    value = value[0];
-  }
-  const resolved = resolvePropertyPath({
-    propertyPath: propertyName,
+function buildJsonContainmentStatement({ repositoriesByModelNameLowered, model, propertyName, isNegated, value, params, joins }) {
+  return buildArrayOrSingleStatement({
+    repositoriesByModelNameLowered,
     model,
+    propertyName,
+    isNegated,
+    value,
+    params,
     joins,
-    repositoriesByModelNameLowered
-  });
-  let column;
-  let tablePrefix;
-  if (resolved) {
-    column = resolved.column;
-    tablePrefix = `"${resolved.tableAlias}".`;
-  } else {
-    const localColumn = model.columnsByPropertyName[propertyName];
-    if (!localColumn) {
-      throw new QueryError(`Unable to find property ${propertyName} on model ${model.name}`, model);
+    buildNonNullStatement({ column, tablePrefix }, nonNullValue, paramsList) {
+      paramsList.push(nonNullValue);
+      return `${isNegated ? "NOT " : ""}${tablePrefix}"${column.name}"@>$${paramsList.length}::jsonb`;
     }
-    column = localColumn;
-    tablePrefix = "";
-  }
-  if (value === null) {
-    return `${tablePrefix}"${column.name}" ${isNegated ? "IS NOT" : "IS"} NULL`;
-  }
-  if (typeof value === "string") {
-    if (value) {
-      params.push(value);
-      const columnType = column.type?.toLowerCase();
+  });
+}
+function buildLikeOperatorStatement({ repositoriesByModelNameLowered, model, propertyName, isNegated, value, params, joins }) {
+  return buildArrayOrSingleStatement({
+    repositoriesByModelNameLowered,
+    model,
+    propertyName,
+    isNegated,
+    value,
+    params,
+    joins,
+    buildNonNullStatement({ column, tablePrefix }, nonNullValue, paramsList) {
+      if (typeof nonNullValue !== "string") {
+        throw new QueryError(`Expected value to be a string for "like" constraint. Property (${propertyName}) in model (${model.name}).`, model);
+      }
+      if (!nonNullValue) {
+        return `${tablePrefix}"${column.name}" ${isNegated ? "!=" : "="} ''`;
+      }
+      paramsList.push(nonNullValue);
+      const columnType = "type" in column && typeof column.type === "string" ? column.type.toLowerCase() : void 0;
+      if (columnType === "json") {
+        throw new QueryError(
+          `"like" operator is not supported for JSON columns. Use "contains" with an object value for JSON containment. Property (${propertyName}) in model (${model.name}).`,
+          model
+        );
+      }
       if (columnType === "array" || columnType === "string[]") {
-        return `${isNegated ? "NOT " : ""}EXISTS(SELECT 1 FROM (SELECT unnest(${tablePrefix}"${column.name}") AS "unnested_${column.name}") __unnested WHERE "unnested_${column.name}" ILIKE $${params.length})`;
+        return `${isNegated ? "NOT " : ""}EXISTS(SELECT 1 FROM (SELECT unnest(${tablePrefix}"${column.name}") AS "unnested_${column.name}") __unnested WHERE "unnested_${column.name}" ILIKE $${paramsList.length})`;
       }
-      return `${tablePrefix}"${column.name}"${isNegated ? " NOT" : ""} ILIKE $${params.length}`;
+      return `${tablePrefix}"${column.name}"${isNegated ? " NOT" : ""} ILIKE $${paramsList.length}`;
     }
-    return `${tablePrefix}"${column.name}" ${isNegated ? "!=" : "="} ''`;
-  }
-  throw new QueryError(`Expected value to be a string for "like" constraint. Property (${propertyName}) in model (${model.name}).`, model);
+  });
 }
 function buildComparisonOperatorStatement({
   repositoriesByModelNameLowered,

package/dist/index.d.cts

@@ -885,6 +885,7 @@ type ExcludeUndefined<T> = Exclude<T, undefined>;
 type LiteralValues<TValue> = (TValue | null)[] | TValue | null;
 type WhereClauseValue<TValue> = TValue extends NotEntityBrand | undefined ? Exclude<TValue, NotEntityBrand | undefined> : Extract<TValue, Entity> extends undefined ? LiteralValues<ExcludeUndefined<TValue>> : (ExcludeUndefined<Exclude<TValue, Entity>> | null)[] | (Pick<Extract<ExcludeUndefined<TValue>, Entity>, 'id'> | null)[] | ExcludeUndefined<Exclude<TValue, Entity>> | Pick<Extract<ExcludeUndefined<TValue>, Entity>, 'id'> | null;
 type StringConstraint<TValue extends string> = Partial<Record<'contains' | 'endsWith' | 'like' | 'startsWith', LiteralValues<ExcludeUndefined<TValue>>>>;
+type JsonConstraint<TValue> = Partial<Record<'contains', ExcludeUndefined<TValue> | LiteralValues<ExcludeUndefined<TValue>>>>;
 type NumberOrDateConstraint<TValue extends Date | number> = Partial<Record<'<' | '<=' | '>' | '>=', LiteralValues<ExcludeUndefined<TValue>>>>;
 interface SubqueryInConstraint {
     in: SubqueryBuilderLike;
@@ -894,7 +895,7 @@ type NumberOrDateConstraintWithSubquery<TValue extends Date | number> = NumberOr
 type NegatableConstraint<TValue> = TValue | {
     '!': TValue;
 };
-type WhereQueryStatement<TValue> = [TValue] extends [string] ? NegatableConstraint<StringConstraint<TValue> | SubqueryInConstraint | WhereClauseValue<TValue>> : TValue extends string ? NegatableConstraint<StringConstraint<TValue> | SubqueryInConstraint | WhereClauseValue<TValue>> : TValue extends Date | number ? NegatableConstraint<NumberOrDateConstraintWithSubquery<TValue> | SubqueryInConstraint | WhereClauseValue<TValue>> : NegatableConstraint<SubqueryInConstraint | WhereClauseValue<TValue>>;
+type WhereQueryStatement<TValue> = [TValue] extends [string] ? NegatableConstraint<StringConstraint<TValue> | SubqueryInConstraint | WhereClauseValue<TValue>> : TValue extends string ? NegatableConstraint<StringConstraint<TValue> | SubqueryInConstraint | WhereClauseValue<TValue>> : TValue extends Date | number ? NegatableConstraint<NumberOrDateConstraintWithSubquery<TValue> | SubqueryInConstraint | WhereClauseValue<TValue>> : NegatableConstraint<JsonConstraint<TValue> | SubqueryInConstraint | WhereClauseValue<TValue>>;
 type WhereQuery<T extends Entity> = {
     [K in keyof T as ExcludeEntityCollections<T[K], ExcludeFunctions<T[K], K>>]?: K extends 'id' ? WhereQueryStatement<T | T[K]> : T[K] extends (infer U)[] | undefined ? WhereQueryStatement<ExcludeUndefined<U>> : NegatableConstraint<LiteralValues<ExcludeUndefined<T[K]>>> | WhereQueryStatement<ExcludeUndefined<T[K]>>;
 } & {
@@ -1197,4 +1198,4 @@ interface InitializeOptions extends IConnection {
 declare function initialize({ models, pool, readonlyPool, connections, expose }: InitializeOptions): Record<string, IReadonlyRepository<Entity> | IRepository<Entity>>;
 
 export { ColumnBaseMetadata, ColumnCollectionMetadata, ColumnModelMetadata, ColumnTypeMetadata, Entity, ModelMetadata, QueryError, ReadonlyRepository, Repository, ScalarSubquery, SelectBuilder, SubqueryBuilder, column, createDateColumn, getMetadataStorage, initialize, isSubqueryJoin, primaryColumn, subquery, table, updateDateColumn, versionColumn };
-export type { AggregateBuilder, ClassLike, ColumnBaseMetadataOptions, ColumnCollectionMetadataOptions, ColumnMetadata, ColumnModelMetadataOptions, ColumnModifierMetadata, ColumnTypeMetadataOptions, Comparer, CountResult, CreateUpdateOptions, CreateUpdateParams, DeleteOptions, DestroyResult, DoNotReturnRecords, EntityFieldValue, EntityPrimitiveOrId, EntityStatic, ExcludeEntityCollections, ExcludeFunctions, FindArgs, FindOneArgs, FindOneResult, FindOneResultJSON, FindQueryWithCount, FindQueryWithCountJSON, FindResult, FindResultJSON, FindWithCountResult, GetValueType, HavingComparer, HavingCondition, IConnection, IReadonlyRepository, IRepository, IRepositoryOptions, IncludeFunctions, InitializeOptions, IsValueOfType, JoinDefinition, JoinInfo, JoinType, JoinedSort, JoinedWhereQuery, LiteralValues, ModelJoinDefinition, ModelMetadataOptions, ModelRelationshipKeys, MultipleSortString, NegatableConstraint, NotEntity, NotEntityBrand, NumberOrDateConstraint, NumberOrDateConstraintWithSubquery, OmitEntityCollections, OmitFunctions, OrderBy, PaginateOptions, PickAsType, PickByValueType, PickFunctions, PlainObject, PoolLike, PoolQueryResult, PopulateArgs, Populated, QueryResult, QueryResultOptionalPopulated, QueryResultPopulated, QueryResultRow, ReturnSelect$1 as ReturnSelect, ScalarSubqueryConstraint, SelectAggregateExpression, SelectItem, Sort, SortObject, SortObjectValue, SortString, StringConstraint, SubqueryBuilderLike, SubqueryInConstraint, SubqueryJoinDefinition, SubqueryJoinOnCondition, WhereClauseValue, WhereQuery, WhereQueryStatement };
+export type { AggregateBuilder, ClassLike, ColumnBaseMetadataOptions, ColumnCollectionMetadataOptions, ColumnMetadata, ColumnModelMetadataOptions, ColumnModifierMetadata, ColumnTypeMetadataOptions, Comparer, CountResult, CreateUpdateOptions, CreateUpdateParams, DeleteOptions, DestroyResult, DoNotReturnRecords, EntityFieldValue, EntityPrimitiveOrId, EntityStatic, ExcludeEntityCollections, ExcludeFunctions, FindArgs, FindOneArgs, FindOneResult, FindOneResultJSON, FindQueryWithCount, FindQueryWithCountJSON, FindResult, FindResultJSON, FindWithCountResult, GetValueType, HavingComparer, HavingCondition, IConnection, IReadonlyRepository, IRepository, IRepositoryOptions, IncludeFunctions, InitializeOptions, IsValueOfType, JoinDefinition, JoinInfo, JoinType, JoinedSort, JoinedWhereQuery, JsonConstraint, LiteralValues, ModelJoinDefinition, ModelMetadataOptions, ModelRelationshipKeys, MultipleSortString, NegatableConstraint, NotEntity, NotEntityBrand, NumberOrDateConstraint, NumberOrDateConstraintWithSubquery, OmitEntityCollections, OmitFunctions, OrderBy, PaginateOptions, PickAsType, PickByValueType, PickFunctions, PlainObject, PoolLike, PoolQueryResult, PopulateArgs, Populated, QueryResult, QueryResultOptionalPopulated, QueryResultPopulated, QueryResultRow, ReturnSelect$1 as ReturnSelect, ScalarSubqueryConstraint, SelectAggregateExpression, SelectItem, Sort, SortObject, SortObjectValue, SortString, StringConstraint, SubqueryBuilderLike, SubqueryInConstraint, SubqueryJoinDefinition, SubqueryJoinOnCondition, WhereClauseValue, WhereQuery, WhereQueryStatement };

package/dist/index.d.mts

@@ -885,6 +885,7 @@ type ExcludeUndefined<T> = Exclude<T, undefined>;
 type LiteralValues<TValue> = (TValue | null)[] | TValue | null;
 type WhereClauseValue<TValue> = TValue extends NotEntityBrand | undefined ? Exclude<TValue, NotEntityBrand | undefined> : Extract<TValue, Entity> extends undefined ? LiteralValues<ExcludeUndefined<TValue>> : (ExcludeUndefined<Exclude<TValue, Entity>> | null)[] | (Pick<Extract<ExcludeUndefined<TValue>, Entity>, 'id'> | null)[] | ExcludeUndefined<Exclude<TValue, Entity>> | Pick<Extract<ExcludeUndefined<TValue>, Entity>, 'id'> | null;
 type StringConstraint<TValue extends string> = Partial<Record<'contains' | 'endsWith' | 'like' | 'startsWith', LiteralValues<ExcludeUndefined<TValue>>>>;
+type JsonConstraint<TValue> = Partial<Record<'contains', ExcludeUndefined<TValue> | LiteralValues<ExcludeUndefined<TValue>>>>;
 type NumberOrDateConstraint<TValue extends Date | number> = Partial<Record<'<' | '<=' | '>' | '>=', LiteralValues<ExcludeUndefined<TValue>>>>;
 interface SubqueryInConstraint {
     in: SubqueryBuilderLike;
@@ -894,7 +895,7 @@ type NumberOrDateConstraintWithSubquery<TValue extends Date | number> = NumberOr
 type NegatableConstraint<TValue> = TValue | {
     '!': TValue;
 };
-type WhereQueryStatement<TValue> = [TValue] extends [string] ? NegatableConstraint<StringConstraint<TValue> | SubqueryInConstraint | WhereClauseValue<TValue>> : TValue extends string ? NegatableConstraint<StringConstraint<TValue> | SubqueryInConstraint | WhereClauseValue<TValue>> : TValue extends Date | number ? NegatableConstraint<NumberOrDateConstraintWithSubquery<TValue> | SubqueryInConstraint | WhereClauseValue<TValue>> : NegatableConstraint<SubqueryInConstraint | WhereClauseValue<TValue>>;
+type WhereQueryStatement<TValue> = [TValue] extends [string] ? NegatableConstraint<StringConstraint<TValue> | SubqueryInConstraint | WhereClauseValue<TValue>> : TValue extends string ? NegatableConstraint<StringConstraint<TValue> | SubqueryInConstraint | WhereClauseValue<TValue>> : TValue extends Date | number ? NegatableConstraint<NumberOrDateConstraintWithSubquery<TValue> | SubqueryInConstraint | WhereClauseValue<TValue>> : NegatableConstraint<JsonConstraint<TValue> | SubqueryInConstraint | WhereClauseValue<TValue>>;
 type WhereQuery<T extends Entity> = {
     [K in keyof T as ExcludeEntityCollections<T[K], ExcludeFunctions<T[K], K>>]?: K extends 'id' ? WhereQueryStatement<T | T[K]> : T[K] extends (infer U)[] | undefined ? WhereQueryStatement<ExcludeUndefined<U>> : NegatableConstraint<LiteralValues<ExcludeUndefined<T[K]>>> | WhereQueryStatement<ExcludeUndefined<T[K]>>;
 } & {
@@ -1197,4 +1198,4 @@ interface InitializeOptions extends IConnection {
 declare function initialize({ models, pool, readonlyPool, connections, expose }: InitializeOptions): Record<string, IReadonlyRepository<Entity> | IRepository<Entity>>;
 
 export { ColumnBaseMetadata, ColumnCollectionMetadata, ColumnModelMetadata, ColumnTypeMetadata, Entity, ModelMetadata, QueryError, ReadonlyRepository, Repository, ScalarSubquery, SelectBuilder, SubqueryBuilder, column, createDateColumn, getMetadataStorage, initialize, isSubqueryJoin, primaryColumn, subquery, table, updateDateColumn, versionColumn };
-export type { AggregateBuilder, ClassLike, ColumnBaseMetadataOptions, ColumnCollectionMetadataOptions, ColumnMetadata, ColumnModelMetadataOptions, ColumnModifierMetadata, ColumnTypeMetadataOptions, Comparer, CountResult, CreateUpdateOptions, CreateUpdateParams, DeleteOptions, DestroyResult, DoNotReturnRecords, EntityFieldValue, EntityPrimitiveOrId, EntityStatic, ExcludeEntityCollections, ExcludeFunctions, FindArgs, FindOneArgs, FindOneResult, FindOneResultJSON, FindQueryWithCount, FindQueryWithCountJSON, FindResult, FindResultJSON, FindWithCountResult, GetValueType, HavingComparer, HavingCondition, IConnection, IReadonlyRepository, IRepository, IRepositoryOptions, IncludeFunctions, InitializeOptions, IsValueOfType, JoinDefinition, JoinInfo, JoinType, JoinedSort, JoinedWhereQuery, LiteralValues, ModelJoinDefinition, ModelMetadataOptions, ModelRelationshipKeys, MultipleSortString, NegatableConstraint, NotEntity, NotEntityBrand, NumberOrDateConstraint, NumberOrDateConstraintWithSubquery, OmitEntityCollections, OmitFunctions, OrderBy, PaginateOptions, PickAsType, PickByValueType, PickFunctions, PlainObject, PoolLike, PoolQueryResult, PopulateArgs, Populated, QueryResult, QueryResultOptionalPopulated, QueryResultPopulated, QueryResultRow, ReturnSelect$1 as ReturnSelect, ScalarSubqueryConstraint, SelectAggregateExpression, SelectItem, Sort, SortObject, SortObjectValue, SortString, StringConstraint, SubqueryBuilderLike, SubqueryInConstraint, SubqueryJoinDefinition, SubqueryJoinOnCondition, WhereClauseValue, WhereQuery, WhereQueryStatement };
+export type { AggregateBuilder, ClassLike, ColumnBaseMetadataOptions, ColumnCollectionMetadataOptions, ColumnMetadata, ColumnModelMetadataOptions, ColumnModifierMetadata, ColumnTypeMetadataOptions, Comparer, CountResult, CreateUpdateOptions, CreateUpdateParams, DeleteOptions, DestroyResult, DoNotReturnRecords, EntityFieldValue, EntityPrimitiveOrId, EntityStatic, ExcludeEntityCollections, ExcludeFunctions, FindArgs, FindOneArgs, FindOneResult, FindOneResultJSON, FindQueryWithCount, FindQueryWithCountJSON, FindResult, FindResultJSON, FindWithCountResult, GetValueType, HavingComparer, HavingCondition, IConnection, IReadonlyRepository, IRepository, IRepositoryOptions, IncludeFunctions, InitializeOptions, IsValueOfType, JoinDefinition, JoinInfo, JoinType, JoinedSort, JoinedWhereQuery, JsonConstraint, LiteralValues, ModelJoinDefinition, ModelMetadataOptions, ModelRelationshipKeys, MultipleSortString, NegatableConstraint, NotEntity, NotEntityBrand, NumberOrDateConstraint, NumberOrDateConstraintWithSubquery, OmitEntityCollections, OmitFunctions, OrderBy, PaginateOptions, PickAsType, PickByValueType, PickFunctions, PlainObject, PoolLike, PoolQueryResult, PopulateArgs, Populated, QueryResult, QueryResultOptionalPopulated, QueryResultPopulated, QueryResultRow, ReturnSelect$1 as ReturnSelect, ScalarSubqueryConstraint, SelectAggregateExpression, SelectItem, Sort, SortObject, SortObjectValue, SortString, StringConstraint, SubqueryBuilderLike, SubqueryInConstraint, SubqueryJoinDefinition, SubqueryJoinOnCondition, WhereClauseValue, WhereQuery, WhereQueryStatement };

package/dist/index.d.ts

@@ -885,6 +885,7 @@ type ExcludeUndefined<T> = Exclude<T, undefined>;
 type LiteralValues<TValue> = (TValue | null)[] | TValue | null;
 type WhereClauseValue<TValue> = TValue extends NotEntityBrand | undefined ? Exclude<TValue, NotEntityBrand | undefined> : Extract<TValue, Entity> extends undefined ? LiteralValues<ExcludeUndefined<TValue>> : (ExcludeUndefined<Exclude<TValue, Entity>> | null)[] | (Pick<Extract<ExcludeUndefined<TValue>, Entity>, 'id'> | null)[] | ExcludeUndefined<Exclude<TValue, Entity>> | Pick<Extract<ExcludeUndefined<TValue>, Entity>, 'id'> | null;
 type StringConstraint<TValue extends string> = Partial<Record<'contains' | 'endsWith' | 'like' | 'startsWith', LiteralValues<ExcludeUndefined<TValue>>>>;
+type JsonConstraint<TValue> = Partial<Record<'contains', ExcludeUndefined<TValue> | LiteralValues<ExcludeUndefined<TValue>>>>;
 type NumberOrDateConstraint<TValue extends Date | number> = Partial<Record<'<' | '<=' | '>' | '>=', LiteralValues<ExcludeUndefined<TValue>>>>;
 interface SubqueryInConstraint {
     in: SubqueryBuilderLike;
@@ -894,7 +895,7 @@ type NumberOrDateConstraintWithSubquery<TValue extends Date | number> = NumberOr
 type NegatableConstraint<TValue> = TValue | {
     '!': TValue;
 };
-type WhereQueryStatement<TValue> = [TValue] extends [string] ? NegatableConstraint<StringConstraint<TValue> | SubqueryInConstraint | WhereClauseValue<TValue>> : TValue extends string ? NegatableConstraint<StringConstraint<TValue> | SubqueryInConstraint | WhereClauseValue<TValue>> : TValue extends Date | number ? NegatableConstraint<NumberOrDateConstraintWithSubquery<TValue> | SubqueryInConstraint | WhereClauseValue<TValue>> : NegatableConstraint<SubqueryInConstraint | WhereClauseValue<TValue>>;
+type WhereQueryStatement<TValue> = [TValue] extends [string] ? NegatableConstraint<StringConstraint<TValue> | SubqueryInConstraint | WhereClauseValue<TValue>> : TValue extends string ? NegatableConstraint<StringConstraint<TValue> | SubqueryInConstraint | WhereClauseValue<TValue>> : TValue extends Date | number ? NegatableConstraint<NumberOrDateConstraintWithSubquery<TValue> | SubqueryInConstraint | WhereClauseValue<TValue>> : NegatableConstraint<JsonConstraint<TValue> | SubqueryInConstraint | WhereClauseValue<TValue>>;
 type WhereQuery<T extends Entity> = {
     [K in keyof T as ExcludeEntityCollections<T[K], ExcludeFunctions<T[K], K>>]?: K extends 'id' ? WhereQueryStatement<T | T[K]> : T[K] extends (infer U)[] | undefined ? WhereQueryStatement<ExcludeUndefined<U>> : NegatableConstraint<LiteralValues<ExcludeUndefined<T[K]>>> | WhereQueryStatement<ExcludeUndefined<T[K]>>;
 } & {
@@ -1197,4 +1198,4 @@ interface InitializeOptions extends IConnection {
 declare function initialize({ models, pool, readonlyPool, connections, expose }: InitializeOptions): Record<string, IReadonlyRepository<Entity> | IRepository<Entity>>;
 
 export { ColumnBaseMetadata, ColumnCollectionMetadata, ColumnModelMetadata, ColumnTypeMetadata, Entity, ModelMetadata, QueryError, ReadonlyRepository, Repository, ScalarSubquery, SelectBuilder, SubqueryBuilder, column, createDateColumn, getMetadataStorage, initialize, isSubqueryJoin, primaryColumn, subquery, table, updateDateColumn, versionColumn };
-export type { AggregateBuilder, ClassLike, ColumnBaseMetadataOptions, ColumnCollectionMetadataOptions, ColumnMetadata, ColumnModelMetadataOptions, ColumnModifierMetadata, ColumnTypeMetadataOptions, Comparer, CountResult, CreateUpdateOptions, CreateUpdateParams, DeleteOptions, DestroyResult, DoNotReturnRecords, EntityFieldValue, EntityPrimitiveOrId, EntityStatic, ExcludeEntityCollections, ExcludeFunctions, FindArgs, FindOneArgs, FindOneResult, FindOneResultJSON, FindQueryWithCount, FindQueryWithCountJSON, FindResult, FindResultJSON, FindWithCountResult, GetValueType, HavingComparer, HavingCondition, IConnection, IReadonlyRepository, IRepository, IRepositoryOptions, IncludeFunctions, InitializeOptions, IsValueOfType, JoinDefinition, JoinInfo, JoinType, JoinedSort, JoinedWhereQuery, LiteralValues, ModelJoinDefinition, ModelMetadataOptions, ModelRelationshipKeys, MultipleSortString, NegatableConstraint, NotEntity, NotEntityBrand, NumberOrDateConstraint, NumberOrDateConstraintWithSubquery, OmitEntityCollections, OmitFunctions, OrderBy, PaginateOptions, PickAsType, PickByValueType, PickFunctions, PlainObject, PoolLike, PoolQueryResult, PopulateArgs, Populated, QueryResult, QueryResultOptionalPopulated, QueryResultPopulated, QueryResultRow, ReturnSelect$1 as ReturnSelect, ScalarSubqueryConstraint, SelectAggregateExpression, SelectItem, Sort, SortObject, SortObjectValue, SortString, StringConstraint, SubqueryBuilderLike, SubqueryInConstraint, SubqueryJoinDefinition, SubqueryJoinOnCondition, WhereClauseValue, WhereQuery, WhereQueryStatement };
+export type { AggregateBuilder, ClassLike, ColumnBaseMetadataOptions, ColumnCollectionMetadataOptions, ColumnMetadata, ColumnModelMetadataOptions, ColumnModifierMetadata, ColumnTypeMetadataOptions, Comparer, CountResult, CreateUpdateOptions, CreateUpdateParams, DeleteOptions, DestroyResult, DoNotReturnRecords, EntityFieldValue, EntityPrimitiveOrId, EntityStatic, ExcludeEntityCollections, ExcludeFunctions, FindArgs, FindOneArgs, FindOneResult, FindOneResultJSON, FindQueryWithCount, FindQueryWithCountJSON, FindResult, FindResultJSON, FindWithCountResult, GetValueType, HavingComparer, HavingCondition, IConnection, IReadonlyRepository, IRepository, IRepositoryOptions, IncludeFunctions, InitializeOptions, IsValueOfType, JoinDefinition, JoinInfo, JoinType, JoinedSort, JoinedWhereQuery, JsonConstraint, LiteralValues, ModelJoinDefinition, ModelMetadataOptions, ModelRelationshipKeys, MultipleSortString, NegatableConstraint, NotEntity, NotEntityBrand, NumberOrDateConstraint, NumberOrDateConstraintWithSubquery, OmitEntityCollections, OmitFunctions, OrderBy, PaginateOptions, PickAsType, PickByValueType, PickFunctions, PlainObject, PoolLike, PoolQueryResult, PopulateArgs, Populated, QueryResult, QueryResultOptionalPopulated, QueryResultPopulated, QueryResultRow, ReturnSelect$1 as ReturnSelect, ScalarSubqueryConstraint, SelectAggregateExpression, SelectItem, Sort, SortObject, SortObjectValue, SortString, StringConstraint, SubqueryBuilderLike, SubqueryInConstraint, SubqueryJoinDefinition, SubqueryJoinOnCondition, WhereClauseValue, WhereQuery, WhereQueryStatement };

package/dist/index.mjs

@@ -1294,7 +1294,21 @@ function buildWhere({
         params,
         joins
       });
-    case "contains":
+    case "contains": {
+      const containsColumn = propertyName ? model.columnsByPropertyName[propertyName] : null;
+      const containsColumnType = containsColumn?.type?.toLowerCase();
+      if (containsColumnType === "json") {
+        return buildJsonContainmentStatement({
+          repositoriesByModelNameLowered,
+          model,
+          // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+          propertyName,
+          isNegated,
+          value,
+          params,
+          joins
+        });
+      }
       if (Array.isArray(value)) {
         const values = value.map((val) => {
           if (typeof val !== "string") {
@@ -1326,6 +1340,7 @@ function buildWhere({
         });
       }
       throw new QueryError(`Expected value to be a string for "contains" constraint. Property (${propertyName ?? ""}) in model (${model.name}).`, model);
+    }
     case "startsWith":
       if (Array.isArray(value)) {
         const values = value.map((val) => {
@@ -1798,6 +1813,70 @@ function resolvePropertyPath({
     tableAlias: matchingJoin.alias
   };
 }
+function buildArrayOrSingleStatement({
+  repositoriesByModelNameLowered,
+  model,
+  propertyName,
+  isNegated,
+  value,
+  params,
+  joins,
+  buildNonNullStatement
+}) {
+  if (Array.isArray(value)) {
+    if (!value.length) {
+      return isNegated ? "1=1" : "1<>1";
+    }
+    if (value.length > 1) {
+      const orConstraints = [];
+      for (const item of value) {
+        orConstraints.push(
+          buildArrayOrSingleStatement({
+            repositoriesByModelNameLowered,
+            model,
+            propertyName,
+            isNegated,
+            value: item,
+            params,
+            joins,
+            buildNonNullStatement
+          })
+        );
+      }
+      if (orConstraints.length === 1) {
+        return orConstraints[0] ?? "";
+      }
+      if (isNegated) {
+        return orConstraints.join(" AND ");
+      }
+      return orConstraints.length ? `(${orConstraints.join(" OR ")})` : "";
+    }
+    value = value[0];
+  }
+  const resolved = resolvePropertyPath({
+    propertyPath: propertyName,
+    model,
+    joins,
+    repositoriesByModelNameLowered
+  });
+  let column;
+  let tablePrefix;
+  if (resolved) {
+    column = resolved.column;
+    tablePrefix = `"${resolved.tableAlias}".`;
+  } else {
+    const localColumn = model.columnsByPropertyName[propertyName];
+    if (!localColumn) {
+      throw new QueryError(`Unable to find property ${propertyName} on model ${model.name}`, model);
+    }
+    column = localColumn;
+    tablePrefix = "";
+  }
+  if (value === null) {
+    return `${tablePrefix}"${column.name}" ${isNegated ? "IS NOT" : "IS"} NULL`;
+  }
+  return buildNonNullStatement({ column, tablePrefix }, value, params);
+}
 function resolveJoinAlias({
   aliasOrPropertyName,
   model,
@@ -1864,21 +1943,64 @@ function buildNestedJoinWhere({
         if (op === "!") {
           if (opValue === null) {
             andClauses.push(`"${tableAlias}"."${column.name}" IS NOT NULL`);
+          } else if (typeof opValue === "object" && !Array.isArray(opValue)) {
+            for (const [nestedOp, nestedOpValue] of Object.entries(opValue)) {
+              if (nestedOp === "like" || nestedOp === "contains" || nestedOp === "startsWith" || nestedOp === "endsWith") {
+                const negatedColumnType = column.type?.toLowerCase();
+                if (negatedColumnType === "json") {
+                  if (nestedOp !== "contains") {
+                    throw new QueryError(
+                      `"${nestedOp}" operator is not supported for JSON columns. Use "contains" with an object value for JSON containment. Property (${key}) in model (${joinedModel.name}).`,
+                      joinedModel
+                    );
+                  }
+                  params.push(nestedOpValue);
+                  andClauses.push(`NOT "${tableAlias}"."${column.name}"@>$${params.length}::jsonb`);
+                } else {
+                  let likeValue = nestedOpValue;
+                  if (nestedOp === "contains") {
+                    likeValue = `%${likeValue}%`;
+                  } else if (nestedOp === "startsWith") {
+                    likeValue = `${likeValue}%`;
+                  } else if (nestedOp === "endsWith") {
+                    likeValue = `%${likeValue}`;
+                  }
+                  params.push(likeValue);
+                  andClauses.push(`"${tableAlias}"."${column.name}" NOT ILIKE $${params.length}`);
+                }
+              } else if (nestedOp === ">" || nestedOp === ">=" || nestedOp === "<" || nestedOp === "<=") {
+                params.push(nestedOpValue);
+                const negatedComparisonOps = { ">": "<=", ">=": "<", "<": ">=", "<=": ">" };
+                andClauses.push(`"${tableAlias}"."${column.name}"${negatedComparisonOps[nestedOp]}$${params.length}`);
+              }
+            }
           } else {
             params.push(opValue);
             andClauses.push(`"${tableAlias}"."${column.name}"<>$${params.length}`);
           }
         } else if (op === "like" || op === "contains" || op === "startsWith" || op === "endsWith") {
-          let likeValue = opValue;
-          if (op === "contains") {
-            likeValue = `%${likeValue}%`;
-          } else if (op === "startsWith") {
-            likeValue = `${likeValue}%`;
-          } else if (op === "endsWith") {
-            likeValue = `%${likeValue}`;
+          const nestedColumnType = column.type?.toLowerCase();
+          if (nestedColumnType === "json") {
+            if (op !== "contains") {
+              throw new QueryError(
+                `"${op}" operator is not supported for JSON columns. Use "contains" with an object value for JSON containment. Property (${key}) in model (${joinedModel.name}).`,
+                joinedModel
+              );
+            }
+            params.push(opValue);
+            andClauses.push(`"${tableAlias}"."${column.name}"@>$${params.length}::jsonb`);
+          } else {
+            let likeValue = opValue;
+            if (op === "contains") {
+              likeValue = `%${likeValue}%`;
+            } else if (op === "startsWith") {
+              likeValue = `${likeValue}%`;
+            } else if (op === "endsWith") {
+              likeValue = `%${likeValue}`;
+            }
+            params.push(likeValue);
+            andClauses.push(`"${tableAlias}"."${column.name}" ILIKE $${params.length}`);
           }
-          params.push(likeValue);
-          andClauses.push(`"${tableAlias}"."${column.name}" ILIKE $${params.length}`);
         } else if (op === ">" || op === ">=" || op === "<" || op === "<=") {
           params.push(opValue);
           andClauses.push(`"${tableAlias}"."${column.name}"${op}$${params.length}`);
@@ -1898,76 +2020,51 @@ function buildNestedJoinWhere({
   }
   return andClauses.join(" AND ");
 }
-function buildLikeOperatorStatement({ repositoriesByModelNameLowered, model, propertyName, isNegated, value, params, joins }) {
-  if (Array.isArray(value)) {
-    if (!value.length) {
-      if (isNegated) {
-        return "1=1";
-      }
-      return "1<>1";
-    }
-    if (value.length > 1) {
-      const orConstraints = [];
-      for (const item of value) {
-        orConstraints.push(
-          buildLikeOperatorStatement({
-            repositoriesByModelNameLowered,
-            model,
-            propertyName,
-            isNegated,
-            value: item,
-            params,
-            joins
-          })
-        );
-      }
-      if (orConstraints.length === 1) {
-        return orConstraints[0] ?? "";
-      }
-      if (isNegated) {
-        return orConstraints.join(" AND ");
-      }
-      if (orConstraints.length) {
-        return `(${orConstraints.join(" OR ")})`;
-      }
-      return "";
-    }
-    value = value[0];
-  }
-  const resolved = resolvePropertyPath({
-    propertyPath: propertyName,
+function buildJsonContainmentStatement({ repositoriesByModelNameLowered, model, propertyName, isNegated, value, params, joins }) {
+  return buildArrayOrSingleStatement({
+    repositoriesByModelNameLowered,
     model,
+    propertyName,
+    isNegated,
+    value,
+    params,
     joins,
-    repositoriesByModelNameLowered
-  });
-  let column;
-  let tablePrefix;
-  if (resolved) {
-    column = resolved.column;
-    tablePrefix = `"${resolved.tableAlias}".`;
-  } else {
-    const localColumn = model.columnsByPropertyName[propertyName];
-    if (!localColumn) {
-      throw new QueryError(`Unable to find property ${propertyName} on model ${model.name}`, model);
+    buildNonNullStatement({ column, tablePrefix }, nonNullValue, paramsList) {
+      paramsList.push(nonNullValue);
+      return `${isNegated ? "NOT " : ""}${tablePrefix}"${column.name}"@>$${paramsList.length}::jsonb`;
     }
-    column = localColumn;
-    tablePrefix = "";
-  }
-  if (value === null) {
-    return `${tablePrefix}"${column.name}" ${isNegated ? "IS NOT" : "IS"} NULL`;
-  }
-  if (typeof value === "string") {
-    if (value) {
-      params.push(value);
-      const columnType = column.type?.toLowerCase();
+  });
+}
+function buildLikeOperatorStatement({ repositoriesByModelNameLowered, model, propertyName, isNegated, value, params, joins }) {
+  return buildArrayOrSingleStatement({
+    repositoriesByModelNameLowered,
+    model,
+    propertyName,
+    isNegated,
+    value,
+    params,
+    joins,
+    buildNonNullStatement({ column, tablePrefix }, nonNullValue, paramsList) {
+      if (typeof nonNullValue !== "string") {
+        throw new QueryError(`Expected value to be a string for "like" constraint. Property (${propertyName}) in model (${model.name}).`, model);
+      }
+      if (!nonNullValue) {
+        return `${tablePrefix}"${column.name}" ${isNegated ? "!=" : "="} ''`;
+      }
+      paramsList.push(nonNullValue);
+      const columnType = "type" in column && typeof column.type === "string" ? column.type.toLowerCase() : void 0;
+      if (columnType === "json") {
+        throw new QueryError(
+          `"like" operator is not supported for JSON columns. Use "contains" with an object value for JSON containment. Property (${propertyName}) in model (${model.name}).`,
+          model
+        );
+      }
       if (columnType === "array" || columnType === "string[]") {
-        return `${isNegated ? "NOT " : ""}EXISTS(SELECT 1 FROM (SELECT unnest(${tablePrefix}"${column.name}") AS "unnested_${column.name}") __unnested WHERE "unnested_${column.name}" ILIKE $${params.length})`;
+        return `${isNegated ? "NOT " : ""}EXISTS(SELECT 1 FROM (SELECT unnest(${tablePrefix}"${column.name}") AS "unnested_${column.name}") __unnested WHERE "unnested_${column.name}" ILIKE $${paramsList.length})`;
       }
-      return `${tablePrefix}"${column.name}"${isNegated ? " NOT" : ""} ILIKE $${params.length}`;
+      return `${tablePrefix}"${column.name}"${isNegated ? " NOT" : ""} ILIKE $${paramsList.length}`;
     }
-    return `${tablePrefix}"${column.name}" ${isNegated ? "!=" : "="} ''`;
-  }
-  throw new QueryError(`Expected value to be a string for "like" constraint. Property (${propertyName}) in model (${model.name}).`, model);
+  });
 }
 function buildComparisonOperatorStatement({
   repositoriesByModelNameLowered,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bigal",
-  "version": "15.6.0",
+  "version": "15.7.0",
   "description": "A fast and lightweight orm for postgres and node.js, written in typescript.",
   "main": "./dist/index.cjs",
   "module": "./dist/index.mjs",