orange-orm 4.5.0-beta.1 → 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,20 +1,4 @@
-var Domain = require('node:domain');
-var negotiateForwardProperty = require('./createDomain/negotiateForwardProperty');
-
-function createNodeDomain() {
-	var oldDomain = Domain.active || {};
-	var domain = Domain.create();
-	var ownProperties = Object.getOwnPropertyNames(oldDomain);
-	ownProperties.forEach(function(propName) {
-		negotiateForwardProperty(oldDomain, domain, propName);
-	});
-	return domain;
-}
-
-
-function _createDomain(useNodeDomain) {
-	if (useNodeDomain)
-		return createNodeDomain();
+function createDomain() {
 	let c = {};
 	function run(fn) {
 		return fn(c);
@@ -23,4 +7,4 @@ function _createDomain(useNodeDomain) {
 	return c;
 }
 
-module.exports = _createDomain;
+module.exports = createDomain;

package/src/d1/newPool.js

@@ -1,4 +1,4 @@
-const promisify = require('node:util').promisify;
+const promisify = require('../promisify');
 const pools = require('../pools');
 const end = require('./pool/end');
 const newGenericPool = require('./pool/newGenericPool');

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,9 +1,6 @@
 /* eslint-disable no-prototype-builtins */
-var EventEmitter = require('events').EventEmitter;
-
 var defaults = require('../../poolDefaults');
 var genericPool = require('../../generic-pool');
-var process = require('node:process');
 
 function newGenericPool(d1Database, poolOptions) {
 	poolOptions = poolOptions || {};
@@ -22,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/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;