@lwrjs/lwc-module-provider 0.11.3 → 0.11.5

package/build/cjs/compiler.cjs

@@ -54,17 +54,33 @@ var LwcCompiler = class {
         presets: [["@babel/preset-typescript", {onlyRemoveTypeImports: false}]],
         filename
       };
-      import_diagnostics.logger.debug("babelTransform", {babelConfig});
+      import_diagnostics.logger.debug({
+        label: "LwcCompiler",
+        message: "babelTransform",
+        additionalInfo: {babelConfig}
+      });
       let result;
       try {
         result = (0, import_core.transformSync)(source, babelConfig);
       } catch (error) {
-        import_diagnostics.logger.debug("babelTransform error", error);
+        import_diagnostics.logger.debug({
+          label: "LwcCompiler",
+          message: "babelTransform error",
+          additionalInfo: error
+        });
         throw error;
       }
-      import_diagnostics.logger.verbose("babelTransform result", {result});
+      import_diagnostics.logger.verbose({
+        label: "LwcCompiler",
+        message: "babelTransform result",
+        additionalInfo: {result}
+      });
       if (!result || !result.code) {
-        import_diagnostics.logger.debug("babelTransform invalid result", {result});
+        import_diagnostics.logger.debug({
+          label: "LwcCompiler",
+          message: "babelTransform invalid result",
+          additionalInfo: {result}
+        });
         throw new Error(`Error TS compiling ${filename}`);
       }
       source = result.code;
@@ -87,9 +103,17 @@ var LwcCompiler = class {
       enableLightningWebSecurityTransforms,
       enableScopedSlots: true
     };
-    import_diagnostics.logger.debug("transformSync", {filename, transformConfig});
+    import_diagnostics.logger.debug({
+      label: "LwcCompiler",
+      message: "transformSync",
+      additionalInfo: {filename, transformConfig}
+    });
     const compilerResult = (0, import_compiler.transformSync)(source, filename, transformConfig);
-    import_diagnostics.logger.verbose("transformSync result", {compilerResult});
+    import_diagnostics.logger.verbose({
+      label: "LwcCompiler",
+      message: "transformSync result",
+      additionalInfo: {compilerResult}
+    });
     return {
       code: compilerResult.code,
       map: null,

package/build/cjs/index.cjs

@@ -78,14 +78,18 @@ var LwcModuleProvider = class {
   }
   async getModule(moduleId) {
     const id = (0, import_shared_utils.getSpecifier)(moduleId);
-    import_diagnostics.logger.debug(`[lwc-module-provider ] getModule ${id}`);
+    import_diagnostics.logger.debug({label: `${this.name}`, message: `getModule ${id}`});
     return this.inflightGetModuleJobs.execute(id, () => {
       return this.createGetModuleJob(moduleId);
     });
   }
   async createGetModuleJob(moduleId) {
     const {watcher, watchedModuleContextMap, lwcCacheDir, lwcCacheIndex, moduleFsCacheEnabled} = this;
-    import_diagnostics.logger.debug("[lwc-module-provider ] fetch module", {moduleId, moduleFsCacheEnabled});
+    import_diagnostics.logger.debug({
+      label: `${this.name}`,
+      message: "fetch module",
+      additionalInfo: {moduleId, moduleFsCacheEnabled}
+    });
     const moduleEntry = await this.getModuleEntry(moduleId);
     if (!moduleEntry) {
       return;
@@ -94,19 +98,27 @@ var LwcModuleProvider = class {
     const {id, namespace, name: rawName, originalSource} = moduleSource;
     const cacheConfig = {lwcCacheDir, lwcCacheIndex};
     let compiledModule = moduleFsCacheEnabled && (0, import_cache.getCompiledModuleCacheEntry)(moduleSource, cacheConfig);
-    import_diagnostics.logger.debug("[lwc-module-provider ] module source ", {
-      moduleId,
-      isPreCompiled: compiledModule != void 0
+    import_diagnostics.logger.debug({
+      label: `${this.name}`,
+      message: "module source",
+      additionalInfo: {
+        moduleId,
+        isPreCompiled: compiledModule != void 0
+      }
     });
     if (!compiledModule) {
       const [name] = rawName.split("#");
       const enableLightningWebSecurityTransforms = !!this.locker?.enabled && !this.locker?.clientOnly;
       const scopedStyles = moduleEntry.entry.endsWith(".css") && moduleEntry.specifier.endsWith("?scoped=true");
-      import_diagnostics.logger.debug("[lwc-module-provider] compile", {
-        namespace,
-        name,
-        filename: moduleEntry.entry,
-        scopedStyles
+      import_diagnostics.logger.debug({
+        label: `${this.name}`,
+        message: "compile",
+        additionalInfo: {
+          namespace,
+          name,
+          filename: moduleEntry.entry,
+          scopedStyles
+        }
       });
       compiledModule = await this.lwcCompiler.compileFile(originalSource, {
         namespace,
@@ -115,11 +127,15 @@ var LwcModuleProvider = class {
         enableLightningWebSecurityTransforms,
         scopedStyles
       });
-      import_diagnostics.logger.verbose("[lwc-module-provider] createGetModuleJob:compile compiledModule", {
-        namespace,
-        name,
-        filename: moduleEntry.entry,
-        scopedStyles
+      import_diagnostics.logger.verbose({
+        label: `${this.name}`,
+        message: "createGetModuleJob:compile compiledModule",
+        additionalInfo: {
+          namespace,
+          name,
+          filename: moduleEntry.entry,
+          scopedStyles
+        }
       });
       if (moduleFsCacheEnabled) {
         (0, import_cache.addCompiledModuleCacheEntry)(moduleSource, compiledModule, cacheConfig);
@@ -162,7 +178,10 @@ var LwcModuleProvider = class {
     importer,
     version
   }) {
-    import_diagnostics.logger.debug(`[lwc-module-provider] getModuleEntry ${specifier}@${version}@${importer}`);
+    import_diagnostics.logger.debug({
+      label: `${this.name}`,
+      message: `getModuleEntry ${specifier}@${version}@${importer}`
+    });
     const versionId = version || importer;
     if (versionId) {
       const cacheKey2 = getModuleEntryCacheKey(specifier, versionId);
@@ -180,11 +199,15 @@ var LwcModuleProvider = class {
     importer,
     version
   }) {
-    import_diagnostics.logger.debug("[lwc-module-provider] createModuleEntry", {
-      specifier,
-      importer,
-      rootDir: this.rootDir,
-      version
+    import_diagnostics.logger.debug({
+      label: `${this.name}`,
+      message: "createModuleEntry",
+      additionalInfo: {
+        specifier,
+        importer,
+        rootDir: this.rootDir,
+        version
+      }
     });
     const [baseSpecifier, fileRelativePathRaw] = specifier.split("#");
     const fileRelativePath = fileRelativePathRaw?.split("?")[0];
@@ -195,14 +218,22 @@ var LwcModuleProvider = class {
     }
     if (!moduleEntry) {
       try {
-        import_diagnostics.logger.debug("[lwc-module-provider] createModuleEntry:resolveModuleSpecifier", {
-          baseSpecifier,
-          importer,
-          rootDir: this.rootDir,
-          modules: this.modules
+        import_diagnostics.logger.debug({
+          label: `${this.name}`,
+          message: "createModuleEntry:resolveModuleSpecifier",
+          additionalInfo: {
+            baseSpecifier,
+            importer,
+            rootDir: this.rootDir,
+            modules: this.modules
+          }
         });
         const registryEntry = (0, import_utils.resolveModuleSpecifier)(baseSpecifier, importer || this.rootDir, this.modules, this.packageVersionCache);
-        import_diagnostics.logger.debug("[lwc-module-provider] createModuleEntry:registryEntry", {registryEntry});
+        import_diagnostics.logger.debug({
+          label: `${this.name}`,
+          message: "createModuleEntry:registryEntry",
+          additionalInfo: {registryEntry}
+        });
         moduleEntry = {
           id: getModuleEntryCacheKey(registryEntry.specifier, registryEntry.version),
           ...registryEntry
@@ -217,7 +248,10 @@ var LwcModuleProvider = class {
         if (e.code !== "NO_LWC_MODULE_FOUND") {
           throw e;
         } else {
-          import_diagnostics.logger.verbose(`LWC provider could not find the module ${specifier}`);
+          import_diagnostics.logger.verbose({
+            label: `${this.name}`,
+            message: `LWC provider could not find the module ${specifier}`
+          });
         }
       }
     }

package/build/cjs/utils.cjs

@@ -38,18 +38,29 @@ 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_diagnostics.logger.debug("[lwc-module-provider] resolveModuleSpecifier", {specifier, importer, modules});
+  import_diagnostics.logger.debug({
+    label: `lwc-module-provider`,
+    message: "resolveModuleSpecifier",
+    additionalInfo: {specifier, importer, modules}
+  });
   let resolvedModule;
   try {
     resolvedModule = (0, import_module_resolver.resolveModule)(specifier, importer, {modules});
   } catch (error) {
     if (import_diagnostics.logger.isDebugEnabled()) {
-      import_diagnostics.logger.debug(`[lwc-module-provider] @lwc/module-resolver/resolveModule ${specifier}`);
+      import_diagnostics.logger.debug({
+        label: `lwc-module-provider`,
+        message: `@lwc/module-resolver/resolveModule ${specifier}`
+      });
       import_diagnostics.logger.error(error);
     }
     throw error;
   }
-  import_diagnostics.logger.debug("[lwc-module-provider] resolveModuleSpecifier:resolvedModule", {resolvedModule});
+  import_diagnostics.logger.debug({
+    label: `lwc-module-provider`,
+    message: "resolveModuleSpecifier:resolvedModule",
+    additionalInfo: {resolvedModule}
+  });
   const moduleScope = resolvedModule.scope;
   let version;
   if (packageVersionCache.has(moduleScope)) {
@@ -93,6 +104,6 @@ function setUpWatcher(watcherFactory, onModuleChange) {
   const watcher = watcherFactory.createFileWatcher();
   watcher.on("change", (0, import_shared_utils.debounce)((file) => onModuleChange(file), 500));
   watcher.on("unlink", (0, import_shared_utils.debounce)((file) => onModuleChange(file), 500));
-  watcher.on("add", (file) => import_diagnostics.logger.info(`Watching: ${file}`));
+  watcher.on("add", (file) => import_diagnostics.logger.info({label: `lwc-module-provider`, message: `Watching: ${file}`}));
   return watcher;
 }

package/build/es/compiler.js

@@ -27,18 +27,34 @@ export class LwcCompiler {
                 presets: [['@babel/preset-typescript', { onlyRemoveTypeImports: false }]],
                 filename,
             };
-            logger.debug('babelTransform', { babelConfig });
+            logger.debug({
+                label: 'LwcCompiler',
+                message: 'babelTransform',
+                additionalInfo: { babelConfig },
+            });
             let result;
             try {
                 result = babelTransform(source, babelConfig);
             }
             catch (error) {
-                logger.debug('babelTransform error', error);
+                logger.debug({
+                    label: 'LwcCompiler',
+                    message: 'babelTransform error',
+                    additionalInfo: error,
+                });
                 throw error;
             }
-            logger.verbose('babelTransform result', { result });
+            logger.verbose({
+                label: 'LwcCompiler',
+                message: 'babelTransform result',
+                additionalInfo: { result },
+            });
             if (!result || !result.code) {
-                logger.debug('babelTransform invalid result', { result });
+                logger.debug({
+                    label: 'LwcCompiler',
+                    message: 'babelTransform invalid result',
+                    additionalInfo: { result },
+                });
                 throw new Error(`Error TS compiling ${filename}`);
             }
             source = result.code;
@@ -62,9 +78,17 @@ export class LwcCompiler {
             enableLightningWebSecurityTransforms,
             enableScopedSlots: true, // this flag turns on an additive feature and is backwards compatible
         };
-        logger.debug('transformSync', { filename, transformConfig });
+        logger.debug({
+            label: 'LwcCompiler',
+            message: 'transformSync',
+            additionalInfo: { filename, transformConfig },
+        });
         const compilerResult = transformSync(source, filename, transformConfig);
-        logger.verbose('transformSync result', { compilerResult });
+        logger.verbose({
+            label: 'LwcCompiler',
+            message: 'transformSync result',
+            additionalInfo: { compilerResult },
+        });
         return {
             code: compilerResult.code,
             map: null,

package/build/es/index.js

@@ -49,7 +49,7 @@ export default class LwcModuleProvider {
     }
     async getModule(moduleId) {
         const id = getSpecifier(moduleId);
-        logger.debug(`[lwc-module-provider ] getModule ${id}`);
+        logger.debug({ label: `${this.name}`, message: `getModule ${id}` });
         return this.inflightGetModuleJobs.execute(id, () => {
             return this.createGetModuleJob(moduleId);
         });
@@ -61,7 +61,11 @@ export default class LwcModuleProvider {
      */
     async createGetModuleJob(moduleId) {
         const { watcher, watchedModuleContextMap, lwcCacheDir, lwcCacheIndex, moduleFsCacheEnabled } = this;
-        logger.debug('[lwc-module-provider ] fetch module', { moduleId, moduleFsCacheEnabled });
+        logger.debug({
+            label: `${this.name}`,
+            message: 'fetch module',
+            additionalInfo: { moduleId, moduleFsCacheEnabled },
+        });
         const moduleEntry = await this.getModuleEntry(moduleId);
         if (!moduleEntry) {
             return;
@@ -70,19 +74,27 @@ 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,
+        logger.debug({
+            label: `${this.name}`,
+            message: 'module source',
+            additionalInfo: {
+                moduleId,
+                isPreCompiled: compiledModule != undefined,
+            },
         });
         if (!compiledModule) {
             const [name] = rawName.split('#');
             const enableLightningWebSecurityTransforms = !!this.locker?.enabled && !this.locker?.clientOnly;
             const scopedStyles = moduleEntry.entry.endsWith('.css') && moduleEntry.specifier.endsWith('?scoped=true');
-            logger.debug('[lwc-module-provider] compile', {
-                namespace,
-                name,
-                filename: moduleEntry.entry,
-                scopedStyles,
+            logger.debug({
+                label: `${this.name}`,
+                message: 'compile',
+                additionalInfo: {
+                    namespace,
+                    name,
+                    filename: moduleEntry.entry,
+                    scopedStyles,
+                },
             });
             // We need to convert anything (html, css, javascript) into a canonical ES6 module
             compiledModule = await this.lwcCompiler.compileFile(originalSource, {
@@ -92,11 +104,15 @@ export default class LwcModuleProvider {
                 enableLightningWebSecurityTransforms,
                 scopedStyles,
             });
-            logger.verbose('[lwc-module-provider] createGetModuleJob:compile compiledModule', {
-                namespace,
-                name,
-                filename: moduleEntry.entry,
-                scopedStyles,
+            logger.verbose({
+                label: `${this.name}`,
+                message: 'createGetModuleJob:compile compiledModule',
+                additionalInfo: {
+                    namespace,
+                    name,
+                    filename: moduleEntry.entry,
+                    scopedStyles,
+                },
             });
             if (moduleFsCacheEnabled) {
                 addCompiledModuleCacheEntry(moduleSource, compiledModule, cacheConfig);
@@ -135,7 +151,10 @@ export default class LwcModuleProvider {
         return moduleSource;
     }
     async getModuleEntry({ specifier, importer, version, }) {
-        logger.debug(`[lwc-module-provider] getModuleEntry ${specifier}@${version}@${importer}`);
+        logger.debug({
+            label: `${this.name}`,
+            message: `getModuleEntry ${specifier}@${version}@${importer}`,
+        });
         // Check cache
         const versionId = version || importer;
         if (versionId) {
@@ -150,11 +169,15 @@ export default class LwcModuleProvider {
         });
     }
     async createModuleEntry({ specifier, importer, version, }) {
-        logger.debug('[lwc-module-provider] createModuleEntry', {
-            specifier,
-            importer,
-            rootDir: this.rootDir,
-            version,
+        logger.debug({
+            label: `${this.name}`,
+            message: 'createModuleEntry',
+            additionalInfo: {
+                specifier,
+                importer,
+                rootDir: this.rootDir,
+                version,
+            },
         });
         // Strip any filenames out of the specifier
         // eg: 'c/myApp#myApp.css' => 'c/myApp' and 'myApp.css'
@@ -170,14 +193,22 @@ export default class LwcModuleProvider {
         // Nothing from cache, let's try to resolve it first from lwc then from npm
         if (!moduleEntry) {
             try {
-                logger.debug('[lwc-module-provider] createModuleEntry:resolveModuleSpecifier', {
-                    baseSpecifier,
-                    importer,
-                    rootDir: this.rootDir,
-                    modules: this.modules,
+                logger.debug({
+                    label: `${this.name}`,
+                    message: 'createModuleEntry:resolveModuleSpecifier',
+                    additionalInfo: {
+                        baseSpecifier,
+                        importer,
+                        rootDir: this.rootDir,
+                        modules: this.modules,
+                    },
                 });
                 const registryEntry = resolveModuleSpecifier(baseSpecifier, importer || this.rootDir, this.modules, this.packageVersionCache);
-                logger.debug('[lwc-module-provider] createModuleEntry:registryEntry', { registryEntry });
+                logger.debug({
+                    label: `${this.name}`,
+                    message: 'createModuleEntry:registryEntry',
+                    additionalInfo: { registryEntry },
+                });
                 moduleEntry = {
                     id: getModuleEntryCacheKey(registryEntry.specifier, registryEntry.version),
                     ...registryEntry,
@@ -196,7 +227,10 @@ export default class LwcModuleProvider {
                 }
                 else {
                     // in verbose log the lwc provider miss
-                    logger.verbose(`LWC provider could not find the module ${specifier}`);
+                    logger.verbose({
+                        label: `${this.name}`,
+                        message: `LWC provider could not find the module ${specifier}`,
+                    });
                 }
             }
         }

package/build/es/utils.js

@@ -6,20 +6,31 @@ 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('[lwc-module-provider] resolveModuleSpecifier', { specifier, importer, modules });
+    logger.debug({
+        label: `lwc-module-provider`,
+        message: 'resolveModuleSpecifier',
+        additionalInfo: { specifier, importer, modules },
+    });
     let resolvedModule;
     try {
         resolvedModule = resolveModule(specifier, importer, { modules });
     }
     catch (error) {
         if (logger.isDebugEnabled()) {
-            // 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}`);
+            // If log level is debug or greater.  Otherwise error will be swallowed and resolved by npm-resolver
+            logger.debug({
+                label: `lwc-module-provider`,
+                message: `@lwc/module-resolver/resolveModule ${specifier}`,
+            });
             logger.error(error);
         }
         throw error;
     }
-    logger.debug('[lwc-module-provider] resolveModuleSpecifier:resolvedModule', { resolvedModule });
+    logger.debug({
+        label: `lwc-module-provider`,
+        message: 'resolveModuleSpecifier:resolvedModule',
+        additionalInfo: { resolvedModule },
+    });
     const moduleScope = resolvedModule.scope;
     let version;
     if (packageVersionCache.has(moduleScope)) {
@@ -77,7 +88,7 @@ export function setUpWatcher(watcherFactory, onModuleChange) {
     const watcher = watcherFactory.createFileWatcher();
     watcher.on('change', debounce((file) => onModuleChange(file), 500));
     watcher.on('unlink', debounce((file) => onModuleChange(file), 500));
-    watcher.on('add', (file) => logger.info(`Watching: ${file}`));
+    watcher.on('add', (file) => logger.info({ label: `lwc-module-provider`, message: `Watching: ${file}` }));
     return watcher;
 }
 //# sourceMappingURL=utils.js.map

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.11.3",
+    "version": "0.11.5",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -30,13 +30,13 @@
         "build/**/*.d.ts"
     ],
     "dependencies": {
-        "@babel/preset-typescript": "^7.23.2",
-        "@lwrjs/diagnostics": "0.11.3",
-        "@lwrjs/fs-watch": "0.11.3",
-        "@lwrjs/shared-utils": "0.11.3"
+        "@babel/preset-typescript": "^7.23.3",
+        "@lwrjs/diagnostics": "0.11.5",
+        "@lwrjs/fs-watch": "0.11.5",
+        "@lwrjs/shared-utils": "0.11.5"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.11.3",
+        "@lwrjs/types": "0.11.5",
         "typescript": "^4.9.5"
     },
     "peerDependencies": {
@@ -46,5 +46,5 @@
     "engines": {
         "node": ">=16.0.0"
     },
-    "gitHead": "e420814f37150c71850f7f46f20372a33e1bb6d8"
+    "gitHead": "b1a54889dd55baed1bf61ceb497d251958415595"
 }