orange-orm 4.5.1-beta.3 → 4.5.2

package/README.md

@@ -2,7 +2,7 @@
 <img src="./docs/orange.svg" alt="Orange ORM Logo" width="250"/>
 </div>
 
-The ultimate Object Relational Mapper for Node.js and Typescript, offering seamless integration with a variety of popular databases. Whether you're building applications in TypeScript or JavaScript, including both CommonJS and ECMAScript, Orange ORM has got you covered.  
+The ultimate Object Relational Mapper for Node.js and Typescript, offering seamless integration with a variety of popular databases. Orange ORM supports both TypeScript and JavaScript, including both CommonJS and ECMAScript.  
 
 [![npm version](https://img.shields.io/npm/v/orange-orm.svg?style=flat-square)](https://www.npmjs.org/package/orange-orm)
 [![Build status](https://github.com/alfateam/orange-orm/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/alfateam/orange-orm/actions)
@@ -22,16 +22,16 @@ The ultimate Object Relational Mapper for Node.js and Typescript, offering seaml
 - **TypeScript and JavaScript Support**: Orange fully supports both TypeScript and JavaScript, allowing you to leverage the benefits of static typing and modern ECMAScript features.
 - **Works in the Browser**: You can securely use Orange in the browser by utilizing the Express.js plugin, which serves to safeguard sensitive database credentials from exposure at the client level and protect against SQL injection. This method mirrors a traditional REST API, augmented with advanced TypeScript tooling for enhanced functionality.
 
-## Supported Databases and Runtimes
-|               | Node | Deno | Bun |Cloudflare |
-| ------------- | :-----: | :-----: | :-----: | :-----: | 
-| Postgres      | ✅ | ✅ | ✅ | ✅
-| MS SQL        | ✅ |  | ✅ | 
-| MySQL         | ✅ | ✅ | ✅ | 
-| Oracle        | ✅ | ✅ | ✅ | 
-| SAP ASE       | ✅ |  |  | 
-| SQLite        | ✅ | ✅ | ✅ | 
-| Cloudflare D1 |  |  |  | ✅
+## Supported Databases
+
+✅ Postgres  
+✅ MS SQL  
+✅ MySQL  
+✅ Oracle  
+✅ SAP ASE  
+✅ SQLite  
+✅ Cloudflare D1
+
 
 This is the _Modern Typescript Documentation_. Are you looking for the [_Classic Documentation_](https://github.com/alfateam/orange-orm/blob/master/docs/docs.md) ?
 

package/docs/changelog.md

@@ -1,4 +1,8 @@
 ## Changelog
+__4.5.2__  
+Bugfix: Aggregate functions are not allowed on root tables .  See [#120](https://github.com/alfateam/orange-orm/issues/121)  
+__4.5.1__  
+Bugfix: "Changed by Other User" Error Triggered by Precision Mismatch in Numeric Column.  See [#120](https://github.com/alfateam/orange-orm/issues/120)  
 __4.5.0__  
 Support for Cloudflare D1.  
 __4.4.2__  
@@ -26,6 +30,8 @@ __4.0.1__
 Inhouse definitions of ajv to avoid trouble with nestjs.  
 __4.0.0__  
 Changed the behaviour of `update` to accept a `where` filter and only update passed in columns and relations. The previous behaviour of `update` has moved to `replace` method.  
+__3.10.4__  
+Bugfix: "Changed by Other User" Error Triggered by Precision Mismatch in Numeric Column.  See [#120](https://github.com/alfateam/orange-orm/issues/120)  
 __3.10.3__  
 Fix duplicate method signatures for those still using code generation  
 __3.10.2__  

package/package.json

@@ -1,16 +1,8 @@
 {
   "name": "orange-orm",
-  "version": "4.5.1-beta.3",
+  "version": "4.5.2",
   "main": "./src/index.js",
-  "module": "./dist/index.mjs",
-  "browser": "./dist/index.browser.mjs",
-  "exports": {
-    ".": {
-      "require": "./src/index.js",
-      "import": "./dist/index.mjs",
-      "browser": "./dist/index.browser.mjs"
-    }
-  },
+  "browser": "./src/client/index.mjs",
   "bin": {
     "orange-orm": "bin/rdb.js"
   },
@@ -51,11 +43,8 @@
     "coverage": "vitest run --coverage.enabled --coverage.reporter='text-summary' --threads=false",
     "testw": "vitest --threads=false update",
     "tscheck": "tsc ./src/index.d.ts --module commonjs --target es2022 --noEmit true --strict true --esModuleInterop true",
-    "concat-server": "node ./src/merge-server.js",
-    "concat-browser": "node ./src/merge-browser.js",
-    "build": "npm run build-server && npm run build-browser",
-    "build-server": "rollup -c ./src/rollup.config.server.js && npm run concat-server",
-    "build-browser": "rollup -c ./src/rollup.config.browser.js && npm run concat-browser",
+    "concat": "node ./src/client/merge.js",
+    "build": "rollup -c ./src/client/rollup.config.js && npm run concat",
     "lint": "eslint ./",
     "fix": "eslint ./ --fix",
     "owasp": "owasp-dependency-check --project \"MY_PROJECT\" --scan \"package-lock.json\" --exclude \"dependency-check-bin\" --out \"owasp\" --format HTML",

package/{dist/index.browser.mjs → src/client/index.mjs}

@@ -1758,7 +1758,7 @@ var hasRequiredSetSessionSingleton;
 function requireSetSessionSingleton () {
 	if (hasRequiredSetSessionSingleton) return setSessionSingleton_1;
 	hasRequiredSetSessionSingleton = 1;
-	var getSessionContext = requireGetSessionContext();
+	const getSessionContext = requireGetSessionContext();
 
 	function setSessionSingleton(context, name, value) {
 		const rdb = getSessionContext(context);
@@ -3951,6 +3951,178 @@ function requireExtractAlias () {
 	return extractAlias;
 }
 
+var columnAggregate_1$1;
+var hasRequiredColumnAggregate$1;
+
+function requireColumnAggregate$1 () {
+	if (hasRequiredColumnAggregate$1) return columnAggregate_1$1;
+	hasRequiredColumnAggregate$1 = 1;
+	const getSessionSingleton = requireGetSessionSingleton();
+
+	function columnAggregate(context, operator, column, table, coalesce = true) {
+		const quote = getSessionSingleton(context, 'quote');
+
+		const tableAlias = quote(table._rootAlias || table._dbName);
+		const columnName = quote(column._dbName);
+
+		return {
+			expression: (alias) => coalesce ? `COALESCE(${operator}(${tableAlias}.${columnName}), 0) as ${quote(alias)}` : `${operator}(${tableAlias}.${columnName}) as ${quote(alias)}`,
+			joins: ['']
+		};
+	}
+
+	columnAggregate_1$1 = columnAggregate;
+	return columnAggregate_1$1;
+}
+
+var newDiscriminatorSql_1$1;
+var hasRequiredNewDiscriminatorSql$1;
+
+function requireNewDiscriminatorSql$1 () {
+	if (hasRequiredNewDiscriminatorSql$1) return newDiscriminatorSql_1$1;
+	hasRequiredNewDiscriminatorSql$1 = 1;
+	const getSessionSingleton = requireGetSessionSingleton();
+
+	function newDiscriminatorSql(context, table, alias) {
+		const quote = getSessionSingleton(context, 'quote');
+		alias = quote(alias);
+		var result = '';
+		var formulaDiscriminators = table._formulaDiscriminators;
+		var columnDiscriminators = table._columnDiscriminators;
+		addFormula();
+		addColumn();
+		return result;
+
+		function addFormula() {
+			for (var i = 0; i<formulaDiscriminators.length; i++) {
+				var current = formulaDiscriminators[i].replace('@this',alias);
+				and();
+				result += '(' + current + ')';
+			}
+		}
+
+		function addColumn() {
+			for (var i = 0; i< columnDiscriminators.length; i++) {
+				var current = columnDiscriminators[i].split('=');
+				and();
+				result += alias + '.' + quote(current[0]) + '=' + current[1];
+			}
+		}
+
+		function and() {
+			if(result)
+				result += ' AND ';
+			else
+				result = ' ';
+		}
+	}
+
+	newDiscriminatorSql_1$1 = newDiscriminatorSql;
+	return newDiscriminatorSql_1$1;
+}
+
+var newDiscriminatorSql_1;
+var hasRequiredNewDiscriminatorSql;
+
+function requireNewDiscriminatorSql () {
+	if (hasRequiredNewDiscriminatorSql) return newDiscriminatorSql_1;
+	hasRequiredNewDiscriminatorSql = 1;
+	var newDiscriminatorSqlCore = requireNewDiscriminatorSql$1();
+
+	function newDiscriminatorSql(context, table, alias) {
+		var result = newDiscriminatorSqlCore(context,table,alias);
+		if (result)
+			return ' AND' + result;
+		return result;
+
+	}
+
+	newDiscriminatorSql_1 = newDiscriminatorSql;
+	return newDiscriminatorSql_1;
+}
+
+var newShallowJoinSqlCore;
+var hasRequiredNewShallowJoinSqlCore;
+
+function requireNewShallowJoinSqlCore () {
+	if (hasRequiredNewShallowJoinSqlCore) return newShallowJoinSqlCore;
+	hasRequiredNewShallowJoinSqlCore = 1;
+	const newDiscriminatorSql = requireNewDiscriminatorSql();
+	const newParameterized = requireNewParameterized();
+	const getSessionSingleton = requireGetSessionSingleton();
+
+	function _new(context, rightTable, leftColumns, rightColumns, leftAlias, rightAlias, filter) {
+		const quote = getSessionSingleton(context, 'quote');
+		leftAlias = quote(leftAlias);
+		rightAlias = quote(rightAlias);
+		var sql = '';
+		var delimiter = '';
+		for (var i = 0; i < leftColumns.length; i++) {
+			addColumn(i);
+			delimiter = ' AND ';
+		}
+
+		function addColumn(index) {
+			var leftColumn = leftColumns[index];
+			var rightColumn = rightColumns[index];
+			sql += delimiter + leftAlias + '.' + quote(leftColumn._dbName) + '=' + rightAlias + '.' + quote(rightColumn._dbName);
+		}
+
+		sql += newDiscriminatorSql(context, rightTable, rightAlias);
+		var result = newParameterized(sql);
+		if (filter)
+			result = result.append(delimiter).append(filter);
+		return result;
+	}
+
+	newShallowJoinSqlCore = _new;
+	return newShallowJoinSqlCore;
+}
+
+var columnAggregateGroup$1;
+var hasRequiredColumnAggregateGroup$1;
+
+function requireColumnAggregateGroup$1 () {
+	if (hasRequiredColumnAggregateGroup$1) return columnAggregateGroup$1;
+	hasRequiredColumnAggregateGroup$1 = 1;
+	var getSessionContext = requireGetSessionContext();
+	var newJoinCore = requireNewShallowJoinSqlCore();
+	const getSessionSingleton = requireGetSessionSingleton();
+
+	function columnAggregate(context, operator, column, table, coalesce = true) {
+		const quote = getSessionSingleton(context, 'quote');
+		const rdb = getSessionContext(context);
+		const outerAlias = 'y' + rdb.aggregateCount++;
+		const outerAliasQuoted = quote(outerAlias);
+		const alias = quote('x');
+		const foreignKeys = getForeignKeys(table);
+		const select = ` LEFT JOIN (SELECT ${foreignKeys},${operator}(${alias}.${quote(column._dbName)}) as amount`;
+		const onClause = createOnClause(context, table, outerAlias);
+		const from = ` FROM ${quote(table._dbName)} ${alias} GROUP BY ${foreignKeys}) ${outerAliasQuoted} ON (${onClause})`;
+		const join = select + from;
+
+		return {
+			expression: (alias) => coalesce ? `COALESCE(${outerAliasQuoted}.amount, 0) as ${quote(alias)}` : `${outerAliasQuoted}.amount as ${alias}`,
+			joins: [join]
+		};
+
+		function getForeignKeys(table) {
+			return table._primaryColumns.map(x => `${alias}.${quote(x._dbName)}`).join(',');
+		}
+	}
+
+	function createOnClause(context, table, rightAlias) {
+		let leftAlias = table._rootAlias || table._dbName;
+		const columns = table._primaryColumns;
+		return newJoinCore(context, table, columns, columns, leftAlias, rightAlias).sql();
+	}
+
+
+
+	columnAggregateGroup$1 = columnAggregate;
+	return columnAggregateGroup$1;
+}
+
 var newColumn;
 var hasRequiredNewColumn;
 
@@ -3966,6 +4138,8 @@ function requireNewColumn () {
 	const _in = require_in();
 	const _extractAlias = requireExtractAlias();
 	const quote = requireQuote$1();
+	const aggregate = requireColumnAggregate$1();
+	const aggregateGroup = requireColumnAggregateGroup$1();
 
 	newColumn = function(table, name) {
 		var c = {};
@@ -4035,6 +4209,17 @@ function requireNewColumn () {
 		c.IN = c.in;
 		c.self = self;
 
+		c.groupSum = (context, ...rest) => aggregateGroup.apply(null, [context, 'sum', c, table, ...rest]);
+		c.groupAvg = (context, ...rest) => aggregateGroup.apply(null, [context, 'avg', c, table, ...rest]);
+		c.groupMin = (context, ...rest) => aggregateGroup.apply(null, [context, 'min', c, table, ...rest]);
+		c.groupMax = (context, ...rest) => aggregateGroup.apply(null, [context, 'max', c, table, ...rest]);
+		c.groupCount = (context, ...rest) => aggregateGroup.apply(null, [context, 'count', c, table, false, ...rest]);
+		c.sum = (context, ...rest) => aggregate.apply(null, [context, 'sum', c, table, ...rest]);
+		c.avg = (context, ...rest) => aggregate.apply(null, [context, 'avg', c, table, ...rest]);
+		c.min = (context, ...rest) => aggregate.apply(null, [context, 'min', c, table, ...rest]);
+		c.max = (context, ...rest) => aggregate.apply(null, [context, 'max', c, table, ...rest]);
+		c.count = (context, ...rest) => aggregate.apply(null, [context, 'count', c, table, false, ...rest]);
+
 		function self(context) {
 			const tableAlias = quote(context,table._rootAlias || table._dbName);
 			const columnName = quote(context, c._dbName);
@@ -5137,39 +5322,29 @@ function requireNewEncode () {
 	hasRequiredNewEncode = 1;
 	var purify = requirePurify();
 	var newParam = requireNewParameterized();
-	var getSessionSingleton = requireGetSessionSingleton();
 
 	function _new(_column) {
 
-		function encode(context, value) {
+		function encode(_context, value) {
 			value = purify(value);
 			if (value === null)
 				return newParam('null');
-
-			var encodeCore = getSessionSingleton(context, 'encodeBinary') || encodeDefault;
-			const enc = encodeCore(value);
-			return newParam('?', [enc]);
+			return newParam('?', [Buffer.from(value, 'base64')]);
 		}
-		encode.unsafe = function(context, value) {
+		encode.unsafe = function(_context, value) {
 			value = purify(value);
 			if (value === null)
 				return 'null';
-			var encodeCore = getSessionSingleton(context, 'encodeBinary') || encodeDefault;
-			return encodeCore(value);
+			return Buffer.from(value, 'base64');
 		};
 
-		encode.direct = function(context, value) {
-			var encodeCore = getSessionSingleton(context, 'encodeBinary') || encodeDefault;
-			return encodeCore(value);
+		encode.direct = function(_context, value) {
+			return Buffer.from(value, 'base64');
 		};
 
 		return encode;
 	}
 
-	function encodeDefault(base64) {
-		return Buffer.from(base64, 'base64');
-	}
-
 	newEncode = _new;
 	return newEncode;
 }
@@ -5181,30 +5356,19 @@ function requireNewDecode () {
 	if (hasRequiredNewDecode) return newDecode;
 	hasRequiredNewDecode = 1;
 	var newDecodeCore = requireNewDecodeCore();
-	var getSessionSingleton = requireGetSessionSingleton();
 
 	function _new(column) {
 		var decodeCore = newDecodeCore(column);
 
 		return function(context, value) {
-
-			var toBase64  = getSessionSingleton(context, 'decodeBinary') || toBase64Default;
-
 			value = decodeCore(context, value);
 			if (value === null)
 				return value;
-			else {
-				const ret = toBase64(value);
-				return ret;
-			}
+			else
+				return value.toString('base64');
 		};
 	}
 
-	function toBase64Default(buffer) {
-		return buffer.toString('base64');
-
-	}
-
 	newDecode = _new;
 	return newDecode;
 }
@@ -5691,110 +5855,6 @@ function requireNewColumnSql () {
 	return newColumnSql;
 }
 
-var newDiscriminatorSql_1$1;
-var hasRequiredNewDiscriminatorSql$1;
-
-function requireNewDiscriminatorSql$1 () {
-	if (hasRequiredNewDiscriminatorSql$1) return newDiscriminatorSql_1$1;
-	hasRequiredNewDiscriminatorSql$1 = 1;
-	const getSessionSingleton = requireGetSessionSingleton();
-
-	function newDiscriminatorSql(context, table, alias) {
-		const quote = getSessionSingleton(context, 'quote');
-		alias = quote(alias);
-		var result = '';
-		var formulaDiscriminators = table._formulaDiscriminators;
-		var columnDiscriminators = table._columnDiscriminators;
-		addFormula();
-		addColumn();
-		return result;
-
-		function addFormula() {
-			for (var i = 0; i<formulaDiscriminators.length; i++) {
-				var current = formulaDiscriminators[i].replace('@this',alias);
-				and();
-				result += '(' + current + ')';
-			}
-		}
-
-		function addColumn() {
-			for (var i = 0; i< columnDiscriminators.length; i++) {
-				var current = columnDiscriminators[i].split('=');
-				and();
-				result += alias + '.' + quote(current[0]) + '=' + current[1];
-			}
-		}
-
-		function and() {
-			if(result)
-				result += ' AND ';
-			else
-				result = ' ';
-		}
-	}
-
-	newDiscriminatorSql_1$1 = newDiscriminatorSql;
-	return newDiscriminatorSql_1$1;
-}
-
-var newDiscriminatorSql_1;
-var hasRequiredNewDiscriminatorSql;
-
-function requireNewDiscriminatorSql () {
-	if (hasRequiredNewDiscriminatorSql) return newDiscriminatorSql_1;
-	hasRequiredNewDiscriminatorSql = 1;
-	var newDiscriminatorSqlCore = requireNewDiscriminatorSql$1();
-
-	function newDiscriminatorSql(context, table, alias) {
-		var result = newDiscriminatorSqlCore(context,table,alias);
-		if (result)
-			return ' AND' + result;
-		return result;
-
-	}
-
-	newDiscriminatorSql_1 = newDiscriminatorSql;
-	return newDiscriminatorSql_1;
-}
-
-var newShallowJoinSqlCore;
-var hasRequiredNewShallowJoinSqlCore;
-
-function requireNewShallowJoinSqlCore () {
-	if (hasRequiredNewShallowJoinSqlCore) return newShallowJoinSqlCore;
-	hasRequiredNewShallowJoinSqlCore = 1;
-	const newDiscriminatorSql = requireNewDiscriminatorSql();
-	const newParameterized = requireNewParameterized();
-	const getSessionSingleton = requireGetSessionSingleton();
-
-	function _new(context, rightTable, leftColumns, rightColumns, leftAlias, rightAlias, filter) {
-		const quote = getSessionSingleton(context, 'quote');
-		leftAlias = quote(leftAlias);
-		rightAlias = quote(rightAlias);
-		var sql = '';
-		var delimiter = '';
-		for (var i = 0; i < leftColumns.length; i++) {
-			addColumn(i);
-			delimiter = ' AND ';
-		}
-
-		function addColumn(index) {
-			var leftColumn = leftColumns[index];
-			var rightColumn = rightColumns[index];
-			sql += delimiter + leftAlias + '.' + quote(leftColumn._dbName) + '=' + rightAlias + '.' + quote(rightColumn._dbName);
-		}
-
-		sql += newDiscriminatorSql(context, rightTable, rightAlias);
-		var result = newParameterized(sql);
-		if (filter)
-			result = result.append(delimiter).append(filter);
-		return result;
-	}
-
-	newShallowJoinSqlCore = _new;
-	return newShallowJoinSqlCore;
-}
-
 var newShallowJoinSql;
 var hasRequiredNewShallowJoinSql;
 
@@ -7393,6 +7453,22 @@ function requireValidateDeleteAllowed () {
 	return validateDeleteAllowed_1;
 }
 
+var clearCache_1;
+var hasRequiredClearCache;
+
+function requireClearCache () {
+	if (hasRequiredClearCache) return clearCache_1;
+	hasRequiredClearCache = 1;
+	var setSessionSingleton = requireSetSessionSingleton();
+
+	function clearCache(context) {
+		setSessionSingleton(context, 'cache', {});
+	}
+
+	clearCache_1 = clearCache;
+	return clearCache_1;
+}
+
 /* eslint-disable require-atomic-updates */
 
 var patchTable_1;
@@ -7405,13 +7481,16 @@ function requirePatchTable () {
 	let fromCompareObject = requireFromCompareObject();
 	let validateDeleteConflict = requireValidateDeleteConflict();
 	let validateDeleteAllowed = requireValidateDeleteAllowed();
+	let clearCache = requireClearCache();
 
 	async function patchTable() {
 		// const dryrun = true;
 		//traverse all rows you want to update before updatinng or inserting anything.
 		//this is to avoid page locks in ms sql
 		// await patchTableCore.apply(null, [...arguments, dryrun]);
-		return patchTableCore.apply(null, arguments);
+		const result = await  patchTableCore.apply(null, arguments);
+		clearCache(arguments[0]);
+		return result;
 	}
 
 	async function patchTableCore(context, table, patches, { strategy = undefined, deduceStrategy = false, ...options } = {}, dryrun) {
@@ -8014,7 +8093,7 @@ function requireNewDecodeDbRow () {
 			for (let i = 0; i < numberOfColumns; i++) {
 				let index = offset + i;
 				let key = keys[index];
-				if (row[key] !== undefined && !isInsert)
+				if (row[key] !== undefined)
 					row[key] = columns[i].decode(context, row[key]);
 				if (shouldValidate && columns[i].validate)
 					columns[i].validate(row[key], row, isInsert);
@@ -9195,7 +9274,7 @@ function requireColumnAggregate () {
 		const columnName = quote(column._dbName);
 
 		return {
-			expression: (alias) => coalesce ? `COALESCE(${operator}(${tableAlias}.${columnName}), 0) as ${quote(alias)}` : `${operator}(${tableAlias}.${columnName}) as ${alias}`,
+			expression: (alias) => coalesce ? `COALESCE(${operator}(${tableAlias}.${columnName}), 0) as ${quote(alias)}` : `${operator}(${tableAlias}.${columnName}) as ${quote(alias)}`,
 
 			joins: newJoinArray(context, relations)
 		};
@@ -10074,6 +10153,40 @@ function requireNewId () {
 	return newId;
 }
 
+var getSessionCache_1;
+var hasRequiredGetSessionCache;
+
+function requireGetSessionCache () {
+	if (hasRequiredGetSessionCache) return getSessionCache_1;
+	hasRequiredGetSessionCache = 1;
+	const getSessionSingleton = requireGetSessionSingleton();
+
+	function getSessionCache(context, id) {
+		const cache = getSessionSingleton(context, 'cache');
+		return cache[id];
+	}
+
+	getSessionCache_1 = getSessionCache;
+	return getSessionCache_1;
+}
+
+var setSessionCache_1;
+var hasRequiredSetSessionCache;
+
+function requireSetSessionCache () {
+	if (hasRequiredSetSessionCache) return setSessionCache_1;
+	hasRequiredSetSessionCache = 1;
+	const getSessionSingleton = requireGetSessionSingleton();
+
+	function setSessionCache(context, id, value) {
+		const cache = getSessionSingleton(context, 'cache');
+		cache[id] = value;
+	}
+
+	setSessionCache_1 = setSessionCache;
+	return setSessionCache_1;
+}
+
 var newManyCache_1;
 var hasRequiredNewManyCache;
 
@@ -10086,8 +10199,8 @@ function requireNewManyCache () {
 	var extractParentKey = requireExtractParentKey();
 	var newCacheCore = requireNewManyCacheCore();
 	var newId = requireNewId();
-	var getSessionSingleton = requireGetSessionSingleton();
-	var setSessionSingleton = requireSetSessionSingleton();
+	var getSessionCache = requireGetSessionCache();
+	var setSessionCache = requireSetSessionCache();
 
 	function newManyCache(joinRelation) {
 		var c = {};
@@ -10108,10 +10221,10 @@ function requireNewManyCache () {
 
 		c.getInnerCache = function(context) {
 			const theKey = negotiateKey();
-			var cache = getSessionSingleton(context, theKey);
+			var cache = getSessionCache(context, theKey);
 			if (!cache) {
 				cache = newCacheCore(joinRelation);
-				setSessionSingleton(context, theKey, cache);
+				setSessionCache(context, theKey, cache);
 				fillCache(context);
 				synchronizeAdded(context, c.tryAdd.bind(null, context), joinRelation);
 				synchronizeRemoved(context, c.tryRemove.bind(null, context), joinRelation);
@@ -11061,8 +11174,8 @@ function requireNewRowCache () {
 	if (hasRequiredNewRowCache) return newRowCache_1;
 	hasRequiredNewRowCache = 1;
 	let newCache = requireNewCache();
-	let getSessionSingleton = requireGetSessionSingleton();
-	let setSessionSingleton = requireSetSessionSingleton();
+	let getSessionCache = requireGetSessionCache();
+	let setSessionCache = requireSetSessionCache();
 
 	function newRowCache(table) {
 		let id = Symbol();
@@ -11100,11 +11213,11 @@ function requireNewRowCache () {
 
 
 	function getCache(context, table, id) {
-		let cache = getSessionSingleton(context, id);
+		let cache = getSessionCache(context, id);
 		if (cache)
 			return cache;
 		cache = _newRowCache(table);
-		setSessionSingleton(context, id, cache);
+		setSessionCache(context, id, cache);
 		return cache;
 	}
 
@@ -12965,6 +13078,7 @@ function requireNewTransaction () {
 		};
 		rdb.aggregateCount = 0;
 		rdb.quote = (name) => `"${name}"`;
+		rdb.cache = {};
 
 		if (readonly) {
 			rdb.dbClient = {

package/src/client/merge.js

@@ -0,0 +1,9 @@
+const fs = require('fs').promises;
+
+async function merge() {
+	let data1 = await fs.readFile('./src/client/self.js', 'utf8');
+	let data2 = await fs.readFile('./src/client/index.mjs', 'utf8');
+	await fs.writeFile('./src/client/index.mjs', data1 + data2);
+}
+
+merge();

package/src/{rollup.config.browser.js → client/rollup.config.js}

@@ -5,7 +5,7 @@ import nodeResolve from '@rollup/plugin-node-resolve';
 export default {
 	input: './src/indexBrowser.js',
 	output: {
-		file: './dist/index.browser.mjs',
+		file: './src/client/index.mjs',
 		format: 'esm',
 		interop: 'auto'
 	},

package/src/d1/newTransaction.js

@@ -31,6 +31,7 @@ function newResolveTransaction(domain, pool, { readonly = false } = {})  {
 	};
 	rdb.aggregateCount = 0;
 	rdb.quote = (name) => `"${name}"`;
+	rdb.cache = {};
 
 	if (readonly) {
 		rdb.dbClient = {