orange-orm 4.1.3 → 4.2.0-beta.0

package/README.md

@@ -2,7 +2,7 @@
 <img src="./docs/orange.svg" alt="Orange ORM Logo" width="250"/>
 </div>
 
-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.  
+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)
@@ -20,7 +20,7 @@ The ultimate Object Relational Mapper for Node.js and Typescript, offering seaml
 - **Active Record**: With a concise and expressive syntax, Orange enables you to interact with your database using the [*Active Record Pattern*](https://en.wikipedia.org/wiki/Active_record_pattern).
 - **No Code Generation Required**: Enjoy full IntelliSense, even in table mappings, without the need for cumbersome code generation.
 - **TypeScript and JavaScript Support**: Orange fully supports both TypeScript and JavaScript, allowing you to leverage the benefits of static typing and modern ECMAScript features.
-- **Works in the Browser**: You can securely use Orange in the browser by utilizing the Express.js plugin, which serves to safeguard sensitive database credentials from exposure at the client level. This method mirrors a traditional REST API, augmented with advanced TypeScript tooling for enhanced functionality.
+- **Works in the Browser**: You can securely use Orange in the browser by utilizing the Express.js plugin, which serves to safeguard sensitive database credentials from exposure at the client level and protect against SQL injection. This method mirrors a traditional REST API, augmented with advanced TypeScript tooling for enhanced functionality.
 
 ## Supported Databases
 
@@ -139,7 +139,7 @@ getRows();
 async function getRows() {
   const orders = await db.order.getAll({
     where: x => x.lines.any(line => line.product.contains('broomstick'))
-      .and(db.order.customer.name.startsWith('Harry')),
+      .and(x.customer.name.startsWith('Harry')),
     lines: {
       packages: true
     },
@@ -831,7 +831,7 @@ async function update() {
   };
 
   const modified = JSON.parse(JSON.stringify(original));
-  deliveryAddress.name = 'Roger';
+  modified.deliveryAddress.name = 'Roger';
   modified.lines.push({ product: 'Piano', amount: 800 });
 
   const order = await db.order.updateChanges(modified, original, { customer: true, deliveryAddress: true, lines: true });

package/docs/changelog.md

@@ -1,4 +1,6 @@
 ## Changelog
+__4.1.4__  
+Better error message when running over http.  
 __4.1.3__  
 Do not use transaction in readonly operations. [#109](https://github.com/alfateam/orange-orm/issues/109)  
 __4.1.2__  

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orange-orm",
-  "version": "4.1.3",
+  "version": "4.2.0-beta.0",
   "main": "./src/index.js",
   "browser": "./src/client/index.mjs",
   "bin": {

package/src/client/index.mjs

@@ -4842,8 +4842,8 @@ function httpAdapter(baseURL, path, axiosInterceptor) {
 			return res.data;
 		}
 		catch (e) {
-			if (e.response?.data)
-				throw new Error(e.response?.data.replace(/^Error: /, ''));
+			if (typeof e.response?.data === 'string')
+				throw new Error(e.response.data.replace(/^Error: /, ''));
 			else
 				throw e;
 		}
@@ -4857,9 +4857,9 @@ function httpAdapter(baseURL, path, axiosInterceptor) {
 			const res = await axios.request(path, { headers, method: 'patch', data: body });
 			return res.data;
 		}
-		catch (e) {
-			if (e.response?.data)
-				throw new Error(e.response?.data.replace(/^Error: /, ''));
+		catch (e) {			
+			if (typeof e.response?.data === 'string')
+				throw new Error(e.response.data.replace(/^Error: /, ''));
 			else
 				throw e;
 		}
@@ -4874,8 +4874,8 @@ function httpAdapter(baseURL, path, axiosInterceptor) {
 			return res.data;
 		}
 		catch (e) {
-			if (e.response?.data)
-				throw new Error(e.response?.data.replace(/^Error: /, ''));
+			if (typeof e.response?.data === 'string')
+				throw new Error(e.response.data.replace(/^Error: /, ''));
 			else throw e;
 		}
 	}

package/src/client/netAdapter.js

@@ -22,8 +22,8 @@ function httpAdapter(baseURL, path, axiosInterceptor) {
 			return res.data;
 		}
 		catch (e) {
-			if (e.response?.data)
-				throw new Error(e.response?.data.replace(/^Error: /, ''));
+			if (typeof e.response?.data === 'string')
+				throw new Error(e.response.data.replace(/^Error: /, ''));
 			else
 				throw e;
 		}
@@ -38,8 +38,8 @@ function httpAdapter(baseURL, path, axiosInterceptor) {
 			return res.data;
 		}
 		catch (e) {
-			if (e.response?.data)
-				throw new Error(e.response?.data.replace(/^Error: /, ''));
+			if (typeof e.response?.data === 'string')
+				throw new Error(e.response.data.replace(/^Error: /, ''));
 			else
 				throw e;
 		}
@@ -54,8 +54,8 @@ function httpAdapter(baseURL, path, axiosInterceptor) {
 			return res.data;
 		}
 		catch (e) {
-			if (e.response?.data)
-				throw new Error(e.response?.data.replace(/^Error: /, ''));
+			if (typeof e.response?.data === 'string')
+				throw new Error(e.response.data.replace(/^Error: /, ''));
 			else throw e;
 		}
 	}