orange-orm 4.2.0-beta.4 → 4.2.0-beta.6

package/package.json

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

package/src/client/cloneFromDb.js

@@ -1,9 +1,22 @@
 let dateToISOString = require('../dateToISOString');
 
 function cloneFromDbFast(obj) {
-	if (obj === null || typeof obj !== 'object') return obj;
-	if (Array.isArray(obj)) return obj.map(cloneFromDbFast);
-	return Object.fromEntries(Object.entries(obj).map(([key, value]) => [key, cloneFromDbFast(value)]));
+	if (obj === null || typeof obj !== 'object')
+		return obj;
+	if (Array.isArray(obj)) {
+		const arrClone = [];
+		for (let i = 0; i < obj.length; i++) {
+			arrClone[i] = cloneFromDbFast(obj[i]);
+		}
+		return arrClone;
+	}
+	const clone = {};
+	const keys = Object.keys(obj);
+	for (let i = 0; i < keys.length; i++) {
+		const key = keys[i];
+		clone[key] = cloneFromDbFast(obj[key]);
+	}
+	return clone;
 }
 
 function cloneRegular(obj) {

package/src/client/index.js

@@ -483,9 +483,11 @@ function rdbClient(options = {}) {
 				}
 
 			};
-			let innerProxy = new Proxy(array, handler);
-			//todo
-			rootMap.set(array, { json: cloneFromDb(array, fast), strategy, originalArray: [...array] });
+
+			let watcher = onChange(array, () => {
+				rootMap.set(array, { json: cloneFromDb(array, fast), strategy, originalArray: [...array] });
+			});
+			let innerProxy = new Proxy(watcher, handler);
 			if (strategy !== undefined) {
 				const { limit, ...cleanStrategy } = { ...strategy };
 				fetchingStrategyMap.set(array, cleanStrategy);
@@ -517,8 +519,10 @@ function rdbClient(options = {}) {
 				}
 
 			};
-			let innerProxy = new Proxy(row, handler);
-			rootMap.set(row, { json: cloneFromDb(row, fast), strategy });
+			let watcher = onChange(row, () => {
+				rootMap.set(row, { json: cloneFromDb(row, fast), strategy });
+			});
+			let innerProxy = new Proxy(watcher, handler);
 			fetchingStrategyMap.set(row, strategy);
 			return innerProxy;
 		}
@@ -588,7 +592,9 @@ function rdbClient(options = {}) {
 
 		async function saveArray(array, concurrencyOptions, strategy) {
 			let deduceStrategy = false;
-			let { json } = rootMap.get(array);
+			let json = rootMap.get(array)?.json;
+			if (!json)
+				return;
 			strategy = extractStrategy({ strategy }, array);
 			strategy = extractFetchingStrategy(array, strategy);
 
@@ -668,7 +674,7 @@ function rdbClient(options = {}) {
 				return options.strategy;
 			if (obj) {
 				let context = rootMap.get(obj);
-				if (context.strategy !== undefined) {
+				if (context?.strategy !== undefined) {
 					// @ts-ignore
 					let { limit, ...strategy } = { ...context.strategy };
 					return strategy;
@@ -687,13 +693,17 @@ function rdbClient(options = {}) {
 		}
 
 		function clearChangesArray(array) {
-			let { json } = rootMap.get(array);
+			let json = rootMap.get(array)?.json;
+			if (!json)
+				return;
 			let old = cloneFromDb(json);
 			array.splice(0, old.length, ...old);
 		}
 
 		function acceptChangesArray(array) {
 			const map = rootMap.get(array);
+			if (!map)
+				return;
 			map.json = cloneFromDb(array);
 			map.originalArray = [...array];
 		}
@@ -791,7 +801,7 @@ function rdbClient(options = {}) {
 			strategy = extractStrategy({ strategy }, row);
 			strategy = extractFetchingStrategy(row, strategy);
 
-			let { json } = rootMap.get(row);
+			let json = rootMap.get(row)?.json;
 			if (!json)
 				return;
 			let meta = await getMeta();
@@ -834,12 +844,15 @@ function rdbClient(options = {}) {
 		}
 
 		function acceptChangesRow(row) {
-			const { strategy } = rootMap.get(row);
+			const data = rootMap.get(row);
+			if (!data)
+				return;
+			const { strategy } = data;
 			rootMap.set(row, { json: cloneFromDb(row), strategy });
 		}
 
 		function clearChangesRow(row) {
-			let { json } = rootMap.get(row);
+			let json = rootMap.get(row)?.json;
 			if (!json)
 				return;
 			let old = cloneFromDb(json);
@@ -1004,4 +1017,36 @@ function column(path, ...previous) {
 
 }
 
+function onChange(target, onChange) {
+
+	let  notified = false;
+	const handler = {
+		get(target, prop, receiver) {
+			const value = Reflect.get(target, prop, receiver);
+			if (typeof value === 'object' && value !== null) {
+				return new Proxy(value, handler);
+			}
+			return value;
+		},
+		set(target, prop, value, receiver) {
+			if (!notified) {
+				notified = true;
+				onChange(JSON.stringify(target));
+			}
+			return Reflect.set(target, prop, value, receiver);
+
+		},
+		deleteProperty(target, prop) {
+			if (!notified) {
+				notified = true;
+				onChange(JSON.stringify(target));
+			}
+			return Reflect.deleteProperty(target, prop);
+		}
+	};
+
+	return new Proxy(target, handler);
+}
+
+
 module.exports = rdbClient();