orange-orm 5.3.1 → 5.3.3

package/dist/index.browser.mjs

@@ -2,7 +2,6 @@ void !function() {
 	typeof self === 'undefined' && typeof global === 'object'
 		? global.self = global : null;
 }();import * as fastJsonPatch from 'fast-json-patch';
-import * as uuid from 'uuid';
 import * as axios from 'axios';
 import * as _default from 'rfdc/default';
 import * as ajv from 'ajv';
@@ -973,7 +972,7 @@ function requireHostHono () {
 	return hostHono_1;
 }
 
-var require$$0$3 = /*@__PURE__*/getDefaultExportFromNamespaceIfPresent(fastJsonPatch);
+var require$$0$2 = /*@__PURE__*/getDefaultExportFromNamespaceIfPresent(fastJsonPatch);
 
 var dateToISOString_1;
 var hasRequiredDateToISOString;
@@ -1035,7 +1034,19 @@ function requireStringify () {
 	return stringify_1;
 }
 
-var require$$0$2 = /*@__PURE__*/getDefaultExportFromNamespaceIfPresent(uuid);
+var newMemoryId;
+var hasRequiredNewMemoryId;
+
+function requireNewMemoryId () {
+	if (hasRequiredNewMemoryId) return newMemoryId;
+	hasRequiredNewMemoryId = 1;
+	let nextId = 1;
+
+	newMemoryId = function newMemoryId() {
+		return `tmp${nextId++}`;
+	};
+	return newMemoryId;
+}
 
 var createPatch;
 var hasRequiredCreatePatch;
@@ -1043,10 +1054,10 @@ var hasRequiredCreatePatch;
 function requireCreatePatch () {
 	if (hasRequiredCreatePatch) return createPatch;
 	hasRequiredCreatePatch = 1;
-	const jsonpatch = require$$0$3;
+	const jsonpatch = require$$0$2;
 	let dateToIsoString = requireDateToISOString();
 	let stringify = requireStringify();
-	let { v4: uuid } = require$$0$2;
+	let newMemoryId = requireNewMemoryId();
 
 	createPatch = function createPatch(original, dto, options) {
 		let subject = toCompareObject({ d: original }, options, true);
@@ -1155,7 +1166,7 @@ function requireCreatePatch () {
 
 		function negotiateTempKey(value) {
 			if (value === undefined)
-				return `~${uuid()}`;
+				return `~${newMemoryId()}`;
 			else
 				return value;
 		}
@@ -2972,7 +2983,7 @@ function requireToKeyPositionMap () {
 	if (hasRequiredToKeyPositionMap) return toKeyPositionMap_1;
 	hasRequiredToKeyPositionMap = 1;
 	const stringify = requireStringify();
-	const { v4: uuid } = require$$0$2;
+	const newMemoryId = requireNewMemoryId();
 
 	function toKeyPositionMap(rows, options) {
 		return rows.reduce((map, element, i) => {
@@ -2995,7 +3006,7 @@ function requireToKeyPositionMap () {
 
 	function negotiateTempKey(value) {
 		if (value === undefined)
-			return `~${uuid()}`;
+			return `~${newMemoryId()}`;
 		else
 			return value;
 	}
@@ -11073,8 +11084,7 @@ var hasRequiredNewId;
 function requireNewId () {
 	if (hasRequiredNewId) return newId;
 	hasRequiredNewId = 1;
-	const { v4 : uuid} = require$$0$2;
-	newId = uuid;
+	newId = requireNewMemoryId();
 	return newId;
 }
 
@@ -11820,9 +11830,6 @@ function requireGetManyDto$1 () {
 
 	async function decodeManyRelations(context, strategy, span) {
 		const maxParameters = getSessionSingleton(context, 'maxParameters');
-		const maxRows = maxParameters
-			? maxParameters * span.table._primaryColumns.length
-			: undefined;
 
 		const promises = [];
 		const c = {};
@@ -11842,6 +11849,10 @@ function requireGetManyDto$1 () {
 			const name = leg.name;
 			const table = span.table;
 			const relation = table._relations[name];
+			const parametersPerRow = relation.joinRelation.columns.length;
+			const maxRows = maxParameters
+				? Math.max(1, Math.floor((maxParameters - 1) / parametersPerRow))
+				: undefined;
 			const rowsMap = span._rowsMap;
 
 			const extractKey = createExtractKey(leg);
@@ -12460,7 +12471,7 @@ var hasRequiredApplyPatch;
 function requireApplyPatch () {
 	if (hasRequiredApplyPatch) return applyPatch_1;
 	hasRequiredApplyPatch = 1;
-	const fastjson = require$$0$3;
+	const fastjson = require$$0$2;
 	let fromCompareObject = requireFromCompareObject();
 	let toCompareObject = requireToCompareObject();
 	let getSessionSingleton = requireGetSessionSingleton();

package/dist/index.mjs

@@ -2,7 +2,6 @@ void !function() {
 	typeof self === 'undefined' && typeof global === 'object'
 		? global.self = global : null;
 }();import * as fastJsonPatch from 'fast-json-patch';
-import * as uuid from 'uuid';
 import * as axios from 'axios';
 import * as _default from 'rfdc/default';
 import * as ajv from 'ajv';
@@ -974,7 +973,7 @@ function requireHostHono () {
 	return hostHono_1;
 }
 
-var require$$0$4 = /*@__PURE__*/getDefaultExportFromNamespaceIfPresent(fastJsonPatch);
+var require$$0$3 = /*@__PURE__*/getDefaultExportFromNamespaceIfPresent(fastJsonPatch);
 
 var dateToISOString_1;
 var hasRequiredDateToISOString;
@@ -1036,7 +1035,19 @@ function requireStringify () {
 	return stringify_1;
 }
 
-var require$$0$3 = /*@__PURE__*/getDefaultExportFromNamespaceIfPresent(uuid);
+var newMemoryId;
+var hasRequiredNewMemoryId;
+
+function requireNewMemoryId () {
+	if (hasRequiredNewMemoryId) return newMemoryId;
+	hasRequiredNewMemoryId = 1;
+	let nextId = 1;
+
+	newMemoryId = function newMemoryId() {
+		return `tmp${nextId++}`;
+	};
+	return newMemoryId;
+}
 
 var createPatch;
 var hasRequiredCreatePatch;
@@ -1044,10 +1055,10 @@ var hasRequiredCreatePatch;
 function requireCreatePatch () {
 	if (hasRequiredCreatePatch) return createPatch;
 	hasRequiredCreatePatch = 1;
-	const jsonpatch = require$$0$4;
+	const jsonpatch = require$$0$3;
 	let dateToIsoString = requireDateToISOString();
 	let stringify = requireStringify();
-	let { v4: uuid } = require$$0$3;
+	let newMemoryId = requireNewMemoryId();
 
 	createPatch = function createPatch(original, dto, options) {
 		let subject = toCompareObject({ d: original }, options, true);
@@ -1156,7 +1167,7 @@ function requireCreatePatch () {
 
 		function negotiateTempKey(value) {
 			if (value === undefined)
-				return `~${uuid()}`;
+				return `~${newMemoryId()}`;
 			else
 				return value;
 		}
@@ -2973,7 +2984,7 @@ function requireToKeyPositionMap () {
 	if (hasRequiredToKeyPositionMap) return toKeyPositionMap_1;
 	hasRequiredToKeyPositionMap = 1;
 	const stringify = requireStringify();
-	const { v4: uuid } = require$$0$3;
+	const newMemoryId = requireNewMemoryId();
 
 	function toKeyPositionMap(rows, options) {
 		return rows.reduce((map, element, i) => {
@@ -2996,7 +3007,7 @@ function requireToKeyPositionMap () {
 
 	function negotiateTempKey(value) {
 		if (value === undefined)
-			return `~${uuid()}`;
+			return `~${newMemoryId()}`;
 		else
 			return value;
 	}
@@ -11074,8 +11085,7 @@ var hasRequiredNewId;
 function requireNewId () {
 	if (hasRequiredNewId) return newId;
 	hasRequiredNewId = 1;
-	const { v4 : uuid} = require$$0$3;
-	newId = uuid;
+	newId = requireNewMemoryId();
 	return newId;
 }
 
@@ -11821,9 +11831,6 @@ function requireGetManyDto$1 () {
 
 	async function decodeManyRelations(context, strategy, span) {
 		const maxParameters = getSessionSingleton(context, 'maxParameters');
-		const maxRows = maxParameters
-			? maxParameters * span.table._primaryColumns.length
-			: undefined;
 
 		const promises = [];
 		const c = {};
@@ -11843,6 +11850,10 @@ function requireGetManyDto$1 () {
 			const name = leg.name;
 			const table = span.table;
 			const relation = table._relations[name];
+			const parametersPerRow = relation.joinRelation.columns.length;
+			const maxRows = maxParameters
+				? Math.max(1, Math.floor((maxParameters - 1) / parametersPerRow))
+				: undefined;
 			const rowsMap = span._rowsMap;
 
 			const extractKey = createExtractKey(leg);
@@ -12461,7 +12472,7 @@ var hasRequiredApplyPatch;
 function requireApplyPatch () {
 	if (hasRequiredApplyPatch) return applyPatch_1;
 	hasRequiredApplyPatch = 1;
-	const fastjson = require$$0$4;
+	const fastjson = require$$0$3;
 	let fromCompareObject = requireFromCompareObject();
 	let toCompareObject = requireToCompareObject();
 	let getSessionSingleton = requireGetSessionSingleton();
@@ -20905,7 +20916,7 @@ function requireNewTransaction$3 () {
 			rdb.pool = pool;
 		}
 		rdb.engine = 'mssqlNative';
-		rdb.maxParameters = 2100;
+		rdb.maxParameters = 2098;
 		rdb.encodeBoolean = encodeBoolean;
 		rdb.decodeJSON = decodeJSON;
 		rdb.encodeJSON = JSON.stringify;
@@ -21668,7 +21679,7 @@ function requireNewTransaction$2 () {
 			rdb.pool = pool;
 		}
 		rdb.engine = 'mssql';
-		rdb.maxParameters = 2100;
+		rdb.maxParameters = 2098;
 		rdb.encodeBoolean = encodeBoolean;
 		rdb.decodeJSON = decodeJSON;
 		rdb.encodeJSON = JSON.stringify;

package/docs/changelog.md

@@ -1,4 +1,9 @@
 ## Changelog
+__5.3.3__  
+MSSQL: Set `maxParameters` to `2098` because `tedious` adds extra parameters, so using `2100` can still exceed SQL Server's limit during `getMany`/`hasMany` loading.  
+__5.3.2__  
+Removed uuid dependency.  
+Upgraded to tedious@19.2.1 to reduce transitive audit vulnerabilities in the MSSQL driver chain.  
 __5.3.1__  
 Fixes crashes in getById/getMany when a missing relation has nested hasMany/hasOne/references in the strategy. [#177](https://github.com/alfateam/orange-orm/issues/177)  
 Added max parameter chunking for getManyDto hasMany subqueries on MSSQL, SQLite and Oracle.  

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "orange-orm",
-    "version": "5.3.1",
+    "version": "5.3.3",
     "publishConfig": {
         "access": "public"
     },
@@ -81,8 +81,7 @@
         "ajv": "^8.17.1",
         "axios": "^1.6.2",
         "fast-json-patch": "^3.1.1",
-        "rfdc": "^1.2.0",
-        "uuid": "^8.3.2 || ^9.0.0 || ^10.0.0 || ^11.1.0"
+        "rfdc": "^1.2.0"
     },
     "peerDependencies": {
         "@electric-sql/pglite": "^0.3.0",
@@ -92,7 +91,7 @@
         "oracledb": "^6.3.0",
         "pg": "^8.5.1",
         "pg-query-stream": "^3.3.2",
-        "tedious": "^15.1.2 || ^16.0.0 || ^18.1.0 || || ^19.0.0"
+        "tedious": "^15.1.2 || ^16.0.0 || ^18.1.0 || ^19.0.0"
     },
     "peerDependenciesMeta": {
         "pg": {
@@ -145,7 +144,7 @@
         "pg": "^8.5.1",
         "pg-query-stream": "^3.3.2",
         "rollup": "^2.52.7",
-        "tedious": "^19.0.0",
+        "tedious": "^19.2.1",
         "typescript": "^5.4.5",
         "vitest": "^3.2.4"
     },

package/src/client/createPatch.js

@@ -1,7 +1,7 @@
 const jsonpatch = require('fast-json-patch');
 let dateToIsoString = require('../dateToISOString');
 let stringify = require('./stringify');
-let { v4: uuid } = require('uuid');
+let newMemoryId = require('../newMemoryId');
 
 module.exports = function createPatch(original, dto, options) {
 	let subject = toCompareObject({ d: original }, options, true);
@@ -110,7 +110,7 @@ module.exports = function createPatch(original, dto, options) {
 
 	function negotiateTempKey(value) {
 		if (value === undefined)
-			return `~${uuid()}`;
+			return `~${newMemoryId()}`;
 		else
 			return value;
 	}

package/src/client/toKeyPositionMap.js

@@ -1,5 +1,5 @@
 const stringify = require('./stringify');
-const { v4: uuid } = require('uuid');
+const newMemoryId = require('../newMemoryId');
 
 function toKeyPositionMap(rows, options) {
 	return rows.reduce((map, element, i) => {
@@ -22,9 +22,9 @@ function toKeyPositionMap(rows, options) {
 
 function negotiateTempKey(value) {
 	if (value === undefined)
-		return `~${uuid()}`;
+		return `~${newMemoryId()}`;
 	else
 		return value;
 }
 
-module.exports = toKeyPositionMap;
+module.exports = toKeyPositionMap;

package/src/getManyDto.js

@@ -184,9 +184,6 @@ async function decode(context, strategy, span, rows, keys = rows.length > 0 ? Ob
 
 async function decodeManyRelations(context, strategy, span) {
 	const maxParameters = getSessionSingleton(context, 'maxParameters');
-	const maxRows = maxParameters
-		? maxParameters * span.table._primaryColumns.length
-		: undefined;
 
 	const promises = [];
 	const c = {};
@@ -206,6 +203,10 @@ async function decodeManyRelations(context, strategy, span) {
 		const name = leg.name;
 		const table = span.table;
 		const relation = table._relations[name];
+		const parametersPerRow = relation.joinRelation.columns.length;
+		const maxRows = maxParameters
+			? Math.max(1, Math.floor((maxParameters - 1) / parametersPerRow))
+			: undefined;
 		const rowsMap = span._rowsMap;
 
 		const extractKey = createExtractKey(leg);

package/src/mssql/newTransaction.js

@@ -19,7 +19,7 @@ function newResolveTransaction(domain, pool, { readonly = false } = {}) {
 		rdb.pool = pool;
 	}
 	rdb.engine = 'mssqlNative';
-	rdb.maxParameters = 2100;
+	rdb.maxParameters = 2098;
 	rdb.encodeBoolean = encodeBoolean;
 	rdb.decodeJSON = decodeJSON;
 	rdb.encodeJSON = JSON.stringify;

package/src/newId.js

@@ -1,2 +1 @@
-const { v4 : uuid} = require('uuid');
-module.exports = uuid;
+module.exports = require('./newMemoryId');

package/src/newMemoryId.js

@@ -0,0 +1,5 @@
+let nextId = 1;
+
+module.exports = function newMemoryId() {
+	return `tmp${nextId++}`;
+};

package/src/tedious/newTransaction.js

@@ -19,7 +19,7 @@ function newResolveTransaction(domain, pool, { readonly = false } = {}) {
 		rdb.pool = pool;
 	}
 	rdb.engine = 'mssql';
-	rdb.maxParameters = 2100;
+	rdb.maxParameters = 2098;
 	rdb.encodeBoolean = encodeBoolean;
 	rdb.decodeJSON = decodeJSON;
 	rdb.encodeJSON = JSON.stringify;