@lwrjs/view-registry 0.17.2-alpha.6 → 0.17.2-alpha.7

package/build/cjs/index.cjs

@@ -32,6 +32,7 @@ var import_instrumentation = __toModule(require("@lwrjs/instrumentation"));
 var import_utils = __toModule(require("./utils.cjs"));
 var import_link_lwr_resources = __toModule(require("./linkers/link-lwr-resources.cjs"));
 var import_lru_cache = __toModule(require("lru-cache"));
+var import_crypto = __toModule(require("crypto"));
 var import_diagnostics = __toModule(require("@lwrjs/diagnostics"));
 var import_view_handler = __toModule(require("./view-handler.cjs"));
 var LwrViewRegistry = class {
@@ -40,6 +41,7 @@ var LwrViewRegistry = class {
     this.compiledViews = new Map();
     this.immutableAssets = new Map();
     this.pendingViewDefinitions = new import_shared_utils.InflightTasks();
+    this.metadataCache = new Map();
     this.name = "lwr-view-registry";
     this.resourceRegistry = context.resourceRegistry;
     this.runtimeEnvironment = context.runtimeEnvironment;
@@ -243,6 +245,10 @@ var LwrViewRegistry = class {
       lwr_resources: lwrResourcesId
     }, runtimeParams, runtimeEnvironment);
     normalizedRenderOptions = (0, import_utils.normalizeRenderOptions)(this.runtimeEnvironment, renderedLayout.options, normalizedRenderOptions);
+    const warnings = [
+      ...renderedContent.metadata.serverDebug?.warnings || [],
+      ...renderedLayout.metadata.serverDebug?.warnings || []
+    ];
     const renderedViewDef = await this.link({
       ...renderedLayout,
       compiledView: {
@@ -262,10 +268,7 @@ var LwrViewRegistry = class {
           ...renderedContent.metadata.serverData,
           ...renderedLayout.metadata.serverData
         },
-        serverDebug: {
-          ...renderedContent.metadata.serverDebug,
-          ...renderedLayout.metadata.serverDebug
-        },
+        serverDebug: {warnings},
         serverBundles: renderedContent.metadata.serverBundles
       },
       cache: renderedContent.cache
@@ -325,7 +328,17 @@ var LwrViewRegistry = class {
         ssr: view.bootstrap?.ssr === true
       }
     }, () => {
-      const linkedMetadata2 = skipMetadataCollection ? renderedViewMetadata : (0, import_shared_utils.extractMetadataFromHtml)(renderedViewContent, renderedViewMetadata, this.globalConfig);
+      let linkedMetadata2 = renderedViewMetadata;
+      if (!skipMetadataCollection) {
+        const contentHash = (0, import_crypto.createHash)("md5").update(renderedViewContent).digest("hex");
+        const cacheKey = `${view.id}:${contentHash}`;
+        if (this.metadataCache.has(cacheKey)) {
+          linkedMetadata2 = this.metadataCache.get(cacheKey);
+        } else {
+          linkedMetadata2 = (0, import_shared_utils.extractMetadataFromHtml)(renderedViewContent, renderedViewMetadata, this.globalConfig);
+          this.metadataCache.set(cacheKey, linkedMetadata2);
+        }
+      }
       const stringBuilder2 = (0, import_shared_utils.createStringBuilder)(renderedViewContent);
       return {linkedMetadata: linkedMetadata2, stringBuilder: stringBuilder2};
     });

package/build/cjs/linkers/legacy_view_bootstrap.cjs

@@ -251,7 +251,7 @@ async function getHtmlResources(view, viewParams, resourceContext) {
       }
     }
   }));
-  if (viewContainsLiveElements || serverDebug?.message) {
+  if (viewContainsLiveElements || serverDebug?.warnings?.length) {
     if ((0, import_shared_utils.isLocalDev)()) {
       const localDevSpecifier = "lwr_local_dev/bootstrap";
       rootComponents.push(localDevSpecifier);
@@ -278,7 +278,7 @@ async function getHtmlResources(view, viewParams, resourceContext) {
       serverData,
       ...isAMD && {requiredModules: requiredAmdModules},
       ...isAMD && {preloadModules: viewPreloads.specifiers}
-    }, runtimeEnvironment, runtimeParams, serverDebug?.message));
+    }, runtimeEnvironment, runtimeParams, serverDebug?.warnings));
   }
   if (!isAMD && hmrEnabled) {
     configResources.unshift((0, import_utils2.getViewHmrConfigurationResource)(view, viewMetadata));

package/build/cjs/linkers/utils.cjs

@@ -29,9 +29,10 @@ __export(exports, {
   getViewBootstrapConfigurationResource: () => getViewBootstrapConfigurationResource,
   getViewHmrConfigurationResource: () => getViewHmrConfigurationResource
 });
+var import_diagnostics = __toModule(require("@lwrjs/diagnostics"));
 var import_shared_utils = __toModule(require("@lwrjs/shared-utils"));
 var CONTENT_TYPE = "application/javascript";
-function getViewBootstrapConfigurationResource(viewInfo, config, runtimeEnvironment, runtimeParams, debugMessage) {
+function getViewBootstrapConfigurationResource(viewInfo, config, runtimeEnvironment, runtimeParams, warnings) {
   const {compat, debug, hmrEnabled, apiVersion, format} = runtimeEnvironment;
   const isESM = format === "esm";
   const defaultUrl = (0, import_shared_utils.getModuleUriPrefix)(runtimeEnvironment, runtimeParams);
@@ -53,6 +54,9 @@ function getViewBootstrapConfigurationResource(viewInfo, config, runtimeEnvironm
     SSR: false,
     ...(0, import_shared_utils.buildEnvironmentContext)(runtimeParams)
   };
+  let warnMessages = `console.group('Server-side rendering warnings:');`;
+  warnings?.forEach((warning) => warnMessages += `console.warn('${(0, import_diagnostics.stringifyError)(warning)}');`);
+  warnMessages += "console.groupEnd();";
   const configString = [
     "/* This script is generated */",
     "/* Client Bootstrap configuration */",
@@ -64,7 +68,7 @@ function getViewBootstrapConfigurationResource(viewInfo, config, runtimeEnvironm
     `globalThis.LWR = {...globalThis.LWR, env: ${JSON.stringify(lwrEnv)}};`,
     `globalThis.process={...globalThis.process,env:{...globalThis.process?.env,...${JSON.stringify(nodeEnv)}}};`,
     `globalThis.lwcRuntimeFlags = { ENABLE_MIXED_SHADOW_MODE: ${viewInfo.mixedMode}, ENABLE_WIRE_SYNC_EMIT: ${viewInfo.ssr} };`,
-    debug && debugMessage && `console.error(${JSON.stringify(debugMessage)});`
+    warnings?.length && warnMessages
   ].filter(Boolean).join("\n");
   if (viewInfo.configAsSrc) {
     const viewUrl = viewInfo.url || "/";

package/build/cjs/linkers/view_bootstrap.cjs

@@ -234,7 +234,7 @@ async function getHtmlResources(view, viewParams, resourceContext) {
       importMetadata = await (0, import_shared_utils.toImportMetadata)(graph, importMetadata, moduleRegistry, runtimeEnvironment, runtimeParams);
     }
   }
-  if (viewContainsLiveElements || serverDebug?.message) {
+  if (viewContainsLiveElements || serverDebug?.warnings?.length) {
     configResources.unshift((0, import_utils2.getViewBootstrapConfigurationResource)({
       id: view.id,
       url: viewParams?.page?.url,
@@ -252,7 +252,7 @@ async function getHtmlResources(view, viewParams, resourceContext) {
       serverData,
       ...isAMD && {requiredModules: requiredAmdModules},
       ...isAMD && {preloadModules: viewPreloads.specifiers}
-    }, runtimeEnvironment, runtimeParams, serverDebug?.message));
+    }, runtimeEnvironment, runtimeParams, serverDebug?.warnings));
   }
   if (!isAMD && hmrEnabled) {
     configResources.unshift((0, import_utils2.getViewHmrConfigurationResource)(view, viewMetadata));

package/build/es/index.d.ts

@@ -47,6 +47,7 @@ export declare class LwrViewRegistry implements ViewRegistry {
     getViewDefinition(view: View, viewParams: ViewParams, runtimeEnvironment: RuntimeEnvironment, runtimeParams?: RuntimeParams, renderOptions?: RenderOptions): Promise<LinkedViewDefinition>;
     private renderView;
     private render;
+    private metadataCache;
     private link;
 }
 //# sourceMappingURL=index.d.ts.map

package/build/es/index.js

@@ -4,6 +4,7 @@ import { generateViewNonce, getViewNonce, normalizeRenderOptions, normalizeRende
 import { linkLwrResources } from './linkers/link-lwr-resources.js';
 // TODO: investigate perf impact W-16056356
 import { LRUCache } from 'lru-cache';
+import { createHash } from 'crypto';
 import { LwrError, LwrServerError, descriptions, logger } from '@lwrjs/diagnostics';
 export { LwrViewHandler } from './view-handler.js';
 export class LwrViewRegistry {
@@ -19,6 +20,7 @@ export class LwrViewRegistry {
         // Pending view definitions are tracked to prevent concurrent resolution of the same view.
         // Subsequent requests for the same view will await the original promise.
         this.pendingViewDefinitions = new InflightTasks();
+        this.metadataCache = new Map();
         this.name = 'lwr-view-registry';
         this.resourceRegistry = context.resourceRegistry;
         this.runtimeEnvironment = context.runtimeEnvironment;
@@ -264,6 +266,10 @@ export class LwrViewRegistry {
             lwr_resources: lwrResourcesId,
         }, runtimeParams, runtimeEnvironment);
         normalizedRenderOptions = normalizeRenderOptions(this.runtimeEnvironment, renderedLayout.options, normalizedRenderOptions);
+        const warnings = [
+            ...(renderedContent.metadata.serverDebug?.warnings || []),
+            ...(renderedLayout.metadata.serverDebug?.warnings || []),
+        ];
         const renderedViewDef = await this.link({
             ...renderedLayout,
             // Rendered Layout view's immutability is a composite of the layouts mutability and the body's mutability
@@ -285,10 +291,7 @@ export class LwrViewRegistry {
                     ...renderedContent.metadata.serverData,
                     ...renderedLayout.metadata.serverData,
                 },
-                serverDebug: {
-                    ...renderedContent.metadata.serverDebug,
-                    ...renderedLayout.metadata.serverDebug,
-                },
+                serverDebug: { warnings },
                 serverBundles: renderedContent.metadata.serverBundles, // 1st pass of SSR
             },
             cache: renderedContent.cache,
@@ -351,9 +354,19 @@ export class LwrViewRegistry {
                 ssr: view.bootstrap?.ssr === true,
             },
         }, () => {
-            const linkedMetadata = skipMetadataCollection
-                ? renderedViewMetadata
-                : extractMetadataFromHtml(renderedViewContent, renderedViewMetadata, this.globalConfig);
+            let linkedMetadata = renderedViewMetadata;
+            if (!skipMetadataCollection) {
+                // Create a unique key based on view ID and content hash
+                const contentHash = createHash('md5').update(renderedViewContent).digest('hex');
+                const cacheKey = `${view.id}:${contentHash}`;
+                if (this.metadataCache.has(cacheKey)) {
+                    linkedMetadata = this.metadataCache.get(cacheKey);
+                }
+                else {
+                    linkedMetadata = extractMetadataFromHtml(renderedViewContent, renderedViewMetadata, this.globalConfig);
+                    this.metadataCache.set(cacheKey, linkedMetadata);
+                }
+            }
             const stringBuilder = createStringBuilder(renderedViewContent);
             return { linkedMetadata, stringBuilder };
         });

package/build/es/linkers/legacy_view_bootstrap.js

@@ -290,7 +290,7 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
             }
         }
     }));
-    if (viewContainsLiveElements || serverDebug?.message) {
+    if (viewContainsLiveElements || serverDebug?.warnings?.length) {
         if (isLocalDev()) {
             // ADD the client-side bootstrap module and mapping for local-dev
             const localDevSpecifier = 'lwr_local_dev/bootstrap';
@@ -320,7 +320,7 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
             ...(isAMD && { requiredModules: requiredAmdModules }),
             // in AMD we need to tell the loader what modules we are preloading
             ...(isAMD && { preloadModules: viewPreloads.specifiers }),
-        }, runtimeEnvironment, runtimeParams, serverDebug?.message));
+        }, runtimeEnvironment, runtimeParams, serverDebug?.warnings));
     }
     if (!isAMD && hmrEnabled) {
         configResources.unshift(getViewHmrConfigurationResource(view, viewMetadata));

package/build/es/linkers/utils.d.ts

@@ -1,5 +1,5 @@
 import type { ClientBootstrapConfig, RuntimeEnvironment, RuntimeParams, ResourceDefinition, RenderedViewMetadata, CustomElementReference, View, ViewInfo, FlattenedModuleGraphs } from '@lwrjs/types';
-export declare function getViewBootstrapConfigurationResource(viewInfo: ViewInfo, config: ClientBootstrapConfig, runtimeEnvironment: RuntimeEnvironment, runtimeParams: RuntimeParams, debugMessage?: string): ResourceDefinition;
+export declare function getViewBootstrapConfigurationResource(viewInfo: ViewInfo, config: ClientBootstrapConfig, runtimeEnvironment: RuntimeEnvironment, runtimeParams: RuntimeParams, warnings?: (Error | string)[]): ResourceDefinition;
 export declare function getViewHmrConfigurationResource(view: View, viewMetadata: RenderedViewMetadata): ResourceDefinition;
 export declare function flattenCustomElements(arr: CustomElementReference[], isSSR?: boolean): CustomElementReference[];
 export declare function getBundleIntegrity(bootstrapModuleGraph: FlattenedModuleGraphs, versionedSpecifier: string): string | undefined;

package/build/es/linkers/utils.js

@@ -1,6 +1,7 @@
+import { stringifyError } from '@lwrjs/diagnostics';
 import { buildEnvironmentContext, getMappingUriPrefix, getModuleUriPrefix, getClientBootstrapConfigurationUri, hashContent, } from '@lwrjs/shared-utils';
 const CONTENT_TYPE = 'application/javascript';
-export function getViewBootstrapConfigurationResource(viewInfo, config, runtimeEnvironment, runtimeParams, debugMessage) {
+export function getViewBootstrapConfigurationResource(viewInfo, config, runtimeEnvironment, runtimeParams, warnings) {
     const { compat, debug, hmrEnabled, apiVersion, format } = runtimeEnvironment;
     const isESM = format === 'esm';
     const defaultUrl = getModuleUriPrefix(runtimeEnvironment, runtimeParams);
@@ -27,6 +28,9 @@ export function getViewBootstrapConfigurationResource(viewInfo, config, runtimeE
         // Used by `lwr/environment`
         ...buildEnvironmentContext(runtimeParams),
     };
+    let warnMessages = `console.group('Server-side rendering warnings:');`;
+    warnings?.forEach((warning) => (warnMessages += `console.warn('${stringifyError(warning)}');`));
+    warnMessages += 'console.groupEnd();';
     const configString = [
         '/* This script is generated */',
         '/* Client Bootstrap configuration */',
@@ -39,7 +43,7 @@ export function getViewBootstrapConfigurationResource(viewInfo, config, runtimeE
         `globalThis.process={...globalThis.process,env:{...globalThis.process?.env,...${JSON.stringify(nodeEnv)}}};`,
         // TODO: evaluate moving these to app layer
         `globalThis.lwcRuntimeFlags = { ENABLE_MIXED_SHADOW_MODE: ${viewInfo.mixedMode}, ENABLE_WIRE_SYNC_EMIT: ${viewInfo.ssr} };`,
-        debug && debugMessage && `console.error(${JSON.stringify(debugMessage)});`,
+        warnings?.length && warnMessages,
     ]
         .filter(Boolean)
         .join('\n');

package/build/es/linkers/view_bootstrap.js

@@ -262,7 +262,7 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
             importMetadata = await toImportMetadata(graph, importMetadata, moduleRegistry, runtimeEnvironment, runtimeParams);
         }
     }
-    if (viewContainsLiveElements || serverDebug?.message) {
+    if (viewContainsLiveElements || serverDebug?.warnings?.length) {
         // ADD configuration of the bootstrapModule
         configResources.unshift(getViewBootstrapConfigurationResource({
             id: view.id,
@@ -282,7 +282,7 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
             ...(isAMD && { requiredModules: requiredAmdModules }),
             // in AMD we need to tell the loader what modules we are preloading
             ...(isAMD && { preloadModules: viewPreloads.specifiers }),
-        }, runtimeEnvironment, runtimeParams, serverDebug?.message));
+        }, runtimeEnvironment, runtimeParams, serverDebug?.warnings));
     }
     if (!isAMD && hmrEnabled) {
         configResources.unshift(getViewHmrConfigurationResource(view, viewMetadata));

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.17.2-alpha.6",
+    "version": "0.17.2-alpha.7",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -33,14 +33,14 @@
         "build": "tsc -b"
     },
     "dependencies": {
-        "@lwrjs/app-service": "0.17.2-alpha.6",
-        "@lwrjs/diagnostics": "0.17.2-alpha.6",
-        "@lwrjs/instrumentation": "0.17.2-alpha.6",
-        "@lwrjs/shared-utils": "0.17.2-alpha.6",
+        "@lwrjs/app-service": "0.17.2-alpha.7",
+        "@lwrjs/diagnostics": "0.17.2-alpha.7",
+        "@lwrjs/instrumentation": "0.17.2-alpha.7",
+        "@lwrjs/shared-utils": "0.17.2-alpha.7",
         "lru-cache": "^10.4.3"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.17.2-alpha.6"
+        "@lwrjs/types": "0.17.2-alpha.7"
     },
     "engines": {
         "node": ">=18.0.0"
@@ -48,5 +48,5 @@
     "volta": {
         "extends": "../../../package.json"
     },
-    "gitHead": "e52a06333b7cd8d6d4bdc846ea9019d13f9fb85d"
+    "gitHead": "13d2ef766b72903be7be11a0ddc4704fe649f77a"
 }