orange-orm 4.5.0-beta.3 → 4.5.0

package/README.md

@@ -5,7 +5,7 @@
 The ultimate Object Relational Mapper for Node.js and Typescript, offering seamless integration with a variety of popular databases. Whether you're building applications in TypeScript or JavaScript, including both CommonJS and ECMAScript, Orange ORM has got you covered.  
 
 [![npm version](https://img.shields.io/npm/v/orange-orm.svg?style=flat-square)](https://www.npmjs.org/package/orange-orm)
-[![Build status](https://github.com/alfateam/orange-orm/workflows/Node.js%20CI/badge.svg)](https://github.com/alfateam/orange-orm/actions)
+[![Build status](https://github.com/alfateam/orange-orm/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/alfateam/orange-orm/actions)
 [![Coverage Badge](https://img.shields.io/endpoint?url=https://gist.githubusercontent.com/lroal/1a69422f03da7f8155cf94fe66022452/raw/rdb__heads_master.json)](https://github.com/alfateam/orange-orm/actions)
 [![Github](https://img.shields.io/endpoint?url=https://gist.githubusercontent.com/lroal/1ccb2b79abbe0258d636e9b5e4630a1a/raw/rdb__heads_master.json)](https://github.com/alfateam/orange-orm)
 [![GitHub Discussions](https://img.shields.io/github/discussions/alfateam/orange-orm)](https://github.com/alfateam/orange-orm/discussions)
@@ -320,22 +320,7 @@ 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
@@ -381,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>📄 src/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

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/docs/docs.md

@@ -1,4 +1,5 @@
 All examples below are found at [npmjs.org/package/rdb-demo](https://npmjs.org/package/rdb-demo).  
+The _Classic mode_ is only available below version 4.5.0.  
 This is the _Classic Documentation_.  Are you looking for the [_Modern Typescript Documentation_](https://github.com/alfateam/orange-orm/blob/master/README.md) ?
 ---------------
 __Connecting__  

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orange-orm",
-  "version": "4.5.0-beta.3",
+  "version": "4.5.0",
   "main": "./src/index.js",
   "browser": "./src/client/index.mjs",
   "bin": {
@@ -54,6 +54,7 @@
     "@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",
@@ -62,10 +63,8 @@
     "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",
@@ -103,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/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;