@salesforce/lds-runtime-webruntime 1.368.0 → 1.370.0

package/dist/ldsWebruntimeOneStoreInit.js

@@ -483,6 +483,38 @@ function setOverlaps(setA, setB) {
   }
   return false;
 }
+class CacheControlRequestRunner {
+  constructor(readFromCache, requestFromNetwork, writeToCache) {
+    this.readFromCacheInternal = readFromCache;
+    this.requestFromNetworkInternal = requestFromNetwork;
+    this.writeToCacheInternal = writeToCache;
+  }
+  readFromCache(cache) {
+    const resultPromise = this.readFromCacheInternal(cache);
+    return resultPromise.then((result) => {
+      if (result.isErr()) {
+        return err(result.error);
+      }
+      this.returnData = result;
+      return ok$1(void 0);
+    });
+  }
+  requestFromNetwork() {
+    const that = this;
+    return async function* () {
+      const result = await that.requestFromNetworkInternal();
+      if (result.isErr()) {
+        that.networkError = result;
+      } else {
+        that.networkData = result;
+      }
+      yield result;
+    }();
+  }
+  writeToCache(cache, networkResult) {
+    return this.writeToCacheInternal(cache, networkResult);
+  }
+}
 class CacheControlCommand extends BaseCommand {
   constructor(services) {
     super();
@@ -502,57 +534,48 @@ class CacheControlCommand extends BaseCommand {
       this.cacheControlStrategyConfig,
       overrides
     );
-    let returnData;
-    let returnError;
-    const requestRunner = {
-      readFromCache: (cache) => {
-        const resultPromise2 = this.buildResultWithSubscribe(cache);
-        return resultPromise2.then((result) => {
-          if (result.isErr()) {
-            return err(result.error);
-          }
-          returnData = result;
-          return ok$1(void 0);
-        });
-      },
-      requestFromNetwork: () => {
-        const that = this;
-        return async function* () {
-          const result = await that.requestFromNetwork();
-          if (result.isErr()) {
-            returnError = result;
-          }
-          yield result;
-        }();
-      },
-      writeToCache: (cache, networkResult) => {
-        return this.writeToCacheAndRecordKeys(cache, networkResult);
-      }
-    };
+    const requestRunner = this.buildRequestRunner();
     const resultPromise = this.services.cacheController.execute(mergedCacheControlConfig, requestRunner, {
       instrumentationAttributes: this.instrumentationAttributes
     });
     return resultPromise.then((result) => {
-      return this.publishUpdatedKeys().then(() => {
-        if (returnError) {
-          return returnError;
-        }
-        if (result.isErr()) {
-          return err(result.error);
-        }
-        if (this.subscriptions.length > 0) {
-          this.subscribeToKeysUsed();
-        }
-        if (returnData === void 0) {
-          return err(new Error("Cache miss after fetching from network"));
+      return this.handleCacheControllerResult(result, requestRunner);
+    });
+  }
+  handleCacheControllerResult(result, requestRunner) {
+    const { networkError, networkData, returnData } = requestRunner;
+    return this.publishUpdatedKeys().then(() => {
+      if (networkError) {
+        return networkError;
+      }
+      if (result.isErr()) {
+        if (networkData) {
+          return this.constructSubscribableResult(networkData.value);
         }
-        if (returnData.isOk() && this.lastEmittedData === void 0) {
-          this.lastEmittedData = returnData.value.data;
+        return err(result.error);
+      }
+      if (this.subscriptions.length > 0) {
+        this.subscribeToKeysUsed();
+      }
+      if (returnData === void 0) {
+        if (networkData) {
+          return this.constructSubscribableResult(networkData.value);
         }
-        return returnData;
-      });
+        return err(new Error("Cache miss after fetching from network"));
+      }
+      if (returnData.isOk() && this.lastEmittedData === void 0) {
+        this.lastEmittedData = returnData.value.data;
+      }
+      return returnData;
     });
   }
+  buildRequestRunner() {
+    return new CacheControlRequestRunner(
+      (cache) => this.buildResultWithSubscribe(cache),
+      () => this.requestFromNetwork(),
+      (cache, networkResult) => this.writeToCacheAndRecordKeys(cache, networkResult)
+    );
+  }
   publishUpdatedKeys() {
     if (this.services.pubSub) {
       if (this.keysUpdated !== void 0 && this.keysUpdated.size > 0) {
@@ -623,14 +646,18 @@ class CacheControlCommand extends BaseCommand {
       } else {
         const data = readResult.value;
         this.keysUsed = recordableCache.keysRead;
-        return ok$1({
-          data,
-          subscribe: this.buildSubscribe(),
-          refresh: () => this.refresh()
-        });
+        return this.constructSubscribableResult(data);
       }
     });
   }
+  constructSubscribableResult(data) {
+    return ok$1({
+      data,
+      // this cast is in case we need to return Network data as a fallback for caching errors
+      subscribe: this.buildSubscribe(),
+      refresh: () => this.refresh()
+    });
+  }
   /**
    * Builds a function that subscribes to cache changes via the pubsub service. Whenever
    * relevant cache updates occur, it re-reads the data and compares it against
@@ -2911,4 +2938,4 @@ const services = [
     buildServiceDescriptor$2(),
 ];
 setServices(services);
-// version: 1.368.0-20c9e0247b
+// version: 1.370.0-3ec6ffba72

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@salesforce/lds-runtime-webruntime",
-    "version": "1.368.0",
+    "version": "1.370.0",
     "license": "SEE LICENSE IN LICENSE.txt",
     "description": "LDS engine for Webruntime runtime",
     "main": "dist/ldsWebruntimeOneStoreInit.js",
@@ -35,33 +35,33 @@
         "ready": "yarn build && jest --collectCoverage && yarn test:size && yarn release:corejar"
     },
     "devDependencies": {
-        "@luvio/service-provisioner": "5.43.1",
-        "@luvio/tools-core": "5.43.1",
+        "@luvio/service-provisioner": "5.44.0",
+        "@luvio/tools-core": "5.44.0",
         "jwt-encode": "1.0.1"
     },
     "dependencies": {
-        "@luvio/command-aura-network": "5.43.1",
-        "@luvio/command-aura-normalized-cache-control": "5.43.1",
-        "@luvio/command-aura-resource-cache-control": "5.43.1",
-        "@luvio/command-fetch-network": "5.43.1",
-        "@luvio/command-http-normalized-cache-control": "5.43.1",
-        "@luvio/command-ndjson": "5.43.1",
-        "@luvio/command-network": "5.43.1",
-        "@luvio/command-sse": "5.43.1",
-        "@luvio/command-streaming": "5.43.1",
-        "@luvio/jwt-manager": "5.43.1",
-        "@luvio/network-adapter-composable": "0.158.3",
-        "@luvio/network-adapter-fetch": "0.158.3",
-        "@luvio/service-aura-network": "5.43.1",
-        "@luvio/service-cache": "5.43.1",
-        "@luvio/service-cache-control": "5.43.1",
-        "@luvio/service-cache-inclusion-policy": "5.43.1",
-        "@luvio/service-fetch-network": "5.43.1",
-        "@luvio/service-instrument-command": "5.43.1",
-        "@luvio/service-pubsub": "5.43.1",
-        "@luvio/service-store": "5.43.1",
-        "@luvio/utils": "5.43.1",
-        "@salesforce/lds-adapters-uiapi-lex": "^1.368.0"
+        "@luvio/command-aura-network": "5.44.0",
+        "@luvio/command-aura-normalized-cache-control": "5.44.0",
+        "@luvio/command-aura-resource-cache-control": "5.44.0",
+        "@luvio/command-fetch-network": "5.44.0",
+        "@luvio/command-http-normalized-cache-control": "5.44.0",
+        "@luvio/command-ndjson": "5.44.0",
+        "@luvio/command-network": "5.44.0",
+        "@luvio/command-sse": "5.44.0",
+        "@luvio/command-streaming": "5.44.0",
+        "@luvio/jwt-manager": "5.44.0",
+        "@luvio/network-adapter-composable": "0.158.7",
+        "@luvio/network-adapter-fetch": "0.158.7",
+        "@luvio/service-aura-network": "5.44.0",
+        "@luvio/service-cache": "5.44.0",
+        "@luvio/service-cache-control": "5.44.0",
+        "@luvio/service-cache-inclusion-policy": "5.44.0",
+        "@luvio/service-fetch-network": "5.44.0",
+        "@luvio/service-instrument-command": "5.44.0",
+        "@luvio/service-pubsub": "5.44.0",
+        "@luvio/service-store": "5.44.0",
+        "@luvio/utils": "5.44.0",
+        "@salesforce/lds-adapters-uiapi-lex": "^1.370.0"
     },
     "luvioBundlesize": [
         {