@lwrjs/view-registry 0.15.0-alpha.41 → 0.15.0-alpha.43

package/build/cjs/index.cjs

@@ -54,11 +54,7 @@ var LwrViewRegistry = class {
     this.viewDefinitions = new import_lru_cache.LRUCache({
       max: parseInt(process.env.VIEW_CACHE_SIZE ?? "500", 10),
       dispose: (_value, key) => {
-        if ((0, import_shared_utils.isLambdaEnv)()) {
-          import_diagnostics.logger.warn(`View evicted from cache ${key}`);
-        } else {
-          import_diagnostics.logger.verbose(`View evicted from cache ${key}`);
-        }
+        import_diagnostics.logger.verbose(`View evicted from cache ${key}`);
       }
     });
     observer.onViewSourceChange(({payload}) => this.onViewSourceChange(payload));

package/build/cjs/linkers/legacy_view_bootstrap.cjs

@@ -59,8 +59,7 @@ async function getHtmlResources(view, viewParams, resourceContext) {
     moduleRegistry,
     moduleBundler,
     resourceRegistry,
-    viewMetadata,
-    viewLinkCacheKey
+    viewMetadata
   } = resourceContext;
   const {format, hmrEnabled, bundle, debug, minify} = runtimeEnvironment;
   const {customElements, serverData, serverDebug} = viewMetadata;
@@ -154,7 +153,7 @@ async function getHtmlResources(view, viewParams, resourceContext) {
       requiredResources.push(errorShimDef);
     }
     let bootstrapModuleGraph;
-    const bootstrapModuleGraphCacheKey = (0, import_utils.getModuleGraphCacheKey)(bootstrapSpecifier, viewLinkCacheKey);
+    const bootstrapModuleGraphCacheKey = (0, import_utils.getModuleGraphCacheKey)(bootstrapSpecifier, runtimeEnvironment, runtimeParams);
     if (enableModuleGraphsCache && moduleGraphsCache.has(bootstrapModuleGraphCacheKey)) {
       bootstrapModuleGraph = moduleGraphsCache.get(bootstrapModuleGraphCacheKey);
     } else {
@@ -191,7 +190,7 @@ async function getHtmlResources(view, viewParams, resourceContext) {
       for (const staticDep of bootstrapModuleGraph.graphs[0].static) {
         const uri2 = bootstrapModuleGraph.uriMap[staticDep];
         imports[staticDep] = uri2;
-        if (services && services.length) {
+        if (services?.length) {
           requiredAmdModules.push(staticDep);
         }
       }
@@ -211,12 +210,16 @@ async function getHtmlResources(view, viewParams, resourceContext) {
   await Promise.all(flattenedElements.map(async ({tagName: element, props}) => {
     const hydrateDirective = (0, import_shared_utils.getHydrateDirective)(props);
     const isSsrOnly = isSSR && !hydrateDirective;
-    const moduleGraphCacheKey = (0, import_utils.getModuleGraphCacheKey)(element, viewLinkCacheKey);
+    const elementSpecifier = (0, import_shared_utils.kebabCaseToModuleSpecifier)(element);
+    const moduleGraphCacheKey = (0, import_utils.getModuleGraphCacheKey)(elementSpecifier, runtimeEnvironment, {
+      ...runtimeParams,
+      ssr: isSsrOnly
+    });
     let graph;
     if (enableModuleGraphsCache && moduleGraphsCache.has(moduleGraphCacheKey)) {
       graph = moduleGraphsCache.get(moduleGraphCacheKey);
     } else {
-      graph = await (0, import_shared_utils.getModuleGraphs)((0, import_shared_utils.kebabCaseToModuleSpecifier)(element), {includeUris: true, includeLinkedDefinitions: true, depth}, moduleRegistry, defRegistry, runtimeEnvironment, {...runtimeParams, ssr: isSsrOnly}, visitedCache);
+      graph = await (0, import_shared_utils.getModuleGraphs)(elementSpecifier, {includeUris: true, includeLinkedDefinitions: true, depth}, moduleRegistry, defRegistry, runtimeEnvironment, {...runtimeParams, ssr: isSsrOnly}, visitedCache);
       enableModuleGraphsCache && moduleGraphsCache.set(moduleGraphCacheKey, graph);
     }
     customElementsRecords.push({elementName: element, flatGraph: graph});

package/build/cjs/linkers/view_bootstrap.cjs

@@ -52,8 +52,7 @@ async function getHtmlResources(view, viewParams, resourceContext) {
     moduleRegistry,
     moduleBundler,
     resourceRegistry,
-    viewMetadata,
-    viewLinkCacheKey
+    viewMetadata
   } = resourceContext;
   const {format, hmrEnabled, bundle, debug, minify} = runtimeEnvironment;
   const {customElements, serverData, serverDebug} = viewMetadata;
@@ -135,7 +134,7 @@ async function getHtmlResources(view, viewParams, resourceContext) {
       requiredResources.push(errorShimDef);
     }
     let bootstrapModuleGraph;
-    const bootstrapModuleGraphCacheKey = (0, import_utils3.getModuleGraphCacheKey)(bootstrapSpecifier, viewLinkCacheKey);
+    const bootstrapModuleGraphCacheKey = (0, import_utils3.getModuleGraphCacheKey)(bootstrapSpecifier, runtimeEnvironment, runtimeParams);
     if (enableModuleGraphsCache && moduleGraphsCache.has(bootstrapModuleGraphCacheKey)) {
       bootstrapModuleGraph = moduleGraphsCache.get(bootstrapModuleGraphCacheKey);
     } else {
@@ -172,7 +171,7 @@ async function getHtmlResources(view, viewParams, resourceContext) {
       for (const staticDep of bootstrapModuleGraph.graphs[0].static) {
         const uri2 = bootstrapModuleGraph.uriMap[staticDep];
         imports[staticDep] = uri2;
-        if (services && services.length) {
+        if (services?.length) {
           requiredAmdModules.push(staticDep);
         }
       }
@@ -193,12 +192,16 @@ async function getHtmlResources(view, viewParams, resourceContext) {
   for (const {tagName: element, props} of flattenedElements) {
     const hydrateDirective = (0, import_shared_utils.getHydrateDirective)(props);
     const isSsrOnly = isSSR && !hydrateDirective;
-    const moduleGraphCacheKey = (0, import_utils3.getModuleGraphCacheKey)(element, viewLinkCacheKey);
+    const elementSpecifier = (0, import_shared_utils.kebabCaseToModuleSpecifier)(element);
+    const moduleGraphCacheKey = (0, import_utils3.getModuleGraphCacheKey)(elementSpecifier, runtimeEnvironment, {
+      ...runtimeParams,
+      ssr: isSsrOnly
+    });
     let graph;
     if (enableModuleGraphsCache && moduleGraphsCache.has(moduleGraphCacheKey)) {
       graph = moduleGraphsCache.get(moduleGraphCacheKey);
     } else {
-      graph = await (0, import_shared_utils.getModuleGraphs)((0, import_shared_utils.kebabCaseToModuleSpecifier)(element), {includeUris: true, includeLinkedDefinitions: true, depth}, moduleRegistry, defRegistry, runtimeEnvironment, {...runtimeParams, ssr: isSsrOnly}, visitedCache);
+      graph = await (0, import_shared_utils.getModuleGraphs)(elementSpecifier, {includeUris: true, includeLinkedDefinitions: true, depth}, moduleRegistry, defRegistry, runtimeEnvironment, {...runtimeParams, ssr: isSsrOnly}, visitedCache);
       enableModuleGraphsCache && moduleGraphsCache.set(moduleGraphCacheKey, graph);
     }
     customElementsRecords.push({elementName: element, flatGraph: graph});

package/build/cjs/utils.cjs

@@ -349,6 +349,15 @@ function getViewDefCacheKey(view, runtimeEnvironment, freezeAssets, runtimeParam
     nonceEnabled: (0, import_shared_utils.getFeatureFlags)().ENABLE_NONCE
   });
 }
-function getModuleGraphCacheKey(specifier, viewLinkCacheKey) {
-  return specifier + viewLinkCacheKey;
+function getModuleGraphCacheKey(specifier, runtimeEnvironment, runtimeParams) {
+  const updatedParams = {
+    ...runtimeParams
+  };
+  delete updatedParams.url;
+  delete updatedParams.query;
+  return (0, import_shared_utils.getCacheKeyFromJson)({
+    specifier,
+    updatedParams,
+    runtimeEnvironment
+  });
 }

package/build/es/index.js

@@ -1,4 +1,4 @@
-import { InflightTasks, createStringBuilder, extractMetadataFromHtml, getCacheKeyFromJson, getFeatureFlags, getSpecifier, isLambdaEnv, isLocalDev, normalizeResourcePath, shortestTtl, isRelative, } from '@lwrjs/shared-utils';
+import { InflightTasks, createStringBuilder, extractMetadataFromHtml, getCacheKeyFromJson, getFeatureFlags, getSpecifier, isLocalDev, normalizeResourcePath, shortestTtl, isRelative, } from '@lwrjs/shared-utils';
 import { getTracer, ViewSpan } from '@lwrjs/instrumentation';
 import { generateViewNonce, getViewNonce, normalizeRenderOptions, normalizeRenderedResult, reduceSourceAssetReferences, getViewDefCacheKey, } from './utils.js';
 import { linkLwrResources } from './linkers/link-lwr-resources.js';
@@ -33,12 +33,8 @@ export class LwrViewRegistry {
         this.viewDefinitions = new LRUCache({
             max: parseInt(process.env.VIEW_CACHE_SIZE ?? '500', 10),
             dispose: (_value, key) => {
-                if (isLambdaEnv()) {
-                    logger.warn(`View evicted from cache ${key}`);
-                }
-                else {
-                    logger.verbose(`View evicted from cache ${key}`);
-                }
+                // We expect the view to get evicted quite often in LWR@MRT so we are not warning of eviction here.
+                logger.verbose(`View evicted from cache ${key}`);
             },
         });
         // Observers for cached entries external dependencies -- view templates, modules, and assets

package/build/es/linkers/legacy_view_bootstrap.js

@@ -31,7 +31,7 @@ const moduleGraphsCache = new LRUCache({
 });
 const isRunningLocalDev = isLocalDev();
 export async function getHtmlResources(view, viewParams, resourceContext) {
-    const { runtimeEnvironment, runtimeParams, moduleRegistry, moduleBundler, resourceRegistry, viewMetadata, viewLinkCacheKey, } = resourceContext;
+    const { runtimeEnvironment, runtimeParams, moduleRegistry, moduleBundler, resourceRegistry, viewMetadata, } = resourceContext;
     const { format, hmrEnabled, bundle, debug, minify } = runtimeEnvironment;
     const { customElements, serverData, serverDebug } = viewMetadata;
     const isAMD = format === 'amd';
@@ -168,7 +168,8 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
         // Reasoning: This is to avoid unnecessary HTTP 302's during initial application module fetching.
         // Scope: ESM currently only exposes immutable URI references, optimize for AMD formats
         let bootstrapModuleGraph;
-        const bootstrapModuleGraphCacheKey = getModuleGraphCacheKey(bootstrapSpecifier, viewLinkCacheKey);
+        // Just determine the cache key based on the inputs to the getModuleGraphs
+        const bootstrapModuleGraphCacheKey = getModuleGraphCacheKey(bootstrapSpecifier, runtimeEnvironment, runtimeParams);
         if (enableModuleGraphsCache && moduleGraphsCache.has(bootstrapModuleGraphCacheKey)) {
             bootstrapModuleGraph = moduleGraphsCache.get(bootstrapModuleGraphCacheKey);
         }
@@ -217,7 +218,7 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
                 // AMD ADD static module dep uri addressability
                 imports[staticDep] = uri;
                 // ADD bootstrap module static deps to requiredAmdModules if services, otherwise preloadModules
-                if (services && services.length) {
+                if (services?.length) {
                     requiredAmdModules.push(staticDep);
                 }
             }
@@ -240,13 +241,17 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
     await Promise.all(flattenedElements.map(async ({ tagName: element, props }) => {
         const hydrateDirective = getHydrateDirective(props);
         const isSsrOnly = isSSR && !hydrateDirective;
-        const moduleGraphCacheKey = getModuleGraphCacheKey(element, viewLinkCacheKey);
+        const elementSpecifier = kebabCaseToModuleSpecifier(element);
+        const moduleGraphCacheKey = getModuleGraphCacheKey(elementSpecifier, runtimeEnvironment, {
+            ...runtimeParams,
+            ssr: isSsrOnly,
+        });
         let graph;
         if (enableModuleGraphsCache && moduleGraphsCache.has(moduleGraphCacheKey)) {
             graph = moduleGraphsCache.get(moduleGraphCacheKey);
         }
         else {
-            graph = await getModuleGraphs(kebabCaseToModuleSpecifier(element), { includeUris: true, includeLinkedDefinitions: true, depth }, moduleRegistry, defRegistry, runtimeEnvironment, { ...runtimeParams, ssr: isSsrOnly }, visitedCache);
+            graph = await getModuleGraphs(elementSpecifier, { includeUris: true, includeLinkedDefinitions: true, depth }, moduleRegistry, defRegistry, runtimeEnvironment, { ...runtimeParams, ssr: isSsrOnly }, visitedCache);
             enableModuleGraphsCache && moduleGraphsCache.set(moduleGraphCacheKey, graph);
         }
         // add to the viewRecord

package/build/es/linkers/view_bootstrap.js

@@ -21,7 +21,7 @@ const moduleGraphsCache = new LRUCache({
 });
 const isRunningLocalDev = isLocalDev();
 export async function getHtmlResources(view, viewParams, resourceContext) {
-    const { runtimeEnvironment, runtimeParams, moduleRegistry, moduleBundler, resourceRegistry, viewMetadata, viewLinkCacheKey, } = resourceContext;
+    const { runtimeEnvironment, runtimeParams, moduleRegistry, moduleBundler, resourceRegistry, viewMetadata, } = resourceContext;
     const { format, hmrEnabled, bundle, debug, minify } = runtimeEnvironment;
     const { customElements, serverData, serverDebug } = viewMetadata;
     const defRegistry = bundle ? moduleBundler : moduleRegistry;
@@ -136,7 +136,8 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
         // Traversal of the Bootstrap Module Graph is done to get all the URLS for discoverable static dependencies.
         // Reasoning: This is to avoid unnecessary HTTP 302's during initial application module fetching.
         let bootstrapModuleGraph;
-        const bootstrapModuleGraphCacheKey = getModuleGraphCacheKey(bootstrapSpecifier, viewLinkCacheKey);
+        // Just determine the cache key based on the inputs to the getModuleGraphs
+        const bootstrapModuleGraphCacheKey = getModuleGraphCacheKey(bootstrapSpecifier, runtimeEnvironment, runtimeParams);
         if (enableModuleGraphsCache && moduleGraphsCache.has(bootstrapModuleGraphCacheKey)) {
             bootstrapModuleGraph = moduleGraphsCache.get(bootstrapModuleGraphCacheKey);
         }
@@ -185,7 +186,7 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
                 // ADD static module dep uri addressability
                 imports[staticDep] = uri;
                 // ADD bootstrap module static deps to requiredAmdModules if services, otherwise preloadModules
-                if (services && services.length) {
+                if (services?.length) {
                     requiredAmdModules.push(staticDep);
                 }
             }
@@ -209,14 +210,18 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
     for (const { tagName: element, props } of flattenedElements) {
         const hydrateDirective = getHydrateDirective(props);
         const isSsrOnly = isSSR && !hydrateDirective;
-        const moduleGraphCacheKey = getModuleGraphCacheKey(element, viewLinkCacheKey);
+        const elementSpecifier = kebabCaseToModuleSpecifier(element);
+        const moduleGraphCacheKey = getModuleGraphCacheKey(elementSpecifier, runtimeEnvironment, {
+            ...runtimeParams,
+            ssr: isSsrOnly,
+        });
         let graph;
         if (enableModuleGraphsCache && moduleGraphsCache.has(moduleGraphCacheKey)) {
             graph = moduleGraphsCache.get(moduleGraphCacheKey);
         }
         else {
             // eslint-disable-next-line no-await-in-loop
-            graph = await getModuleGraphs(kebabCaseToModuleSpecifier(element), { includeUris: true, includeLinkedDefinitions: true, depth }, moduleRegistry, defRegistry, runtimeEnvironment, { ...runtimeParams, ssr: isSsrOnly }, visitedCache);
+            graph = await getModuleGraphs(elementSpecifier, { includeUris: true, includeLinkedDefinitions: true, depth }, moduleRegistry, defRegistry, runtimeEnvironment, { ...runtimeParams, ssr: isSsrOnly }, visitedCache);
             enableModuleGraphsCache && moduleGraphsCache.set(moduleGraphCacheKey, graph);
         }
         // add to the viewRecord

package/build/es/utils.d.ts

@@ -25,5 +25,5 @@ export declare function generateViewNonce(viewParams: ViewParams): void;
 export declare function addExternalScriptNonce(def: ResourceDefinition, nonce?: string): void;
 export declare function generateLinkHeaders(assets: RenderedAssetReference[], patterns: Record<string, any>[]): string;
 export declare function getViewDefCacheKey(view: View, runtimeEnvironment: RuntimeEnvironment, freezeAssets: boolean, runtimeParams?: RuntimeParams): string;
-export declare function getModuleGraphCacheKey(specifier: string, viewLinkCacheKey: string): string;
+export declare function getModuleGraphCacheKey(specifier: string, runtimeEnvironment: RuntimeEnvironment, runtimeParams: RuntimeParams): string;
 //# sourceMappingURL=utils.d.ts.map

package/build/es/utils.js

@@ -340,7 +340,17 @@ export function getViewDefCacheKey(view, runtimeEnvironment, freezeAssets, runti
         nonceEnabled: getFeatureFlags().ENABLE_NONCE,
     });
 }
-export function getModuleGraphCacheKey(specifier, viewLinkCacheKey) {
-    return specifier + viewLinkCacheKey;
+export function getModuleGraphCacheKey(specifier, runtimeEnvironment, runtimeParams) {
+    const updatedParams = {
+        ...runtimeParams,
+    };
+    // Remove the URL and query from the runtimeParams
+    delete updatedParams.url;
+    delete updatedParams.query;
+    return getCacheKeyFromJson({
+        specifier,
+        updatedParams,
+        runtimeEnvironment,
+    });
 }
 //# sourceMappingURL=utils.js.map

package/package.json

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