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

package/README.md

@@ -29,7 +29,8 @@ The ultimate Object Relational Mapper for Node.js and Typescript, offering seaml
 ✅ MySQL  
 ✅ Oracle  
 ✅ SAP ASE  
-✅ SQLite
+✅ 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) ?
@@ -319,6 +320,7 @@ import map from './map';
 
 const db = map.http('http://localhost:3000/orange');
 ```
+
 __MySQL__
 ```bash
 $ npm install mysql2
@@ -364,6 +366,38 @@ With schema
 import map from './map';
 const db = map.postgres('postgres://postgres:postgres@postgres/postgres?search_path=custom');
 ```
+__Cloudflare D1__  
+<sub>📄 wrangler.toml</sub>  
+```toml
+name = "d1-tutorial"
+main = "src/index.ts"
+compatibility_date = "2025-02-04"
+
+# Bind a D1 database. D1 is Cloudflare’s native serverless SQL database.
+# Docs: https://developers.cloudflare.com/workers/wrangler/configuration/#d1-databases
+[[d1_databases]]
+binding = "DB"
+database_name = "<your-name-for-the-database>"
+database_id = "<your-guid-for-the-database>"
+```
+
+<sub>📄 scr/index.ts</sub>  
+```javascript
+import map from './map';
+
+export interface Env {
+  // Must match the binding name in wrangler.toml  
+  DB: D1Database;
+}
+
+export default {
+  async fetch(request, env): Promise<Response> {
+    const db = map.d1(env.DB);
+    const customers = await db.customer.getAll();
+    return Response.json(customers);
+  },
+} satisfies ExportedHandler<Env>;
+```
 __Oracle__
 ```bash
 npm install oracledb
@@ -1580,6 +1614,8 @@ async function getRows() {
 Within the transaction, a customer is retrieved and its balance updated using the tx object to ensure operations are transactional.
 An error is deliberately thrown to demonstrate a rollback, ensuring all previous changes within the transaction are reverted.
 Always use the provided tx object for operations within the transaction to maintain data integrity.</p>
+<p>(NOTE: Transactions are not supported for Cloudflare D1)</p>
+
 
 ```javascript
 import map from './map';
@@ -1597,6 +1633,7 @@ async function execute() {
 }
 
 ```
+
 </details>
 
 <details><summary><strong>Data types</strong></summary>

package/docs/changelog.md

@@ -1,4 +1,6 @@
 ## Changelog
+__4.5.0__  
+Support for Cloudflare D1.  
 __4.4.2__  
 Support for schema in connection string. Postgrs only. [#116](https://github.com/alfateam/orange-orm/issues/118)  
 __4.4.1__  

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orange-orm",
-  "version": "4.5.0-beta.2",
+  "version": "4.5.0-beta.4",
   "main": "./src/index.js",
   "browser": "./src/client/index.mjs",
   "bin": {
@@ -54,19 +54,17 @@
     "@lroal/on-change": "^4.0.2",
     "@tediousjs/connection-string": "^0.4.1",
     "@types/express": "^4.17.13",
+    "@cloudflare/workers-types": "^4.20241106.0",
     "@types/oracledb": "^6.0.4",
     "@types/tedious": "^4.0.14",
     "ajv": "^6.10.2",
-    "assert": "^2.1.0",
     "axios": "^1.6.2",
     "fast-json-patch": "^3.1.1",
     "findup-sync": "^5.0.0",
     "glob": "^10.3.4",
     "module-definition": "^4.0.0",
-    "node-cls": "^1.0.5",
     "rfdc": "^1.2.0",
-    "uuid": "^8.3.2",
-    "wrangler": "^3.107.2"
+    "uuid": "^8.3.2"
   },
   "peerDependencies": {
     "msnodesqlv8": "^4.1.0",
@@ -104,8 +102,7 @@
       "optional": true
     }
   },
-  "devDependencies": {
-    "@cloudflare/workers-types": "^4.20241106.0",
+  "devDependencies": {    
     "@miniflare/d1": "^2.14.4",
     "@rollup/plugin-commonjs": "^28.0.2",
     "@rollup/plugin-json": "^6.1.0",

package/src/applyPatch.js

@@ -1,5 +1,4 @@
 const fastjson = require('fast-json-patch');
-let assert = require('assert');
 let fromCompareObject = require('./fromCompareObject');
 let toCompareObject = require('./toCompareObject');
 
@@ -42,7 +41,7 @@ function applyPatch({ options = {} }, dto, changes, column) {
 						assertDatesEqual(oldValue, expectedOldValue);
 					}
 					else
-						assert.deepEqual(oldValue, expectedOldValue);
+						assertDeepEqual(oldValue, expectedOldValue);
 				}
 				catch (e) {
 					if (concurrency === 'skipOnConflict')
@@ -98,7 +97,12 @@ function assertDatesEqual(date1, date2) {
 		date1 = `${parts1[0]}T${time1parts[0]}`;
 		date2 = `${parts2[0]}T${time2parts[0]}`;
 	}
-	assert.deepEqual(date1, date2);
+	assertDeepEqual(date1, date2);
+}
+
+function assertDeepEqual(a, b) {
+	if (JSON.stringify(a) !== JSON.stringify(b))
+		throw new Error('A, b are not equal');
 }
 
 function inspect(obj) {

package/src/client/index.mjs

@@ -7,7 +7,6 @@ import * as axios from 'axios';
 import * as _default from 'rfdc/default';
 import * as ajv from 'ajv';
 import * as onChange from '@lroal/on-change';
-import * as assert from 'assert';
 
 function getDefaultExportFromCjs (x) {
 	return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;
@@ -724,7 +723,7 @@ function requireHostExpress () {
 	return hostExpress_1;
 }
 
-var require$$0$4 = /*@__PURE__*/getDefaultExportFromNamespaceIfPresent(fastJsonPatch);
+var require$$0$3 = /*@__PURE__*/getDefaultExportFromNamespaceIfPresent(fastJsonPatch);
 
 var dateToISOString_1;
 var hasRequiredDateToISOString;
@@ -784,7 +783,7 @@ function requireStringify () {
 	return stringify_1;
 }
 
-var require$$0$3 = /*@__PURE__*/getDefaultExportFromNamespaceIfPresent(uuid);
+var require$$0$2 = /*@__PURE__*/getDefaultExportFromNamespaceIfPresent(uuid);
 
 var createPatch;
 var hasRequiredCreatePatch;
@@ -792,10 +791,10 @@ var hasRequiredCreatePatch;
 function requireCreatePatch () {
 	if (hasRequiredCreatePatch) return createPatch;
 	hasRequiredCreatePatch = 1;
-	const jsonpatch = require$$0$4;
+	const jsonpatch = require$$0$3;
 	let dateToIsoString = requireDateToISOString();
 	let stringify = requireStringify();
-	let { v4: uuid } = require$$0$3;
+	let { v4: uuid } = require$$0$2;
 
 	createPatch = function createPatch(original, dto, options) {
 		let subject = toCompareObject({ d: original }, options, true);
@@ -2315,7 +2314,7 @@ function requireCloneFromDb () {
 	return cloneFromDb_1;
 }
 
-var require$$0$2 = /*@__PURE__*/getDefaultExportFromNamespaceIfPresent(axios);
+var require$$0$1 = /*@__PURE__*/getDefaultExportFromNamespaceIfPresent(axios);
 
 var netAdapter_1;
 var hasRequiredNetAdapter;
@@ -2323,7 +2322,7 @@ var hasRequiredNetAdapter;
 function requireNetAdapter () {
 	if (hasRequiredNetAdapter) return netAdapter_1;
 	hasRequiredNetAdapter = 1;
-	const _axios = require$$0$2;
+	const _axios = require$$0$1;
 
 	function httpAdapter(baseURL, path, axiosInterceptor) {
 		//@ts-ignore
@@ -2466,7 +2465,7 @@ function requireToKeyPositionMap () {
 	if (hasRequiredToKeyPositionMap) return toKeyPositionMap_1;
 	hasRequiredToKeyPositionMap = 1;
 	const stringify = requireStringify();
-	const { v4: uuid } = require$$0$3;
+	const { v4: uuid } = require$$0$2;
 
 	function toKeyPositionMap(rows, options) {
 		return rows.reduce((map, element, i) => {
@@ -4053,7 +4052,7 @@ function requireNewColumn () {
 	return newColumn;
 }
 
-var require$$0$1 = /*@__PURE__*/getDefaultExportFromNamespaceIfPresent(ajv);
+var require$$0 = /*@__PURE__*/getDefaultExportFromNamespaceIfPresent(ajv);
 
 var purify_1$5;
 var hasRequiredPurify$6;
@@ -5216,7 +5215,7 @@ var hasRequiredColumn;
 function requireColumn () {
 	if (hasRequiredColumn) return column;
 	hasRequiredColumn = 1;
-	const Ajv = require$$0$1;
+	const Ajv = require$$0;
 
 	function defineColumn(column, table) {
 		var c = {};
@@ -7004,8 +7003,6 @@ function requireToDto () {
 	return toDto_1;
 }
 
-var require$$0 = /*@__PURE__*/getDefaultExportFromNamespaceIfPresent(assert);
-
 var fromCompareObject_1;
 var hasRequiredFromCompareObject;
 
@@ -7095,8 +7092,7 @@ var hasRequiredApplyPatch;
 function requireApplyPatch () {
 	if (hasRequiredApplyPatch) return applyPatch_1;
 	hasRequiredApplyPatch = 1;
-	const fastjson = require$$0$4;
-	let assert = require$$0;
+	const fastjson = require$$0$3;
 	let fromCompareObject = requireFromCompareObject();
 	let toCompareObject = requireToCompareObject();
 
@@ -7139,7 +7135,7 @@ function requireApplyPatch () {
 							assertDatesEqual(oldValue, expectedOldValue);
 						}
 						else
-							assert.deepEqual(oldValue, expectedOldValue);
+							assertDeepEqual(oldValue, expectedOldValue);
 					}
 					catch (e) {
 						if (concurrency === 'skipOnConflict')
@@ -7195,7 +7191,12 @@ function requireApplyPatch () {
 			date1 = `${parts1[0]}T${time1parts[0]}`;
 			date2 = `${parts2[0]}T${time2parts[0]}`;
 		}
-		assert.deepEqual(date1, date2);
+		assertDeepEqual(date1, date2);
+	}
+
+	function assertDeepEqual(a, b) {
+		if (JSON.stringify(a) !== JSON.stringify(b))
+			throw new Error('A, b are not equal');
 	}
 
 	function inspect(obj) {
@@ -7214,7 +7215,6 @@ function requireValidateDeleteConflict () {
 	hasRequiredValidateDeleteConflict = 1;
 	// @ts-nocheck
 	/* eslint-disable */
-	let assert = require$$0;
 	const toCompareObject = requireToCompareObject();
 
 	async function validateDeleteConflict({ row, oldValue, options, table }) {
@@ -7229,7 +7229,7 @@ function requireValidateDeleteConflict () {
 							assertDatesEqual(oldValue[p], toCompareObject(row[p]));
 						}
 						else
-							assert.deepEqual(oldValue[p], toCompareObject(row[p]));						
+							assertDeepEqual(oldValue[p], toCompareObject(row[p]));						
 					}
 					catch (e) {
 						throw new Error(`The field ${p} was changed by another user. Expected ${inspect(oldValue[p])}, but was ${inspect(row[p])}.`);
@@ -7298,7 +7298,12 @@ function requireValidateDeleteConflict () {
 			date1 = `${parts1[0]}T${time1parts[0]}`;
 			date2 = `${parts2[0]}T${time2parts[0]}`;
 		}
-		assert.deepEqual(date1, date2);
+		assertDeepEqual(date1, date2);
+	}
+
+	function assertDeepEqual(a, b) {
+		if (JSON.stringify(a) !== JSON.stringify(b))
+			throw new Error('A, b are not equal');
 	}
 
 	function inspect(obj) {
@@ -10043,7 +10048,7 @@ var hasRequiredNewId;
 function requireNewId () {
 	if (hasRequiredNewId) return newId;
 	hasRequiredNewId = 1;
-	const { v4 : uuid} = require$$0$3;
+	const { v4 : uuid} = require$$0$2;
 	newId = uuid;
 	return newId;
 }

package/src/validateDeleteConflict.js

@@ -1,6 +1,5 @@
 // @ts-nocheck
 /* eslint-disable */
-let assert = require('assert');
 const toCompareObject = require('./toCompareObject');
 
 async function validateDeleteConflict({ row, oldValue, options, table }) {
@@ -15,7 +14,7 @@ async function validateDeleteConflict({ row, oldValue, options, table }) {
 						assertDatesEqual(oldValue[p], toCompareObject(row[p]));
 					}
 					else
-						assert.deepEqual(oldValue[p], toCompareObject(row[p]));						
+						assertDeepEqual(oldValue[p], toCompareObject(row[p]));						
 				}
 				catch (e) {
 					throw new Error(`The field ${p} was changed by another user. Expected ${inspect(oldValue[p])}, but was ${inspect(row[p])}.`);
@@ -84,7 +83,12 @@ function assertDatesEqual(date1, date2) {
 		date1 = `${parts1[0]}T${time1parts[0]}`;
 		date2 = `${parts2[0]}T${time2parts[0]}`;
 	}
-	assert.deepEqual(date1, date2);
+	assertDeepEqual(date1, date2);
+}
+
+function assertDeepEqual(a, b) {
+	if (JSON.stringify(a) !== JSON.stringify(b))
+		throw new Error('A, b are not equal');
 }
 
 function inspect(obj) {

package/src/clsTest.js

@@ -1,79 +0,0 @@
-let cls = require('node-cls');
-const fs = require('fs');
-const log = (str) => fs.writeSync(1, `${str}\n`);
-
-function begin(id) {
-	return new Promise((resolve) => {
-		let context = cls.get();
-		context.id = id;
-		resolve();
-	});
-}
-
-function getById() {
-	return new Promise((resolve) => {
-		let context = cls.get();
-		context.id;
-		resolve(context.id);
-	});
-}
-
-async function getFromDb() {
-	let c = cls.create();
-	await c.start();
-	await begin(1);
-	await new Promise((resolve) => {
-		setTimeout(resolve(), 500);
-	});
-	await getFromDb2();
-
-	let c3 = cls.create();
-	await c3.start();
-	await begin(3);
-	let id3 = await getById();
-	if (id3 !== 3)
-		throw new Error('3 Unexpected context id : ' + id3);
-	cls.exit();
-
-	await getFromDb3();
-
-	let id = await getById();
-	if (id !== 1)
-		throw new Error('1 Unexpected context id : ' + id);
-	cls.exit();
-}
-
-function getFromDb2() {
-	return new Promise((resolve) => {
-		setTimeout(async () => {
-			let c2 = cls.create();
-			await c2.start();
-			await begin(2);
-			let id2 = await getById();
-			if (id2 !== 2)
-				throw new Error('2 Unexpected context id : ' + id2);
-			id2 = cls.active.id;
-			if (id2 !== 2)
-				throw new Error('2 Unexpected context id : ' + id2);
-			cls.exit();
-			resolve();
-		}, 500);
-	});
-}
-
-async function getFromDb3() {
-	let c3 = cls.create();
-	await c3.start();
-	await begin(3);
-	let id3 = await getById();
-	if (id3 !== 3)
-		throw new Error('3 Unexpected context id : ' + id3);
-	cls.exit();
-}
-
-
-async function testStart() {
-	await getFromDb();
-}
-
-testStart().then(() => log('done'), (e) => log(e.stack));

package/src/mySql/wrapQueryStream.js

@@ -1,9 +0,0 @@
-function wrapQueryStream(connection) {
-	return runQuery;
-
-	function runQuery(query, options) {
-		return connection.executeQuery(query).stream(options);
-	}
-}
-
-module.exports = wrapQueryStream;

package/src/pg/newStreamableQuery.js

@@ -1,7 +0,0 @@
-var QueryStream;
-
-module.exports = function(sql, params) {
-	if (!QueryStream)
-		QueryStream = require('pg-query-stream');
-	return new QueryStream(sql, params);
-};

package/src/pg/wrapQueryStream.js

@@ -1,20 +0,0 @@
-var log = require('../table/log');
-var replaceParamChar = require('./replaceParamChar');
-var newStreamableQuery = require('./newStreamableQuery');
-
-function wrapQueryStream(connection) {
-	var runOriginalQuery = connection.query;
-	return runQuery;
-
-	function runQuery(query, options) {
-		var params = query.parameters;
-		var sql = replaceParamChar(query, params);
-		log.emitQuery({sql, parameters: params});
-		query = newStreamableQuery(sql, params, options);
-
-		return runOriginalQuery.call(connection, query);
-	}
-
-}
-
-module.exports = wrapQueryStream;

package/src/table/getManyDto/pg/newQuery.js

@@ -1,8 +0,0 @@
-var newQueryCore = require('../../readStream/pg/newQueryCore');
-
-function newQuery() {
-	var query = newQueryCore.apply(null, arguments);
-	return query.prepend('select json_strip_nulls(coalesce(json_agg(row_to_json(r)), \'[]\')) as result from (').append(') r');
-}
-
-module.exports = newQuery;