@salesforce/lds-runtime-aura 1.404.0-dev4 → 1.404.0-dev6

package/dist/ldsEngineCreator.js

@@ -22,8 +22,9 @@ import useCmpDefPredictions from '@salesforce/gate/lds.pdl.useCmpDefPredictions'
 import applyPredictionRequestLimit from '@salesforce/gate/lds.pdl.applyRequestLimit';
 import useLocalStorage from '@salesforce/gate/lds.pdl.useLocalStorage';
 import useOneStoreGraphql from '@salesforce/gate/lds.oneStoreGraphqlEnabled.ltng';
+import canCombineRecordLayoutRequests from '@salesforce/gate/lds.pdl.canCombineRecordLayoutRequests';
 import { GetApexWireAdapterFactory, registerPrefetcher as registerPrefetcher$1 } from 'force/ldsAdaptersApex';
-import { instrument, getRecordAvatarsAdapterFactory, getRecordAdapterFactory, coerceFieldIdArray, getRecordsAdapterFactory, getRecordActionsAdapterFactory, getObjectInfosAdapterFactory, coerceObjectIdArray, getObjectInfoAdapterFactory, coerceObjectId, getRelatedListsActionsAdapterFactory, getRelatedListInfoBatchAdapterFactory, getRelatedListInfoAdapterFactory, getRelatedListRecordsBatchAdapterFactory, getRelatedListRecordsAdapterFactory, getListInfoByNameAdapterFactory, getListInfosByObjectNameAdapterFactory, getListRecordsByNameAdapterFactory, getListObjectInfoAdapterFactory, getRelatedListsInfoAdapterFactory, getRelatedListActionsAdapterFactory, getRecordId18Array, buildRecordRepKeyFromId, configuration, InMemoryRecordRepresentationQueryEvaluator, UiApiNamespace, RecordRepresentationRepresentationType, registerPrefetcher, RecordRepresentationVersion } from 'force/ldsAdaptersUiapi';
+import { instrument, getRecordAvatarsAdapterFactory, getRecordAdapterFactory, coerceFieldIdArray, coerceLayoutTypeArray, coerceLayoutModeArray, getRecordsAdapterFactory, getRecordActionsAdapterFactory, getObjectInfosAdapterFactory, coerceObjectIdArray, getObjectInfoAdapterFactory, coerceObjectId, getRelatedListsActionsAdapterFactory, getRelatedListInfoBatchAdapterFactory, getRelatedListInfoAdapterFactory, getRelatedListRecordsBatchAdapterFactory, getRelatedListRecordsAdapterFactory, getListInfoByNameAdapterFactory, getListInfosByObjectNameAdapterFactory, getListRecordsByNameAdapterFactory, getListObjectInfoAdapterFactory, getRelatedListsInfoAdapterFactory, getRelatedListActionsAdapterFactory, getRecordId18Array, buildRecordRepKeyFromId, configuration, InMemoryRecordRepresentationQueryEvaluator, UiApiNamespace, RecordRepresentationRepresentationType, registerPrefetcher, RecordRepresentationVersion } from 'force/ldsAdaptersUiapi';
 import { getInstrumentation } from 'o11y/client';
 import { findExecutableOperation, buildGraphQLInputExtension, addTypenameToDocument } from 'force/luvioGraphqlNormalization';
 import { print, wrapConfigAndVerify, resolveAst, validateGraphQLOperations } from 'force/luvioOnestoreGraphqlParser';
@@ -470,7 +471,12 @@ class AuraNetworkCommand extends NetworkCommand$1 {
         this.coerceAuraErrors
       );
     } else if (this.shouldUseFetch()) {
-      return this.convertFetchResponseToData(this.services.fetch(...this.fetchParams));
+      const params = this.fetchParams;
+      try {
+        return this.convertFetchResponseToData(this.services.fetch(...params));
+      } catch (reason) {
+        return resolvedPromiseLike$2(err$1(toError(reason)));
+      }
     }
     return resolvedPromiseLike$2(err$1(toError("Aura/Fetch network services not found")));
   }
@@ -1068,7 +1074,12 @@ let AuraCacheControlCommand$1 = class AuraCacheControlCommand extends CacheContr
         (errs) => this.coerceAuraErrors(errs)
       );
     } else if (this.shouldUseFetch()) {
-      return this.convertFetchResponseToData(this.services.fetch(...this.fetchParams));
+      const params = this.fetchParams;
+      try {
+        return this.convertFetchResponseToData(this.services.fetch(...params));
+      } catch (reason) {
+        return resolvedPromiseLike$2(err$1(toError(reason)));
+      }
     }
     return resolvedPromiseLike$2(err$1(toError("Aura/Fetch network services not found")));
   }
@@ -1211,7 +1222,12 @@ class AuraCacheControlCommand extends CacheControlCommand {
         (errs) => this.coerceAuraErrors(errs)
       );
     } else if (this.shouldUseFetch()) {
-      return this.convertFetchResponseToData(this.services.fetch(...this.fetchParams));
+      const params = this.fetchParams;
+      try {
+        return this.convertFetchResponseToData(this.services.fetch(...params));
+      } catch (reason) {
+        return resolvedPromiseLike$2(err$1(toError(reason)));
+      }
     }
     return resolvedPromiseLike$2(err$1(toError("Aura/Fetch network services not found")));
   }
@@ -1329,7 +1345,11 @@ class HttpCacheControlCommand extends CacheControlCommand {
     return this.fetch();
   }
   fetch() {
-    return this.convertFetchResponseToData(this.services.fetch(...this.fetchParams));
+    try {
+      return this.convertFetchResponseToData(this.services.fetch(...this.fetchParams));
+    } catch (reason) {
+      return resolvedPromiseLike$2(err$1(toError(reason)));
+    }
   }
   async coerceError(errorResponse) {
     return toError(errorResponse.statusText);
@@ -1532,7 +1552,11 @@ const _FetchNetworkCommand = class _FetchNetworkCommand extends NetworkCommand {
     this.services = services;
   }
   fetch() {
-    return this.convertFetchResponseToData(this.services.fetch(...this.fetchParams));
+    try {
+      return this.convertFetchResponseToData(this.services.fetch(...this.fetchParams));
+    } catch (reason) {
+      return resolvedPromiseLike$2(err$1(toError(reason)));
+    }
   }
   async coerceError(errorResponse) {
     return toError(errorResponse.statusText);
@@ -1588,7 +1612,11 @@ class StreamingCommand extends BaseCommand {
     this.services = services;
   }
   execute() {
-    return this.convertFetchStreamResponseToData(this.services.fetch(...this.fetchParams));
+    try {
+      return this.convertFetchStreamResponseToData(this.services.fetch(...this.fetchParams));
+    } catch (reason) {
+      return resolvedPromiseLike$2(err$1(toError(reason)));
+    }
   }
   convertFetchStreamResponseToData(response) {
     return response.then(
@@ -2424,9 +2452,13 @@ class OnlyIfCachedCacheControlStrategy extends CacheControlStrategy {
   }
   get expiredChecks() {
     return [
-      (cacheControlMetadata) => cacheControlMetadata.type === "no-store"
+      ...super.expiredChecks,
+      (cacheControlMetadata) => cacheControlMetadata.type === "no-cache"
     ];
   }
+  // Note: If we add support for `stale-while-revalidate` in the future, we may
+  // need to further override expiredChecks to allow stale entries that are within the
+  // stale-while-revalidate window to be returned for only-if-cached requests.
   collectCacheHitInstrumentation(startTime, instrumentationAttributes) {
     if (this.services.instrumentation) {
       const meter = this.services.instrumentation.metrics.getMeter("onestore");
@@ -2666,7 +2698,7 @@ function buildServiceDescriptor$d(luvio) {
         },
     };
 }
-// version: 1.404.0-dev4-42147f9daa
+// version: 1.404.0-dev6-7d450dc392
 
 /*!
  * Copyright (c) 2022, Salesforce, Inc.,
@@ -2782,11 +2814,26 @@ class AuraGraphQLNormalizedCacheControlCommand extends AuraNormalizedCacheContro
         return buildSubscribableResult$1(result, this.buildSubscribe(), () => this.refresh());
       });
     } else if (this.shouldUseFetch()) {
-      return this.convertFetchResponseToData(
-        this.services.fetch(...this.originalFetchParams)
-      ).then((result) => {
-        return buildSubscribableResult$1(result, this.buildSubscribe(), () => this.refresh());
-      });
+      const params = this.originalFetchParams;
+      try {
+        return this.convertFetchResponseToData(this.services.fetch(...params)).then(
+          (result) => {
+            return buildSubscribableResult$1(
+              result,
+              this.buildSubscribe(),
+              () => this.refresh()
+            );
+          }
+        );
+      } catch (reason) {
+        return resolvedPromiseLike$2(
+          buildSubscribableResult$1(
+            err$1(toError(reason)),
+            this.buildSubscribe(),
+            () => this.refresh()
+          )
+        );
+      }
     }
     return resolvedPromiseLike$2(
       buildSubscribableResult$1(
@@ -3004,7 +3051,7 @@ function buildServiceDescriptor$9(notifyRecordUpdateAvailable, getNormalizedLuvi
         },
     };
 }
-// version: 1.404.0-dev4-42147f9daa
+// version: 1.404.0-dev6-7d450dc392
 
 /*!
  * Copyright (c) 2022, Salesforce, Inc.,
@@ -4707,7 +4754,7 @@ function getEnvironmentSetting(name) {
     }
     return undefined;
 }
-// version: 1.404.0-dev4-42147f9daa
+// version: 1.404.0-dev6-7d450dc392
 
 /**
  * Observability / Critical Availability Program (230+)
@@ -6775,9 +6822,31 @@ function isFieldsRequest(config) {
         config.modes === undefined &&
         (config.fields !== undefined || config.optionalFields !== undefined));
 }
+function isCombinableLayoutRequest(config) {
+    // We will only consider a layout request combinable if it is a single layout type request
+    // and the only request parameters are:
+    // - layoutTypes
+    // - optionalFields
+    // - modes
+    const hasExtraParams = config.childRelationships !== undefined ||
+        config.pageSize !== undefined ||
+        config.updateMru !== undefined;
+    return config.layoutTypes !== undefined && !hasExtraParams;
+}
+function areCombinableLayoutRequests(reqA, reqB) {
+    const normilizedLayoutTypesA = coerceLayoutTypeArray(reqA.layoutTypes) || [];
+    const normilizedLayoutTypesB = coerceLayoutTypeArray(reqB.layoutTypes) || [];
+    // Let's only combine when the layoutTypes are the same
+    return (isCombinableLayoutRequest(reqA) &&
+        isCombinableLayoutRequest(reqB) &&
+        reqA.recordId === reqB.recordId &&
+        normilizedLayoutTypesA.length === normilizedLayoutTypesB.length &&
+        normilizedLayoutTypesA.every((type, index) => type === normilizedLayoutTypesB[index]));
+}
 class GetRecordRequestStrategy extends LuvioAdapterRequestStrategy {
-    constructor() {
-        super(...arguments);
+    constructor(luvio, canCombineRecordLayoutRequests = false) {
+        super(luvio);
+        this.canCombineRecordLayoutRequests = canCombineRecordLayoutRequests;
         this.adapterName = GET_RECORD_ADAPTER_NAME;
         this.adapterFactory = getRecordAdapterFactory;
     }
@@ -6806,10 +6875,41 @@ class GetRecordRequestStrategy extends LuvioAdapterRequestStrategy {
         };
     }
     canCombine(reqA, reqB) {
-        // must be same record and
-        return reqA.recordId === reqB.recordId && isFieldsRequest(reqA) && isFieldsRequest(reqB);
+        // must be same record and either both are fields requests or both are combinable layout requests
+        return (reqA.recordId === reqB.recordId &&
+            ((isFieldsRequest(reqA) && isFieldsRequest(reqB)) ||
+                (this.canCombineRecordLayoutRequests && areCombinableLayoutRequests(reqA, reqB))));
     }
     combineRequests(reqA, reqB) {
+        if (isFieldsRequest(reqA)) {
+            return this.combineFieldsRequests(reqA, reqB);
+        }
+        else {
+            return this.combineLayoutRequests(reqA, reqB);
+        }
+    }
+    combineLayoutRequests(reqA, reqB) {
+        const combined = {
+            recordId: reqA.recordId,
+            layoutTypes: coerceLayoutTypeArray(reqA.layoutTypes),
+        };
+        // combine Modes.
+        // Note: the || ['View'] is important; it is to cover the case in which it needs to
+        // combine mode: undefined (defaults to View) with mode: ['something else than View']
+        const modeA = coerceLayoutModeArray(reqA.modes) || ['View'];
+        const modeB = coerceLayoutModeArray(reqB.modes) || ['View'];
+        if (reqA.modes !== undefined || reqB.modes !== undefined) {
+            combined.modes = Array.from(new Set([...modeA, ...modeB]));
+        }
+        // combine Optional Fields.
+        const optionalFieldsA = coerceFieldIdArray(reqA.optionalFields, COERCE_FIELD_ID_ARRAY_OPTIONS) || [];
+        const optionalFieldsB = coerceFieldIdArray(reqB.optionalFields, COERCE_FIELD_ID_ARRAY_OPTIONS) || [];
+        if (optionalFieldsA !== undefined || optionalFieldsB !== undefined) {
+            combined.optionalFields = Array.from(new Set([...optionalFieldsA, ...optionalFieldsB]));
+        }
+        return combined;
+    }
+    combineFieldsRequests(reqA, reqB) {
         const fields = new Set();
         const optionalFields = new Set();
         if (reqA.fields !== undefined) {
@@ -9495,7 +9595,7 @@ function whenPredictionsReady(callback) {
 }
 function setupPredictivePrefetcher(luvio) {
     const allStrategies = [
-        new GetRecordRequestStrategy(luvio),
+        new GetRecordRequestStrategy(luvio, canCombineRecordLayoutRequests.isOpen({ fallback: false })),
         new GetRecordsRequestStrategy(luvio),
         new GetRecordActionsRequestStrategy(luvio),
         new GetRecordAvatarsRequestStrategy(luvio),
@@ -9788,4 +9888,4 @@ function ldsEngineCreator() {
 }
 
 export { LexRequestStrategy, PdlRequestPriority, buildPredictorForContext, ldsEngineCreator as default, initializeLDS, initializeOneStore, notifyUpdateAvailableFactory, registerRequestStrategy, saveRequestAsPrediction, unregisterRequestStrategy, whenPredictionsReady };
-// version: 1.404.0-dev4-e7390885d6
+// version: 1.404.0-dev6-37e463b2dc

package/dist/types/predictive-loading/request-strategy/get-record-request-strategy.d.ts

@@ -1,3 +1,4 @@
+import type { Luvio } from '@luvio/engine';
 import type { GetRecordConfig } from '@salesforce/lds-adapters-uiapi';
 import { LuvioAdapterRequestStrategy } from './luvio-adapter-request-strategy';
 export type GetRecordRequest = {
@@ -9,12 +10,16 @@ type GetRecordContext = {
 };
 export declare const GET_RECORD_ADAPTER_NAME = "getRecord";
 export declare class GetRecordRequestStrategy extends LuvioAdapterRequestStrategy<GetRecordConfig, GetRecordRequest, GetRecordContext> {
+    private readonly canCombineRecordLayoutRequests;
     adapterName: string;
     adapterFactory: import("@luvio/engine").AdapterFactory<GetRecordConfig, import("@salesforce/lds-adapters-uiapi").RecordRepresentation>;
+    constructor(luvio: Luvio, canCombineRecordLayoutRequests?: boolean);
     buildConcreteRequest(similarRequest: GetRecordRequest, context: GetRecordContext): GetRecordRequest;
     transformForSave(request: GetRecordRequest): GetRecordRequest;
     canCombine(reqA: GetRecordConfig, reqB: GetRecordConfig): boolean;
     combineRequests(reqA: GetRecordConfig, reqB: GetRecordConfig): GetRecordConfig;
+    combineLayoutRequests(reqA: GetRecordConfig, reqB: GetRecordConfig): GetRecordConfig;
+    combineFieldsRequests(reqA: GetRecordConfig, reqB: GetRecordConfig): GetRecordConfig;
     isContextDependent(context: GetRecordContext, request: GetRecordRequest): boolean;
     transformForSaveSimilarRequest(request: GetRecordRequest): GetRecordRequest;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@salesforce/lds-runtime-aura",
-    "version": "1.404.0-dev4",
+    "version": "1.404.0-dev6",
     "license": "SEE LICENSE IN LICENSE.txt",
     "description": "LDS engine for Aura runtime",
     "main": "dist/ldsEngineCreator.js",
@@ -34,49 +34,49 @@
         "release:corejar": "yarn build && ../core-build/scripts/core.js --name=lds-runtime-aura"
     },
     "devDependencies": {
-        "@conduit-client/service-provisioner": "3.2.0",
-        "@conduit-client/tools-core": "3.2.0",
-        "@salesforce/lds-adapters-apex": "^1.404.0-dev4",
-        "@salesforce/lds-adapters-uiapi": "^1.404.0-dev4",
-        "@salesforce/lds-ads-bridge": "^1.404.0-dev4",
-        "@salesforce/lds-aura-storage": "^1.404.0-dev4",
-        "@salesforce/lds-bindings": "^1.404.0-dev4",
-        "@salesforce/lds-instrumentation": "^1.404.0-dev4",
-        "@salesforce/lds-network-aura": "^1.404.0-dev4",
-        "@salesforce/lds-network-fetch": "^1.404.0-dev4",
+        "@conduit-client/service-provisioner": "3.7.0-dev1",
+        "@conduit-client/tools-core": "3.7.0-dev1",
+        "@salesforce/lds-adapters-apex": "^1.404.0-dev6",
+        "@salesforce/lds-adapters-uiapi": "^1.404.0-dev6",
+        "@salesforce/lds-ads-bridge": "^1.404.0-dev6",
+        "@salesforce/lds-aura-storage": "^1.404.0-dev6",
+        "@salesforce/lds-bindings": "^1.404.0-dev6",
+        "@salesforce/lds-instrumentation": "^1.404.0-dev6",
+        "@salesforce/lds-network-aura": "^1.404.0-dev6",
+        "@salesforce/lds-network-fetch": "^1.404.0-dev6",
         "jwt-encode": "1.0.1"
     },
     "dependencies": {
-        "@conduit-client/command-aura-graphql-normalized-cache-control": "3.2.0",
-        "@conduit-client/command-aura-network": "3.2.0",
-        "@conduit-client/command-aura-normalized-cache-control": "3.2.0",
-        "@conduit-client/command-aura-resource-cache-control": "3.2.0",
-        "@conduit-client/command-fetch-network": "3.2.0",
-        "@conduit-client/command-http-graphql-normalized-cache-control": "3.2.0",
-        "@conduit-client/command-http-normalized-cache-control": "3.2.0",
-        "@conduit-client/command-ndjson": "3.2.0",
-        "@conduit-client/command-network": "3.2.0",
-        "@conduit-client/command-sse": "3.2.0",
-        "@conduit-client/command-streaming": "3.2.0",
-        "@conduit-client/service-aura-network": "3.2.0",
-        "@conduit-client/service-bindings-imperative": "3.2.0",
-        "@conduit-client/service-bindings-lwc": "3.2.0",
-        "@conduit-client/service-cache": "3.2.0",
-        "@conduit-client/service-cache-control": "3.2.0",
-        "@conduit-client/service-cache-inclusion-policy": "3.2.0",
-        "@conduit-client/service-feature-flags": "3.2.0",
-        "@conduit-client/service-fetch-network": "3.2.0",
-        "@conduit-client/service-instrument-command": "3.2.0",
-        "@conduit-client/service-pubsub": "3.2.0",
-        "@conduit-client/service-store": "3.2.0",
-        "@conduit-client/utils": "3.2.0",
+        "@conduit-client/command-aura-graphql-normalized-cache-control": "3.7.0-dev1",
+        "@conduit-client/command-aura-network": "3.7.0-dev1",
+        "@conduit-client/command-aura-normalized-cache-control": "3.7.0-dev1",
+        "@conduit-client/command-aura-resource-cache-control": "3.7.0-dev1",
+        "@conduit-client/command-fetch-network": "3.7.0-dev1",
+        "@conduit-client/command-http-graphql-normalized-cache-control": "3.7.0-dev1",
+        "@conduit-client/command-http-normalized-cache-control": "3.7.0-dev1",
+        "@conduit-client/command-ndjson": "3.7.0-dev1",
+        "@conduit-client/command-network": "3.7.0-dev1",
+        "@conduit-client/command-sse": "3.7.0-dev1",
+        "@conduit-client/command-streaming": "3.7.0-dev1",
+        "@conduit-client/service-aura-network": "3.7.0-dev1",
+        "@conduit-client/service-bindings-imperative": "3.7.0-dev1",
+        "@conduit-client/service-bindings-lwc": "3.7.0-dev1",
+        "@conduit-client/service-cache": "3.7.0-dev1",
+        "@conduit-client/service-cache-control": "3.7.0-dev1",
+        "@conduit-client/service-cache-inclusion-policy": "3.7.0-dev1",
+        "@conduit-client/service-feature-flags": "3.7.0-dev1",
+        "@conduit-client/service-fetch-network": "3.7.0-dev1",
+        "@conduit-client/service-instrument-command": "3.7.0-dev1",
+        "@conduit-client/service-pubsub": "3.7.0-dev1",
+        "@conduit-client/service-store": "3.7.0-dev1",
+        "@conduit-client/utils": "3.7.0-dev1",
         "@luvio/network-adapter-composable": "0.158.7",
         "@luvio/network-adapter-fetch": "0.158.7",
         "@lwc/state": "^0.23.0",
-        "@salesforce/lds-adapters-onestore-graphql": "^1.404.0-dev4",
-        "@salesforce/lds-adapters-uiapi-lex": "^1.404.0-dev4",
-        "@salesforce/lds-luvio-service": "^1.404.0-dev4",
-        "@salesforce/lds-luvio-uiapi-records-service": "^1.404.0-dev4"
+        "@salesforce/lds-adapters-onestore-graphql": "^1.404.0-dev6",
+        "@salesforce/lds-adapters-uiapi-lex": "^1.404.0-dev6",
+        "@salesforce/lds-luvio-service": "^1.404.0-dev6",
+        "@salesforce/lds-luvio-uiapi-records-service": "^1.404.0-dev6"
     },
     "luvioBundlesize": [
         {
@@ -84,7 +84,7 @@
             "maxSize": {
                 "none": "350 kB",
                 "min": "190 kB",
-                "compressed": "56 kB"
+                "compressed": "57 kB"
             }
         }
     ],