pinia-plugin-persist-state 0.1.2 → 0.1.3-beta.0

package/dist/pinia-plugin-persist-state.js

@@ -1,6 +1,6 @@
-import { Store as f, isEmpty as u, CustomConsole as _, PluginSubscriber as w } from "pinia-plugin-subscription";
-import { toRaw as P, nextTick as v } from "vue";
-class E {
+import { Store as f, traceGroups as p, isEmpty as y, PluginSubscriber as _ } from "pinia-plugin-subscription/helpers";
+import { toRaw as b, nextTick as w } from "vue";
+class P {
   _storage;
   constructor(t) {
     this._storage = t === "localStorage" ? localStorage : sessionStorage;
@@ -27,7 +27,7 @@ class E {
     this._storage.setItem(e, JSON.stringify(t));
   }
 }
-let l = class {
+let g = class {
   constructor(t, e, s = {}) {
     this._databaseName = t, this._objectStoreName = e, this._objectStoreOptions = s;
   }
@@ -91,7 +91,7 @@ let l = class {
     });
   }
 };
-class m {
+class l {
   _db;
   _db_options;
   get dbName() {
@@ -104,7 +104,7 @@ class m {
   }
   defineDb() {
     const { databaseName: t, keyPath: e, name: s, objectStoreName: r, storage: a } = this._db_options, o = a ?? (s === "localStorage" || s === "sessionStorage" ? s : "indexedDB");
-    return o === "localStorage" || o === "sessionStorage" ? new E(o) : new l(t ?? s, r ?? "persistedStore", { keyPath: e });
+    return o === "localStorage" || o === "sessionStorage" ? new P(o) : new g(t ?? s, r ?? "persistedStore", { keyPath: e });
   }
   async getItem(t) {
     return this._db.getItem(t);
@@ -113,10 +113,10 @@ class m {
     await this._db.removeItem(t);
   }
   async setItem(t, e) {
-    this._db instanceof l ? await this._db.setItem({ storeName: t, ...e }) : await this._db.setItem(e, t);
+    this._db instanceof g ? await this._db.setItem({ storeName: t, ...e }) : await this._db.setItem(e, t);
   }
 }
-class T {
+class v {
   _store = /* @__PURE__ */ new Map();
   async clear() {
     this._store.clear();
@@ -141,25 +141,25 @@ class T {
     this._store.set(e, t);
   }
 }
-let p = {};
-const N = {
+let u = {};
+const E = {
   clear: async () => {
-    p = {};
+    u = {};
   },
-  getItem: async (i) => new Promise((t) => t(p[i])),
+  getItem: async (i) => new Promise((t) => t(u[i])),
   removeItem: async (i) => {
-    delete p[i];
+    delete u[i];
   },
   removeItems: async (i) => {
-    i ? i.forEach((t) => delete p[t]) : p = {};
+    i ? i.forEach((t) => delete u[t]) : u = {};
   },
   setItem: async (i, t) => {
-    p[t] = i;
+    u[t] = i;
   }
 };
-class I extends m {
+class T extends l {
   defineDb() {
-    return this.dbName === "localStorage" || this.dbName === "sessionStorage" ? N : new T();
+    return this.dbName === "localStorage" || this.dbName === "sessionStorage" ? E : new v();
   }
 }
 class h {
@@ -245,7 +245,7 @@ class h {
     return t.buffer.slice(t.byteOffset, t.byteOffset + t.byteLength);
   }
 }
-const O = [
+const N = [
   "@context",
   "activeLink",
   "computed",
@@ -256,8 +256,8 @@ const O = [
   "isLoading",
   "subs",
   "version"
-], M = 200;
-class g extends f {
+], I = 200;
+class S extends f {
   _className = "StorePersister";
   _crypt;
   _excludedKeys;
@@ -265,46 +265,48 @@ class g extends f {
   _propertiesToEncrypt;
   _persistenceVersion = 0;
   _persistTimer;
+  _resolvePendingPersist;
   _writeQueue = Promise.resolve();
   _watchedStore;
-  constructor(t, e, s, r) {
-    super(t, e, s, r);
-    const { crypt: a, persister: o, watchedStore: n } = e;
-    this._excludedKeys = this.initExcludedKeys(), this.definePersister(o), this._propertiesToEncrypt = new Set(this.getPropertiesToEncrypt()), this._watchedStore = n, a && (this._crypt = a, this.options && (this.options.isEncrypted = !1)), this.augmentStore(), this.debugLog("StorePersister constructor", {
+  constructor(t, e) {
+    super(t, e);
+    const { crypt: s, persister: r, watchedStore: a } = e;
+    this._excludedKeys = this.initExcludedKeys(), this.definePersister(r), this._propertiesToEncrypt = new Set(this.getPropertiesToEncrypt()), this._watchedStore = a, s && (this._crypt = s, this.options && (this.options.isEncrypted = !1)), this.augmentStore(), this.trace("constructor", t.$id, () => ({
       toBeWatched: this.toBeWatched(),
-      watchedStore: n,
-      persister: o,
-      store: t,
-      options: e
-    }), this.toBeWatched() && (this._watchedStore.add(this.store.$id), this.storeSubscribe = this.storeSubscription.bind(this));
+      watchedStore: a
+      //persister
+    })), this.toBeWatched() && (this._watchedStore.add(this.store.$id), this.storeSubscribe = this.storeSubscription.bind(this));
   }
   augmentStore() {
     const { isEncrypted: t, persistedPropertiesToEncrypt: e, watchMutation: s } = this.options;
     t === void 0 && (this.options.isEncrypted = !1), e === void 0 && (this.options.persistedPropertiesToEncrypt = []), s === void 0 && (this.options.watchMutation = !1), this.stateHas("isLoading") || this.addToState("isLoading", !1), this.store.persistState = async () => await this.persist(), this.store.flushPersistedState = async () => await this.flushPersistedState(), this.store.remember = async () => await this.remember(), this.store.removePersistedState = this.removePersistedState.bind(this), this.store.watch = this.watch.bind(this), this.store.stopWatch = this.stopWatch.bind(this), this.store.hydrate = this.hydrate.bind(this);
   }
   cancelScheduledPersist() {
-    this._persistTimer && (clearTimeout(this._persistTimer), this._persistTimer = void 0);
+    this._persistTimer && (clearTimeout(this._persistTimer), this._persistTimer = void 0), this._resolvePendingPersist?.(), this._resolvePendingPersist = void 0;
   }
   async cryptState(t, e = !1) {
     return await new Promise(async (s) => {
       const r = this._crypt, a = this.getPropertiesToEncrypt(), o = this.isEncrypted();
-      if (this.debugLog(`cryptState - ${this.store.$id} ${e ? "decrypt" : "crypt"}`, {
+      if (this.trace(`cryptState:${e ? "decrypt" : "crypt"}`, this.store.$id, () => ({
         can: this._propertiesToEncrypt.size > 0 && o === e && !!r,
-        Crypt: r,
-        state: t
-      }), this._propertiesToEncrypt.size > 0 && r) {
+        //Crypt,
+        groupId: p.onMutation(this.store.$id)
+      })), this._propertiesToEncrypt.size > 0 && r) {
         const n = {};
         for (const c of a) {
           const d = this.getValue(t[c]);
           d && (n[c] = e ? await this.decryptProperty(r, d) : await this.encryptProperty(r, d));
         }
-        this.debugLog(`cryptState - ${this.store.$id}`, { encryptedState: n }), u(n) || (t = { ...t, ...n }, this.options && (this.options.isEncrypted = !e));
+        this.trace("cryptState:result", this.store.$id, () => ({
+          groupId: p.onMutation(this.store.$id)
+          //encryptedState
+        })), y(n) || (t = { ...t, ...n }, this.options && (this.options.isEncrypted = !e));
       }
       s(t);
     });
   }
-  static customizeStore(t, e, s, r) {
-    return !e.storeOptions?.persist && e.storeOptions?.watchMutation && (e.storeOptions.persist = !0), super.customizeStore(t, e, s, r);
+  static customizeStore(t, e) {
+    return !e.storeOptions?.persist && e.storeOptions?.watchMutation && (e.storeOptions.persist = !0), super.customizeStore(t, e);
   }
   async decryptProperty(t, e) {
     return t.decrypt(e);
@@ -316,7 +318,7 @@ class g extends f {
       return;
     }
     const s = e.storageOptions;
-    this._persister = new m({
+    this._persister = new l({
       name: s?.databaseName ?? e.storage,
       storage: e.storage,
       databaseName: s?.databaseName,
@@ -355,9 +357,16 @@ class g extends f {
           return;
         s = r.state;
       }
-      return t && this.toBeCrypted() && s && (await this._crypt?.init(), s = await this.cryptState(s, !0)), this.debugLog(`getPersistedState ${e}`, { persistedState: s, state: this.state }), s;
+      return t && this.toBeCrypted() && s && (await this._crypt?.init(), s = await this.cryptState(s, !0)), this.trace("getPersistedState", this.store.$id, () => ({
+        groupId: p.onMutation(this.store.$id)
+        //persistenceKey,
+        //persistedState
+      })), s;
     } catch (s) {
-      this.logError("getPersistedState()", { persistenceKey: e, e: s });
+      this.traceError("getPersistedState", s, this.store.$id, () => ({
+        groupId: p.onMutation(this.store.$id),
+        persistenceKey: e
+      }));
     }
   }
   async getStateToPersist() {
@@ -367,7 +376,7 @@ class g extends f {
     for (const o of Object.keys(e))
       if (!this.hasDeniedFirstChar(o[0]) && !t.has(o)) {
         const n = e[o];
-        u(n) || (s && this._propertiesToEncrypt.has(o) ? a[o] = await this.encryptProperty(r, n) : a[o] = P(n));
+        y(n) || (s && this._propertiesToEncrypt.has(o) ? a[o] = await this.encryptProperty(r, n) : a[o] = b(n));
       }
     return this.transformState(a);
   }
@@ -375,7 +384,7 @@ class g extends f {
     return this.options.watchMutation;
   }
   getDebounceMs() {
-    return Math.max(0, this.options.debounceMs ?? M);
+    return Math.max(0, this.options.debounceMs ?? I);
   }
   static hasRequiredKeys(t) {
     return !!t?.persist || !!t?.watchMutation;
@@ -385,7 +394,7 @@ class g extends f {
   }
   initExcludedKeys() {
     return /* @__PURE__ */ new Set([
-      ...O,
+      ...N,
       ...this.options.excludedKeys ?? []
     ]);
   }
@@ -394,7 +403,9 @@ class g extends f {
   }
   async persist() {
     const t = ++this._persistenceVersion, e = await this.getStateToPersist();
-    if (this.debugLog(`persist() ${this.store.$id} - stateToPersist:`, { state: e }), !u(e)) {
+    if (this.trace("persist", this.store.$id, () => ({
+      groupId: p.onMutation(this.store.$id)
+    })), !y(e)) {
       const s = this.getCacheOptions(), r = s ? { state: e, metadata: { cachedAt: Date.now(), version: s.version } } : e, a = this._writeQueue.then(async () => {
         t === this._persistenceVersion && await this._persister.setItem(this.getPersistenceKey(), r);
       });
@@ -406,9 +417,9 @@ class g extends f {
     this.state.isLoading = !0;
     try {
       let t = await this.getPersistedState();
-      t && !u(t) && this.store.$patch(t);
+      t && !y(t) && this.store.$patch(t);
     } catch (t) {
-      this.logError("remember()", { error: t, storeName: this.store.$id });
+      this.traceError("remember", t, this.store.$id);
     } finally {
       this.state.isLoading = !1;
     }
@@ -422,9 +433,20 @@ class g extends f {
     }), await t;
   }
   schedulePersist(t) {
-    this.cancelScheduledPersist(), this._persistTimer = setTimeout(() => {
-      this._persistTimer = void 0, this.persist().then(() => this.store.mutationCallback?.(this.state, t)).catch((e) => this.logError("persist()", { error: e, storeName: this.store.$id }));
-    }, this.getDebounceMs());
+    return this.cancelScheduledPersist(), new Promise((e) => {
+      this._resolvePendingPersist = e, this._persistTimer = setTimeout(async () => {
+        this._persistTimer = void 0, this._resolvePendingPersist = void 0;
+        try {
+          await this.persist(), this.store.mutationCallback?.(this.state, t);
+        } catch (s) {
+          this.traceError("persist", s, this.store.$id, () => ({
+            groupId: p.onMutation(this.store.$id)
+          }));
+        } finally {
+          e();
+        }
+      }, this.getDebounceMs());
+    });
   }
   async shouldIgnoreCachedState(t, e) {
     const s = this.getCacheOptions(), r = s.maxAge !== void 0 && t.metadata.cachedAt + s.maxAge < Date.now(), a = s.version !== void 0 && s.version !== t.metadata.version, o = r ? s.onExpired : a ? s.onVersionMismatch : void 0;
@@ -436,19 +458,12 @@ class g extends f {
   stopWatch() {
     this.options?.watchMutation && (this.options && (this.options.watchMutation = !1), this._watchedStore.delete(this.store.$id));
   }
-  storeSubscription(t) {
-    this.debugLog(`store.storeSubscription() ${this.store.$id}`, [
-      "mutation type !== patch object: ",
-      t.type !== "patch object",
-      "watchMutation: ",
-      this.getWatchMutation(),
-      "mutation:",
-      t,
-      "state:",
-      this.state,
-      "store:",
-      this.store
-    ]), t.type !== "patch object" && this.getWatchMutation() && this.schedulePersist(t);
+  async storeSubscription(t) {
+    this.trace("storeSubscription", this.store.$id, () => ({
+      groupId: p.onMutation(this.store.$id),
+      isNotPatchObject: t.type !== "patch object",
+      watchMutation: this.getWatchMutation()
+    })), t.type !== "patch object" && this.getWatchMutation() && await this.schedulePersist(t);
   }
   toBeCrypted() {
     return !!(this._crypt && this.getPropertiesToEncrypt());
@@ -463,39 +478,34 @@ class g extends f {
     this.toBeWatched() && (this.options && (this.options.watchMutation = !0), this.storeSubscribe = this.storeSubscription.bind(this));
   }
 }
-const b = "pinia-plugin-persist-state";
-class C extends _ {
-  _pluginName = b;
-}
-const S = new C();
-class x extends w {
+const O = "pinia-plugin-persist-state";
+class M extends _ {
   _resetStoreCallback = (t) => {
     const { removePersistedState: e } = t;
     typeof e == "function" && e();
   };
   constructor() {
     super(
-      b,
-      g.customizeStore.bind(g),
-      S
+      O,
+      S.customizeStore.bind(S)
     ), this.execution = {
       environment: "client",
       hydration: "immediate"
     }, this.hydrationScheduler = (t) => {
-      v(() => t());
+      w(() => t());
     };
   }
   hydrate() {
     typeof window > "u" || this.hydrationScheduler?.(() => {
       const t = this.storeInstance?.hydrate?.();
-      t && typeof t.catch == "function" && t.catch((e) => S.error("PersistPiniaState hydration error", e));
+      t && typeof t.catch == "function" && t.catch((e) => console.error("PersistPiniaState hydration error", e));
     });
   }
 }
-const y = new x(), A = ["localStorage", "sessionStorage"];
-function L(i, t) {
+const m = new M(), A = ["localStorage", "sessionStorage"];
+function j(i, t) {
   const e = K(i, t);
-  return y.pluginOptions = D(e), y;
+  return m.pluginOptions = x(e), m;
 }
 function K(i, t) {
   return typeof i != "string" ? i : A.includes(i) ? { storage: i, cryptKey: t } : {
@@ -505,12 +515,12 @@ function K(i, t) {
     cryptKey: t
   };
 }
-function D(i) {
+function x(i) {
   let t, e;
   const s = /* @__PURE__ */ new Set();
   try {
     if (typeof window < "u")
-      return i && !u(i.storage) && (t = new m({
+      return i && !y(i.storage) && (t = new l({
         name: i.databaseName ?? i.storage,
         storage: i.storage,
         databaseName: i.databaseName,
@@ -523,15 +533,15 @@ function D(i) {
 }
 function $(i, t) {
   let e;
-  return t && (e = new h(t)), y.pluginOptions = {
-    persister: new I({ name: i }),
+  return t && (e = new h(t)), m.pluginOptions = {
+    persister: new T({ name: i }),
     crypt: e,
     watchedStore: /* @__PURE__ */ new Set()
-  }, y;
+  }, m;
 }
 export {
-  b as PLUGIN_NAME,
-  I as PersisterMock,
-  L as createPersistStatePlugin,
+  O as PLUGIN_NAME,
+  T as PersisterMock,
+  j as createPersistStatePlugin,
   $ as createPluginMock
 };

package/dist/types/index.d.ts

@@ -1,4 +1,4 @@
-import type { PluginSubscriberInterface } from "pinia-plugin-subscription";
+import type { PluginSubscriberInterface } from "pinia-plugin-subscription/types";
 import type { PersistStatePluginOptions } from "./store";
 export type { PersistedCacheOptions, PersistedStore, PersistedStoreOptions, PersistedStateTransformer, PersistStatePluginOptions, PersistStorage, PluginPersistedStoreOptions, } from "./store";
 export declare const PLUGIN_NAME: string;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "pinia-plugin-persist-state",
   "description": "Pinia plugin for persisting store state",
-  "version": "0.1.2",
+  "version": "0.1.3-beta.0",
   "type": "module",
   "author": "Alexandre Bidaud <alexbidaud85@gmail.com> (https://github.com/AlxBDo)",
   "license": "MIT",
@@ -42,7 +42,7 @@
     "coverage": "vitest run --coverage"
   },
   "dependencies": {
-    "pinia-plugin-subscription": "^0.1.7"
+    "pinia-plugin-subscription": "^1.0.0-beta.9"
   },
   "peerDependencies": {
     "pinia": "^2.0.0 || ^3.0.0",
@@ -56,6 +56,7 @@
     "@vue/tsconfig": "^0.8.1",
     "fake-indexeddb": "^6.2.5",
     "pinia": "^3.0.2",
+    "pinia-plugin-extending-store": "^0.1.6-beta.4",
     "typescript": "~5.9.3",
     "vite": "^7.2.4",
     "vitest": "^4.0.16",