@spoosh/plugin-optimistic 0.8.1 → 0.9.0

package/dist/index.js

@@ -104,6 +104,8 @@ var import_core3 = require("@spoosh/core");
 function createBuilder(state, isConfirmed = false) {
   return {
     ...state,
+    // Expose the internal state so the plugin can access predicates
+    __state: state,
     filter(predicate) {
       return createBuilder({ ...state, filter: predicate }, isConfirmed);
     },
@@ -170,11 +172,12 @@ function applyUpdate(stateManager, target, updater, response, t) {
   const snapshots = [];
   const matchingEntries = getMatchingEntries(stateManager, target.path);
   if (matchingEntries.length === 0) {
-    t?.skip(`Skipped ${target.path} (no cache entry)`);
     return [];
   }
   for (const { key, entry, extractedParams } of matchingEntries) {
-    if (target.filter) {
+    const targetWithState = target;
+    const filterPredicate = targetWithState.__state ? targetWithState.__state.filter : target.filter;
+    if (filterPredicate) {
       const options = extractOptionsFromKey(key) ?? {};
       const mergedOptions = {
         ...options,
@@ -184,10 +187,7 @@ function applyUpdate(stateManager, target, updater, response, t) {
         }
       };
       try {
-        if (!target.filter(mergedOptions)) {
-          t?.skip(
-            `Skipped ${formatCacheKeyForTrace(key)} (filter not matched)`
-          );
+        if (!filterPredicate(mergedOptions)) {
           continue;
         }
       } catch {
@@ -196,7 +196,6 @@ function applyUpdate(stateManager, target, updater, response, t) {
       }
     }
     if (entry?.state.data === void 0) {
-      t?.skip(`Skipped ${formatCacheKeyForTrace(key)} (no cached data)`);
       continue;
     }
     const afterData = updater(entry.state.data, response);
@@ -256,14 +255,16 @@ function optimisticPlugin() {
         t?.skip("No optimistic targets");
         return next();
       }
-      context.plugins.get("spoosh:invalidation")?.setDefaultMode("none");
+      context.plugins.get("spoosh:invalidation")?.disableAutoInvalidate();
       const allImmediateSnapshots = [];
       for (const target of targets) {
-        if (!target.immediateUpdater) continue;
+        const targetWithState = target;
+        const immediateUpdater = targetWithState.__state ? targetWithState.__state.immediateUpdater : target.immediateUpdater;
+        if (!immediateUpdater) continue;
         const snapshots = applyUpdate(
           stateManager,
           target,
-          target.immediateUpdater,
+          immediateUpdater,
           void 0,
           t
         );
@@ -277,9 +278,12 @@ function optimisticPlugin() {
       }
       const response = await next();
       if (response.error) {
-        const shouldRollback = targets.some(
-          (target) => target.rollbackOnError && target.immediateUpdater
-        );
+        const shouldRollback = targets.some((target) => {
+          const targetWithState = target;
+          const rollbackOnError = targetWithState.__state ? targetWithState.__state.rollbackOnError : target.rollbackOnError;
+          const immediateUpdater = targetWithState.__state ? targetWithState.__state.immediateUpdater : target.immediateUpdater;
+          return rollbackOnError && immediateUpdater;
+        });
         if (shouldRollback && allImmediateSnapshots.length > 0) {
           rollbackOptimistic(stateManager, allImmediateSnapshots);
           for (const snapshot of allImmediateSnapshots) {
@@ -290,8 +294,10 @@ function optimisticPlugin() {
           }
         }
         for (const target of targets) {
-          if (target.onError) {
-            target.onError(response.error);
+          const targetWithState = target;
+          const onError = targetWithState.__state ? targetWithState.__state.onError : target.onError;
+          if (onError) {
+            onError(response.error);
           }
         }
       } else {
@@ -299,11 +305,13 @@ function optimisticPlugin() {
           confirmOptimistic(stateManager, allImmediateSnapshots);
         }
         for (const target of targets) {
-          if (!target.confirmedUpdater) continue;
+          const targetWithState = target;
+          const confirmedUpdater = targetWithState.__state ? targetWithState.__state.confirmedUpdater : target.confirmedUpdater;
+          if (!confirmedUpdater) continue;
           const snapshots = applyUpdate(
             stateManager,
             target,
-            target.confirmedUpdater,
+            confirmedUpdater,
             response.data,
             t
           );

package/dist/index.mjs

@@ -80,6 +80,8 @@ import { generateSelfTagFromKey as generateSelfTagFromKey2 } from "@spoosh/core"
 function createBuilder(state, isConfirmed = false) {
   return {
     ...state,
+    // Expose the internal state so the plugin can access predicates
+    __state: state,
     filter(predicate) {
       return createBuilder({ ...state, filter: predicate }, isConfirmed);
     },
@@ -146,11 +148,12 @@ function applyUpdate(stateManager, target, updater, response, t) {
   const snapshots = [];
   const matchingEntries = getMatchingEntries(stateManager, target.path);
   if (matchingEntries.length === 0) {
-    t?.skip(`Skipped ${target.path} (no cache entry)`);
     return [];
   }
   for (const { key, entry, extractedParams } of matchingEntries) {
-    if (target.filter) {
+    const targetWithState = target;
+    const filterPredicate = targetWithState.__state ? targetWithState.__state.filter : target.filter;
+    if (filterPredicate) {
       const options = extractOptionsFromKey(key) ?? {};
       const mergedOptions = {
         ...options,
@@ -160,10 +163,7 @@ function applyUpdate(stateManager, target, updater, response, t) {
         }
       };
       try {
-        if (!target.filter(mergedOptions)) {
-          t?.skip(
-            `Skipped ${formatCacheKeyForTrace(key)} (filter not matched)`
-          );
+        if (!filterPredicate(mergedOptions)) {
           continue;
         }
       } catch {
@@ -172,7 +172,6 @@ function applyUpdate(stateManager, target, updater, response, t) {
       }
     }
     if (entry?.state.data === void 0) {
-      t?.skip(`Skipped ${formatCacheKeyForTrace(key)} (no cached data)`);
       continue;
     }
     const afterData = updater(entry.state.data, response);
@@ -232,14 +231,16 @@ function optimisticPlugin() {
         t?.skip("No optimistic targets");
         return next();
       }
-      context.plugins.get("spoosh:invalidation")?.setDefaultMode("none");
+      context.plugins.get("spoosh:invalidation")?.disableAutoInvalidate();
       const allImmediateSnapshots = [];
       for (const target of targets) {
-        if (!target.immediateUpdater) continue;
+        const targetWithState = target;
+        const immediateUpdater = targetWithState.__state ? targetWithState.__state.immediateUpdater : target.immediateUpdater;
+        if (!immediateUpdater) continue;
         const snapshots = applyUpdate(
           stateManager,
           target,
-          target.immediateUpdater,
+          immediateUpdater,
           void 0,
           t
         );
@@ -253,9 +254,12 @@ function optimisticPlugin() {
       }
       const response = await next();
       if (response.error) {
-        const shouldRollback = targets.some(
-          (target) => target.rollbackOnError && target.immediateUpdater
-        );
+        const shouldRollback = targets.some((target) => {
+          const targetWithState = target;
+          const rollbackOnError = targetWithState.__state ? targetWithState.__state.rollbackOnError : target.rollbackOnError;
+          const immediateUpdater = targetWithState.__state ? targetWithState.__state.immediateUpdater : target.immediateUpdater;
+          return rollbackOnError && immediateUpdater;
+        });
         if (shouldRollback && allImmediateSnapshots.length > 0) {
           rollbackOptimistic(stateManager, allImmediateSnapshots);
           for (const snapshot of allImmediateSnapshots) {
@@ -266,8 +270,10 @@ function optimisticPlugin() {
           }
         }
         for (const target of targets) {
-          if (target.onError) {
-            target.onError(response.error);
+          const targetWithState = target;
+          const onError = targetWithState.__state ? targetWithState.__state.onError : target.onError;
+          if (onError) {
+            onError(response.error);
           }
         }
       } else {
@@ -275,11 +281,13 @@ function optimisticPlugin() {
           confirmOptimistic(stateManager, allImmediateSnapshots);
         }
         for (const target of targets) {
-          if (!target.confirmedUpdater) continue;
+          const targetWithState = target;
+          const confirmedUpdater = targetWithState.__state ? targetWithState.__state.confirmedUpdater : target.confirmedUpdater;
+          if (!confirmedUpdater) continue;
           const snapshots = applyUpdate(
             stateManager,
             target,
-            target.confirmedUpdater,
+            confirmedUpdater,
             response.data,
             t
           );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spoosh/plugin-optimistic",
-  "version": "0.8.1",
+  "version": "0.9.0",
   "description": "Optimistic updates plugin for Spoosh - instant UI updates with automatic rollback",
   "license": "MIT",
   "repository": {
@@ -33,12 +33,12 @@
     }
   },
   "peerDependencies": {
-    "@spoosh/core": ">=0.17.0",
-    "@spoosh/plugin-invalidation": ">=0.7.0"
+    "@spoosh/core": ">=0.18.0",
+    "@spoosh/plugin-invalidation": ">=0.11.0"
   },
   "devDependencies": {
-    "@spoosh/core": "0.17.1",
-    "@spoosh/plugin-invalidation": "0.10.0",
+    "@spoosh/core": "0.18.0",
+    "@spoosh/plugin-invalidation": "0.11.0",
     "@spoosh/test-utils": "0.3.0"
   },
   "scripts": {