@salesforce/lds-runtime-webruntime 1.380.0-dev4 → 1.380.0-dev5

package/dist/ldsWebruntimeOneStoreInit.js

@@ -91,18 +91,24 @@ let Err$1 = class Err {
 };
 const ok$2 = (value) => new Ok$2(value);
 const err$1 = (err2) => new Err$1(err2);
+function isResult(value) {
+  return value != null && typeof value === "object" && "isOk" in value && "isErr" in value && typeof value.isOk === "function" && typeof value.isErr === "function" && (value.isOk() === true && value.isErr() === false && "value" in value || value.isOk() === false && value.isErr() === true && "error" in value);
+}
+function isSubscribable(obj) {
+  return typeof obj === "object" && obj !== null && "subscribe" in obj && typeof obj.subscribe === "function" && "refresh" in obj && typeof obj.refresh === "function";
+}
 function isSubscribableResult(x) {
-  if (typeof x !== "object" || x === null) {
+  if (!isResult(x)) {
     return false;
   }
-  if ("isOk" in x && typeof x.isOk === "function") {
-    if (x.isOk()) {
-      return "value" in x && typeof x.value === "object" && x.value !== null && "subscribe" in x.value && typeof x.value.subscribe === "function" && "refresh" in x.value && typeof x.value.refresh === "function";
-    } else {
-      return "error" in x;
-    }
+  return isSubscribable(x.isOk() ? x.value : x.error);
+}
+function buildSubscribableResult$1(result, subscribe, refresh) {
+  if (result.isOk()) {
+    return ok$2({ data: result.value, subscribe, refresh });
+  } else {
+    return err$1({ failure: result.error, subscribe, refresh });
   }
-  return false;
 }
 function resolvedPromiseLike$3(result) {
   if (isPromiseLike$3(result)) {
@@ -234,35 +240,27 @@ let NetworkCommand$1 = class NetworkCommand extends BaseCommand {
   }
   fetchSubscribableResult(res) {
     return res.then((networkResult) => {
-      if (networkResult.isErr()) {
-        return err$1(networkResult.error);
-      } else {
-        const data = networkResult.value;
-        return ok$2({
-          data,
-          subscribe: (cb) => {
-            this.subscriptions.push(cb);
-            return () => {
-              this.subscriptions = this.subscriptions.filter((cb2) => cb2 !== cb);
-            };
-          },
-          refresh: () => this.refresh()
-        });
-      }
+      return buildSubscribableResult$1(
+        networkResult,
+        (cb) => {
+          this.subscriptions.push(cb);
+          return () => {
+            this.subscriptions = this.subscriptions.filter((cb2) => cb2 !== cb);
+          };
+        },
+        () => this.refresh()
+      );
     });
   }
   refresh() {
     return this.execute().then((newResult) => {
-      if (newResult.isOk()) {
-        if (isSubscribableResult(newResult)) {
-          const value = newResult.value;
-          this.subscriptions.forEach((cb) => {
-            cb(ok$2(value.data));
-          });
-        }
-        return ok$2(void 0);
+      if (isSubscribableResult(newResult)) {
+        const value = newResult.isOk() ? ok$2(newResult.value.data) : err$1(newResult.error.failure);
+        this.subscriptions.forEach((cb) => {
+          cb(value);
+        });
       }
-      return err$1(newResult.error);
+      return ok$2(void 0);
     });
   }
   async afterRequestHooks(_options) {
@@ -413,6 +411,13 @@ class Err {
 }
 const ok$1 = (value) => new Ok$1(value);
 const err = (err2) => new Err(err2);
+function buildSubscribableResult(result, subscribe, refresh) {
+  if (result.isOk()) {
+    return ok$1({ data: result.value, subscribe, refresh });
+  } else {
+    return err({ failure: result.error, subscribe, refresh });
+  }
+}
 function resolvedPromiseLike$2(result) {
   if (isPromiseLike$2(result)) {
     return result.then((nextResult) => nextResult);
@@ -512,7 +517,7 @@ class CacheControlRequestRunner {
     const resultPromise = this.readFromCacheInternal(cache);
     return resultPromise.then((result) => {
       if (result.isErr()) {
-        return err(result.error);
+        return err(result.error.failure);
       }
       this.returnData = result;
       return ok$1(void 0);
@@ -520,7 +525,7 @@ class CacheControlRequestRunner {
   }
   requestFromNetwork() {
     const that = this;
-    return async function* () {
+    return (async function* () {
       const result = await that.requestFromNetworkInternal();
       if (result.isErr()) {
         that.networkError = result;
@@ -528,7 +533,7 @@ class CacheControlRequestRunner {
         that.networkData = result;
       }
       yield result;
-    }();
+    })();
   }
   writeToCache(cache, networkResult) {
     return this.writeToCacheInternal(cache, networkResult);
@@ -541,7 +546,7 @@ class CacheControlCommand extends BaseCommand {
     this.keysUsed = /* @__PURE__ */ new Set();
     this.keysUpdated = void 0;
     this.operationType = "query";
-    this.lastEmittedData = void 0;
+    this.lastResult = void 0;
     this.unsubscribeFromKeysImpl = () => void 0;
     this.subscriptions = [];
     this.instantiationTime = Date.now() / 1e3;
@@ -558,32 +563,54 @@ class CacheControlCommand extends BaseCommand {
       instrumentationAttributes: this.instrumentationAttributes
     });
     return resultPromise.then((result) => {
-      return this.handleCacheControllerResult(result, requestRunner);
+      return this.handleCacheControllerResult(result, requestRunner).then((result2) => {
+        if (this.lastResult === void 0) {
+          if (result2.isErr()) {
+            this.lastResult = { type: "error", error: result2.error.failure };
+          } else {
+            this.lastResult = { type: "data", data: result2.value.data };
+          }
+        }
+        return result2;
+      });
     });
   }
   handleCacheControllerResult(result, requestRunner) {
     const { networkError, networkData, returnData } = requestRunner;
     return this.publishUpdatedKeys().then(() => {
       if (networkError) {
-        return networkError;
+        return buildSubscribableResult(
+          networkError,
+          this.buildSubscribe(),
+          () => this.refresh()
+        );
       }
       if (result.isErr()) {
         if (networkData) {
-          return this.constructSubscribableResult(networkData.value);
+          return buildSubscribableResult(
+            networkData,
+            this.buildSubscribe(),
+            () => this.refresh()
+          );
         }
-        return err(result.error);
+        return buildSubscribableResult(result, this.buildSubscribe(), () => this.refresh());
       }
       if (this.subscriptions.length > 0) {
         this.subscribeToKeysUsed();
       }
       if (returnData === void 0) {
         if (networkData) {
-          return this.constructSubscribableResult(networkData.value);
+          return buildSubscribableResult(
+            networkData,
+            this.buildSubscribe(),
+            () => this.refresh()
+          );
         }
-        return err(new Error("Cache miss after fetching from network"));
-      }
-      if (returnData.isOk() && this.lastEmittedData === void 0) {
-        this.lastEmittedData = returnData.value.data;
+        return buildSubscribableResult(
+          err(new Error("Cache miss after fetching from network")),
+          this.buildSubscribe(),
+          () => this.refresh()
+        );
       }
       return returnData;
     });
@@ -643,7 +670,7 @@ class CacheControlCommand extends BaseCommand {
   refresh() {
     return this.rerun({ cacheControlConfig: { type: "no-cache" } }).then((result) => {
       if (result.isErr()) {
-        return err(result.error);
+        return err(result.error.failure);
       }
       return ok$1(void 0);
     });
@@ -661,22 +688,22 @@ class CacheControlCommand extends BaseCommand {
     const result = this.readFromCache(recordableCache);
     return result.then((readResult) => {
       if (readResult.isErr()) {
-        return err(readResult.error);
+        return buildSubscribableResult(
+          readResult,
+          this.buildSubscribe(),
+          () => this.refresh()
+        );
       } else {
         const data = readResult.value;
         this.keysUsed = recordableCache.keysRead;
-        return this.constructSubscribableResult(data);
+        return buildSubscribableResult(
+          ok$1(data),
+          this.buildSubscribe(),
+          () => this.refresh()
+        );
       }
     });
   }
-  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
@@ -703,11 +730,12 @@ class CacheControlCommand extends BaseCommand {
   rerun(overrides) {
     return this.execute(overrides).then((result) => {
       if (result.isErr()) {
-        this.invokeConsumerCallbacks(result);
+        this.lastResult = { type: "error", error: result.error.failure };
+        this.invokeConsumerCallbacks(err(result.error.failure));
         return result;
       }
-      if (!this.equals(this.lastEmittedData, result.value.data)) {
-        this.lastEmittedData = result.value.data;
+      if (this.lastResult === void 0 || this.lastResult.type === "error" || !this.equals(this.lastResult.data, result.value.data)) {
+        this.lastResult = { type: "data", data: result.value.data };
         this.invokeConsumerCallbacks(ok$1(result.value.data));
       }
       return result;
@@ -1139,35 +1167,27 @@ class NetworkCommand extends BaseCommand {
   }
   fetchSubscribableResult(res) {
     return res.then((networkResult) => {
-      if (networkResult.isErr()) {
-        return err$1(networkResult.error);
-      } else {
-        const data = networkResult.value;
-        return ok$2({
-          data,
-          subscribe: (cb) => {
-            this.subscriptions.push(cb);
-            return () => {
-              this.subscriptions = this.subscriptions.filter((cb2) => cb2 !== cb);
-            };
-          },
-          refresh: () => this.refresh()
-        });
-      }
+      return buildSubscribableResult$1(
+        networkResult,
+        (cb) => {
+          this.subscriptions.push(cb);
+          return () => {
+            this.subscriptions = this.subscriptions.filter((cb2) => cb2 !== cb);
+          };
+        },
+        () => this.refresh()
+      );
     });
   }
   refresh() {
     return this.execute().then((newResult) => {
-      if (newResult.isOk()) {
-        if (isSubscribableResult(newResult)) {
-          const value = newResult.value;
-          this.subscriptions.forEach((cb) => {
-            cb(ok$2(value.data));
-          });
-        }
-        return ok$2(void 0);
+      if (isSubscribableResult(newResult)) {
+        const value = newResult.isOk() ? ok$2(newResult.value.data) : err$1(newResult.error.failure);
+        this.subscriptions.forEach((cb) => {
+          cb(value);
+        });
       }
-      return err$1(newResult.error);
+      return ok$2(void 0);
     });
   }
   async afterRequestHooks(_options) {
@@ -3432,22 +3452,22 @@ class AuraGraphQLNormalizedCacheControlCommand extends AuraNormalizedCacheContro
         ),
         (errs) => this.coerceError(errs)
       ).then((result) => {
-        if (result.isOk()) {
-          return this.constructSubscribableResult(result.value);
-        }
-        return result;
+        return buildSubscribableResult$1(result, this.buildSubscribe(), () => this.refresh());
       });
     } else if (this.shouldUseFetch()) {
       return this.convertFetchResponseToData(
         this.services.fetch(...this.originalFetchParams)
       ).then((result) => {
-        if (result.isOk()) {
-          return this.constructSubscribableResult(result.value);
-        }
-        return result;
+        return buildSubscribableResult$1(result, this.buildSubscribe(), () => this.refresh());
       });
     }
-    return resolvedPromiseLike$3(err$1(toError("Aura/Fetch network services not found")));
+    return resolvedPromiseLike$3(
+      buildSubscribableResult$1(
+        err$1(toError("Aura/Fetch network services not found")),
+        this.buildSubscribe(),
+        () => this.refresh()
+      )
+    );
   }
   buildRequestQuery() {
     const augmentedQueryResult = this.documentRootType.buildAugmentedQuery(this.config);
@@ -3476,9 +3496,6 @@ class AuraGraphQLNormalizedCacheControlCommand extends AuraNormalizedCacheContro
       if (this.subscriptions.length > 0) {
         this.subscribeToKeysUsed();
       }
-      if (this.lastEmittedData === void 0) {
-        this.lastEmittedData = returnData.value.data;
-      }
       return returnData;
     });
   }
@@ -3570,10 +3587,7 @@ class HttpGraphQLNormalizedCacheControlCommand extends HttpNormalizedCacheContro
     return this.convertFetchResponseToData(
       this.services.fetch(...this.originalFetchParams)
     ).then((result) => {
-      if (result.isOk()) {
-        return this.constructSubscribableResult(result.value);
-      }
-      return result;
+      return buildSubscribableResult$1(result, this.buildSubscribe(), () => this.refresh());
     });
   }
   // Any changes to this method should most likely be duplicated in the aura command as well
@@ -3586,9 +3600,6 @@ class HttpGraphQLNormalizedCacheControlCommand extends HttpNormalizedCacheContro
       if (this.subscriptions.length > 0) {
         this.subscribeToKeysUsed();
       }
-      if (this.lastEmittedData === void 0) {
-        this.lastEmittedData = returnData.value.data;
-      }
       return returnData;
     });
   }
@@ -3706,7 +3717,7 @@ function buildServiceDescriptor$2(luvio) {
         },
     };
 }
-// version: 1.380.0-dev4-6d09d6af3b
+// version: 1.380.0-dev5-27c3b66ede
 
 /**
  * Copyright (c) 2022, Salesforce, Inc.,
@@ -3732,7 +3743,7 @@ function buildServiceDescriptor$1(notifyRecordUpdateAvailable, getNormalizedLuvi
         },
     };
 }
-// version: 1.380.0-dev4-6d09d6af3b
+// version: 1.380.0-dev5-27c3b66ede
 
 /*!
  * Copyright (c) 2022, Salesforce, Inc.,
@@ -3764,12 +3775,12 @@ function t(e2) {
       throw "Illegal base64url string!";
   }
   try {
-    return function(e3) {
-      return decodeURIComponent(r(e3).replace(/(.)/g, function(e4, r2) {
+    return (function(e3) {
+      return decodeURIComponent(r(e3).replace(/(.)/g, (function(e4, r2) {
         var t3 = r2.charCodeAt(0).toString(16).toUpperCase();
         return t3.length < 2 && (t3 = "0" + t3), "%" + t3;
-      }));
-    }(t2);
+      })));
+    })(t2);
   } catch (e3) {
     return r(t2);
   }
@@ -4352,4 +4363,4 @@ const services = [
     buildServiceDescriptor$1({}, {}),
 ];
 setServices(services);
-// version: 1.380.0-dev4-be0d98927e
+// version: 1.380.0-dev5-94859d35c9

package/package.json

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