@legendapp/state 3.0.0-alpha.21 → 3.0.0-alpha.23

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;
@@ -316,7 +319,7 @@ declare function setSilently(value$: ObservableParam, newValue: any): any;
 declare function initializePathType(pathType: TypeAtPath): any;
 declare function applyChange<T extends object>(value: T, change: Change, applyPrevious?: boolean): T;
 declare function applyChanges<T extends object>(value: T, changes: Change[], applyPrevious?: boolean): T;
-declare function deepMerge<T extends object>(target: T, ...sources: any[]): T;
+declare function deepMerge<T>(target: T, ...sources: any[]): T;
 
 declare const hasOwnProperty: (v: PropertyKey) => boolean;
 declare function isArray(obj: unknown): obj is Array<any>;

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;
@@ -316,7 +319,7 @@ declare function setSilently(value$: ObservableParam, newValue: any): any;
 declare function initializePathType(pathType: TypeAtPath): any;
 declare function applyChange<T extends object>(value: T, change: Change, applyPrevious?: boolean): T;
 declare function applyChanges<T extends object>(value: T, changes: Change[], applyPrevious?: boolean): T;
-declare function deepMerge<T extends object>(target: T, ...sources: any[]): T;
+declare function deepMerge<T>(target: T, ...sources: any[]): T;
 
 declare const hasOwnProperty: (v: PropertyKey) => boolean;
 declare function isArray(obj: unknown): obj is Array<any>;

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;
@@ -310,13 +312,13 @@ function setAtPath(obj, path, pathTypes, value, mode, fullObj, restore) {
   }
   if (p === void 0) {
     if (mode === "merge") {
-      obj = deepMerge(obj, value, false, 0);
+      obj = deepMerge(obj, value);
     } else {
       obj = value;
     }
   } else {
     if (mode === "merge") {
-      o[p] = deepMerge(o[p], value, false, 0);
+      o[p] = deepMerge(o[p], value);
     } else if (isMap(o)) {
       o.set(p, value);
     } else {
@@ -454,7 +456,10 @@ function applyChanges(value, changes, applyPrevious) {
   return value;
 }
 function deepMerge(target, ...sources) {
-  const result = { ...target };
+  if (isPrimitive(target)) {
+    return sources[sources.length - 1];
+  }
+  const result = isArray(target) ? [...target] : { ...target };
   for (let i = 0; i < sources.length; i++) {
     const obj2 = sources[i];
     for (const key in obj2) {
@@ -1369,7 +1374,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 +1466,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 +1630,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 +1642,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 +1667,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;
@@ -308,13 +310,13 @@ function setAtPath(obj, path, pathTypes, value, mode, fullObj, restore) {
   }
   if (p === void 0) {
     if (mode === "merge") {
-      obj = deepMerge(obj, value, false, 0);
+      obj = deepMerge(obj, value);
     } else {
       obj = value;
     }
   } else {
     if (mode === "merge") {
-      o[p] = deepMerge(o[p], value, false, 0);
+      o[p] = deepMerge(o[p], value);
     } else if (isMap(o)) {
       o.set(p, value);
     } else {
@@ -452,7 +454,10 @@ function applyChanges(value, changes, applyPrevious) {
   return value;
 }
 function deepMerge(target, ...sources) {
-  const result = { ...target };
+  if (isPrimitive(target)) {
+    return sources[sources.length - 1];
+  }
+  const result = isArray(target) ? [...target] : { ...target };
   for (let i = 0; i < sources.length; i++) {
     const obj2 = sources[i];
     for (const key in obj2) {
@@ -1367,7 +1372,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 +1464,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 +1628,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 +1640,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 +1665,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.21",
+  "version": "3.0.0-alpha.23",
   "description": "legend-state",
   "sideEffects": false,
   "private": false,

package/sync-plugins/firebase.js

@@ -232,6 +232,9 @@ function syncedFirebase(props) {
           return;
         const key = snap.key;
         const val = snap.val();
+        if (fieldId && !val[fieldId]) {
+          val[fieldId] = key;
+        }
         if (saving$[key].get()) {
           pendingIncoming$[key].set(val);
         } else {

package/sync-plugins/firebase.mjs

@@ -230,6 +230,9 @@ function syncedFirebase(props) {
           return;
         const key = snap.key;
         const val = snap.val();
+        if (fieldId && !val[fieldId]) {
+          val[fieldId] = key;
+        }
         if (saving$[key].get()) {
           pendingIncoming$[key].set(val);
         } else {

package/sync.js

@@ -777,6 +777,7 @@ function syncObservable(obs$, syncOptionsOrSynced) {
       const pending = localState.pendingChanges;
       const get = syncOptions.get;
       if (get) {
+        const { waitFor } = syncOptions;
         const runGet = () => {
           var _a2;
           const onChange = async ({ value, mode, lastSync: lastSync2 }) => {
@@ -865,22 +866,30 @@ function syncObservable(obs$, syncOptionsOrSynced) {
             node.activationState.onChange = onChange;
           }
           if (!isSubscribed && syncOptions.subscribe) {
+            const subscribe = syncOptions.subscribe;
             isSubscribed = true;
-            unsubscribe = syncOptions.subscribe({
-              node,
-              value$: obs$,
-              lastSync,
-              update: (params) => {
-                state.when(syncState$.isLoaded, () => {
-                  state.when(waitFor || true, () => {
-                    params.mode || (params.mode = syncOptions.mode || "merge");
-                    onChange(params);
+            const doSubscribe = () => {
+              unsubscribe = subscribe({
+                node,
+                value$: obs$,
+                lastSync,
+                update: (params) => {
+                  state.when(syncState$.isLoaded, () => {
+                    state.when(waitFor || true, () => {
+                      params.mode || (params.mode = syncOptions.mode || "merge");
+                      onChange(params);
+                    });
                   });
-                });
-              },
-              refresh: () => state.when(syncState$.isLoaded, sync),
-              onError: (error) => onError(error, void 0, "subscribe")
-            });
+                },
+                refresh: () => state.when(syncState$.isLoaded, sync),
+                onError: (error) => onError(error, void 0, "subscribe")
+              });
+            };
+            if (waitFor) {
+              state.whenReady(waitFor, doSubscribe);
+            } else {
+              doSubscribe();
+            }
           }
           const existingValue = getNodeValue(node);
           const getParams = {
@@ -953,7 +962,6 @@ function syncObservable(obs$, syncOptionsOrSynced) {
             handle(got);
           }
         };
-        const { waitFor } = syncOptions;
         if (waitFor) {
           if (node.activationState) {
             node.activationState.waitFor = void 0;

package/sync.mjs

@@ -775,6 +775,7 @@ function syncObservable(obs$, syncOptionsOrSynced) {
       const pending = localState.pendingChanges;
       const get = syncOptions.get;
       if (get) {
+        const { waitFor } = syncOptions;
         const runGet = () => {
           var _a2;
           const onChange = async ({ value, mode, lastSync: lastSync2 }) => {
@@ -863,22 +864,30 @@ function syncObservable(obs$, syncOptionsOrSynced) {
             node.activationState.onChange = onChange;
           }
           if (!isSubscribed && syncOptions.subscribe) {
+            const subscribe = syncOptions.subscribe;
             isSubscribed = true;
-            unsubscribe = syncOptions.subscribe({
-              node,
-              value$: obs$,
-              lastSync,
-              update: (params) => {
-                when(syncState$.isLoaded, () => {
-                  when(waitFor || true, () => {
-                    params.mode || (params.mode = syncOptions.mode || "merge");
-                    onChange(params);
+            const doSubscribe = () => {
+              unsubscribe = subscribe({
+                node,
+                value$: obs$,
+                lastSync,
+                update: (params) => {
+                  when(syncState$.isLoaded, () => {
+                    when(waitFor || true, () => {
+                      params.mode || (params.mode = syncOptions.mode || "merge");
+                      onChange(params);
+                    });
                   });
-                });
-              },
-              refresh: () => when(syncState$.isLoaded, sync),
-              onError: (error) => onError(error, void 0, "subscribe")
-            });
+                },
+                refresh: () => when(syncState$.isLoaded, sync),
+                onError: (error) => onError(error, void 0, "subscribe")
+              });
+            };
+            if (waitFor) {
+              whenReady(waitFor, doSubscribe);
+            } else {
+              doSubscribe();
+            }
           }
           const existingValue = getNodeValue(node);
           const getParams = {
@@ -951,7 +960,6 @@ function syncObservable(obs$, syncOptionsOrSynced) {
             handle(got);
           }
         };
-        const { waitFor } = syncOptions;
         if (waitFor) {
           if (node.activationState) {
             node.activationState.waitFor = void 0;