@wisemen/nestjs-typeorm 0.0.26 → 0.0.27

package/dist/extensions/repository.d.ts

@@ -3,7 +3,8 @@ export declare class TypeOrmRepository<T extends ObjectLiteral> extends Reposito
     constructor(entity: EntityTarget<T>, manager: EntityManager);
     findInBatches(options: FindOneOptions<T>, batchSize: number): AsyncGenerator<T[], void, void>;
     findByInBatches(where: FindOptionsWhere<T> | FindOptionsWhere<T>[], batchSize: number): AsyncGenerator<T[], void, void>;
-    private addOffsetKeyToWhere;
-    private addOffsetKeyToWhereCondition;
-    private addOffsetKeyToOrder;
+    private addBatchingToOrder;
+    private addBatchingToWhere;
+    private addBatchConditionToWhereClause;
+    private getKeyCondition;
 }

package/dist/extensions/repository.js

@@ -1,22 +1,16 @@
-import { MoreThan, Repository } from 'typeorm';
+import { And, Equal, FindOperator, LessThan, MoreThan, Repository } from 'typeorm';
 import { createTransactionManagerProxy } from './transaction.js';
 export class TypeOrmRepository extends Repository {
     constructor(entity, manager) {
         super(entity, createTransactionManagerProxy(manager));
     }
     async *findInBatches(options, batchSize) {
-        if (this.metadata.primaryColumns.length !== 1) {
-            throw new Error(`Entity ${this.metadata.name} has a composite primary key and cannot be fetched in batches`);
-        }
-        const primaryKey = this.metadata.primaryColumns[0].propertyName;
-        if (options.order !== undefined && primaryKey in options.order) {
-            throw new Error(`Cannot specify order for primary key "${this.metadata.name}.${primaryKey}" when fetching in batches`);
-        }
-        let lastPrimaryKeyValue = undefined;
+        const primaryKeys = this.metadata.primaryColumns.map(column => column.propertyName);
         let entities = [];
+        let lastEntity = undefined;
         do {
-            const where = this.addOffsetKeyToWhere(options.where, primaryKey, lastPrimaryKeyValue);
-            const order = this.addOffsetKeyToOrder(options.order, primaryKey);
+            const order = this.addBatchingToOrder(options.order, primaryKeys);
+            const where = this.addBatchingToWhere(options.where, order, lastEntity);
             entities = await this.find({
                 ...options,
                 where,
@@ -26,32 +20,58 @@ export class TypeOrmRepository extends Repository {
             if (entities.length === 0)
                 return;
             yield entities;
-            lastPrimaryKeyValue = entities.at(-1)?.[primaryKey];
-        } while (lastPrimaryKeyValue !== undefined);
+            lastEntity = entities.at(-1);
+        } while (entities.length === batchSize);
     }
     findByInBatches(where, batchSize) {
         return this.findInBatches({ where }, batchSize);
     }
-    addOffsetKeyToWhere(where, key, lastKeyValue) {
-        if (lastKeyValue === undefined) {
+    addBatchingToOrder(order, keys) {
+        const batchOrder = Object.fromEntries(keys.map((key) => [key, order?.[key] ?? 'ASC']));
+        return {
+            ...order,
+            ...batchOrder
+        };
+    }
+    addBatchingToWhere(where, order, lastEntity) {
+        if (lastEntity === undefined) {
             return where;
         }
         if (Array.isArray(where)) {
-            return where.map(condition => this.addOffsetKeyToWhereCondition(condition, key, lastKeyValue));
+            return where.flatMap(whereClause => this.addBatchConditionToWhereClause(whereClause, order, lastEntity));
         }
-        return this.addOffsetKeyToWhereCondition(where, key, lastKeyValue);
+        return this.addBatchConditionToWhereClause(where, order, lastEntity);
     }
-    addOffsetKeyToWhereCondition(where, key, lastKeyValue) {
-        return {
-            ...where,
-            [key]: MoreThan(lastKeyValue)
-        };
+    addBatchConditionToWhereClause(where, order, lastEntity) {
+        const clauses = [];
+        const keys = Object.keys(order);
+        for (let i = keys.length - 1; i >= 0; i--) {
+            const key = keys[i];
+            const keyLastValue = lastEntity[key];
+            const preceedingKeys = keys.slice(0, i);
+            const preceedingKeysLastValues = preceedingKeys.map(k => lastEntity[k]);
+            const preceedingKeysWhere = Object.fromEntries(preceedingKeys.map((k, i) => [k, preceedingKeysLastValues[i]]));
+            const clause = {
+                ...where,
+                ...preceedingKeysWhere,
+                [key]: this.getKeyCondition(where, order, key, keyLastValue)
+            };
+            clauses.push(clause);
+        }
+        return clauses;
     }
-    addOffsetKeyToOrder(order, key) {
-        return {
-            ...order,
-            [key]: 'ASC'
-        };
+    getKeyCondition(where, order, key, lastKeyValue) {
+        const existingCondition = where?.[key];
+        const batchCondition = order?.[key] === 'ASC' ? MoreThan(lastKeyValue) : LessThan(lastKeyValue);
+        if (existingCondition === undefined) {
+            return batchCondition;
+        }
+        else if (existingCondition instanceof FindOperator) {
+            return And(batchCondition, existingCondition);
+        }
+        else {
+            return And(batchCondition, Equal(existingCondition));
+        }
     }
 }
 //# sourceMappingURL=repository.js.map

package/dist/extensions/repository.js.map

@@ -1 +1 @@
-{"version":3,"file":"repository.js","sourceRoot":"","sources":["../../lib/extensions/repository.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6F,QAAQ,EAAiB,UAAU,EAAE,MAAM,SAAS,CAAA;AACxJ,OAAO,EAAE,6BAA6B,EAAE,MAAM,kBAAkB,CAAA;AAEhE,MAAM,OAAO,iBAA2C,SAAQ,UAAc;IAC5E,YAAa,MAAuB,EAAE,OAAsB;QAC1D,KAAK,CAAC,MAAM,EAAE,6BAA6B,CAAC,OAAO,CAAC,CAAC,CAAA;IACvD,CAAC;IAED,KAAK,CAAA,CAAE,aAAa,CAClB,OAA0B,EAC1B,SAAiB;QAEjB,IAAI,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC9C,MAAM,IAAI,KAAK,CAAC,UAAU,IAAI,CAAC,QAAQ,CAAC,IAAI,+DAA+D,CAAC,CAAA;QAC9G,CAAC;QAED,MAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,YAAY,CAAA;QAE/D,IAAI,OAAO,CAAC,KAAK,KAAK,SAAS,IAAI,UAAU,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;YAC/D,MAAM,IAAI,KAAK,CAAC,yCAAyC,IAAI,CAAC,QAAQ,CAAC,IAAI,IAAI,UAAU,4BAA4B,CAAC,CAAA;QACxH,CAAC;QAED,IAAI,mBAAmB,GAAY,SAAS,CAAA;QAC5C,IAAI,QAAQ,GAAQ,EAAE,CAAA;QAEtB,GAAG,CAAC;YACF,MAAM,KAAK,GAAG,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,KAAK,EAAE,UAAU,EAAE,mBAAmB,CAAC,CAAA;YACtF,MAAM,KAAK,GAAG,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,KAAK,EAAE,UAAU,CAAC,CAAA;YAEjE,QAAQ,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC;gBACzB,GAAG,OAAO;gBACV,KAAK;gBACL,KAAK;gBACL,IAAI,EAAE,SAAS;aAChB,CAAC,CAAA;YAEF,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;gBAAE,OAAM;YAEjC,MAAM,QAAQ,CAAA;YAEd,mBAAmB,GAAG,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,CAAA;QACrD,CAAC,QAAQ,mBAAmB,KAAK,SAAS,EAAC;IAC7C,CAAC;IAED,eAAe,CACb,KAAkD,EAClD,SAAiB;QAEjB,OAAO,IAAI,CAAC,aAAa,CAAC,EAAE,KAAK,EAAE,EAAE,SAAS,CAAC,CAAA;IACjD,CAAC;IAEO,mBAAmB,CACzB,KAA8D,EAC9D,GAAW,EACX,YAAqB;QAErB,IAAI,YAAY,KAAK,SAAS,EAAE,CAAC;YAC/B,OAAO,KAAK,CAAA;QACd,CAAC;QAED,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YACzB,OAAO,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAC3B,IAAI,CAAC,4BAA4B,CAAC,SAAS,EAAE,GAAG,EAAE,YAAY,CAAC,CAChE,CAAA;QACH,CAAC;QAED,OAAO,IAAI,CAAC,4BAA4B,CAAC,KAAK,EAAE,GAAG,EAAE,YAAY,CAAC,CAAA;IACpE,CAAC;IAEO,4BAA4B,CAClC,KAAsC,EACtC,GAAW,EACX,YAAqB;QAErB,OAAO;YACL,GAAG,KAAK;YACR,CAAC,GAAG,CAAC,EAAE,QAAQ,CAAC,YAAY,CAAC;SACP,CAAA;IAC1B,CAAC;IAEO,mBAAmB,CACzB,KAAsC,EACtC,GAAW;QAEX,OAAO;YACL,GAAG,KAAK;YACR,CAAC,GAAG,CAAC,EAAE,KAAK;SACU,CAAA;IAC1B,CAAC;CACF"}
+{"version":3,"file":"repository.js","sourceRoot":"","sources":["../../lib/extensions/repository.ts"],"names":[],"mappings":"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"}

package/dist/extensions/tests/repository-find-in-batches.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/extensions/tests/repository-find-in-batches.test.js

@@ -0,0 +1,90 @@
+import { after, before, describe, it } from "node:test";
+import { expect } from 'expect';
+import { dataSource } from "./sql/datasource.js";
+import { UserEntity } from "./test.entity.js";
+import { TypeOrmRepository } from "../repository.js";
+import { LessThan } from "typeorm";
+describe('Monetary calculations', () => {
+    let repository;
+    before(async () => {
+        await dataSource.initialize();
+        await dataSource.synchronize(true);
+        repository = new TypeOrmRepository(UserEntity, dataSource.manager);
+        await repository.insert([
+            { id: 1, name: "Alice", age: 25 },
+            { id: 2, name: "Bob", age: 30 },
+            { id: 3, name: "Charlie", age: 28 },
+            { id: 4, name: "Diana", age: 22 },
+            { id: 5, name: "Eve", age: 35 }
+        ]);
+    });
+    after(async () => {
+        await dataSource.destroy();
+    });
+    it('finds in batches without filters or sorting', async () => {
+        const result = repository.findInBatches({}, 2);
+        let batches = [];
+        for await (const batch of result) {
+            batches.push(batch);
+        }
+        expect(batches).toHaveLength(3);
+        expect(batches[0]).toHaveLength(2);
+        expect(batches[1]).toHaveLength(2);
+        expect(batches[2]).toHaveLength(1);
+        expect(batches[0][0].name).toBe("Alice");
+        expect(batches[0][1].name).toBe("Bob");
+        expect(batches[1][0].name).toBe("Charlie");
+        expect(batches[1][1].name).toBe("Diana");
+        expect(batches[2][0].name).toBe("Eve");
+    });
+    it('finds in batches without filters with sorting', async () => {
+        const result = repository.findInBatches({
+            order: { name: 'DESC' }
+        }, 2);
+        let batches = [];
+        for await (const batch of result) {
+            batches.push(batch);
+        }
+        expect(batches).toHaveLength(3);
+        expect(batches[0]).toHaveLength(2);
+        expect(batches[1]).toHaveLength(2);
+        expect(batches[2]).toHaveLength(1);
+        expect(batches[0][0].name).toBe("Eve");
+        expect(batches[0][1].name).toBe("Diana");
+        expect(batches[1][0].name).toBe("Charlie");
+        expect(batches[1][1].name).toBe("Bob");
+        expect(batches[2][0].name).toBe("Alice");
+    });
+    it('finds in batches with filters without sorting', async () => {
+        const result = repository.findInBatches({
+            where: { age: LessThan(30) }
+        }, 2);
+        let batches = [];
+        for await (const batch of result) {
+            batches.push(batch);
+        }
+        expect(batches).toHaveLength(2);
+        expect(batches[0]).toHaveLength(2);
+        expect(batches[1]).toHaveLength(1);
+        expect(batches[0][0].name).toBe('Alice');
+        expect(batches[0][1].name).toBe('Charlie');
+        expect(batches[1][0].name).toBe('Diana');
+    });
+    it('finds in batches with filters with sorting', async () => {
+        const result = repository.findInBatches({
+            where: { age: LessThan(30) },
+            order: { age: 'ASC' }
+        }, 2);
+        let batches = [];
+        for await (const batch of result) {
+            batches.push(batch);
+        }
+        expect(batches).toHaveLength(2);
+        expect(batches[0]).toHaveLength(2);
+        expect(batches[1]).toHaveLength(1);
+        expect(batches[0][0].name).toBe('Diana');
+        expect(batches[0][1].name).toBe('Alice');
+        expect(batches[1][0].name).toBe('Charlie');
+    });
+});
+//# sourceMappingURL=repository-find-in-batches.test.js.map

package/dist/extensions/tests/repository-find-in-batches.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"repository-find-in-batches.test.js","sourceRoot":"","sources":["../../../lib/extensions/tests/repository-find-in-batches.test.ts"],"names":[],"mappings":"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"}

package/dist/extensions/tests/sql/datasource.d.ts

@@ -0,0 +1,2 @@
+import { DataSource } from "typeorm";
+export declare const dataSource: DataSource;

package/dist/extensions/tests/sql/datasource.js

@@ -0,0 +1,16 @@
+import { DataSource } from "typeorm";
+import { SnakeNamingStrategy } from "../../../naming/snake-case.naming-strategy.js";
+import { sslHelper } from "../../../helpers/ssl.js";
+export const dataSource = new DataSource({
+    name: 'default',
+    type: 'postgres',
+    url: process.env.DATABASE_URI,
+    ssl: sslHelper(process.env.DATABASE_SSL),
+    extra: { max: 50 },
+    logging: false,
+    synchronize: false,
+    migrationsRun: true,
+    entities: ['dist/**/*.entity.js'],
+    namingStrategy: new SnakeNamingStrategy()
+});
+//# sourceMappingURL=datasource.js.map

package/dist/extensions/tests/sql/datasource.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"datasource.js","sourceRoot":"","sources":["../../../../lib/extensions/tests/sql/datasource.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,mBAAmB,EAAE,MAAM,+CAA+C,CAAC;AACpF,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAEpD,MAAM,CAAC,MAAM,UAAU,GAAG,IAAI,UAAU,CAAC;IACvC,IAAI,EAAE,SAAS;IACf,IAAI,EAAE,UAAU;IAChB,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,YAAY;IAC7B,GAAG,EAAE,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC;IACxC,KAAK,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE;IAClB,OAAO,EAAE,KAAK;IACd,WAAW,EAAE,KAAK;IAClB,aAAa,EAAE,IAAI;IACnB,QAAQ,EAAE,CAAC,qBAAqB,CAAC;IACjC,cAAc,EAAE,IAAI,mBAAmB,EAAE;CAC1C,CAAC,CAAA"}

package/dist/extensions/tests/test.entity.d.ts

@@ -0,0 +1,5 @@
+export declare class UserEntity {
+    id: number;
+    name: string;
+    age: number;
+}

package/dist/extensions/tests/test.entity.js

@@ -0,0 +1,32 @@
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+import { Column, Entity, PrimaryGeneratedColumn } from "typeorm";
+let UserEntity = class UserEntity {
+    id;
+    name;
+    age;
+};
+__decorate([
+    PrimaryGeneratedColumn(),
+    __metadata("design:type", Number)
+], UserEntity.prototype, "id", void 0);
+__decorate([
+    Column({ type: 'varchar' }),
+    __metadata("design:type", String)
+], UserEntity.prototype, "name", void 0);
+__decorate([
+    Column({ type: 'int' }),
+    __metadata("design:type", Number)
+], UserEntity.prototype, "age", void 0);
+UserEntity = __decorate([
+    Entity()
+], UserEntity);
+export { UserEntity };
+//# sourceMappingURL=test.entity.js.map

package/dist/extensions/tests/test.entity.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"test.entity.js","sourceRoot":"","sources":["../../../lib/extensions/tests/test.entity.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,sBAAsB,EAAE,MAAM,SAAS,CAAC;AAG1D,IAAM,UAAU,GAAhB,MAAM,UAAU;IAErB,EAAE,CAAQ;IAGV,IAAI,CAAQ;IAGZ,GAAG,CAAQ;CACZ,CAAA;AAPC;IADC,sBAAsB,EAAE;;sCACf;AAGV;IADC,MAAM,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;;wCAChB;AAGZ;IADC,MAAM,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;;uCACb;AARA,UAAU;IADtB,MAAM,EAAE;GACI,UAAU,CAStB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wisemen/nestjs-typeorm",
-  "version": "0.0.26",
+  "version": "0.0.27",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "type": "module",
@@ -13,13 +13,14 @@
     "clean": "rm -rf ./dist",
     "build": "tsc",
     "pretest": "npm run clean && npm run build",
-    "test": "node --test",
+    "test": "node --env-file=.env --test",
     "prerelease": "npm run build",
     "release": "pnpx release-it"
   },
   "devDependencies": {
     "@types/node": "^24.3.0",
     "eslint": "^9.33.0",
+    "expect": "^30.0.5",
     "typescript": "^5.9.2"
   },
   "author": "Joren Vandeweyer",