orange-orm 4.2.0-beta.3 → 4.2.0-beta.5

package/package.json

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

package/src/client/cloneFromDb.js

@@ -1,12 +1,31 @@
 let dateToISOString = require('../dateToISOString');
 
-function cloneFromDb(obj) {
+function cloneFromDbFast(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]);
+			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) {
+	if (obj === null || typeof obj !== 'object')
+		return obj;
+	if (Array.isArray(obj)) {
+		const arrClone = [];
+		for (let i = 0; i < obj.length; i++) {
+			arrClone[i] = cloneRegular(obj[i]);
 		}
 		return arrClone;
 	}
@@ -16,10 +35,16 @@ function cloneFromDb(obj) {
 	const keys = Object.keys(obj);
 	for (let i = 0; i < keys.length; i++) {
 		const key = keys[i];
-		clone[key] = cloneFromDb(obj[key]);
+		clone[key] = cloneRegular(obj[key]);
 	}
 	return clone;
 }
 
+function cloneFromDb(obj, isFast) {
+	if (isFast)
+		return cloneFromDbFast(obj);
+	else
+		return cloneRegular(obj);
+}
 
 module.exports = cloneFromDb;

package/src/client/index.js

@@ -229,7 +229,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, {fast: true});
+			return proxify(rows, strategy, true);
 		}
 
 		async function groupBy(strategy) {
@@ -261,7 +261,7 @@ function rdbClient(options = {}) {
 			await metaPromise;
 			if (rows.length === 0)
 				return;
-			return proxify(rows[0], strategy, {fast: true});
+			return proxify(rows[0], strategy, true);
 		}
 
 		async function getById() {
@@ -449,14 +449,14 @@ function rdbClient(options = {}) {
 		}
 
 
-		function proxify(itemOrArray, strategy, options) {
+		function proxify(itemOrArray, strategy, fast) {
 			if (Array.isArray(itemOrArray))
-				return proxifyArray(itemOrArray, strategy, options);
+				return proxifyArray(itemOrArray, strategy, fast);
 			else
-				return proxifyRow(itemOrArray, strategy, options);
+				return proxifyRow(itemOrArray, strategy, fast);
 		}
 
-		function proxifyArray(array, strategy,  { fast } = { }) {
+		function proxifyArray(array, strategy, fast) {
 			let _array = array;
 			if (_reactive)
 				array = _reactive(array);
@@ -483,9 +483,12 @@ function rdbClient(options = {}) {
 				}
 
 			};
-			let innerProxy = new Proxy(array, handler);
+
+			let watcher = onChange(array, () => {
+				rootMap.set(array, { json: cloneFromDb(array, fast), strategy, originalArray: [...array] });
+			});
+			let innerProxy = new Proxy(watcher, handler);
 			//todo
-			rootMap.set(array, { json: fast ? structuredClone(array) : cloneFromDb(array), strategy, originalArray: [...array] });
 			if (strategy !== undefined) {
 				const { limit, ...cleanStrategy } = { ...strategy };
 				fetchingStrategyMap.set(array, cleanStrategy);
@@ -493,7 +496,7 @@ function rdbClient(options = {}) {
 			return innerProxy;
 		}
 
-		function proxifyRow(row, strategy, { fast } = {}) {
+		function proxifyRow(row, strategy, fast) {
 			let handler = {
 				get(_target, property,) {
 					if (property === 'save' || property === 'saveChanges') //call server then acceptChanges
@@ -517,8 +520,10 @@ function rdbClient(options = {}) {
 				}
 
 			};
-			let innerProxy = new Proxy(row, handler);
-			rootMap.set(row, { json: fast ? structuredClone(row) : cloneFromDb(row), 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;
 		}
@@ -1004,4 +1009,31 @@ 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);
+
+		}
+
+
+	};
+
+	return new Proxy(target, handler);
+}
+
+
 module.exports = rdbClient();