@lwrjs/view-registry 0.9.0-alpha.13 → 0.9.0-alpha.14

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 = {
@@ -84,7 +85,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}));
@@ -108,11 +109,11 @@ async function getHtmlResources(view, viewParams, resourceContext) {
       }
     }
   }
-  let importMetadata = await (0, import_shared_utils.toImportMetadata)(bootstrapModuleGraph, {imports: {}, index: {}}, moduleRegistry, runtimeEnvironment, runtimeParams);
+  let importMetadata = await (0, import_shared_utils.toImportMetadata)(bootstrapModuleGraph, {imports: {}, index: {}}, defRegistry, runtimeEnvironment, runtimeParams);
   const customElementsRecords = [];
   const flattenedElements = (0, import_utils2.flattenCustomElements)(customElements, isSSR);
   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);
+    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];
@@ -130,7 +131,7 @@ async function getHtmlResources(view, viewParams, resourceContext) {
         imports[dynamicDep] = uri3;
       }
     }
-    importMetadata = await (0, import_shared_utils.toImportMetadata)(graph, importMetadata, moduleRegistry, runtimeEnvironment, runtimeParams);
+    importMetadata = await (0, import_shared_utils.toImportMetadata)(graph, importMetadata, defRegistry, runtimeEnvironment, runtimeParams);
   }
   configResources.unshift(await (0, import_utils2.getViewBootstrapConfigurationResource)({
     id: view.id,

package/build/cjs/utils.cjs

@@ -212,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/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}"
@@ -81,7 +82,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];
@@ -114,13 +115,13 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
             }
         }
     }
-    let importMetadata = await toImportMetadata(bootstrapModuleGraph, { imports: {}, index: {} }, moduleRegistry, runtimeEnvironment, runtimeParams);
+    let importMetadata = await toImportMetadata(bootstrapModuleGraph, { imports: {}, index: {} }, defRegistry, runtimeEnvironment, runtimeParams);
     // ------- View related custom element moduleResources
     const customElementsRecords = [];
     const flattenedElements = flattenCustomElements(customElements, isSSR);
     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);
+        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
@@ -144,7 +145,7 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
             }
         }
         // eslint-disable-next-line no-await-in-loop
-        importMetadata = await toImportMetadata(graph, importMetadata, moduleRegistry, runtimeEnvironment, runtimeParams);
+        importMetadata = await toImportMetadata(graph, importMetadata, defRegistry, runtimeEnvironment, runtimeParams);
     }
     // ADD configuration of the bootstrapModule
     configResources.unshift(await getViewBootstrapConfigurationResource({

package/build/es/utils.d.ts

@@ -1,4 +1,4 @@
-import type { NormalizedRenderingResult, RenderingResult, ResourceDefinition, AssetReference, RenderedAssetReference, RenderOptions, ModuleId, ViewModuleResourceContext, ViewPageContext, JsonCompatible, LwrRoute, LwrErrorRoute, PublicModuleRegistry, RuntimeEnvironment, RuntimeParams, ModuleJson, RouteHandlerViewResponse, ViewResponse, Route, ViewRequest, LinkedViewDefinition, ModuleRegistry } from '@lwrjs/types';
+import type { AssetReference, JsonCompatible, LinkedViewDefinition, LwrErrorRoute, LwrRoute, ModuleBundler, ModuleId, ModuleJson, ModuleRegistry, NormalizedRenderingResult, PublicModuleRegistry, RenderOptions, RenderedAssetReference, RenderingResult, ResourceDefinition, Route, 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,7 +7,7 @@ export declare function normalizeRenderOptions(runtimeEnvironment: RuntimeEnviro
 export declare function generatePageContext({ requestPath: url }: ViewRequest, { id, contentTemplate, properties }: Route<LwrRoute | LwrErrorRoute>): JsonCompatible<ViewPageContext>;
 export declare function isViewResponse(response: RouteHandlerViewResponse): response is ViewResponse;
 export declare function toJsonFormat(viewRequest: ViewRequest, viewDefinition: LinkedViewDefinition, route: 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>;
 //# sourceMappingURL=utils.d.ts.map

package/build/es/utils.js

@@ -191,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/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.9.0-alpha.13",
+    "version": "0.9.0-alpha.14",
     "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.13",
-        "@lwrjs/diagnostics": "0.9.0-alpha.13",
-        "@lwrjs/shared-utils": "0.9.0-alpha.13"
+        "@lwrjs/app-service": "0.9.0-alpha.14",
+        "@lwrjs/diagnostics": "0.9.0-alpha.14",
+        "@lwrjs/shared-utils": "0.9.0-alpha.14"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.9.0-alpha.13"
+        "@lwrjs/types": "0.9.0-alpha.14"
     },
     "engines": {
         "node": ">=14.15.4 <19"
     },
-    "gitHead": "fa30915a685f6e8c5c2895d0c053d59145780123"
+    "gitHead": "64e0ba617151429da6e09f1a9686628f64183d25"
 }