@goatlab/fluent 0.6.14 → 0.6.15

package/dist/{core/database/decorators.d.ts → decorators.d.ts}

@@ -1,4 +1,4 @@
-import { Primitives } from '../../types';
+import { Primitives } from './types';
 interface PropertyInterface {
     required?: boolean;
     unique?: boolean;

package/dist/{core/database/decorators.js → decorators.js}

@@ -4,9 +4,9 @@ exports.Decorators = void 0;
 const typeorm_1 = require("typeorm");
 const fireorm_1 = require("fireorm");
 const graphql_1 = require("graphql");
-const types_1 = require("../types");
-const applyDecorators_1 = require("../Nestjs/applyDecorators");
-const field_decorator_1 = require("../Nestjs/types/decorators/field.decorator");
+const types_1 = require("./core/types");
+const applyDecorators_1 = require("./core/Nestjs/applyDecorators");
+const field_decorator_1 = require("./core/Nestjs/types/decorators/field.decorator");
 exports.Decorators = (() => {
     const id = (isMongo) => {
         isMongo = false;

package/dist/index.d.ts

@@ -4,14 +4,14 @@ import { PaginationLinks, PaginationMeta } from './core/dtos/pagination.dto';
 import { Access } from './core/dtos/access.dto';
 import { BaseConnector } from './BaseConnector';
 import { Collection } from '@goatlab/js-utils';
-import { Decorators } from './core/database/decorators';
+import { Decorators } from './decorators';
 import { Fluent } from './Fluent';
 import type { FluentConnectorInterface } from './BaseConnector';
 import type { SchemaObject } from './core/types';
 import { TypeOrmConnector } from './TypeOrmConnector/TypeOrmConnector';
-import { createConnection } from './core/database/createConnection';
 import { getOutputKeys } from './outputKeys';
 import { loadRelations } from './loadRelations';
 import { modelGeneratorDataSource } from './generatorDatasource';
-export { Access, ApiHideProperty, ApiProperty, BaseConnector, Collection, Column, createConnection, Decorators, Fluent, getModelSchemaRef, getOutputKeys, HideField, InputType, loadRelations, modelGeneratorDataSource, ObjectType, OmitType, PaginationLinks, PaginationMeta, PartialType, TypeOrmConnector };
+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 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.createConnection = exports.Column = exports.Collection = exports.BaseConnector = exports.ApiProperty = exports.ApiHideProperty = exports.Access = void 0;
+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; } });
@@ -20,17 +20,17 @@ const BaseConnector_1 = require("./BaseConnector");
 Object.defineProperty(exports, "BaseConnector", { enumerable: true, get: function () { return BaseConnector_1.BaseConnector; } });
 const js_utils_1 = require("@goatlab/js-utils");
 Object.defineProperty(exports, "Collection", { enumerable: true, get: function () { return js_utils_1.Collection; } });
-const decorators_1 = require("./core/database/decorators");
+const decorators_1 = require("./decorators");
 Object.defineProperty(exports, "Decorators", { enumerable: true, get: function () { return decorators_1.Decorators; } });
 const Fluent_1 = require("./Fluent");
 Object.defineProperty(exports, "Fluent", { enumerable: true, get: function () { return Fluent_1.Fluent; } });
 const TypeOrmConnector_1 = require("./TypeOrmConnector/TypeOrmConnector");
 Object.defineProperty(exports, "TypeOrmConnector", { enumerable: true, get: function () { return TypeOrmConnector_1.TypeOrmConnector; } });
-const createConnection_1 = require("./core/database/createConnection");
-Object.defineProperty(exports, "createConnection", { enumerable: true, get: function () { return createConnection_1.createConnection; } });
 const outputKeys_1 = require("./outputKeys");
 Object.defineProperty(exports, "getOutputKeys", { enumerable: true, get: function () { return outputKeys_1.getOutputKeys; } });
 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; } });
+var typeorm_1 = require("typeorm");
+Object.defineProperty(exports, "DataSource", { enumerable: true, get: function () { return typeorm_1.DataSource; } });

package/dist/loadRelations.d.ts

@@ -1,10 +1,11 @@
+import { DataSource } from 'typeorm';
 interface RelationshipLoader {
     data: any[];
     relations: any;
     modelRelations: any;
-    connectionName?: string;
+    dataSource?: DataSource;
     provider?: 'typeorm' | 'firebase';
     self: any;
 }
-export declare const loadRelations: ({ data, relations, modelRelations, connectionName, provider, self }: RelationshipLoader) => Promise<any[]>;
+export declare const loadRelations: ({ data, relations, modelRelations, dataSource, provider, self }: RelationshipLoader) => Promise<any[]>;
 export {};

package/dist/loadRelations.js

@@ -3,7 +3,7 @@ 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, connectionName, provider, self }) => {
+const loadRelations = async ({ data, relations, modelRelations, dataSource, provider, self }) => {
     if (!relations) {
         return data;
     }
@@ -18,7 +18,7 @@ const loadRelations = async ({ data, relations, modelRelations, connectionName,
             const Model = typeof self[relation] === 'function'
                 ? self[relation]()
                 : provider === 'typeorm'
-                    ? new TypeOrmConnector_1.TypeOrmConnector(relationModel.targetClass, undefined, connectionName || 'LOCAL_DB')
+                    ? new TypeOrmConnector_1.TypeOrmConnector(relationModel.targetClass, dataSource)
                     : new firebaseConnector(relationModel.targetClass);
             if (relationModel.isOneToMany) {
                 const ids = js_utils_1.Arrays.deDuplicate(data.map(d => Model.isMongoDB ? js_utils_1.Ids.objectID(d.id) : d.id));