orange-orm 5.0.0-beta.7 → 5.0.0-beta.9

package/dist/index.browser.mjs

@@ -10994,6 +10994,8 @@ function requireGetManyDto$1 () {
 		}
 
 		let span = spanFromParent || strategyToSpan(table, strategy);
+		if (!spanFromParent)
+			assignAliases(span, table._dbName);
 		let alias = table._dbName;
 
 		const query = newQuery(context, table, filter, span, alias);
@@ -11001,6 +11003,13 @@ function requireGetManyDto$1 () {
 		return decode(context, strategy, span, await res[0], undefined, updateParent);
 	}
 
+	function assignAliases(span, alias) {
+		span._alias = alias;
+		span.legs.forEach((leg) => {
+			assignAliases(leg.span, alias + leg.name);
+		});
+	}
+
 	function newCreateRow(span) {
 		let columnsMap = span.columns;
 		const columns = span.table._columns.filter(column => !columnsMap || columnsMap.get(column));
@@ -11086,6 +11095,8 @@ function requireGetManyDto$1 () {
 		const fkIds = new Array(rows.length);
 		const getIds = createGetIds();
 		const aggregateKeys = Object.keys(span.aggregates);
+		const aliasPrefix = span._alias ? 's' + span._alias : null;
+		const useAlias = aliasPrefix && rowsLength > 0 && Object.prototype.hasOwnProperty.call(rows[0], aliasPrefix + '0');
 
 		const outRows = new Array(rowsLength);
 		const createRow = newCreateRow(span);
@@ -11095,8 +11106,9 @@ function requireGetManyDto$1 () {
 			let outRow = createRow();
 			let pkWithNullCount = 0;
 			for (let j = 0; j < columnsLength; j++) {
+				const key = useAlias ? (aliasPrefix + j) : keys[j];
 				if (j < primaryColumnsLength) {
-					if (row[keys[j]] === null)
+					if (row[key] === null)
 						pkWithNullCount++;
 					if (pkWithNullCount === primaryColumnsLength) {
 						outRow = null;
@@ -11104,13 +11116,14 @@ function requireGetManyDto$1 () {
 					}
 				}
 				const column = columns[j];
-				outRow[column.alias] = column.decode(context, row[keys[j]]);
+				outRow[column.alias] = column.decode(context, row[key]);
 			}
 
 			for (let j = 0; j < aggregateKeys.length; j++) {
 				const key = aggregateKeys[j];
 				const parse = span.aggregates[key].column?.decode || ((context, arg) => Number.parseFloat(arg));
-				outRow[key] = parse(context, row[keys[j + columnsLength]]);
+				const value = useAlias ? row[key] : row[keys[j + columnsLength]];
+				outRow[key] = parse(context, value);
 			}
 
 			outRows[i] = outRow;
@@ -11124,7 +11137,8 @@ function requireGetManyDto$1 () {
 		span._rowsMap = rowsMap;
 		span._ids = fkIds;
 
-		keys.splice(0, columnsLength + aggregateKeys.length);
+		if (!useAlias)
+			keys.splice(0, columnsLength + aggregateKeys.length);
 		if (span.legs.toArray().length === 0)
 			return outRows;
 

package/dist/index.mjs

@@ -10995,6 +10995,8 @@ function requireGetManyDto$1 () {
 		}
 
 		let span = spanFromParent || strategyToSpan(table, strategy);
+		if (!spanFromParent)
+			assignAliases(span, table._dbName);
 		let alias = table._dbName;
 
 		const query = newQuery(context, table, filter, span, alias);
@@ -11002,6 +11004,13 @@ function requireGetManyDto$1 () {
 		return decode(context, strategy, span, await res[0], undefined, updateParent);
 	}
 
+	function assignAliases(span, alias) {
+		span._alias = alias;
+		span.legs.forEach((leg) => {
+			assignAliases(leg.span, alias + leg.name);
+		});
+	}
+
 	function newCreateRow(span) {
 		let columnsMap = span.columns;
 		const columns = span.table._columns.filter(column => !columnsMap || columnsMap.get(column));
@@ -11087,6 +11096,8 @@ function requireGetManyDto$1 () {
 		const fkIds = new Array(rows.length);
 		const getIds = createGetIds();
 		const aggregateKeys = Object.keys(span.aggregates);
+		const aliasPrefix = span._alias ? 's' + span._alias : null;
+		const useAlias = aliasPrefix && rowsLength > 0 && Object.prototype.hasOwnProperty.call(rows[0], aliasPrefix + '0');
 
 		const outRows = new Array(rowsLength);
 		const createRow = newCreateRow(span);
@@ -11096,8 +11107,9 @@ function requireGetManyDto$1 () {
 			let outRow = createRow();
 			let pkWithNullCount = 0;
 			for (let j = 0; j < columnsLength; j++) {
+				const key = useAlias ? (aliasPrefix + j) : keys[j];
 				if (j < primaryColumnsLength) {
-					if (row[keys[j]] === null)
+					if (row[key] === null)
 						pkWithNullCount++;
 					if (pkWithNullCount === primaryColumnsLength) {
 						outRow = null;
@@ -11105,13 +11117,14 @@ function requireGetManyDto$1 () {
 					}
 				}
 				const column = columns[j];
-				outRow[column.alias] = column.decode(context, row[keys[j]]);
+				outRow[column.alias] = column.decode(context, row[key]);
 			}
 
 			for (let j = 0; j < aggregateKeys.length; j++) {
 				const key = aggregateKeys[j];
 				const parse = span.aggregates[key].column?.decode || ((context, arg) => Number.parseFloat(arg));
-				outRow[key] = parse(context, row[keys[j + columnsLength]]);
+				const value = useAlias ? row[key] : row[keys[j + columnsLength]];
+				outRow[key] = parse(context, value);
 			}
 
 			outRows[i] = outRow;
@@ -11125,7 +11138,8 @@ function requireGetManyDto$1 () {
 		span._rowsMap = rowsMap;
 		span._ids = fkIds;
 
-		keys.splice(0, columnsLength + aggregateKeys.length);
+		if (!useAlias)
+			keys.splice(0, columnsLength + aggregateKeys.length);
 		if (span.legs.toArray().length === 0)
 			return outRows;
 
@@ -20267,18 +20281,28 @@ function requireWrapQuery$1 () {
 		return runQuery;
 
 		function runQuery(query, onCompleted) {
-			if (!CachedRequest || !CachedTypes) {
-				import('tedious')
-					.then(({ Request, TYPES }) => {
-						CachedRequest = Request;
-						CachedTypes = TYPES;
-						doQuery(query, onCompleted);
-					})
-					.catch(err => onCompleted(extractError(err), []));
-			}
-			else {
-				doQuery(query, onCompleted);
-			}
+			enqueue(function(done) {
+				function safeCompleted(err, rows) {
+					try {
+						onCompleted(err, rows);
+					} finally {
+						done();
+					}
+				}
+
+				if (!CachedRequest || !CachedTypes) {
+					import('tedious')
+						.then(({ Request, TYPES }) => {
+							CachedRequest = Request;
+							CachedTypes = TYPES;
+							doQuery(query, safeCompleted);
+						})
+						.catch(err => safeCompleted(extractError(err), []));
+				}
+				else {
+					doQuery(query, safeCompleted);
+				}
+			});
 		}
 
 		function doQuery(query, onCompleted) {
@@ -20379,6 +20403,19 @@ function requireWrapQuery$1 () {
 				}
 			}
 		}
+
+		function enqueue(task) {
+			if (!connection.__orangeOrmQueue)
+				connection.__orangeOrmQueue = Promise.resolve();
+			connection.__orangeOrmQueue = connection.__orangeOrmQueue.then(() => new Promise((resolve) => {
+				try {
+					task(resolve);
+				}
+				catch (_e) {
+					resolve();
+				}
+			})).catch(() => {});
+		}
 	}
 
 	// Helper functions remain the same
@@ -20458,17 +20495,27 @@ function requireWrapCommand$1 () {
 		return runQuery;
 
 		function runQuery(query, onCompleted) {
-			if (!CachedRequest || !CachedTypes) {
-				import('tedious')
-					.then(({ Request, TYPES }) => {
-						CachedRequest = Request;
-						CachedTypes = TYPES;
-						doQuery(query, onCompleted);
-					})
-					.catch((err) => onCompleted(extractError(err), { rowsAffected: 0 }));
-			} else {
-				doQuery(query, onCompleted);
-			}
+			enqueue(function(done) {
+				function safeCompleted(err, result) {
+					try {
+						onCompleted(err, result);
+					} finally {
+						done();
+					}
+				}
+
+				if (!CachedRequest || !CachedTypes) {
+					import('tedious')
+						.then(({ Request, TYPES }) => {
+							CachedRequest = Request;
+							CachedTypes = TYPES;
+							doQuery(query, safeCompleted);
+						})
+						.catch((err) => safeCompleted(extractError(err), { rowsAffected: 0 }));
+				} else {
+					doQuery(query, safeCompleted);
+				}
+			});
 		}
 
 		function doQuery(query, onCompleted) {
@@ -20521,6 +20568,19 @@ function requireWrapCommand$1 () {
 				return onCompleted(null, { rowsAffected: affectedRows });
 			}
 		}
+
+		function enqueue(task) {
+			if (!connection.__orangeOrmQueue)
+				connection.__orangeOrmQueue = Promise.resolve();
+			connection.__orangeOrmQueue = connection.__orangeOrmQueue.then(() => new Promise((resolve) => {
+				try {
+					task(resolve);
+				}
+				catch (_e) {
+					resolve();
+				}
+			})).catch(() => {});
+		}
 	}
 
 	function extractError(e) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "orange-orm",
-    "version": "5.0.0-beta.7",
+    "version": "5.0.0-beta.9",
     "publishConfig": {
         "access": "public"
     },

package/src/getManyDto.js

@@ -13,6 +13,8 @@ async function getManyDto(context, table, filter, strategy, spanFromParent, upda
 	}
 
 	let span = spanFromParent || strategyToSpan(table, strategy);
+	if (!spanFromParent)
+		assignAliases(span, table._dbName);
 	let alias = table._dbName;
 
 	const query = newQuery(context, table, filter, span, alias);
@@ -20,6 +22,13 @@ async function getManyDto(context, table, filter, strategy, spanFromParent, upda
 	return decode(context, strategy, span, await res[0], undefined, updateParent);
 }
 
+function assignAliases(span, alias) {
+	span._alias = alias;
+	span.legs.forEach((leg) => {
+		assignAliases(leg.span, alias + leg.name);
+	});
+}
+
 function newCreateRow(span) {
 	let columnsMap = span.columns;
 	const columns = span.table._columns.filter(column => !columnsMap || columnsMap.get(column));
@@ -105,6 +114,8 @@ async function decode(context, strategy, span, rows, keys = rows.length > 0 ? Ob
 	const fkIds = new Array(rows.length);
 	const getIds = createGetIds();
 	const aggregateKeys = Object.keys(span.aggregates);
+	const aliasPrefix = span._alias ? 's' + span._alias : null;
+	const useAlias = aliasPrefix && rowsLength > 0 && Object.prototype.hasOwnProperty.call(rows[0], aliasPrefix + '0');
 
 	const outRows = new Array(rowsLength);
 	const createRow = newCreateRow(span);
@@ -114,8 +125,9 @@ async function decode(context, strategy, span, rows, keys = rows.length > 0 ? Ob
 		let outRow = createRow();
 		let pkWithNullCount = 0;
 		for (let j = 0; j < columnsLength; j++) {
+			const key = useAlias ? (aliasPrefix + j) : keys[j];
 			if (j < primaryColumnsLength) {
-				if (row[keys[j]] === null)
+				if (row[key] === null)
 					pkWithNullCount++;
 				if (pkWithNullCount === primaryColumnsLength) {
 					outRow = null;
@@ -123,13 +135,14 @@ async function decode(context, strategy, span, rows, keys = rows.length > 0 ? Ob
 				}
 			}
 			const column = columns[j];
-			outRow[column.alias] = column.decode(context, row[keys[j]]);
+			outRow[column.alias] = column.decode(context, row[key]);
 		}
 
 		for (let j = 0; j < aggregateKeys.length; j++) {
 			const key = aggregateKeys[j];
 			const parse = span.aggregates[key].column?.decode || ((context, arg) => Number.parseFloat(arg));
-			outRow[key] = parse(context, row[keys[j + columnsLength]]);
+			const value = useAlias ? row[key] : row[keys[j + columnsLength]];
+			outRow[key] = parse(context, value);
 		}
 
 		outRows[i] = outRow;
@@ -143,7 +156,8 @@ async function decode(context, strategy, span, rows, keys = rows.length > 0 ? Ob
 	span._rowsMap = rowsMap;
 	span._ids = fkIds;
 
-	keys.splice(0, columnsLength + aggregateKeys.length);
+	if (!useAlias)
+		keys.splice(0, columnsLength + aggregateKeys.length);
 	if (span.legs.toArray().length === 0)
 		return outRows;
 

package/src/tedious/wrapCommand.js

@@ -7,17 +7,27 @@ function wrapCommand(_context, connection) {
 	return runQuery;
 
 	function runQuery(query, onCompleted) {
-		if (!CachedRequest || !CachedTypes) {
-			import('tedious')
-				.then(({ Request, TYPES }) => {
-					CachedRequest = Request;
-					CachedTypes = TYPES;
-					doQuery(query, onCompleted);
-				})
-				.catch((err) => onCompleted(extractError(err), { rowsAffected: 0 }));
-		} else {
-			doQuery(query, onCompleted);
-		}
+		enqueue(function(done) {
+			function safeCompleted(err, result) {
+				try {
+					onCompleted(err, result);
+				} finally {
+					done();
+				}
+			}
+
+			if (!CachedRequest || !CachedTypes) {
+				import('tedious')
+					.then(({ Request, TYPES }) => {
+						CachedRequest = Request;
+						CachedTypes = TYPES;
+						doQuery(query, safeCompleted);
+					})
+					.catch((err) => safeCompleted(extractError(err), { rowsAffected: 0 }));
+			} else {
+				doQuery(query, safeCompleted);
+			}
+		});
 	}
 
 	function doQuery(query, onCompleted) {
@@ -70,6 +80,19 @@ function wrapCommand(_context, connection) {
 			return onCompleted(null, { rowsAffected: affectedRows });
 		}
 	}
+
+	function enqueue(task) {
+		if (!connection.__orangeOrmQueue)
+			connection.__orangeOrmQueue = Promise.resolve();
+		connection.__orangeOrmQueue = connection.__orangeOrmQueue.then(() => new Promise((resolve) => {
+			try {
+				task(resolve);
+			}
+			catch (_e) {
+				resolve();
+			}
+		})).catch(() => {});
+	}
 }
 
 function extractError(e) {

package/src/tedious/wrapQuery.js

@@ -7,18 +7,28 @@ function wrapQuery(_context, connection) {
 	return runQuery;
 
 	function runQuery(query, onCompleted) {
-		if (!CachedRequest || !CachedTypes) {
-			import('tedious')
-				.then(({ Request, TYPES }) => {
-					CachedRequest = Request;
-					CachedTypes = TYPES;
-					doQuery(query, onCompleted);
-				})
-				.catch(err => onCompleted(extractError(err), []));
-		}
-		else {
-			doQuery(query, onCompleted);
-		}
+		enqueue(function(done) {
+			function safeCompleted(err, rows) {
+				try {
+					onCompleted(err, rows);
+				} finally {
+					done();
+				}
+			}
+
+			if (!CachedRequest || !CachedTypes) {
+				import('tedious')
+					.then(({ Request, TYPES }) => {
+						CachedRequest = Request;
+						CachedTypes = TYPES;
+						doQuery(query, safeCompleted);
+					})
+					.catch(err => safeCompleted(extractError(err), []));
+			}
+			else {
+				doQuery(query, safeCompleted);
+			}
+		});
 	}
 
 	function doQuery(query, onCompleted) {
@@ -119,6 +129,19 @@ function wrapQuery(_context, connection) {
 			}
 		}
 	}
+
+	function enqueue(task) {
+		if (!connection.__orangeOrmQueue)
+			connection.__orangeOrmQueue = Promise.resolve();
+		connection.__orangeOrmQueue = connection.__orangeOrmQueue.then(() => new Promise((resolve) => {
+			try {
+				task(resolve);
+			}
+			catch (_e) {
+				resolve();
+			}
+		})).catch(() => {});
+	}
 }
 
 // Helper functions remain the same
@@ -179,4 +202,4 @@ function addParameters(request, params, TYPES) {
 	}
 }
 
-module.exports = wrapQuery;
+module.exports = wrapQuery;