@lwrjs/shared-utils 0.6.0-alpha.7 → 0.6.0

package/build/cjs/html-meta.cjs

@@ -67,7 +67,7 @@ async function extractMetadataFromHtml(htmlSource) {
           ceRefStack.push(ceRef);
         }
       }
-      if (tagName === "img" && sourceCodeLocation.attrs) {
+      if ((tagName === "img" || tagName === "script") && sourceCodeLocation.attrs) {
         if (sourceCodeLocation.attrs.src) {
           assetReferences.push(parseAssetLocation(htmlSource, tagName, sourceCodeLocation.attrs.src));
         }

package/build/cjs/index.cjs

@@ -31,6 +31,5 @@ __exportStar(exports, __toModule(require("./typescript.cjs")));
 __exportStar(exports, __toModule(require("./import-metadata.cjs")));
 __exportStar(exports, __toModule(require("./graph.cjs")));
 __exportStar(exports, __toModule(require("./mappings.cjs")));
-__exportStar(exports, __toModule(require("./metrics.cjs")));
 __exportStar(exports, __toModule(require("./urls.cjs")));
 __exportStar(exports, __toModule(require("./env.cjs")));

package/build/cjs/mappings.cjs

@@ -38,7 +38,10 @@ async function getImportMetadataMappings(moduleIds, runtimeEnvironment, runtimeP
   for (const moduleId of moduleIds) {
     const specifier = (0, import_identity.getSpecifier)(moduleId);
     if (!visitedCache.has(specifier)) {
-      const depth = {static: import_graph.GraphDepth.ALL, dynamic: 0};
+      const depth = {
+        static: runtimeEnvironment.format === "esm" ? import_graph.GraphDepth.NONE : import_graph.GraphDepth.ALL,
+        dynamic: runtimeEnvironment.format === "esm" ? 1 : 0
+      };
       const moduleGraph = await (0, import_graph.getModuleGraphs)(specifier, {includeUris: true, includeLinkedDefinitions: true, depth}, moduleRegistry, runtimeEnvironment.bundle ? moduleBundler : moduleRegistry, runtimeEnvironment, runtimeParams, visitedCache);
       importMetadata = await toImportMetadata(moduleGraph, importMetadata, moduleRegistry, runtimeEnvironment, runtimeParams);
     }
@@ -57,15 +60,20 @@ async function toImportMetadata(moduleGraph, existingImportMetadata = {imports:
   }
   const rootMetadata = await normalizeImportMetadata(specifier, uri, definition, moduleRegistry, runtimeEnvironment, runtimeParams);
   let importMetadata = mergeImportMetadata(existingImportMetadata, rootMetadata);
-  const depSpecifiers = moduleGraph.graphs[0].static;
+  const depSpecifiers = runtimeEnvironment.format === "esm" ? moduleGraph.graphs[0].dynamicRefs : moduleGraph.graphs[0].static;
   for (const depSpecifier of depSpecifiers) {
     const depUri = moduleGraph.uriMap[depSpecifier];
     const depDef = moduleGraph.linkedDefinitions[depSpecifier];
-    if (!depUri) {
-      throw new Error("URI was not included in the graph for dependent: " + depSpecifier);
-    }
-    if (!depDef) {
-      throw new Error("Linked dependent module definition was not included in the graph: " + depSpecifier);
+    const depMissing = !depUri || !depDef;
+    if (depMissing && runtimeEnvironment.format !== "esm") {
+      if (!depUri) {
+        throw new Error("URI was not included in the graph for dependent: " + depSpecifier);
+      }
+      if (!depDef) {
+        throw new Error("Linked dependent module definition was not included in the graph: " + depSpecifier);
+      }
+    } else if (depMissing) {
+      continue;
     }
     if (!importMetadata.imports[depUri]) {
       const depMetadata = await normalizeImportMetadata((0, import_identity.getSpecifier)(depDef), depUri, depDef, moduleRegistry, runtimeEnvironment, runtimeParams);

package/build/cjs/urls.cjs

@@ -32,10 +32,12 @@ __export(exports, {
 });
 var import_path_to_regexp = __toModule(require("path-to-regexp"));
 var CONFIG_SUFFIX = "/config.js";
-function getClientBootstrapConfigurationUri(routeInfo, runtimeEnvironment, runtimeParams) {
+var SIGNATURE_SIGIL = "s";
+function getClientBootstrapConfigurationUri(routeInfo, runtimeEnvironment, runtimeParams, signature) {
   const encodeUrl = encodeURIComponent(routeInfo.url);
   const configUrlPrefix = getClientBootstrapConfigurationUriPrefix(routeInfo, runtimeEnvironment, runtimeParams);
-  return `${configUrlPrefix}/${encodeUrl}${CONFIG_SUFFIX}`;
+  const signatureSegment = signature ? `/${SIGNATURE_SIGIL}/${signature}` : "";
+  return `${configUrlPrefix}/${encodeUrl}${signatureSegment}${CONFIG_SUFFIX}`;
 }
 function getClientBootstrapConfigurationUriPrefix(routeInfo, runtimeEnvironment, runtimeParams) {
   const {apiVersion, format} = runtimeEnvironment;
@@ -64,7 +66,11 @@ function getClientBootstrapConfigurationRoutes() {
     `/:apiVersion/application/:format/l/:locale/ai/:appId/configuration/ci/:encodedViewPath${CONFIG_SUFFIX}`,
     `/:apiVersion/application/:format/l/:locale/e/:environment/ai/:appId/configuration/ci/:encodedViewPath${CONFIG_SUFFIX}`,
     `/:apiVersion/application/:format/ai/:appId/configuration/ci/:encodedViewPath${CONFIG_SUFFIX}`,
-    `/:apiVersion/application/:format/e/:environment/ai/:appId/configuration/ci/:encodedViewPath${CONFIG_SUFFIX}`
+    `/:apiVersion/application/:format/e/:environment/ai/:appId/configuration/ci/:encodedViewPath${CONFIG_SUFFIX}`,
+    `/:apiVersion/application/:format/l/:locale/ai/:appId/configuration/ci/:encodedViewPath/s/:signature${CONFIG_SUFFIX}`,
+    `/:apiVersion/application/:format/l/:locale/e/:environment/ai/:appId/configuration/ci/:encodedViewPath/s/:signature${CONFIG_SUFFIX}`,
+    `/:apiVersion/application/:format/ai/:appId/configuration/ci/:encodedViewPath/s/:signature${CONFIG_SUFFIX}`,
+    `/:apiVersion/application/:format/e/:environment/ai/:appId/configuration/ci/:encodedViewPath/s/:signature${CONFIG_SUFFIX}`
   ];
 }
 function extractRequestParams(parameterizedRoute, resolvedUrl, existingParams) {

package/build/es/html-meta.js

@@ -46,7 +46,8 @@ export async function extractMetadataFromHtml(htmlSource) {
                 }
             }
             // <img src="asset-url"/>
-            if (tagName === 'img' && sourceCodeLocation.attrs) {
+            // <script type="text/javascript" src="asset-url"></script>
+            if ((tagName === 'img' || tagName === 'script') && sourceCodeLocation.attrs) {
                 if (sourceCodeLocation.attrs.src) {
                     assetReferences.push(parseAssetLocation(htmlSource, tagName, sourceCodeLocation.attrs.src));
                 }

package/build/es/index.d.ts

@@ -10,7 +10,6 @@ export * from './typescript.js';
 export * from './import-metadata.js';
 export * from './graph.js';
 export * from './mappings.js';
-export * from './metrics.js';
 export * from './urls.js';
 export * from './env.js';
 //# sourceMappingURL=index.d.ts.map

package/build/es/index.js

@@ -10,7 +10,6 @@ export * from './typescript.js';
 export * from './import-metadata.js';
 export * from './graph.js';
 export * from './mappings.js';
-export * from './metrics.js';
 export * from './urls.js';
 export * from './env.js';
 //# sourceMappingURL=index.js.map

package/build/es/mappings.js

@@ -13,8 +13,12 @@ export async function getImportMetadataMappings(moduleIds, runtimeEnvironment, r
         const specifier = getSpecifier(moduleId);
         // Check if we have already visited
         if (!visitedCache.has(specifier)) {
-            // Traversal of the Module Graph is done to get all the URLS for discoverable static dependencies.
-            const depth = { static: GraphDepth.ALL, dynamic: 0 };
+            // Traversal of the Module Graph is done to get all the URLs for discoverable dependencies.
+            // AMD gathers static imports while ESM gathers dynamic imports
+            const depth = {
+                static: runtimeEnvironment.format === 'esm' ? GraphDepth.NONE : GraphDepth.ALL,
+                dynamic: runtimeEnvironment.format === 'esm' ? 1 : 0,
+            };
             // eslint-disable-next-line no-await-in-loop
             const moduleGraph = await getModuleGraphs(specifier, 
             // include uris and linked definitions
@@ -52,16 +56,27 @@ export async function toImportMetadata(moduleGraph, existingImportMetadata = { i
     // Merge in the existing metadata with imports for the root specifier
     const rootMetadata = await normalizeImportMetadata(specifier, uri, definition, moduleRegistry, runtimeEnvironment, runtimeParams);
     let importMetadata = mergeImportMetadata(existingImportMetadata, rootMetadata);
-    // root module dependencies
-    const depSpecifiers = moduleGraph.graphs[0].static;
+    // root module dependencies:
+    //  - static for AMD; dynamic dependencies require a new mapping request
+    //  - dynamic for ESM; static dependencies are imported via fully qualified URLs
+    const depSpecifiers = runtimeEnvironment.format === 'esm'
+        ? moduleGraph.graphs[0].dynamicRefs
+        : moduleGraph.graphs[0].static;
     for (const depSpecifier of depSpecifiers) {
         const depUri = moduleGraph.uriMap[depSpecifier];
         const depDef = moduleGraph.linkedDefinitions[depSpecifier];
-        if (!depUri) {
-            throw new Error('URI was not included in the graph for dependent: ' + depSpecifier);
+        const depMissing = !depUri || !depDef;
+        if (depMissing && runtimeEnvironment.format !== 'esm') {
+            if (!depUri) {
+                throw new Error('URI was not included in the graph for dependent: ' + depSpecifier);
+            }
+            if (!depDef) {
+                throw new Error('Linked dependent module definition was not included in the graph: ' + depSpecifier);
+            }
         }
-        if (!depDef) {
-            throw new Error('Linked dependent module definition was not included in the graph: ' + depSpecifier);
+        else if (depMissing) {
+            // Ignore variable dynamic imports
+            continue;
         }
         if (!importMetadata.imports[depUri]) {
             // eslint-disable-next-line no-await-in-loop

package/build/es/urls.d.ts

@@ -2,7 +2,7 @@ import { RuntimeEnvironment, RuntimeParams } from '@lwrjs/types';
 export declare function getClientBootstrapConfigurationUri(routeInfo: {
     id: string;
     url: string;
-}, runtimeEnvironment: Required<Pick<RuntimeEnvironment, 'apiVersion' | 'format'>>, runtimeParams?: RuntimeParams): string;
+}, runtimeEnvironment: Required<Pick<RuntimeEnvironment, 'apiVersion' | 'format'>>, runtimeParams?: RuntimeParams, signature?: string): string;
 export declare function getClientBootstrapConfigurationUriPrefix(routeInfo: {
     id: string;
 }, runtimeEnvironment: Required<Pick<RuntimeEnvironment, 'apiVersion' | 'format'>>, runtimeParams?: RuntimeParams): string;

package/build/es/urls.js

@@ -1,9 +1,11 @@
 import { pathToRegexp } from 'path-to-regexp';
 const CONFIG_SUFFIX = '/config.js';
-export function getClientBootstrapConfigurationUri(routeInfo, runtimeEnvironment, runtimeParams) {
+const SIGNATURE_SIGIL = 's';
+export function getClientBootstrapConfigurationUri(routeInfo, runtimeEnvironment, runtimeParams, signature) {
     const encodeUrl = encodeURIComponent(routeInfo.url);
     const configUrlPrefix = getClientBootstrapConfigurationUriPrefix(routeInfo, runtimeEnvironment, runtimeParams);
-    return `${configUrlPrefix}/${encodeUrl}${CONFIG_SUFFIX}`;
+    const signatureSegment = signature ? `/${SIGNATURE_SIGIL}/${signature}` : '';
+    return `${configUrlPrefix}/${encodeUrl}${signatureSegment}${CONFIG_SUFFIX}`;
 }
 export function getClientBootstrapConfigurationUriPrefix(routeInfo, runtimeEnvironment, runtimeParams) {
     const { apiVersion, format } = runtimeEnvironment;
@@ -42,6 +44,11 @@ export function getClientBootstrapConfigurationRoutes() {
         `/:apiVersion/application/:format/l/:locale/e/:environment/ai/:appId/configuration/ci/:encodedViewPath${CONFIG_SUFFIX}`,
         `/:apiVersion/application/:format/ai/:appId/configuration/ci/:encodedViewPath${CONFIG_SUFFIX}`,
         `/:apiVersion/application/:format/e/:environment/ai/:appId/configuration/ci/:encodedViewPath${CONFIG_SUFFIX}`,
+        // with signature
+        `/:apiVersion/application/:format/l/:locale/ai/:appId/configuration/ci/:encodedViewPath/s/:signature${CONFIG_SUFFIX}`,
+        `/:apiVersion/application/:format/l/:locale/e/:environment/ai/:appId/configuration/ci/:encodedViewPath/s/:signature${CONFIG_SUFFIX}`,
+        `/:apiVersion/application/:format/ai/:appId/configuration/ci/:encodedViewPath/s/:signature${CONFIG_SUFFIX}`,
+        `/:apiVersion/application/:format/e/:environment/ai/:appId/configuration/ci/:encodedViewPath/s/:signature${CONFIG_SUFFIX}`,
     ];
 }
 /**

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.6.0-alpha.7",
+    "version": "0.6.0",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -43,13 +43,13 @@
         "slugify": "^1.4.5"
     },
     "devDependencies": {
-        "@lwrjs/diagnostics": "0.6.0-alpha.7",
-        "@lwrjs/types": "0.6.0-alpha.7",
+        "@lwrjs/diagnostics": "0.6.0",
+        "@lwrjs/types": "0.6.0",
         "@types/mime-types": "2.1.1",
         "@types/path-to-regexp": "^1.7.0"
     },
     "engines": {
         "node": ">=14.15.4 <17"
     },
-    "gitHead": "dc066450384dc1e27064b46ddd5f24543758a414"
+    "gitHead": "31769655f0155ad7e54cf37bccdf72d0baaf44ab"
 }

package/build/cjs/metrics.cjs

@@ -1,15 +0,0 @@
-var __defProp = Object.defineProperty;
-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});
-};
-
-// packages/@lwrjs/shared-utils/src/metrics.ts
-__markAsModule(exports);
-__export(exports, {
-  ON_APP_INIT: () => ON_APP_INIT,
-  ON_APP_LOAD: () => ON_APP_LOAD
-});
-var ON_APP_LOAD = "lwr-bootstrap-on-app-load";
-var ON_APP_INIT = "lwr-bootstrap-on-app-init";

package/build/es/metrics.d.ts

@@ -1,5 +0,0 @@
-import { LWRBootstrapMetrics } from '@lwrjs/types';
-declare const ON_APP_LOAD: LWRBootstrapMetrics;
-declare const ON_APP_INIT: LWRBootstrapMetrics;
-export { ON_APP_LOAD, ON_APP_INIT };
-//# sourceMappingURL=metrics.d.ts.map

package/build/es/metrics.js

@@ -1,6 +0,0 @@
-// Measure the point just before the app is requested
-const ON_APP_LOAD = 'lwr-bootstrap-on-app-load';
-// Measure the point where the app has been defined via customElements.define
-const ON_APP_INIT = 'lwr-bootstrap-on-app-init';
-export { ON_APP_LOAD, ON_APP_INIT };
-//# sourceMappingURL=metrics.js.map