@goatlab/fluent 0.6.15 → 0.6.18

package/dist/BaseConnector.js

@@ -289,7 +289,7 @@ class BaseConnector {
                     : d.id,
                 ...data
             }));
-            return this.insertMany(relatedData);
+            return await this.insertMany(relatedData);
         }
     }
     associate(id) {

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;

package/dist/index.d.ts

@@ -12,6 +12,7 @@ import { TypeOrmConnector } from './TypeOrmConnector/TypeOrmConnector';
 import { getOutputKeys } from './outputKeys';
 import { loadRelations } from './loadRelations';
 import { modelGeneratorDataSource } from './generatorDatasource';
+import { Cache } from './cache';
 export { DataSource } from 'typeorm';
-export { Access, ApiHideProperty, ApiProperty, BaseConnector, Collection, Column, Decorators, Fluent, getModelSchemaRef, getOutputKeys, HideField, InputType, loadRelations, modelGeneratorDataSource, ObjectType, OmitType, PaginationLinks, PaginationMeta, PartialType, TypeOrmConnector };
+export { Access, ApiHideProperty, ApiProperty, BaseConnector, Collection, Column, Decorators, Fluent, getModelSchemaRef, getOutputKeys, HideField, InputType, loadRelations, modelGeneratorDataSource, ObjectType, OmitType, PaginationLinks, PaginationMeta, PartialType, TypeOrmConnector, Cache };
 export type { BaseDaoExtendedAttributes, BaseDataElement, DaoOutput, Deleted, Filter, FluentConnectorInterface, LogicOperator, PaginatedData, Paginator, Paths, Primitives, PrimitivesArray, Sure, WhereClause, SchemaObject };

package/dist/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TypeOrmConnector = exports.PartialType = exports.PaginationMeta = exports.PaginationLinks = exports.OmitType = exports.ObjectType = exports.modelGeneratorDataSource = exports.loadRelations = exports.InputType = exports.HideField = exports.getOutputKeys = exports.getModelSchemaRef = exports.Fluent = exports.Decorators = exports.Column = exports.Collection = exports.BaseConnector = exports.ApiProperty = exports.ApiHideProperty = exports.Access = exports.DataSource = void 0;
+exports.Cache = exports.TypeOrmConnector = exports.PartialType = exports.PaginationMeta = exports.PaginationLinks = exports.OmitType = exports.ObjectType = exports.modelGeneratorDataSource = exports.loadRelations = exports.InputType = exports.HideField = exports.getOutputKeys = exports.getModelSchemaRef = exports.Fluent = exports.Decorators = exports.Column = exports.Collection = exports.BaseConnector = exports.ApiProperty = exports.ApiHideProperty = exports.Access = exports.DataSource = void 0;
 const types_1 = require("./core/types");
 Object.defineProperty(exports, "ApiHideProperty", { enumerable: true, get: function () { return types_1.ApiHideProperty; } });
 Object.defineProperty(exports, "ApiProperty", { enumerable: true, get: function () { return types_1.ApiProperty; } });
@@ -32,5 +32,7 @@ const loadRelations_1 = require("./loadRelations");
 Object.defineProperty(exports, "loadRelations", { enumerable: true, get: function () { return loadRelations_1.loadRelations; } });
 const generatorDatasource_1 = require("./generatorDatasource");
 Object.defineProperty(exports, "modelGeneratorDataSource", { enumerable: true, get: function () { return generatorDatasource_1.modelGeneratorDataSource; } });
+const cache_1 = require("./cache");
+Object.defineProperty(exports, "Cache", { enumerable: true, get: function () { return cache_1.Cache; } });
 var typeorm_1 = require("typeorm");
 Object.defineProperty(exports, "DataSource", { enumerable: true, get: function () { return typeorm_1.DataSource; } });

package/dist/loadRelations.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadRelations = void 0;
 const js_utils_1 = require("@goatlab/js-utils");
-const TypeOrmConnector_1 = require("./TypeOrmConnector/TypeOrmConnector");
 const loadRelations = async ({ data, relations, modelRelations, dataSource, provider, self }) => {
     if (!relations) {
         return data;
@@ -11,15 +10,7 @@ const loadRelations = async ({ data, relations, modelRelations, dataSource, prov
     for (const relation of Object.keys(relations)) {
         if (modelRelations[relation]) {
             const relationModel = modelRelations[relation];
-            let firebaseConnector;
-            if (provider === 'firebase') {
-                firebaseConnector = require('@goatlab/fluent-firebase').FirebaseConnector;
-            }
-            const Model = typeof self[relation] === 'function'
-                ? self[relation]()
-                : provider === 'typeorm'
-                    ? new TypeOrmConnector_1.TypeOrmConnector(relationModel.targetClass, dataSource)
-                    : new firebaseConnector(relationModel.targetClass);
+            const Model = new relations[relation]();
             if (relationModel.isOneToMany) {
                 const ids = js_utils_1.Arrays.deDuplicate(data.map(d => Model.isMongoDB ? js_utils_1.Ids.objectID(d.id) : d.id));
                 const chunks = js_utils_1.Arrays.chunk(ids, chunkSize);