orange-orm 4.5.0-beta.1 → 4.5.0-beta.3

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,22 @@ import map from './map';
 
 const db = map.http('http://localhost:3000/orange');
 ```
+__Cloudflare D1__  
+<sub>📄 wrangler.toml</sub>  
+```toml
+# 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>"
+```
+
+```javascript
+import map from './map';
+// Must match the binding name in wrangler.toml
+const db = map.d1(env.DB);
+```
 __MySQL__
 ```bash
 $ npm install mysql2
@@ -1580,6 +1597,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 +1616,7 @@ async function execute() {
 }
 
 ```
+
 </details>
 
 <details><summary><strong>Data types</strong></summary>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orange-orm",
-  "version": "4.5.0-beta.1",
+  "version": "4.5.0-beta.3",
   "main": "./src/index.js",
   "browser": "./src/client/index.mjs",
   "bin": {
@@ -19,7 +19,6 @@
     "mssql",
     "Microsoft Sql Server",
     "PostgreSql",
-    "Cloudflare D1",
     "Postgres",
     "pg",
     "sap",
@@ -107,7 +106,8 @@
   "devDependencies": {
     "@cloudflare/workers-types": "^4.20241106.0",
     "@miniflare/d1": "^2.14.4",
-    "@rollup/plugin-commonjs": "^21.0.1",
+    "@rollup/plugin-commonjs": "^28.0.2",
+    "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-node-resolve": "^13.0.0",
     "@typescript-eslint/eslint-plugin": "^6.x",
     "@typescript-eslint/parser": "^6.x",

package/src/applyPatch.js

@@ -1,6 +1,4 @@
 const fastjson = require('fast-json-patch');
-let { inspect } = require('util');
-let assert = require('assert');
 let fromCompareObject = require('./fromCompareObject');
 let toCompareObject = require('./toCompareObject');
 
@@ -43,12 +41,12 @@ function applyPatch({ options = {} }, dto, changes, column) {
 						assertDatesEqual(oldValue, expectedOldValue);
 					}
 					else
-						assert.deepEqual(oldValue, expectedOldValue);
+						assertDeepEqual(oldValue, expectedOldValue);
 				}
 				catch (e) {
 					if (concurrency === 'skipOnConflict')
 						return false;
-					throw new Error(`The field ${change.path.replace('/', '')} was changed by another user. Expected ${inspect(fromCompareObject(expectedOldValue), false, 10)}, but was ${inspect(fromCompareObject(oldValue), false, 10)}.`);
+					throw new Error(`The field ${change.path.replace('/', '')} was changed by another user. Expected ${inspect(fromCompareObject(expectedOldValue))}, but was ${inspect(fromCompareObject(oldValue))}.`);
 				}
 			}
 			return true;
@@ -99,7 +97,16 @@ 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) {
+	return JSON.stringify(obj, null, 2);
 }
 
 module.exports = applyPatch;