orange-orm 4.3.0-beta.3 → 4.4.0-beta.0

package/src/getManyDto.js

@@ -19,68 +19,98 @@ async function getManyDto(table, filter, strategy, spanFromParent) {
 	return decode(strategy, span, await res[0]);
 }
 
+// function newCreateRow(span) {
+// 	let columnsMap = span.columns;
+// 	const columns = span.table._columns.filter(column => !columnsMap || columnsMap.get(column));
+// 	const protoRow = createProto(columns, span);
+// 	const manyNames = [];
+
+// 	const c = {};
+// 	c.visitJoin = () => { };
+// 	c.visitOne = () => { };
+// 	c.visitMany = function(leg) {
+// 		manyNames.push(leg.name);
+// 	};
+
+// 	span.legs.forEach(onEachLeg);
+// 	return createRow;
+
+// 	function onEachLeg(leg) {
+// 		leg.accept(c);
+// 	}
+
+// 	function createRow() {
+// 		const obj = Object.create(protoRow);
+// 		for (let i = 0; i < manyNames.length; i++) {
+// 			obj[manyNames[i]] = [];
+// 		}
+// 		return obj;
+// 	}
+// }
+
+
 function newCreateRow(span) {
-	let columnsMap = span.columns;
+	const columnsMap = span.columns;
 	const columns = span.table._columns.filter(column => !columnsMap || columnsMap.get(column));
-	const protoRow = createProto(columns, span);
+	const ProtoRow = createProto(columns, span);
 	const manyNames = [];
 
-	const c = {};
-	c.visitJoin = () => { };
-	c.visitOne = () => { };
-	c.visitMany = function (leg) {
-		manyNames.push(leg.name);
+	const c = {
+		visitJoin: () => { },
+		visitOne: () => { },
+		visitMany: function(leg) {
+			manyNames.push(leg.name);
+		}
 	};
 
-	span.legs.forEach(onEachLeg);
-	return createRow;
+	span.legs.forEach(leg => leg.accept(c));
 
-	function onEachLeg(leg) {
-		leg.accept(c);
-	}
+	return createRow;
 
 	function createRow() {
-		const obj = Object.create(protoRow);
-		for (let i = 0; i < manyNames.length; i++) {
-			obj[manyNames[i]] = [];
-		}
+		const obj = new ProtoRow();
+		manyNames.forEach(name => {
+			obj[name] = [];
+		});
 		return obj;
 	}
 }
 
 function createProto(columns, span) {
-	let obj = {};
-	for (let i = 0; i < columns.length; i++) {
-		obj[columns[i].alias] = null;
-	}
-	for (let key in span.aggregates) {
-		obj[key] = null;
-	}
-	const c = {};
+	function ProtoRow() {
+		columns.forEach(column => {
+			this[column.alias] = null;
+		});
 
-	c.visitJoin = function (leg) {
-		obj[leg.name] = null;
-	};
-	c.visitOne = c.visitJoin;
-	c.visitMany = function (leg) {
-		obj[leg.name] = null;
-	};
+		for (const key in span.aggregates) {
+			this[key] = null;
+		}
 
-	span.legs.forEach(onEachLeg);
+		const c = {
+			visitJoin: (leg) => {
+				this[leg.name] = null;
+			},
+			visitOne: (leg) => {
+				this[leg.name] = null;
+			},
+			visitMany: (leg) => {
+				this[leg.name] = null;
+			}
+		};
 
-	function onEachLeg(leg) {
-		leg.accept(c);
+		span.legs.forEach(leg => leg.accept(c));
 	}
 
-	return obj;
+	return ProtoRow;
 }
 
+
 function hasManyRelations(span) {
 	let result;
 	const c = {};
 	c.visitJoin = () => { };
 	c.visitOne = c.visitJoin;
-	c.visitMany = function () {
+	c.visitMany = function() {
 		result = true;
 	};
 
@@ -92,7 +122,7 @@ function hasManyRelations(span) {
 	}
 }
 
-async function decode(strategy, span, rows, keys = rows.length > 0 ? Object.keys(rows[0]) : []) {
+async function decode(strategy, span, rows, keys = rows.length > 0 ? Object.keys(rows[0]) : [], parentRows, parentProp) {
 	const table = span.table;
 	let columnsMap = span.columns;
 	const columns = table._columns.filter(column => !columnsMap || columnsMap.get(column));
@@ -108,52 +138,37 @@ async function decode(strategy, span, rows, keys = rows.length > 0 ? Object.keys
 	const outRows = new Array(rowsLength);
 	const createRow = newCreateRow(span);
 	const shouldCreateMap = hasManyRelations(span);
-	let all = [];;
-
 	for (let i = 0; i < rowsLength; i++) {
 		const row = rows[i];
 		let outRow = createRow();
 		let pkWithNullCount = 0;
-		for (let j = 0; j < primaryColumnsLength; j++) {
-			if (row[keys[j]] === null)
-				pkWithNullCount++;
-			if (pkWithNullCount === primaryColumnsLength) {
-				outRow = null;
-				break;
+		for (let j = 0; j < columnsLength; j++) {
+			if (j < primaryColumnsLength) {
+				if (row[keys[j]] === null)
+					pkWithNullCount++;
+				if (pkWithNullCount === primaryColumnsLength) {
+					outRow = null;
+					break;
+				}
 			}
 			const column = columns[j];
 			outRow[column.alias] = column.decode(row[keys[j]]);
+		}
 
+		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]]);
 		}
 
-		if (shouldCreateMap && outRow) {
+		outRows[i] = outRow;
+		if (parentRows)
+			parentRows[i][parentProp] = outRow;
+		if (shouldCreateMap) {
 			fkIds[i] = getIds(outRow);
-			addToMap(rowsMap, primaryColumns, outRow);
+			addToMap(rowsMap, fkIds[i], outRow);
 		}
-		outRows[i] = outRow;
 	}
-
-	all.push(new Promise((resolve) => {
-		setImmediate(async () => {
-			for (let i = 0; i < rowsLength; i++) {
-				const currentOutRow = outRows[i];
-				const currentRow = rows[i];
-				for (let j = primaryColumnsLength; j < columnsLength; j++) {
-					const column = columns[j];
-					currentOutRow[column.alias] = column.decode(currentRow[keys[j]]);
-				}
-
-				for (let j = 0; j < aggregateKeys.length; j++) {
-					const key = aggregateKeys[j];
-					const parse = span.aggregates[key].column?.decode || Number.parseFloat;
-					currentOutRow[key] = parse(currentRow[keys[j + columnsLength]]);
-				}
-			}
-			resolve();
-		});
-	}));
-
-
 	span._rowsMap = rowsMap;
 	span._ids = fkIds;
 
@@ -161,107 +176,15 @@ async function decode(strategy, span, rows, keys = rows.length > 0 ? Object.keys
 	if (span.legs.toArray().length === 0)
 		return outRows;
 
-	//alt 1
-	// 3.1 sec
-	// await new Promise((resolve, reject) => {
-	// 	setTimeout(() => {
-	// 		if (shouldCreateMap)
-	// 			decodeManyRelations(strategy, span, rows, outRows, keys)
-	// 				.then(() => decodeRelations2(strategy, span, rows, outRows, keys))
-	// 				.then(resolve)
-	// 				.catch(reject);
-	// 		else
-	// 			decodeRelations2(strategy, span, rows, outRows, keys)
-	// 				.then(resolve)
-	// 				.catch(reject);
-	// 	}, 0);
-	// });
-
-
-	//alt 1
-	// 3.2 sec
-	// await new Promise((resolve, reject) => {
-	// 	setTimeout(() => {
-	// 		const all = [];
-	// 		if (shouldCreateMap) 
-	// 			all.push(decodeManyRelations(strategy, span, rows, outRows, keys))
-
-	// 		all.push(new Promise((resolve, reject) => {
-	// 			setTimeout(async () => {
-	// 				await decodeRelations2(strategy, span, rows, outRows, keys);
-	// 				resolve();
-
-	// 			}, 0);
-	// 		}));
-	// 		// const p2 = decodeRelations2(strategy, span, rows, outRows, keys);
-	// 		Promise.all(all).then(resolve, reject);				
-	// 	}, 0);
-	// });
-
-
-	// let all = [];;
-	// if(shouldCreateMap) {
-
-	// 	await decodeManyRelations(strategy, span, rows, outRows, keys).then(() => decodeRelations2(strategy, span, rows, outRows, keys));		
-	// }
-	// else
-	// 	await  decodeRelations2(strategy, span, rows, outRows, keys);
-
-	// await Promise.all(all);
-
-
-
-	//alt 3
-	// 3.05 sec
-
-	if (shouldCreateMap) {
-		// all.push( decodeRelations2(strategy, span, rows, outRows, keys).then(() => decodeManyRelations(strategy, span)));
-		all.push(decodeManyRelations(strategy, span));
-		all.push(decodeRelations2(strategy, span, rows, outRows, keys));
-		// all.push( decodeManyRelations(strategy, span).then(() => decodeRelations2(strategy, span, rows, outRows, keys)));
-		// all.push( decodeManyRelations(strategy, span));
-		// all.push(decodeRelations2(strategy, span, rows, outRows, keys));
-		// all.push( decodeRelations2(strategy, span, rows, outRows, keys) );		
-	}
+	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);
 
-	//alt 4
-	// 3.02 sec
-	// const all = [];
-	// if (shouldCreateMap)
-	// 	// all.push(new Promise((resolve, reject) => {
-	// 	// 	setTimeout(async () => {
-	// 	// 		await decodeManyRelations(strategy, span);
-	// 	// 		resolve();
-
-	// 	// 	}, 0)
-	// 	// }));
-	// all.push(decodeManyRelations(strategy, span));
-	// all.push(new Promise((resolve, reject) => {
-	// 	setTimeout(async () => {
-	// 		await decodeRelations2(strategy, span, rows, outRows, keys);
-	// 		resolve();
-
-	// 	}, 0);
-	// }));
-	// await Promise.all(all);
-
-	// all.push(decodeRelations2(strategy, span, rows, outRows, keys));
-
-	//alt 4
-	// 3.3 sec
-	// if(shouldCreateMap) 
-	// 	await decodeRelations(strategy, span, rows, outRows, keys);
-	// else
-	// 	await decodeRelations2(strategy, span, rows, outRows, keys);
-
-	// await decodeRelationsNext(strategy, span, rows, outRows, keys);
-	// await decodeRelations(strategy, span, rows, outRows, keys);
-
 	return outRows;
 
 
@@ -283,254 +206,70 @@ async function decode(strategy, span, rows, keys = rows.length > 0 ? Object.keys
 	}
 
 }
-async function decodeRelations2(strategy, span, rawRows, resultRows, keys) {
-	const legs = span.legs.toArray();
-	if (legs.length === 0)
-		return;
-	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 processLegs(index) {
-		if (index >= legs.length) {
-			return;
-		}
-		const leg = legs[index];
-		leg.accept(c);
-		Promise.all(promises).then(() => {
-			setImmediate(() => {
-				processLegs(index + 1);
-			});
-		});
-	}
-
-	processLegs(0);
-
-	await Promise.all(promises);
-}
-
-async function decodeRelations3(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 decodeManyRelations(strategy, span, rawRows, resultRows, keys) {
+async function decodeManyRelations(strategy, span) {
 	const promises = [];
 	const c = {};
 	c.visitJoin = () => { };
 	c.visitOne = c.visitJoin;
 
-	c.visitMany = function (leg) {
+	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 filter = createOneFilter(relation, span._ids);
+		const extractKey = createExtractKey(leg);
+		const extractFromMap = createExtractFromMap(rowsMap, table._primaryColumns);
 		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);
+				const key = extractKey(subRows[i]);
+				const parentRow = extractFromMap(key);
 				parentRow[name].push(subRows[i]);
 			}
 		});
 		promises.push(p);
 	};
 
-	span.legs.forEach(onEachLeg);
-
-	function onEachLeg(leg) {
-		leg.accept(c);
+	function createExtractKey(leg) {
+		if (leg.columns.length === 1) {
+			const alias = leg.columns[0].alias;
+			return (row) => row[alias];
+		}
+		else {
+			const aliases = leg.columns.map(column => column.alias);
+			return (row) => aliases.map(alias => row[alias]);
+		}
 	}
-
-	// 	await Promise.all(promises);
-	// }
-
-	// async function decodeRelations2(strategy, span, rawRows, resultRows, keys) {
-	// 	const promises = [];
-	// 	const c = {};
-	// c.visitJoin = function (leg) {
-	// 	const name = leg.name;
-	// 	//todo avoid traverse twice noMany relations below
-	// 	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 decodeRelations3(strategy, span, rawRows, resultRows, keys) {
-
-	let previous = new Promise((resolve) => setImmediate(() => resolve()));
-	const c = {};
-
-	c.visitJoin = function (leg) {
-		const name = leg.name;
-		const p = new Promise((resolve) => {
-			setImmediate(() => {
-				decode(strategy[name], leg.span, rawRows, keys).then((rows) => {
-					for (let i = 0; i < rows.length; i++) {
-						resultRows[i][name] = rows[i];
-					}
-					resolve();
-				});
-			});
-		});
-		previous = previous.then(() => p);
-	};
-
-	c.visitOne = c.visitJoin;
-
-	c.visitMany = () => { };
-
-	span.legs.forEach(onEachLeg);
-
-	function onEachLeg(leg) {
-		leg.accept(c);
+	function createExtractFromMap(map, primaryColumns) {
+		if (primaryColumns.length === 1)
+			return (key) => map.get(key);
+		else
+			return getFromMap.bind(null, map, primaryColumns);
 	}
 
-	await previous;
-
-}
-
-
-async function decodeRelationsNext(strategy, span, rawRows, resultRows, keys) {
-	// const promises = [];
-	let previous = new Promise((resolve) => setImmediate(() => resolve()));
-	const c = {};
-
-	c.visitJoin = function (leg) {
-		const name = leg.name;
-		const p = new Promise((resolve) => {
-			setImmediate(() => {
-				decode(strategy[name], leg.span, rawRows, keys).then((rows) => {
-					for (let i = 0; i < rows.length; i++) {
-						resultRows[i][name] = rows[i];
-					}
-					resolve();
-				});
-			});
-		});
-		previous = previous.then(() => p);
-	};
-
-	c.visitOne = c.visitJoin;
-
-	c.visitMany = function (leg) {
-		const p = new Promise((resolve, reject) => {
-			setImmediate(() => {
-
-				const name = leg.name;
-				const table = span.table;
-				const relation = table._relations[name];
-				const filter = createOneFilter(relation, span._ids);
-				const rowsMap = span._rowsMap;
-
-				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]);
-					}
-				}).then(() => resolve(), reject);
-
-
-			});
-		});
-
-
-		previous = previous.then(() => p);
-		// promises.push(p);
-	};
-
 	span.legs.forEach(onEachLeg);
 
 	function onEachLeg(leg) {
 		leg.accept(c);
 	}
 
-	await previous
+	await Promise.all(promises);
 }
 
-
-async function decodeRelations(strategy, span, rawRows, resultRows, keys) {
+async function decodeRelations2(strategy, span, rawRows, resultRows, keys) {
 	const promises = [];
 	const c = {};
-	c.visitJoin = function (leg) {
+	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];
-			}
-		});
+		const p = decode(strategy[name], leg.span, rawRows, keys, resultRows, name);
 		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);
-	};
+	c.visitMany = () => { };
 
 
 	span.legs.forEach(onEachLeg);
@@ -567,28 +306,36 @@ function createOneFilter(relation, ids) {
 	}
 }
 
-function addToMap(map, primaryColumns, row) {
-
-	const lastIndex = primaryColumns.length - 1;
-	for (let i = 0; i < lastIndex; i++) {
-		const id = row[primaryColumns[i].alias];
-		if (map.has(id))
-			map = map.get(id);
-		else {
-			const next = new Map();
-			map.set(id, next);
-			map = next;
+function addToMap(map, values, row) {
+	if (Array.isArray(values)) {
+
+		const lastIndex = values.length - 1;
+		for (let i = 0; i < lastIndex; i++) {
+			const id = values[i];
+			if (map.has(id))
+				map = map.get(id);
+			else {
+				const next = new Map();
+				map.set(id, next);
+				map = next;
+			}
 		}
+		map.set(values[lastIndex], row);
 	}
-	map.set(row[primaryColumns[lastIndex].alias], row);
+	else
+		map.set(values, row);
 }
 
 function getFromMap(map, primaryColumns, values) {
-	const length = primaryColumns.length;
-	for (let i = 0; i < length; i++) {
-		map = map.get(values[i]);
+	if (Array.isArray(values)) {
+		const length = primaryColumns.length;
+		for (let i = 0; i < length; i++) {
+			map = map.get(values[i]);
+		}
+		return map;
 	}
-	return map;
+	else
+		return map.get(values);
 }