@lwrjs/view-registry 0.9.0-alpha.2 → 0.9.0-alpha.21

package/build/cjs/index.cjs

@@ -278,8 +278,11 @@ var LwrViewRegistry = class {
       importer: importer || renderedView.compiledView.filePath
     };
     const stringBuilder = (0, import_shared_utils.createStringBuilder)(renderedViewContent);
+    let pageTtl;
     for (const viewTransformer of this.viewTransformers) {
-      await viewTransformer.link?.(stringBuilder, mergedViewContext, linkedMetadata);
+      const linkResults = await viewTransformer.link?.(stringBuilder, mergedViewContext, linkedMetadata);
+      const ttl = linkResults && linkResults.cache?.ttl;
+      pageTtl = (0, import_shared_utils.shortestTtl)(ttl || void 0, pageTtl);
     }
     const linkedAssetContent = stringBuilder.toString();
     if (linkedAssetContent.includes(lwrResourcesId)) {
@@ -298,7 +301,8 @@ var LwrViewRegistry = class {
         viewRecord: {
           assetReferences: (0, import_utils.reduceSourceAssetReferences)(linkedMetadata.assetReferences),
           ...viewRecord
-        }
+        },
+        cache: {ttl: pageTtl}
       };
     }
     return {
@@ -306,7 +310,8 @@ var LwrViewRegistry = class {
       immutable,
       viewRecord: {
         assetReferences: (0, import_utils.reduceSourceAssetReferences)(linkedMetadata.assetReferences)
-      }
+      },
+      cache: {ttl: pageTtl}
     };
   }
 };

package/build/cjs/linkers/legacy_view_bootstrap.cjs

@@ -65,9 +65,6 @@ async function getHtmlResources(view, viewParams, resourceContext) {
     if (!def) {
       throw Error("Failed to find definition of resource: " + shimBundle);
     }
-    if (def.stream) {
-      def.stream.destroy();
-    }
     requiredResources.push(def);
     const errorShimDef = await resourceRegistry.getResource({specifier: "lwr-error-shim.js", version}, runtimeEnvironment, runtimeParams);
     if (!errorShimDef) {

package/build/cjs/linkers/view_bootstrap.cjs

@@ -42,6 +42,7 @@ async function getHtmlResources(view, viewParams, resourceContext) {
   const {id: appName, bootstrap: {services} = {services: []}} = view;
   const {lwrVersion, format, hmrEnabled, bundle, debug, minify} = runtimeEnvironment;
   const {customElements} = viewMetadata;
+  const defRegistry = bundle ? moduleBundler : moduleRegistry;
   const version = lwrVersion;
   const isAMD = format === "amd";
   const appIdentity = {
@@ -65,9 +66,6 @@ async function getHtmlResources(view, viewParams, resourceContext) {
     if (!def) {
       throw Error("Failed to find definition of resource: " + shimBundle);
     }
-    if (def.stream) {
-      def.stream.destroy();
-    }
     requiredResources.push(def);
     const errorShimDef = await resourceRegistry.getResource({specifier: "lwr-error-shim.js", version}, runtimeEnvironment, runtimeParams);
     if (!errorShimDef) {
@@ -84,7 +82,7 @@ async function getHtmlResources(view, viewParams, resourceContext) {
     }
   }
   const depth = isAMD ? {static: import_shared_utils.GraphDepth.ALL, dynamic: 1} : {static: import_shared_utils.GraphDepth.NONE, dynamic: 1};
-  const bootstrapModuleGraph = await (0, import_shared_utils.getModuleGraphs)(bootstrapSpecifier, {includeUris: true, includeLinkedDefinitions: true, depth}, moduleRegistry, bundle ? moduleBundler : moduleRegistry, runtimeEnvironment, runtimeParams, visitedCache);
+  const bootstrapModuleGraph = await (0, import_shared_utils.getModuleGraphs)(bootstrapSpecifier, {includeUris: true, includeLinkedDefinitions: true, depth}, moduleRegistry, defRegistry, runtimeEnvironment, runtimeParams, visitedCache);
   const versionedSpecifier = bootstrapModuleGraph.graphs[0].specifier;
   const uri = bootstrapModuleGraph.uriMap[versionedSpecifier];
   moduleResources.push((0, import_utils.getModuleResourceByUri)(uri, runtimeEnvironment, {isPreload: false, isSSR}));
@@ -111,8 +109,8 @@ async function getHtmlResources(view, viewParams, resourceContext) {
   let importMetadata = await (0, import_shared_utils.toImportMetadata)(bootstrapModuleGraph, {imports: {}, index: {}}, moduleRegistry, runtimeEnvironment, runtimeParams);
   const customElementsRecords = [];
   const flattenedElements = (0, import_utils2.flattenCustomElements)(customElements, isSSR);
-  await Promise.all(flattenedElements.map(async ({tagName: element, props}) => {
-    const graph = await (0, import_shared_utils.getModuleGraphs)((0, import_shared_utils.kebabCaseToModuleSpecifer)(element), {includeUris: true, includeLinkedDefinitions: true, depth}, moduleRegistry, bundle ? moduleBundler : moduleRegistry, runtimeEnvironment, runtimeParams ? runtimeParams : {}, visitedCache);
+  for (const {tagName: element} of flattenedElements) {
+    const graph = await (0, import_shared_utils.getModuleGraphs)((0, import_shared_utils.kebabCaseToModuleSpecifer)(element), {includeUris: true, includeLinkedDefinitions: true, depth}, moduleRegistry, defRegistry, runtimeEnvironment, runtimeParams ? runtimeParams : {}, visitedCache);
     customElementsRecords.push({elementName: element, flatGraph: graph});
     const specifier = graph.graphs[0].specifier;
     const uri2 = graph.uriMap[specifier];
@@ -131,7 +129,7 @@ async function getHtmlResources(view, viewParams, resourceContext) {
       }
     }
     importMetadata = await (0, import_shared_utils.toImportMetadata)(graph, importMetadata, moduleRegistry, runtimeEnvironment, runtimeParams);
-  }));
+  }
   configResources.unshift(await (0, import_utils2.getViewBootstrapConfigurationResource)({
     id: view.id,
     url: viewParams?.page?.url,

package/build/cjs/utils.cjs

@@ -29,19 +29,15 @@ __export(exports, {
   generatePageContext: () => generatePageContext,
   getModuleResource: () => getModuleResource,
   getModuleResourceByUri: () => getModuleResourceByUri,
-  getRouteHandler: () => getRouteHandler,
   isViewResponse: () => isViewResponse,
   normalizeRenderOptions: () => normalizeRenderOptions,
   normalizeRenderedResult: () => normalizeRenderedResult,
   reduceSourceAssetReferences: () => reduceSourceAssetReferences,
   toJsonFormat: () => toJsonFormat
 });
-var import_shared_utils = __toModule(require("@lwrjs/shared-utils"));
 var import_path = __toModule(require("path"));
-var import_path2 = __toModule(require("path"));
-var import_shared_utils2 = __toModule(require("@lwrjs/shared-utils"));
+var import_shared_utils = __toModule(require("@lwrjs/shared-utils"));
 var import_identity = __toModule(require("@lwrjs/app-service/identity"));
-var import_shared_utils3 = __toModule(require("@lwrjs/shared-utils"));
 function streamToString(stream) {
   const chunks = [];
   return new Promise((resolve, reject) => {
@@ -85,7 +81,7 @@ async function generateInlineTag({specifier, type, content, stream, nonce}) {
   if (!content && !stream) {
     throw new Error(`Invalid inline Resource Definition: must have either "content" or "stream": "${specifier}"`);
   }
-  const code = content ? content : await streamToString(stream);
+  const code = stream ? await streamToString(stream()) : content;
   return `<${tag}${typeStr}${nonceStr}>${code}</${tag}>`;
 }
 async function generateHtmlTag(definition) {
@@ -132,7 +128,7 @@ function normalizeRenderOptions(runtimeEnvironment, overrideRenderOptions, baseR
   };
 }
 function getTitleFromFilePath(filePath) {
-  return filePath ? (0, import_path2.basename)(filePath, (0, import_path2.extname)(filePath)) : import_shared_utils.DEFAULT_TITLE;
+  return filePath ? (0, import_path.basename)(filePath, (0, import_path.extname)(filePath)) : import_shared_utils.DEFAULT_TITLE;
 }
 function generatePageContext({requestPath: url}, {id, contentTemplate, properties}) {
   const title = properties?.title || getTitleFromFilePath(contentTemplate);
@@ -141,19 +137,6 @@ function generatePageContext({requestPath: url}, {id, contentTemplate, propertie
 function isViewResponse(response) {
   return response.body !== void 0;
 }
-async function getRouteHandler(path, {cacheDir, rootDir}) {
-  try {
-    const fullPath = (0, import_shared_utils.resolveFileExtension)(path);
-    if (fullPath.endsWith(".ts")) {
-      path = await (0, import_shared_utils.transpileTs)(path, {rootDir, cacheDir: import_path.default.join(cacheDir, "routeHandlers")});
-    }
-    const moduleEntry = await Promise.resolve().then(() => __toModule(require(path)));
-    return moduleEntry.default || moduleEntry;
-  } catch (err) {
-    console.log(err);
-    throw new Error(`Unable to get routeHandler: ${path}`);
-  }
-}
 async function toJsonFormat(viewRequest, viewDefinition, route, runtimeEnvironment, runtimeParams, moduleRegistry) {
   const {viewRecord} = viewDefinition;
   const {bootstrap, id: appName} = route;
@@ -186,7 +169,7 @@ async function toJsonFormat(viewRequest, viewDefinition, route, runtimeEnvironme
     });
     resources.push({
       type: "application/javascript",
-      src: (0, import_shared_utils3.getClientBootstrapConfigurationUri)({url: viewRequest.url, id: route.id}, runtimeEnvironment, runtimeParams)
+      src: (0, import_shared_utils.getClientBootstrapConfigurationUri)({url: viewRequest.url, id: route.id}, runtimeEnvironment, runtimeParams)
     });
   }
   const mappingUrl = (0, import_shared_utils.getMappingUriPrefix)(runtimeEnvironment, runtimeParams);
@@ -206,7 +189,7 @@ async function toJsonFormat(viewRequest, viewDefinition, route, runtimeEnvironme
   });
   viewRecord.assetReferences?.forEach((asset) => {
     if (asset.override?.uri) {
-      const type = (0, import_shared_utils2.mimeLookup)(asset.override?.uri);
+      const type = (0, import_shared_utils.mimeLookup)(asset.override?.uri);
       resources.push({type, src: asset.override?.uri});
     }
   });
@@ -229,10 +212,10 @@ async function toJsonFormat(viewRequest, viewDefinition, route, runtimeEnvironme
     }
   };
 }
-async function getModuleResource(moduleId, runtimeEnvironment, moduleResouceMeta, moduleRegistry, runtimeParams) {
+async function getModuleResource(moduleId, runtimeEnvironment, moduleResouceMeta, defRegistry, runtimeParams) {
   const {format} = runtimeEnvironment;
   const {isSSR = false, isPreload = false} = moduleResouceMeta;
-  const moduleUri = await moduleRegistry.resolveModuleUri(moduleId, runtimeEnvironment, runtimeParams);
+  const moduleUri = await defRegistry.resolveModuleUri(moduleId, runtimeEnvironment, runtimeParams);
   return {
     src: moduleUri,
     type: format === "amd" ? "application/javascript" : "module",

package/build/cjs/view-handler.cjs

@@ -31,15 +31,13 @@ var import_utils = __toModule(require("./utils.cjs"));
 var import_path = __toModule(require("path"));
 var LwrViewHandler = class {
   constructor(context, globalConfig) {
-    this.inflightRouteHandlerEvalMap = new Map();
-    this.routeHandlerFunctionMap = new Map();
-    this.viewRegistry = context.viewRegistry;
     this.globalConfig = globalConfig;
+    this.routeHandlers = context.routeHandlers;
+    this.viewRegistry = context.viewRegistry;
     this.moduleRegistry = context.moduleRegistry;
   }
   async getViewContent(viewRequest, route, runtimeEnvironment, runtimeParams = {}) {
-    const {routeHandler} = route;
-    if (routeHandler) {
+    if (route.routeHandler) {
       const response = await this.getRouteHandlerResponse(viewRequest, route, runtimeEnvironment, runtimeParams);
       if ((0, import_utils.isViewResponse)(response)) {
         return response;
@@ -55,7 +53,8 @@ var LwrViewHandler = class {
         body: viewDefinition2.renderedView,
         metadata: {
           viewDefinition: viewDefinition2
-        }
+        },
+        cache: {ttl: (0, import_shared_utils.shortestTtl)(response.cache?.ttl, viewDefinition2.cache?.ttl)}
       };
     }
     const viewDefinition = await this.getDefaultRouteViewDefinition(viewRequest, route, runtimeEnvironment, runtimeParams);
@@ -63,12 +62,12 @@ var LwrViewHandler = class {
       body: viewDefinition.renderedView,
       metadata: {
         viewDefinition
-      }
+      },
+      cache: viewDefinition.cache
     };
   }
   async getViewJson(viewRequest, route, runtimeEnvironment, runtimeParams = {}) {
-    const {routeHandler} = route;
-    if (routeHandler) {
+    if (route.routeHandler) {
       const response = await this.getRouteHandlerResponse(viewRequest, route, runtimeEnvironment, runtimeParams);
       if ((0, import_utils.isViewResponse)(response)) {
         return response;
@@ -84,9 +83,8 @@ var LwrViewHandler = class {
     return await (0, import_utils.toJsonFormat)(viewRequest, viewDefinition, route, runtimeEnvironment, runtimeParams, this.moduleRegistry);
   }
   async getViewConfiguration(viewRequest, route, runtimeEnvironment, runtimeParams = {}) {
-    const {routeHandler} = route;
     let viewDefinition;
-    if (routeHandler) {
+    if (route.routeHandler) {
       const response = await this.getRouteHandlerResponse(viewRequest, route, runtimeEnvironment, runtimeParams);
       if ((0, import_utils.isViewResponse)(response)) {
         return;
@@ -126,28 +124,18 @@ var LwrViewHandler = class {
     return viewDefinition;
   }
   async getRouteHandlerResponse(viewRequest, route, runtimeEnvironment, runtimeParams = {}) {
-    const {rootDir, assets, contentDir, layoutsDir, cacheDir} = this.globalConfig;
-    const paths = {rootDir, assets, contentDir, layoutsDir};
-    const {routeHandler} = route;
-    if (!routeHandler) {
-      throw new Error("Route Handler is required for a CustomView");
+    if (!route.routeHandler) {
+      throw new Error("Route handler is required for a CustomView");
     }
-    let routeHandlerFunction = this.routeHandlerFunctionMap.get(routeHandler);
-    if (!routeHandlerFunction) {
-      const inflightRouteHandlerPromise = this.inflightRouteHandlerEvalMap.get(routeHandler);
-      if (inflightRouteHandlerPromise) {
-        routeHandlerFunction = await inflightRouteHandlerPromise;
-      } else {
-        const handlerPromise = (0, import_utils.getRouteHandler)(routeHandler, {cacheDir, rootDir});
-        this.inflightRouteHandlerEvalMap.set(routeHandler, handlerPromise);
-        routeHandlerFunction = await handlerPromise;
-      }
-      this.routeHandlerFunctionMap.set(routeHandler, routeHandlerFunction);
-      this.inflightRouteHandlerEvalMap.delete(routeHandler);
+    const routeHandler = this.routeHandlers[route.routeHandler];
+    if (!routeHandler) {
+      throw new Error(`Route handler does not exist for id: ${route.routeHandler}`);
     }
+    const {rootDir, assets, contentDir, layoutsDir} = this.globalConfig;
+    const paths = {rootDir, assets, contentDir, layoutsDir};
     const locale = runtimeParams.locale;
     const viewApi = this.getBoundApi(route, runtimeEnvironment, runtimeParams);
-    const response = await routeHandlerFunction({...viewRequest, locale}, {route, viewApi, ...paths});
+    const response = await routeHandler({...viewRequest, locale}, {route, viewApi, ...paths});
     return response;
   }
   getBoundApi(route, runtimeEnvironment, runtimeParams) {
@@ -169,7 +157,8 @@ var LwrViewHandler = class {
       body: viewDefinition.renderedView,
       metadata: {
         viewDefinition
-      }
+      },
+      cache: viewDefinition.cache
     };
   }
 };

package/build/es/index.js

@@ -1,4 +1,4 @@
-import { extractMetadataFromHtml, getCacheKeyFromJson, getSpecifier, normalizeResourcePath, createStringBuilder, InflightTasks, } from '@lwrjs/shared-utils';
+import { extractMetadataFromHtml, getCacheKeyFromJson, getSpecifier, normalizeResourcePath, createStringBuilder, shortestTtl, InflightTasks, } from '@lwrjs/shared-utils';
 import { normalizeRenderOptions, normalizeRenderedResult, reduceSourceAssetReferences } from './utils.js';
 import { linkLwrResources } from './linkers/link-lwr-resources.js';
 export { LwrViewHandler } from './view-handler.js';
@@ -295,9 +295,13 @@ export class LwrViewRegistry {
             importer: importer || renderedView.compiledView.filePath,
         };
         const stringBuilder = createStringBuilder(renderedViewContent);
+        let pageTtl;
         for (const viewTransformer of this.viewTransformers) {
             // eslint-disable-next-line no-await-in-loop
-            await viewTransformer.link?.(stringBuilder, mergedViewContext, linkedMetadata);
+            const linkResults = await viewTransformer.link?.(stringBuilder, mergedViewContext, linkedMetadata);
+            // Keep track of the shortest TTL from each view transformer (e.g. lwcSsrViewTranformer)
+            const ttl = linkResults && linkResults.cache?.ttl;
+            pageTtl = shortestTtl(ttl || undefined, pageTtl);
         }
         const linkedAssetContent = stringBuilder.toString();
         // Link LWR related resources
@@ -321,6 +325,7 @@ export class LwrViewRegistry {
                     assetReferences: reduceSourceAssetReferences(linkedMetadata.assetReferences),
                     ...viewRecord,
                 },
+                cache: { ttl: pageTtl },
             };
         }
         return {
@@ -329,6 +334,7 @@ export class LwrViewRegistry {
             viewRecord: {
                 assetReferences: reduceSourceAssetReferences(linkedMetadata.assetReferences),
             },
+            cache: { ttl: pageTtl },
         };
     }
 }

package/build/es/linkers/legacy_view_bootstrap.js

@@ -53,10 +53,6 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
         if (!def) {
             throw Error('Failed to find definition of resource: ' + shimBundle);
         }
-        // HACK: preemptively closing the stream because it is never read
-        if (def.stream) {
-            def.stream.destroy();
-        }
         requiredResources.push(def);
         // Always inline the error shim script after the shim
         const errorShimDef = (await resourceRegistry.getResource({ specifier: 'lwr-error-shim.js', version }, runtimeEnvironment, runtimeParams));

package/build/es/linkers/view_bootstrap.js

@@ -7,6 +7,7 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
     const { id: appName, bootstrap: { services } = { services: [] } } = view;
     const { lwrVersion, format, hmrEnabled, bundle, debug, minify } = runtimeEnvironment;
     const { customElements } = viewMetadata;
+    const defRegistry = bundle ? moduleBundler : moduleRegistry;
     const version = lwrVersion;
     const isAMD = format === 'amd';
     // Application Bootstrap (ABS) module resource: "@lwrjs/app-service/{appName}/module/{format}"
@@ -53,10 +54,6 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
         if (!def) {
             throw Error('Failed to find definition of resource: ' + shimBundle);
         }
-        // HACK: preemptively closing the stream because it is never read
-        if (def.stream) {
-            def.stream.destroy();
-        }
         requiredResources.push(def);
         // Always inline the error shim script after the shim
         const errorShimDef = (await resourceRegistry.getResource({ specifier: 'lwr-error-shim.js', version }, runtimeEnvironment, runtimeParams));
@@ -81,7 +78,7 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
     const depth = isAMD
         ? { static: GraphDepth.ALL, dynamic: 1 }
         : { static: GraphDepth.NONE, dynamic: 1 };
-    const bootstrapModuleGraph = await getModuleGraphs(bootstrapSpecifier, { includeUris: true, includeLinkedDefinitions: true, depth }, moduleRegistry, bundle ? moduleBundler : moduleRegistry, runtimeEnvironment, runtimeParams, visitedCache);
+    const bootstrapModuleGraph = await getModuleGraphs(bootstrapSpecifier, { includeUris: true, includeLinkedDefinitions: true, depth }, moduleRegistry, defRegistry, runtimeEnvironment, runtimeParams, visitedCache);
     // ADD bootstrap module uri as a script resource
     const versionedSpecifier = bootstrapModuleGraph.graphs[0].specifier;
     const uri = bootstrapModuleGraph.uriMap[versionedSpecifier];
@@ -118,8 +115,9 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
     // ------- View related custom element moduleResources
     const customElementsRecords = [];
     const flattenedElements = flattenCustomElements(customElements, isSSR);
-    await Promise.all(flattenedElements.map(async ({ tagName: element, props }) => {
-        const graph = await getModuleGraphs(kebabCaseToModuleSpecifer(element), { includeUris: true, includeLinkedDefinitions: true, depth }, moduleRegistry, bundle ? moduleBundler : moduleRegistry, runtimeEnvironment, runtimeParams ? runtimeParams : {}, visitedCache);
+    for (const { tagName: element } of flattenedElements) {
+        // eslint-disable-next-line no-await-in-loop
+        const graph = await getModuleGraphs(kebabCaseToModuleSpecifer(element), { includeUris: true, includeLinkedDefinitions: true, depth }, moduleRegistry, defRegistry, runtimeEnvironment, runtimeParams ? runtimeParams : {}, visitedCache);
         // add to the viewRecord
         customElementsRecords.push({ elementName: element, flatGraph: graph });
         // PRELOAD custom element static deps as link resource
@@ -142,8 +140,9 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
                 imports[dynamicDep] = uri;
             }
         }
+        // eslint-disable-next-line no-await-in-loop
         importMetadata = await toImportMetadata(graph, importMetadata, moduleRegistry, runtimeEnvironment, runtimeParams);
-    }));
+    }
     // ADD configuration of the bootstrapModule
     configResources.unshift(await getViewBootstrapConfigurationResource({
         id: view.id,

package/build/es/utils.d.ts

@@ -1,5 +1,4 @@
-import { NormalizedRenderingResult, RenderingResult, ResourceDefinition, AssetReference, RenderedAssetReference, RenderOptions, ModuleId, ViewModuleResourceContext, ViewPageContext, JsonCompatible } from '@lwrjs/types';
-import { PublicModuleRegistry, RuntimeEnvironment, RuntimeParams, ModuleJson, RouteHandlerViewResponse, ViewResponse, RouteHandlerFunction, LwrRoute, LwrErrorRoute, ViewRequest, LinkedViewDefinition, ModuleRegistry } from 'packages/@lwrjs/types/src';
+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 declare type HTMLResource = Partial<ResourceDefinition>;
 export declare function generateHtmlTag(definition: HTMLResource): Promise<string>;
 export declare function normalizeRenderedResult({ renderedView, metadata, options, }: RenderingResult): NormalizedRenderingResult;
@@ -7,19 +6,8 @@ export declare function reduceSourceAssetReferences(assets: AssetReference[]): R
 export declare function normalizeRenderOptions(runtimeEnvironment: RuntimeEnvironment, overrideRenderOptions?: RenderOptions, baseRenderOptions?: RenderOptions): Required<RenderOptions>;
 export declare function generatePageContext({ requestPath: url }: ViewRequest, { id, contentTemplate, properties }: LwrRoute | LwrErrorRoute): JsonCompatible<ViewPageContext>;
 export declare function isViewResponse(response: RouteHandlerViewResponse): response is ViewResponse;
-interface RouteHandlerContext {
-    cacheDir: string;
-    rootDir: string;
-}
-/**
- * Load and cache a route handler function (for a view) from the fs
- * @param path - path to the route handle code on the fs
- * @param param1 - directories
- */
-export declare function getRouteHandler(path: string, { cacheDir, rootDir }: RouteHandlerContext): Promise<RouteHandlerFunction>;
 export declare function toJsonFormat(viewRequest: ViewRequest, viewDefinition: LinkedViewDefinition, route: LwrRoute | LwrErrorRoute, runtimeEnvironment: RuntimeEnvironment, runtimeParams: RuntimeParams, moduleRegistry: ModuleRegistry): Promise<ViewResponse>;
-export declare function getModuleResource(moduleId: Pick<ModuleId, 'specifier' | 'version'>, runtimeEnvironment: RuntimeEnvironment, moduleResouceMeta: ViewModuleResourceContext, moduleRegistry: ModuleRegistry, runtimeParams?: RuntimeParams): Promise<ResourceDefinition>;
+export declare function getModuleResource(moduleId: Pick<ModuleId, 'specifier' | 'version'>, runtimeEnvironment: RuntimeEnvironment, moduleResouceMeta: ViewModuleResourceContext, defRegistry: ModuleRegistry | ModuleBundler, runtimeParams?: RuntimeParams): Promise<ResourceDefinition>;
 export declare function getModuleResourceByUri(uri: string, runtimeEnvironment: RuntimeEnvironment, moduleResouceMeta: ViewModuleResourceContext): ResourceDefinition;
 export declare function createJsonModule(specifier: string, moduleRegistry: PublicModuleRegistry, environment: RuntimeEnvironment, params?: RuntimeParams): Promise<ModuleJson>;
-export {};
 //# sourceMappingURL=utils.d.ts.map

package/build/es/utils.js

@@ -1,9 +1,6 @@
-import { explodeSpecifier, getMappingUriPrefix, getSpecifier, resolveFileExtension, transpileTs, DEFAULT_TITLE, } from '@lwrjs/shared-utils';
-import libPath from 'path';
 import { basename, extname } from 'path';
-import { mimeLookup } from '@lwrjs/shared-utils';
+import { explodeSpecifier, getMappingUriPrefix, getSpecifier, getClientBootstrapConfigurationUri, mimeLookup, DEFAULT_TITLE, } from '@lwrjs/shared-utils';
 import { AppResourceEnum, getAppSpecifier, ResourceIdentityTypes, } from '@lwrjs/app-service/identity';
-import { getClientBootstrapConfigurationUri } from '@lwrjs/shared-utils';
 function streamToString(stream) {
     const chunks = [];
     return new Promise((resolve, reject) => {
@@ -51,7 +48,7 @@ async function generateInlineTag({ specifier, type, content, stream, nonce }) {
     if (!content && !stream) {
         throw new Error(`Invalid inline Resource Definition: must have either "content" or "stream": "${specifier}"`);
     }
-    const code = content ? content : await streamToString(stream);
+    const code = stream ? await streamToString(stream()) : content;
     return `<${tag}${typeStr}${nonceStr}>${code}</${tag}>`;
 }
 export async function generateHtmlTag(definition) {
@@ -110,25 +107,6 @@ export function generatePageContext({ requestPath: url }, { id, contentTemplate,
 export function isViewResponse(response) {
     return response.body !== undefined;
 }
-/**
- * Load and cache a route handler function (for a view) from the fs
- * @param path - path to the route handle code on the fs
- * @param param1 - directories
- */
-export async function getRouteHandler(path, { cacheDir, rootDir }) {
-    try {
-        const fullPath = resolveFileExtension(path);
-        if (fullPath.endsWith('.ts')) {
-            path = await transpileTs(path, { rootDir, cacheDir: libPath.join(cacheDir, 'routeHandlers') });
-        }
-        const moduleEntry = await import(path);
-        return moduleEntry.default || moduleEntry;
-    }
-    catch (err) {
-        console.log(err);
-        throw new Error(`Unable to get routeHandler: ${path}`);
-    }
-}
 export async function toJsonFormat(viewRequest, viewDefinition, route, runtimeEnvironment, runtimeParams, moduleRegistry) {
     const { viewRecord } = viewDefinition;
     const { bootstrap, id: appName } = route;
@@ -213,10 +191,10 @@ export async function toJsonFormat(viewRequest, viewDefinition, route, runtimeEn
         },
     };
 }
-export async function getModuleResource(moduleId, runtimeEnvironment, moduleResouceMeta, moduleRegistry, runtimeParams) {
+export async function getModuleResource(moduleId, runtimeEnvironment, moduleResouceMeta, defRegistry, runtimeParams) {
     const { format } = runtimeEnvironment;
     const { isSSR = false, isPreload = false } = moduleResouceMeta;
-    const moduleUri = await moduleRegistry.resolveModuleUri(moduleId, runtimeEnvironment, runtimeParams);
+    const moduleUri = await defRegistry.resolveModuleUri(moduleId, runtimeEnvironment, runtimeParams);
     return {
         src: moduleUri,
         type: format === 'amd' ? 'application/javascript' : 'module',

package/build/es/view-handler.d.ts

@@ -1,14 +1,14 @@
-import { ViewRegistry, RuntimeEnvironment, NormalizedLwrGlobalConfig, ViewRequest, RuntimeParams, ViewResponse, LwrErrorRoute, LwrRoute, ModuleRegistry, RouteHandlerFunction } from '@lwrjs/types';
+import { ViewRegistry, RuntimeEnvironment, NormalizedLwrGlobalConfig, ViewRequest, RuntimeParams, ViewResponse, LwrRoute, LwrErrorRoute, ModuleRegistry, ViewHandler, RouteHandlers } from '@lwrjs/types';
 export interface ViewHandlerContext {
     viewRegistry: ViewRegistry;
     moduleRegistry: ModuleRegistry;
+    routeHandlers: RouteHandlers;
 }
-export declare class LwrViewHandler {
+export declare class LwrViewHandler implements ViewHandler {
+    globalConfig: NormalizedLwrGlobalConfig;
+    routeHandlers: RouteHandlers;
     viewRegistry: ViewRegistry;
     moduleRegistry: ModuleRegistry;
-    globalConfig: NormalizedLwrGlobalConfig;
-    inflightRouteHandlerEvalMap: Map<string, Promise<RouteHandlerFunction>>;
-    routeHandlerFunctionMap: Map<string, RouteHandlerFunction>;
     constructor(context: ViewHandlerContext, globalConfig: NormalizedLwrGlobalConfig);
     getViewContent(viewRequest: ViewRequest, route: LwrRoute | LwrErrorRoute, runtimeEnvironment: RuntimeEnvironment, runtimeParams?: RuntimeParams): Promise<ViewResponse>;
     getViewJson(viewRequest: ViewRequest, route: LwrRoute | LwrErrorRoute, runtimeEnvironment: RuntimeEnvironment, runtimeParams?: RuntimeParams): Promise<ViewResponse>;

package/build/es/view-handler.js

@@ -1,13 +1,11 @@
-import { normalizeResourcePath } from '@lwrjs/shared-utils';
-import { generateHtmlTag, generatePageContext, getRouteHandler, isViewResponse, toJsonFormat, } from './utils.js';
+import { normalizeResourcePath, shortestTtl } from '@lwrjs/shared-utils';
+import { generateHtmlTag, generatePageContext, isViewResponse, toJsonFormat } from './utils.js';
 import { resolve } from 'path';
 export class LwrViewHandler {
     constructor(context, globalConfig) {
-        // TODO convert to using InflightTasks in the shared utils
-        this.inflightRouteHandlerEvalMap = new Map();
-        this.routeHandlerFunctionMap = new Map();
-        this.viewRegistry = context.viewRegistry;
         this.globalConfig = globalConfig;
+        this.routeHandlers = context.routeHandlers;
+        this.viewRegistry = context.viewRegistry;
         this.moduleRegistry = context.moduleRegistry;
     }
     // Get the View's HTML Response
@@ -18,8 +16,7 @@ export class LwrViewHandler {
     route, 
     // context
     runtimeEnvironment, runtimeParams = {}) {
-        const { routeHandler } = route;
-        if (routeHandler) {
+        if (route.routeHandler) {
             const response = await this.getRouteHandlerResponse(viewRequest, route, runtimeEnvironment, runtimeParams);
             if (isViewResponse(response)) {
                 // Return custom view response payload as-is
@@ -38,6 +35,7 @@ export class LwrViewHandler {
                 metadata: {
                     viewDefinition,
                 },
+                cache: { ttl: shortestTtl(response.cache?.ttl, viewDefinition.cache?.ttl) },
             };
         }
         // default static view
@@ -47,6 +45,7 @@ export class LwrViewHandler {
             metadata: {
                 viewDefinition,
             },
+            cache: viewDefinition.cache,
         };
     }
     // Get the View's JSON Manifest Response
@@ -57,8 +56,7 @@ export class LwrViewHandler {
     route, 
     // context
     runtimeEnvironment, runtimeParams = {}) {
-        const { routeHandler } = route;
-        if (routeHandler) {
+        if (route.routeHandler) {
             const response = await this.getRouteHandlerResponse(viewRequest, route, runtimeEnvironment, runtimeParams);
             if (isViewResponse(response)) {
                 // Return custom view response payload as-is
@@ -86,9 +84,8 @@ export class LwrViewHandler {
     route, 
     // context
     runtimeEnvironment, runtimeParams = {}) {
-        const { routeHandler } = route;
         let viewDefinition;
-        if (routeHandler) {
+        if (route.routeHandler) {
             const response = await this.getRouteHandlerResponse(viewRequest, route, runtimeEnvironment, runtimeParams);
             if (isViewResponse(response)) {
                 // Return custom view response payload as-is
@@ -143,33 +140,18 @@ export class LwrViewHandler {
     viewRequest, route, 
     // context
     runtimeEnvironment, runtimeParams = {}) {
-        const { rootDir, assets, contentDir, layoutsDir, cacheDir } = this.globalConfig;
-        const paths = { rootDir, assets, contentDir, layoutsDir };
-        const { routeHandler } = route;
-        if (!routeHandler) {
-            throw new Error('Route Handler is required for a CustomView');
+        if (!route.routeHandler) {
+            throw new Error('Route handler is required for a CustomView');
         }
-        // Import and instantiate route handler
-        let routeHandlerFunction = this.routeHandlerFunctionMap.get(routeHandler);
-        if (!routeHandlerFunction) {
-            const inflightRouteHandlerPromise = this.inflightRouteHandlerEvalMap.get(routeHandler);
-            if (inflightRouteHandlerPromise) {
-                // wait on the current inflight route handler promise
-                routeHandlerFunction = await inflightRouteHandlerPromise;
-            }
-            else {
-                // get the route handler eval promise
-                const handlerPromise = getRouteHandler(routeHandler, { cacheDir, rootDir });
-                this.inflightRouteHandlerEvalMap.set(routeHandler, handlerPromise);
-                routeHandlerFunction = await handlerPromise;
-            }
-            // add the resolved route handler function into the cache and delete the inflight entry
-            this.routeHandlerFunctionMap.set(routeHandler, routeHandlerFunction);
-            this.inflightRouteHandlerEvalMap.delete(routeHandler);
+        const routeHandler = this.routeHandlers[route.routeHandler];
+        if (!routeHandler) {
+            throw new Error(`Route handler does not exist for id: ${route.routeHandler}`);
         }
+        const { rootDir, assets, contentDir, layoutsDir } = this.globalConfig;
+        const paths = { rootDir, assets, contentDir, layoutsDir };
         const locale = runtimeParams.locale;
         const viewApi = this.getBoundApi(route, runtimeEnvironment, runtimeParams);
-        const response = await routeHandlerFunction({ ...viewRequest, locale }, { route, viewApi, ...paths });
+        const response = await routeHandler({ ...viewRequest, locale }, { route: route, viewApi, ...paths });
         return response;
     }
     /*
@@ -202,6 +184,7 @@ export class LwrViewHandler {
             metadata: {
                 viewDefinition,
             },
+            cache: viewDefinition.cache,
         };
     }
 }

package/package.json

@@ -4,15 +4,15 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.9.0-alpha.2",
+    "version": "0.9.0-alpha.21",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
-        "url": "https://github.com/salesforce/lwr.git",
+        "url": "https://github.com/salesforce-experience-platform-emu/lwr.git",
         "directory": "packages/@lwrjs/view-registry"
     },
     "bugs": {
-        "url": "https://github.com/salesforce/lwr/issues"
+        "url": "https://github.com/salesforce-experience-platform-emu/lwr/issues"
     },
     "type": "module",
     "types": "build/es/index.d.ts",
@@ -30,15 +30,15 @@
         "build/**/*.d.ts"
     ],
     "dependencies": {
-        "@lwrjs/app-service": "0.9.0-alpha.2",
-        "@lwrjs/diagnostics": "0.9.0-alpha.2",
-        "@lwrjs/shared-utils": "0.9.0-alpha.2"
+        "@lwrjs/app-service": "0.9.0-alpha.21",
+        "@lwrjs/diagnostics": "0.9.0-alpha.21",
+        "@lwrjs/shared-utils": "0.9.0-alpha.21"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.9.0-alpha.2"
+        "@lwrjs/types": "0.9.0-alpha.21"
     },
     "engines": {
         "node": ">=14.15.4 <19"
     },
-    "gitHead": "bcf63de23d1a2a53fb0e961dba4396e8753710dd"
+    "gitHead": "a89adcac80601f657becd6fd734c765e6b2a2745"
 }