@lwrjs/view-registry 0.12.0-alpha.2 → 0.12.0-alpha.20

package/build/cjs/index.cjs

@@ -167,44 +167,53 @@ var LwrViewRegistry = class {
     return false;
   }
   async getViewDefinition(view, viewParams, runtimeEnvironment, runtimeParams, renderOptions) {
-    const {skipCaching, freezeAssets, viewParamCacheKey} = (0, import_utils.normalizeRenderOptions)(this.runtimeEnvironment, renderOptions);
-    const viewDefCacheKey = (0, import_shared_utils.getCacheKeyFromJson)({
-      ...view,
-      freezeAssets,
-      locale: runtimeParams?.locale,
-      basePath: runtimeParams?.basePath,
-      debug: runtimeEnvironment.debug
-    });
-    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)) {
-      const viewDefinition2 = this.viewDefinitions.get(viewDefCacheKey);
-      if (viewDefinition2 && viewDefinition2.paramKey === viewParamKey && viewDefinition2.viewDefinition.immutable) {
-        return viewDefinition2.viewDefinition;
+    try {
+      const {skipCaching, freezeAssets, viewParamCacheKey} = (0, import_utils.normalizeRenderOptions)(this.runtimeEnvironment, renderOptions);
+      const viewDefCacheKey = (0, import_shared_utils.getCacheKeyFromJson)({
+        ...view,
+        freezeAssets,
+        locale: runtimeParams?.locale,
+        basePath: runtimeParams?.basePath,
+        debug: runtimeEnvironment.debug
+      });
+      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)) {
+        const viewDefinition2 = this.viewDefinitions.get(viewDefCacheKey);
+        if (viewDefinition2 && viewDefinition2.paramKey === viewParamKey && viewDefinition2.viewDefinition.immutable) {
+          return viewDefinition2.viewDefinition;
+        }
       }
-    }
-    const pendingViewDefCacheKey = viewDefCacheKey + viewParamKey;
-    const viewDefinition = await this.pendingViewDefinitions.execute(pendingViewDefCacheKey, () => (0, import_instrumentation.getTracer)().trace({
-      name: import_instrumentation.ViewSpan.RenderView,
-      attributes: {
-        view: view.id,
-        ssr: view.bootstrap?.ssr === true
+      const pendingViewDefCacheKey = viewDefCacheKey + viewParamKey;
+      const viewDefinition = await this.pendingViewDefinitions.execute(pendingViewDefCacheKey, () => (0, import_instrumentation.getTracer)().trace({
+        name: import_instrumentation.ViewSpan.RenderView,
+        attributes: {
+          view: view.id,
+          ssr: view.bootstrap?.ssr === true
+        }
+      }, () => this.renderView(view, viewParams, runtimeEnvironment, runtimeParams, renderOptions)));
+      if (cacheDisabled === false) {
+        const route = this.globalConfig.routes.find((r) => r.id === view.id);
+        const ttl = (0, import_shared_utils.shortestTtl)(viewDefinition.cache?.ttl, route?.cache?.ttl);
+        if (ttl !== 0) {
+          this.viewDefinitions.set(viewDefCacheKey, {
+            view,
+            viewDefinition,
+            paramKey: viewParamKey
+          }, {ttl: ttl ? ttl * 1e3 : void 0});
+        }
       }
-    }, () => this.renderView(view, viewParams, runtimeEnvironment, runtimeParams, renderOptions)));
-    if (cacheDisabled === false) {
-      const route = this.globalConfig.routes.find((r) => r.id === view.id);
-      const ttl = (0, import_shared_utils.shortestTtl)(viewDefinition.cache?.ttl, route?.cache?.ttl);
-      if (ttl !== 0) {
-        this.viewDefinitions.set(viewDefCacheKey, {
-          view,
-          viewDefinition,
-          paramKey: viewParamKey
-        }, {ttl: ttl ? ttl * 1e3 : void 0});
+      return viewDefinition;
+    } catch (err) {
+      if (err instanceof import_diagnostics.DiagnosticsError) {
+        throw err;
       }
+      import_diagnostics.logger.error(`Failed to get view definition "${view.id}": ${err}`);
+      const message = err instanceof Error ? err.message : String(err);
+      throw (0, import_diagnostics.createSingleDiagnosticError)({description: import_diagnostics.descriptions.SERVER.UNEXPECTED_ERROR(message)}, import_diagnostics.LwrServerError);
     }
-    return viewDefinition;
   }
   async renderView(view, viewParams, runtimeEnvironment, runtimeParams = {}, renderOptions) {
     const {id, contentTemplate, rootComponent, layoutTemplate} = view;
@@ -254,7 +263,8 @@ var LwrViewRegistry = class {
           ...renderedContent.metadata.serverDebug,
           ...renderedLayout.metadata.serverDebug
         }
-      }
+      },
+      cache: renderedContent.cache
     }, {
       view: {...view, layoutTemplate: layoutTemplatePath},
       viewParams,
@@ -304,11 +314,12 @@ var LwrViewRegistry = class {
     const linkedMetadata = skipMetadataCollection ? renderedViewMetadata : await (0, import_shared_utils.extractMetadataFromHtml)(renderedViewContent, renderedViewMetadata, this.globalConfig);
     const mergedViewContext = {
       ...viewContext,
+      config: this.globalConfig,
       runtimeEnvironment,
       importer: importer || renderedView.compiledView.filePath
     };
     const stringBuilder = (0, import_shared_utils.createStringBuilder)(renderedViewContent);
-    let pageTtl;
+    let pageTtl = renderedView.cache.ttl;
     for (const viewTransformer of this.viewTransformers) {
       const linkResults = await viewTransformer.link?.(stringBuilder, mergedViewContext, linkedMetadata);
       const ttl = linkResults && linkResults.cache?.ttl;

package/build/cjs/linkers/legacy_view_bootstrap.cjs

@@ -46,11 +46,21 @@ async function getHtmlResources(view, viewParams, resourceContext) {
   const version = lwrVersion;
   const isAMD = format === "amd";
   const {bundleConfig} = resourceContext;
-  const {external = {}} = bundleConfig;
+  const {external = {}, exclude = []} = bundleConfig;
   const groups = isAMD ? bundleConfig.groups || {} : {};
-  const isExternal = function(rawSpecifier) {
+  const getPreloadUri = function(rawSpecifier, uriMap) {
     const {specifier} = (0, import_shared_utils.explodeSpecifier)(rawSpecifier);
-    return Object.keys(external).some((e) => specifier === e);
+    if (Object.keys(external).some((e) => specifier === e))
+      return;
+    const uri = uriMap[rawSpecifier];
+    if (!uri && (exclude.includes(specifier) || (0, import_shared_utils.isGroupie)(specifier, groups))) {
+      import_diagnostics.logger.warn({
+        label: "view-registry",
+        message: `Skipping preload of unknown static import: ${rawSpecifier}`
+      });
+      return;
+    }
+    return uri;
   };
   const {
     id: appName,
@@ -127,8 +137,8 @@ async function getHtmlResources(view, viewParams, resourceContext) {
     }
     moduleResources.push((0, import_utils.getModuleResourceByUri)(uri, runtimeEnvironment, {isPreload: false, isSSR}));
     for (const depSpecifier of bootstrapModuleGraph.graphs[0].static) {
-      if (!isExternal(depSpecifier)) {
-        const uri2 = bootstrapModuleGraph.uriMap[depSpecifier];
+      const uri2 = getPreloadUri(depSpecifier, bootstrapModuleGraph.uriMap);
+      if (uri2) {
         (0, import_preload_utils.setPreloadModulesMeta)(depSpecifier, uri2, groups, viewPreloads);
       }
     }
@@ -169,8 +179,8 @@ async function getHtmlResources(view, viewParams, resourceContext) {
       (0, import_preload_utils.setPreloadModulesMeta)(specifier, uri, groups, viewPreloads);
       if (bundle) {
         for (const depSpecifier of graph.graphs[0].static) {
-          if (!isExternal(depSpecifier)) {
-            const uri2 = graph.uriMap[depSpecifier];
+          const uri2 = getPreloadUri(depSpecifier, graph.uriMap);
+          if (uri2) {
             (0, import_preload_utils.setPreloadModulesMeta)(depSpecifier, uri2, groups, viewPreloads);
           }
         }

package/build/cjs/linkers/preload-utils.cjs

@@ -31,7 +31,9 @@ var import_diagnostics = __toModule(require("@lwrjs/diagnostics"));
 var import_shared_utils = __toModule(require("@lwrjs/shared-utils"));
 function setPreloadModulesMeta(specifier, uri, groups, preloads) {
   if (!uri) {
-    throw Error(`Invalid Preload Module ${specifier}`);
+    throw (0, import_diagnostics.createSingleDiagnosticError)({
+      description: import_diagnostics.descriptions.UNRESOLVABLE.PRELOAD_MODULE(specifier)
+    }, import_diagnostics.LwrUnresolvableError);
   }
   const [removedVersion, version] = specifier.split("/v/");
   const normalizedSpecifier = version === import_shared_utils.VERSION_NOT_PROVIDED ? removedVersion : specifier;

package/build/cjs/linkers/utils.cjs

@@ -45,8 +45,10 @@ function getViewBootstrapConfigurationResource(viewInfo, config, runtimeEnvironm
     },
     ...debug && {modifiers: {debug: "true"}}
   };
-  const environment = {
-    NODE_ENV: runtimeEnvironment.serverMode,
+  const nodeEnv = {
+    NODE_ENV: runtimeEnvironment.serverMode
+  };
+  const lwrEnv = {
     SSR: false,
     ...(0, import_shared_utils.buildEnvironmentContext)(runtimeParams)
   };
@@ -58,7 +60,8 @@ function getViewBootstrapConfigurationResource(viewInfo, config, runtimeEnvironm
       ...config,
       endpoints
     })});`,
-    `globalThis.process = { env: ${JSON.stringify(environment)} };`,
+    `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} };`,
     debug && debugMessage && `console.warn(${JSON.stringify(debugMessage)});`
   ].filter(Boolean).join("\n");

package/build/cjs/linkers/view_bootstrap.cjs

@@ -48,11 +48,21 @@ async function getHtmlResources(view, viewParams, resourceContext) {
   const isAMD = format === "amd";
   const depth = isAMD ? {static: import_shared_utils.GraphDepth.ALL, dynamic: 1} : {static: import_shared_utils.GraphDepth.NONE, dynamic: 1};
   const {bundleConfig} = resourceContext;
-  const {external = {}} = bundleConfig;
+  const {external = {}, exclude = []} = bundleConfig;
   const groups = isAMD ? bundleConfig.groups || {} : {};
-  const isExternal = function(rawSpecifier) {
+  const getPreloadUri = function(rawSpecifier, uriMap) {
     const {specifier} = (0, import_shared_utils.explodeSpecifier)(rawSpecifier);
-    return Object.keys(external).some((e) => specifier === e);
+    if (Object.keys(external).some((e) => specifier === e))
+      return;
+    const uri = uriMap[rawSpecifier];
+    if (!uri && (exclude.includes(specifier) || (0, import_shared_utils.isGroupie)(specifier, groups))) {
+      import_diagnostics.logger.warn({
+        label: "view-registry",
+        message: `Skipping preload of unknown static import: ${rawSpecifier}`
+      });
+      return;
+    }
+    return uri;
   };
   const {
     id: appName,
@@ -118,8 +128,8 @@ async function getHtmlResources(view, viewParams, resourceContext) {
     }
     moduleResources.push((0, import_utils.getModuleResourceByUri)(uri, runtimeEnvironment, {isPreload: false, isSSR}));
     for (const depSpecifier of bootstrapModuleGraph.graphs[0].static) {
-      if (!isExternal(depSpecifier)) {
-        const uri2 = bootstrapModuleGraph.uriMap[depSpecifier];
+      const uri2 = getPreloadUri(depSpecifier, bootstrapModuleGraph.uriMap);
+      if (uri2) {
         (0, import_preload_utils.setPreloadModulesMeta)(depSpecifier, uri2, groups, viewPreloads);
       }
     }
@@ -161,8 +171,8 @@ async function getHtmlResources(view, viewParams, resourceContext) {
       (0, import_preload_utils.setPreloadModulesMeta)(specifier, uri, groups, viewPreloads);
       if (bundle) {
         for (const depSpecifier of graph.graphs[0].static) {
-          if (!isExternal(depSpecifier)) {
-            const uri2 = graph.uriMap[depSpecifier];
+          const uri2 = getPreloadUri(depSpecifier, graph.uriMap);
+          if (uri2) {
             (0, import_preload_utils.setPreloadModulesMeta)(depSpecifier, uri2, groups, viewPreloads);
           }
         }

package/build/cjs/utils.cjs

@@ -87,7 +87,8 @@ async function generateHtmlTag(definition) {
 function normalizeRenderedResult({
   renderedView,
   metadata,
-  options
+  options,
+  cache
 }) {
   return {
     renderedView,
@@ -99,7 +100,8 @@ function normalizeRenderedResult({
     },
     options: {
       skipMetadataCollection: options ? options.skipMetadataCollection : false
-    }
+    },
+    cache: cache || {}
   };
 }
 function reduceSourceAssetReferences(assets) {

package/build/cjs/view-handler.cjs

@@ -30,6 +30,7 @@ var import_path = __toModule(require("path"));
 var import_shared_utils = __toModule(require("@lwrjs/shared-utils"));
 var import_instrumentation = __toModule(require("@lwrjs/instrumentation"));
 var import_utils = __toModule(require("./utils.cjs"));
+var import_diagnostics = __toModule(require("@lwrjs/diagnostics"));
 var LwrViewHandler = class {
   constructor(context, globalConfig) {
     this.globalConfig = globalConfig;
@@ -128,6 +129,7 @@ var LwrViewHandler = class {
     const {rootDir, assets, contentDir, layoutsDir} = this.globalConfig;
     const paths = {rootDir, assets, contentDir, layoutsDir};
     const locale = runtimeParams.locale;
+    const basePath = runtimeParams.basePath;
     const viewApi = this.getBoundApi(viewRequest, route, runtimeEnvironment, runtimeParams);
     const response = await (0, import_instrumentation.getTracer)().trace({
       name: import_instrumentation.ViewSpan.ExecuteRouteHandler,
@@ -135,7 +137,17 @@ var LwrViewHandler = class {
         view: route.id,
         route: viewRequest.requestPath
       }
-    }, async () => routeHandlerFn({...viewRequest, locale}, {route, viewApi, ...paths}, routeHandlerOptions));
+    }, async () => {
+      try {
+        return await routeHandlerFn({...viewRequest, locale, basePath}, {route, viewApi, ...paths}, routeHandlerOptions);
+      } catch (err) {
+        if (err instanceof import_diagnostics.DiagnosticsError) {
+          throw err;
+        }
+        const message = err instanceof Error ? err.message : String(err);
+        throw (0, import_diagnostics.createSingleDiagnosticError)({description: import_diagnostics.descriptions.APPLICATION.ROUTE_HANDLER_ERROR(route.id, message)}, import_diagnostics.LwrApplicationError);
+      }
+    });
     return response;
   }
   getBoundApi(viewRequest, route, runtimeEnvironment, runtimeParams) {

package/build/es/index.js

@@ -3,7 +3,7 @@ import { getTracer, ViewSpan } from '@lwrjs/instrumentation';
 import { normalizeRenderOptions, normalizeRenderedResult, reduceSourceAssetReferences } from './utils.js';
 import { linkLwrResources } from './linkers/link-lwr-resources.js';
 import { LRUCache } from 'lru-cache';
-import { logger } from '@lwrjs/diagnostics';
+import { DiagnosticsError, LwrServerError, createSingleDiagnosticError, descriptions, logger, } from '@lwrjs/diagnostics';
 export { LwrViewHandler } from './view-handler.js';
 export class LwrViewRegistry {
     constructor(context, globalConfig) {
@@ -159,55 +159,65 @@ export class LwrViewRegistry {
         return false;
     }
     async getViewDefinition(view, viewParams, runtimeEnvironment, runtimeParams, renderOptions) {
-        const { skipCaching, freezeAssets, viewParamCacheKey } = normalizeRenderOptions(this.runtimeEnvironment, renderOptions);
-        const viewDefCacheKey = getCacheKeyFromJson({
-            ...view,
-            freezeAssets,
-            locale: runtimeParams?.locale,
-            basePath: runtimeParams?.basePath,
-            debug: runtimeEnvironment.debug,
-        });
-        logger.debug(`[view-registry][getViewDefinition] viewDefCacheKey=${viewDefCacheKey}`);
-        // viewParams is an unbounded object and can be very large (17MB/view for developer.salesforce.com). Allowing consumers
-        // to provide a simple override avoids the excess memory / performance overhead of serializing & storing the viewParams
-        // on every request, while still reusing our caching logic.
-        const viewParamKey = viewParamCacheKey
-            ? 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)) {
-            const viewDefinition = this.viewDefinitions.get(viewDefCacheKey);
-            if (viewDefinition &&
-                viewDefinition.paramKey === viewParamKey &&
-                viewDefinition.viewDefinition.immutable) {
-                return viewDefinition.viewDefinition;
+        try {
+            const { skipCaching, freezeAssets, viewParamCacheKey } = normalizeRenderOptions(this.runtimeEnvironment, renderOptions);
+            const viewDefCacheKey = getCacheKeyFromJson({
+                ...view,
+                freezeAssets,
+                locale: runtimeParams?.locale,
+                basePath: runtimeParams?.basePath,
+                debug: runtimeEnvironment.debug,
+            });
+            logger.debug(`[view-registry][getViewDefinition] viewDefCacheKey=${viewDefCacheKey}`);
+            // viewParams is an unbounded object and can be very large (17MB/view for developer.salesforce.com). Allowing consumers
+            // to provide a simple override avoids the excess memory / performance overhead of serializing & storing the viewParams
+            // on every request, while still reusing our caching logic.
+            const viewParamKey = viewParamCacheKey
+                ? 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)) {
+                const viewDefinition = this.viewDefinitions.get(viewDefCacheKey);
+                if (viewDefinition &&
+                    viewDefinition.paramKey === viewParamKey &&
+                    viewDefinition.viewDefinition.immutable) {
+                    return viewDefinition.viewDefinition;
+                }
             }
+            const pendingViewDefCacheKey = viewDefCacheKey + viewParamKey;
+            const viewDefinition = await this.pendingViewDefinitions.execute(pendingViewDefCacheKey, () => getTracer().trace({
+                name: ViewSpan.RenderView,
+                attributes: {
+                    view: view.id,
+                    ssr: view.bootstrap?.ssr === true,
+                },
+            }, () => this.renderView(view, viewParams, runtimeEnvironment, runtimeParams, renderOptions)));
+            if (cacheDisabled === false) {
+                const route = this.globalConfig.routes.find((r) => r.id === view.id);
+                const ttl = shortestTtl(viewDefinition.cache?.ttl, route?.cache?.ttl);
+                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 });
+                }
+            }
+            return viewDefinition;
         }
-        const pendingViewDefCacheKey = viewDefCacheKey + viewParamKey;
-        const viewDefinition = await this.pendingViewDefinitions.execute(pendingViewDefCacheKey, () => getTracer().trace({
-            name: ViewSpan.RenderView,
-            attributes: {
-                view: view.id,
-                ssr: view.bootstrap?.ssr === true,
-            },
-        }, () => this.renderView(view, viewParams, runtimeEnvironment, runtimeParams, renderOptions)));
-        if (cacheDisabled === false) {
-            const route = this.globalConfig.routes.find((r) => r.id === view.id);
-            const ttl = shortestTtl(viewDefinition.cache?.ttl, route?.cache?.ttl);
-            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 });
+        catch (err) {
+            if (err instanceof DiagnosticsError) {
+                throw err;
             }
+            logger.error(`Failed to get view definition "${view.id}": ${err}`);
+            const message = err instanceof Error ? err.message : String(err);
+            throw createSingleDiagnosticError({ description: descriptions.SERVER.UNEXPECTED_ERROR(message) }, LwrServerError);
         }
-        return viewDefinition;
     }
     async renderView(view, viewParams, runtimeEnvironment, runtimeParams = {}, renderOptions) {
         const { id, contentTemplate, rootComponent, layoutTemplate } = view;
@@ -264,6 +274,7 @@ export class LwrViewRegistry {
                     ...renderedLayout.metadata.serverDebug,
                 },
             },
+            cache: renderedContent.cache,
         }, 
         // Render Content now contains a layout
         {
@@ -318,11 +329,12 @@ export class LwrViewRegistry {
             : await extractMetadataFromHtml(renderedViewContent, renderedViewMetadata, this.globalConfig);
         const mergedViewContext = {
             ...viewContext,
+            config: this.globalConfig,
             runtimeEnvironment,
             importer: importer || renderedView.compiledView.filePath,
         };
         const stringBuilder = createStringBuilder(renderedViewContent);
-        let pageTtl;
+        let pageTtl = renderedView.cache.ttl;
         for (const viewTransformer of this.viewTransformers) {
             // eslint-disable-next-line no-await-in-loop
             const linkResults = await viewTransformer.link?.(stringBuilder, mergedViewContext, linkedMetadata);

package/build/es/linkers/legacy_view_bootstrap.js

@@ -1,5 +1,5 @@
 import { logger } from '@lwrjs/diagnostics';
-import { kebabCaseToModuleSpecifier, getModuleGraphs, GraphDepth, getModuleUriPrefix, explodeSpecifier, isBundler, getHydrateDirective, } from '@lwrjs/shared-utils';
+import { kebabCaseToModuleSpecifier, getModuleGraphs, GraphDepth, getModuleUriPrefix, explodeSpecifier, isBundler, getHydrateDirective, isGroupie, } from '@lwrjs/shared-utils';
 import { AppResourceEnum, getAppSpecifier } from '@lwrjs/app-service/identity';
 import { generateHtmlTag, getModuleResourceByUri } from '../utils.js';
 import { flattenCustomElements, getViewBootstrapConfigurationResource, getViewHmrConfigurationResource, } from './utils.js';
@@ -11,12 +11,26 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
     const version = lwrVersion;
     const isAMD = format === 'amd';
     const { bundleConfig } = resourceContext;
-    const { external = {} } = bundleConfig;
+    const { external = {}, exclude = [] } = bundleConfig;
     // Bundling groups is only supported in AMD for now
     const groups = isAMD ? bundleConfig.groups || {} : {};
-    const isExternal = function (rawSpecifier) {
+    const getPreloadUri = function (rawSpecifier, uriMap) {
         const { specifier } = explodeSpecifier(rawSpecifier);
-        return Object.keys(external).some((e) => specifier === e);
+        // do not preload externals; this is the app's responsibility
+        if (Object.keys(external).some((e) => specifier === e))
+            return;
+        const uri = uriMap[rawSpecifier];
+        // if there is no uri for an exclude or groupie, they've been handled via another specifier
+        // eg: if a bundle group has already been added to the URI map, its groups will not also be added
+        if (!uri && (exclude.includes(specifier) || isGroupie(specifier, groups))) {
+            // warn instead of throwing from setPreloadModulesMeta()
+            logger.warn({
+                label: 'view-registry',
+                message: `Skipping preload of unknown static import: ${rawSpecifier}`,
+            });
+            return;
+        }
+        return uri;
     };
     const { id: appName, bootstrap: { services, module: bootstrapModule, preloadModules = [] } = {
         services: [],
@@ -130,8 +144,8 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
         moduleResources.push(getModuleResourceByUri(uri, runtimeEnvironment, { isPreload: false, isSSR }));
         // PRELOAD the bootstrap module static dependencies as preloaded script resources
         for (const depSpecifier of bootstrapModuleGraph.graphs[0].static) {
-            if (!isExternal(depSpecifier)) {
-                const uri = bootstrapModuleGraph.uriMap[depSpecifier];
+            const uri = getPreloadUri(depSpecifier, bootstrapModuleGraph.uriMap);
+            if (uri) {
                 setPreloadModulesMeta(depSpecifier, uri, groups, viewPreloads);
             }
         }
@@ -186,8 +200,8 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
             // PRELOAD custom element static deps as link resources when bundling is ON
             if (bundle) {
                 for (const depSpecifier of graph.graphs[0].static) {
-                    if (!isExternal(depSpecifier)) {
-                        const uri = graph.uriMap[depSpecifier];
+                    const uri = getPreloadUri(depSpecifier, graph.uriMap);
+                    if (uri) {
                         setPreloadModulesMeta(depSpecifier, uri, groups, viewPreloads);
                     }
                 }

package/build/es/linkers/preload-utils.js

@@ -1,4 +1,4 @@
-import { logger } from '@lwrjs/diagnostics';
+import { LwrUnresolvableError, createSingleDiagnosticError, descriptions, logger } from '@lwrjs/diagnostics';
 import { explodeSpecifier, getGroupName, getVersionedModuleId, normalizeVersionToUri, VERSION_NOT_PROVIDED, getSpecifier, isGroupie, } from '@lwrjs/shared-utils';
 /**
  * keeps track of preloadModules metadata
@@ -6,7 +6,9 @@ import { explodeSpecifier, getGroupName, getVersionedModuleId, normalizeVersionT
 export function setPreloadModulesMeta(specifier, uri, groups, preloads) {
     // Throw a very specific error if we get this back and the uri property is not set
     if (!uri) {
-        throw Error(`Invalid Preload Module ${specifier}`);
+        throw createSingleDiagnosticError({
+            description: descriptions.UNRESOLVABLE.PRELOAD_MODULE(specifier),
+        }, LwrUnresolvableError);
     }
     // We need to support version-less preloadModules, including version-less rootComponents.
     // Removing the "/v/version_not_provided" hack from the preloadModules specifier

package/build/es/linkers/utils.js

@@ -17,9 +17,11 @@ export function getViewBootstrapConfigurationResource(viewInfo, config, runtimeE
         },
         ...(debug && { modifiers: { debug: 'true' } }),
     };
-    const environment = {
+    const nodeEnv = {
         // TODO: W-12639529 change NODE_ENV after addressing downstream customers
         NODE_ENV: runtimeEnvironment.serverMode,
+    };
+    const lwrEnv = {
         // Note: SSR is always false because this script is executed on the client
         SSR: false,
         // Used by `lwr/environment`
@@ -33,7 +35,8 @@ export function getViewBootstrapConfigurationResource(viewInfo, config, runtimeE
             ...config,
             endpoints,
         })});`,
-        `globalThis.process = { env: ${JSON.stringify(environment)} };`,
+        `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} };`,
         debug && debugMessage && `console.warn(${JSON.stringify(debugMessage)});`,
     ]

package/build/es/linkers/view_bootstrap.js

@@ -1,5 +1,5 @@
 import { logger } from '@lwrjs/diagnostics';
-import { kebabCaseToModuleSpecifier, toImportMetadata, getModuleGraphs, getMappingUriPrefix, GraphDepth, explodeSpecifier, isBundler, getHydrateDirective, } from '@lwrjs/shared-utils';
+import { kebabCaseToModuleSpecifier, toImportMetadata, getModuleGraphs, getMappingUriPrefix, GraphDepth, explodeSpecifier, isBundler, getHydrateDirective, isGroupie, } from '@lwrjs/shared-utils';
 import { AppResourceEnum, getAppSpecifier } from '@lwrjs/app-service/identity';
 import { generateHtmlTag, getModuleResourceByUri } from '../utils.js';
 import { flattenCustomElements, getViewBootstrapConfigurationResource, getViewHmrConfigurationResource, } from './utils.js';
@@ -15,12 +15,23 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
         ? { static: GraphDepth.ALL, dynamic: 1 }
         : { static: GraphDepth.NONE, dynamic: 1 };
     const { bundleConfig } = resourceContext;
-    const { external = {} } = bundleConfig;
+    const { external = {}, exclude = [] } = bundleConfig;
     // Bundling groups is only supported in AMD for now
     const groups = isAMD ? bundleConfig.groups || {} : {};
-    const isExternal = function (rawSpecifier) {
+    const getPreloadUri = function (rawSpecifier, uriMap) {
         const { specifier } = explodeSpecifier(rawSpecifier);
-        return Object.keys(external).some((e) => specifier === e);
+        if (Object.keys(external).some((e) => specifier === e))
+            return;
+        const uri = uriMap[rawSpecifier];
+        if (!uri && (exclude.includes(specifier) || isGroupie(specifier, groups))) {
+            // warn instead of throwing from setPreloadModulesMeta()
+            logger.warn({
+                label: 'view-registry',
+                message: `Skipping preload of unknown static import: ${rawSpecifier}`,
+            });
+            return;
+        }
+        return uri;
     };
     const { id: appName, bootstrap: { services, module: bootstrapModule, preloadModules = [] } = {
         services: [],
@@ -114,8 +125,8 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
         moduleResources.push(getModuleResourceByUri(uri, runtimeEnvironment, { isPreload: false, isSSR }));
         // PRELOAD the bootstrap module static dependencies as preloaded script resources
         for (const depSpecifier of bootstrapModuleGraph.graphs[0].static) {
-            if (!isExternal(depSpecifier)) {
-                const uri = bootstrapModuleGraph.uriMap[depSpecifier];
+            const uri = getPreloadUri(depSpecifier, bootstrapModuleGraph.uriMap);
+            if (uri) {
                 setPreloadModulesMeta(depSpecifier, uri, groups, viewPreloads);
             }
         }
@@ -172,8 +183,8 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
             // PRELOAD custom element static deps as link resources when bundling is ON
             if (bundle) {
                 for (const depSpecifier of graph.graphs[0].static) {
-                    if (!isExternal(depSpecifier)) {
-                        const uri = graph.uriMap[depSpecifier];
+                    const uri = getPreloadUri(depSpecifier, graph.uriMap);
+                    if (uri) {
                         setPreloadModulesMeta(depSpecifier, uri, groups, viewPreloads);
                     }
                 }

package/build/es/utils.d.ts

@@ -1,7 +1,7 @@
 import type { AssetReference, JsonCompatible, LinkedViewDefinition, LwrErrorRoute, LwrRoute, ModuleBundler, ModuleId, ModuleJson, ModuleRegistry, NormalizedRenderingResult, PublicModuleRegistry, RenderOptions, RenderedAssetReference, RenderingResult, ResourceDefinition, RouteHandlerViewResponse, RuntimeEnvironment, RuntimeParams, ViewModuleResourceContext, ViewPageContext, ViewRequest, ViewResponse } from '@lwrjs/types';
 export type HTMLResource = Partial<ResourceDefinition>;
 export declare function generateHtmlTag(definition: HTMLResource): Promise<string>;
-export declare function normalizeRenderedResult({ renderedView, metadata, options, }: RenderingResult): NormalizedRenderingResult;
+export declare function normalizeRenderedResult({ renderedView, metadata, options, cache, }: RenderingResult): NormalizedRenderingResult;
 export declare function reduceSourceAssetReferences(assets: AssetReference[]): RenderedAssetReference[];
 export declare function normalizeRenderOptions(runtimeEnvironment: RuntimeEnvironment, overrideRenderOptions?: RenderOptions, baseRenderOptions?: RenderOptions): Required<RenderOptions>;
 export declare function generatePageContext({ requestPath: url }: ViewRequest, { id, contentTemplate, properties }: LwrRoute | LwrErrorRoute, runtimeParams: RuntimeParams): JsonCompatible<ViewPageContext>;

package/build/es/utils.js

@@ -52,7 +52,7 @@ export async function generateHtmlTag(definition) {
     }
     throw new Error(`Invalid external Resource Definition: missing a "src": "${definition.specifier}"`);
 }
-export function normalizeRenderedResult({ renderedView, metadata, options, }) {
+export function normalizeRenderedResult({ renderedView, metadata, options, cache, }) {
     return {
         renderedView,
         metadata: {
@@ -64,6 +64,7 @@ export function normalizeRenderedResult({ renderedView, metadata, options, }) {
         options: {
             skipMetadataCollection: options ? options.skipMetadataCollection : false,
         },
+        cache: cache || {},
     };
 }
 export function reduceSourceAssetReferences(assets) {

package/build/es/view-handler.js

@@ -2,6 +2,7 @@ import { resolve } from 'path';
 import { normalizeResourcePath, shortestTtl } from '@lwrjs/shared-utils';
 import { getTracer, ViewSpan } from '@lwrjs/instrumentation';
 import { generateHtmlTag, generatePageContext, isViewResponse, toJsonFormat } from './utils.js';
+import { DiagnosticsError, LwrApplicationError, createSingleDiagnosticError, descriptions, } from '@lwrjs/diagnostics';
 export class LwrViewHandler {
     constructor(context, globalConfig) {
         this.globalConfig = globalConfig;
@@ -144,15 +145,26 @@ export class LwrViewHandler {
         const { rootDir, assets, contentDir, layoutsDir } = this.globalConfig;
         const paths = { rootDir, assets, contentDir, layoutsDir };
         const locale = runtimeParams.locale;
+        const basePath = runtimeParams.basePath;
         const viewApi = this.getBoundApi(viewRequest, route, runtimeEnvironment, runtimeParams);
-        // TODO: add trace attributes
         const response = await getTracer().trace({
             name: ViewSpan.ExecuteRouteHandler,
             attributes: {
                 view: route.id,
                 route: viewRequest.requestPath,
             },
-        }, async () => routeHandlerFn({ ...viewRequest, locale }, { route: route, viewApi, ...paths }, routeHandlerOptions));
+        }, async () => {
+            try {
+                return await routeHandlerFn({ ...viewRequest, locale, basePath }, { route: route, viewApi, ...paths }, routeHandlerOptions);
+            }
+            catch (err) {
+                if (err instanceof DiagnosticsError) {
+                    throw err;
+                }
+                const message = err instanceof Error ? err.message : String(err);
+                throw createSingleDiagnosticError({ description: descriptions.APPLICATION.ROUTE_HANDLER_ERROR(route.id, message) }, LwrApplicationError);
+            }
+        });
         return response;
     }
     /*

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.12.0-alpha.2",
+    "version": "0.12.0-alpha.20",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -30,17 +30,17 @@
         "build/**/*.d.ts"
     ],
     "dependencies": {
-        "@lwrjs/app-service": "0.12.0-alpha.2",
-        "@lwrjs/diagnostics": "0.12.0-alpha.2",
-        "@lwrjs/instrumentation": "0.12.0-alpha.2",
-        "@lwrjs/shared-utils": "0.12.0-alpha.2",
-        "lru-cache": "^10.0.0"
+        "@lwrjs/app-service": "0.12.0-alpha.20",
+        "@lwrjs/diagnostics": "0.12.0-alpha.20",
+        "@lwrjs/instrumentation": "0.12.0-alpha.20",
+        "@lwrjs/shared-utils": "0.12.0-alpha.20",
+        "lru-cache": "^10.2.0"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.12.0-alpha.2"
+        "@lwrjs/types": "0.12.0-alpha.20"
     },
     "engines": {
         "node": ">=18.0.0"
     },
-    "gitHead": "586a2aa659882483af9249dc3db7fe07bc842a25"
+    "gitHead": "ae1793e34eaf4e9b97996d7aea9031908b23a13a"
 }