orange-orm 4.3.0-beta.1 → 4.3.0-beta.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orange-orm",
-  "version": "4.3.0-beta.1",
+  "version": "4.3.0-beta.2",
   "main": "./src/index.js",
   "browser": "./src/client/index.mjs",
   "bin": {

package/src/getManyDto.js

@@ -128,7 +128,7 @@ async function decode(strategy, span, rows, keys = rows.length > 0 ? Object.keys
 		for (let j = 0; j < aggregateKeys.length; j++) {
 			const key = aggregateKeys[j];
 			const parse = span.aggregates[key].column?.decode || Number.parseFloat;
-			outRow[key] =  parse(row[keys[j+columnsLength]]);
+			outRow[key] = parse(row[keys[j + columnsLength]]);
 		}
 
 		outRows[i] = outRow;
@@ -141,8 +141,18 @@ async function decode(strategy, span, rows, keys = rows.length > 0 ? Object.keys
 	span._ids = fkIds;
 
 	keys.splice(0, columnsLength + aggregateKeys.length);
+	if (span.legs.toArray().length === 0)
+		return outRows;
+
+	const all = [];
+
+	if (shouldCreateMap)
+		all.push(decodeManyRelations(strategy, span).then(() => decodeRelations2(strategy, span, rows, outRows, keys)));
+	else
+		all.push(decodeRelations2(strategy, span, rows, outRows, keys));
+
+	await Promise.all(all);
 
-	await decodeRelations(strategy, span, rows, outRows, keys);
 	return outRows;
 
 
@@ -165,19 +175,10 @@ async function decode(strategy, span, rows, keys = rows.length > 0 ? Object.keys
 
 }
 
-async function decodeRelations(strategy, span, rawRows, resultRows, keys) {
+async function decodeManyRelations(strategy, span) {
 	const promises = [];
 	const c = {};
-	c.visitJoin = function(leg) {
-		const name = leg.name;
-		const p = decode(strategy[name], leg.span, rawRows, keys).then((rows) => {
-			for (let i = 0; i < rows.length; i++) {
-				resultRows[i][name] = rows[i];
-			}
-		});
-		promises.push(p);
-	};
-
+	c.visitJoin = () => { };
 	c.visitOne = c.visitJoin;
 
 	c.visitMany = function(leg) {
@@ -205,6 +206,74 @@ async function decodeRelations(strategy, span, rawRows, resultRows, keys) {
 	await Promise.all(promises);
 }
 
+async function decodeRelations2(strategy, span, rawRows, resultRows, keys) {
+	const promises = [];
+	const c = {};
+	c.visitJoin = function (leg) {
+		const name = leg.name;
+		const p = decode(strategy[name], leg.span, rawRows, keys).then((rows) => {
+			for (let i = 0; i < rows.length; i++) {
+				resultRows[i][name] = rows[i];
+			}
+		});
+		promises.push(p);
+	};
+
+	c.visitOne = c.visitJoin;
+
+	c.visitMany = () => { };
+
+
+	span.legs.forEach(onEachLeg);
+
+	function onEachLeg(leg) {
+		leg.accept(c);
+	}
+
+	await Promise.all(promises);
+}
+
+
+// async function decodeRelations(strategy, span, rawRows, resultRows, keys) {
+// 	const promises = [];
+// 	const c = {};
+// 	c.visitJoin = function (leg) {
+// 		const name = leg.name;
+// 		const p = decode(strategy[name], leg.span, rawRows, keys).then((rows) => {
+// 			for (let i = 0; i < rows.length; i++) {
+// 				resultRows[i][name] = rows[i];
+// 			}
+// 		});
+// 		promises.push(p);
+// 	};
+
+// 	c.visitOne = c.visitJoin;
+
+// 	c.visitMany = function (leg) {
+// 		const name = leg.name;
+// 		const table = span.table;
+// 		const relation = table._relations[name];
+// 		const filter = createOneFilter(relation, span._ids);
+// 		const rowsMap = span._rowsMap;
+// 		const p = getManyDto(relation.childTable, filter, strategy[name], leg.span).then(subRows => {
+// 			for (let i = 0; i < subRows.length; i++) {
+// 				const key = leg.columns.map(column => subRows[i][column.alias]);
+// 				const parentRow = getFromMap(rowsMap, table._primaryColumns, key);
+// 				parentRow[name].push(subRows[i]);
+// 			}
+// 		});
+// 		promises.push(p);
+// 	};
+
+// 	span.legs.forEach(onEachLeg);
+
+// 	function onEachLeg(leg) {
+// 		leg.accept(c);
+// 	}
+
+// 	await Promise.all(promises);
+// }
+
 function createOneFilter(relation, ids) {
 	const columns = relation.joinRelation.columns;
 
@@ -216,7 +285,7 @@ function createOneFilter(relation, ids) {
 
 	function createCompositeFilter() {
 		let filter = emptyFilter;
-		for(let id of ids) {
+		for (let id of ids) {
 			let nextFilter;
 			for (let i = 0; i < columns.length; i++) {
 				if (nextFilter)