@lwrjs/lwc-module-provider 0.9.0-alpha.14 → 0.9.0-alpha.16

package/build/cjs/index.cjs

@@ -76,13 +76,14 @@ var LwcModuleProvider = class {
   }
   async getModule(moduleId) {
     const id = (0, import_shared_utils.getSpecifier)(moduleId);
+    import_shared_utils.logger.debug(`[lwc-module-provider ] getModule ${id}`);
     return this.inflightGetModuleJobs.execute(id, () => {
       return this.createGetModuleJob(moduleId);
     });
   }
   async createGetModuleJob(moduleId) {
     const {watcher, watchedModuleContextMap, lwcCacheDir, lwcCacheIndex, moduleFsCacheEnabled} = this;
-    import_shared_utils.logger.debug("createGetModuleJob", {moduleId});
+    import_shared_utils.logger.debug("[lwc-module-provider ] fetch module", {moduleId, moduleFsCacheEnabled});
     const moduleEntry = await this.getModuleEntry(moduleId);
     if (!moduleEntry) {
       return;
@@ -91,10 +92,14 @@ var LwcModuleProvider = class {
     const {id, namespace, name: rawName, originalSource} = moduleSource;
     const cacheConfig = {lwcCacheDir, lwcCacheIndex};
     let compiledModule = moduleFsCacheEnabled && (0, import_cache.getCompiledModuleCacheEntry)(moduleSource, cacheConfig);
+    import_shared_utils.logger.debug("[lwc-module-provider ] module source ", {
+      moduleId,
+      isPreCompiled: compiledModule != void 0
+    });
     if (!compiledModule) {
       const [name] = rawName.split("#");
       const scopedStyles = moduleEntry.entry.endsWith(".css") && moduleEntry.specifier.endsWith("?scoped=true");
-      import_shared_utils.logger.debug("createGetModuleJob:compile", {
+      import_shared_utils.logger.debug("[lwc-module-provider] compile", {
         namespace,
         name,
         filename: moduleEntry.entry,
@@ -106,7 +111,7 @@ var LwcModuleProvider = class {
         filename: moduleEntry.entry,
         scopedStyles
       });
-      import_shared_utils.logger.verbose("createGetModuleJob:compile compiledModule", {
+      import_shared_utils.logger.verbose("[lwc-module-provider] createGetModuleJob:compile compiledModule", {
         namespace,
         name,
         filename: moduleEntry.entry,
@@ -153,7 +158,7 @@ var LwcModuleProvider = class {
     importer,
     version
   }) {
-    import_shared_utils.logger.debug("getModuleEntry", {specifier, importer, version});
+    import_shared_utils.logger.debug(`[lwc-module-provider] getModuleEntry ${specifier}@${version}@${importer}`);
     const versionId = version || importer;
     if (versionId) {
       const cacheKey2 = getModuleEntryCacheKey(specifier, versionId);
@@ -162,7 +167,6 @@ var LwcModuleProvider = class {
       }
     }
     const cacheKey = `${specifier}@${version}@${importer}`;
-    import_shared_utils.logger.debug("getModuleEntry:cacheKey", {cacheKey});
     return this.inflightGetModuleEntryJobs.execute(cacheKey, async () => {
       return this.createModuleEntry({specifier, importer, version});
     });
@@ -172,7 +176,12 @@ var LwcModuleProvider = class {
     importer,
     version
   }) {
-    import_shared_utils.logger.debug("createModuleEntry", {specifier, importer, rootDir: this.rootDir, version});
+    import_shared_utils.logger.debug("[lwc-module-provider] createModuleEntry", {
+      specifier,
+      importer,
+      rootDir: this.rootDir,
+      version
+    });
     const [baseSpecifier, fileRelativePathRaw] = specifier.split("#");
     const fileRelativePath = fileRelativePathRaw?.split("?")[0];
     let moduleEntry;
@@ -182,14 +191,14 @@ var LwcModuleProvider = class {
     }
     if (!moduleEntry) {
       try {
-        import_shared_utils.logger.debug("createModuleEntry:resolveModuleSpecifier", {
+        import_shared_utils.logger.debug("[lwc-module-provider] createModuleEntry:resolveModuleSpecifier", {
           baseSpecifier,
           importer,
           rootDir: this.rootDir,
           modules: this.modules
         });
         const registryEntry = (0, import_utils.resolveModuleSpecifier)(baseSpecifier, importer || this.rootDir, this.modules, this.packageVersionCache);
-        import_shared_utils.logger.debug("createModuleEntry:registryEntry", {registryEntry});
+        import_shared_utils.logger.debug("[lwc-module-provider] createModuleEntry:registryEntry", {registryEntry});
         moduleEntry = {
           id: getModuleEntryCacheKey(registryEntry.specifier, registryEntry.version),
           ...registryEntry

package/build/cjs/utils.cjs

@@ -37,9 +37,18 @@ var import_module_resolver = __toModule(require("@lwc/module-resolver"));
 var EXPLICIT_CONSTANT = "/* _implicit_dependency_ */";
 var DEFAULT_IMPLICIT_DEP = `${EXPLICIT_CONSTANT} export default void 0`;
 function resolveModuleSpecifier(specifier, importer, modules = [], packageVersionCache) {
-  import_shared_utils.logger.debug("resolveModuleSpecifier", {specifier, importer, modules});
-  const resolvedModule = (0, import_module_resolver.resolveModule)(specifier, importer, {modules});
-  import_shared_utils.logger.debug("resolveModuleSpecifier:resolvedModule", {resolvedModule});
+  import_shared_utils.logger.debug("[lwc-module-provider] resolveModuleSpecifier", {specifier, importer, modules});
+  let resolvedModule;
+  try {
+    resolvedModule = (0, import_module_resolver.resolveModule)(specifier, importer, {modules});
+  } catch (error) {
+    if (import_shared_utils.logger.currentLevel == import_shared_utils.DEBUG || import_shared_utils.logger.currentLevel == import_shared_utils.VERBOSE) {
+      import_shared_utils.logger.debug(`[lwc-module-provider] @lwc/module-resolver/resolveModule ${specifier}`);
+      import_shared_utils.logger.error(error);
+    }
+    throw error;
+  }
+  import_shared_utils.logger.debug("[lwc-module-provider] resolveModuleSpecifier:resolvedModule", {resolvedModule});
   const moduleScope = resolvedModule.scope;
   let version;
   if (packageVersionCache.has(moduleScope)) {

package/build/es/index.js

@@ -47,6 +47,7 @@ export default class LwcModuleProvider {
     }
     async getModule(moduleId) {
         const id = getSpecifier(moduleId);
+        logger.debug(`[lwc-module-provider ] getModule ${id}`);
         return this.inflightGetModuleJobs.execute(id, () => {
             return this.createGetModuleJob(moduleId);
         });
@@ -58,7 +59,7 @@ export default class LwcModuleProvider {
      */
     async createGetModuleJob(moduleId) {
         const { watcher, watchedModuleContextMap, lwcCacheDir, lwcCacheIndex, moduleFsCacheEnabled } = this;
-        logger.debug('createGetModuleJob', { moduleId });
+        logger.debug('[lwc-module-provider ] fetch module', { moduleId, moduleFsCacheEnabled });
         const moduleEntry = await this.getModuleEntry(moduleId);
         if (!moduleEntry) {
             return;
@@ -67,10 +68,14 @@ export default class LwcModuleProvider {
         const { id, namespace, name: rawName, originalSource } = moduleSource;
         const cacheConfig = { lwcCacheDir, lwcCacheIndex };
         let compiledModule = moduleFsCacheEnabled && getCompiledModuleCacheEntry(moduleSource, cacheConfig);
+        logger.debug('[lwc-module-provider ] module source ', {
+            moduleId,
+            isPreCompiled: compiledModule != undefined,
+        });
         if (!compiledModule) {
             const [name] = rawName.split('#');
             const scopedStyles = moduleEntry.entry.endsWith('.css') && moduleEntry.specifier.endsWith('?scoped=true');
-            logger.debug('createGetModuleJob:compile', {
+            logger.debug('[lwc-module-provider] compile', {
                 namespace,
                 name,
                 filename: moduleEntry.entry,
@@ -83,7 +88,7 @@ export default class LwcModuleProvider {
                 filename: moduleEntry.entry,
                 scopedStyles,
             });
-            logger.verbose('createGetModuleJob:compile compiledModule', {
+            logger.verbose('[lwc-module-provider] createGetModuleJob:compile compiledModule', {
                 namespace,
                 name,
                 filename: moduleEntry.entry,
@@ -126,7 +131,7 @@ export default class LwcModuleProvider {
         return moduleSource;
     }
     async getModuleEntry({ specifier, importer, version, }) {
-        logger.debug('getModuleEntry', { specifier, importer, version });
+        logger.debug(`[lwc-module-provider] getModuleEntry ${specifier}@${version}@${importer}`);
         // Check cache
         const versionId = version || importer;
         if (versionId) {
@@ -136,13 +141,17 @@ export default class LwcModuleProvider {
             }
         }
         const cacheKey = `${specifier}@${version}@${importer}`;
-        logger.debug('getModuleEntry:cacheKey', { cacheKey });
         return this.inflightGetModuleEntryJobs.execute(cacheKey, async () => {
             return this.createModuleEntry({ specifier, importer, version });
         });
     }
     async createModuleEntry({ specifier, importer, version, }) {
-        logger.debug('createModuleEntry', { specifier, importer, rootDir: this.rootDir, version });
+        logger.debug('[lwc-module-provider] createModuleEntry', {
+            specifier,
+            importer,
+            rootDir: this.rootDir,
+            version,
+        });
         // Strip any filenames out of the specifier
         // eg: 'c/myApp#myApp.css' => 'c/myApp' and 'myApp.css'
         // eg: 'some/where#lib/util' => 'some/where' and 'lib/util'
@@ -157,14 +166,14 @@ export default class LwcModuleProvider {
         // Nothing from cache, let's try to resolve it first from lwc then from npm
         if (!moduleEntry) {
             try {
-                logger.debug('createModuleEntry:resolveModuleSpecifier', {
+                logger.debug('[lwc-module-provider] createModuleEntry:resolveModuleSpecifier', {
                     baseSpecifier,
                     importer,
                     rootDir: this.rootDir,
                     modules: this.modules,
                 });
                 const registryEntry = resolveModuleSpecifier(baseSpecifier, importer || this.rootDir, this.modules, this.packageVersionCache);
-                logger.debug('createModuleEntry:registryEntry', { registryEntry });
+                logger.debug('[lwc-module-provider] createModuleEntry:registryEntry', { registryEntry });
                 moduleEntry = {
                     id: getModuleEntryCacheKey(registryEntry.specifier, registryEntry.version),
                     ...registryEntry,

package/build/es/utils.js

@@ -1,13 +1,24 @@
 import fs from 'fs';
 import path from 'path';
-import { readFile, debounce, logger } from '@lwrjs/shared-utils';
+import { readFile, debounce, logger, DEBUG, VERBOSE } from '@lwrjs/shared-utils';
 import { resolveModule } from '@lwc/module-resolver';
 export const EXPLICIT_CONSTANT = '/* _implicit_dependency_ */';
 export const DEFAULT_IMPLICIT_DEP = `${EXPLICIT_CONSTANT} export default void 0`;
 export function resolveModuleSpecifier(specifier, importer, modules = [], packageVersionCache) {
-    logger.debug('resolveModuleSpecifier', { specifier, importer, modules });
-    const resolvedModule = resolveModule(specifier, importer, { modules });
-    logger.debug('resolveModuleSpecifier:resolvedModule', { resolvedModule });
+    logger.debug('[lwc-module-provider] resolveModuleSpecifier', { specifier, importer, modules });
+    let resolvedModule;
+    try {
+        resolvedModule = resolveModule(specifier, importer, { modules });
+    }
+    catch (error) {
+        if (logger.currentLevel == DEBUG || logger.currentLevel == VERBOSE) {
+            // If log level is debug or greater.  Otherwise error will be swalloed and resolved by npm-resolver
+            logger.debug(`[lwc-module-provider] @lwc/module-resolver/resolveModule ${specifier}`);
+            logger.error(error);
+        }
+        throw error;
+    }
+    logger.debug('[lwc-module-provider] resolveModuleSpecifier:resolvedModule', { resolvedModule });
     const moduleScope = resolvedModule.scope;
     let version;
     if (packageVersionCache.has(moduleScope)) {

package/package.json

@@ -4,15 +4,15 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.9.0-alpha.14",
+    "version": "0.9.0-alpha.16",
     "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/fs-service"
     },
     "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",
@@ -32,14 +32,14 @@
     "dependencies": {
         "@babel/preset-typescript": "^7.9.0",
         "@lwc/module-resolver": "2.33.0",
-        "@lwrjs/shared-utils": "0.9.0-alpha.14",
+        "@lwrjs/shared-utils": "0.9.0-alpha.16",
         "es-module-lexer": "^0.3.18"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.9.0-alpha.14"
+        "@lwrjs/types": "0.9.0-alpha.16"
     },
     "engines": {
         "node": ">=14.15.4 <19"
     },
-    "gitHead": "64e0ba617151429da6e09f1a9686628f64183d25"
+    "gitHead": "03fe3982780e7c63b96ef0733b58529057db61fa"
 }