orange-orm 4.5.0 → 4.5.1-beta.1

package/package.json

@@ -1,8 +1,16 @@
 {
   "name": "orange-orm",
-  "version": "4.5.0",
+  "version": "4.5.1-beta.1",
   "main": "./src/index.js",
-  "browser": "./src/client/index.mjs",
+  "module": "./dist/index.mjs",
+  "browser": "./dist/index.browser.mjs",
+  "exports": {
+    ".": {
+      "require": "./src/index.js",
+      "import": "./dist/index.mjs",
+      "browser": "./dist/index.browser.mjs"
+    }
+  },
   "bin": {
     "orange-orm": "bin/rdb.js"
   },
@@ -43,8 +51,10 @@
     "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": "node ./src/client/merge.js",
-    "build": "rollup -c ./src/client/rollup.config.js && npm run concat",
+    "concat-server": "node ./src/merge-server.js",
+    "concat-browser": "node ./src/merge-browser.js",
+    "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",
     "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/src/bunPg/newDatabase.js

@@ -0,0 +1,137 @@
+let createDomain = require('../createDomain');
+let newTransaction = require('../pg/newTransaction');
+let _begin = require('../table/begin');
+let commit = require('../table/commit');
+let rollback = require('../table/rollback');
+let newPool = require('./newPool');
+let lock = require('../lock');
+let executeSchema = require('../pg/schema');
+let express = require('../hostExpress');
+let hostLocal = require('../hostLocal');
+let doQuery = require('../query');
+let releaseDbClient = require('../table/releaseDbClient');
+let setSessionSingleton = require('../table/setSessionSingleton');
+
+function newDatabase(connectionString, poolOptions) {
+	if (!connectionString)
+		throw new Error('Connection string cannot be empty');
+	var pool;
+	if (!poolOptions)
+		pool = newPool.bind(null, connectionString, poolOptions);
+	else
+		pool = newPool(connectionString, poolOptions);
+
+	let c = { poolFactory: pool, hostLocal, express };
+
+	c.transaction = function(options, fn) {
+		if ((arguments.length === 1) && (typeof options === 'function')) {
+			fn = options;
+			options = undefined;
+		}
+		let domain = createDomain();
+
+		if (fn)
+			return domain.run(runInTransaction);
+		else
+			return domain.run(run);
+
+		async function runInTransaction() {
+			let result;
+			let transaction = newTransaction(domain, pool, options);
+			await new Promise(transaction)
+				.then(begin)
+				.then(negotiateSchema)
+				.then(() => fn(domain))
+				.then((res) => result = res)
+				.then(() => commit(domain))
+				.then(null, (e) => rollback(domain,e));
+			return result;
+		}
+
+		function begin() {
+			return _begin(domain, options);
+		}
+
+		function run() {
+			let p;
+			let transaction = newTransaction(domain, pool, options);
+			p = new Promise(transaction);
+
+			return p.then(begin)
+				.then(negotiateSchema);
+		}
+
+		function negotiateSchema(previous) {
+			let schema = options && options.schema;
+			if (!schema)
+				return previous;
+			return executeSchema(domain, schema);
+		}
+	};
+
+	c.createTransaction = function(options) {
+		let domain = createDomain();
+		let transaction = newTransaction(domain, pool, options);
+		let p = domain.run(() => new Promise(transaction)
+			.then(begin).then(negotiateSchema));
+
+		function run(fn) {
+			return p.then(domain.run.bind(domain, fn));
+		}
+
+		function begin() {
+			return _begin(domain, options);
+		}
+
+		function negotiateSchema(previous) {
+			let schema = options && options.schema;
+			if (!schema)
+				return previous;
+			return executeSchema(domain,schema);
+		}
+
+		run.rollback = rollback.bind(null, domain);
+		run.commit = commit.bind(null, domain);
+
+		return run;
+	};
+
+	c.query = function(query) {
+		let domain = createDomain();
+		let transaction = newTransaction(domain, pool);
+		let p = domain.run(() => new Promise(transaction)
+			.then(() => setSessionSingleton(domain, 'changes', []))
+			.then(() => doQuery(domain, query).then(onResult, onError)));
+		return p;
+
+		function onResult(result) {
+			releaseDbClient(domain);
+			return result;
+		}
+
+		function onError(e) {
+			releaseDbClient(domain);
+			throw e;
+		}
+	};
+
+	c.rollback = rollback;
+	c.commit = commit;
+	c.lock = lock;
+	c.schema = executeSchema;
+
+	c.end = function() {
+		if (poolOptions)
+			return pool.end();
+		else
+			return Promise.resolve();
+	};
+
+	c.accept = function(caller) {
+		caller.visitPg();
+	};
+
+	return c;
+}
+
+module.exports = newDatabase;

package/src/bunPg/newPool.js

@@ -0,0 +1,19 @@
+const promisify = require('../promisify');
+const pools = require('../pools');
+const end = require('./pool/end');
+const newPgPool = require('./pool/newPgPool');
+const newId = require('../newId');
+
+function newPool(connectionString, poolOptions) {
+	let pool = newPgPool(connectionString, poolOptions);
+	let id = newId();
+	let boundEnd = end.bind(null, pool, id);
+	let c = {};
+
+	c.connect = pool.connect;
+	c.end = promisify(boundEnd);
+	pools[id] = c;
+	return c;
+}
+
+module.exports = newPool;

package/src/bunPg/pool/end.js

@@ -0,0 +1,13 @@
+var pools = require('../../pools');
+
+function endPool(pgPool, id, done) {
+	pgPool.drain(onDrained);
+
+	function onDrained() {
+		pgPool.destroyAllNow();
+		delete pools[id];
+		done();
+	}
+}
+
+module.exports = endPool;

package/src/bunPg/pool/newPgPool.js

@@ -0,0 +1,98 @@
+/* eslint-disable no-prototype-builtins */
+//slightly modified code from github.com/brianc/node-postgres
+var log = require('../../table/log');
+
+var defaults = require('../../poolDefaults');
+var genericPool = require('../../generic-pool');
+var pg;
+var parseSearchPathParam = require('../../pg/pool/parseSearchPathParam');
+
+function newPgPool(connectionString, poolOptions) {
+	poolOptions = poolOptions || {};
+
+	// @ts-ignore
+	var pool = genericPool.Pool({
+		max: poolOptions.size || poolOptions.poolSize || defaults.poolSize,
+		idleTimeoutMillis: poolOptions.idleTimeout || defaults.poolIdleTimeout,
+		reapIntervalMillis: poolOptions.reapIntervalMillis || defaults.reapIntervalMillis,
+		log: poolOptions.log,
+		create: async function(cb) {
+			try {
+				if (!pg) {
+					const bunImport = await import('bun');
+					const { sql } = bunImport.default || bunImport;
+					pg = sql;
+				}
+			}
+			catch(e) {
+				return cb(e, null);
+			}
+			var client = new pg.Client(connectionString);
+			client.connect(function(err) {
+				if (err) return cb(err, null);
+
+				//handle connected client background errors by emitting event
+				//via the pg object and then removing errored client from the pool
+				client.on('error', function(e) {
+					pool.emit('error', e, client);
+
+					// If the client is already being destroyed, the error
+					// occurred during stream ending. Do not attempt to destroy
+					// the client again.
+					if (!client._destroying) {
+						pool.destroy(client);
+					}
+				});
+
+				// Remove connection from pool on disconnect
+				client.on('end', function(_e) {
+					// Do not enter infinite loop between pool.destroy
+					// and client 'end' event...
+					if (!client._destroying) {
+						pool.destroy(client);
+					}
+				});
+				client.poolCount = 0;
+				negotiateSearchPath(client, connectionString, (err) => cb(err, client));
+
+			});
+		},
+		destroy: function(client) {
+			client._destroying = true;
+			client.poolCount = undefined;
+			client.end();
+		}
+	});
+	//monkey-patch with connect method
+	pool.connect = function(cb) {
+		pool.acquire(function(err, client) {
+			if (err) return cb(err, null, function() {
+				/*NOOP*/
+			});
+			client.poolCount++;
+			cb(null, client, function(err) {
+				if (err) {
+					pool.destroy(client);
+				} else {
+					pool.release(client);
+				}
+			});
+		});
+	};
+	return pool;
+}
+
+function negotiateSearchPath(client, connectionString, cb) {
+	const searchPath = parseSearchPathParam(connectionString);
+	if (searchPath) {
+		const sql = `set search_path to ${searchPath}`;
+		log.emitQuery({sql, parameters: []});
+		return client.query(sql, cb);
+	}
+	else
+		cb();
+
+
+}
+
+module.exports = newPgPool;

package/src/bunPg/wrapQuery.js

@@ -0,0 +1,33 @@
+var log = require('../table/log');
+var replaceParamChar = require('../pg/replaceParamChar');
+
+function wrapQuery(connection) {
+	var runOriginalQuery = connection.query;
+	return runQuery;
+
+	function runQuery(query, onCompleted) {
+		var params = query.parameters;
+		var sql = replaceParamChar(query, params);
+		query = {
+			text: sql,
+			values: params,
+			types: query.types
+		};
+		log.emitQuery({sql, parameters: params});
+
+		runOriginalQuery.call(connection, query, onInnerCompleted);
+
+		function onInnerCompleted(err, result) {
+			if (err)
+				onCompleted(err);
+			else {
+				if (Array.isArray(result))
+					result = result[result.length-1];
+				onCompleted(null, result.rows);
+			}
+		}
+	}
+
+}
+
+module.exports = wrapQuery;

package/src/bunSqlite/newPool.js

@@ -0,0 +1,19 @@
+const promisify = require('../promisify');
+const pools = require('../pools');
+const end = require('../sqlite/pool/end');
+const newGenericPool = require('./pool/newGenericPool');
+const newId = require('../newId');
+
+function newPool(connectionString, poolOptions) {
+	let pool = newGenericPool(connectionString, poolOptions);
+	let id = newId();
+	let boundEnd = end.bind(null, pool, id);
+	let c = {};
+
+	c.connect = pool.connect;
+	c.end = promisify(boundEnd);
+	pools[id] = c;
+	return c;
+}
+
+module.exports = newPool;

package/src/bunSqlite/newTransaction.js

@@ -0,0 +1,83 @@
+const wrapQuery = require('./wrapQuery');
+const encodeBoolean = require('../sqlite/encodeBoolean');
+const deleteFromSql = require('../sqlite/deleteFromSql');
+const selectForUpdateSql = require('../sqlite/selectForUpdateSql');
+const lastInsertedSql = require('../sqlite/lastInsertedSql');
+const limitAndOffset = require('../sqlite/limitAndOffset');
+const insertSql = require('../sqlite/insertSql');
+const insert = require('../sqlite/insert');
+const quote = require('../sqlite/quote');
+
+function newResolveTransaction(domain, pool, { readonly = false } = {})  {
+	var rdb = {poolFactory: pool};
+	if (!pool.connect) {
+		pool = pool();
+		rdb.pool = pool;
+	}
+	rdb.engine = 'sqlite';
+	rdb.encodeBoolean = encodeBoolean;
+	rdb.decodeJSON = decodeJSON;
+	rdb.encodeJSON = JSON.stringify;
+	rdb.deleteFromSql = deleteFromSql;
+	rdb.selectForUpdateSql = selectForUpdateSql;
+	rdb.lastInsertedSql = lastInsertedSql;
+	rdb.insertSql = insertSql;
+	rdb.insert = insert;
+	rdb.lastInsertedIsSeparate = true;
+	rdb.multipleStatements = false;
+	rdb.limitAndOffset = limitAndOffset;
+	rdb.accept = function(caller) {
+		caller.visitSqlite();
+	};
+	rdb.aggregateCount = 0;
+	rdb.quote = quote;
+
+	if (readonly) {
+		rdb.dbClient = {
+			executeQuery: function(query, callback) {
+				pool.connect((err, client, done) => {
+					if (err) {
+						return callback(err);
+					}
+					try {
+						wrapQuery(client)(query, (err, res) => {
+							done();
+							callback(err, res);
+						});
+					} catch (e) {
+						done();
+						callback(e);
+					}
+				});
+			}
+		};
+		domain.rdb = rdb;
+		return (onSuccess) => onSuccess();
+	}
+
+	return function(onSuccess, onError) {
+		pool.connect(onConnected);
+
+		function onConnected(err, client, done) {
+			try {
+				if (err) {
+					onError(err);
+					return;
+				}
+				client.executeQuery = wrapQuery(client);
+				rdb.dbClient = client;
+				rdb.dbClientDone = done;
+				domain.rdb = rdb;
+				onSuccess();
+			} catch (e) {
+				onError(e);
+			}
+		}
+	};
+}
+
+function decodeJSON(value) {
+	return JSON.parse(value);
+}
+
+module.exports = newResolveTransaction;

package/src/bunSqlite/pool/newGenericPool.js

@@ -0,0 +1,55 @@
+/* eslint-disable no-prototype-builtins */
+var defaults = require('../../poolDefaults');
+
+var genericPool = require('../../generic-pool');
+var sqlite;
+
+function newGenericPool(connectionString, poolOptions) {
+	poolOptions = poolOptions || {};
+	var pool = genericPool.Pool({
+		max: poolOptions.size || poolOptions.poolSize || defaults.poolSize,
+		idleTimeoutMillis: poolOptions.idleTimeout || defaults.poolIdleTimeout,
+		reapIntervalMillis: poolOptions.reapIntervalMillis || defaults.reapIntervalMillis,
+		log: poolOptions.log || defaults.poolLog,
+		create: async function(cb) {
+			try {
+				try {
+					if (!sqlite)
+						sqlite = await import('bun:sqlite');
+				}
+				catch (err) {
+					return cb(err, null);
+				}
+
+				var client = new sqlite.DatabaseSync(connectionString);
+				client.poolCount = 0;
+				cb(null, client);
+			}
+			catch(err) {
+				return cb(err, null);
+			}
+		},
+
+		destroy: function(client) {
+			client.poolCount = undefined;
+			client.close();
+		}
+	});
+	//monkey-patch with connect method
+	pool.connect = function(cb) {
+		pool.acquire(function(err, client) {
+			if(err)  return cb(err, null, function() {/*NOOP*/});
+			client.poolCount++;
+			cb(null, client, function(err) {
+				if(err) {
+					pool.destroy(client);
+				} else {
+					pool.release(client);
+				}
+			});
+		});
+	};
+	return pool;
+}
+
+module.exports = newGenericPool;

package/src/bunSqlite/wrapQuery.js

@@ -0,0 +1,23 @@
+var log = require('../table/log');
+
+function wrapQuery(connection) {
+	return runQuery;
+
+	function runQuery(query, onCompleted) {
+		try {
+			var params = query.parameters;
+			var sql = query.sql();
+			log.emitQuery({ sql, parameters: params });
+
+			var statement = connection.prepare(sql);
+			const rows = statement.all.apply(statement, params);
+			onCompleted(null, rows);
+		}
+		catch (e) {
+			onCompleted(e);
+		}
+	}
+
+}
+
+module.exports = wrapQuery;

package/src/index.js

@@ -2,6 +2,8 @@ const hostExpress = require('./hostExpress');
 const hostLocal = require('./hostLocal');
 const client = require('./client/index.js');
 const map = require('./client/map');
+const runtimes = require('./runtimes');
+
 let _mySql;
 let _pg;
 let _sqlite;
@@ -63,15 +65,26 @@ Object.defineProperty(connectViaPool, 'postgres', {
 Object.defineProperty(connectViaPool, 'pg', {
 	get: function() {
 		if (!_pg)
-			_pg = require('./pg/newDatabase');
+			if (runtimes.bun)
+				_sqlite = require('./bunPg/newDatabase');
+			else
+				_pg = require('./pg/newDatabase');
 		return _pg;
 	}
 });
 
 Object.defineProperty(connectViaPool, 'sqlite', {
 	get: function() {
-		if (!_sqlite)
-			_sqlite = require('./sqlite/newDatabase');
+		if (!_sqlite) {
+			if (runtimes.deno || (runtimes.node && runtimes.node.major >= 22))
+				_sqlite = require('./nodeSqlite/newDatabase');
+			else if (runtimes.bun)
+				_sqlite = require('./bunSqlite/newDatabase');
+			else if (runtimes.node)
+				_sqlite = require('./sqlite3/newDatabase');
+			else
+				throw new Error('SQLite is not supported in this environment');
+		}
 		return _sqlite;
 	}
 });

package/src/merge-browser.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('./dist/index.browser.mjs', 'utf8');
+	await fs.writeFile('./dist/index.browser.mjs', data1 + data2);
+}
+
+merge();

package/src/merge-server.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('./dist/index.mjs', 'utf8');
+	await fs.writeFile('./dist/index.mjs', data1 + data2);
+}
+
+merge();

package/src/mssql/pool/newGenericPool.js

@@ -3,7 +3,7 @@
 
 var defaults = require('../../poolDefaults');
 var genericPool = require('../../generic-pool');
-var mssql = require('msnodesqlv8');
+var mssql;
 
 function newGenericPool(connectionString, poolOptions) {
 	poolOptions = poolOptions || {};
@@ -12,7 +12,14 @@ function newGenericPool(connectionString, poolOptions) {
 		idleTimeoutMillis: poolOptions.idleTimeout || defaults.poolIdleTimeout,
 		reapIntervalMillis: poolOptions.reapIntervalMillis || defaults.reapIntervalMillis,
 		log: poolOptions.log || defaults.poolLog,
-		create: function(cb) {
+		create: async function(cb) {
+			try {
+				if (!mssql)
+					mssql = await import('msnodesqlv8');
+			}
+			catch (err) {
+				return cb(err, null);
+			}
 			var client;
 			mssql.open(connectionString, onConnected);
 

package/src/mySql/pool/newGenericPool.js

@@ -2,7 +2,7 @@
 /* eslint-disable no-prototype-builtins */
 var defaults = require('../../poolDefaults');
 var genericPool = require('../../generic-pool');
-var mysql = require('mysql2');
+var mysql;
 
 function newGenericPool(connectionString, poolOptions) {
 	if (typeof connectionString === 'string')
@@ -15,7 +15,16 @@ function newGenericPool(connectionString, poolOptions) {
 		idleTimeoutMillis: poolOptions.idleTimeout || defaults.poolIdleTimeout,
 		reapIntervalMillis: poolOptions.reapIntervalMillis || defaults.reapIntervalMillis,
 		log: poolOptions.log,
-		create: function(cb) {
+		create: async function(cb) {
+			try {
+				if(!mysql) {
+					mysql = await import('mysql2');
+					mysql = mysql.default || mysql;
+				}
+			}
+			catch(err) {
+				return cb(err, null);
+			}
 			var innerPool = mysql.createPool(connectionString);
 			return cb(null, innerPool);
 			// innerPool.getConnection(onConnected);

package/src/nodeSqlite/decodeBinary.js

@@ -0,0 +1,9 @@
+function decodeBinary(u8Arr) {
+	let binaryString = '';
+	for (let i = 0; i < u8Arr.length; i++) {
+		binaryString += String.fromCharCode(u8Arr[i]);
+	}
+	return btoa(binaryString);
+}
+
+module.exports = decodeBinary;

package/src/nodeSqlite/encodeBinary.js

@@ -0,0 +1,20 @@
+function encodeBinary(base64) {
+	// return Buffer.from(base64, 'base64');
+
+
+	// Decode base64 to a binary string
+	const binaryString = atob(base64);
+
+	// Create a new Uint8Array with the same length as the binary string
+	const len = binaryString.length;
+	const bytes = new Uint8Array(len);
+
+	// Populate the Uint8Array with numeric character codes
+	for (let i = 0; i < len; i++) {
+		bytes[i] = binaryString.charCodeAt(i);
+	}
+
+	return bytes;
+}
+
+module.exports = encodeBinary;