orange-orm 4.1.4 → 4.2.0-beta.1

package/README.md

@@ -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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orange-orm",
-  "version": "4.1.4",
+  "version": "4.2.0-beta.1",
   "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

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

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,8 +132,10 @@ 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;