@legendapp/state 3.0.0-beta.24 → 3.0.0-beta.27

package/index.js

@@ -1601,7 +1601,7 @@ function setKey(node, key, newValue, level) {
     setToObservable(childNode, newValue);
   } else {
     const { newValue: savedValue, prevValue, parentValue } = setNodeValue(childNode, newValue);
-    const isPrim = isPrimitive(savedValue) || savedValue instanceof Date;
+    const isPrim = isPrimitive(prevValue) || prevValue instanceof Date || isPrimitive(savedValue) || savedValue instanceof Date;
     if (!isPrim) {
       let parent = childNode;
       do {
@@ -1677,7 +1677,7 @@ function handlerMapSet(node, p, value) {
   } else if (isFunction(vProp)) {
     return function(a, b, c) {
       const l = arguments.length;
-      const valueMap = value;
+      const valueMapOrSet = value;
       if (p === "get") {
         if (l > 0 && typeof a !== "boolean" && a !== optimized) {
           return getProxy(node, a);
@@ -1691,14 +1691,14 @@ function handlerMapSet(node, p, value) {
         return getProxy(node);
       } else if (p === "delete") {
         if (l > 0) {
-          const prev = value.get ? valueMap.get(a) : a;
+          const prev = value.get ? valueMapOrSet.get(a) : a;
           deleteFn(node, a);
           return prev !== void 0;
         }
       } else if (p === "clear") {
-        const prev = new Map(valueMap);
-        const size = valueMap.size;
-        valueMap.clear();
+        const prev = isSet(valueMapOrSet) ? new Set(valueMapOrSet) : new Map(valueMapOrSet);
+        const size = valueMapOrSet.size;
+        valueMapOrSet.clear();
         if (size) {
           updateNodesAndNotify(node, value, prev);
         }

package/index.mjs

@@ -1599,7 +1599,7 @@ function setKey(node, key, newValue, level) {
     setToObservable(childNode, newValue);
   } else {
     const { newValue: savedValue, prevValue, parentValue } = setNodeValue(childNode, newValue);
-    const isPrim = isPrimitive(savedValue) || savedValue instanceof Date;
+    const isPrim = isPrimitive(prevValue) || prevValue instanceof Date || isPrimitive(savedValue) || savedValue instanceof Date;
     if (!isPrim) {
       let parent = childNode;
       do {
@@ -1675,7 +1675,7 @@ function handlerMapSet(node, p, value) {
   } else if (isFunction(vProp)) {
     return function(a, b, c) {
       const l = arguments.length;
-      const valueMap = value;
+      const valueMapOrSet = value;
       if (p === "get") {
         if (l > 0 && typeof a !== "boolean" && a !== optimized) {
           return getProxy(node, a);
@@ -1689,14 +1689,14 @@ function handlerMapSet(node, p, value) {
         return getProxy(node);
       } else if (p === "delete") {
         if (l > 0) {
-          const prev = value.get ? valueMap.get(a) : a;
+          const prev = value.get ? valueMapOrSet.get(a) : a;
           deleteFn(node, a);
           return prev !== void 0;
         }
       } else if (p === "clear") {
-        const prev = new Map(valueMap);
-        const size = valueMap.size;
-        valueMap.clear();
+        const prev = isSet(valueMapOrSet) ? new Set(valueMapOrSet) : new Map(valueMapOrSet);
+        const size = valueMapOrSet.size;
+        valueMapOrSet.clear();
         if (size) {
           updateNodesAndNotify(node, value, prev);
         }

package/package.json

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

package/persist-plugins/expo-sqlite.js

@@ -8,9 +8,11 @@ var MetadataSuffix = "__m";
 var ObservablePersistSqlite = class {
   constructor(storage) {
     this.data = {};
-    console.error(
-      "[legend-state] ObservablePersistSqlite failed to initialize. You need to pass the SQLiteStorage instance."
-    );
+    if (!storage) {
+      console.error(
+        "[legend-state] ObservablePersistSqlite failed to initialize. You need to pass the SQLiteStorage instance."
+      );
+    }
     this.storage = storage;
   }
   getTable(table, init) {

package/persist-plugins/expo-sqlite.mjs

@@ -6,9 +6,11 @@ var MetadataSuffix = "__m";
 var ObservablePersistSqlite = class {
   constructor(storage) {
     this.data = {};
-    console.error(
-      "[legend-state] ObservablePersistSqlite failed to initialize. You need to pass the SQLiteStorage instance."
-    );
+    if (!storage) {
+      console.error(
+        "[legend-state] ObservablePersistSqlite failed to initialize. You need to pass the SQLiteStorage instance."
+      );
+    }
     this.storage = storage;
   }
   getTable(table, init) {

package/react.d.mts

@@ -46,7 +46,9 @@ interface PropsIfReady<T> {
 interface PropsBase<T> {
     else?: ReactNode | (() => ReactNode);
     $value?: Observable<T>;
-    wrap?: FC;
+    wrap?: FC<{
+        children: ReactNode;
+    }>;
     children: ReactNode | ((value?: T) => ReactNode);
 }
 type Props<T> = PropsBase<T> & (PropsIf<T> | PropsIfReady<T>);

package/react.d.ts

@@ -46,7 +46,9 @@ interface PropsIfReady<T> {
 interface PropsBase<T> {
     else?: ReactNode | (() => ReactNode);
     $value?: Observable<T>;
-    wrap?: FC;
+    wrap?: FC<{
+        children: ReactNode;
+    }>;
     children: ReactNode | ((value?: T) => ReactNode);
 }
 type Props<T> = PropsBase<T> & (PropsIf<T> | PropsIfReady<T>);

package/sync-plugins/crud.js

@@ -54,6 +54,7 @@ function retrySet(params, retry, action, itemKey, itemValue, change, queuedRetri
     itemValue = Object.assign(queuedRetry, itemValue);
   }
   queuedRetries[action].set(itemKey, itemValue);
+  const clonedValue = clone(itemValue);
   const paramsWithChanges = { ...params, changes: [change] };
   return runWithRetry(
     paramsWithChanges,
@@ -61,7 +62,7 @@ function retrySet(params, retry, action, itemKey, itemValue, change, queuedRetri
     "create_" + itemKey,
     () => actionFn(itemValue, paramsWithChanges).then((result) => {
       queuedRetries[action].delete(itemKey);
-      return saveResult(itemKey, itemValue, result, true, change);
+      return saveResult(itemKey, clonedValue, result, true, change);
     })
   );
 }

package/sync-plugins/crud.mjs

@@ -52,6 +52,7 @@ function retrySet(params, retry, action, itemKey, itemValue, change, queuedRetri
     itemValue = Object.assign(queuedRetry, itemValue);
   }
   queuedRetries[action].set(itemKey, itemValue);
+  const clonedValue = clone(itemValue);
   const paramsWithChanges = { ...params, changes: [change] };
   return runWithRetry(
     paramsWithChanges,
@@ -59,7 +60,7 @@ function retrySet(params, retry, action, itemKey, itemValue, change, queuedRetri
     "create_" + itemKey,
     () => actionFn(itemValue, paramsWithChanges).then((result) => {
       queuedRetries[action].delete(itemKey);
-      return saveResult(itemKey, itemValue, result, true, change);
+      return saveResult(itemKey, clonedValue, result, true, change);
     })
   );
 }

package/sync-plugins/supabase.js

@@ -54,6 +54,7 @@ function syncedSupabase(props) {
     fieldUpdatedAt,
     fieldDeleted,
     realtime,
+    fieldId = "id",
     changesSince,
     transform: transformParam,
     stringifyDates,
@@ -124,7 +125,7 @@ function syncedSupabase(props) {
   } : void 0;
   const update = !actions || actions.includes("update") ? updateParam ? wrapSupabaseFn(updateParam, "update") : async (input, params) => {
     const { onError } = params;
-    const res = await client.from(collection).update(input).eq("id", input.id).select();
+    const res = await client.from(collection).update(input).eq(fieldId, input[fieldId]).select();
     const { data, error } = res;
     if (data) {
       const created = data[0];
@@ -144,8 +145,7 @@ function syncedSupabase(props) {
     // prettier-ignore
     deleteParam ? wrapSupabaseFn(deleteParam, "delete") : async (input, params) => {
       const { onError } = params;
-      const id = input.id;
-      const res = await client.from(collection).delete().eq("id", id).select();
+      const res = await client.from(collection).delete().eq(fieldId, input[fieldId]).select();
       const { data, error } = res;
       if (data) {
         const created = data[0];
@@ -176,7 +176,7 @@ function syncedSupabase(props) {
         var _a;
         const { eventType, new: value, old } = payload;
         if (eventType === "INSERT" || eventType === "UPDATE") {
-          const cur = (_a = value$.peek()) == null ? void 0 : _a[value.id];
+          const cur = (_a = value$.peek()) == null ? void 0 : _a[value[fieldId]];
           let isOk = !fieldUpdatedAt;
           let lastSync = void 0;
           if (!isOk) {
@@ -219,6 +219,7 @@ function syncedSupabase(props) {
     fieldUpdatedAt,
     fieldDeleted,
     updatePartial: false,
+    fieldId,
     transform,
     generateId,
     waitFor: () => isEnabled$.get() && (waitFor ? state.computeSelector(waitFor) : true),

package/sync-plugins/supabase.mjs

@@ -52,6 +52,7 @@ function syncedSupabase(props) {
     fieldUpdatedAt,
     fieldDeleted,
     realtime,
+    fieldId = "id",
     changesSince,
     transform: transformParam,
     stringifyDates,
@@ -122,7 +123,7 @@ function syncedSupabase(props) {
   } : void 0;
   const update = !actions || actions.includes("update") ? updateParam ? wrapSupabaseFn(updateParam, "update") : async (input, params) => {
     const { onError } = params;
-    const res = await client.from(collection).update(input).eq("id", input.id).select();
+    const res = await client.from(collection).update(input).eq(fieldId, input[fieldId]).select();
     const { data, error } = res;
     if (data) {
       const created = data[0];
@@ -142,8 +143,7 @@ function syncedSupabase(props) {
     // prettier-ignore
     deleteParam ? wrapSupabaseFn(deleteParam, "delete") : async (input, params) => {
       const { onError } = params;
-      const id = input.id;
-      const res = await client.from(collection).delete().eq("id", id).select();
+      const res = await client.from(collection).delete().eq(fieldId, input[fieldId]).select();
       const { data, error } = res;
       if (data) {
         const created = data[0];
@@ -174,7 +174,7 @@ function syncedSupabase(props) {
         var _a;
         const { eventType, new: value, old } = payload;
         if (eventType === "INSERT" || eventType === "UPDATE") {
-          const cur = (_a = value$.peek()) == null ? void 0 : _a[value.id];
+          const cur = (_a = value$.peek()) == null ? void 0 : _a[value[fieldId]];
           let isOk = !fieldUpdatedAt;
           let lastSync = void 0;
           if (!isOk) {
@@ -217,6 +217,7 @@ function syncedSupabase(props) {
     fieldUpdatedAt,
     fieldDeleted,
     updatePartial: false,
+    fieldId,
     transform,
     generateId,
     waitFor: () => isEnabled$.get() && (waitFor ? computeSelector(waitFor) : true),

package/sync.js

@@ -835,6 +835,11 @@ async function loadLocal(value$, syncOptions, syncState$, localState) {
       ].filter(Boolean)
     );
   } else {
+    if ((process.env.NODE_ENV === "development" || process.env.NODE_ENV === "test") && persist && persist.plugin && !Object.hasOwn(persist, "name")) {
+      console.warn(
+        "[legend-state] Trying to syncObservable without `name` defined. Please include a `name` property in the `persist` configuration."
+      );
+    }
     nodeValue.resetPersistence = () => prevResetPersistence == null ? void 0 : prevResetPersistence();
   }
   nodeValue.clearPersist = nodeValue.resetPersistence;

package/sync.mjs

@@ -833,6 +833,11 @@ async function loadLocal(value$, syncOptions, syncState$, localState) {
       ].filter(Boolean)
     );
   } else {
+    if ((process.env.NODE_ENV === "development" || process.env.NODE_ENV === "test") && persist && persist.plugin && !Object.hasOwn(persist, "name")) {
+      console.warn(
+        "[legend-state] Trying to syncObservable without `name` defined. Please include a `name` property in the `persist` configuration."
+      );
+    }
     nodeValue.resetPersistence = () => prevResetPersistence == null ? void 0 : prevResetPersistence();
   }
   nodeValue.clearPersist = nodeValue.resetPersistence;