orange-orm 4.4.0-beta.1 → 4.5.0-beta.0

package/README.md

@@ -40,7 +40,7 @@ If you value the hard work behind Orange and wish to see it evolve further, cons
 ## Installation
 
 ```bash
-$ npm install orange-orm
+npm install orange-orm
 ```  
 
 ## Example
@@ -50,7 +50,7 @@ Watch the [tutorial video on YouTube](https://youtu.be/1IwwjPr2lMs)
 
 Here we choose SQLite.  
 ```bash
-$ npm install sqlite3
+npm install sqlite3
 ```
 <sub>📄 map.ts</sub>
 ```javascript
@@ -280,7 +280,7 @@ In SQLite, columns with the INTEGER PRIMARY KEY attribute are designed to autoin
 
 __SQLite__
 ```bash
-$ npm install sqlite3
+npm install sqlite3
 ```  
 ```javascript
 import map from './map';
@@ -288,7 +288,7 @@ const db = map.sqlite('demo.db');
 ```
 __With connection pool__
 ```bash
-$ npm install sqlite3
+npm install sqlite3
 ```  
 ```javascript
 import map from './map';
@@ -331,7 +331,7 @@ const db = map.mysql('mysql://test:test@mysql/test');
 
 __MS SQL__
 ```bash
-$ npm install tedious
+npm install tedious
 ```  
 ```javascript
 import map from './map';
@@ -353,7 +353,7 @@ const db = map.mssql({
 
 __PostgreSQL__
 ```bash
-$ npm install pg
+npm install pg
 ```  
 ```javascript
 import map from './map';
@@ -361,7 +361,7 @@ const db = map.postgres('postgres://postgres:postgres@postgres/postgres');
 ```
 __Oracle__
 ```bash
-$ npm install oracledb
+npm install oracledb
 ```  
 ```javascript
 import map from './map';
@@ -375,7 +375,7 @@ const db = map.oracle({
 __SAP Adaptive Server__  
 Even though msnodesqlv8 was developed for MS SQL, it also works for SAP ASE as it is ODBC compliant.  
 ```bash
-$ npm install msnodesqlv8
+npm install msnodesqlv8
 ```  
 ```javascript
 import { fileURLToPath } from 'url';

package/docs/changelog.md

@@ -1,4 +1,8 @@
 ## Changelog
+__4.4.0__  
+More performance gains.  
+__4.3.0__  
+Minor performance improvements.  
 __4.2.0__  
 Improved performance.  
 __4.1.4__  

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orange-orm",
-  "version": "4.4.0-beta.1",
+  "version": "4.5.0-beta.0",
   "main": "./src/index.js",
   "browser": "./src/client/index.mjs",
   "bin": {
@@ -48,7 +48,7 @@
     "lint": "eslint ./",
     "fix": "eslint ./ --fix",
     "owasp": "owasp-dependency-check --project \"MY_PROJECT\" --scan \"package-lock.json\" --exclude \"dependency-check-bin\" --out \"owasp\" --format HTML",
-    "beta": "publish --tag beta"
+    "beta": "npm publish --tag beta"
   },
   "dependencies": {
     "@lroal/on-change": "^4.0.2",
@@ -66,7 +66,8 @@
     "node-cls": "^1.0.5",
     "promise": "^8.0.3",
     "rfdc": "^1.2.0",
-    "uuid": "^8.3.2"
+    "uuid": "^8.3.2",
+    "wrangler": "^3.86.0"
   },
   "peerDependencies": {
     "msnodesqlv8": "^4.1.0",
@@ -102,6 +103,8 @@
     }
   },
   "devDependencies": {
+    "@cloudflare/workers-types": "^4.20241106.0",
+    "@miniflare/d1": "^2.14.4",
     "@rollup/plugin-commonjs": "^21.0.1",
     "@rollup/plugin-node-resolve": "^13.0.0",
     "@typescript-eslint/eslint-plugin": "^6.x",

package/src/client/clientMap.js

@@ -39,6 +39,7 @@ function map(index, _fn) {
 	dbMap.sap = throwDb;
 	dbMap.oracle = throwDb;
 	dbMap.sqlite = throwDb;
+	dbMap.d1 = throwDb;
 
 	function throwDb() {
 		throw new Error('Cannot create pool for database outside node');
@@ -65,6 +66,7 @@ function map(index, _fn) {
 	onFinal.sap = () => index({ db: throwDb, providers: dbMap });
 	onFinal.oracle = () => index({ db: throwDb, providers: dbMap });
 	onFinal.sqlite = () => index({ db: throwDb, providers: dbMap });
+	onFinal.d1 = () => index({ db: throwDb, providers: dbMap });
 
 	return new Proxy(onFinal, handler);
 }

package/src/client/createProviders.js

@@ -48,6 +48,11 @@ function createProviders(index) {
 			return createPool.bind(null, 'sqlite');
 		}
 	});
+	Object.defineProperty(dbMap, 'd1', {
+		get:  function() {
+			return createPool.bind(null, 'd1');
+		}
+	});
 	Object.defineProperty(dbMap, 'http', {
 		get:  function() {
 			return createPool.bind(null, 'http');
@@ -97,12 +102,19 @@ function negotiateCachedPool(fn, providers) {
 		get sqlite() {
 			return createPool.bind(null, 'sqlite');
 		},
+		get d1() {
+			return createPool.bind(null, 'd1');
+		},
 		get http() {
 			return createPool.bind(null, 'http');
 		}
 	};
 
 	function createPool(providerName, ...args) {
+		//todo
+		if (providerName === 'd1') {
+			return providers[providerName].apply(null, args);
+		}
 		const key = JSON.stringify(args);
 		if (!cache[providerName])
 			cache[providerName] = {};

package/src/client/index.js

@@ -57,6 +57,7 @@ function rdbClient(options = {}) {
 	client.mssqlNative = onProvider.bind(null, 'mssqlNative');
 	client.pg = onProvider.bind(null, 'pg');
 	client.postgres = onProvider.bind(null, 'postgres');
+	client.d1 = onProvider.bind(null, 'd1');
 	client.sqlite = onProvider.bind(null, 'sqlite');
 	client.sap = onProvider.bind(null, 'sap');
 	client.oracle = onProvider.bind(null, 'oracle');
@@ -128,7 +129,8 @@ function rdbClient(options = {}) {
 	}
 
 	async function query() {
-		return netAdapter(baseUrl, undefined, { tableOptions: { db: baseUrl, transaction } }).query.apply(null, arguments);
+		const adapter = netAdapter(baseUrl, undefined, { tableOptions: { db: baseUrl, transaction } });
+		return adapter.query.apply(null, arguments);
 	}
 
 	function express(arg) {