orange-orm 4.5.4 → 4.6.0-beta.1

package/README.md

@@ -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
-
-✅ Postgres  
-✅ MS SQL  
-✅ MySQL  
-✅ Oracle  
-✅ SAP ASE  
-✅ SQLite  
-✅ Cloudflare D1
-
+## Supported Databases and Runtimes
+|               | Node | Deno | Bun |Cloudflare |
+| ------------- | :-----: | :-----: | :-----: | :-----: | 
+| 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) ?
 
@@ -49,10 +49,6 @@ Watch the [tutorial video on YouTube](https://youtu.be/1IwwjPr2lMs)
 
 ![Relations diagram](./docs/diagram.svg)  
 
-Here we choose SQLite.  
-```bash
-npm install sqlite3
-```
 <sub>📄 map.ts</sub>
 ```javascript
 import orange from 'orange-orm';
@@ -279,10 +275,15 @@ In SQLite, columns with the INTEGER PRIMARY KEY attribute are designed to autoin
 
 <details><summary><strong>Connecting</strong></summary>
 
-__SQLite__
+__SQLite__  
+
+**Node.js 21 and earlier**
 ```bash
 npm install sqlite3
 ```  
+__Node.js 22+, Bun, or Deno__  
+When running Node.js 22 and later, Bun, or Deno, you can use the builtin SQLite dependency and don't need to install sqlite3.
+
 ```javascript
 import map from './map';
 const db = map.sqlite('demo.db');
@@ -353,7 +354,8 @@ const db = map.mssql({
         });
 ```
 
-__PostgreSQL__
+__PostgreSQL__  
+With Bun, you don't need to install the 'pg' package as PostgreSQL support is built-in.
 ```bash
 npm install pg
 ```  

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

@@ -5322,29 +5322,39 @@ 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');
-			return newParam('?', [Buffer.from(value, 'base64')]);
+
+			var encodeCore = getSessionSingleton(context, 'encodeBinary') || encodeDefault;
+			const enc = encodeCore(value);
+			return newParam('?', [enc]);
 		}
-		encode.unsafe = function(_context, value) {
+		encode.unsafe = function(context, value) {
 			value = purify(value);
 			if (value === null)
 				return 'null';
-			return Buffer.from(value, 'base64');
+			var encodeCore = getSessionSingleton(context, 'encodeBinary') || encodeDefault;
+			return encodeCore(value);
 		};
 
-		encode.direct = function(_context, value) {
-			return Buffer.from(value, 'base64');
+		encode.direct = function(context, value) {
+			var encodeCore = getSessionSingleton(context, 'encodeBinary') || encodeDefault;
+			return encodeCore(value);
 		};
 
 		return encode;
 	}
 
+	function encodeDefault(base64) {
+		return Buffer.from(base64, 'base64');
+	}
+
 	newEncode = _new;
 	return newEncode;
 }
@@ -5356,19 +5366,30 @@ 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
-				return value.toString('base64');
+			else {
+				const ret = toBase64(value);
+				return ret;
+			}
 		};
 	}
 
+	function toBase64Default(buffer) {
+		return buffer.toString('base64');
+
+	}
+
 	newDecode = _new;
 	return newDecode;
 }
@@ -8093,7 +8114,7 @@ function requireNewDecodeDbRow () {
 			for (let i = 0; i < numberOfColumns; i++) {
 				let index = offset + i;
 				let key = keys[index];
-				if (row[key] !== undefined)
+				if (row[key] !== undefined && !isInsert)
 					row[key] = columns[i].decode(context, row[key]);
 				if (shouldValidate && columns[i].validate)
 					columns[i].validate(row[key], row, isInsert);
@@ -12495,7 +12516,7 @@ function requireWrapQuery () {
 	hasRequiredWrapQuery = 1;
 	var log = requireLog();
 
-	function wrapQuery(client) {
+	function wrapQuery(_context, client) {
 
 		return runQuery;
 
@@ -13088,7 +13109,7 @@ function requireNewTransaction () {
 							return callback(err);
 						}
 						try {
-							wrapQuery(client)(query, (err, res) => {
+							wrapQuery(domain, client)(query, (err, res) => {
 								done();
 								callback(err, res);
 							});
@@ -13112,7 +13133,7 @@ function requireNewTransaction () {
 						onError(err);
 						return;
 					}
-					client.executeQuery = wrapQuery(client);
+					client.executeQuery = wrapQuery(domain, client);
 					rdb.dbClient = client;
 					rdb.dbClientDone = done;
 					domain.rdb = rdb;