@salesforce/lds-runtime-aura 1.251.0 → 1.252.0

package/dist/ldsEngineCreator.js

@@ -203,10 +203,11 @@ class ApplicationPredictivePrefetcher {
     async predict() {
         const exactPageRequests = (await this.repository.getPageRequests(this.context)) || [];
         const similarPageRequests = await this.getSimilarPageRequests();
-        const predictedRequests = [
-            ...this.requestRunner.reduceRequests([...exactPageRequests, ...similarPageRequests]),
+        const predictedRequests = this.requestRunner.reduceRequests([
+            ...exactPageRequests,
+            ...similarPageRequests,
             ...this.page.getAlwaysRunRequests(),
-        ];
+        ]);
         this.queuedPredictionRequests.push(...predictedRequests);
         return Promise.all(predictedRequests.map((request) => this.requestRunner.runRequest(request))).then();
     }
@@ -240,7 +241,7 @@ class LexPredictivePrefetcher extends ApplicationPredictivePrefetcher {
 }
 
 // Copy-pasted from adapter-utils. This util should be extracted from generated code and imported in prefetch repository.
-const { keys: ObjectKeys } = Object;
+const { keys: ObjectKeys$1 } = Object;
 const { stringify: JSONStringify } = JSON;
 const { isArray: ArrayIsArray } = Array;
 /**
@@ -283,7 +284,7 @@ function stableJSONStringify$1(node) {
     if (node === null) {
         return 'null';
     }
-    const keys = ObjectKeys(node).sort();
+    const keys = ObjectKeys$1(node).sort();
     out = '';
     for (i = 0; i < keys.length; i++) {
         const key = keys[i];
@@ -310,8 +311,8 @@ function deepEquals(objA, objB) {
     if (!isObject(objA) || !isObject(objB))
         return false;
     // Filter out keys set as undefined, we can compare undefined as equals.
-    const keysA = ObjectKeys(objA).filter((key) => objA[key] !== undefined);
-    const keysB = ObjectKeys(objB).filter((key) => objB[key] !== undefined);
+    const keysA = ObjectKeys$1(objA).filter((key) => objA[key] !== undefined);
+    const keysB = ObjectKeys$1(objB).filter((key) => objB[key] !== undefined);
     // If the objects do not have the same set of keys, they are not deeply equal
     if (keysA.length !== keysB.length)
         return false;
@@ -393,7 +394,37 @@ class LuvioAdapterRequestStrategy extends RequestStrategy {
         return unfilteredRequests.filter((request) => request.adapterName === this.adapterName);
     }
     reduce(unfilteredRequests) {
-        return this.filterRequests(unfilteredRequests);
+        const requests = this.filterRequests(unfilteredRequests);
+        const visitedRequests = new Set();
+        const reducedRequests = [];
+        for (let i = 0, n = requests.length; i < n; i++) {
+            const currentRequest = requests[i];
+            if (!visitedRequests.has(currentRequest)) {
+                const combinedRequest = { ...currentRequest };
+                for (let j = i + 1; j < n; j++) {
+                    const hasNotBeenVisited = !visitedRequests.has(requests[j]);
+                    const canCombineConfigs = this.canCombine(combinedRequest.config, requests[j].config);
+                    if (hasNotBeenVisited && canCombineConfigs) {
+                        combinedRequest.config = this.combineRequests(combinedRequest.config, requests[j].config);
+                        visitedRequests.add(requests[j]);
+                    }
+                }
+                reducedRequests.push(combinedRequest);
+                visitedRequests.add(currentRequest);
+            }
+        }
+        return reducedRequests;
+    }
+    canCombine(_reqA, _reqB) {
+        // By default, all requests are not comibinable
+        return false;
+    }
+    combineRequests(reqA, _reqB) {
+        // By default, this should never be called since requests aren't combinable
+        if (process.env.NODE_ENV !== 'production') {
+            throw new Error('Not implemented');
+        }
+        return reqA;
     }
 }
 
@@ -403,14 +434,6 @@ function normalizeRecordIds$1(recordIds) {
     }
     return recordIds;
 }
-function canCombine$1(reqA, reqB) {
-    return reqA.formFactor === reqB.formFactor;
-}
-function combineRequests$1(reqA, reqB) {
-    const combined = { ...reqA };
-    combined.recordIds = Array.from(new Set([...normalizeRecordIds$1(reqA.recordIds), ...normalizeRecordIds$1(reqB.recordIds)]));
-    return combined;
-}
 class GetRecordAvatarsRequestStrategy extends LuvioAdapterRequestStrategy {
     constructor() {
         super(...arguments);
@@ -450,27 +473,13 @@ class GetRecordAvatarsRequestStrategy extends LuvioAdapterRequestStrategy {
                 (request.config.recordIds.length === 1 &&
                     request.config.recordIds[0] === context.recordId)));
     }
-    reduce(unfilteredRequests) {
-        const requests = this.filterRequests(unfilteredRequests);
-        const visitedRequests = new Set();
-        const reducedRequests = [];
-        for (let i = 0, n = requests.length; i < n; i++) {
-            const currentRequest = requests[i];
-            if (!visitedRequests.has(currentRequest)) {
-                const combinedRequest = { ...currentRequest };
-                for (let j = i + 1; j < n; j++) {
-                    const hasNotBeenVisited = !visitedRequests.has(requests[j]);
-                    const canCombineConfigs = canCombine$1(combinedRequest.config, requests[j].config);
-                    if (hasNotBeenVisited && canCombineConfigs) {
-                        combinedRequest.config = combineRequests$1(combinedRequest.config, requests[j].config);
-                        visitedRequests.add(requests[j]);
-                    }
-                }
-                reducedRequests.push(combinedRequest);
-                visitedRequests.add(currentRequest);
-            }
-        }
-        return reducedRequests;
+    canCombine(reqA, reqB) {
+        return reqA.formFactor === reqB.formFactor;
+    }
+    combineRequests(reqA, reqB) {
+        const combined = { ...reqA };
+        combined.recordIds = Array.from(new Set([...normalizeRecordIds$1(reqA.recordIds), ...normalizeRecordIds$1(reqB.recordIds)]));
+        return combined;
     }
 }
 
@@ -506,46 +515,33 @@ class GetRecordRequestStrategy extends LuvioAdapterRequestStrategy {
             },
         };
     }
-    reduce(unfilteredRequests) {
-        const requests = this.filterRequests(unfilteredRequests);
-        const recordIdToRequestMap = {};
-        const resultRequests = [];
-        requests.forEach((request) => {
-            if (request.config.fields === undefined &&
-                request.config.optionalFields === undefined) {
-                resultRequests.push(request);
-                return;
-            }
-            if (recordIdToRequestMap[request.config.recordId] === undefined) {
-                recordIdToRequestMap[request.config.recordId] = [];
-            }
-            recordIdToRequestMap[request.config.recordId].push(request);
-        });
-        Object.entries(recordIdToRequestMap).forEach(([recordId, requests]) => {
-            const fields = new Set();
-            const optionalFields = new Set();
-            requests.forEach((request) => {
-                if (request.config.fields !== undefined) {
-                    request.config.fields.forEach((field) => {
-                        fields.add(field);
-                    });
-                }
-                if (request.config.optionalFields !== undefined) {
-                    request.config.optionalFields.forEach((field) => {
-                        optionalFields.add(field);
-                    });
-                }
-            });
-            resultRequests.push({
-                adapterName: 'getRecord',
-                config: {
-                    recordId,
-                    fields: Array.from(fields),
-                    optionalFields: Array.from(optionalFields),
-                },
-            });
-        });
-        return resultRequests;
+    canCombine(reqA, reqB) {
+        // must be same record and
+        return (reqA.recordId === reqB.recordId &&
+            // both requests are fields requests
+            (reqA.optionalFields !== undefined || reqB.optionalFields !== undefined) &&
+            (reqB.fields !== undefined || reqB.optionalFields !== undefined));
+    }
+    combineRequests(reqA, reqB) {
+        const fields = new Set();
+        const optionalFields = new Set();
+        if (reqA.fields !== undefined) {
+            reqA.fields.forEach((field) => fields.add(field));
+        }
+        if (reqB.fields !== undefined) {
+            reqB.fields.forEach((field) => fields.add(field));
+        }
+        if (reqA.optionalFields !== undefined) {
+            reqA.optionalFields.forEach((field) => optionalFields.add(field));
+        }
+        if (reqB.optionalFields !== undefined) {
+            reqB.optionalFields.forEach((field) => optionalFields.add(field));
+        }
+        return {
+            recordId: reqA.recordId,
+            fields: Array.from(fields),
+            optionalFields: Array.from(optionalFields),
+        };
     }
 }
 
@@ -572,22 +568,6 @@ function normalizeRecordIds(recordIds) {
     }
     return recordIds;
 }
-function canCombine(reqA, reqB) {
-    return (reqA.retrievalMode === reqB.retrievalMode &&
-        reqA.formFactor === reqB.formFactor &&
-        (reqA.actionTypes || []).toString() === (reqB.actionTypes || []).toString() &&
-        (reqA.sections || []).toString() === (reqB.sections || []).toString());
-}
-function combineRequests(reqA, reqB) {
-    const combined = { ...reqA };
-    // let's merge the recordIds
-    combined.recordIds = Array.from(new Set([...normalizeRecordIds(reqA.recordIds), ...normalizeRecordIds(reqB.recordIds)]));
-    if (combined.retrievalMode === 'ALL') {
-        const combinedSet = new Set([...(combined.apiNames || []), ...(reqB.apiNames || [])]);
-        combined.apiNames = Array.from(combinedSet);
-    }
-    return combined;
-}
 class GetRecordActionsRequestStrategy extends LuvioAdapterRequestStrategy {
     constructor() {
         super(...arguments);
@@ -621,33 +601,28 @@ class GetRecordActionsRequestStrategy extends LuvioAdapterRequestStrategy {
             context,
         };
     }
+    canCombine(reqA, reqB) {
+        return (reqA.retrievalMode === reqB.retrievalMode &&
+            reqA.formFactor === reqB.formFactor &&
+            (reqA.actionTypes || []).toString() === (reqB.actionTypes || []).toString() &&
+            (reqA.sections || []).toString() === (reqB.sections || []).toString());
+    }
+    combineRequests(reqA, reqB) {
+        const combined = { ...reqA };
+        // let's merge the recordIds
+        combined.recordIds = Array.from(new Set([...normalizeRecordIds(reqA.recordIds), ...normalizeRecordIds(reqB.recordIds)]));
+        if (combined.retrievalMode === 'ALL') {
+            const combinedSet = new Set([...(combined.apiNames || []), ...(reqB.apiNames || [])]);
+            combined.apiNames = Array.from(combinedSet);
+        }
+        return combined;
+    }
     isGetRecordActionsRequestContextDependent(context, request) {
         return (request.config.recordIds &&
             (context.recordId === request.config.recordIds || // some may set this as string instead of array
                 (request.config.recordIds.length === 1 &&
                     request.config.recordIds[0] === context.recordId)));
     }
-    reduce(unfilteredRequests) {
-        const requests = this.filterRequests(unfilteredRequests);
-        const visitedRequests = new Set();
-        const reducedRequests = [];
-        for (let i = 0, n = requests.length; i < n; i++) {
-            const currentRequest = requests[i];
-            if (!visitedRequests.has(currentRequest)) {
-                const combinedRequest = { ...currentRequest };
-                for (let j = i + 1; j < n; j++) {
-                    if (!visitedRequests.has(requests[j]) &&
-                        canCombine(combinedRequest.config, requests[j].config)) {
-                        combinedRequest.config = combineRequests(combinedRequest.config, requests[j].config);
-                        visitedRequests.add(requests[j]);
-                    }
-                }
-                reducedRequests.push(combinedRequest);
-                visitedRequests.add(currentRequest);
-            }
-        }
-        return reducedRequests;
-    }
 }
 
 class GetObjectInfoRequestStrategy extends LuvioAdapterRequestStrategy {
@@ -732,13 +707,13 @@ class InMemoryPrefetchStorage {
     }
 }
 
+const { keys: ObjectKeys } = Object;
 const DEFAULT_STORAGE_OPTIONS = {
     name: 'ldsPredictiveLoading',
     persistent: true,
     secure: true,
-    maxSize: 20 * 1024 * 1024,
-    // @todo: there's no way of setting a "no expire" value. We should determine the best ttl for this cache.
-    expiration: 24 * 60 * 60,
+    maxSize: 7 * 1024 * 1024,
+    expiration: 12 * 60 * 60,
     clearOnInit: false,
     debugLogging: false,
 };
@@ -747,20 +722,33 @@ function buildAuraPrefetchStorage(options = {}) {
         ...DEFAULT_STORAGE_OPTIONS,
         ...options,
     });
+    const inMemoryStorage = new InMemoryPrefetchStorage();
     if (auraStorage === null) {
-        return new InMemoryPrefetchStorage();
+        return inMemoryStorage;
     }
-    return new AuraPrefetchStorage(auraStorage);
+    return new AuraPrefetchStorage(auraStorage, inMemoryStorage);
 }
 class AuraPrefetchStorage {
-    constructor(auraStorage) {
+    constructor(auraStorage, inMemoryStorage) {
         this.auraStorage = auraStorage;
+        this.inMemoryStorage = inMemoryStorage;
+        auraStorage.getAll().then((results) => {
+            ObjectKeys(results).forEach((key) => this.inMemoryStorage.set(key, results[key]));
+        });
     }
     set(key, value) {
-        return this.auraStorage.set(key, value);
+        const inMemoryResult = this.inMemoryStorage.set(key, value);
+        this.auraStorage.set(key, value).catch((error) => {
+            if (process.env.NODE_ENV !== 'production') {
+                // eslint-disable-next-line no-console
+                console.error('Error save LDS prediction: ', error);
+            }
+        });
+        return inMemoryResult;
     }
     async get(key) {
-        const result = await this.auraStorage.get(key);
+        // we never read from the AuraStorage, except in construction.
+        const result = await this.inMemoryStorage.get(key);
         return result ? result : undefined;
     }
 }
@@ -1508,7 +1496,7 @@ function setupPredictivePrefetcher(luvio) {
     __lexPrefetcher = prefetcher;
 }
 // Triggers a payload.
-async function predictiveLoadPage(preloadProps) {
+async function predictiveLoadPage(preloadProps, runPredictions) {
     // the gate is disabled and the prefetcher was not setup.
     if (__lexPrefetcher === undefined) {
         return;
@@ -1524,10 +1512,10 @@ async function predictiveLoadPage(preloadProps) {
     };
     // This chunk tells the prefetcher to receive events, send off any predictions we have from previous loads, then setup idle detection to stop predicting.
     __lexPrefetcher.startRecording();
-    __lexPrefetcher.predict();
     onIdleDetected(() => {
         __lexPrefetcher.stopRecording();
     });
+    return runPredictions ? __lexPrefetcher.predict() : Promise.resolve();
 }
 // LDS initialization logic, invoked directly by Aura component tests
 function initializeLDS() {
@@ -1555,4 +1543,4 @@ function ldsEngineCreator() {
 }
 
 export { ldsEngineCreator as default, initializeLDS, predictiveLoadPage };
-// version: 1.251.0-51b11f205
+// version: 1.252.0-a960aa048

package/dist/types/main.d.ts

@@ -13,7 +13,7 @@ type LexPageReference = {
     state: any;
     type: string;
 };
-export declare function predictiveLoadPage(preloadProps: PreloadProps): Promise<void>;
+export declare function predictiveLoadPage(preloadProps: PreloadProps, runPredictions: true): Promise<void>;
 export declare function initializeLDS(): void;
 declare function ldsEngineCreator(): {
     name: string;

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

@@ -1,6 +1,5 @@
 import type { GetRecordActionsConfig } from '@salesforce/lds-adapters-uiapi';
 import { LuvioAdapterRequestStrategy } from './luvio-adapter-request-strategy';
-import type { LuvioAdapterRequest } from './luvio-adapter-request';
 export type GetRecordActionsRequest = {
     adapterName: 'getRecordActions';
     config: GetRecordActionsConfig;
@@ -16,7 +15,8 @@ export declare class GetRecordActionsRequestStrategy extends LuvioAdapterRequest
         request: GetRecordActionsRequest;
         context: C;
     };
+    canCombine(reqA: GetRecordActionsConfig, reqB: GetRecordActionsConfig): boolean;
+    combineRequests(reqA: GetRecordActionsConfig, reqB: GetRecordActionsConfig): GetRecordActionsConfig;
     private isGetRecordActionsRequestContextDependent;
-    reduce(unfilteredRequests: LuvioAdapterRequest<unknown>[]): GetRecordActionsRequest[];
 }
 export {};

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

@@ -1,6 +1,5 @@
 import type { GetRecordAvatarsConfig } from '@salesforce/lds-adapters-uiapi';
 import { LuvioAdapterRequestStrategy } from './luvio-adapter-request-strategy';
-import type { LuvioAdapterRequest } from './luvio-adapter-request';
 export type GetRecordAvatarsRequest = {
     adapterName: 'getRecordAvatars';
     config: GetRecordAvatarsConfig;
@@ -17,6 +16,7 @@ export declare class GetRecordAvatarsRequestStrategy extends LuvioAdapterRequest
         context: C;
     };
     private isGetRecordAvatarsRequestContextDependent;
-    reduce(unfilteredRequests: LuvioAdapterRequest<unknown>[]): GetRecordAvatarsRequest[];
+    canCombine(reqA: GetRecordAvatarsConfig, reqB: GetRecordAvatarsConfig): boolean;
+    combineRequests(reqA: GetRecordAvatarsConfig, reqB: GetRecordAvatarsConfig): GetRecordAvatarsConfig;
 }
 export {};

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

@@ -4,7 +4,6 @@ export type GetRecordRequest = {
     adapterName: 'getRecord';
     config: GetRecordConfig;
 };
-import type { LuvioAdapterRequest } from './luvio-adapter-request';
 type GetRecordContext = {
     recordId: string;
 };
@@ -13,6 +12,7 @@ export declare class GetRecordRequestStrategy extends LuvioAdapterRequestStrateg
     adapterFactory: import("@luvio/engine").AdapterFactory<GetRecordConfig, import("@salesforce/lds-adapters-uiapi").RecordRepresentation>;
     buildConcreteRequest(similarRequest: GetRecordRequest, context: GetRecordContext): GetRecordRequest;
     transformForSave(request: GetRecordRequest): GetRecordRequest;
-    reduce(unfilteredRequests: LuvioAdapterRequest<unknown>[]): GetRecordRequest[];
+    canCombine(reqA: GetRecordConfig, reqB: GetRecordConfig): boolean;
+    combineRequests(reqA: GetRecordConfig, reqB: GetRecordConfig): GetRecordConfig;
 }
 export {};

package/dist/types/predictive-loading/request-strategy/luvio-adapter-request-strategy.d.ts

@@ -7,4 +7,6 @@ export declare abstract class LuvioAdapterRequestStrategy<AdapterConfig, Request
     transformForSave(request: Request): Request;
     protected filterRequests(unfilteredRequests: LuvioAdapterRequest<unknown>[]): Request[];
     reduce(unfilteredRequests: LuvioAdapterRequest<unknown>[]): Request[];
+    canCombine(_reqA: AdapterConfig, _reqB: AdapterConfig): boolean;
+    combineRequests(reqA: AdapterConfig, _reqB: AdapterConfig): AdapterConfig;
 }

package/dist/types/predictive-loading/storage/aura-prefetch-storage.d.ts

@@ -1,4 +1,4 @@
-import { type PrefetchStorage } from '.';
+import { InMemoryPrefetchStorage, type PrefetchStorage } from '.';
 import { type AuraStorage, type AuraStorageConfig } from '@salesforce/lds-aura-storage';
 export declare const DEFAULT_STORAGE_OPTIONS: {
     name: string;
@@ -12,7 +12,8 @@ export declare const DEFAULT_STORAGE_OPTIONS: {
 export declare function buildAuraPrefetchStorage(options?: Partial<AuraStorageConfig>): PrefetchStorage;
 export declare class AuraPrefetchStorage implements PrefetchStorage {
     private auraStorage;
-    constructor(auraStorage: AuraStorage);
+    private inMemoryStorage;
+    constructor(auraStorage: AuraStorage, inMemoryStorage: InMemoryPrefetchStorage);
     set<T>(key: string, value: T): Promise<void>;
     get<T>(key: string): Promise<T | undefined>;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@salesforce/lds-runtime-aura",
-    "version": "1.251.0",
+    "version": "1.252.0",
     "license": "SEE LICENSE IN LICENSE.txt",
     "description": "LDS engine for Aura runtime",
     "main": "dist/ldsEngineCreator.js",
@@ -43,7 +43,7 @@
         "@salesforce/lds-network-fetch-with-jwt": "*"
     },
     "dependencies": {
-        "@luvio/network-adapter-composable": "0.152.2"
+        "@luvio/network-adapter-composable": "0.153.0"
     },
     "luvioBundlesize": [
         {