@goatlab/fluent 0.6.16 → 0.6.19

package/dist/loadRelations.d.ts

@@ -6,6 +6,7 @@ interface RelationshipLoader {
     dataSource?: DataSource;
     provider?: 'typeorm' | 'firebase';
     self: any;
+    returnPivot?: boolean;
 }
-export declare const loadRelations: ({ data, relations, modelRelations, dataSource, provider, self }: RelationshipLoader) => Promise<any[]>;
+export declare const loadRelations: ({ data, relations, modelRelations, provider, self, returnPivot }: RelationshipLoader) => Promise<any[]>;
 export {};

package/dist/loadRelations.js

@@ -2,8 +2,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, dataSource, provider, self }) => {
+const loadRelations = async ({ data, relations, modelRelations, provider, self, returnPivot }) => {
     if (!relations) {
         return data;
     }
@@ -11,21 +10,13 @@ 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);
+                const ids = new Set(data.map(d => Model.isMongoDB ? js_utils_1.Ids.objectID(d.id) : d.id));
+                const chunks = js_utils_1.Arrays.chunk(Array.from(ids), chunkSize);
                 const promises = [];
                 for (const relatedIds of chunks) {
-                    const results = await Model.andWhere(Model._keys[relationModel.inverseSidePropertyPath], 'in', relatedIds).get();
+                    const results = await Model.andWhere(keys => keys[relationModel.inverseSidePropertyPath], 'in', relatedIds).get();
                     promises.push(results);
                 }
                 const relatedResults = js_utils_1.Arrays.collapse(await Promise.all(promises));
@@ -41,7 +32,7 @@ const loadRelations = async ({ data, relations, modelRelations, dataSource, prov
                 const chunks = js_utils_1.Arrays.chunk(ids, chunkSize);
                 const promises = [];
                 for (const relatedIds of chunks) {
-                    const results = await Model.andWhere(Model._keys.id, 'in', relatedIds).get();
+                    const results = await Model.andWhere(keys => keys.id, 'in', relatedIds).get();
                     promises.push(results);
                 }
                 const relatedResults = js_utils_1.Arrays.collapse(promises);
@@ -63,7 +54,7 @@ const loadRelations = async ({ data, relations, modelRelations, dataSource, prov
                 const promises = [];
                 for (const pivotIds of chunks) {
                     const results = await pivotRepository
-                        .where(relationModel.joinColumns[0].propertyName, 'in', pivotIds)
+                        .where(k => k[relationModel.joinColumns[0].propertyName], 'in', pivotIds)
                         .get();
                     promises.push(results);
                 }
@@ -72,10 +63,14 @@ const loadRelations = async ({ data, relations, modelRelations, dataSource, prov
                 const relationChunks = js_utils_1.Arrays.chunk(uniquePivotIds, chunkSize);
                 const relationPromises = [];
                 for (const relatedIds of relationChunks) {
-                    const results = await Model.andWhere(Model._keys.id, 'in', relatedIds).get();
+                    const results = await Model.andWhere(keys => keys.id, 'in', relatedIds).get();
                     relationPromises.push(results);
                 }
-                const relatedResults = js_utils_1.Arrays.collapse(await Promise.all(relationPromises));
+                let relatedResults = js_utils_1.Arrays.collapse(await Promise.all(relationPromises));
+                const pivotInverseKey = relationModel.inverseJoinColumns[0].propertyName;
+                relatedResults = relatedResults.map(r => {
+                    return { ...r, pivot: pivotResults.find(p => p[pivotInverseKey] === r.id) };
+                });
                 const groupedPivot = js_utils_1.Arrays.groupBy(pivotResults, r => r[relationModel.joinColumns[0].propertyName]);
                 const groupedRelated = js_utils_1.Arrays.groupBy(relatedResults, r => r.id);
                 data.forEach(d => {