orange-orm 4.2.0-beta.0 → 4.2.0-beta.2

package/package.json

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

package/src/client/cloneFromDb.js

@@ -0,0 +1,25 @@
+let dateToISOString = require('../dateToISOString');
+
+function cloneFromDb(obj) {
+	if (obj === null || typeof obj !== 'object')
+		return obj;
+	if (Array.isArray(obj)) {
+		const arrClone = [];
+		for (let i = 0; i < obj.length; i++) {
+			arrClone[i] = cloneFromDb(obj[i]);
+		}
+		return arrClone;
+	}
+	else if (obj instanceof Date  && !isNaN(obj))
+		return dateToISOString(obj);
+	const clone = {};
+	const keys = Object.keys(obj);
+	for (let i = 0; i < keys.length; i++) {
+		const key = keys[i];
+		clone[key] = cloneFromDb(obj[key]);
+	}
+	return clone;
+}
+
+
+module.exports = cloneFromDb;

package/src/client/index.js

@@ -228,7 +228,7 @@ function rdbClient(options = {}) {
 			let args = [_, strategy].concat(Array.prototype.slice.call(arguments).slice(2));
 			let rows = await getManyCore.apply(null, args);
 			await metaPromise;
-			return proxify(rows, strategy);
+			return proxify(rows, strategy, {fastStringify : true});
 		}
 
 		async function groupBy(strategy) {
@@ -260,7 +260,7 @@ function rdbClient(options = {}) {
 			await metaPromise;
 			if (rows.length === 0)
 				return;
-			return proxify(rows[0], strategy);
+			return proxify(rows[0], strategy, {fastStringify : true});
 		}
 
 		async function getById() {
@@ -448,14 +448,14 @@ function rdbClient(options = {}) {
 		}
 
 
-		function proxify(itemOrArray, strategy) {
+		function proxify(itemOrArray, strategy, options) {
 			if (Array.isArray(itemOrArray))
-				return proxifyArray(itemOrArray, strategy);
+				return proxifyArray(itemOrArray, strategy, options);
 			else
-				return proxifyRow(itemOrArray, strategy);
+				return proxifyRow(itemOrArray, strategy, options);
 		}
 
-		function proxifyArray(array, strategy) {
+		function proxifyArray(array, strategy, { fastStringify } = {}) {
 			let _array = array;
 			if (_reactive)
 				array = _reactive(array);
@@ -483,7 +483,7 @@ function rdbClient(options = {}) {
 
 			};
 			let innerProxy = new Proxy(array, handler);
-			rootMap.set(array, { json: stringify(array), strategy, originalArray: [...array] });
+			rootMap.set(array, { json: fastStringify ? JSON.stringify(array) : stringify(array), strategy, originalArray: [...array] });
 			if (strategy !== undefined) {
 				const { limit, ...cleanStrategy } = { ...strategy };
 				fetchingStrategyMap.set(array, cleanStrategy);
@@ -491,7 +491,7 @@ function rdbClient(options = {}) {
 			return innerProxy;
 		}
 
-		function proxifyRow(row, strategy) {
+		function proxifyRow(row, strategy, { fastStringify } = {}) {
 			let handler = {
 				get(_target, property,) {
 					if (property === 'save' || property === 'saveChanges') //call server then acceptChanges
@@ -516,7 +516,7 @@ function rdbClient(options = {}) {
 
 			};
 			let innerProxy = new Proxy(row, handler);
-			rootMap.set(row, { json: stringify(row), strategy });
+			rootMap.set(row, { json: fastStringify ? JSON.stringify(row) : stringify(row), strategy });
 			fetchingStrategyMap.set(row, strategy);
 			return innerProxy;
 		}

package/src/client/index.mjs

@@ -3607,7 +3607,7 @@ function isAbsoluteURL(url) {
  */
 function combineURLs(baseURL, relativeURL) {
   return relativeURL
-    ? baseURL.replace(/\/+$/, '') + '/' + relativeURL.replace(/^\/+/, '')
+    ? baseURL.replace(/\/?\/$/, '') + '/' + relativeURL.replace(/^\/+/, '')
     : baseURL;
 }
 
@@ -4241,7 +4241,7 @@ function mergeConfig(config1, config2) {
   return config;
 }
 
-const VERSION = "1.6.2";
+const VERSION = "1.6.3";
 
 const validators$1 = {};
 
@@ -4857,7 +4857,7 @@ function httpAdapter(baseURL, path, axiosInterceptor) {
 			const res = await axios.request(path, { headers, method: 'patch', data: body });
 			return res.data;
 		}
-		catch (e) {			
+		catch (e) {
 			if (typeof e.response?.data === 'string')
 				throw new Error(e.response.data.replace(/^Error: /, ''));
 			else
@@ -5524,7 +5524,7 @@ function rdbClient(options = {}) {
 			let args = [_, strategy].concat(Array.prototype.slice.call(arguments).slice(2));
 			let rows = await getManyCore.apply(null, args);
 			await metaPromise;
-			return proxify(rows, strategy);
+			return proxify(rows, strategy, {fastStringify : true});
 		}
 
 		async function groupBy(strategy) {
@@ -5556,7 +5556,7 @@ function rdbClient(options = {}) {
 			await metaPromise;
 			if (rows.length === 0)
 				return;
-			return proxify(rows[0], strategy);
+			return proxify(rows[0], strategy, {fastStringify : true});
 		}
 
 		async function getById() {
@@ -5744,14 +5744,14 @@ function rdbClient(options = {}) {
 		}
 
 
-		function proxify(itemOrArray, strategy) {
+		function proxify(itemOrArray, strategy, options) {
 			if (Array.isArray(itemOrArray))
-				return proxifyArray(itemOrArray, strategy);
+				return proxifyArray(itemOrArray, strategy, options);
 			else
-				return proxifyRow(itemOrArray, strategy);
+				return proxifyRow(itemOrArray, strategy, options);
 		}
 
-		function proxifyArray(array, strategy) {
+		function proxifyArray(array, strategy, { fastStringify } = {}) {
 			let _array = array;
 			if (_reactive)
 				array = _reactive(array);
@@ -5779,7 +5779,7 @@ function rdbClient(options = {}) {
 
 			};
 			let innerProxy = new Proxy(array, handler);
-			rootMap.set(array, { json: stringify(array), strategy, originalArray: [...array] });
+			rootMap.set(array, { json: fastStringify ? JSON.stringify(array) : stringify(array), strategy, originalArray: [...array] });
 			if (strategy !== undefined) {
 				const { limit, ...cleanStrategy } = { ...strategy };
 				fetchingStrategyMap.set(array, cleanStrategy);
@@ -5787,7 +5787,7 @@ function rdbClient(options = {}) {
 			return innerProxy;
 		}
 
-		function proxifyRow(row, strategy) {
+		function proxifyRow(row, strategy, { fastStringify } = {}) {
 			let handler = {
 				get(_target, property,) {
 					if (property === 'save' || property === 'saveChanges') //call server then acceptChanges
@@ -5812,7 +5812,7 @@ function rdbClient(options = {}) {
 
 			};
 			let innerProxy = new Proxy(row, handler);
-			rootMap.set(row, { json: stringify(row), strategy });
+			rootMap.set(row, { json: fastStringify ? JSON.stringify(row) : stringify(row), strategy });
 			fetchingStrategyMap.set(row, strategy);
 			return innerProxy;
 		}

package/src/getManyDto.js

@@ -123,8 +123,6 @@ async function decode(strategy, span, rows, keys = rows.length > 0 ? Object.keys
 			}
 			const column = columns[j];
 			outRow[column.alias] = column.decode(row[keys[j]]);
-			if (shouldCreateMap)
-				fkIds[i] = getIds(outRow);
 		}
 
 		for (let j = 0; j < aggregateKeys.length; j++) {
@@ -134,15 +132,16 @@ async function decode(strategy, span, rows, keys = rows.length > 0 ? Object.keys
 		}
 
 		outRows[i] = outRow;
-		if (shouldCreateMap)
+		if (shouldCreateMap) {
+			fkIds[i] = getIds(outRow);
 			addToMap(rowsMap, primaryColumns, outRow);
+		}
 	}
 	span._rowsMap = rowsMap;
 	span._ids = fkIds;
 
-	for (let i = 0; i < columnsLength + aggregateKeys.length; i++) {
-		keys.shift();
-	}
+	keys.splice(0, columnsLength + aggregateKeys.length);
+
 	await decodeRelations(strategy, span, rows, outRows, keys);
 	return outRows;