@lwrjs/view-registry 0.13.0-alpha.27 → 0.13.0-alpha.28

package/build/cjs/index.cjs

@@ -136,17 +136,15 @@ var LwrViewRegistry = class {
     }
     throw new Error(`No View provider was able to resolve a view for template: ${viewId.contentTemplate}`);
   }
-  async getView(viewId, skipCaching = false) {
+  async getView(viewId) {
     const {contentTemplate, rootComponent} = viewId;
     const compiledViewCacheKey = (0, import_shared_utils.getCacheKeyFromJson)({contentTemplate, rootComponent});
     import_diagnostics.logger.debug(`[view-registry][getView] compiledViewCacheKey=${compiledViewCacheKey}`);
-    if (!skipCaching && this.compiledViews.has(compiledViewCacheKey)) {
+    if (this.compiledViews.has(compiledViewCacheKey)) {
       return this.compiledViews.get(compiledViewCacheKey);
     }
     const compiledView = await this.delegateGetView(viewId);
-    if (!skipCaching) {
-      this.compiledViews.set(compiledViewCacheKey, compiledView);
-    }
+    this.compiledViews.set(compiledViewCacheKey, compiledView);
     return compiledView;
   }
   hasViewDefinition(view, viewParams, runtimeEnvironment, runtimeParams, renderOptions) {
@@ -177,7 +175,7 @@ var LwrViewRegistry = class {
   }
   async getViewDefinition(view, viewParams, runtimeEnvironment, runtimeParams, renderOptions) {
     try {
-      const {skipCaching, freezeAssets, viewParamCacheKey} = (0, import_utils.normalizeRenderOptions)(this.runtimeEnvironment, renderOptions);
+      const {freezeAssets, viewParamCacheKey} = (0, import_utils.normalizeRenderOptions)(this.runtimeEnvironment, renderOptions);
       const viewDefCacheKey = (0, import_shared_utils.getCacheKeyFromJson)({
         ...view,
         freezeAssets,
@@ -189,8 +187,7 @@ var LwrViewRegistry = class {
       import_diagnostics.logger.debug(`[view-registry][getViewDefinition] viewDefCacheKey=${viewDefCacheKey}`);
       const viewParamKey = viewParamCacheKey ? (0, import_shared_utils.getCacheKeyFromJson)(viewParamCacheKey) : (0, import_shared_utils.getCacheKeyFromJson)(viewParams);
       import_diagnostics.logger.debug(`[view-registry][getViewDefinition] viewParamKey=${viewParamKey}`);
-      const cacheDisabled = process.env.NOCACHE === "true" || skipCaching;
-      if (cacheDisabled === false && this.viewDefinitions.has(viewDefCacheKey)) {
+      if (this.viewDefinitions.has(viewDefCacheKey)) {
         const viewDefinition2 = this.viewDefinitions.get(viewDefCacheKey);
         if (viewDefinition2 && viewDefinition2.paramKey === viewParamKey && viewDefinition2.viewDefinition.immutable) {
           return viewDefinition2.viewDefinition;
@@ -207,19 +204,16 @@ var LwrViewRegistry = class {
         }
       }, () => this.renderView(view, updatableViewParams, runtimeEnvironment, runtimeParams, renderOptions)));
       viewDefinition.nonce = (0, import_utils.getViewNonce)(updatableViewParams);
-      if (cacheDisabled === false) {
-        const route = this.globalConfig.routes.find((r) => r.id === view.id);
-        const maxViewCacheTtl = (0, import_shared_utils.getFeatureFlags)().MAX_VIEW_CACHE_TTL;
-        const maxTtl = maxViewCacheTtl && parseInt(maxViewCacheTtl, 10);
-        const ttl = (0, import_shared_utils.shortestTtl)(viewDefinition.cache?.ttl, route?.cache?.ttl, maxTtl);
-        if (ttl !== 0) {
-          this.viewDefinitions.set(viewDefCacheKey, {
-            view,
-            viewDefinition,
-            paramKey: viewParamKey
-          }, {ttl: ttl ? ttl * 1e3 : void 0});
-        }
-      }
+      const route = this.globalConfig.routes.find((r) => r.id === view.id);
+      const maxViewCacheTtl = (0, import_shared_utils.getFeatureFlags)().MAX_VIEW_CACHE_TTL;
+      const maxTtl = maxViewCacheTtl && parseInt(maxViewCacheTtl, 10);
+      const leastTtl = (0, import_shared_utils.shortestTtl)(viewDefinition.cache?.ttl, route?.cache?.ttl, maxTtl);
+      const ttl = leastTtl !== void 0 ? leastTtl === 0 ? 10 : leastTtl * 1e3 : void 0;
+      this.viewDefinitions.set(viewDefCacheKey, {
+        view,
+        viewDefinition,
+        paramKey: viewParamKey
+      }, {ttl});
       return viewDefinition;
     } catch (err) {
       if (err instanceof import_diagnostics.DiagnosticsError) {
@@ -295,7 +289,7 @@ var LwrViewRegistry = class {
   async render(viewId, viewParams, runtimeParams, runtimeEnvironment, renderOptions) {
     const globalContext = this.globalData;
     const {id, rootComponent, contentTemplate} = viewId;
-    const compiledView = await this.getView({id, contentTemplate, rootComponent}, renderOptions?.skipCaching);
+    const compiledView = await this.getView({id, contentTemplate, rootComponent});
     const result = await compiledView.render({
       ...runtimeParams,
       ...globalContext,

package/build/cjs/utils.cjs

@@ -137,7 +137,6 @@ function normalizeRenderOptions(runtimeEnvironment, overrideRenderOptions, baseR
   return {
     skipMetadataCollection: false,
     freezeAssets: runtimeEnvironment.immutableAssets,
-    skipCaching: false,
     viewParamCacheKey: null,
     ...baseRenderOptions,
     ...overrideRenderOptions

package/build/es/index.d.ts

@@ -42,7 +42,7 @@ export declare class LwrViewRegistry implements ViewRegistry {
     addViewTransformers(transformers: ViewTransformPlugin[]): void;
     initializeViewProviders(): Promise<void[]>;
     delegateGetView(viewId: ViewIdentity): Promise<CompiledView>;
-    getView(viewId: ViewIdentity, skipCaching?: boolean): Promise<CompiledView>;
+    getView(viewId: ViewIdentity): Promise<CompiledView>;
     hasViewDefinition(view: View, viewParams: ViewParams, runtimeEnvironment: RuntimeEnvironment, runtimeParams?: RuntimeParams, renderOptions?: RenderOptions): boolean;
     getViewDefinition(view: View, viewParams: ViewParams, runtimeEnvironment: RuntimeEnvironment, runtimeParams?: RuntimeParams, renderOptions?: RenderOptions): Promise<LinkedViewDefinition>;
     private renderView;

package/build/es/index.js

@@ -123,19 +123,16 @@ export class LwrViewRegistry {
         }
         throw new Error(`No View provider was able to resolve a view for template: ${viewId.contentTemplate}`);
     }
-    async getView(viewId, skipCaching = false) {
+    async getView(viewId) {
         const { contentTemplate, rootComponent } = viewId;
         const compiledViewCacheKey = getCacheKeyFromJson({ contentTemplate, rootComponent });
         logger.debug(`[view-registry][getView] compiledViewCacheKey=${compiledViewCacheKey}`);
         // use cached compiledView if available
-        if (!skipCaching && this.compiledViews.has(compiledViewCacheKey)) {
+        if (this.compiledViews.has(compiledViewCacheKey)) {
             return this.compiledViews.get(compiledViewCacheKey);
         }
         const compiledView = await this.delegateGetView(viewId);
-        // cache the compiled view
-        if (!skipCaching) {
-            this.compiledViews.set(compiledViewCacheKey, compiledView);
-        }
+        this.compiledViews.set(compiledViewCacheKey, compiledView);
         return compiledView;
     }
     hasViewDefinition(view, viewParams, runtimeEnvironment, runtimeParams, renderOptions) {
@@ -173,7 +170,7 @@ export class LwrViewRegistry {
     }
     async getViewDefinition(view, viewParams, runtimeEnvironment, runtimeParams, renderOptions) {
         try {
-            const { skipCaching, freezeAssets, viewParamCacheKey } = normalizeRenderOptions(this.runtimeEnvironment, renderOptions);
+            const { freezeAssets, viewParamCacheKey } = normalizeRenderOptions(this.runtimeEnvironment, renderOptions);
             const viewDefCacheKey = getCacheKeyFromJson({
                 ...view,
                 freezeAssets,
@@ -191,9 +188,8 @@ export class LwrViewRegistry {
                 ? getCacheKeyFromJson(viewParamCacheKey)
                 : getCacheKeyFromJson(viewParams);
             logger.debug(`[view-registry][getViewDefinition] viewParamKey=${viewParamKey}`);
-            const cacheDisabled = process.env.NOCACHE === 'true' || skipCaching;
             // important: cache key does not include the unbounded viewParams
-            if (cacheDisabled === false && this.viewDefinitions.has(viewDefCacheKey)) {
+            if (this.viewDefinitions.has(viewDefCacheKey)) {
                 const viewDefinition = this.viewDefinitions.get(viewDefCacheKey);
                 if (viewDefinition &&
                     viewDefinition.paramKey === viewParamKey &&
@@ -214,23 +210,19 @@ export class LwrViewRegistry {
             }, () => this.renderView(view, updatableViewParams, runtimeEnvironment, runtimeParams, renderOptions)));
             // Once the view is generated add the nonce to the response so it can be cached and then added to the headers
             viewDefinition.nonce = getViewNonce(updatableViewParams);
-            if (cacheDisabled === false) {
-                const route = this.globalConfig.routes.find((r) => r.id === view.id);
-                const maxViewCacheTtl = getFeatureFlags().MAX_VIEW_CACHE_TTL;
-                // optionally set a max TTL on the view registry cache
-                const maxTtl = maxViewCacheTtl && parseInt(maxViewCacheTtl, 10);
-                const ttl = shortestTtl(viewDefinition.cache?.ttl, route?.cache?.ttl, maxTtl);
-                if (ttl !== 0) {
-                    // cache view definition for the shortest ttl or until it is the least recently used when ttl is undefined
-                    this.viewDefinitions.set(viewDefCacheKey, {
-                        view,
-                        viewDefinition,
-                        paramKey: viewParamKey,
-                    }, 
-                    // s -> ms
-                    { ttl: ttl ? ttl * 1000 : undefined });
-                }
-            }
+            const route = this.globalConfig.routes.find((r) => r.id === view.id);
+            const maxViewCacheTtl = getFeatureFlags().MAX_VIEW_CACHE_TTL;
+            // optionally set a max TTL on the view registry cache
+            // use a very low TTL if the shortest is 0, to allow the view to be fetched > once during a single request
+            const maxTtl = maxViewCacheTtl && parseInt(maxViewCacheTtl, 10);
+            const leastTtl = shortestTtl(viewDefinition.cache?.ttl, route?.cache?.ttl, maxTtl);
+            const ttl = leastTtl !== undefined ? (leastTtl === 0 ? 10 : leastTtl * 1000) : undefined;
+            // cache view definition for the shortest ttl or until it is the least recently used when ttl is undefined
+            this.viewDefinitions.set(viewDefCacheKey, {
+                view,
+                viewDefinition,
+                paramKey: viewParamKey,
+            }, { ttl });
             return viewDefinition;
         }
         catch (err) {
@@ -317,7 +309,7 @@ export class LwrViewRegistry {
     async render(viewId, viewParams, runtimeParams, runtimeEnvironment, renderOptions) {
         const globalContext = this.globalData;
         const { id, rootComponent, contentTemplate } = viewId;
-        const compiledView = await this.getView({ id, contentTemplate, rootComponent }, renderOptions?.skipCaching);
+        const compiledView = await this.getView({ id, contentTemplate, rootComponent });
         // Get content/body of the view
         /*
             When rendering the compiled view, a collection variable properties can be passed to the render() to be rendered in

package/build/es/utils.js

@@ -95,7 +95,6 @@ export function normalizeRenderOptions(runtimeEnvironment, overrideRenderOptions
         // Default render options
         skipMetadataCollection: false,
         freezeAssets: runtimeEnvironment.immutableAssets,
-        skipCaching: false,
         viewParamCacheKey: null,
         ...baseRenderOptions,
         ...overrideRenderOptions,

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.13.0-alpha.27",
+    "version": "0.13.0-alpha.28",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -33,17 +33,17 @@
         "build": "tsc -b"
     },
     "dependencies": {
-        "@lwrjs/app-service": "0.13.0-alpha.27",
-        "@lwrjs/diagnostics": "0.13.0-alpha.27",
-        "@lwrjs/instrumentation": "0.13.0-alpha.27",
-        "@lwrjs/shared-utils": "0.13.0-alpha.27",
+        "@lwrjs/app-service": "0.13.0-alpha.28",
+        "@lwrjs/diagnostics": "0.13.0-alpha.28",
+        "@lwrjs/instrumentation": "0.13.0-alpha.28",
+        "@lwrjs/shared-utils": "0.13.0-alpha.28",
         "lru-cache": "^10.2.2"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.13.0-alpha.27"
+        "@lwrjs/types": "0.13.0-alpha.28"
     },
     "engines": {
         "node": ">=18.0.0"
     },
-    "gitHead": "2145759ab377e5e625dcd449b80ac25f492513a7"
+    "gitHead": "3c8caa1fd5ce8c2360cd63049865aac499e30881"
 }