@wisemen/nestjs-typeorm 0.0.9 → 0.0.10

package/dist/columns/coordinates-column.js

@@ -1,6 +1,6 @@
 import { applyDecorators } from '@nestjs/common';
-import { Coordinates } from '@wisemen/coordinates';
 import { Column } from 'typeorm';
+import { Coordinates } from '../types/coordinates.js';
 export function CoordinatesColumn(options) {
     return applyDecorators(Column({
         ...options,

package/dist/columns/coordinates-column.js.map

@@ -1 +1 @@
-{"version":3,"file":"coordinates-column.js","sourceRoot":"","sources":["../../lib/columns/coordinates-column.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAClD,OAAO,EAAE,MAAM,EAAwB,MAAM,SAAS,CAAA;AAItD,MAAM,UAAU,iBAAiB,CAAE,OAAkC;IACnE,OAAO,eAAe,CACpB,MAAM,CAAC;QACL,GAAG,OAAO;QACV,IAAI,EAAE,UAAU;QAChB,kBAAkB,EAAE,OAAO;QAC3B,IAAI,EAAE,IAAI;QACV,WAAW,EAAE,sBAAsB,CAAC,WAAW,EAAE;KAClD,CAAC,CACH,CAAA;AACH,CAAC;AAED,MAAM,sBAAsB;IAClB,MAAM,CAAC,QAAQ,CAAoC;IAEpD,MAAM,CAAC,WAAW;QACvB,IAAI,sBAAsB,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;YAClD,sBAAsB,CAAC,QAAQ,GAAG,IAAI,sBAAsB,EAAE,CAAA;QAChE,CAAC;QACD,OAAO,sBAAsB,CAAC,QAAQ,CAAA;IACxC,CAAC;IAED,IAAI,CAAE,KAAmB;QACvB,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;YACnB,OAAO,IAAI,CAAA;QACb,CAAC;aAAM,CAAC;YACN,OAAO,IAAI,WAAW,CAAC,KAAK,CAAC,CAAA;QAC/B,CAAC;IACH,CAAC;IAED,EAAE,CAAE,KAAyB;QAC3B,OAAO,KAAK,EAAE,OAAO,EAAE,IAAI,IAAI,CAAA;IACjC,CAAC;CACF"}
+{"version":3,"file":"coordinates-column.js","sourceRoot":"","sources":["../../lib/columns/coordinates-column.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAChD,OAAO,EAAE,MAAM,EAAwB,MAAM,SAAS,CAAA;AACtD,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AAIrD,MAAM,UAAU,iBAAiB,CAAE,OAAkC;IACnE,OAAO,eAAe,CACpB,MAAM,CAAC;QACL,GAAG,OAAO;QACV,IAAI,EAAE,UAAU;QAChB,kBAAkB,EAAE,OAAO;QAC3B,IAAI,EAAE,IAAI;QACV,WAAW,EAAE,sBAAsB,CAAC,WAAW,EAAE;KAClD,CAAC,CACH,CAAA;AACH,CAAC;AAED,MAAM,sBAAsB;IAClB,MAAM,CAAC,QAAQ,CAAoC;IAEpD,MAAM,CAAC,WAAW;QACvB,IAAI,sBAAsB,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;YAClD,sBAAsB,CAAC,QAAQ,GAAG,IAAI,sBAAsB,EAAE,CAAA;QAChE,CAAC;QACD,OAAO,sBAAsB,CAAC,QAAQ,CAAA;IACxC,CAAC;IAED,IAAI,CAAE,KAAmB;QACvB,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;YACnB,OAAO,IAAI,CAAA;QACb,CAAC;aAAM,CAAC;YACN,OAAO,IAAI,WAAW,CAAC,KAAK,CAAC,CAAA;QAC/B,CAAC;IACH,CAAC;IAED,EAAE,CAAE,KAAyB;QAC3B,OAAO,KAAK,EAAE,OAAO,EAAE,IAAI,IAAI,CAAA;IACjC,CAAC;CACF"}

package/dist/extensions/repository.d.ts

@@ -1,4 +1,6 @@
-import { type EntityManager, type EntityTarget, ObjectLiteral, Repository } from 'typeorm';
+import { type EntityManager, type EntityTarget, FindOneOptions, FindOptionsWhere, ObjectLiteral, Repository } from 'typeorm';
 export declare class TypeOrmRepository<T extends ObjectLiteral> extends Repository<T> {
     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>;
 }

package/dist/extensions/repository.js

@@ -1,8 +1,37 @@
-import { Repository } from 'typeorm';
+import { 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;
+        let lastPrimaryKeyValue = undefined;
+        let entities = [];
+        do {
+            const where = lastPrimaryKeyValue !== undefined
+                ? { ...options.where, [primaryKey]: MoreThan(lastPrimaryKeyValue) }
+                : options.where;
+            const order = options.order !== undefined && primaryKey in options.order
+                ? options.order
+                : { ...options.order, [primaryKey]: 'ASC' };
+            entities = await this.find({
+                ...options,
+                where,
+                order,
+                take: batchSize,
+            });
+            if (entities.length === 0)
+                return;
+            yield entities;
+            lastPrimaryKeyValue = entities.at(-1)?.[primaryKey];
+        } while (lastPrimaryKeyValue !== undefined);
+    }
+    findByInBatches(where, batchSize) {
+        return this.findInBatches({ where }, batchSize);
+    }
 }
 //# 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,EAAwD,UAAU,EAAE,MAAM,SAAS,CAAA;AAC1F,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;CACF"}
+{"version":3,"file":"repository.js","sourceRoot":"","sources":["../../lib/extensions/repository.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoH,QAAQ,EAAiB,UAAU,EAAE,MAAM,SAAS,CAAA;AAC/K,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,CAAC,CAAC,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,mBAAmB,GAAoB,SAAS,CAAA;QACpD,IAAI,QAAQ,GAAQ,EAAE,CAAA;QAEtB,GAAG,CAAC;YACF,MAAM,KAAK,GAAG,mBAAmB,KAAK,SAAS;gBAC7C,CAAC,CAAC,EAAE,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC,UAAU,CAAC,EAAE,QAAQ,CAAC,mBAAmB,CAAC,EAAE;gBACnE,CAAC,CAAC,OAAO,CAAC,KAAK,CAAA;YACjB,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,KAAK,SAAS,IAAI,UAAU,IAAI,OAAO,CAAC,KAAK;gBACtE,CAAC,CAAC,OAAO,CAAC,KAAK;gBACf,CAAC,CAAC,EAAE,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC,UAAU,CAAC,EAAE,KAAK,EAAyB,CAAA;YAEpE,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;CACF"}

package/dist/extensions/transaction.js

@@ -1,10 +1,6 @@
 import { AsyncLocalStorage } from 'async_hooks';
 const transactionStorage = new AsyncLocalStorage();
 export async function transaction(dataSource, runInTransaction) {
-    const transactionManager = transactionStorage.getStore();
-    if (transactionManager != null) {
-        return await transactionManager.transaction(runInTransaction);
-    }
     return await dataSource.transaction(async (manager) => {
         return await transactionStorage.run(manager, async () => {
             return await runInTransaction(manager);

package/dist/extensions/transaction.js.map

@@ -1 +1 @@
-{"version":3,"file":"transaction.js","sourceRoot":"","sources":["../../lib/extensions/transaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAA;AAG/C,MAAM,kBAAkB,GAAG,IAAI,iBAAiB,EAAwB,CAAA;AAExE,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,UAAsB,EACtB,gBAA8D;IAE9D,MAAM,kBAAkB,GAAG,kBAAkB,CAAC,QAAQ,EAAE,CAAA;IACxD,IAAG,kBAAkB,IAAI,IAAI,EAAE,CAAC;QAC9B,OAAO,MAAM,kBAAkB,CAAC,WAAW,CAAC,gBAAgB,CAAC,CAAA;IAC/D,CAAC;IAED,OAAO,MAAM,UAAU,CAAC,WAAW,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;QACpD,OAAO,MAAM,kBAAkB,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,IAAI,EAAE;YACtD,OAAO,MAAM,gBAAgB,CAAC,OAAO,CAAC,CAAA;QACxC,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;AACJ,CAAC;AAED,MAAM,UAAU,6BAA6B,CAAE,OAAsB;IACnE,OAAO,IAAI,KAAK,CAAC,OAAO,EAAE;QACxB,GAAG,CAAE,MAAM,EAAE,IAAI;YACf,MAAM,OAAO,GAAG,kBAAkB,CAAC,QAAQ,EAAE,CAAA;YAE7C,IAAI,OAAO,IAAI,IAAI,EAAE,CAAC;gBACpB,OAAO,OAAO,CAAC,IAAI,CAAY,CAAA;YACjC,CAAC;iBAAM,CAAC;gBACN,OAAO,MAAM,CAAC,IAAI,CAAY,CAAA;YAChC,CAAC;QACH,CAAC;KACF,CAAC,CAAA;AACJ,CAAC"}
+{"version":3,"file":"transaction.js","sourceRoot":"","sources":["../../lib/extensions/transaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAA;AAG/C,MAAM,kBAAkB,GAAG,IAAI,iBAAiB,EAAwB,CAAA;AAExE,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,UAAsB,EACtB,gBAA8D;IAE9D,OAAO,MAAM,UAAU,CAAC,WAAW,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;QACpD,OAAO,MAAM,kBAAkB,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,IAAI,EAAE;YACtD,OAAO,MAAM,gBAAgB,CAAC,OAAO,CAAC,CAAA;QACxC,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;AACJ,CAAC;AAED,MAAM,UAAU,6BAA6B,CAAE,OAAsB;IACnE,OAAO,IAAI,KAAK,CAAC,OAAO,EAAE;QACxB,GAAG,CAAE,MAAM,EAAE,IAAI;YACf,MAAM,OAAO,GAAG,kBAAkB,CAAC,QAAQ,EAAE,CAAA;YAE7C,IAAI,OAAO,IAAI,IAAI,EAAE,CAAC;gBACpB,OAAO,OAAO,CAAC,IAAI,CAAY,CAAA;YACjC,CAAC;iBAAM,CAAC;gBACN,OAAO,MAAM,CAAC,IAAI,CAAY,CAAA;YAChC,CAAC;QACH,CAAC;KACF,CAAC,CAAA;AACJ,CAAC"}

package/dist/index.d.ts

@@ -2,5 +2,6 @@ export { InjectRepository, InjectEntityManager, InjectDataSource, } from '@nestj
 export * from './extensions/index.js';
 export * from './columns/index.js';
 export * from './operators/index.js';
+export * from './types/index.js';
 export * from './naming/index.js';
 export * from './helpers/index.js';

package/dist/index.js

@@ -2,6 +2,7 @@ export { InjectRepository, InjectEntityManager, InjectDataSource, } from '@nestj
 export * from './extensions/index.js';
 export * from './columns/index.js';
 export * from './operators/index.js';
+export * from './types/index.js';
 export * from './naming/index.js';
 export * from './helpers/index.js';
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../lib/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAChB,mBAAmB,EACnB,gBAAgB,GACjB,MAAM,iBAAiB,CAAA;AAExB,cAAc,uBAAuB,CAAA;AACrC,cAAc,oBAAoB,CAAA;AAClC,cAAc,sBAAsB,CAAA;AACpC,cAAc,mBAAmB,CAAA;AACjC,cAAc,oBAAoB,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../lib/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAChB,mBAAmB,EACnB,gBAAgB,GACjB,MAAM,iBAAiB,CAAA;AAExB,cAAc,uBAAuB,CAAA;AACrC,cAAc,oBAAoB,CAAA;AAClC,cAAc,sBAAsB,CAAA;AACpC,cAAc,kBAAkB,CAAA;AAChC,cAAc,mBAAmB,CAAA;AACjC,cAAc,oBAAoB,CAAA"}

package/dist/types/coordinates.d.ts

@@ -0,0 +1,8 @@
+import { Point } from 'typeorm';
+export declare class Coordinates {
+    readonly latitude: number;
+    readonly longitude: number;
+    constructor(point: Point);
+    constructor(latitude: number, longitude: number);
+    toPoint(): Point;
+}

package/dist/types/coordinates.js

@@ -0,0 +1,28 @@
+import { isLatLong, isObject } from 'class-validator';
+export class Coordinates {
+    latitude;
+    longitude;
+    constructor(pointOrLatitude, longitude) {
+        let latitude;
+        if (isObject(pointOrLatitude)) {
+            latitude = pointOrLatitude.coordinates[1];
+            longitude = pointOrLatitude.coordinates[0];
+        }
+        else {
+            latitude = pointOrLatitude;
+            longitude = longitude;
+        }
+        if (!isLatLong(`${latitude},${longitude}`)) {
+            throw new Error(`${latitude},${longitude} are not valid coordinates`);
+        }
+        this.latitude = latitude;
+        this.longitude = longitude;
+    }
+    toPoint() {
+        return {
+            type: 'Point',
+            coordinates: [this.longitude, this.latitude]
+        };
+    }
+}
+//# sourceMappingURL=coordinates.js.map

package/dist/types/coordinates.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"coordinates.js","sourceRoot":"","sources":["../../lib/types/coordinates.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAA;AAGrD,MAAM,OAAO,WAAW;IACN,QAAQ,CAAQ;IAChB,SAAS,CAAQ;IAIjC,YAAa,eAA+B,EAAE,SAAkB;QAC9D,IAAI,QAAgB,CAAA;QACpB,IAAI,QAAQ,CAAC,eAAe,CAAC,EAAE,CAAC;YAC9B,QAAQ,GAAG,eAAe,CAAC,WAAW,CAAC,CAAC,CAAC,CAAA;YACzC,SAAS,GAAG,eAAe,CAAC,WAAW,CAAC,CAAC,CAAC,CAAA;QAC5C,CAAC;aAAM,CAAC;YACN,QAAQ,GAAG,eAAe,CAAA;YAC1B,SAAS,GAAG,SAAmB,CAAA;QACjC,CAAC;QAED,IAAI,CAAC,SAAS,CAAC,GAAG,QAAQ,IAAI,SAAS,EAAE,CAAC,EAAE,CAAC;YAC3C,MAAM,IAAI,KAAK,CAAC,GAAG,QAAQ,IAAI,SAAS,4BAA4B,CAAC,CAAA;QACvE,CAAC;QAED,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAA;QACxB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAA;IAC5B,CAAC;IAED,OAAO;QACL,OAAO;YACL,IAAI,EAAE,OAAO;YACb,WAAW,EAAE,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,QAAQ,CAAC;SAC7C,CAAA;IACH,CAAC;CACF"}

package/dist/types/index.d.ts

@@ -0,0 +1 @@
+export * from './coordinates.js';

package/dist/types/index.js

@@ -0,0 +1,2 @@
+export * from './coordinates.js';
+//# sourceMappingURL=index.js.map

package/dist/types/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../lib/types/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wisemen/nestjs-typeorm",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "type": "module",