@lwrjs/shared-utils 0.9.0-alpha.15 → 0.9.0-alpha.17

package/build/cjs/graph.cjs

@@ -25,7 +25,8 @@ var __toModule = (module2) => {
 __markAsModule(exports);
 __export(exports, {
   GraphDepth: () => GraphDepth,
-  getModuleGraphs: () => getModuleGraphs
+  getModuleGraphs: () => getModuleGraphs,
+  isBundler: () => isBundler
 });
 var import_identity = __toModule(require("./identity.cjs"));
 var import_diagnostics = __toModule(require("@lwrjs/diagnostics"));

package/build/cjs/logger.cjs

@@ -74,21 +74,29 @@ function log(level, message, additionalInfo) {
     }
   }
   if (shouldLog) {
-    let logMessage;
-    if (additionalInfo) {
-      logMessage = `[${level}]${gap(message)}${message} 
-Additional Info: ${JSON.stringify(additionalInfo)}`;
-    } else {
-      logMessage = `[${level}]${gap(message)}${message}`;
-    }
+    const logMessage = `[${level}]${gap(message)}${message}`;
+    const additionalMessage = additionalInfo ? `Additional Info: ${JSON.stringify(additionalInfo)}` : void 0;
     if (level == ERROR) {
       console.error("%s", logMessage);
+      if (additionalInfo) {
+        console.error("\n%s", additionalMessage);
+      }
     } else if (level == WARN) {
       console.warn("%s", logMessage);
+      if (additionalInfo) {
+        console.warn("\n%s", additionalMessage);
+      }
     } else if (level == DEBUG || level == VERBOSE) {
       console.log("%s", logMessage);
+      if (additionalInfo) {
+        console.log("\n%s", additionalMessage);
+      }
     } else {
       console.log(logMessage);
+      if (additionalInfo) {
+        console.log(`
+${additionalMessage}`);
+      }
     }
   }
 }

package/build/cjs/mappings.cjs

@@ -57,7 +57,7 @@ async function getImportMetadataMappings(moduleIds, runtimeEnvironment, runtimeP
   }
   return importMetadata;
 }
-async function toImportMetadata(moduleGraph, existingImportMetadata = {imports: {}, index: {}}, defRegistry, runtimeEnvironment, runtimeParams = {}) {
+async function toImportMetadata(moduleGraph, existingImportMetadata = {imports: {}, index: {}}, moduleRegistry, runtimeEnvironment, runtimeParams = {}) {
   const specifier = moduleGraph.graphs[0].specifier;
   const uri = moduleGraph.uriMap[specifier];
   const definition = moduleGraph.linkedDefinitions[specifier];
@@ -67,7 +67,7 @@ async function toImportMetadata(moduleGraph, existingImportMetadata = {imports:
   if (!definition) {
     throw new Error("Linked module definition was not included in the graph: " + specifier);
   }
-  const rootMetadata = await normalizeImportMetadata(specifier, uri, definition, defRegistry, runtimeEnvironment, runtimeParams);
+  const rootMetadata = await normalizeImportMetadata(specifier, uri, definition, moduleRegistry, runtimeEnvironment, runtimeParams);
   let importMetadata = mergeImportMetadata(existingImportMetadata, rootMetadata);
   const depSpecifiers = runtimeEnvironment.format === "esm" ? moduleGraph.graphs[0].dynamicRefs : moduleGraph.graphs[0].static;
   for (const depSpecifier of depSpecifiers) {
@@ -85,7 +85,7 @@ async function toImportMetadata(moduleGraph, existingImportMetadata = {imports:
       continue;
     }
     if (!importMetadata.imports[depUri]) {
-      const depMetadata = await normalizeImportMetadata((0, import_identity.getSpecifier)(depDef), depUri, depDef, defRegistry, runtimeEnvironment, runtimeParams);
+      const depMetadata = await normalizeImportMetadata((0, import_identity.getSpecifier)(depDef), depUri, depDef, moduleRegistry, runtimeEnvironment, runtimeParams);
       importMetadata = mergeImportMetadata(importMetadata, depMetadata);
     }
   }
@@ -103,11 +103,11 @@ function mergeImportMetadata(existing, newMetadata) {
     }
   };
 }
-async function normalizeImportMetadata(specifier, uri, definition, defRegistry, moduleRuntimeEnvironment, runtimeParams) {
+async function normalizeImportMetadata(specifier, uri, definition, moduleRegistry, moduleRuntimeEnvironment, runtimeParams) {
   const specifiers = normalizedIncludedModules(definition);
   const imports = {};
   imports[uri] = specifiers;
-  const index = await createIndex(specifiers, defRegistry, moduleRuntimeEnvironment, runtimeParams);
+  const index = await createIndex(specifiers, moduleRegistry, moduleRuntimeEnvironment, runtimeParams);
   if (!(specifier in index)) {
     index[specifier] = uri;
   }
@@ -119,7 +119,7 @@ async function normalizeImportMetadata(specifier, uri, definition, defRegistry,
 function normalizedIncludedModules(definition) {
   return (0, import_identity.isBundleDefinition)(definition) ? [(0, import_identity.getSpecifier)(definition), ...definition.bundleRecord.includedModules] : [(0, import_identity.getSpecifier)(definition)];
 }
-async function createIndex(specifiers, defRegistry, runtimeEnvironment, runtimeParams) {
+async function createIndex(specifiers, moduleRegistry, runtimeEnvironment, runtimeParams) {
   const index = {};
   const moduleRuntimeEnvironment = {...runtimeEnvironment, bundle: false};
   async function getUri(specifier) {
@@ -127,7 +127,7 @@ async function createIndex(specifiers, defRegistry, runtimeEnvironment, runtimeP
     if (!moduleId.version) {
       throw new Error("Module specifier must include a version: " + specifier);
     }
-    index[specifier] = await defRegistry.resolveModuleUri({...moduleId, version: moduleId.version}, moduleRuntimeEnvironment, runtimeParams);
+    index[specifier] = await moduleRegistry.resolveModuleUri({...moduleId, version: moduleId.version}, moduleRuntimeEnvironment, runtimeParams);
   }
   const promises = [];
   for (const specifier of specifiers) {

package/build/cjs/site-metadata.cjs

@@ -29,7 +29,7 @@ __export(exports, {
 var import_path = __toModule(require("path"));
 var import_fs_extra = __toModule(require("fs-extra"));
 var import_logger = __toModule(require("./logger.cjs"));
-var SITE_METADATA_PATH = "site-metadata";
+var SITE_METADATA_PATH = ".metadata";
 var STATIC_BUNDLE_METADATA_PATH = import_path.default.join(SITE_METADATA_PATH, "/bundle-metadata.json");
 var STATIC_RESOURCE_METADATA_PATH = import_path.default.join(SITE_METADATA_PATH, "/resource-metadata.json");
 var STATIC_ASSET_METADATA_PATH = import_path.default.join(SITE_METADATA_PATH, "/asset-metadata.json");
@@ -40,6 +40,9 @@ var SiteMetadataImpl = class {
     this.siteResources = this.readStaticResourceMetadata(options.rootDir);
     this.siteAssets = this.readStaticAssetsMetadata(options.rootDir);
   }
+  getSiteRootDir() {
+    return this.options.rootDir;
+  }
   getSiteBundles() {
     return this.siteBundles;
   }

package/build/es/graph.d.ts

@@ -1,9 +1,10 @@
-import { ModuleRegistry, RuntimeEnvironment, RuntimeParams, FlattenedModuleGraphs, GraphNode, GraphOptions, ModuleBundler } from '@lwrjs/types';
+import type { ModuleRegistry, RuntimeEnvironment, RuntimeParams, FlattenedModuleGraphs, GraphNode, GraphOptions, ModuleBundler, PublicModuleRegistry, PublicModuleBundler } from '@lwrjs/types';
 export declare enum GraphDepth {
     ALL = "all",
     DIRECT = "direct",
     NONE = "none"
 }
+export declare function isBundler(registry: PublicModuleRegistry | PublicModuleBundler): registry is PublicModuleBundler;
 export declare function getModuleGraphs(specifier: string, // version | un-versioned specifiers
 options: GraphOptions, moduleRegistry: ModuleRegistry, defRegistry: ModuleRegistry | ModuleBundler, runtimeEnvironment: RuntimeEnvironment, runtimeParams?: RuntimeParams, visited?: Map<string, GraphNode>): Promise<FlattenedModuleGraphs>;
 //# sourceMappingURL=graph.d.ts.map

package/build/es/graph.js

@@ -8,7 +8,7 @@ export var GraphDepth;
     GraphDepth["NONE"] = "none";
 })(GraphDepth || (GraphDepth = {}));
 // type guard for ViewDef responses
-function isBundler(registry) {
+export function isBundler(registry) {
     return registry.getModuleBundle !== undefined;
 }
 async function traverse(module, depth, flattened, 

package/build/es/logger.js

@@ -43,24 +43,33 @@ function log(level, message, additionalInfo) {
         }
     }
     if (shouldLog) {
-        let logMessage;
-        if (additionalInfo) {
-            logMessage = `[${level}]${gap(message)}${message} \nAdditional Info: ${JSON.stringify(additionalInfo)}`;
-        }
-        else {
-            logMessage = `[${level}]${gap(message)}${message}`;
-        }
+        const logMessage = `[${level}]${gap(message)}${message}`;
+        const additionalMessage = additionalInfo
+            ? `Additional Info: ${JSON.stringify(additionalInfo)}`
+            : undefined;
         if (level == ERROR) {
             console.error('\x1b[31m%s\x1b[0m', logMessage); // red
+            if (additionalInfo) {
+                console.error('\n\x1b[31m%s\x1b[0m', additionalMessage); // red
+            }
         }
         else if (level == WARN) {
             console.warn('\x1b[33m%s\x1b[0m', logMessage); // yellow
+            if (additionalInfo) {
+                console.warn('\n\x1b[33m%s\x1b[0m', additionalMessage); // yellow
+            }
         }
         else if (level == DEBUG || level == VERBOSE) {
             console.log('\x1b[2m%s\x1b[0m', logMessage); // dim
+            if (additionalInfo) {
+                console.log('\n\x1b[2m%s\x1b[0m', additionalMessage); // dim
+            }
         }
         else {
             console.log(logMessage);
+            if (additionalInfo) {
+                console.log(`\n${additionalMessage}`);
+            }
         }
     }
 }

package/build/es/mappings.d.ts

@@ -15,5 +15,5 @@ export declare function getImportMetadataMappings(moduleIds: AbstractModuleId[],
  * @param existingImportMetadata Optional existing ImportMetadata.  If provided the results will be a merge the two sets of URI mappings.
  * @returns Returns ImportMetadata from a module graph in the format here -> https://rfcs.lwc.dev/rfcs/lwr/0000-mapping-api#uri-mapping-resource-specification
  */
-export declare function toImportMetadata(moduleGraph: FlattenedModuleGraphs, existingImportMetadata: ImportMetadata | undefined, defRegistry: ModuleRegistry | ModuleBundler, runtimeEnvironment: RuntimeEnvironment, runtimeParams?: RuntimeParams): Promise<ImportMetadata>;
+export declare function toImportMetadata(moduleGraph: FlattenedModuleGraphs, existingImportMetadata: ImportMetadata | undefined, moduleRegistry: ModuleRegistry, runtimeEnvironment: RuntimeEnvironment, runtimeParams?: RuntimeParams): Promise<ImportMetadata>;
 //# sourceMappingURL=mappings.d.ts.map

package/build/es/mappings.js

@@ -53,7 +53,7 @@ export async function getImportMetadataMappings(moduleIds, runtimeEnvironment, r
  * @param existingImportMetadata Optional existing ImportMetadata.  If provided the results will be a merge the two sets of URI mappings.
  * @returns Returns ImportMetadata from a module graph in the format here -> https://rfcs.lwc.dev/rfcs/lwr/0000-mapping-api#uri-mapping-resource-specification
  */
-export async function toImportMetadata(moduleGraph, existingImportMetadata = { imports: {}, index: {} }, defRegistry, runtimeEnvironment, runtimeParams = {}) {
+export async function toImportMetadata(moduleGraph, existingImportMetadata = { imports: {}, index: {} }, moduleRegistry, runtimeEnvironment, runtimeParams = {}) {
     // root module specifier
     const specifier = moduleGraph.graphs[0].specifier;
     const uri = moduleGraph.uriMap[specifier];
@@ -65,7 +65,7 @@ export async function toImportMetadata(moduleGraph, existingImportMetadata = { i
         throw new Error('Linked module definition was not included in the graph: ' + specifier);
     }
     // Merge in the existing metadata with imports for the root specifier
-    const rootMetadata = await normalizeImportMetadata(specifier, uri, definition, defRegistry, runtimeEnvironment, runtimeParams);
+    const rootMetadata = await normalizeImportMetadata(specifier, uri, definition, moduleRegistry, runtimeEnvironment, runtimeParams);
     let importMetadata = mergeImportMetadata(existingImportMetadata, rootMetadata);
     // root module dependencies:
     //  - static for AMD; dynamic dependencies require a new mapping request
@@ -91,7 +91,7 @@ export async function toImportMetadata(moduleGraph, existingImportMetadata = { i
         }
         if (!importMetadata.imports[depUri]) {
             // eslint-disable-next-line no-await-in-loop
-            const depMetadata = await normalizeImportMetadata(getSpecifier(depDef), depUri, depDef, defRegistry, runtimeEnvironment, runtimeParams);
+            const depMetadata = await normalizeImportMetadata(getSpecifier(depDef), depUri, depDef, moduleRegistry, runtimeEnvironment, runtimeParams);
             importMetadata = mergeImportMetadata(importMetadata, depMetadata);
         }
     }
@@ -110,12 +110,12 @@ function mergeImportMetadata(existing, newMetadata) {
         },
     };
 }
-async function normalizeImportMetadata(specifier, uri, definition, defRegistry, moduleRuntimeEnvironment, runtimeParams) {
+async function normalizeImportMetadata(specifier, uri, definition, moduleRegistry, moduleRuntimeEnvironment, runtimeParams) {
     const specifiers = normalizedIncludedModules(definition);
     const imports = {};
     imports[uri] = specifiers;
     // The index info for the modules included in a bundle
-    const index = await createIndex(specifiers, defRegistry, moduleRuntimeEnvironment, runtimeParams);
+    const index = await createIndex(specifiers, moduleRegistry, moduleRuntimeEnvironment, runtimeParams);
     // If root specifier was not included in createIndex add an entry where the uri is the index
     if (!(specifier in index)) {
         index[specifier] = uri;
@@ -132,7 +132,7 @@ function normalizedIncludedModules(definition) {
         ? [getSpecifier(definition), ...definition.bundleRecord.includedModules]
         : [getSpecifier(definition)];
 }
-async function createIndex(specifiers, defRegistry, runtimeEnvironment, runtimeParams) {
+async function createIndex(specifiers, moduleRegistry, runtimeEnvironment, runtimeParams) {
     const index = {};
     // We need a runtime environment for modules when building the index for a bundle
     const moduleRuntimeEnvironment = { ...runtimeEnvironment, bundle: false };
@@ -141,7 +141,9 @@ async function createIndex(specifiers, defRegistry, runtimeEnvironment, runtimeP
         if (!moduleId.version) {
             throw new Error('Module specifier must include a version: ' + specifier);
         }
-        index[specifier] = await defRegistry.resolveModuleUri({ ...moduleId, version: moduleId.version }, moduleRuntimeEnvironment, runtimeParams);
+        // Do not use replace with the moduleBundler.  Otherwize we will create a bundle from every
+        // root just to get the URL.
+        index[specifier] = await moduleRegistry.resolveModuleUri({ ...moduleId, version: moduleId.version }, moduleRuntimeEnvironment, runtimeParams);
     }
     // Queue up uri requests
     const promises = [];

package/build/es/site-metadata.d.ts

@@ -9,6 +9,7 @@ export declare class SiteMetadataImpl implements SiteMetadata {
     private siteResources;
     private siteAssets;
     constructor(options: Options);
+    getSiteRootDir(): string;
     getSiteBundles(): SiteBundles;
     getSiteResources(): SiteResources;
     getSiteAssets(): SiteAssets;

package/build/es/site-metadata.js

@@ -1,7 +1,7 @@
 import path from 'path';
 import fs from 'fs-extra';
 import { logger } from './logger.js';
-const SITE_METADATA_PATH = 'site-metadata';
+const SITE_METADATA_PATH = '.metadata';
 const STATIC_BUNDLE_METADATA_PATH = path.join(SITE_METADATA_PATH, '/bundle-metadata.json');
 const STATIC_RESOURCE_METADATA_PATH = path.join(SITE_METADATA_PATH, '/resource-metadata.json');
 const STATIC_ASSET_METADATA_PATH = path.join(SITE_METADATA_PATH, '/asset-metadata.json');
@@ -12,6 +12,9 @@ export class SiteMetadataImpl {
         this.siteResources = this.readStaticResourceMetadata(options.rootDir);
         this.siteAssets = this.readStaticAssetsMetadata(options.rootDir);
     }
+    getSiteRootDir() {
+        return this.options.rootDir;
+    }
     getSiteBundles() {
         return this.siteBundles;
     }

package/build/es/typescript.js

@@ -3,7 +3,7 @@ import { join, dirname, extname } from 'path';
 import esbuildEsm from 'esbuild';
 // https://github.com/evanw/esbuild/issues/706
 // Fixed in 0.11.0 but upgrading past 0.9.7 has caused breaking changes for consumers...
-// https://github.com/salesforce-experience-platform/lwr/issues/1014
+// https://github.com/salesforce-experience-platform-emu/lwr/issues/1014
 let esbuild = esbuildEsm;
 if (!esbuildEsm) {
     try {

package/package.json

@@ -4,18 +4,18 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.9.0-alpha.15",
+    "version": "0.9.0-alpha.17",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
-        "url": "https://github.com/salesforce/lwr.git",
+        "url": "https://github.com/salesforce-experience-platform-emu/lwr.git",
         "directory": "packages/@lwrjs/shared-utils"
     },
     "scripts": {
         "build": "tsc -b"
     },
     "bugs": {
-        "url": "https://github.com/salesforce/lwr/issues"
+        "url": "https://github.com/salesforce-experience-platform-emu/lwr/issues"
     },
     "type": "module",
     "types": "build/es/index.d.ts",
@@ -54,20 +54,20 @@
         "path-to-regexp": "^6.2.0",
         "slugify": "^1.4.5"
     },
-    "optionalDependencies": {
+    "peerDependencies": {
         "@locker/compiler": "0.18.2",
         "chokidar": "^3.5.3",
         "esbuild": "^0.9.7",
         "rollup": "~2.45.2"
     },
     "devDependencies": {
-        "@lwrjs/diagnostics": "0.9.0-alpha.15",
-        "@lwrjs/types": "0.9.0-alpha.15",
+        "@lwrjs/diagnostics": "0.9.0-alpha.17",
+        "@lwrjs/types": "0.9.0-alpha.17",
         "@types/mime-types": "2.1.1",
         "@types/path-to-regexp": "^1.7.0"
     },
     "engines": {
         "node": ">=14.15.4 <19"
     },
-    "gitHead": "f32f103d2d5e516daccce1be69f68acd7b4b86fb"
+    "gitHead": "447417ff091802927b25cfc1bcb01da02264f41b"
 }