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

package/package.json

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

package/src/client/index.js

@@ -1,6 +1,5 @@
 const createPatch = require('./createPatch');
 const stringify = require('./stringify');
-const cloneFromDb = require('./cloneFromDb');
 const netAdapter = require('./netAdapter');
 const toKeyPositionMap = require('./toKeyPositionMap');
 const rootMap = new WeakMap();
@@ -229,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) {
@@ -261,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() {
@@ -449,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);
@@ -484,8 +483,7 @@ function rdbClient(options = {}) {
 
 			};
 			let innerProxy = new Proxy(array, handler);
-			//todo
-			rootMap.set(array, { json: cloneFromDb(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);
@@ -493,18 +491,18 @@ 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
 						return saveRow.bind(null, row);
-					else if (property === 'delete') //call server then remove from json and original
+					else if (property === 'delete') //call server then remove from jsonMap and original
 						return deleteRow.bind(null, row);
 					else if (property === 'refresh') //refresh from server then acceptChanges
 						return refreshRow.bind(null, row);
-					else if (property === 'clearChanges') //refresh from json, update original if present
+					else if (property === 'clearChanges') //refresh from jsonMap, update original if present
 						return clearChangesRow.bind(null, row);
-					else if (property === 'acceptChanges') //remove from json
+					else if (property === 'acceptChanges') //remove from jsonMap
 						return acceptChangesRow.bind(null, row);
 					else if (property === 'toJSON')
 						return () => {
@@ -518,7 +516,7 @@ function rdbClient(options = {}) {
 
 			};
 			let innerProxy = new Proxy(row, handler);
-			rootMap.set(row, { json: cloneFromDb(row), strategy });
+			rootMap.set(row, { json: fastStringify ? JSON.stringify(row) : stringify(row), strategy });
 			fetchingStrategyMap.set(row, strategy);
 			return innerProxy;
 		}
@@ -593,7 +591,7 @@ function rdbClient(options = {}) {
 			strategy = extractFetchingStrategy(array, strategy);
 
 			let meta = await getMeta();
-			const patch = createPatch(json, array, meta);
+			const patch = createPatch(JSON.parse(json), array, meta);
 			if (patch.length === 0)
 				return;
 			let body = stringify({ patch, options: { strategy, ...tableOptions, ...concurrencyOptions, deduceStrategy } });
@@ -608,7 +606,7 @@ function rdbClient(options = {}) {
 			let insertedPositions = getInsertedRowsPosition(array);
 			let { changed, strategy: newStrategy } = await p;
 			copyIntoArray(changed, array, [...insertedPositions, ...updatedPositions]);
-			rootMap.set(array, { json: cloneFromDb(array), strategy: newStrategy, originalArray: [...array] });
+			rootMap.set(array, { json: stringify(array), strategy: newStrategy, originalArray: [...array] });
 		}
 
 		async function patch(patch, concurrencyOptions, strategy) {
@@ -688,13 +686,13 @@ function rdbClient(options = {}) {
 
 		function clearChangesArray(array) {
 			let { json } = rootMap.get(array);
-			let old = cloneFromDb(json);
+			let old = JSON.parse(json);
 			array.splice(0, old.length, ...old);
 		}
 
 		function acceptChangesArray(array) {
 			const map = rootMap.get(array);
-			map.json = cloneFromDb(array);
+			map.json = stringify(array);
 			map.originalArray = [...array];
 		}
 
@@ -707,7 +705,7 @@ function rdbClient(options = {}) {
 			let adapter = netAdapter(url, tableName, { axios: axiosInterceptor, tableOptions });
 			let { strategy } = await adapter.patch(body);
 			array.length = 0;
-			rootMap.set(array, { json: cloneFromDb(array), strategy });
+			rootMap.set(array, { jsonMap: stringify(array), strategy });
 		}
 
 		function setMapValue(rowsMap, keys, row, index) {
@@ -770,7 +768,7 @@ function rdbClient(options = {}) {
 				array.splice(i + offset, 1);
 				offset--;
 			}
-			rootMap.set(array, { json: cloneFromDb(array), strategy, originalArray: [...array] });
+			rootMap.set(array, { json: stringify(array), strategy, originalArray: [...array] });
 			fetchingStrategyMap.set(array, strategy);
 		}
 
@@ -796,7 +794,7 @@ function rdbClient(options = {}) {
 				return;
 			let meta = await getMeta();
 
-			let patch = createPatch([json], [row], meta);
+			let patch = createPatch([JSON.parse(json)], [row], meta);
 			if (patch.length === 0)
 				return;
 
@@ -805,7 +803,7 @@ function rdbClient(options = {}) {
 			let adapter = netAdapter(url, tableName, { axios: axiosInterceptor, tableOptions });
 			let { changed, strategy: newStrategy } = await adapter.patch(body);
 			copyInto(changed, [row]);
-			rootMap.set(row, { json: cloneFromDb(row), strategy: newStrategy });
+			rootMap.set(row, { json: stringify(row), strategy: newStrategy });
 		}
 
 		async function refreshRow(row, strategy) {
@@ -829,20 +827,20 @@ function rdbClient(options = {}) {
 			for (let p in rows[0]) {
 				row[p] = rows[0][p];
 			}
-			rootMap.set(row, { json: cloneFromDb(row), strategy });
+			rootMap.set(row, { json: stringify(row), strategy });
 			fetchingStrategyMap.set(row, strategy);
 		}
 
 		function acceptChangesRow(row) {
 			const { strategy } = rootMap.get(row);
-			rootMap.set(row, { json: cloneFromDb(row), strategy });
+			rootMap.set(row, { json: stringify(row), strategy });
 		}
 
 		function clearChangesRow(row) {
 			let { json } = rootMap.get(row);
 			if (!json)
 				return;
-			let old = cloneFromDb(json);
+			let old = JSON.parse(json);
 			for (let p in row) {
 				delete row[p];
 			}

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

@@ -140,9 +140,8 @@ async function decode(strategy, span, rows, keys = rows.length > 0 ? Object.keys
 	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;