@legendapp/state 3.0.0-alpha.20 → 3.0.0-alpha.22

package/index.d.mts

@@ -17,14 +17,17 @@ interface ObservableObjectFunctions<T = Record<string, any>> extends ObservableP
 }
 type MapKey<T extends Map<any, any> | WeakMap<any, any>> = Parameters<T['has']>[0];
 type MapValue<T extends Map<any, any> | WeakMap<any, any>> = Parameters<T['get']>[0];
-type ObservableMap<T extends Map<any, any> | WeakMap<any, any>> = Omit<T, 'get' | 'size'> & Omit<ObservablePrimitive<T>, 'get' | 'size'> & {
+type ObservableMap<T extends Map<any, any> | WeakMap<any, any>> = Omit<T, 'get' | 'size' | 'set'> & Omit<ObservablePrimitive<T>, 'get' | 'size'> & {
     get(key: Parameters<T['get']>[0]): Observable<Parameters<T['set']>[1]>;
     get(): T;
-    size: ImmutableObservableBase<number>;
+    size: number;
+    set(key: MapKey<T>, value: MapValue<T>): Observable<T>;
     assign(value: Record<MapKey<T>, MapValue<T>> | Map<MapKey<T>, MapValue<T>> | WeakMap<MapKey<T>, MapValue<T>>): Observable<T>;
 };
-type ObservableSet<T extends Set<any> | WeakSet<any>> = Omit<T, 'size'> & Omit<ObservablePrimitive<T>, 'size'> & {
-    size: ImmutableObservableBase<number>;
+type SetValue<T extends Set<any> | WeakSet<any>> = Parameters<T['has']>[0];
+type ObservableSet<T extends Set<any> | WeakSet<any>> = Omit<T, 'size' | 'add'> & Omit<ObservablePrimitive<T>, 'size'> & {
+    size: number;
+    add: (value: SetValue<T>) => Observable<T>;
 };
 interface ObservableBoolean extends ObservablePrimitive<boolean> {
     toggle(): void;

package/index.d.ts

@@ -17,14 +17,17 @@ interface ObservableObjectFunctions<T = Record<string, any>> extends ObservableP
 }
 type MapKey<T extends Map<any, any> | WeakMap<any, any>> = Parameters<T['has']>[0];
 type MapValue<T extends Map<any, any> | WeakMap<any, any>> = Parameters<T['get']>[0];
-type ObservableMap<T extends Map<any, any> | WeakMap<any, any>> = Omit<T, 'get' | 'size'> & Omit<ObservablePrimitive<T>, 'get' | 'size'> & {
+type ObservableMap<T extends Map<any, any> | WeakMap<any, any>> = Omit<T, 'get' | 'size' | 'set'> & Omit<ObservablePrimitive<T>, 'get' | 'size'> & {
     get(key: Parameters<T['get']>[0]): Observable<Parameters<T['set']>[1]>;
     get(): T;
-    size: ImmutableObservableBase<number>;
+    size: number;
+    set(key: MapKey<T>, value: MapValue<T>): Observable<T>;
     assign(value: Record<MapKey<T>, MapValue<T>> | Map<MapKey<T>, MapValue<T>> | WeakMap<MapKey<T>, MapValue<T>>): Observable<T>;
 };
-type ObservableSet<T extends Set<any> | WeakSet<any>> = Omit<T, 'size'> & Omit<ObservablePrimitive<T>, 'size'> & {
-    size: ImmutableObservableBase<number>;
+type SetValue<T extends Set<any> | WeakSet<any>> = Parameters<T['has']>[0];
+type ObservableSet<T extends Set<any> | WeakSet<any>> = Omit<T, 'size' | 'add'> & Omit<ObservablePrimitive<T>, 'size'> & {
+    size: number;
+    add: (value: SetValue<T>) => Observable<T>;
 };
 interface ObservableBoolean extends ObservablePrimitive<boolean> {
     toggle(): void;

package/index.js

@@ -31,10 +31,10 @@ function isPromise(obj) {
   return obj instanceof Promise;
 }
 function isMap(obj) {
-  return obj instanceof Map;
+  return obj instanceof Map || obj instanceof WeakMap;
 }
 function isSet(obj) {
-  return obj instanceof Set;
+  return obj instanceof Set || obj instanceof WeakSet;
 }
 function isNumber(obj) {
   const n = obj;
@@ -152,22 +152,24 @@ function setNodeValue(node, newValue) {
   if (isDelete)
     newValue = void 0;
   const parentValue = node.parent ? ensureNodeValue(parentNode) : parentNode.root;
-  const prevValue = parentValue[key];
+  const useSetFn = isSet(parentValue);
+  const useMapFn = isMap(parentValue);
+  const prevValue = useSetFn ? key : useMapFn ? parentValue.get(key) : parentValue[key];
   const isFunc = isFunction(newValue);
   newValue = !parentNode.isAssigning && isFunc && !isFunction(prevValue) ? newValue(prevValue) : newValue;
   if (newValue !== prevValue) {
     try {
       parentNode.isSetting = (parentNode.isSetting || 0) + 1;
-      const useMapFn = isMap(parentValue);
       if (isDelete) {
-        if (useMapFn) {
+        if (useMapFn || useSetFn) {
           parentValue.delete(key);
         } else {
           delete parentValue[key];
         }
       } else {
-        const useMapFn2 = isMap(parentValue);
-        if (useMapFn2) {
+        if (useSetFn) {
+          parentValue.add(newValue);
+        } else if (useMapFn) {
           parentValue.set(key, newValue);
         } else {
           parentValue[key] = newValue;
@@ -1369,7 +1371,7 @@ var proxyHandler = {
     if (targetNode && p !== "onChange") {
       return proxyHandler.get(targetNode, p, receiver);
     }
-    if (isMap(value) || value instanceof WeakMap || value instanceof Set || value instanceof WeakSet) {
+    if (isMap(value) || isSet(value)) {
       const ret = handlerMapSet(node, p, value);
       if (ret !== void 0) {
         return ret;
@@ -1461,7 +1463,7 @@ var proxyHandler = {
       return vProp.bind(value);
     }
     if (isPrimitive(vProp)) {
-      if (isArray(value) && p === "length") {
+      if (p === "length" && isArray(value)) {
         updateTracking(node, true);
         return vProp;
       }
@@ -1625,7 +1627,8 @@ function deleteFn(node, key) {
 function handlerMapSet(node, p, value) {
   const vProp = value == null ? void 0 : value[p];
   if (p === "size") {
-    return getProxy(node, p);
+    updateTracking(node, true);
+    return value[p];
   } else if (isFunction(vProp)) {
     return function(a, b, c) {
       const l = arguments.length;
@@ -1636,23 +1639,16 @@ function handlerMapSet(node, p, value) {
         }
       } else if (p === "set") {
         if (l === 2) {
-          const prev = valueMap.get(a);
-          const ret = valueMap.set(a, b);
-          if (prev !== b) {
-            updateNodesAndNotify(getChildNode(node, a), b, prev);
-          }
-          return ret;
+          set(getChildNode(node, a), b);
         } else if (l === 1 && isMap(value)) {
           set(node, a);
         }
+        return getProxy(node);
       } else if (p === "delete") {
         if (l > 0) {
           const prev = value.get ? valueMap.get(a) : a;
-          const ret = value.delete(a);
-          if (ret) {
-            updateNodesAndNotify(getChildNode(node, a), void 0, prev);
-          }
-          return ret;
+          deleteFn(node, a);
+          return prev !== void 0;
         }
       } else if (p === "clear") {
         const prev = new Map(valueMap);
@@ -1668,7 +1664,7 @@ function handlerMapSet(node, p, value) {
         if (!value.has(p)) {
           notify(node, ret, prev, 0);
         }
-        return ret;
+        return getProxy(node);
       }
       const fn = observableFns.get(p);
       if (fn) {

package/index.mjs

@@ -29,10 +29,10 @@ function isPromise(obj) {
   return obj instanceof Promise;
 }
 function isMap(obj) {
-  return obj instanceof Map;
+  return obj instanceof Map || obj instanceof WeakMap;
 }
 function isSet(obj) {
-  return obj instanceof Set;
+  return obj instanceof Set || obj instanceof WeakSet;
 }
 function isNumber(obj) {
   const n = obj;
@@ -150,22 +150,24 @@ function setNodeValue(node, newValue) {
   if (isDelete)
     newValue = void 0;
   const parentValue = node.parent ? ensureNodeValue(parentNode) : parentNode.root;
-  const prevValue = parentValue[key];
+  const useSetFn = isSet(parentValue);
+  const useMapFn = isMap(parentValue);
+  const prevValue = useSetFn ? key : useMapFn ? parentValue.get(key) : parentValue[key];
   const isFunc = isFunction(newValue);
   newValue = !parentNode.isAssigning && isFunc && !isFunction(prevValue) ? newValue(prevValue) : newValue;
   if (newValue !== prevValue) {
     try {
       parentNode.isSetting = (parentNode.isSetting || 0) + 1;
-      const useMapFn = isMap(parentValue);
       if (isDelete) {
-        if (useMapFn) {
+        if (useMapFn || useSetFn) {
           parentValue.delete(key);
         } else {
           delete parentValue[key];
         }
       } else {
-        const useMapFn2 = isMap(parentValue);
-        if (useMapFn2) {
+        if (useSetFn) {
+          parentValue.add(newValue);
+        } else if (useMapFn) {
           parentValue.set(key, newValue);
         } else {
           parentValue[key] = newValue;
@@ -1367,7 +1369,7 @@ var proxyHandler = {
     if (targetNode && p !== "onChange") {
       return proxyHandler.get(targetNode, p, receiver);
     }
-    if (isMap(value) || value instanceof WeakMap || value instanceof Set || value instanceof WeakSet) {
+    if (isMap(value) || isSet(value)) {
       const ret = handlerMapSet(node, p, value);
       if (ret !== void 0) {
         return ret;
@@ -1459,7 +1461,7 @@ var proxyHandler = {
       return vProp.bind(value);
     }
     if (isPrimitive(vProp)) {
-      if (isArray(value) && p === "length") {
+      if (p === "length" && isArray(value)) {
         updateTracking(node, true);
         return vProp;
       }
@@ -1623,7 +1625,8 @@ function deleteFn(node, key) {
 function handlerMapSet(node, p, value) {
   const vProp = value == null ? void 0 : value[p];
   if (p === "size") {
-    return getProxy(node, p);
+    updateTracking(node, true);
+    return value[p];
   } else if (isFunction(vProp)) {
     return function(a, b, c) {
       const l = arguments.length;
@@ -1634,23 +1637,16 @@ function handlerMapSet(node, p, value) {
         }
       } else if (p === "set") {
         if (l === 2) {
-          const prev = valueMap.get(a);
-          const ret = valueMap.set(a, b);
-          if (prev !== b) {
-            updateNodesAndNotify(getChildNode(node, a), b, prev);
-          }
-          return ret;
+          set(getChildNode(node, a), b);
         } else if (l === 1 && isMap(value)) {
           set(node, a);
         }
+        return getProxy(node);
       } else if (p === "delete") {
         if (l > 0) {
           const prev = value.get ? valueMap.get(a) : a;
-          const ret = value.delete(a);
-          if (ret) {
-            updateNodesAndNotify(getChildNode(node, a), void 0, prev);
-          }
-          return ret;
+          deleteFn(node, a);
+          return prev !== void 0;
         }
       } else if (p === "clear") {
         const prev = new Map(valueMap);
@@ -1666,7 +1662,7 @@ function handlerMapSet(node, p, value) {
         if (!value.has(p)) {
           notify(node, ret, prev, 0);
         }
-        return ret;
+        return getProxy(node);
       }
       const fn = observableFns.get(p);
       if (fn) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@legendapp/state",
-  "version": "3.0.0-alpha.20",
+  "version": "3.0.0-alpha.22",
   "description": "legend-state",
   "sideEffects": false,
   "private": false,

package/sync-plugins/crud.js

@@ -154,7 +154,7 @@ function syncedCrud(props) {
               if (valueAtPath) {
                 updates.set(id, getUpdateValue(valueAtPath, prevAtPath));
               } else if (prevAtPath) {
-                deletes.add(prevAtPath == null ? void 0 : prevAtPath.id);
+                deletes.add(prevAtPath);
               }
             } else if (!updates.has(id)) {
               const previous = state.applyChanges(
@@ -293,16 +293,22 @@ function syncedCrud(props) {
         }
       }),
       ...Array.from(deletes).map((valuePrevious) => {
-        if (deleteFn) {
-          deleteFn(valuePrevious, params);
-        } else if (fieldDeleted && updateFn) {
-          const valueId = valuePrevious[fieldId];
-          updateFn(
-            { ...valueId ? { [fieldId]: valueId } : {}, [fieldDeleted]: true },
-            params
-          );
-        } else {
-          console.log("[legend-state] missing delete function");
+        if (valuePrevious !== state.symbolDelete) {
+          if (deleteFn) {
+            deleteFn(valuePrevious, params);
+          } else if (fieldDeleted && updateFn) {
+            const valueId = valuePrevious[fieldId];
+            if (valueId) {
+              updateFn(
+                { ...valueId ? { [fieldId]: valueId } : {}, [fieldDeleted]: true },
+                params
+              );
+            } else {
+              console.error("[legend-state]: deleting item without an id");
+            }
+          } else {
+            console.log("[legend-state] missing delete function");
+          }
         }
       })
     ]);

package/sync-plugins/crud.mjs

@@ -1,4 +1,4 @@
-import { isPromise, applyChanges, isNullOrUndefined, setAtPath, isArray, internal, isObservable, getNodeValue } from '@legendapp/state';
+import { isPromise, applyChanges, isNullOrUndefined, setAtPath, symbolDelete, isArray, internal, isObservable, getNodeValue } from '@legendapp/state';
 import { synced, deepEqual, diffObjects } from '@legendapp/state/sync';
 
 // src/sync-plugins/crud.ts
@@ -152,7 +152,7 @@ function syncedCrud(props) {
               if (valueAtPath) {
                 updates.set(id, getUpdateValue(valueAtPath, prevAtPath));
               } else if (prevAtPath) {
-                deletes.add(prevAtPath == null ? void 0 : prevAtPath.id);
+                deletes.add(prevAtPath);
               }
             } else if (!updates.has(id)) {
               const previous = applyChanges(
@@ -291,16 +291,22 @@ function syncedCrud(props) {
         }
       }),
       ...Array.from(deletes).map((valuePrevious) => {
-        if (deleteFn) {
-          deleteFn(valuePrevious, params);
-        } else if (fieldDeleted && updateFn) {
-          const valueId = valuePrevious[fieldId];
-          updateFn(
-            { ...valueId ? { [fieldId]: valueId } : {}, [fieldDeleted]: true },
-            params
-          );
-        } else {
-          console.log("[legend-state] missing delete function");
+        if (valuePrevious !== symbolDelete) {
+          if (deleteFn) {
+            deleteFn(valuePrevious, params);
+          } else if (fieldDeleted && updateFn) {
+            const valueId = valuePrevious[fieldId];
+            if (valueId) {
+              updateFn(
+                { ...valueId ? { [fieldId]: valueId } : {}, [fieldDeleted]: true },
+                params
+              );
+            } else {
+              console.error("[legend-state]: deleting item without an id");
+            }
+          } else {
+            console.log("[legend-state] missing delete function");
+          }
         }
       })
     ]);