@lwrjs/view-registry 0.9.0-alpha.0 → 0.9.0-alpha.10

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,6 +65,9 @@ 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

@@ -65,6 +65,9 @@ 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) {
@@ -108,7 +111,7 @@ 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}) => {
+  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, bundle ? moduleBundler : moduleRegistry, runtimeEnvironment, runtimeParams ? runtimeParams : {}, visitedCache);
     customElementsRecords.push({elementName: element, flatGraph: graph});
     const specifier = graph.graphs[0].specifier;
@@ -128,7 +131,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/view-handler.cjs

@@ -55,7 +55,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,7 +64,8 @@ var LwrViewHandler = class {
       body: viewDefinition.renderedView,
       metadata: {
         viewDefinition
-      }
+      },
+      cache: viewDefinition.cache
     };
   }
   async getViewJson(viewRequest, route, runtimeEnvironment, runtimeParams = {}) {
@@ -169,7 +171,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,6 +53,10 @@ 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

@@ -53,6 +53,10 @@ 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));
@@ -114,7 +118,8 @@ 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 }) => {
+    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, bundle ? moduleBundler : moduleRegistry, runtimeEnvironment, runtimeParams ? runtimeParams : {}, visitedCache);
         // add to the viewRecord
         customElementsRecords.push({ elementName: element, flatGraph: graph });
@@ -138,8 +143,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/view-handler.d.ts

@@ -1,9 +1,9 @@
-import { ViewRegistry, RuntimeEnvironment, NormalizedLwrGlobalConfig, ViewRequest, RuntimeParams, ViewResponse, LwrErrorRoute, LwrRoute, ModuleRegistry, RouteHandlerFunction } from '@lwrjs/types';
+import { ViewRegistry, RuntimeEnvironment, NormalizedLwrGlobalConfig, ViewRequest, RuntimeParams, ViewResponse, LwrErrorRoute, LwrRoute, ModuleRegistry, RouteHandlerFunction, ViewHandler } from '@lwrjs/types';
 export interface ViewHandlerContext {
     viewRegistry: ViewRegistry;
     moduleRegistry: ModuleRegistry;
 }
-export declare class LwrViewHandler {
+export declare class LwrViewHandler implements ViewHandler {
     viewRegistry: ViewRegistry;
     moduleRegistry: ModuleRegistry;
     globalConfig: NormalizedLwrGlobalConfig;

package/build/es/view-handler.js

@@ -1,4 +1,4 @@
-import { normalizeResourcePath } from '@lwrjs/shared-utils';
+import { normalizeResourcePath, shortestTtl } from '@lwrjs/shared-utils';
 import { generateHtmlTag, generatePageContext, getRouteHandler, isViewResponse, toJsonFormat, } from './utils.js';
 import { resolve } from 'path';
 export class LwrViewHandler {
@@ -38,6 +38,7 @@ export class LwrViewHandler {
                 metadata: {
                     viewDefinition,
                 },
+                cache: { ttl: shortestTtl(response.cache?.ttl, viewDefinition.cache?.ttl) },
             };
         }
         // default static view
@@ -47,6 +48,7 @@ export class LwrViewHandler {
             metadata: {
                 viewDefinition,
             },
+            cache: viewDefinition.cache,
         };
     }
     // Get the View's JSON Manifest Response
@@ -202,6 +204,7 @@ export class LwrViewHandler {
             metadata: {
                 viewDefinition,
             },
+            cache: viewDefinition.cache,
         };
     }
 }

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.9.0-alpha.0",
+    "version": "0.9.0-alpha.10",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -30,15 +30,15 @@
         "build/**/*.d.ts"
     ],
     "dependencies": {
-        "@lwrjs/app-service": "0.9.0-alpha.0",
-        "@lwrjs/diagnostics": "0.9.0-alpha.0",
-        "@lwrjs/shared-utils": "0.9.0-alpha.0"
+        "@lwrjs/app-service": "0.9.0-alpha.10",
+        "@lwrjs/diagnostics": "0.9.0-alpha.10",
+        "@lwrjs/shared-utils": "0.9.0-alpha.10"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.9.0-alpha.0"
+        "@lwrjs/types": "0.9.0-alpha.10"
     },
     "engines": {
         "node": ">=14.15.4 <19"
     },
-    "gitHead": "6890d8619b295a49ee1ed8253a372337d83863be"
+    "gitHead": "ecbf031157dd87d2b1a3d528b7fae8f9142eba7e"
 }