@legendapp/state 3.0.0-beta.23 → 3.0.0-beta.26

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.23",
+  "version": "3.0.0-beta.26",
   "description": "legend-state",
   "sideEffects": false,
   "private": false,
@@ -13,6 +13,14 @@
   "dependencies": {
     "use-sync-external-store": "^1.2.2"
   },
+  "peerDependencies": {
+    "expo-sqlite": "^15.0.0"
+  },
+  "peerDependenciesMeta": {
+    "expo-sqlite": {
+      "optional": true
+    }
+  },
   "author": "Legend <contact@legendapp.com> (https://github.com/LegendApp)",
   "keywords": [
     "react",
@@ -249,6 +257,11 @@
       "require": "./persist-plugins/local-storage.js",
       "types": "./persist-plugins/local-storage.d.ts"
     },
+    "./persist-plugins/expo-sqlite": {
+      "import": "./persist-plugins/expo-sqlite.mjs",
+      "require": "./persist-plugins/expo-sqlite.js",
+      "types": "./persist-plugins/expo-sqlite.d.ts"
+    },
     "./persist-plugins/async-storage": {
       "import": "./persist-plugins/async-storage.mjs",
       "require": "./persist-plugins/async-storage.js",

package/persist-plugins/expo-sqlite.d.mts

@@ -0,0 +1,19 @@
+import { Change } from '@legendapp/state';
+import { ObservablePersistPlugin, PersistMetadata } from '@legendapp/state/sync';
+import { SQLiteStorage } from 'expo-sqlite/kv-store';
+
+declare class ObservablePersistSqlite implements ObservablePersistPlugin {
+    private data;
+    private storage;
+    constructor(storage: SQLiteStorage);
+    getTable(table: string, init: any): any;
+    getMetadata(table: string): PersistMetadata;
+    set(table: string, changes: Change[]): void;
+    setMetadata(table: string, metadata: PersistMetadata): void;
+    deleteTable(table: string): undefined;
+    deleteMetadata(table: string): void;
+    private save;
+}
+declare function observablePersistSqlite(storage: SQLiteStorage): ObservablePersistSqlite;
+
+export { ObservablePersistSqlite, observablePersistSqlite };

package/persist-plugins/expo-sqlite.d.ts

@@ -0,0 +1,19 @@
+import { Change } from '@legendapp/state';
+import { ObservablePersistPlugin, PersistMetadata } from '@legendapp/state/sync';
+import { SQLiteStorage } from 'expo-sqlite/kv-store';
+
+declare class ObservablePersistSqlite implements ObservablePersistPlugin {
+    private data;
+    private storage;
+    constructor(storage: SQLiteStorage);
+    getTable(table: string, init: any): any;
+    getMetadata(table: string): PersistMetadata;
+    set(table: string, changes: Change[]): void;
+    setMetadata(table: string, metadata: PersistMetadata): void;
+    deleteTable(table: string): undefined;
+    deleteMetadata(table: string): void;
+    private save;
+}
+declare function observablePersistSqlite(storage: SQLiteStorage): ObservablePersistSqlite;
+
+export { ObservablePersistSqlite, observablePersistSqlite };

package/persist-plugins/expo-sqlite.js

@@ -0,0 +1,72 @@
+'use strict';
+
+var state = require('@legendapp/state');
+
+// src/persist-plugins/expo-sqlite.ts
+var { safeParse, safeStringify } = state.internal;
+var MetadataSuffix = "__m";
+var ObservablePersistSqlite = class {
+  constructor(storage) {
+    this.data = {};
+    if (!storage) {
+      console.error(
+        "[legend-state] ObservablePersistSqlite failed to initialize. You need to pass the SQLiteStorage instance."
+      );
+    }
+    this.storage = storage;
+  }
+  getTable(table, init) {
+    if (!this.storage)
+      return void 0;
+    if (this.data[table] === void 0) {
+      try {
+        const value = this.storage.getItemSync(table);
+        this.data[table] = value ? safeParse(value) : init;
+      } catch (e) {
+        console.error("[legend-state] ObservablePersistSqlite failed to parse", table);
+      }
+    }
+    return this.data[table];
+  }
+  getMetadata(table) {
+    return this.getTable(table + MetadataSuffix, {});
+  }
+  set(table, changes) {
+    if (!this.data[table]) {
+      this.data[table] = {};
+    }
+    this.data[table] = state.applyChanges(this.data[table], changes);
+    this.save(table);
+  }
+  setMetadata(table, metadata) {
+    table = table + MetadataSuffix;
+    this.data[table] = metadata;
+    this.save(table);
+  }
+  deleteTable(table) {
+    if (!this.storage)
+      return void 0;
+    delete this.data[table];
+    this.storage.removeItemSync(table);
+  }
+  deleteMetadata(table) {
+    this.deleteTable(table + MetadataSuffix);
+  }
+  // Private
+  save(table) {
+    if (!this.storage)
+      return void 0;
+    const v = this.data[table];
+    if (v !== void 0 && v !== null) {
+      this.storage.setItemSync(table, safeStringify(v));
+    } else {
+      this.storage.removeItemSync(table);
+    }
+  }
+};
+function observablePersistSqlite(storage) {
+  return new ObservablePersistSqlite(storage);
+}
+
+exports.ObservablePersistSqlite = ObservablePersistSqlite;
+exports.observablePersistSqlite = observablePersistSqlite;

package/persist-plugins/expo-sqlite.mjs

@@ -0,0 +1,69 @@
+import { applyChanges, internal } from '@legendapp/state';
+
+// src/persist-plugins/expo-sqlite.ts
+var { safeParse, safeStringify } = internal;
+var MetadataSuffix = "__m";
+var ObservablePersistSqlite = class {
+  constructor(storage) {
+    this.data = {};
+    if (!storage) {
+      console.error(
+        "[legend-state] ObservablePersistSqlite failed to initialize. You need to pass the SQLiteStorage instance."
+      );
+    }
+    this.storage = storage;
+  }
+  getTable(table, init) {
+    if (!this.storage)
+      return void 0;
+    if (this.data[table] === void 0) {
+      try {
+        const value = this.storage.getItemSync(table);
+        this.data[table] = value ? safeParse(value) : init;
+      } catch (e) {
+        console.error("[legend-state] ObservablePersistSqlite failed to parse", table);
+      }
+    }
+    return this.data[table];
+  }
+  getMetadata(table) {
+    return this.getTable(table + MetadataSuffix, {});
+  }
+  set(table, changes) {
+    if (!this.data[table]) {
+      this.data[table] = {};
+    }
+    this.data[table] = applyChanges(this.data[table], changes);
+    this.save(table);
+  }
+  setMetadata(table, metadata) {
+    table = table + MetadataSuffix;
+    this.data[table] = metadata;
+    this.save(table);
+  }
+  deleteTable(table) {
+    if (!this.storage)
+      return void 0;
+    delete this.data[table];
+    this.storage.removeItemSync(table);
+  }
+  deleteMetadata(table) {
+    this.deleteTable(table + MetadataSuffix);
+  }
+  // Private
+  save(table) {
+    if (!this.storage)
+      return void 0;
+    const v = this.data[table];
+    if (v !== void 0 && v !== null) {
+      this.storage.setItemSync(table, safeStringify(v));
+    } else {
+      this.storage.removeItemSync(table);
+    }
+  }
+};
+function observablePersistSqlite(storage) {
+  return new ObservablePersistSqlite(storage);
+}
+
+export { ObservablePersistSqlite, observablePersistSqlite };

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.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;