@legendapp/state 3.0.0-beta.37 → 3.0.0-beta.39

package/index.js

@@ -146,6 +146,16 @@ function isEvent(value$) {
   var _a;
   return value$ && ((_a = value$[symbolGetNode]) == null ? void 0 : _a.isEvent);
 }
+function setNewValue(parentValue, key, newValue, useSetFn, useMapFn) {
+  if (useSetFn) {
+    parentValue.add(newValue);
+  } else if (useMapFn) {
+    parentValue.set(key, newValue);
+  } else {
+    parentValue[key] = newValue;
+  }
+  return newValue;
+}
 function setNodeValue(node, newValue) {
   var _a;
   const parentNode = (_a = node.parent) != null ? _a : node;
@@ -169,13 +179,7 @@ function setNodeValue(node, newValue) {
           delete parentValue[key];
         }
       } else {
-        if (useSetFn) {
-          parentValue.add(newValue);
-        } else if (useMapFn) {
-          parentValue.set(key, newValue);
-        } else {
-          parentValue[key] = newValue;
-        }
+        setNewValue(parentValue, key, newValue, useSetFn, useMapFn);
       }
     } finally {
       parentNode.isSetting--;
@@ -194,7 +198,7 @@ function getNodeValue(node) {
   let child = node.root._;
   for (let i = count - 1; child && i >= 0; i--) {
     const key = arrNodeKeys[i];
-    child = key !== "size" && (isMap(child) || child instanceof WeakMap) ? child.get(key) : child[key];
+    child = key !== "size" && isMap(child) ? child.get(key) : child[key];
   }
   return child;
 }
@@ -229,7 +233,9 @@ function ensureNodeValue(node) {
   if (!value || isFunction(value)) {
     if (isChildNode(node)) {
       const parent = ensureNodeValue(node.parent);
-      value = parent[node.key] = {};
+      const useSetFn = isSet(parent);
+      const useMapFn = isMap(parent);
+      value = setNewValue(parent, node.key, {}, useSetFn, useMapFn);
     } else {
       value = node.root._ = {};
     }
@@ -285,6 +291,14 @@ var ObservableHint = {
   }
 };
 
+// src/checkPlain.ts
+function checkPlain(node, value) {
+  var _a;
+  if (!node.isPlain && (((_a = node.parent) == null ? void 0 : _a.isPlain) || isHintPlain(value))) {
+    node.isPlain = true;
+  }
+}
+
 // src/helpers.ts
 function computeSelector(selector, getOptions, e, retainObservable) {
   let c = selector;
@@ -611,37 +625,39 @@ function computeChangesAtNode(changesInBatch, node, isFromPersist, isFromSync, v
   }
 }
 function computeChangesRecursive(changesInBatch, node, loading, remote, value, path, pathTypes, valueAtPath, prevAtPath, immediate, level, whenOptimizedOnlyIf) {
-  computeChangesAtNode(
-    changesInBatch,
-    node,
-    loading,
-    remote,
-    value,
-    path,
-    pathTypes,
-    valueAtPath,
-    prevAtPath,
-    immediate,
-    level,
-    whenOptimizedOnlyIf
-  );
-  if (node.linkedFromNodes) {
-    for (const linkedFromNode of node.linkedFromNodes) {
-      const childNode = getNodeAtPath(linkedFromNode, path);
-      computeChangesRecursive(
-        changesInBatch,
-        childNode,
-        loading,
-        remote,
-        valueAtPath,
-        [],
-        [],
-        valueAtPath,
-        prevAtPath,
-        immediate,
-        0,
-        whenOptimizedOnlyIf
-      );
+  if (node.numListenersRecursive > 0) {
+    computeChangesAtNode(
+      changesInBatch,
+      node,
+      loading,
+      remote,
+      value,
+      path,
+      pathTypes,
+      valueAtPath,
+      prevAtPath,
+      immediate,
+      level,
+      whenOptimizedOnlyIf
+    );
+    if (node.linkedFromNodes) {
+      for (const linkedFromNode of node.linkedFromNodes) {
+        const childNode = getNodeAtPath(linkedFromNode, path);
+        computeChangesRecursive(
+          changesInBatch,
+          childNode,
+          loading,
+          remote,
+          valueAtPath,
+          [],
+          [],
+          valueAtPath,
+          prevAtPath,
+          immediate,
+          0,
+          whenOptimizedOnlyIf
+        );
+      }
     }
   }
   if (node.parent) {
@@ -1706,6 +1722,7 @@ function setKey(node, key, newValue, level) {
     }
   }
   const isRoot = !node.parent && key === "_";
+  checkPlain(node, newValue);
   if (node.parent && !getNodeValue(node) && !isFunction(newValue)) {
     set(node, { [key]: newValue });
   }
@@ -1723,8 +1740,8 @@ function setKey(node, key, newValue, level) {
       } while (parent = parent.parent);
     }
     const notify2 = !equals(savedValue, prevValue);
-    const forceNotify = !notify2 && childNode.isComputing && !isPrim;
-    if (notify2 || forceNotify) {
+    const forceNotify = !notify2 && childNode.isComputing && !isPrim && !childNode.isPlain;
+    if ((notify2 || forceNotify) && !(childNode.isComputing && childNode.isPlain && node.numListenersRecursive === 0)) {
       updateNodesAndNotify(
         node,
         savedValue,
@@ -1940,7 +1957,7 @@ function peek(node) {
 }
 var isFlushing = false;
 function peekInternal(node, activateRecursive) {
-  var _a, _b;
+  var _a;
   isFlushing = true;
   if (activateRecursive && ((_a = node.dirtyChildren) == null ? void 0 : _a.size)) {
     const dirty = Array.from(node.dirtyChildren);
@@ -1955,9 +1972,6 @@ function peekInternal(node, activateRecursive) {
   }
   isFlushing = false;
   let value = getNodeValue(node);
-  if (((_b = node.parent) == null ? void 0 : _b.isPlain) || isHintPlain(value)) {
-    node.isPlain = true;
-  }
   if (!node.root.isLoadingLocal && !node.isPlain) {
     value = checkLazy(node, value, !!activateRecursive);
   }
@@ -1989,7 +2003,8 @@ function checkLazy(node, value, activateRecursive) {
       value = extractFunctionOrComputed(node.parent, node.key, value);
     }
   }
-  if ((lazy || node.needsExtract) && !isObservable(value) && !isPrimitive(value)) {
+  checkPlain(node, value);
+  if ((lazy || node.needsExtract) && !node.isPlain && !isObservable(value) && !isPrimitive(value)) {
     if (activateRecursive) {
       recursivelyAutoActivate(value, node);
     }

package/index.mjs

@@ -144,6 +144,16 @@ function isEvent(value$) {
   var _a;
   return value$ && ((_a = value$[symbolGetNode]) == null ? void 0 : _a.isEvent);
 }
+function setNewValue(parentValue, key, newValue, useSetFn, useMapFn) {
+  if (useSetFn) {
+    parentValue.add(newValue);
+  } else if (useMapFn) {
+    parentValue.set(key, newValue);
+  } else {
+    parentValue[key] = newValue;
+  }
+  return newValue;
+}
 function setNodeValue(node, newValue) {
   var _a;
   const parentNode = (_a = node.parent) != null ? _a : node;
@@ -167,13 +177,7 @@ function setNodeValue(node, newValue) {
           delete parentValue[key];
         }
       } else {
-        if (useSetFn) {
-          parentValue.add(newValue);
-        } else if (useMapFn) {
-          parentValue.set(key, newValue);
-        } else {
-          parentValue[key] = newValue;
-        }
+        setNewValue(parentValue, key, newValue, useSetFn, useMapFn);
       }
     } finally {
       parentNode.isSetting--;
@@ -192,7 +196,7 @@ function getNodeValue(node) {
   let child = node.root._;
   for (let i = count - 1; child && i >= 0; i--) {
     const key = arrNodeKeys[i];
-    child = key !== "size" && (isMap(child) || child instanceof WeakMap) ? child.get(key) : child[key];
+    child = key !== "size" && isMap(child) ? child.get(key) : child[key];
   }
   return child;
 }
@@ -227,7 +231,9 @@ function ensureNodeValue(node) {
   if (!value || isFunction(value)) {
     if (isChildNode(node)) {
       const parent = ensureNodeValue(node.parent);
-      value = parent[node.key] = {};
+      const useSetFn = isSet(parent);
+      const useMapFn = isMap(parent);
+      value = setNewValue(parent, node.key, {}, useSetFn, useMapFn);
     } else {
       value = node.root._ = {};
     }
@@ -283,6 +289,14 @@ var ObservableHint = {
   }
 };
 
+// src/checkPlain.ts
+function checkPlain(node, value) {
+  var _a;
+  if (!node.isPlain && (((_a = node.parent) == null ? void 0 : _a.isPlain) || isHintPlain(value))) {
+    node.isPlain = true;
+  }
+}
+
 // src/helpers.ts
 function computeSelector(selector, getOptions, e, retainObservable) {
   let c = selector;
@@ -609,37 +623,39 @@ function computeChangesAtNode(changesInBatch, node, isFromPersist, isFromSync, v
   }
 }
 function computeChangesRecursive(changesInBatch, node, loading, remote, value, path, pathTypes, valueAtPath, prevAtPath, immediate, level, whenOptimizedOnlyIf) {
-  computeChangesAtNode(
-    changesInBatch,
-    node,
-    loading,
-    remote,
-    value,
-    path,
-    pathTypes,
-    valueAtPath,
-    prevAtPath,
-    immediate,
-    level,
-    whenOptimizedOnlyIf
-  );
-  if (node.linkedFromNodes) {
-    for (const linkedFromNode of node.linkedFromNodes) {
-      const childNode = getNodeAtPath(linkedFromNode, path);
-      computeChangesRecursive(
-        changesInBatch,
-        childNode,
-        loading,
-        remote,
-        valueAtPath,
-        [],
-        [],
-        valueAtPath,
-        prevAtPath,
-        immediate,
-        0,
-        whenOptimizedOnlyIf
-      );
+  if (node.numListenersRecursive > 0) {
+    computeChangesAtNode(
+      changesInBatch,
+      node,
+      loading,
+      remote,
+      value,
+      path,
+      pathTypes,
+      valueAtPath,
+      prevAtPath,
+      immediate,
+      level,
+      whenOptimizedOnlyIf
+    );
+    if (node.linkedFromNodes) {
+      for (const linkedFromNode of node.linkedFromNodes) {
+        const childNode = getNodeAtPath(linkedFromNode, path);
+        computeChangesRecursive(
+          changesInBatch,
+          childNode,
+          loading,
+          remote,
+          valueAtPath,
+          [],
+          [],
+          valueAtPath,
+          prevAtPath,
+          immediate,
+          0,
+          whenOptimizedOnlyIf
+        );
+      }
     }
   }
   if (node.parent) {
@@ -1704,6 +1720,7 @@ function setKey(node, key, newValue, level) {
     }
   }
   const isRoot = !node.parent && key === "_";
+  checkPlain(node, newValue);
   if (node.parent && !getNodeValue(node) && !isFunction(newValue)) {
     set(node, { [key]: newValue });
   }
@@ -1721,8 +1738,8 @@ function setKey(node, key, newValue, level) {
       } while (parent = parent.parent);
     }
     const notify2 = !equals(savedValue, prevValue);
-    const forceNotify = !notify2 && childNode.isComputing && !isPrim;
-    if (notify2 || forceNotify) {
+    const forceNotify = !notify2 && childNode.isComputing && !isPrim && !childNode.isPlain;
+    if ((notify2 || forceNotify) && !(childNode.isComputing && childNode.isPlain && node.numListenersRecursive === 0)) {
       updateNodesAndNotify(
         node,
         savedValue,
@@ -1938,7 +1955,7 @@ function peek(node) {
 }
 var isFlushing = false;
 function peekInternal(node, activateRecursive) {
-  var _a, _b;
+  var _a;
   isFlushing = true;
   if (activateRecursive && ((_a = node.dirtyChildren) == null ? void 0 : _a.size)) {
     const dirty = Array.from(node.dirtyChildren);
@@ -1953,9 +1970,6 @@ function peekInternal(node, activateRecursive) {
   }
   isFlushing = false;
   let value = getNodeValue(node);
-  if (((_b = node.parent) == null ? void 0 : _b.isPlain) || isHintPlain(value)) {
-    node.isPlain = true;
-  }
   if (!node.root.isLoadingLocal && !node.isPlain) {
     value = checkLazy(node, value, !!activateRecursive);
   }
@@ -1987,7 +2001,8 @@ function checkLazy(node, value, activateRecursive) {
       value = extractFunctionOrComputed(node.parent, node.key, value);
     }
   }
-  if ((lazy || node.needsExtract) && !isObservable(value) && !isPrimitive(value)) {
+  checkPlain(node, value);
+  if ((lazy || node.needsExtract) && !node.isPlain && !isObservable(value) && !isPrimitive(value)) {
     if (activateRecursive) {
       recursivelyAutoActivate(value, node);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@legendapp/state",
-  "version": "3.0.0-beta.37",
+  "version": "3.0.0-beta.39",
   "description": "legend-state",
   "sideEffects": false,
   "private": false,

package/persist-plugins/indexeddb.js

@@ -5,6 +5,12 @@ var state = require('@legendapp/state');
 // src/persist-plugins/indexeddb.ts
 var MetadataSuffix = "__legend_metadata";
 var PrimitiveName = "__legend_primitive";
+function getIndexedDB() {
+  if (typeof globalThis === "undefined") {
+    return void 0;
+  }
+  return globalThis.indexedDB;
+}
 function requestToPromise(request) {
   return new Promise((resolve) => request.onsuccess = () => resolve());
 }
@@ -21,8 +27,9 @@ var ObservablePersistIndexedDB = class {
   }
   async initialize(configOptions) {
     const config = this.configuration || configOptions.indexedDB;
-    if (typeof indexedDB === "undefined")
+    if (!getIndexedDB()) {
       return;
+    }
     if (process.env.NODE_ENV === "development" && !config) {
       console.error("[legend-state] Must configure ObservablePersistIndexedDB");
     }
@@ -69,6 +76,9 @@ var ObservablePersistIndexedDB = class {
   loadTable(table, config) {
     var _a;
     if (!this.db) {
+      if (!getIndexedDB()) {
+        return;
+      }
       throw new Error(
         "[legend-state] ObservablePersistIndexedDB loading without being initialized. This may happen when running outside of a browser."
       );
@@ -147,7 +157,7 @@ var ObservablePersistIndexedDB = class {
   }
   async set(table, changes, config) {
     var _a, _b;
-    if (typeof indexedDB === "undefined")
+    if (!getIndexedDB())
       return;
     if (!this.pendingSaves.has(config)) {
       this.pendingSaves.set(config, {});
@@ -238,7 +248,7 @@ var ObservablePersistIndexedDB = class {
       delete this.tableData[tableName];
       delete this.tableData[tableName + "_transformed"];
     }
-    if (typeof indexedDB === "undefined")
+    if (!getIndexedDB())
       return;
     this.deleteMetadata(table, config);
     if (data) {

package/persist-plugins/indexeddb.mjs

@@ -3,6 +3,12 @@ import { when, isPromise, observable, setAtPath, isPrimitive } from '@legendapp/
 // src/persist-plugins/indexeddb.ts
 var MetadataSuffix = "__legend_metadata";
 var PrimitiveName = "__legend_primitive";
+function getIndexedDB() {
+  if (typeof globalThis === "undefined") {
+    return void 0;
+  }
+  return globalThis.indexedDB;
+}
 function requestToPromise(request) {
   return new Promise((resolve) => request.onsuccess = () => resolve());
 }
@@ -19,8 +25,9 @@ var ObservablePersistIndexedDB = class {
   }
   async initialize(configOptions) {
     const config = this.configuration || configOptions.indexedDB;
-    if (typeof indexedDB === "undefined")
+    if (!getIndexedDB()) {
       return;
+    }
     if (process.env.NODE_ENV === "development" && !config) {
       console.error("[legend-state] Must configure ObservablePersistIndexedDB");
     }
@@ -67,6 +74,9 @@ var ObservablePersistIndexedDB = class {
   loadTable(table, config) {
     var _a;
     if (!this.db) {
+      if (!getIndexedDB()) {
+        return;
+      }
       throw new Error(
         "[legend-state] ObservablePersistIndexedDB loading without being initialized. This may happen when running outside of a browser."
       );
@@ -145,7 +155,7 @@ var ObservablePersistIndexedDB = class {
   }
   async set(table, changes, config) {
     var _a, _b;
-    if (typeof indexedDB === "undefined")
+    if (!getIndexedDB())
       return;
     if (!this.pendingSaves.has(config)) {
       this.pendingSaves.set(config, {});
@@ -236,7 +246,7 @@ var ObservablePersistIndexedDB = class {
       delete this.tableData[tableName];
       delete this.tableData[tableName + "_transformed"];
     }
-    if (typeof indexedDB === "undefined")
+    if (!getIndexedDB())
       return;
     this.deleteMetadata(table, config);
     if (data) {

package/react-web.d.mts

@@ -1,4 +1,5 @@
 import { FCReactiveObject } from '@legendapp/state/react';
+import { JSX } from 'react';
 
 type IReactive = FCReactiveObject<JSX.IntrinsicElements>;
 declare const $React: IReactive;

package/react-web.d.ts

@@ -1,4 +1,5 @@
 import { FCReactiveObject } from '@legendapp/state/react';
+import { JSX } from 'react';
 
 type IReactive = FCReactiveObject<JSX.IntrinsicElements>;
 declare const $React: IReactive;

package/sync-plugins/supabase.d.mts

@@ -11,7 +11,8 @@ type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends (
 type IsUnionOfStrings<T> = [T] extends [string] ? ([T] extends [UnionToIntersection<T>] ? false : true) : false;
 type SupabaseSchemaOf<Client extends SupabaseClient> = Client extends SupabaseClient<infer _, infer __, infer Schema> ? Schema : never;
 type SupabaseTableOf<Client extends SupabaseClient, SchemaName extends SchemaNameOf<Client>> = DatabaseOf<Client>[SchemaName]['Tables'];
-type SupabaseCollectionOf<Client extends SupabaseClient, SchemaName extends SchemaNameOf<Client>> = keyof SupabaseTableOf<Client, IsUnionOfStrings<SchemaName> extends true ? 'public' : SchemaName>;
+type SupabaseViewOf<Client extends SupabaseClient, SchemaName extends SchemaNameOf<Client>> = DatabaseOf<Client>[SchemaName]['Views'];
+type SupabaseCollectionOf<Client extends SupabaseClient, SchemaName extends SchemaNameOf<Client>> = keyof SupabaseTableOf<Client, IsUnionOfStrings<SchemaName> extends true ? 'public' : SchemaName> | keyof SupabaseViewOf<Client, IsUnionOfStrings<SchemaName> extends true ? 'public' : SchemaName>;
 type SupabaseRowOf<Client extends SupabaseClient, Collection extends SupabaseCollectionOf<Client, SchemaName>, SchemaName extends SchemaNameOf<Client>> = SupabaseTableOf<Client, SchemaName>[Collection]['Row'];
 type SyncedSupabaseConfig<TRemote extends {
     id: string | number;
@@ -50,4 +51,4 @@ declare function configureSyncedSupabase(config: SyncedSupabaseConfiguration): v
 declare function syncedSupabase<Client extends SupabaseClient<any, any>, Collection extends SupabaseCollectionOf<Client, SchemaName> & string, SchemaName extends SchemaNameOf<Client> = 'public', AsOption extends CrudAsOption = 'object', TRemote = SupabaseRowOf<Client, Collection, SchemaName>, TLocal = TRemote>(props: SyncedSupabasePropsWithSelect<Client, Collection, SchemaName, AsOption, TRemote, TLocal>): SyncedCrudReturnType<TLocal, AsOption>;
 declare function syncedSupabase<Client extends SupabaseClient<any, any>, Collection extends SupabaseCollectionOf<Client, SchemaName> & string, SchemaName extends SchemaNameOf<Client> = 'public', AsOption extends CrudAsOption = 'object', TRemote extends SupabaseRowOf<Client, Collection, SchemaName> = SupabaseRowOf<Client, Collection, SchemaName>, TLocal = TRemote>(props: SyncedSupabaseProps<Client, Collection, SchemaName, AsOption, TRemote, TLocal>): SyncedCrudReturnType<TLocal, AsOption>;
 
-export { type SupabaseCollectionOf, type SupabaseRowOf, type SupabaseSchemaOf, type SupabaseTableOf, type SyncedSupabaseConfig, type SyncedSupabaseConfiguration, configureSyncedSupabase, getSyncedSupabaseConfiguration, syncedSupabase };
+export { type SupabaseCollectionOf, type SupabaseRowOf, type SupabaseSchemaOf, type SupabaseTableOf, type SupabaseViewOf, type SyncedSupabaseConfig, type SyncedSupabaseConfiguration, configureSyncedSupabase, getSyncedSupabaseConfiguration, syncedSupabase };

package/sync-plugins/supabase.d.ts

@@ -11,7 +11,8 @@ type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends (
 type IsUnionOfStrings<T> = [T] extends [string] ? ([T] extends [UnionToIntersection<T>] ? false : true) : false;
 type SupabaseSchemaOf<Client extends SupabaseClient> = Client extends SupabaseClient<infer _, infer __, infer Schema> ? Schema : never;
 type SupabaseTableOf<Client extends SupabaseClient, SchemaName extends SchemaNameOf<Client>> = DatabaseOf<Client>[SchemaName]['Tables'];
-type SupabaseCollectionOf<Client extends SupabaseClient, SchemaName extends SchemaNameOf<Client>> = keyof SupabaseTableOf<Client, IsUnionOfStrings<SchemaName> extends true ? 'public' : SchemaName>;
+type SupabaseViewOf<Client extends SupabaseClient, SchemaName extends SchemaNameOf<Client>> = DatabaseOf<Client>[SchemaName]['Views'];
+type SupabaseCollectionOf<Client extends SupabaseClient, SchemaName extends SchemaNameOf<Client>> = keyof SupabaseTableOf<Client, IsUnionOfStrings<SchemaName> extends true ? 'public' : SchemaName> | keyof SupabaseViewOf<Client, IsUnionOfStrings<SchemaName> extends true ? 'public' : SchemaName>;
 type SupabaseRowOf<Client extends SupabaseClient, Collection extends SupabaseCollectionOf<Client, SchemaName>, SchemaName extends SchemaNameOf<Client>> = SupabaseTableOf<Client, SchemaName>[Collection]['Row'];
 type SyncedSupabaseConfig<TRemote extends {
     id: string | number;
@@ -50,4 +51,4 @@ declare function configureSyncedSupabase(config: SyncedSupabaseConfiguration): v
 declare function syncedSupabase<Client extends SupabaseClient<any, any>, Collection extends SupabaseCollectionOf<Client, SchemaName> & string, SchemaName extends SchemaNameOf<Client> = 'public', AsOption extends CrudAsOption = 'object', TRemote = SupabaseRowOf<Client, Collection, SchemaName>, TLocal = TRemote>(props: SyncedSupabasePropsWithSelect<Client, Collection, SchemaName, AsOption, TRemote, TLocal>): SyncedCrudReturnType<TLocal, AsOption>;
 declare function syncedSupabase<Client extends SupabaseClient<any, any>, Collection extends SupabaseCollectionOf<Client, SchemaName> & string, SchemaName extends SchemaNameOf<Client> = 'public', AsOption extends CrudAsOption = 'object', TRemote extends SupabaseRowOf<Client, Collection, SchemaName> = SupabaseRowOf<Client, Collection, SchemaName>, TLocal = TRemote>(props: SyncedSupabaseProps<Client, Collection, SchemaName, AsOption, TRemote, TLocal>): SyncedCrudReturnType<TLocal, AsOption>;
 
-export { type SupabaseCollectionOf, type SupabaseRowOf, type SupabaseSchemaOf, type SupabaseTableOf, type SyncedSupabaseConfig, type SyncedSupabaseConfiguration, configureSyncedSupabase, getSyncedSupabaseConfiguration, syncedSupabase };
+export { type SupabaseCollectionOf, type SupabaseRowOf, type SupabaseSchemaOf, type SupabaseTableOf, type SupabaseViewOf, type SyncedSupabaseConfig, type SyncedSupabaseConfiguration, configureSyncedSupabase, getSyncedSupabaseConfiguration, syncedSupabase };