bigal 15.0.0 → 15.1.0

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+# [15.1.0](https://github.com/bigalorm/bigal/compare/v15.0.1...v15.1.0) (2026-01-07)
+
+### Features
+
+- Add `and` property to WhereQuery for combining OR groups ([#262](https://github.com/bigalorm/bigal/issues/262)) ([903eeb8](https://github.com/bigalorm/bigal/commit/903eeb826e3dedd7574aa940527ca07b264a40b2))
+
+## [15.0.1](https://github.com/bigalorm/bigal/compare/v15.0.0...v15.0.1) (2026-01-07)
+
 # [15.0.0](https://github.com/bigalorm/bigal/compare/v14.1.26...v15.0.0) (2025-12-28)
 
 - feat!: support pluggable PostgreSQL drivers ([7638343](https://github.com/bigalorm/bigal/commit/76383432acc8ee1bdf48a8c60a8e5fa10176bd69))

package/README.md

@@ -4,7 +4,7 @@
 [![node version](https://img.shields.io/node/v/bigal.svg?style=flat)](https://nodejs.org)
 [![Known Vulnerabilities](https://snyk.io/test/npm/bigal/badge.svg)](https://snyk.io/test/npm/bigal)
 
-A fast, lightweight ORM for PostgreSQL and node.js, written in Typescript.
+A fast, lightweight ORM for PostgreSQL and Node.js, written in TypeScript.
 
 This ORM does not:
 
@@ -365,6 +365,34 @@ Equivalent to:
 select id,first_name as firstName,last_name as lastName,created_at as createdAt from person where created_at >= $1 AND created_at < $2
 ```
 
+#### Using `or` for OR conditions across different columns
+
+```ts
+const items = await PersonRepository.find().where({
+  or: [{ firstName: 'Walter' }, { lastName: 'White' }],
+});
+```
+
+Equivalent to:
+
+```postgresql
+select * from person where (first_name = $1) OR (last_name = $2)
+```
+
+#### Using `and` to combine multiple OR groups
+
+```ts
+const items = await PersonRepository.find().where({
+  and: [{ or: [{ firstName: 'Walter' }, { lastName: 'White' }] }, { or: [{ firstName: 'Jesse' }, { lastName: 'Pinkman' }] }],
+});
+```
+
+Equivalent to:
+
+```postgresql
+select * from person where ((first_name = $1) OR (last_name = $2)) AND ((first_name = $3) OR (last_name = $4))
+```
+
 #### Fetch multiple objects and perform a db sort before returning result
 
 ```ts
@@ -721,7 +749,7 @@ export class Store extends Entity {
 
 #### Non-entity object arrays
 
-If you have a json property, with an `id` field, on an entity model, TypeScript will probably think it is a BigAl
+If you have a JSON property, with an `id` field, on an entity model, TypeScript will probably think it is a BigAl
 entity due to how the type system works. In that case, you'll want to wrap the type with `NotEntity<>`. For example:
 
 ```ts

package/dist/index.cjs

@@ -964,6 +964,15 @@ function buildWhere({
         params
       });
     default: {
+      if (comparer === "and" && Array.isArray(value)) {
+        return buildAndOperatorStatement({
+          repositoriesByModelNameLowered,
+          model,
+          isNegated,
+          value,
+          params
+        });
+      }
       if (value === void 0) {
         throw new QueryError(`Attempting to query with an undefined value. ${propertyName ?? ""} on ${model.name}`, model);
       }
@@ -1202,6 +1211,37 @@ function buildOrOperatorStatement({
   }
   return "";
 }
+function buildAndOperatorStatement({
+  repositoriesByModelNameLowered,
+  model,
+  isNegated,
+  value,
+  params
+}) {
+  const andClauses = [];
+  for (const constraint of value) {
+    const andClause = buildWhere({
+      repositoriesByModelNameLowered,
+      model,
+      isNegated,
+      value: constraint,
+      params
+    });
+    if (andClause) {
+      andClauses.push(`(${andClause})`);
+    }
+  }
+  if (andClauses.length === 1) {
+    return andClauses[0] ?? "";
+  }
+  if (isNegated) {
+    return andClauses.join(" OR ");
+  }
+  if (andClauses.length) {
+    return `(${andClauses.join(" AND ")})`;
+  }
+  return "";
+}
 function buildLikeOperatorStatement({ model, propertyName, isNegated, value, params }) {
   if (Array.isArray(value)) {
     if (!value.length) {
@@ -1959,7 +1999,7 @@ ${stack ?? ""}`;
     let relatedModelColumn;
     for (const populateModelColumn of populateRepository.model.columns) {
       const { through } = populateModelColumn;
-      if (through && through.toLowerCase() === column.through.toLowerCase()) {
+      if (through?.toLowerCase() === column.through.toLowerCase()) {
         relatedModelColumn = populateModelColumn;
         break;
       }

package/dist/index.d.cts

@@ -425,6 +425,7 @@ type WhereQueryStatement<TValue> = [TValue] extends [string] ? NegatableConstrai
 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]>>;
 } & {
+    and?: WhereQuery<T>[];
     or?: WhereQuery<T>[];
 };
 
@@ -433,7 +434,7 @@ interface CountArgs<T extends Entity> {
     pool?: PoolLike;
 }
 
-type Comparer = '!' | '<' | '<=' | '>' | '>=' | 'contains' | 'endsWith' | 'like' | 'or' | 'startsWith';
+type Comparer = '!' | '<' | '<=' | '>' | '>=' | 'and' | 'contains' | 'endsWith' | 'like' | 'or' | 'startsWith';
 
 interface CountResult<TEntity extends Entity> extends PromiseLike<number> {
     where(args: WhereQuery<TEntity>): CountResult<TEntity> | number;

package/dist/index.d.mts

@@ -425,6 +425,7 @@ type WhereQueryStatement<TValue> = [TValue] extends [string] ? NegatableConstrai
 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]>>;
 } & {
+    and?: WhereQuery<T>[];
     or?: WhereQuery<T>[];
 };
 
@@ -433,7 +434,7 @@ interface CountArgs<T extends Entity> {
     pool?: PoolLike;
 }
 
-type Comparer = '!' | '<' | '<=' | '>' | '>=' | 'contains' | 'endsWith' | 'like' | 'or' | 'startsWith';
+type Comparer = '!' | '<' | '<=' | '>' | '>=' | 'and' | 'contains' | 'endsWith' | 'like' | 'or' | 'startsWith';
 
 interface CountResult<TEntity extends Entity> extends PromiseLike<number> {
     where(args: WhereQuery<TEntity>): CountResult<TEntity> | number;

package/dist/index.d.ts

@@ -425,6 +425,7 @@ type WhereQueryStatement<TValue> = [TValue] extends [string] ? NegatableConstrai
 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]>>;
 } & {
+    and?: WhereQuery<T>[];
     or?: WhereQuery<T>[];
 };
 
@@ -433,7 +434,7 @@ interface CountArgs<T extends Entity> {
     pool?: PoolLike;
 }
 
-type Comparer = '!' | '<' | '<=' | '>' | '>=' | 'contains' | 'endsWith' | 'like' | 'or' | 'startsWith';
+type Comparer = '!' | '<' | '<=' | '>' | '>=' | 'and' | 'contains' | 'endsWith' | 'like' | 'or' | 'startsWith';
 
 interface CountResult<TEntity extends Entity> extends PromiseLike<number> {
     where(args: WhereQuery<TEntity>): CountResult<TEntity> | number;

package/dist/index.mjs

@@ -962,6 +962,15 @@ function buildWhere({
         params
       });
     default: {
+      if (comparer === "and" && Array.isArray(value)) {
+        return buildAndOperatorStatement({
+          repositoriesByModelNameLowered,
+          model,
+          isNegated,
+          value,
+          params
+        });
+      }
       if (value === void 0) {
         throw new QueryError(`Attempting to query with an undefined value. ${propertyName ?? ""} on ${model.name}`, model);
       }
@@ -1200,6 +1209,37 @@ function buildOrOperatorStatement({
   }
   return "";
 }
+function buildAndOperatorStatement({
+  repositoriesByModelNameLowered,
+  model,
+  isNegated,
+  value,
+  params
+}) {
+  const andClauses = [];
+  for (const constraint of value) {
+    const andClause = buildWhere({
+      repositoriesByModelNameLowered,
+      model,
+      isNegated,
+      value: constraint,
+      params
+    });
+    if (andClause) {
+      andClauses.push(`(${andClause})`);
+    }
+  }
+  if (andClauses.length === 1) {
+    return andClauses[0] ?? "";
+  }
+  if (isNegated) {
+    return andClauses.join(" OR ");
+  }
+  if (andClauses.length) {
+    return `(${andClauses.join(" AND ")})`;
+  }
+  return "";
+}
 function buildLikeOperatorStatement({ model, propertyName, isNegated, value, params }) {
   if (Array.isArray(value)) {
     if (!value.length) {
@@ -1957,7 +1997,7 @@ ${stack ?? ""}`;
     let relatedModelColumn;
     for (const populateModelColumn of populateRepository.model.columns) {
       const { through } = populateModelColumn;
-      if (through && through.toLowerCase() === column.through.toLowerCase()) {
+      if (through?.toLowerCase() === column.through.toLowerCase()) {
         relatedModelColumn = populateModelColumn;
         break;
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bigal",
-  "version": "15.0.0",
+  "version": "15.1.0",
   "description": "A fast and lightweight orm for postgres and node.js, written in typescript.",
   "main": "./dist/index.cjs",
   "module": "./dist/index.mjs",
@@ -34,7 +34,7 @@
   },
   "dependencies": {},
   "devDependencies": {
-    "@faker-js/faker": "10.1.0",
+    "@faker-js/faker": "10.2.0",
     "@semantic-release/changelog": "6.0.3",
     "@semantic-release/commit-analyzer": "13.0.1",
     "@semantic-release/git": "10.0.1",
@@ -46,7 +46,7 @@
     "@types/node": ">=20",
     "chai": "6.2.2",
     "eslint": "9.39.2",
-    "eslint-config-decent": "3.1.79",
+    "eslint-config-decent": "3.1.89",
     "husky": "9.1.7",
     "lint-staged": "16.2.7",
     "markdownlint-cli": "0.47.0",
@@ -56,7 +56,7 @@
     "prettier": "3.7.4",
     "semantic-release": "25.0.2",
     "strict-event-emitter-types": "2.0.0",
-    "postgres-pool": "10.1.33",
+    "postgres-pool": "11.0.1",
     "ts-mockito": "2.6.1",
     "ts-node": "10.9.2",
     "typescript": "5.9.3",