@lwrjs/view-registry 0.15.0-alpha.26 → 0.15.0-alpha.27

package/build/cjs/index.cjs

@@ -145,11 +145,15 @@ var LwrViewRegistry = class {
     const {contentTemplate, rootComponent} = viewId;
     const compiledViewCacheKey = (0, import_shared_utils.getCacheKeyFromJson)({contentTemplate, rootComponent});
     import_diagnostics.logger.debug(`[view-registry][getView] compiledViewCacheKey=${compiledViewCacheKey}`);
-    if (this.compiledViews.has(compiledViewCacheKey)) {
+    const route = this.globalConfig.routes.find((r) => r.id === viewId.id);
+    const skipCaching = route?.cache?.ttl === 0;
+    if (!skipCaching && this.compiledViews.has(compiledViewCacheKey)) {
       return this.compiledViews.get(compiledViewCacheKey);
     }
     const compiledView = await this.delegateGetView(viewId);
-    this.compiledViews.set(compiledViewCacheKey, compiledView);
+    if (!skipCaching) {
+      this.compiledViews.set(compiledViewCacheKey, compiledView);
+    }
     return compiledView;
   }
   hasViewDefinition(view, viewParams, runtimeEnvironment, runtimeParams, renderOptions) {
@@ -329,19 +333,37 @@ var LwrViewRegistry = class {
       metadata: renderedViewMetadata,
       compiledView: {immutable = true}
     } = renderedView;
-    const linkedMetadata = skipMetadataCollection ? renderedViewMetadata : await (0, import_shared_utils.extractMetadataFromHtml)(renderedViewContent, renderedViewMetadata, this.globalConfig);
+    const {linkedMetadata, stringBuilder} = await (0, import_instrumentation.getTracer)().trace({
+      name: import_instrumentation.ViewSpan.ParseView,
+      attributes: {
+        view: view.id,
+        ssr: view.bootstrap?.ssr === true
+      }
+    }, async () => {
+      const linkedMetadata2 = skipMetadataCollection ? renderedViewMetadata : await (0, import_shared_utils.extractMetadataFromHtml)(renderedViewContent, renderedViewMetadata, this.globalConfig);
+      const stringBuilder2 = (0, import_shared_utils.createStringBuilder)(renderedViewContent);
+      return {linkedMetadata: linkedMetadata2, stringBuilder: stringBuilder2};
+    });
     const mergedViewContext = {
       ...viewContext,
       config: this.globalConfig,
       runtimeEnvironment,
       importer: importer || renderedView.compiledView.filePath
     };
-    const stringBuilder = (0, import_shared_utils.createStringBuilder)(renderedViewContent);
     let pageTtl = renderedView.cache.ttl;
+    let pageRedirect = renderedView.redirect;
     for (const viewTransformer of this.viewTransformers) {
-      const linkResults = await viewTransformer.link?.(stringBuilder, mergedViewContext, linkedMetadata);
+      const linkResults = await (0, import_instrumentation.getTracer)().trace({
+        name: import_instrumentation.ViewSpan.Transform,
+        attributes: {
+          name: viewTransformer.name
+        }
+      }, () => viewTransformer.link?.(stringBuilder, mergedViewContext, linkedMetadata));
       const ttl = linkResults && linkResults.cache?.ttl;
       pageTtl = (0, import_shared_utils.shortestTtl)(ttl || void 0, pageTtl);
+      if (!pageRedirect) {
+        pageRedirect = linkResults ? linkResults.redirect : void 0;
+      }
     }
     const linkedAssetContent = stringBuilder.toString();
     if (linkedAssetContent.includes(lwrResourcesId)) {
@@ -363,7 +385,7 @@ var LwrViewRegistry = class {
           ...viewRecord
         },
         cache: {ttl: pageTtl},
-        redirect: renderedView.redirect
+        redirect: pageRedirect
       };
     }
     return {
@@ -374,7 +396,7 @@ var LwrViewRegistry = class {
         moduleResources: []
       },
       cache: {ttl: pageTtl},
-      redirect: renderedView.redirect
+      redirect: pageRedirect
     };
   }
 };

package/build/cjs/linkers/link-lwr-resources.cjs

@@ -32,16 +32,16 @@ var import_legacy_view_bootstrap = __toModule(require("./legacy_view_bootstrap.c
 async function linkLwrResources(source, view, viewParams, cxt) {
   const {lwrResourcesId, ...resourceContext} = cxt;
   const LEGACY_LOADER = !!resourceContext.runtimeEnvironment.featureFlags.LEGACY_LOADER;
-  const {partial, viewRecord} = await (0, import_instrumentation.getTracer)().trace({
+  return await (0, import_instrumentation.getTracer)().trace({
     name: import_instrumentation.ViewSpan.Generate,
     attributes: {
       legacyLoader: LEGACY_LOADER
     }
-  }, () => {
-    return LEGACY_LOADER ? (0, import_legacy_view_bootstrap.getHtmlResources)(view, viewParams, resourceContext) : (0, import_view_bootstrap.getHtmlResources)(view, viewParams, resourceContext);
+  }, async () => {
+    const {partial, viewRecord} = await (LEGACY_LOADER ? (0, import_legacy_view_bootstrap.getHtmlResources)(view, viewParams, resourceContext) : (0, import_view_bootstrap.getHtmlResources)(view, viewParams, resourceContext));
+    return {
+      renderedView: source.replace(lwrResourcesId, () => partial),
+      viewRecord
+    };
   });
-  return {
-    renderedView: source.replace(lwrResourcesId, () => partial),
-    viewRecord
-  };
 }

package/build/es/index.js

@@ -132,12 +132,18 @@ export class LwrViewRegistry {
         const { contentTemplate, rootComponent } = viewId;
         const compiledViewCacheKey = getCacheKeyFromJson({ contentTemplate, rootComponent });
         logger.debug(`[view-registry][getView] compiledViewCacheKey=${compiledViewCacheKey}`);
+        // For now we are only supporting ttl 0 == skipCaching.
+        const route = this.globalConfig.routes.find((r) => r.id === viewId.id);
+        const skipCaching = route?.cache?.ttl === 0;
         // use cached compiledView if available
-        if (this.compiledViews.has(compiledViewCacheKey)) {
+        if (!skipCaching && this.compiledViews.has(compiledViewCacheKey)) {
             return this.compiledViews.get(compiledViewCacheKey);
         }
         const compiledView = await this.delegateGetView(viewId);
-        this.compiledViews.set(compiledViewCacheKey, compiledView);
+        // cache the compiled view
+        if (!skipCaching) {
+            this.compiledViews.set(compiledViewCacheKey, compiledView);
+        }
         return compiledView;
     }
     hasViewDefinition(view, viewParams, runtimeEnvironment, runtimeParams, renderOptions) {
@@ -354,24 +360,43 @@ export class LwrViewRegistry {
         const runtimeEnvironment = { ...runtimeEnv, immutableAssets: freezeAssets };
         // normalize/extract metadata
         const { renderedView: renderedViewContent, metadata: renderedViewMetadata, compiledView: { immutable = true }, } = renderedView;
-        const linkedMetadata = skipMetadataCollection
-            ? renderedViewMetadata
-            : await extractMetadataFromHtml(renderedViewContent, renderedViewMetadata, this.globalConfig);
+        const { linkedMetadata, stringBuilder } = await getTracer().trace({
+            name: ViewSpan.ParseView,
+            attributes: {
+                view: view.id,
+                ssr: view.bootstrap?.ssr === true,
+            },
+        }, async () => {
+            const linkedMetadata = skipMetadataCollection
+                ? renderedViewMetadata
+                : await extractMetadataFromHtml(renderedViewContent, renderedViewMetadata, this.globalConfig);
+            const stringBuilder = createStringBuilder(renderedViewContent);
+            return { linkedMetadata, stringBuilder };
+        });
         const mergedViewContext = {
             ...viewContext,
             config: this.globalConfig,
             runtimeEnvironment,
             importer: importer || renderedView.compiledView.filePath,
         };
-        const stringBuilder = createStringBuilder(renderedViewContent);
         // Note: this is the TTL for the page NOT for the view registry cache
         let pageTtl = renderedView.cache.ttl;
+        let pageRedirect = renderedView.redirect;
         for (const viewTransformer of this.viewTransformers) {
             // eslint-disable-next-line no-await-in-loop
-            const linkResults = await viewTransformer.link?.(stringBuilder, mergedViewContext, linkedMetadata);
+            const linkResults = await getTracer().trace({
+                name: ViewSpan.Transform,
+                attributes: {
+                    name: viewTransformer.name,
+                },
+            }, () => viewTransformer.link?.(stringBuilder, mergedViewContext, linkedMetadata));
             // Keep track of the shortest TTL from each view transformer (e.g. lwcSsrViewTransformer)
             const ttl = linkResults && linkResults.cache?.ttl;
             pageTtl = shortestTtl(ttl || undefined, pageTtl);
+            // Set the redirect info, if it doesn't already exist
+            if (!pageRedirect) {
+                pageRedirect = linkResults ? linkResults.redirect : undefined;
+            }
         }
         const linkedAssetContent = stringBuilder.toString();
         // Link LWR related resources
@@ -397,7 +422,7 @@ export class LwrViewRegistry {
                     ...viewRecord,
                 },
                 cache: { ttl: pageTtl },
-                redirect: renderedView.redirect,
+                redirect: pageRedirect,
             };
         }
         return {
@@ -408,7 +433,7 @@ export class LwrViewRegistry {
                 moduleResources: [],
             },
             cache: { ttl: pageTtl },
-            redirect: renderedView.redirect,
+            redirect: pageRedirect,
         };
     }
 }

package/build/es/linkers/link-lwr-resources.js

@@ -4,22 +4,22 @@ import { getHtmlResources as getLegacyHtmlResource } from './legacy_view_bootstr
 export async function linkLwrResources(source, view, viewParams, cxt) {
     const { lwrResourcesId, ...resourceContext } = cxt;
     const LEGACY_LOADER = !!resourceContext.runtimeEnvironment.featureFlags.LEGACY_LOADER;
-    const { partial, viewRecord } = await getTracer().trace({
+    return await getTracer().trace({
         name: ViewSpan.Generate,
         attributes: {
             legacyLoader: LEGACY_LOADER,
         },
-    }, () => {
-        return LEGACY_LOADER
+    }, async () => {
+        const { partial, viewRecord } = await (LEGACY_LOADER
             ? getLegacyHtmlResource(view, viewParams, resourceContext)
-            : getHtmlResources(view, viewParams, resourceContext);
+            : getHtmlResources(view, viewParams, resourceContext));
+        // Finally replace the token with the real resources
+        return {
+            // partial may contain regex-token-like characters such as $$,
+            // so we want to bypass regex replacement
+            renderedView: source.replace(lwrResourcesId, () => partial),
+            viewRecord,
+        };
     });
-    // Finally replace the token with the real resources
-    return {
-        // partial may contain regex-token-like characters such as $$,
-        // so we want to bypass regex replacement
-        renderedView: source.replace(lwrResourcesId, () => partial),
-        viewRecord,
-    };
 }
 //# sourceMappingURL=link-lwr-resources.js.map

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.15.0-alpha.26",
+    "version": "0.15.0-alpha.27",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -33,17 +33,20 @@
         "build": "tsc -b"
     },
     "dependencies": {
-        "@lwrjs/app-service": "0.15.0-alpha.26",
-        "@lwrjs/diagnostics": "0.15.0-alpha.26",
-        "@lwrjs/instrumentation": "0.15.0-alpha.26",
-        "@lwrjs/shared-utils": "0.15.0-alpha.26",
+        "@lwrjs/app-service": "0.15.0-alpha.27",
+        "@lwrjs/diagnostics": "0.15.0-alpha.27",
+        "@lwrjs/instrumentation": "0.15.0-alpha.27",
+        "@lwrjs/shared-utils": "0.15.0-alpha.27",
         "lru-cache": "^10.4.3"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.15.0-alpha.26"
+        "@lwrjs/types": "0.15.0-alpha.27"
     },
     "engines": {
         "node": ">=18.0.0"
     },
-    "gitHead": "b73171fb2777cf921935959d60d51750747de343"
+    "volta": {
+        "extends": "../../../package.json"
+    },
+    "gitHead": "6051c73d6009467325975f79dfa608a10bf2efa8"
 }