@goatlab/fluent 0.6.13 → 0.6.16

package/dist/Fluent.d.ts

@@ -21,6 +21,6 @@ export declare class Fluent {
     static model<T = BaseDataElement>(name: string): any;
     static collect<T = BaseDataElement | Primitives>(data: T[]): Collection<T>;
     static getConfig(): _FLUENT_;
-    static models(Entities: any[]): Promise<DataSource>;
+    static initialize(dataSources: DataSource[], Entities: any[]): Promise<void>;
 }
 export {};

package/dist/Fluent.js

@@ -40,13 +40,16 @@ class Fluent {
             return global._FLUENT_;
         }
     }
-    static async models(Entities) {
+    static async initialize(dataSources, Entities) {
         generatorDatasource_1.modelGeneratorDataSource.setOptions({ entities: Entities });
-        if (generatorDatasource_1.modelGeneratorDataSource.isInitialized) {
-            return generatorDatasource_1.modelGeneratorDataSource;
+        if (!generatorDatasource_1.modelGeneratorDataSource.isInitialized) {
+            await generatorDatasource_1.modelGeneratorDataSource.initialize();
+        }
+        for (const dataSource of dataSources) {
+            if (!dataSource.isInitialized) {
+                await dataSource.initialize();
+            }
         }
-        await generatorDatasource_1.modelGeneratorDataSource.initialize();
-        return generatorDatasource_1.modelGeneratorDataSource;
     }
 }
 exports.Fluent = Fluent;

package/dist/TypeOrmConnector/TypeOrmConnector.d.ts

@@ -1,15 +1,14 @@
 import { Repository } from 'typeorm';
 import { BaseConnector, FluentConnectorInterface } from '../BaseConnector';
 import type { Filter, DaoOutput, BaseDataElement, PaginatedData, Paginator, Sure } from '../types';
-export declare class GoatRepository<T> extends Repository<T> {
-}
+import { DataSource } from 'typeorm';
 export declare const getRelations: (typeOrmRepo: any) => {
     relations: {};
 };
 export declare class TypeOrmConnector<ModelDTO = BaseDataElement, InputDTO = ModelDTO, OutputDTO = InputDTO> extends BaseConnector<ModelDTO, InputDTO, OutputDTO> implements FluentConnectorInterface<InputDTO, DaoOutput<InputDTO, OutputDTO>> {
     private repository;
-    private connectionName;
-    constructor(entity: any, relationQuery?: any, connectionName?: string);
+    private dataSource;
+    constructor(entity: any, dataSource: DataSource, relationQuery?: any);
     get(): Promise<DaoOutput<InputDTO, OutputDTO>[]>;
     getPaginated(): Promise<PaginatedData<DaoOutput<InputDTO, OutputDTO>>>;
     all(): Promise<DaoOutput<InputDTO, OutputDTO>[]>;

package/dist/TypeOrmConnector/TypeOrmConnector.js

@@ -1,16 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TypeOrmConnector = exports.getRelations = exports.GoatRepository = void 0;
+exports.TypeOrmConnector = exports.getRelations = void 0;
 const typeorm_1 = require("typeorm");
 const mongodb_1 = require("mongodb");
 const js_utils_1 = require("@goatlab/js-utils");
 const loadRelations_1 = require("../loadRelations");
 const BaseConnector_1 = require("../BaseConnector");
-const generatorDatasource_1 = require("../generatorDatasource");
 const outputKeys_1 = require("../outputKeys");
-class GoatRepository extends typeorm_1.Repository {
-}
-exports.GoatRepository = GoatRepository;
+const generatorDatasource_1 = require("../generatorDatasource");
 const getRelations = typeOrmRepo => {
     const relations = {};
     for (const relation of typeOrmRepo.metadata.relations) {
@@ -33,17 +30,15 @@ const getRelations = typeOrmRepo => {
 };
 exports.getRelations = getRelations;
 class TypeOrmConnector extends BaseConnector_1.BaseConnector {
-    constructor(entity, relationQuery, connectionName) {
+    constructor(entity, dataSource, relationQuery) {
         super();
-        this.connectionName = connectionName;
-        if (!generatorDatasource_1.modelGeneratorDataSource.isInitialized) {
-            throw new Error('Fluent model generator data source is not initialized');
-        }
-        this.repository = generatorDatasource_1.modelGeneratorDataSource.getRepository(entity);
+        this.dataSource = dataSource;
         this.relationQuery = relationQuery;
-        const { relations } = (0, exports.getRelations)(this.repository);
+        this.repository = this.dataSource.getRepository(entity);
+        const relationShipBuilder = generatorDatasource_1.modelGeneratorDataSource.getRepository(entity);
+        const { relations } = (0, exports.getRelations)(relationShipBuilder);
         this.modelRelations = relations;
-        this.outputKeys = (0, outputKeys_1.getOutputKeys)(this.repository) || [];
+        this.outputKeys = (0, outputKeys_1.getOutputKeys)(relationShipBuilder) || [];
         this.isMongoDB =
             this.repository.metadata.connection.driver.options.type === 'mongodb';
     }
@@ -55,7 +50,7 @@ class TypeOrmConnector extends BaseConnector_1.BaseConnector {
             data,
             relations: this.relations,
             modelRelations: this.modelRelations,
-            connectionName: this.connectionName,
+            dataSource: this.dataSource,
             provider: 'typeorm',
             self: this
         });

package/dist/TypeOrmConnector/test/advanced/typeOrm.entity.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TypeORMDataModel = exports.Nested = exports.FurtherNested = void 0;
 const tslib_1 = require("tslib");
-const decorators_1 = require("../../../core/database/decorators");
+const decorators_1 = require("../../../decorators");
 class FurtherNested {
 }
 tslib_1.__decorate([

package/dist/TypeOrmConnector/test/advanced/typeOrm.repository.js

@@ -3,9 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TypeOrmRepository = void 0;
 const typeOrm_entity_1 = require("./typeOrm.entity");
 const TypeOrmConnector_1 = require("../../TypeOrmConnector");
+const memoryDataSource_1 = require("../memoryDataSource");
 class TypeOrmRepository extends TypeOrmConnector_1.TypeOrmConnector {
     constructor(relations) {
-        super(typeOrm_entity_1.TypeORMDataModel, relations, 'runningTest');
+        super(typeOrm_entity_1.TypeORMDataModel, memoryDataSource_1.MemoryDataSource, relations);
     }
 }
 exports.TypeOrmRepository = TypeOrmRepository;

package/dist/TypeOrmConnector/test/basic/goat.entity.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.GoatEntity = exports.Breed = void 0;
 const tslib_1 = require("tslib");
 const types_1 = require("../../../core/types");
-const decorators_1 = require("../../../core/database/decorators");
+const decorators_1 = require("../../../decorators");
 let Breed = class Breed {
 };
 tslib_1.__decorate([

package/dist/TypeOrmConnector/test/basic/goat.repository.js

@@ -3,9 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.GoatRepository = void 0;
 const goat_entity_1 = require("./goat.entity");
 const TypeOrmConnector_1 = require("../../TypeOrmConnector");
+const memoryDataSource_1 = require("../memoryDataSource");
 class GoatRepository extends TypeOrmConnector_1.TypeOrmConnector {
     constructor(relations) {
-        super(goat_entity_1.GoatEntity, relations, 'runningTest');
+        super(goat_entity_1.GoatEntity, memoryDataSource_1.MemoryDataSource, relations);
     }
 }
 exports.GoatRepository = GoatRepository;

package/dist/TypeOrmConnector/test/dbEntities.d.ts

@@ -0,0 +1,6 @@
+import { TypeORMDataModel } from "./advanced/typeOrm.entity";
+import { GoatEntity } from "./basic/goat.entity";
+import { CarsEntity } from "./relations/car/car.entity";
+import { RoleEntity } from "./relations/roles/roles.entity";
+import { RolesUser } from "./relations/roles/roles_user.entity";
+export declare const dbEntities: (typeof RoleEntity | typeof CarsEntity | typeof RolesUser | typeof TypeORMDataModel | typeof GoatEntity)[];

package/dist/TypeOrmConnector/test/dbEntities.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.dbEntities = void 0;
+const typeOrm_entity_1 = require("./advanced/typeOrm.entity");
+const goat_entity_1 = require("./basic/goat.entity");
+const car_entity_1 = require("./relations/car/car.entity");
+const roles_entity_1 = require("./relations/roles/roles.entity");
+const roles_user_entity_1 = require("./relations/roles/roles_user.entity");
+const user_entity_1 = require("./relations/user/user.entity");
+exports.dbEntities = [
+    goat_entity_1.GoatEntity,
+    typeOrm_entity_1.TypeORMDataModel,
+    car_entity_1.CarsEntity,
+    user_entity_1.UsersEntity,
+    roles_entity_1.RoleEntity,
+    roles_user_entity_1.RolesUser
+];

package/dist/TypeOrmConnector/test/memoryDataSource.d.ts

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

package/dist/TypeOrmConnector/test/memoryDataSource.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MemoryDataSource = void 0;
+const typeorm_1 = require("typeorm");
+const dbEntities_1 = require("./dbEntities");
+exports.MemoryDataSource = new typeorm_1.DataSource({
+    type: 'sqlite',
+    database: ':memory:',
+    entities: dbEntities_1.dbEntities,
+    logging: false,
+    synchronize: true
+});

package/dist/TypeOrmConnector/test/relations/car/car.entity.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CarsEntity = void 0;
 const tslib_1 = require("tslib");
-const decorators_1 = require("../../../../core/database/decorators");
+const decorators_1 = require("../../../../decorators");
 const user_entity_1 = require("../user/user.entity");
 let CarsEntity = class CarsEntity {
 };

package/dist/TypeOrmConnector/test/relations/car/car.repositoryTypeOrm.js

@@ -4,9 +4,10 @@ exports.CarsRepository = void 0;
 const car_entity_1 = require("./car.entity");
 const TypeOrmConnector_1 = require("../../../TypeOrmConnector");
 const user_repositoryTypeOrm_1 = require("../user/user.repositoryTypeOrm");
+const memoryDataSource_1 = require("../../memoryDataSource");
 class CarsRepository extends TypeOrmConnector_1.TypeOrmConnector {
     constructor(relationQuery) {
-        super(car_entity_1.CarsEntity, relationQuery, 'runningTest');
+        super(car_entity_1.CarsEntity, memoryDataSource_1.MemoryDataSource, relationQuery);
         this.user = () => this.belongsTo(user_repositoryTypeOrm_1.UserRepository, 'user');
     }
 }

package/dist/TypeOrmConnector/test/relations/relationsTestsSuite.js

@@ -45,7 +45,7 @@ const relationsTestSuite = (Model, BelongsToModel, ManyToManyModel) => {
         expect(Array.isArray(searchCar2)).toBe(true);
         expect(searchCar2.length === 0).toBe(true);
     });
-    test('Query related model - BelongTo', async () => {
+    test('Query related model - BelongsTo', async () => {
         const insertedUser = await Model.insert({
             name: 'testUser',
             age: 20

package/dist/TypeOrmConnector/test/relations/roles/roles.entity.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RoleEntity = void 0;
 const tslib_1 = require("tslib");
-const decorators_1 = require("../../../../core/database/decorators");
+const decorators_1 = require("../../../../decorators");
 const user_entity_1 = require("../user/user.entity");
 let RoleEntity = class RoleEntity {
 };

package/dist/TypeOrmConnector/test/relations/roles/roles.repositoryTypeOrm.js

@@ -5,9 +5,10 @@ const roles_entity_1 = require("./roles.entity");
 const roles_users_repositoryTypeOrm_1 = require("./roles_users.repositoryTypeOrm");
 const TypeOrmConnector_1 = require("../../../TypeOrmConnector");
 const user_repositoryTypeOrm_1 = require("../user/user.repositoryTypeOrm");
+const memoryDataSource_1 = require("../../memoryDataSource");
 class RoleRepository extends TypeOrmConnector_1.TypeOrmConnector {
     constructor(relations) {
-        super(roles_entity_1.RoleEntity, relations, 'runningTest');
+        super(roles_entity_1.RoleEntity, memoryDataSource_1.MemoryDataSource, relations);
         this.users = () => this.belongsToMany(user_repositoryTypeOrm_1.UserRepository, roles_users_repositoryTypeOrm_1.RoleUsersRepository, 'users');
     }
 }

package/dist/TypeOrmConnector/test/relations/roles/roles_user.entity.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RolesUser = void 0;
 const tslib_1 = require("tslib");
-const decorators_1 = require("../../../../core/database/decorators");
+const decorators_1 = require("../../../../decorators");
 let RolesUser = class RolesUser {
 };
 tslib_1.__decorate([

package/dist/TypeOrmConnector/test/relations/roles/roles_users.repositoryTypeOrm.js

@@ -3,9 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.RoleUsersRepository = void 0;
 const roles_user_entity_1 = require("./roles_user.entity");
 const TypeOrmConnector_1 = require("../../../TypeOrmConnector");
+const memoryDataSource_1 = require("../../memoryDataSource");
 class RoleUsersRepository extends TypeOrmConnector_1.TypeOrmConnector {
     constructor(relations) {
-        super(roles_user_entity_1.RolesUser, relations, 'runningTest');
+        super(roles_user_entity_1.RolesUser, memoryDataSource_1.MemoryDataSource, relations);
     }
 }
 exports.RoleUsersRepository = RoleUsersRepository;

package/dist/TypeOrmConnector/test/relations/user/user.entity.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.UsersEntity = exports.Family = void 0;
 const tslib_1 = require("tslib");
 const car_entity_1 = require("../car/car.entity");
-const decorators_1 = require("../../../../core/database/decorators");
+const decorators_1 = require("../../../../decorators");
 const roles_entity_1 = require("../roles/roles.entity");
 class Family {
 }

package/dist/TypeOrmConnector/test/relations/user/user.repositoryTypeOrm.js

@@ -6,9 +6,10 @@ const roles_repositoryTypeOrm_1 = require("../roles/roles.repositoryTypeOrm");
 const roles_users_repositoryTypeOrm_1 = require("../roles/roles_users.repositoryTypeOrm");
 const TypeOrmConnector_1 = require("../../../TypeOrmConnector");
 const user_entity_1 = require("./user.entity");
+const memoryDataSource_1 = require("../../memoryDataSource");
 class UserRepository extends TypeOrmConnector_1.TypeOrmConnector {
     constructor(relations) {
-        super(user_entity_1.UsersEntity, relations, 'runningTest');
+        super(user_entity_1.UsersEntity, memoryDataSource_1.MemoryDataSource, relations);
         this.cars = () => this.hasMany(car_repositoryTypeOrm_1.CarsRepository, 'cars');
         this.roles = () => this.belongsToMany(roles_repositoryTypeOrm_1.RoleRepository, roles_users_repositoryTypeOrm_1.RoleUsersRepository, 'roles');
     }

package/dist/cache.d.ts

@@ -0,0 +1,9 @@
+import Keyv from 'keyv';
+export declare class Cache extends Keyv {
+    has(key: string): Promise<boolean>;
+    remember(key: string, ms: number, fx: () => Promise<any>): Promise<any>;
+    rememberForever(key: string, fx: () => Promise<any>): Promise<any>;
+    pull(key: string): Promise<any>;
+    forget(key: string): Promise<boolean>;
+    flush(): Promise<void>;
+}

package/dist/cache.js

@@ -0,0 +1,43 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Cache = void 0;
+const tslib_1 = require("tslib");
+const keyv_1 = tslib_1.__importDefault(require("keyv"));
+class Cache extends keyv_1.default {
+    async has(key) {
+        const value = await this.get(key);
+        return value ? true : false;
+    }
+    async remember(key, ms, fx) {
+        const value = await this.get(key);
+        if (value) {
+            return value;
+        }
+        const result = await fx();
+        await this.set(key, result, ms);
+        return result;
+    }
+    async rememberForever(key, fx) {
+        const value = await this.get(key);
+        if (value) {
+            return value;
+        }
+        const result = await fx();
+        await this.set(key, result);
+        return result;
+    }
+    async pull(key) {
+        const value = await this.get(key);
+        if (value) {
+            this.delete(key);
+        }
+        return value;
+    }
+    async forget(key) {
+        return await this.delete(key);
+    }
+    async flush() {
+        return await this.clear();
+    }
+}
+exports.Cache = Cache;