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

package/package.json

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

package/src/client/index.js

@@ -488,7 +488,6 @@ function rdbClient(options = {}) {
 				rootMap.set(array, { json: cloneFromDb(array, fast), strategy, originalArray: [...array] });
 			});
 			let innerProxy = new Proxy(watcher, handler);
-			//todo
 			if (strategy !== undefined) {
 				const { limit, ...cleanStrategy } = { ...strategy };
 				fetchingStrategyMap.set(array, cleanStrategy);
@@ -593,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);
 
@@ -673,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;
@@ -692,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];
 		}
@@ -796,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();
@@ -839,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);
@@ -1027,9 +1035,14 @@ function onChange(target, onChange) {
 			}
 			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);