@lwrjs/shared-utils 0.7.0-alpha.0 → 0.7.0-alpha.3

package/build/cjs/env.cjs

@@ -8,10 +8,10 @@ var __export = (target, all) => {
 // packages/@lwrjs/shared-utils/src/env.ts
 __markAsModule(exports);
 __export(exports, {
-  getExperimentalFeatures: () => getExperimentalFeatures
+  getFeatureFlags: () => getFeatureFlags
 });
-function getExperimentalFeatures() {
+function getFeatureFlags() {
   return {
-    ENABLE_FINGERPRINTS: process.env.ENABLE_FINGERPRINTS !== void 0 && process.env.ENABLE_FINGERPRINTS === "true" ? true : false
+    LEGACY_LOADER: process.env.LEGACY_LOADER !== void 0 && process.env.LEGACY_LOADER === "true" ? true : false
   };
 }

package/build/cjs/graph.cjs

@@ -28,6 +28,7 @@ __export(exports, {
   getModuleGraphs: () => getModuleGraphs
 });
 var import_identity = __toModule(require("./identity.cjs"));
+var import_diagnostics = __toModule(require("@lwrjs/diagnostics"));
 var import_import_metadata = __toModule(require("./import-metadata.cjs"));
 var GraphDepth;
 (function(GraphDepth2) {
@@ -110,7 +111,9 @@ async function getModuleGraphs(specifier, options, moduleRegistry, defRegistry,
   };
   const moduleDef = isBundler(defRegistry) ? await defRegistry.getModuleBundle(versionedModuleId, runtimeEnvironment, runtimeParams) : await defRegistry.getModule(versionedModuleId, runtimeParams);
   if (!moduleDef) {
-    throw new Error("Missing module Definition");
+    throw (0, import_diagnostics.createSingleDiagnosticError)({
+      description: import_diagnostics.descriptions.UNRESOLVABLE.MODULE_ENTRY(versionedModuleId.specifier)
+    }, import_diagnostics.LwrUnresolvableError);
   }
   const flattened = [];
   await traverse(moduleDef, depth, flattened, 0, acc, defRegistry, runtimeEnvironment, runtimeParams);

package/build/cjs/identity.cjs

@@ -25,6 +25,7 @@ var __toModule = (module2) => {
 __markAsModule(exports);
 __export(exports, {
   ASSETS_CACHE_DIR: () => ASSETS_CACHE_DIR,
+  BUNDLE_SIGIL: () => BUNDLE_SIGIL,
   DEFAULT_LOCKER_TRUSTED_CMP: () => DEFAULT_LOCKER_TRUSTED_CMP,
   DEFAULT_LWR_BOOTSTRAP_CONFIG: () => DEFAULT_LWR_BOOTSTRAP_CONFIG,
   DEFAULT_LWR_LOCKER_CONFIG: () => DEFAULT_LWR_LOCKER_CONFIG,
@@ -61,6 +62,7 @@ var import_fast_json_stable_stringify = __toModule(require("fast-json-stable-str
 var VERSION_SIGIL = "/v/";
 var LOCALE_SIGIL = "l";
 var ENVIRONMENT_SIGIL = "e";
+var BUNDLE_SIGIL = "bi";
 var LATEST_SIGNATURE = "latest";
 var DEFAULT_TITLE = "LWR App";
 var IMMUTABLE_ASSET_PREFIX = "/_immutable/";
@@ -188,14 +190,16 @@ function getModuleUriPrefix({apiVersion, bundle, format, compat, basePath}, {loc
   const localePart = locale ? `/${LOCALE_SIGIL}/${locale}` : "";
   const environmentPart = environment ? `/${ENVIRONMENT_SIGIL}/${environment}` : "";
   if (bundle) {
-    return `${basePath}/${apiVersion}/bundle/${format}${localePart}${environmentPart}/bi/0/module/mi/`;
+    return `${basePath}/${apiVersion}/bundle/${format}${localePart}${environmentPart}/${BUNDLE_SIGIL}/0/module/mi/`;
   } else {
     return `${basePath}/${apiVersion}/module/${format}/${compat}${localePart}${environmentPart}/mi/`;
   }
 }
-function getMappingUriPrefix({apiVersion, format, compat, basePath}, {locale} = {}) {
+function getMappingUriPrefix({apiVersion, bundle, format, compat, basePath}, {locale, environment} = {}) {
   const localePart = locale ? `/${LOCALE_SIGIL}/${locale}` : "";
-  return `${basePath}/${apiVersion}/mapping/${format}/${compat}${localePart}/mp/`;
+  const environmentPart = environment ? `/${ENVIRONMENT_SIGIL}/${environment}` : "";
+  const bundlePart = bundle ? `/${BUNDLE_SIGIL}/0` : "";
+  return `${basePath}/${apiVersion}/mapping/${format}/${compat}${localePart}${environmentPart}${bundlePart}/mp/`;
 }
 var REGEX_URL_SCHEMA_PREFIX = /^(https?|\/\/)/;
 function isExternalUrl(url) {
@@ -214,7 +218,10 @@ function getModuleIdentity(req) {
 }
 function getMappingIdentity(req) {
   const {specifiers} = req.params;
-  const moduleIds = explodeSpecifiers(specifiers);
+  const moduleIds = explodeSpecifiers(specifiers).map((obj) => ({
+    ...obj,
+    importer: req.query.importer
+  }));
   return {
     moduleIds
   };

package/build/cjs/mappings.cjs

@@ -36,7 +36,8 @@ async function getImportMetadataMappings(moduleIds, runtimeEnvironment, runtimeP
     index: {}
   };
   for (const moduleId of moduleIds) {
-    const specifier = (0, import_identity.getSpecifier)(moduleId);
+    const requestedSpecifier = (0, import_identity.getSpecifier)(moduleId);
+    const specifier = await getVersionedSpecifier(moduleId, moduleRegistry);
     if (!visitedCache.has(specifier)) {
       const depth = {
         static: runtimeEnvironment.format === "esm" ? import_graph.GraphDepth.NONE : import_graph.GraphDepth.ALL,
@@ -45,6 +46,14 @@ async function getImportMetadataMappings(moduleIds, runtimeEnvironment, runtimeP
       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);
     }
+    if (requestedSpecifier !== specifier) {
+      const requestedSpecifierPlusImporter = `${requestedSpecifier}?importer=${moduleId.importer}`;
+      const specifiersArray = Object.values(importMetadata.imports).find((a) => a.includes(specifier));
+      if (!specifiersArray) {
+        throw new Error("Could not find: " + specifier + " in " + JSON.stringify(importMetadata.imports));
+      }
+      specifiersArray.push(requestedSpecifierPlusImporter);
+    }
   }
   return importMetadata;
 }
@@ -127,3 +136,12 @@ async function createIndex(specifiers, moduleRegistry, runtimeEnvironment, runti
   await Promise.all(promises);
   return index;
 }
+async function getVersionedSpecifier(moduleId, moduleRegistry) {
+  if (!moduleId.importer || moduleId.version) {
+    return (0, import_identity.getSpecifier)(moduleId);
+  }
+  const versionedModuleEntry = await moduleRegistry.getModuleEntry({
+    ...moduleId
+  });
+  return (0, import_identity.getSpecifier)(versionedModuleEntry);
+}

package/build/es/env.d.ts

@@ -1,3 +1,3 @@
-import { ExperimentalFeatures } from '@lwrjs/types';
-export declare function getExperimentalFeatures(): ExperimentalFeatures;
+import { FeatureFlags } from '@lwrjs/types';
+export declare function getFeatureFlags(): FeatureFlags;
 //# sourceMappingURL=env.d.ts.map

package/build/es/env.js

@@ -1,9 +1,7 @@
-export function getExperimentalFeatures() {
+export function getFeatureFlags() {
     return {
-        // DEFAULT ENABLE_FINGERPRINTS = false;
-        ENABLE_FINGERPRINTS: process.env.ENABLE_FINGERPRINTS !== undefined && process.env.ENABLE_FINGERPRINTS === 'true'
-            ? true
-            : false,
+        // DEFAULT LEGACY_LOADER = false;
+        LEGACY_LOADER: process.env.LEGACY_LOADER !== undefined && process.env.LEGACY_LOADER === 'true' ? true : false,
     };
 }
 //# sourceMappingURL=env.js.map

package/build/es/graph.js

@@ -1,4 +1,5 @@
 import { getSpecifier, getVersionedModuleId, isBundleDefinition } from './identity.js';
+import { LwrUnresolvableError, createSingleDiagnosticError, descriptions } from '@lwrjs/diagnostics';
 import { ModuleNameType } from './import-metadata.js';
 export var GraphDepth;
 (function (GraphDepth) {
@@ -116,7 +117,9 @@ options, moduleRegistry, defRegistry, runtimeEnvironment, runtimeParams, visited
         ? await defRegistry.getModuleBundle(versionedModuleId, runtimeEnvironment, runtimeParams)
         : await defRegistry.getModule(versionedModuleId, runtimeParams);
     if (!moduleDef) {
-        throw new Error('Missing module Definition');
+        throw createSingleDiagnosticError({
+            description: descriptions.UNRESOLVABLE.MODULE_ENTRY(versionedModuleId.specifier),
+        }, LwrUnresolvableError);
     }
     const flattened = [];
     await traverse(moduleDef, depth, flattened, 0, acc, defRegistry, runtimeEnvironment, runtimeParams);

package/build/es/identity.d.ts

@@ -3,6 +3,7 @@ import { AbstractModuleId, AssetIdentity, BundleDefinition, MappingIdentity, Mid
 export declare const VERSION_SIGIL = "/v/";
 export declare const LOCALE_SIGIL = "l";
 export declare const ENVIRONMENT_SIGIL = "e";
+export declare const BUNDLE_SIGIL = "bi";
 export declare const LATEST_SIGNATURE = "latest";
 export declare const DEFAULT_TITLE = "LWR App";
 export declare const IMMUTABLE_ASSET_PREFIX = "/_immutable/";
@@ -154,7 +155,7 @@ export declare function getModuleUriPrefix({ apiVersion, bundle, format, compat,
  * @param param0 - URI props from the Runtime Environment
  * @param param1 - URI props from the Runtime Params
  */
-export declare function getMappingUriPrefix({ apiVersion, format, compat, basePath }: RuntimeEnvironment, { locale }?: RuntimeParams): string;
+export declare function getMappingUriPrefix({ apiVersion, bundle, format, compat, basePath }: RuntimeEnvironment, { locale, environment }?: RuntimeParams): string;
 export { getCacheKeyFromJson };
 export declare function isExternalUrl(url: string): boolean;
 export declare function isBundleDefinition(definition: ModuleDefinition | BundleDefinition): definition is BundleDefinition;

package/build/es/identity.js

@@ -3,6 +3,7 @@ import getCacheKeyFromJson from 'fast-json-stable-stringify';
 export const VERSION_SIGIL = '/v/';
 export const LOCALE_SIGIL = 'l';
 export const ENVIRONMENT_SIGIL = 'e';
+export const BUNDLE_SIGIL = 'bi';
 export const LATEST_SIGNATURE = 'latest';
 export const DEFAULT_TITLE = 'LWR App';
 export const IMMUTABLE_ASSET_PREFIX = '/_immutable/';
@@ -244,7 +245,7 @@ export function getModuleUriPrefix({ apiVersion, bundle, format, compat, basePat
     const localePart = locale ? `/${LOCALE_SIGIL}/${locale}` : '';
     const environmentPart = environment ? `/${ENVIRONMENT_SIGIL}/${environment}` : '';
     if (bundle) {
-        return `${basePath}/${apiVersion}/bundle/${format}${localePart}${environmentPart}/bi/0/module/mi/`;
+        return `${basePath}/${apiVersion}/bundle/${format}${localePart}${environmentPart}/${BUNDLE_SIGIL}/0/module/mi/`;
     }
     else {
         return `${basePath}/${apiVersion}/module/${format}/${compat}${localePart}${environmentPart}/mi/`;
@@ -255,9 +256,11 @@ export function getModuleUriPrefix({ apiVersion, bundle, format, compat, basePat
  * @param param0 - URI props from the Runtime Environment
  * @param param1 - URI props from the Runtime Params
  */
-export function getMappingUriPrefix({ apiVersion, format, compat, basePath }, { locale } = {}) {
+export function getMappingUriPrefix({ apiVersion, bundle, format, compat, basePath }, { locale, environment } = {}) {
     const localePart = locale ? `/${LOCALE_SIGIL}/${locale}` : '';
-    return `${basePath}/${apiVersion}/mapping/${format}/${compat}${localePart}/mp/`;
+    const environmentPart = environment ? `/${ENVIRONMENT_SIGIL}/${environment}` : '';
+    const bundlePart = bundle ? `/${BUNDLE_SIGIL}/0` : '';
+    return `${basePath}/${apiVersion}/mapping/${format}/${compat}${localePart}${environmentPart}${bundlePart}/mp/`;
 }
 export { getCacheKeyFromJson };
 const REGEX_URL_SCHEMA_PREFIX = /^(https?|\/\/)/;
@@ -278,7 +281,10 @@ export function getModuleIdentity(req) {
 }
 export function getMappingIdentity(req) {
     const { specifiers } = req.params;
-    const moduleIds = explodeSpecifiers(specifiers);
+    const moduleIds = explodeSpecifiers(specifiers).map((obj) => ({
+        ...obj,
+        importer: req.query.importer,
+    }));
     return {
         moduleIds,
     };

package/build/es/mappings.js

@@ -10,7 +10,9 @@ export async function getImportMetadataMappings(moduleIds, runtimeEnvironment, r
         index: {},
     };
     for (const moduleId of moduleIds) {
-        const specifier = getSpecifier(moduleId);
+        const requestedSpecifier = getSpecifier(moduleId);
+        // eslint-disable-next-line no-await-in-loop
+        const specifier = await getVersionedSpecifier(moduleId, moduleRegistry);
         // Check if we have already visited
         if (!visitedCache.has(specifier)) {
             // Traversal of the Module Graph is done to get all the URLs for discoverable dependencies.
@@ -27,6 +29,15 @@ export async function getImportMetadataMappings(moduleIds, runtimeEnvironment, r
             // eslint-disable-next-line no-await-in-loop
             importMetadata = await toImportMetadata(moduleGraph, importMetadata, moduleRegistry, runtimeEnvironment, runtimeParams);
         }
+        // If the requested specifier is not the same as the versioned specifier, include the requested specifier's importer.
+        if (requestedSpecifier !== specifier) {
+            const requestedSpecifierPlusImporter = `${requestedSpecifier}?importer=${moduleId.importer}`;
+            const specifiersArray = Object.values(importMetadata.imports).find((a) => a.includes(specifier));
+            if (!specifiersArray) {
+                throw new Error('Could not find: ' + specifier + ' in ' + JSON.stringify(importMetadata.imports));
+            }
+            specifiersArray.push(requestedSpecifierPlusImporter);
+        }
     }
     return importMetadata;
 }
@@ -141,4 +152,13 @@ async function createIndex(specifiers, moduleRegistry, runtimeEnvironment, runti
     await Promise.all(promises);
     return index;
 }
+async function getVersionedSpecifier(moduleId, moduleRegistry) {
+    if (!moduleId.importer || moduleId.version) {
+        return getSpecifier(moduleId);
+    }
+    const versionedModuleEntry = await moduleRegistry.getModuleEntry({
+        ...moduleId,
+    });
+    return getSpecifier(versionedModuleEntry);
+}
 //# sourceMappingURL=mappings.js.map

package/package.json

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