@salesforce/lds-runtime-aura 1.404.0-dev1 → 1.404.0-dev10

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';
@@ -41,6 +42,10 @@ import { instrument as instrument$5 } from '@lwc/state';
 import { withRegistration, register, setDefaultLuvio } from 'force/ldsEngine';
 import { pageScopedCache } from 'instrumentation/utility';
 import { createStorage, clearStorages } from 'force/ldsStorage';
+import lightningConnectEnabled from '@salesforce/gate/ui.services.LightningConnect.enabled';
+import bypassAppRestrictionEnabled from '@salesforce/gate/ui.services.LightningConnect.BypassAppRestriction.enabled';
+import csrfValidationEnabled from '@salesforce/gate/ui.services.LightningConnect.CsrfValidation.enabled';
+import sessionApiEnabled from '@salesforce/gate/ui.uisdk.session.api.enabled';
 import useHotspotLimit from '@salesforce/gate/lds.pdl.useHotspotLimit';
 import useHttpUiapiOneApp from '@salesforce/gate/lds.useHttpUiapiOneApp';
 import useHttpUiapiOneRuntime from '@salesforce/gate/lds.useHttpUiapiOneRuntime';
@@ -470,7 +475,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 +1078,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 +1226,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 +1349,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 +1556,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 +1616,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 +2456,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 +2702,7 @@ function buildServiceDescriptor$d(luvio) {
         },
     };
 }
-// version: 1.404.0-dev1-9582436c8f
+// version: 1.404.0-dev10-1e49deeb66
 
 /*!
  * Copyright (c) 2022, Salesforce, Inc.,
@@ -2782,11 +2818,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 +3055,7 @@ function buildServiceDescriptor$9(notifyRecordUpdateAvailable, getNormalizedLuvi
         },
     };
 }
-// version: 1.404.0-dev1-9582436c8f
+// version: 1.404.0-dev10-1e49deeb66
 
 /*!
  * Copyright (c) 2022, Salesforce, Inc.,
@@ -4707,7 +4758,7 @@ function getEnvironmentSetting(name) {
     }
     return undefined;
 }
-// version: 1.404.0-dev1-9582436c8f
+// version: 1.404.0-dev10-1e49deeb66
 
 /**
  * Observability / Critical Availability Program (230+)
@@ -5715,6 +5766,227 @@ function buildLexRuntimeLuvio5xxStatusResponseInterceptor() {
     };
 }
 
+const CSRF_TOKEN_KEY = 'salesforce_csrf_token';
+const CSRF_STORAGE_NAME = 'ldsCSRFToken';
+const BASE_URI = '/services/data/v66.0';
+const UI_API_BASE_URI = `${BASE_URI}/ui-api`;
+const CSRF_TOKEN_ENDPOINT = `${UI_API_BASE_URI}/session/csrf`;
+const CSRF_STORAGE_CONFIG = {
+    name: CSRF_STORAGE_NAME,
+    persistent: true,
+    secure: true,
+    maxSize: 1024,
+    expiration: 24 * 60 * 60,
+    clearOnInit: false,
+    debugLogging: false,
+};
+/**
+ * Manages CSRF token fetching and caching for secure requests.
+ * Implements a singleton pattern to ensure consistent token management across the application.
+ */
+class CsrfTokenManager {
+    constructor() {
+        this.tokenPromise = null;
+        // Initialize AuraStorage
+        this.storage = createStorage(CSRF_STORAGE_CONFIG);
+    }
+    static getInstance() {
+        if (!CsrfTokenManager.instance) {
+            CsrfTokenManager.instance = new CsrfTokenManager();
+        }
+        return CsrfTokenManager.instance;
+    }
+    /**
+     * Obtain a CSRF token, either from AuraStorage or by fetching a fresh one.
+     *
+     * @private
+     */
+    async loadOrFetchToken() {
+        // First try to get token from AuraStorage
+        if (this.storage) {
+            try {
+                const cachedToken = await this.storage.get(CSRF_TOKEN_KEY);
+                if (typeof cachedToken === 'string' && cachedToken) {
+                    return cachedToken;
+                }
+            }
+            catch {
+                // If storage read fails, continue to fetch
+            }
+        }
+        // No cached token, fetch from server
+        return this.fetchFreshToken();
+    }
+    /**
+     * Call API endpoint to acquire a CSRF token and cache it.
+     *
+     * @private
+     */
+    async fetchFreshToken() {
+        try {
+            const response = await fetch(CSRF_TOKEN_ENDPOINT, {
+                method: 'GET',
+                credentials: 'same-origin',
+            });
+            if (!response.ok) {
+                return undefined;
+            }
+            const data = await response.json();
+            const token = data.csrfToken;
+            if (token && this.storage) {
+                // Cache the token in AuraStorage
+                try {
+                    await this.storage.set(CSRF_TOKEN_KEY, token);
+                }
+                catch {
+                    // Non-fatal: token is still available even if caching fails
+                }
+            }
+            return token;
+        }
+        catch {
+            return undefined;
+        }
+    }
+    /**
+     * Returns the current token value as a Promise.
+     * Lazy-loads the token on first call (from cache or by fetching).
+     */
+    async getToken() {
+        // Lazy initialization: only fetch token when actually needed
+        if (!this.tokenPromise) {
+            this.tokenPromise = this.loadOrFetchToken();
+        }
+        return this.tokenPromise;
+    }
+    /**
+     * Obtains and returns a new token value as a promise.
+     * This will clear the cached token and fetch a fresh one.
+     */
+    async refreshToken() {
+        // Clear cached token
+        if (this.storage) {
+            try {
+                await this.storage.remove(CSRF_TOKEN_KEY);
+            }
+            catch {
+                // Non-fatal: continue with refresh even if clear fails
+            }
+        }
+        // Fetch (and cache) fresh token
+        this.tokenPromise = this.fetchFreshToken();
+        return this.tokenPromise;
+    }
+    /**
+     * Reset the singleton instance (useful for testing).
+     * @internal
+     */
+    static resetInstance() {
+        CsrfTokenManager.instance = null;
+    }
+}
+CsrfTokenManager.instance = null;
+
+const CSRF_TOKEN_HEADER = 'X-CSRF-Token';
+/**
+ * Checks if all required gates are enabled for CSRF token interceptor.
+ *
+ * @returns true if all gates are enabled, false otherwise
+ */
+function areCsrfGatesEnabled() {
+    try {
+        return (lightningConnectEnabled.isOpen({ fallback: false }) &&
+            bypassAppRestrictionEnabled.isOpen({ fallback: false }) &&
+            csrfValidationEnabled.isOpen({ fallback: false }) &&
+            sessionApiEnabled.isOpen({ fallback: false }));
+    }
+    catch (error) {
+        // If any gate check fails, disable CSRF interceptor
+        return false;
+    }
+}
+/**
+ * Determines if the HTTP method requires CSRF protection.
+ * Only mutating operations (POST, PUT, PATCH, DELETE) require CSRF tokens.
+ *
+ * @param method - The HTTP method to check
+ * @returns true if the method requires CSRF protection
+ */
+function isCsrfMethod(method) {
+    if (!method) {
+        return false;
+    }
+    const normalizedMethod = method.toLowerCase();
+    return (normalizedMethod === 'post' ||
+        normalizedMethod === 'put' ||
+        normalizedMethod === 'patch' ||
+        normalizedMethod === 'delete');
+}
+/**
+ * Builds a request interceptor that adds CSRF token headers to mutating requests.
+ * The CSRF token is fetched once and cached for subsequent requests.
+ * Only POST, PUT, PATCH, and DELETE requests will have the CSRF token added.
+ *
+ * @returns A RequestInterceptor function for FetchParameters
+ */
+function buildCsrfTokenInterceptor() {
+    const csrfTokenManager = CsrfTokenManager.getInstance();
+    return async (fetchArgs) => {
+        // Check if all required gates are enabled before running
+        if (!areCsrfGatesEnabled()) {
+            return resolvedPromiseLike$2(fetchArgs);
+        }
+        const [urlOrRequest, options] = fetchArgs;
+        // Determine the method from either Request object or options
+        let method;
+        if (typeof urlOrRequest !== 'string' && 'method' in urlOrRequest) {
+            method = urlOrRequest.method;
+        }
+        else if (options && 'method' in options) {
+            method = options.method;
+        }
+        // Only add CSRF token for mutating operations
+        if (isCsrfMethod(method)) {
+            const token = await csrfTokenManager.getToken();
+            if (token) {
+                fetchArgs = setHeader(CSRF_TOKEN_HEADER, token, fetchArgs);
+            }
+        }
+        return resolvedPromiseLike$2(fetchArgs);
+    };
+}
+/**
+ * Builds a Luvio request interceptor that adds CSRF token headers to mutating requests.
+ * The CSRF token is fetched once and cached for subsequent requests.
+ * Only POST, PUT, PATCH, and DELETE requests will have the CSRF token added.
+ *
+ * @returns A request interceptor function for Luvio ResourceRequest objects
+ */
+function buildLuvioCsrfTokenInterceptor() {
+    const csrfTokenManager = CsrfTokenManager.getInstance();
+    return async (resourceRequest) => {
+        // Check if all required gates are enabled before running
+        if (!areCsrfGatesEnabled()) {
+            return resolvedPromiseLike$2(resourceRequest);
+        }
+        // Ensure headers object exists
+        if (!resourceRequest.headers) {
+            resourceRequest.headers = {};
+        }
+        // Only add CSRF token for mutating operations
+        if (isCsrfMethod(resourceRequest.method)) {
+            // Don't overwrite existing CSRF token header if it already exists
+            if (!resourceRequest.headers[CSRF_TOKEN_HEADER]) {
+                const token = await csrfTokenManager.getToken();
+                if (token) {
+                    resourceRequest.headers[CSRF_TOKEN_HEADER] = token;
+                }
+            }
+        }
+        return resolvedPromiseLike$2(resourceRequest);
+    };
+}
+
 const API_PATHS = [
     // getLookupActions
     // '/ui-api/actions/lookup/{objectApiNames}',
@@ -5776,7 +6048,7 @@ const composedFetchNetworkAdapter = {
         return API_PATH_MATCHERS.some((matcher) => matcher.test(path));
     },
     adapter: setupLexNetworkAdapter(requestTracker, requestLogger, {
-        request: [buildLuvioPageScopedCacheRequestInterceptor()],
+        request: [buildLuvioPageScopedCacheRequestInterceptor(), buildLuvioCsrfTokenInterceptor()],
         response: [
             buildLexRuntimeLuvio5xxStatusResponseInterceptor(),
             buildLexRuntimeLuvioAuthExpirationRedirectResponseInterceptor(),
@@ -5855,120 +6127,6 @@ function buildTransportMarksReceiveInterceptor() {
     };
 }
 
-const CSRF_TOKEN_KEY = 'salesforce_csrf_token';
-const CSRF_STORAGE_NAME = 'ldsCSRFToken';
-const CSRF_STORAGE_CONFIG = {
-    name: CSRF_STORAGE_NAME,
-    persistent: true,
-    secure: true,
-    maxSize: 1024,
-    expiration: 24 * 60 * 60,
-    clearOnInit: false,
-    debugLogging: false,
-};
-/**
- * Manages CSRF token fetching and caching for secure requests.
- * Implements a singleton pattern to ensure consistent token management across the application.
- */
-class CsrfTokenManager {
-    constructor() {
-        // Initialize AuraStorage
-        this.storage = createStorage(CSRF_STORAGE_CONFIG);
-        // Try to load token from AuraStorage on initialization
-        this.tokenPromise = this.loadOrFetchToken();
-    }
-    static getInstance() {
-        if (!CsrfTokenManager.instance) {
-            CsrfTokenManager.instance = new CsrfTokenManager();
-        }
-        return CsrfTokenManager.instance;
-    }
-    /**
-     * Obtain a CSRF token, either from AuraStorage or by fetching a fresh one.
-     *
-     * @private
-     */
-    async loadOrFetchToken() {
-        // First try to get token from AuraStorage
-        if (this.storage) {
-            try {
-                const cachedToken = await this.storage.get(CSRF_TOKEN_KEY);
-                if (typeof cachedToken === 'string' && cachedToken) {
-                    return cachedToken;
-                }
-            }
-            catch {
-                // If storage read fails, continue to fetch
-            }
-        }
-        // No cached token, fetch from server
-        return this.fetchFreshToken();
-    }
-    /**
-     * Call API endpoint to acquire a CSRF token and cache it.
-     *
-     * @private
-     */
-    async fetchFreshToken() {
-        try {
-            const response = await fetch('/session/csrf', {
-                method: 'GET',
-                credentials: 'same-origin',
-            });
-            if (!response.ok) {
-                return undefined;
-            }
-            const data = await response.json();
-            const token = data.csrfToken;
-            if (token && this.storage) {
-                // Cache the token in AuraStorage
-                try {
-                    await this.storage.set(CSRF_TOKEN_KEY, token);
-                }
-                catch {
-                    // Non-fatal: token is still available even if caching fails
-                }
-            }
-            return token;
-        }
-        catch {
-            return undefined;
-        }
-    }
-    /**
-     * Returns the current token value as a Promise.
-     */
-    async getToken() {
-        return this.tokenPromise;
-    }
-    /**
-     * Obtains and returns a new token value as a promise.
-     * This will clear the cached token and fetch a fresh one.
-     */
-    async refreshToken() {
-        // Clear cached token
-        if (this.storage) {
-            try {
-                await this.storage.remove(CSRF_TOKEN_KEY);
-            }
-            catch {
-                // Non-fatal: continue with refresh even if clear fails
-            }
-        }
-        // Fetch (and cache) fresh token
-        this.tokenPromise = this.fetchFreshToken();
-        return this.tokenPromise;
-    }
-    /**
-     * Reset the singleton instance (useful for testing).
-     * @internal
-     */
-    static resetInstance() {
-        CsrfTokenManager.instance = null;
-    }
-}
-CsrfTokenManager.instance = null;
-
 const DEFAULT_CONFIG$1 = {
     maxRetries: 1, // Only retry once after token refresh
 };
@@ -6059,8 +6217,8 @@ async function isCsrfError(response) {
         // Clone to avoid consuming the original response
         const cloned = response.clone();
         const body = await cloned.json();
-        // Check the error array format: data[0].errorCode
-        const errorCode = body?.data?.[0]?.errorCode;
+        // Check the error array format: body[0].errorCode
+        const errorCode = body?.[0]?.errorCode;
         return errorCode === 'INVALID_ACCESS_TOKEN';
     }
     catch {
@@ -6077,6 +6235,7 @@ function buildLexRuntimeDefaultFetchServiceDescriptor(logger, retryService) {
             buildThirdPartyTrackerRegisterInterceptor(),
             buildPageScopedCacheRequestInterceptor(),
             buildTransportMarksSendInterceptor(),
+            buildCsrfTokenInterceptor(),
         ],
         response: [
             buildLexRuntime5xxStatusResponseInterceptor(logger),
@@ -6098,6 +6257,7 @@ function buildLexRuntimeAllow5xxFetchServiceDescriptor(logger, retryService) {
             buildThirdPartyTrackerRegisterInterceptor(),
             buildPageScopedCacheRequestInterceptor(),
             buildTransportMarksSendInterceptor(),
+            buildCsrfTokenInterceptor(),
         ],
         response: [buildLexRuntimeAuthExpirationRedirectResponseInterceptor(logger)],
         finally: [
@@ -6691,9 +6851,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;
     }
@@ -6722,10 +6904,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) {
@@ -9411,7 +9624,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),
@@ -9704,4 +9917,4 @@ function ldsEngineCreator() {
 }
 
 export { LexRequestStrategy, PdlRequestPriority, buildPredictorForContext, ldsEngineCreator as default, initializeLDS, initializeOneStore, notifyUpdateAvailableFactory, registerRequestStrategy, saveRequestAsPrediction, unregisterRequestStrategy, whenPredictionsReady };
-// version: 1.404.0-dev1-48073cfce6
+// version: 1.404.0-dev10-5a5eea9232

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/dist/types/request-interceptors/csrf-manager.d.ts

@@ -22,6 +22,7 @@ declare class CsrfTokenManager {
     private fetchFreshToken;
     /**
      * Returns the current token value as a Promise.
+     * Lazy-loads the token on first call (from cache or by fetching).
      */
     getToken(): Promise<string | undefined>;
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@salesforce/lds-runtime-aura",
-    "version": "1.404.0-dev1",
+    "version": "1.404.0-dev10",
     "license": "SEE LICENSE IN LICENSE.txt",
     "description": "LDS engine for Aura runtime",
     "main": "dist/ldsEngineCreator.js",
@@ -34,47 +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-dev1",
-        "@salesforce/lds-adapters-uiapi": "^1.404.0-dev1",
-        "@salesforce/lds-ads-bridge": "^1.404.0-dev1",
-        "@salesforce/lds-aura-storage": "^1.404.0-dev1",
-        "@salesforce/lds-bindings": "^1.404.0-dev1",
-        "@salesforce/lds-instrumentation": "^1.404.0-dev1",
-        "@salesforce/lds-network-aura": "^1.404.0-dev1",
-        "@salesforce/lds-network-fetch": "^1.404.0-dev1",
+        "@conduit-client/service-provisioner": "3.7.0-dev2",
+        "@conduit-client/tools-core": "3.7.0-dev2",
+        "@salesforce/lds-adapters-apex": "^1.404.0-dev10",
+        "@salesforce/lds-adapters-uiapi": "^1.404.0-dev10",
+        "@salesforce/lds-ads-bridge": "^1.404.0-dev10",
+        "@salesforce/lds-aura-storage": "^1.404.0-dev10",
+        "@salesforce/lds-bindings": "^1.404.0-dev10",
+        "@salesforce/lds-instrumentation": "^1.404.0-dev10",
+        "@salesforce/lds-network-aura": "^1.404.0-dev10",
+        "@salesforce/lds-network-fetch": "^1.404.0-dev10",
         "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-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-dev2",
+        "@conduit-client/command-aura-network": "3.7.0-dev2",
+        "@conduit-client/command-aura-normalized-cache-control": "3.7.0-dev2",
+        "@conduit-client/command-aura-resource-cache-control": "3.7.0-dev2",
+        "@conduit-client/command-fetch-network": "3.7.0-dev2",
+        "@conduit-client/command-http-graphql-normalized-cache-control": "3.7.0-dev2",
+        "@conduit-client/command-http-normalized-cache-control": "3.7.0-dev2",
+        "@conduit-client/command-ndjson": "3.7.0-dev2",
+        "@conduit-client/command-network": "3.7.0-dev2",
+        "@conduit-client/command-sse": "3.7.0-dev2",
+        "@conduit-client/command-streaming": "3.7.0-dev2",
+        "@conduit-client/service-aura-network": "3.7.0-dev2",
+        "@conduit-client/service-bindings-imperative": "3.7.0-dev2",
+        "@conduit-client/service-bindings-lwc": "3.7.0-dev2",
+        "@conduit-client/service-cache": "3.7.0-dev2",
+        "@conduit-client/service-cache-control": "3.7.0-dev2",
+        "@conduit-client/service-cache-inclusion-policy": "3.7.0-dev2",
+        "@conduit-client/service-feature-flags": "3.7.0-dev2",
+        "@conduit-client/service-fetch-network": "3.7.0-dev2",
+        "@conduit-client/service-instrument-command": "3.7.0-dev2",
+        "@conduit-client/service-pubsub": "3.7.0-dev2",
+        "@conduit-client/service-store": "3.7.0-dev2",
+        "@conduit-client/utils": "3.7.0-dev2",
         "@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-dev1",
-        "@salesforce/lds-adapters-uiapi-lex": "^1.404.0-dev1",
-        "@salesforce/lds-luvio-service": "^1.404.0-dev1",
-        "@salesforce/lds-luvio-uiapi-records-service": "^1.404.0-dev1"
+        "@salesforce/lds-adapters-onestore-graphql": "^1.404.0-dev10",
+        "@salesforce/lds-adapters-uiapi-lex": "^1.404.0-dev10",
+        "@salesforce/lds-luvio-service": "^1.404.0-dev10",
+        "@salesforce/lds-luvio-uiapi-records-service": "^1.404.0-dev10"
     },
     "luvioBundlesize": [
         {
@@ -82,7 +84,7 @@
             "maxSize": {
                 "none": "350 kB",
                 "min": "190 kB",
-                "compressed": "56 kB"
+                "compressed": "57 kB"
             }
         }
     ],