orange-orm 4.5.0-beta.0 → 4.5.0-beta.2

package/src/client/rollup.config.js

@@ -1,12 +1,32 @@
+import json from '@rollup/plugin-json';
 import commonjs from '@rollup/plugin-commonjs';
 import nodeResolve from '@rollup/plugin-node-resolve';
 
 export default {
-	input: './src/client/index.js',
+	input: './src/indexBrowser.js',
 	output: {
 		file: './src/client/index.mjs',
-		format: 'esm'
+		format: 'esm',
+		interop: 'auto'
+	},
+
+	// plugins: [json(), commonjs()],
+	plugins: [json(), nodeResolve({ preferBuiltins: false }), commonjs({
+		transformMixedEsModules: true,
+		esmExternals: true,      // Add this
+		requireReturnsDefault: 'preferred'  // Change this
+	})],
+	external(id) {
+		// If it's in node_modules, mark as external
+		return id.includes('node_modules');
+	},
+	onwarn: (warning, warn) => {
+		if (warning.code === 'CIRCULAR_DEPENDENCY') {
+			// Log the full circular dependency warning message
+			console.warn(`[CIRCULAR DEPENDENCY] ${warning.message}`);
+		} else {
+			// For all other warnings, use Rollup's default handler.
+			warn(warning);
+		}
 	},
-	plugins: [commonjs(), nodeResolve({browser: true})],
-	external: ['vue']
 };

package/src/client/stringify.js

@@ -1,22 +1,15 @@
 let dateToISOString = require('../dateToISOString');
-const isNode = (typeof window === 'undefined');
 
 function stringify(value) {
 	return JSON.stringify(value, replacer);
 }
 
 function replacer(key, value) {
-	if (isNode && isNodeBuffer(value))
-		return value.toString('base64');
-	// @ts-ignore
-	else if (value instanceof Date  && !isNaN(value))
+	// // @ts-ignore
+	if (value instanceof Date  && !isNaN(value))
 		return dateToISOString(value);
 	else
 		return value;
 }
 
-function isNodeBuffer(object) {
-	return Buffer.isBuffer(object);
-}
-
 module.exports = stringify;

package/src/createDomain.js

@@ -1,31 +1,10 @@
-let useHook = require('./useHook');
-let cls;
-var Domain = require('domain');
-var negotiateForwardProperty = require('./createDomain/negotiateForwardProperty');
-
 function createDomain() {
-	var oldDomain = Domain.active || {};
-	var domain = Domain.create();
-	var ownProperties = Object.getOwnPropertyNames(oldDomain);
-	ownProperties.forEach(function(propName) {
-		negotiateForwardProperty(oldDomain, domain, propName);
-	});
-	return domain;
-}
-
-function createOnContext() {
-	if (!cls)
-		cls = require('node-cls');
-	return cls.create('rdb');
-}
-
-
-function _createDomain() {
-	if (useHook())
-		return createOnContext();
-	else
-		return createDomain();
-
+	let c = {};
+	function run(fn) {
+		return fn(c);
+	}
+	c.run = run;
+	return c;
 }
 
-module.exports = _createDomain;
+module.exports = createDomain;

package/src/d1/newDatabase.js

@@ -4,10 +4,6 @@ let _begin = require('../table/begin');
 let commit = require('../table/commit');
 let rollback = require('../table/rollback');
 let newPool = require('./newPool');
-let useHook = require('../useHook');
-let promise = require('promise/domains');
-let versionArray = process.version.replace('v', '').split('.');
-let major = parseInt(versionArray[0]);
 let express = require('../hostExpress');
 let hostLocal = require('../hostLocal');
 let doQuery = require('../query');
@@ -34,85 +30,75 @@ function newDatabase(d1Database, poolOptions) {
 
 		if (fn)
 			return domain.run(runInTransaction);
-		else if ((major >= 12) && useHook()) {
-			domain.exitContext = true;
-			return domain.start().then(run);
-		}
 		else
 			return domain.run(run);
 
-		function begin() {
-			const transactionLess = true;
-			return _begin(transactionLess);
-		}
-
 		async function runInTransaction() {
 			let result;
 			let transaction = newTransaction(domain, pool, options);
 			await new Promise(transaction)
 				.then(begin)
-				.then(fn)
+				.then(() => fn(domain))
 				.then((res) => result = res)
-				.then(c.commit)
-				.then(null, c.rollback);
+				.then(() => c.commit(domain))
+				.then(null, (e) =>  c.rollback(domain,e));
 			return result;
 		}
 
+		function begin() {
+			const transactionLess = true;
+			return _begin(domain, transactionLess);
+		}
+
 		function run() {
 			let p;
 			let transaction = newTransaction(domain, pool, options);
-			if (useHook())
-				p = new Promise(transaction);
-			else
-				p = new promise(transaction);
+			p = new Promise(transaction);
 
 			return p.then(begin);
 		}
 
 	};
 
-	c.createTransaction = function() {
+	c.createTransaction = function(options) {
 		let domain = createDomain();
-		let transaction = newTransaction(domain, pool);
-		let p = domain.run(() => new Promise(transaction).then(_begin));
+		let transaction = newTransaction(domain, pool, options);
+		let p = domain.run(() => new Promise(transaction).then(begin));
 
 		function run(fn) {
 			return p.then(domain.run.bind(domain, fn));
 		}
-		return run;
-	};
-
-	c.bindTransaction = function() {
-		// @ts-ignore
-		var domain = process.domain;
-		let p = domain.run(() => true);
 
-		function run(fn) {
-			return p.then(domain.run.bind(domain, fn));
+		function begin() {
+			return _begin(domain, options);
 		}
+
+		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('changes', []))
-			.then(() => doQuery(query).then(onResult, onError)));
+			.then(() => setSessionSingleton(domain, 'changes', []))
+			.then(() => doQuery(domain, query).then(onResult, onError)));
 		return p;
 
 		function onResult(result) {
-			releaseDbClient();
+			releaseDbClient(domain);
 			return result;
 		}
 
 		function onError(e) {
-			releaseDbClient();
+			releaseDbClient(domain);
 			throw e;
 		}
 	};
 
-
 	c.rollback = rollback;
 	c.commit = commit;
 

package/src/d1/newPool.js

@@ -1,8 +1,8 @@
-var pools = require('../pools');
-var promise = require('../table/promise');
-var end = require('./pool/end');
-var newGenericPool = require('./pool/newGenericPool');
-var newId = require('../newId');
+const promisify = require('../promisify');
+const pools = require('../pools');
+const end = require('./pool/end');
+const newGenericPool = require('./pool/newGenericPool');
+const newId = require('../newId');
 
 function newPool(d1Database, poolOptions) {
 	var pool = newGenericPool(d1Database, poolOptions);
@@ -11,7 +11,7 @@ function newPool(d1Database, poolOptions) {
 	var c = {};
 
 	c.connect = pool.connect;
-	c.end = promise.denodeify(boundEnd);
+	c.end = promisify(boundEnd);
 	pools[id] = c;
 	return c;
 }

package/src/d1/newTransaction.js

@@ -14,6 +14,7 @@ function newResolveTransaction(domain, pool, { readonly = false } = {})  {
 		rdb.pool = pool;
 	}
 	rdb.engine = 'sqlite';
+	rdb.maxParameters = 100;
 	rdb.encodeBoolean = encodeBoolean;
 	rdb.decodeJSON = decodeJSON;
 	rdb.encodeJSON = JSON.stringify;

package/src/d1/pool/newGenericPool.js

@@ -1,7 +1,5 @@
 /* eslint-disable no-prototype-builtins */
-var EventEmitter = require('events').EventEmitter;
-
-var defaults = require('./defaults');
+var defaults = require('../../poolDefaults');
 var genericPool = require('../../generic-pool');
 
 function newGenericPool(d1Database, poolOptions) {
@@ -21,20 +19,10 @@ function newGenericPool(d1Database, poolOptions) {
 		destroy: function() {
 		}
 	});
-	//mixin EventEmitter to pool
-	EventEmitter.call(pool);
-	for(var key in EventEmitter.prototype) {
-		if(EventEmitter.prototype.hasOwnProperty(key)) {
-			pool[key] = EventEmitter.prototype[key];
-		}
-	}
 	//monkey-patch with connect method
 	pool.connect = function(cb) {
-		var domain = process.domain;
+
 		pool.acquire(function(err, client) {
-			if(domain) {
-				cb = domain.bind(cb);
-			}
 			if(err)  return cb(err, null, function() {/*NOOP*/});
 			client.poolCount++;
 			cb(null, client, function(err) {

package/src/emitEvent.js

@@ -6,12 +6,14 @@ function emitEvent() {
 		var result = [];
 		for (var i = 0; i < copy.length; i++) {
 			var callback = copy[i];
-			result.push(callback.apply(null,arguments));
+			result.push(callback.apply(null, arguments));
 		}
 		return result;
 	};
 
 	emit.add = function(callback) {
+		if (!callback)
+			throw new Error('missing callback');
 		callbacks.push(callback);
 	};
 
@@ -22,15 +24,15 @@ function emitEvent() {
 
 	emit.remove = function(callback) {
 		for (var i = 0; i < callbacks.length; i++) {
-			if(callbacks[i] === callback){
-				callbacks.splice(i,1);
+			if (callbacks[i] === callback) {
+				callbacks.splice(i, 1);
 				return;
 			}
 		}
 	};
 
 	emit.tryRemove = function(callback) {
-		if(callback)
+		if (callback)
 			emit.remove(callback);
 	};
 

package/src/emptyFilter.js

@@ -7,26 +7,26 @@ function emptyFilter() {
 emptyFilter.sql = parameterized.sql;
 emptyFilter.parameters = parameterized.parameters;
 
-emptyFilter.and = function(other) {
-	other = negotiateRawSqlFilter(other);
-	for (var i = 1; i < arguments.length; i++) {
-		other = other.and(arguments[i]);
+emptyFilter.and = function(context, other) {
+	other = negotiateRawSqlFilter(context, other);
+	for (var i = 2; i < arguments.length; i++) {
+		other = other.and(context, arguments[i]);
 	}
 	return other;
 };
 
-emptyFilter.or = function(other) {
-	other = negotiateRawSqlFilter(other);
-	for (var i = 1; i < arguments.length; i++) {
-		other = other.or(arguments[i]);
+emptyFilter.or = function(context, other) {
+	other = negotiateRawSqlFilter(context, other);
+	for (var i = 2; i < arguments.length; i++) {
+		other = other.or(context, arguments[i]);
 	}
 	return other;
 };
 
-emptyFilter.not = function(other) {
-	other = negotiateRawSqlFilter(other).not();
-	for (var i = 1; i < arguments.length; i++) {
-		other = other.and(arguments[i]);
+emptyFilter.not = function(context, other) {
+	other = negotiateRawSqlFilter(context, other).not(context);
+	for (var i = 2; i < arguments.length; i++) {
+		other = other.and(context, arguments[i]);
 	}
 	return other;
 

package/src/format.js

@@ -0,0 +1,9 @@
+function format(template, ...values) {
+	let index = 0;
+	return template.replace(/%s/g, () => {
+		// If there aren't enough values, this will insert 'undefined'
+		// for placeholders that don't have a corresponding array item.
+		return values[index++];
+	});
+}
+module.exports = format;