orange-orm 4.7.17-beta.0 → 4.8.0

package/dist/index.browser.mjs

@@ -2395,6 +2395,8 @@ function requireNetAdapter () {
 	}
 
 	function netAdapter(url, tableName, { axios, tableOptions }) {
+		if (tableOptions.transaction?.done)
+			delete tableOptions.transaction;
 
 		let c = {
 			get,
@@ -2841,8 +2843,10 @@ function requireClient () {
 
 			try {
 				const nextClient = client({ transaction });
-				await fn(nextClient);
+				const result = await fn(nextClient);
+				transaction.done = true;
 				await transaction(transaction.commit);
+				return result;
 			}
 			catch (e) {
 				await transaction(transaction.rollback.bind(null, e));
@@ -3482,7 +3486,6 @@ function requireClient () {
 					return;
 
 				let body = stringify({ patch, options: { ...tableOptions, ...concurrencyOptions, strategy, deduceStrategy } });
-
 				let adapter = netAdapter(url, tableName, { axios: axiosInterceptor, tableOptions });
 				let { changed, strategy: newStrategy } = await adapter.patch(body);
 				copyInto(changed, [row]);

package/dist/index.mjs

@@ -2396,6 +2396,8 @@ function requireNetAdapter () {
 	}
 
 	function netAdapter(url, tableName, { axios, tableOptions }) {
+		if (tableOptions.transaction?.done)
+			delete tableOptions.transaction;
 
 		let c = {
 			get,
@@ -2842,8 +2844,10 @@ function requireClient () {
 
 			try {
 				const nextClient = client({ transaction });
-				await fn(nextClient);
+				const result = await fn(nextClient);
+				transaction.done = true;
 				await transaction(transaction.commit);
+				return result;
 			}
 			catch (e) {
 				await transaction(transaction.rollback.bind(null, e));
@@ -3483,7 +3487,6 @@ function requireClient () {
 					return;
 
 				let body = stringify({ patch, options: { ...tableOptions, ...concurrencyOptions, strategy, deduceStrategy } });
-
 				let adapter = netAdapter(url, tableName, { axios: axiosInterceptor, tableOptions });
 				let { changed, strategy: newStrategy } = await adapter.patch(body);
 				copyInto(changed, [row]);

package/docs/changelog.md

@@ -1,4 +1,6 @@
 ## Changelog
+__4.7.17__  
+Export PostgreSQL provider in browser bundle for Cloudflare Workers compatibility  
 __4.7.16__  
 Support msnodesqlv8@5.0.0  
 __4.7.15__  

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "orange-orm",
-    "version": "4.7.17-beta.0",
+    "version": "4.8.0",
     "publishConfig": {
         "access": "public"
     },
@@ -54,7 +54,7 @@
     "scripts": {
         "test": "vitest run --pool=forks --poolOptions.forks.singleFork",
         "test:bun": "bun test --timeout=30000 ./tests/*.bun.test.js",
-        "test:deno": "deno test --allow-all --unstable-detect-cjs ./tests/*.deno.test.js",
+        "test:deno": "deno test --allow-all --no-check --unstable-detect-cjs ./tests/*.deno.test.js",
         "test:all": "echo 'Running Node.js tests...' && npm run test:node && echo 'Running Bun tests...' && npm run test:bun && echo 'Running Deno tests...' && npm run test:deno && echo 'All tests completed!'",
         "test:all:parallel": "concurrently \"npm:test:node\" \"npm:test:bun\" \"npm:test:deno\"",
         "coverage": "vitest run --coverage.enabled --coverage.reporter='text-summary' --pool=forks --poolOptions.forks.singleFork",

package/src/client/index.js

@@ -179,8 +179,10 @@ function rdbClient(options = {}) {
 
 		try {
 			const nextClient = client({ transaction });
-			await fn(nextClient);
+			const result = await fn(nextClient);
+			transaction.done = true;
 			await transaction(transaction.commit);
+			return result;
 		}
 		catch (e) {
 			await transaction(transaction.rollback.bind(null, e));
@@ -820,7 +822,6 @@ function rdbClient(options = {}) {
 				return;
 
 			let body = stringify({ patch, options: { ...tableOptions, ...concurrencyOptions, strategy, deduceStrategy } });
-
 			let adapter = netAdapter(url, tableName, { axios: axiosInterceptor, tableOptions });
 			let { changed, strategy: newStrategy } = await adapter.patch(body);
 			copyInto(changed, [row]);

package/src/client/netAdapter.js

@@ -71,6 +71,8 @@ function httpAdapter(baseURL, path, axiosInterceptor) {
 }
 
 function netAdapter(url, tableName, { axios, tableOptions }) {
+	if (tableOptions.transaction?.done)
+		delete tableOptions.transaction;
 
 	let c = {
 		get,

package/src/map2.d.ts

@@ -910,9 +910,9 @@ export type DBClient<M extends Record<string, TableDefinition<M>>> = {
   (
     config?: DbOptions<M>
   ): DBClient<M>;
-  transaction(
-		fn: (db: DBClient<M>) => Promise<unknown>
-	): Promise<void>;
+  transaction<TR = unknown>(
+    fn: (db: DBClient<M>) => Promise<TR> | TR
+  ): Promise<TR>;
   express(): import('express').RequestHandler;
   express(config: ExpressConfig<M>): import('express').RequestHandler;
   readonly metaData: DbConcurrency<M>;