@lwrjs/view-registry 0.5.11 → 0.6.0-0.6.0-alpha.15.0

package/build/cjs/index.cjs

@@ -29,7 +29,6 @@ __export(exports, {
 });
 var import_shared_utils = __toModule(require("@lwrjs/shared-utils"));
 var import_utils = __toModule(require("./utils.cjs"));
-var import_link_assets = __toModule(require("./linkers/link-assets.cjs"));
 var import_link_lwr_resources = __toModule(require("./linkers/link-lwr-resources.cjs"));
 var import_view_handler = __toModule(require("./view-handler.cjs"));
 var LwrViewRegistry = class {
@@ -45,6 +44,7 @@ var LwrViewRegistry = class {
     this.moduleRegistry = context.moduleRegistry;
     this.moduleBundler = context.moduleBundler;
     this.assetRegistry = context.assetRegistry;
+    this.viewTransformers = context.viewTransformers || [];
     this.globalConfig = globalConfig;
     this.globalData = context.globalData;
     this.appEmitter = context.appEmitter;
@@ -106,6 +106,9 @@ var LwrViewRegistry = class {
   addViewProviders(providers) {
     this.viewProviders.push(...providers);
   }
+  addViewTransformers(transformers) {
+    this.viewTransformers.push(...transformers);
+  }
   initializeViewProviders() {
     return Promise.all(this.viewProviders.map((vp) => vp.initialize()));
   }
@@ -272,20 +275,24 @@ var LwrViewRegistry = class {
     } = viewContext;
     const {skipMetadataCollection, freezeAssets} = renderOptions;
     const {lwrResourcesId} = contentIds;
-    const {moduleRegistry, assetRegistry, resourceRegistry, moduleBundler} = this;
+    const {moduleRegistry, resourceRegistry, moduleBundler} = this;
     const runtimeEnvironment = {...runtimeEnv, immutableAssets: freezeAssets};
     const {
       renderedView: renderedViewContent,
       metadata: renderedViewMetadata,
       compiledView: {immutable = true}
     } = renderedView;
-    const linkedMetadata = skipMetadataCollection ? await (0, import_shared_utils.extractMetadataFromHtml)(renderedViewContent) : renderedViewMetadata;
-    const {source: linkedAssetContent, assetReferences: linkedAssetReferences} = await (0, import_link_assets.linkAssets)(renderedViewContent, linkedMetadata.assetReferences, {
-      assetRegistry,
+    const linkedMetadata = skipMetadataCollection ? renderedViewMetadata : await (0, import_shared_utils.extractMetadataFromHtml)(renderedViewContent);
+    const mergedViewContext = {
+      ...viewContext,
       runtimeEnvironment,
       importer: importer || renderedView.compiledView.filePath
-    });
-    linkedMetadata.assetReferences = linkedAssetReferences;
+    };
+    const stringBuilder = (0, import_shared_utils.createStringBuilder)(renderedViewContent);
+    for (const viewTransformer of this.viewTransformers) {
+      await viewTransformer.link?.(stringBuilder, mergedViewContext, linkedMetadata);
+    }
+    const linkedAssetContent = stringBuilder.toString();
     if (linkedAssetContent.includes(lwrResourcesId)) {
       const {renderedView: linkedView, viewRecord} = await (0, import_link_lwr_resources.linkLwrResources)(linkedAssetContent, view, viewParams, {
         lwrResourcesId,
@@ -300,7 +307,7 @@ var LwrViewRegistry = class {
         renderedView: linkedView,
         immutable,
         viewRecord: {
-          assetReferences: (0, import_utils.reduceSourceAssetReferences)(linkedAssetReferences),
+          assetReferences: (0, import_utils.reduceSourceAssetReferences)(linkedMetadata.assetReferences),
           ...viewRecord
         }
       };
@@ -309,7 +316,7 @@ var LwrViewRegistry = class {
       renderedView: linkedAssetContent,
       immutable,
       viewRecord: {
-        assetReferences: (0, import_utils.reduceSourceAssetReferences)(linkedAssetReferences)
+        assetReferences: (0, import_utils.reduceSourceAssetReferences)(linkedMetadata.assetReferences)
       }
     };
   }

package/build/cjs/linkers/legacy_view_bootstrap.cjs

@@ -98,7 +98,8 @@ async function getHtmlResources(view, viewParams, resourceContext) {
     }
   }
   const customElementsRecords = [];
-  await Promise.all(customElements.map(async (element) => {
+  const flattenedElements = (0, import_utils2.flattenCustomElements)(customElements);
+  await Promise.all(flattenedElements.map(async ({tagName: element}) => {
     const graph = await (0, import_shared_utils.getModuleGraphs)((0, import_shared_utils.kebabcaseToCamelcase)(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;
@@ -123,6 +124,7 @@ async function getHtmlResources(view, viewParams, resourceContext) {
     url: viewParams?.page?.url,
     configAsSrc: view.bootstrap?.configAsSrc || false
   }, {
+    appId: appIdentity.appName,
     bootstrapModule: versionedSpecifier,
     autoBoot: view.bootstrap?.autoBoot === false ? false : true,
     importMappings: {

package/build/cjs/linkers/utils.cjs

@@ -24,6 +24,7 @@ var __toModule = (module2) => {
 // packages/@lwrjs/view-registry/src/linkers/utils.ts
 __markAsModule(exports);
 __export(exports, {
+  flattenCustomElements: () => flattenCustomElements,
   getViewBootstrapConfigurationResource: () => getViewBootstrapConfigurationResource,
   getViewHmrConfigurationResource: () => getViewHmrConfigurationResource
 });
@@ -97,3 +98,23 @@ function getViewHmrConfigurationResource(view, viewMetadata) {
     content: configString
   };
 }
+function flattenCustomElements(arr) {
+  const ret = [];
+  const visitedTags = new Set();
+  function flatten(arr2) {
+    for (const val of arr2) {
+      const {tagName, children} = val;
+      if (!visitedTags.has(tagName)) {
+        ret.push({
+          tagName
+        });
+        visitedTags.add(tagName);
+      }
+      if (children) {
+        flatten(children);
+      }
+    }
+  }
+  flatten(arr);
+  return ret;
+}

package/build/cjs/linkers/view_bootstrap.cjs

@@ -72,7 +72,7 @@ async function getHtmlResources(view, viewParams, resourceContext) {
       }, moduleRegistry, runtimeEnvironment, runtimeParams));
     }
   }
-  const depth = isAMD ? {static: import_shared_utils.GraphDepth.ALL, dynamic: 1} : {static: import_shared_utils.GraphDepth.NONE, dynamic: 0};
+  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 versionedSpecifier = bootstrapModuleGraph.graphs[0].specifier;
   const uri = bootstrapModuleGraph.uriMap[versionedSpecifier];
@@ -99,7 +99,8 @@ async function getHtmlResources(view, viewParams, resourceContext) {
   }
   let importMetadata = await (0, import_shared_utils.toImportMetadata)(bootstrapModuleGraph, {imports: {}, index: {}}, moduleRegistry, runtimeEnvironment, runtimeParams);
   const customElementsRecords = [];
-  await Promise.all(customElements.map(async (element) => {
+  const flattenedElements = (0, import_utils2.flattenCustomElements)(customElements);
+  await Promise.all(flattenedElements.map(async ({tagName: element}) => {
     const graph = await (0, import_shared_utils.getModuleGraphs)((0, import_shared_utils.kebabcaseToCamelcase)(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;
@@ -125,6 +126,7 @@ async function getHtmlResources(view, viewParams, resourceContext) {
     url: viewParams?.page?.url,
     configAsSrc: view.bootstrap?.configAsSrc || false
   }, {
+    appId: appIdentity.appName,
     bootstrapModule: versionedSpecifier,
     autoBoot: view.bootstrap?.autoBoot === false ? false : true,
     imports: importMetadata?.imports,
@@ -137,11 +139,19 @@ async function getHtmlResources(view, viewParams, resourceContext) {
     configResources.unshift(await (0, import_utils2.getViewHmrConfigurationResource)(view, viewMetadata));
   }
   const htmlResources = await Promise.all([...configResources, ...requiredResources, ...moduleResources].map(import_utils.generateHtmlTag));
+  const mapping = (0, import_shared_utils.getMappingUriPrefix)(runtimeEnvironment, runtimeParams);
+  const endpoints = {
+    uris: {
+      mapping
+    }
+  };
   return {
     partial: htmlResources.join("\n"),
     viewRecord: {
       resources: requiredResources,
       customElements: customElementsRecords,
+      endpoints,
+      importMetadata,
       bootstrapModule: {
         specifier: bootstrapModuleGraph.graphs[0].specifier,
         flatGraph: bootstrapModuleGraph,

package/build/cjs/utils.cjs

@@ -39,8 +39,9 @@ __export(exports, {
 var import_shared_utils = __toModule(require("@lwrjs/shared-utils"));
 var import_path = __toModule(require("path"));
 var import_path2 = __toModule(require("path"));
-var import_mime_types = __toModule(require("mime-types"));
+var import_shared_utils2 = __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) => {
@@ -102,7 +103,7 @@ function normalizeRenderedResult({
       assetReferences: metadata ? metadata.assetReferences : []
     },
     options: {
-      skipMetadataCollection: options ? options.skipMetadataCollection : true
+      skipMetadataCollection: options ? options.skipMetadataCollection : false
     }
   };
 }
@@ -117,7 +118,7 @@ function reduceSourceAssetReferences(assets) {
 }
 function normalizeRenderOptions(runtimeEnvironment, overrideRenderOptions, baseRenderOptions) {
   return {
-    skipMetadataCollection: true,
+    skipMetadataCollection: false,
     freezeAssets: runtimeEnvironment.immutableAssets,
     skipCaching: false,
     viewParamCacheKey: null,
@@ -180,7 +181,7 @@ async function toJsonFormat(viewRequest, viewDefinition, route, runtimeEnvironme
     });
     resources.push({
       type: "application/javascript",
-      src: (0, import_shared_utils.getClientBootstrapConfigurationUri)({url: viewRequest.url, id: route.id}, runtimeEnvironment, runtimeParams)
+      src: (0, import_shared_utils3.getClientBootstrapConfigurationUri)({url: viewRequest.url, id: route.id}, runtimeEnvironment, runtimeParams)
     });
   }
   const mappingUrl = (0, import_shared_utils.getMappingUriPrefix)(runtimeEnvironment, runtimeParams);
@@ -200,7 +201,7 @@ async function toJsonFormat(viewRequest, viewDefinition, route, runtimeEnvironme
   });
   viewRecord.assetReferences?.forEach((asset) => {
     if (asset.override?.uri) {
-      const type = (0, import_mime_types.lookup)(asset.override?.uri);
+      const type = (0, import_shared_utils2.mimeLookup)(asset.override?.uri);
       resources.push({type, src: asset.override?.uri});
     }
   });

package/build/es/index.d.ts

@@ -1,7 +1,8 @@
-import { AssetRegistry, CompiledView, Json, LinkedModuleDefinition, LinkedViewDefinition, LwrAppEmitter, LwrAppObserver, ModuleBundler, ModuleRegistry, NormalizedLwrGlobalConfig, PublicViewRegistry, RenderOptions, ResourceRegistry, RuntimeEnvironment, RuntimeParams, View, ViewIdentity, ViewParams, ViewProvider, ViewRegistry } from '@lwrjs/types';
+import { AssetRegistry, CompiledView, Json, LinkedModuleDefinition, LinkedViewDefinition, LwrAppEmitter, LwrAppObserver, ModuleBundler, ModuleRegistry, NormalizedLwrGlobalConfig, PublicViewRegistry, RenderOptions, ResourceRegistry, RuntimeEnvironment, RuntimeParams, View, ViewIdentity, ViewParams, ViewProvider, ViewRegistry, ViewTransformPlugin } from '@lwrjs/types';
 import { AssetSource } from '@lwrjs/types';
 export { LwrViewHandler } from './view-handler.js';
 interface ViewProviderContext {
+    viewTransformers?: ViewTransformPlugin[];
     appObserver: LwrAppObserver;
     appEmitter: LwrAppEmitter;
     assetRegistry: AssetRegistry;
@@ -30,6 +31,7 @@ export declare class LwrViewRegistry implements ViewRegistry {
     globalData: Json;
     runtimeEnvironment: RuntimeEnvironment;
     immutableAssets: Map<string, string>;
+    viewTransformers: ViewTransformPlugin[];
     private pendingViewDefinitions;
     constructor(context: ViewProviderContext, globalConfig: NormalizedLwrGlobalConfig);
     onModuleDefinitionChange(moduleDefinition: LinkedModuleDefinition): Promise<void>;
@@ -37,6 +39,7 @@ export declare class LwrViewRegistry implements ViewRegistry {
     onAssetSourceChange(asset: AssetSource): void;
     getPublicApi(): PublicViewRegistry;
     addViewProviders(providers: ViewProvider[]): void;
+    addViewTransformers(transformers: ViewTransformPlugin[]): void;
     initializeViewProviders(): Promise<void[]>;
     delegateGetView(viewId: ViewIdentity): Promise<CompiledView>;
     getView(viewId: ViewIdentity, skipCaching?: boolean): Promise<CompiledView>;

package/build/es/index.js

@@ -1,6 +1,5 @@
-import { extractMetadataFromHtml, getCacheKeyFromJson, getSpecifier, normalizeResourcePath, } from '@lwrjs/shared-utils';
+import { extractMetadataFromHtml, getCacheKeyFromJson, getSpecifier, normalizeResourcePath, createStringBuilder, } from '@lwrjs/shared-utils';
 import { normalizeRenderOptions, normalizeRenderedResult, reduceSourceAssetReferences } from './utils.js';
-import { linkAssets } from './linkers/link-assets.js';
 import { linkLwrResources } from './linkers/link-lwr-resources.js';
 export { LwrViewHandler } from './view-handler.js';
 export class LwrViewRegistry {
@@ -26,6 +25,7 @@ export class LwrViewRegistry {
         this.moduleRegistry = context.moduleRegistry;
         this.moduleBundler = context.moduleBundler;
         this.assetRegistry = context.assetRegistry;
+        this.viewTransformers = context.viewTransformers || [];
         this.globalConfig = globalConfig;
         this.globalData = context.globalData;
         this.appEmitter = context.appEmitter;
@@ -96,6 +96,9 @@ export class LwrViewRegistry {
     addViewProviders(providers) {
         this.viewProviders.push(...providers);
     }
+    addViewTransformers(transformers) {
+        this.viewTransformers.push(...transformers);
+    }
     initializeViewProviders() {
         return Promise.all(this.viewProviders.map((vp) => vp.initialize()));
     }
@@ -291,21 +294,25 @@ export class LwrViewRegistry {
         const { view, viewParams, runtimeEnvironment: runtimeEnv, runtimeParams, renderOptions, contentIds, importer, } = viewContext;
         const { skipMetadataCollection, freezeAssets } = renderOptions;
         const { lwrResourcesId } = contentIds;
-        const { moduleRegistry, assetRegistry, resourceRegistry, moduleBundler } = this;
+        const { moduleRegistry, resourceRegistry, moduleBundler } = this;
         const runtimeEnvironment = { ...runtimeEnv, immutableAssets: freezeAssets };
         // normalize/extract metadata
         const { renderedView: renderedViewContent, metadata: renderedViewMetadata, compiledView: { immutable = true }, } = renderedView;
         const linkedMetadata = skipMetadataCollection
-            ? await extractMetadataFromHtml(renderedViewContent)
-            : renderedViewMetadata;
-        // link assets
-        const { source: linkedAssetContent, assetReferences: linkedAssetReferences } = await linkAssets(renderedViewContent, linkedMetadata.assetReferences, {
-            assetRegistry,
+            ? renderedViewMetadata
+            : await extractMetadataFromHtml(renderedViewContent);
+        const mergedViewContext = {
+            ...viewContext,
             runtimeEnvironment,
             importer: importer || renderedView.compiledView.filePath,
-        });
-        linkedMetadata.assetReferences = linkedAssetReferences;
-        // link LWR related resources
+        };
+        const stringBuilder = createStringBuilder(renderedViewContent);
+        for (const viewTransformer of this.viewTransformers) {
+            // eslint-disable-next-line no-await-in-loop
+            await viewTransformer.link?.(stringBuilder, mergedViewContext, linkedMetadata);
+        }
+        const linkedAssetContent = stringBuilder.toString();
+        // Link LWR related resources
         if (linkedAssetContent.includes(lwrResourcesId)) {
             // This calculation is expensive, only do it if lwr_resources is needed
             // Link LWR View resources if necessary
@@ -323,7 +330,7 @@ export class LwrViewRegistry {
                 renderedView: linkedView,
                 immutable,
                 viewRecord: {
-                    assetReferences: reduceSourceAssetReferences(linkedAssetReferences),
+                    assetReferences: reduceSourceAssetReferences(linkedMetadata.assetReferences),
                     ...viewRecord,
                 },
             };
@@ -332,7 +339,7 @@ export class LwrViewRegistry {
             renderedView: linkedAssetContent,
             immutable,
             viewRecord: {
-                assetReferences: reduceSourceAssetReferences(linkedAssetReferences),
+                assetReferences: reduceSourceAssetReferences(linkedMetadata.assetReferences),
             },
         };
     }

package/build/es/linkers/legacy_view_bootstrap.js

@@ -1,7 +1,7 @@
 import { kebabcaseToCamelcase, getModuleGraphs, GraphDepth, getModuleUriPrefix } from '@lwrjs/shared-utils';
 import { AppResourceEnum, getAppSpecifier } from '@lwrjs/app-service/identity';
 import { generateHtmlTag, getModuleResource, getModuleResourceByUri } from '../utils.js';
-import { getViewBootstrapConfigurationResource, getViewHmrConfigurationResource } from './utils.js';
+import { flattenCustomElements, getViewBootstrapConfigurationResource, getViewHmrConfigurationResource, } from './utils.js';
 export async function getHtmlResources(view, viewParams, resourceContext) {
     const { runtimeEnvironment, runtimeParams, moduleRegistry, moduleBundler, resourceRegistry, viewMetadata, } = resourceContext;
     const { id: appName, bootstrap: { services } = { services: [] } } = view;
@@ -102,7 +102,8 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
     }
     // ------- View related custom element moduleResources
     const customElementsRecords = [];
-    await Promise.all(customElements.map(async (element) => {
+    const flattenedElements = flattenCustomElements(customElements);
+    await Promise.all(flattenedElements.map(async ({ tagName: element }) => {
         const graph = await getModuleGraphs(kebabcaseToCamelcase(element), { includeUris: true, includeLinkedDefinitions: true, depth }, moduleRegistry, bundle ? moduleBundler : moduleRegistry, runtimeEnvironment, runtimeParams ? runtimeParams : {}, visitedCache);
         // add to the viewRecord
         customElementsRecords.push({ elementName: element, flatGraph: graph });
@@ -133,6 +134,7 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
         url: viewParams?.page?.url,
         configAsSrc: view.bootstrap?.configAsSrc || false,
     }, {
+        appId: appIdentity.appName,
         bootstrapModule: versionedSpecifier,
         autoBoot: view.bootstrap?.autoBoot === false ? false : true,
         importMappings: {

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

@@ -1,5 +1,6 @@
-import { ClientBootstrapConfig, RuntimeEnvironment, RuntimeParams, ResourceDefinition, RenderedViewMetadata } from '@lwrjs/types';
+import { ClientBootstrapConfig, RuntimeEnvironment, RuntimeParams, ResourceDefinition, RenderedViewMetadata, CustomElementReference } from '@lwrjs/types';
 import { View, ViewInfo } from '@lwrjs/types';
 export declare function getViewBootstrapConfigurationResource(viewInfo: ViewInfo, config: ClientBootstrapConfig, runtimeEnvironment: RuntimeEnvironment, runtimeParams?: RuntimeParams): ResourceDefinition;
 export declare function getViewHmrConfigurationResource(view: View, viewMetadata: RenderedViewMetadata): ResourceDefinition;
+export declare function flattenCustomElements(arr: CustomElementReference[]): CustomElementReference[];
 //# sourceMappingURL=utils.d.ts.map

package/build/es/linkers/utils.js

@@ -76,4 +76,24 @@ export function getViewHmrConfigurationResource(view, viewMetadata) {
         content: configString,
     };
 }
+export function flattenCustomElements(arr) {
+    const ret = [];
+    const visitedTags = new Set();
+    function flatten(arr) {
+        for (const val of arr) {
+            const { tagName, children } = val;
+            if (!visitedTags.has(tagName)) {
+                ret.push({
+                    tagName,
+                });
+                visitedTags.add(tagName);
+            }
+            if (children) {
+                flatten(children);
+            }
+        }
+    }
+    flatten(arr);
+    return ret;
+}
 //# sourceMappingURL=utils.js.map

package/build/es/linkers/view_bootstrap.js

@@ -1,7 +1,7 @@
-import { kebabcaseToCamelcase, toImportMetadata, getModuleGraphs, GraphDepth } from '@lwrjs/shared-utils';
+import { kebabcaseToCamelcase, toImportMetadata, getModuleGraphs, getMappingUriPrefix, GraphDepth, } from '@lwrjs/shared-utils';
 import { AppResourceEnum, getAppSpecifier } from '@lwrjs/app-service/identity';
 import { generateHtmlTag, getModuleResource, getModuleResourceByUri } from '../utils.js';
-import { getViewBootstrapConfigurationResource, getViewHmrConfigurationResource } from './utils.js';
+import { flattenCustomElements, getViewBootstrapConfigurationResource, getViewHmrConfigurationResource, } from './utils.js';
 export async function getHtmlResources(view, viewParams, resourceContext) {
     const { runtimeEnvironment, runtimeParams, moduleRegistry, moduleBundler, resourceRegistry, viewMetadata, } = resourceContext;
     const { id: appName, bootstrap: { services } = { services: [] } } = view;
@@ -63,10 +63,9 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
     // ------- Application Bootstrap module
     // 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.
-    // Scope: ESM currently only exposes immutable URI references, optimize for AMD formats
     const depth = isAMD
         ? { static: GraphDepth.ALL, dynamic: 1 }
-        : { static: GraphDepth.NONE, dynamic: 0 };
+        : { static: GraphDepth.NONE, dynamic: 1 };
     const bootstrapModuleGraph = await getModuleGraphs(bootstrapSpecifier, { includeUris: true, includeLinkedDefinitions: true, depth }, moduleRegistry, bundle ? moduleBundler : moduleRegistry, runtimeEnvironment, runtimeParams, visitedCache);
     // ADD bootstrap module uri as a script resource
     const versionedSpecifier = bootstrapModuleGraph.graphs[0].specifier;
@@ -75,12 +74,12 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
     if (isAMD) {
         // ADD bootstrap module as required
         requiredAmdModules.push(versionedSpecifier);
-        // AMD ADD bootstrap module uri addressability
+        // ADD bootstrap module uri addressability
         imports[versionedSpecifier] = uri;
         // PRELOAD bootstrap module static deps as link resource
         for (const staticDep of bootstrapModuleGraph.graphs[0].static) {
             const uri = bootstrapModuleGraph.uriMap[staticDep];
-            // AMD ADD static module dep uri addressability
+            // ADD static module dep uri addressability
             imports[staticDep] = uri;
             // ADD bootstrap module static deps to requiredAmdModules if services, otherwise preloadModules
             if (services && services.length) {
@@ -89,7 +88,7 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
                 requiredAmdModules.push(staticDep);
             }
         }
-        // AMD Add import mappings for known dynamic imports
+        // Add import mappings for known dynamic imports
         for (const dynamicDep of bootstrapModuleGraph.graphs[0].dynamicRefs) {
             const uri = bootstrapModuleGraph.uriMap[dynamicDep];
             if (uri) {
@@ -103,7 +102,8 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
     let importMetadata = await toImportMetadata(bootstrapModuleGraph, { imports: {}, index: {} }, moduleRegistry, runtimeEnvironment, runtimeParams);
     // ------- View related custom element moduleResources
     const customElementsRecords = [];
-    await Promise.all(customElements.map(async (element) => {
+    const flattenedElements = flattenCustomElements(customElements);
+    await Promise.all(flattenedElements.map(async ({ tagName: element }) => {
         const graph = await getModuleGraphs(kebabcaseToCamelcase(element), { includeUris: true, includeLinkedDefinitions: true, depth }, moduleRegistry, bundle ? moduleBundler : moduleRegistry, runtimeEnvironment, runtimeParams ? runtimeParams : {}, visitedCache);
         // add to the viewRecord
         customElementsRecords.push({ elementName: element, flatGraph: graph });
@@ -135,6 +135,7 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
         url: viewParams?.page?.url,
         configAsSrc: view.bootstrap?.configAsSrc || false,
     }, {
+        appId: appIdentity.appName,
         bootstrapModule: versionedSpecifier,
         autoBoot: view.bootstrap?.autoBoot === false ? false : true,
         imports: importMetadata?.imports,
@@ -148,11 +149,19 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
     }
     // generate html partial
     const htmlResources = await Promise.all([...configResources, ...requiredResources, ...moduleResources].map(generateHtmlTag));
+    const mapping = getMappingUriPrefix(runtimeEnvironment, runtimeParams);
+    const endpoints = {
+        uris: {
+            mapping,
+        },
+    };
     return {
         partial: htmlResources.join('\n'),
         viewRecord: {
             resources: requiredResources,
             customElements: customElementsRecords,
+            endpoints,
+            importMetadata,
             bootstrapModule: {
                 specifier: bootstrapModuleGraph.graphs[0].specifier,
                 flatGraph: bootstrapModuleGraph,

package/build/es/utils.js

@@ -1,8 +1,9 @@
-import { explodeSpecifier, getMappingUriPrefix, getSpecifier, resolveFileExtension, transpileTs, DEFAULT_TITLE, getClientBootstrapConfigurationUri, } from '@lwrjs/shared-utils';
+import { explodeSpecifier, getMappingUriPrefix, getSpecifier, resolveFileExtension, transpileTs, DEFAULT_TITLE, } from '@lwrjs/shared-utils';
 import libPath from 'path';
 import { basename, extname } from 'path';
-import { lookup } from 'mime-types';
+import { mimeLookup } 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) => {
@@ -64,7 +65,7 @@ export function normalizeRenderedResult({ renderedView, metadata, options, }) {
             assetReferences: metadata ? metadata.assetReferences : [],
         },
         options: {
-            skipMetadataCollection: options ? options.skipMetadataCollection : true,
+            skipMetadataCollection: options ? options.skipMetadataCollection : false,
         },
     };
 }
@@ -80,7 +81,7 @@ export function reduceSourceAssetReferences(assets) {
 export function normalizeRenderOptions(runtimeEnvironment, overrideRenderOptions, baseRenderOptions) {
     return {
         // Default render options
-        skipMetadataCollection: true,
+        skipMetadataCollection: false,
         freezeAssets: runtimeEnvironment.immutableAssets,
         skipCaching: false,
         viewParamCacheKey: null,
@@ -182,7 +183,7 @@ export async function toJsonFormat(viewRequest, viewDefinition, route, runtimeEn
     // ADD assetReferences to the JSON resources
     viewRecord.assetReferences?.forEach((asset) => {
         if (asset.override?.uri) {
-            const type = lookup(asset.override?.uri);
+            const type = mimeLookup(asset.override?.uri);
             resources.push({ type, src: asset.override?.uri });
         }
     });

package/build/es/view-handler.js

@@ -3,6 +3,7 @@ import { generateHtmlTag, generatePageContext, getRouteHandler, isViewResponse,
 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;

package/package.json

@@ -4,8 +4,8 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.5.11",
-    "homepage": "https://lwr.dev/",
+    "version": "0.6.0-0.6.0-alpha.15.0",
+    "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
         "url": "https://github.com/salesforce/lwr.git",
@@ -30,16 +30,15 @@
         "build/**/*.d.ts"
     ],
     "dependencies": {
-        "@lwrjs/app-service": "0.5.11",
-        "@lwrjs/diagnostics": "0.5.11",
-        "@lwrjs/shared-utils": "0.5.11",
-        "magic-string": "^0.25.7"
+        "@lwrjs/app-service": "0.6.0-0.6.0-alpha.15.0",
+        "@lwrjs/diagnostics": "0.6.0-0.6.0-alpha.15.0",
+        "@lwrjs/shared-utils": "0.6.0-0.6.0-alpha.15.0"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.5.11"
+        "@lwrjs/types": "0.6.0-0.6.0-alpha.15.0"
     },
     "engines": {
         "node": ">=14.15.4 <17"
     },
-    "gitHead": "2ee810c0a4f1f36d1e0f8378a1fe00c19b4c5bc1"
+    "gitHead": "101ad971f5a7b0631dd149ee4e3aa1d1799a7af2"
 }

package/build/cjs/linkers/link-assets.cjs

@@ -1,60 +0,0 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __markAsModule = (target) => __defProp(target, "__esModule", {value: true});
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, {get: all[name], enumerable: true});
-};
-var __exportStar = (target, module2, desc) => {
-  if (module2 && typeof module2 === "object" || typeof module2 === "function") {
-    for (let key of __getOwnPropNames(module2))
-      if (!__hasOwnProp.call(target, key) && key !== "default")
-        __defProp(target, key, {get: () => module2[key], enumerable: !(desc = __getOwnPropDesc(module2, key)) || desc.enumerable});
-  }
-  return target;
-};
-var __toModule = (module2) => {
-  return __exportStar(__markAsModule(__defProp(module2 != null ? __create(__getProtoOf(module2)) : {}, "default", module2 && module2.__esModule && "default" in module2 ? {get: () => module2.default, enumerable: true} : {value: module2, enumerable: true})), module2);
-};
-
-// packages/@lwrjs/view-registry/src/linkers/link-assets.ts
-__markAsModule(exports);
-__export(exports, {
-  linkAssets: () => linkAssets
-});
-var import_magic_string = __toModule(require("magic-string"));
-var import_diagnostics = __toModule(require("@lwrjs/diagnostics"));
-function rewriteDocumentWithImmutableUrls(renderedView, assetReferences) {
-  const codeStringBuilder = new import_magic_string.default(renderedView);
-  assetReferences.forEach((assetRef) => {
-    const {
-      override,
-      url,
-      location: {startOffset, endOffset}
-    } = assetRef;
-    startOffset !== endOffset && codeStringBuilder.overwrite(startOffset, endOffset, override?.uri || url);
-  });
-  return codeStringBuilder.toString();
-}
-async function linkAssets(source, assetReferences, {assetRegistry, runtimeEnvironment, importer}) {
-  const imageRefs = await Promise.all(assetReferences.map(async (ref) => {
-    const {url: specifier} = ref;
-    let override;
-    try {
-      override = await assetRegistry.resolveAssetUri({specifier, importer}, runtimeEnvironment);
-    } catch (e) {
-      if (e instanceof import_diagnostics.LwrUnresolvableError) {
-        console.warn("[WARN]: Asset was not found for " + ref.url);
-        return ref;
-      }
-      throw e;
-    }
-    return {...ref, override};
-  }));
-  const modifiedSource = rewriteDocumentWithImmutableUrls(source, imageRefs);
-  return {source: modifiedSource, assetReferences: imageRefs};
-}

package/build/es/linkers/link-assets.d.ts

@@ -1,12 +0,0 @@
-import { AssetReference, PublicAssetRegistry, RuntimeEnvironment } from '@lwrjs/types';
-interface LinkedAssetsContext {
-    assetRegistry: PublicAssetRegistry;
-    runtimeEnvironment: RuntimeEnvironment;
-    importer: string;
-}
-export declare function linkAssets(source: string, assetReferences: AssetReference[], { assetRegistry, runtimeEnvironment, importer }: LinkedAssetsContext): Promise<{
-    source: string;
-    assetReferences: AssetReference[];
-}>;
-export {};
-//# sourceMappingURL=link-assets.d.ts.map

package/build/es/linkers/link-assets.js

@@ -1,33 +0,0 @@
-import MagicString from 'magic-string';
-import { LwrUnresolvableError } from '@lwrjs/diagnostics';
-function rewriteDocumentWithImmutableUrls(renderedView, assetReferences) {
-    const codeStringBuilder = new MagicString(renderedView);
-    assetReferences.forEach((assetRef) => {
-        const { override, url, location: { startOffset, endOffset }, } = assetRef;
-        startOffset !== endOffset &&
-            codeStringBuilder.overwrite(startOffset, endOffset, override?.uri || url);
-    });
-    return codeStringBuilder.toString();
-}
-export async function linkAssets(source, assetReferences, { assetRegistry, runtimeEnvironment, importer }) {
-    const imageRefs = await Promise.all(assetReferences.map(async (ref) => {
-        const { url: specifier } = ref;
-        let override;
-        try {
-            override = await assetRegistry.resolveAssetUri({ specifier, importer }, runtimeEnvironment);
-        }
-        catch (e) {
-            if (e instanceof LwrUnresolvableError) {
-                // the asset may not exist, in which case the URL is not overwritten.  Log a warning so
-                // the developer can see the bad asset URL, and be able to correct it
-                console.warn('[WARN]: Asset was not found for ' + ref.url);
-                return ref;
-            }
-            throw e;
-        }
-        return { ...ref, override };
-    }));
-    const modifiedSource = rewriteDocumentWithImmutableUrls(source, imageRefs);
-    return { source: modifiedSource, assetReferences: imageRefs };
-}
-//# sourceMappingURL=link-assets.js.map