@lwrjs/lwc-module-provider 0.5.11 → 0.6.0-alpha.12

package/build/cjs/cache.cjs

@@ -36,7 +36,7 @@ var import_fs = __toModule(require("fs"));
 var DEFAULT_COMPILED_DIR = "lwc_compiled_modules";
 var DEFAULT_CACHE_FOLDER = "cache";
 var DEFAULT_CACHE_INDEX = `compiled.json`;
-var NORMALIZE_PATH_REGEX = /[@\/#\.]/gm;
+var NORMALIZE_PATH_REGEX = /[@\/#\.\?<>\\:\*\|"]/gm;
 function setupModuleCache(cacheDir) {
   const lwcCacheDir = import_path.default.join(cacheDir, `${DEFAULT_COMPILED_DIR}`);
   const lwcCacheIndexPath = import_path.default.join(lwcCacheDir, DEFAULT_CACHE_INDEX);

package/build/cjs/index.cjs

@@ -45,6 +45,8 @@ var LwcModuleProvider = class {
     this.watchedModuleContextMap = new Map();
     this.moduleEntryVersionCache = new Map();
     this.lwcCompiler = new import_compiler.LwcCompiler();
+    this.inflightGetModuleJobs = new import_shared_utils.InflightTasks();
+    this.inflightGetModuleEntryJobs = new import_shared_utils.InflightTasks();
     const {disableCaching} = options;
     this.emitter = appEmitter;
     this.modules = modules;
@@ -71,6 +73,12 @@ var LwcModuleProvider = class {
     }
   }
   async getModule(moduleId) {
+    const id = (0, import_shared_utils.getSpecifier)(moduleId);
+    return this.inflightGetModuleJobs.execute(id, () => {
+      return this.createGetModuleJob(moduleId);
+    }, this);
+  }
+  async createGetModuleJob(moduleId) {
     const {watcher, watchedModuleContextMap, lwcCacheDir, lwcCacheIndex, moduleFsCacheEnabled} = this;
     const moduleEntry = await this.getModuleEntry(moduleId);
     if (!moduleEntry) {
@@ -135,6 +143,16 @@ var LwcModuleProvider = class {
         return this.moduleEntryVersionCache.get(cacheKey2);
       }
     }
+    const cacheKey = `${specifier}@${version}@${importer}`;
+    return this.inflightGetModuleEntryJobs.execute(cacheKey, async () => {
+      return this.createModuleEntry({specifier, importer, version});
+    });
+  }
+  async createModuleEntry({
+    specifier,
+    importer,
+    version
+  }) {
     const [baseSpecifier, fileRelativePathRaw] = specifier.split("#");
     const fileRelativePath = fileRelativePathRaw?.split("?")[0];
     let moduleEntry;

package/build/es/cache.js

@@ -4,7 +4,7 @@ export const DEFAULT_COMPILED_DIR = 'lwc_compiled_modules';
 export const DEFAULT_CACHE_FOLDER = 'cache';
 export const DEFAULT_CACHE_INDEX = `compiled.json`;
 // eslint-disable-next-line no-useless-escape
-const NORMALIZE_PATH_REGEX = /[@\/#\.]/gm;
+const NORMALIZE_PATH_REGEX = /[@\/#\.\?<>\\:\*\|"]/gm;
 /**
  * The module cache allow us to recover modules compiled across server restart
  * We store an index file and the compiler modules individually

package/build/es/index.d.ts

@@ -16,11 +16,20 @@ export default class LwcModuleProvider implements ModuleProvider {
     private watchedModuleContextMap;
     private moduleEntryVersionCache;
     private lwcCompiler;
+    private inflightGetModuleJobs;
+    private inflightGetModuleEntryJobs;
     constructor(options: LwcModuleProviderOptions | undefined, { appEmitter, config: { modules, rootDir, cacheDir, environment }, runtimeEnvironment: { watchFiles }, }: ProviderContext);
     onModuleChange(fileChanged: string): Promise<void>;
     getModule(moduleId: AbstractModuleId): Promise<ModuleCompiled | undefined>;
+    /**
+     * Create a new Job to fetch a module by id so we are not duplicating effort when multiple requests come in
+     * @param moduleId Id of module in question
+     * @returns Compiled Module
+     */
+    createGetModuleJob(moduleId: AbstractModuleId): Promise<ModuleCompiled | undefined>;
     getModuleSource({ name, namespace, specifier }: AbstractModuleId, moduleEntry: FsModuleEntry): Promise<ModuleSource>;
     getModuleEntry({ specifier, importer, version, }: AbstractModuleId): Promise<FsModuleEntry | undefined>;
+    createModuleEntry({ specifier, importer, version, }: AbstractModuleId): Promise<FsModuleEntry | undefined>;
 }
 export {};
 //# sourceMappingURL=index.d.ts.map

package/build/es/index.js

@@ -1,5 +1,5 @@
 import { dirname, join } from 'path';
-import { explodeSpecifier, hashContent, readFile, resolveFileExtension, resolveCustomLWCMetadata, } from '@lwrjs/shared-utils';
+import { explodeSpecifier, getSpecifier, hashContent, InflightTasks, readFile, resolveFileExtension, resolveCustomLWCMetadata, } from '@lwrjs/shared-utils';
 import { DEFAULT_IMPLICIT_DEP, isImplicitLwcImport, resolveModuleSpecifier, setUpWatcher } from './utils.js';
 import { addCompiledModuleCacheEntry, getCompiledModuleCacheEntry, setupModuleCache, } from './cache.js';
 import { LwcCompiler } from './compiler.js';
@@ -13,6 +13,8 @@ export default class LwcModuleProvider {
         this.watchedModuleContextMap = new Map();
         this.moduleEntryVersionCache = new Map();
         this.lwcCompiler = new LwcCompiler();
+        this.inflightGetModuleJobs = new InflightTasks();
+        this.inflightGetModuleEntryJobs = new InflightTasks();
         const { disableCaching } = options;
         this.emitter = appEmitter;
         this.modules = modules;
@@ -40,6 +42,17 @@ export default class LwcModuleProvider {
         }
     }
     async getModule(moduleId) {
+        const id = getSpecifier(moduleId);
+        return this.inflightGetModuleJobs.execute(id, () => {
+            return this.createGetModuleJob(moduleId);
+        }, this);
+    }
+    /**
+     * Create a new Job to fetch a module by id so we are not duplicating effort when multiple requests come in
+     * @param moduleId Id of module in question
+     * @returns Compiled Module
+     */
+    async createGetModuleJob(moduleId) {
         const { watcher, watchedModuleContextMap, lwcCacheDir, lwcCacheIndex, moduleFsCacheEnabled } = this;
         const moduleEntry = await this.getModuleEntry(moduleId);
         if (!moduleEntry) {
@@ -102,6 +115,12 @@ export default class LwcModuleProvider {
                 return this.moduleEntryVersionCache.get(cacheKey);
             }
         }
+        const cacheKey = `${specifier}@${version}@${importer}`;
+        return this.inflightGetModuleEntryJobs.execute(cacheKey, async () => {
+            return this.createModuleEntry({ specifier, importer, version });
+        });
+    }
+    async createModuleEntry({ specifier, importer, 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'

package/package.json

@@ -4,8 +4,8 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.5.11",
-    "homepage": "https://lwr.dev/",
+    "version": "0.6.0-alpha.12",
+    "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
         "url": "https://github.com/salesforce/lwr.git",
@@ -31,15 +31,15 @@
     ],
     "dependencies": {
         "@babel/preset-typescript": "^7.9.0",
-        "@lwc/module-resolver": "2.3.1",
-        "@lwrjs/shared-utils": "0.5.11",
+        "@lwc/module-resolver": "2.5.8",
+        "@lwrjs/shared-utils": "0.6.0-alpha.12",
         "es-module-lexer": "^0.3.18"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.5.11"
+        "@lwrjs/types": "0.6.0-alpha.12"
     },
     "engines": {
         "node": ">=14.15.4 <17"
     },
-    "gitHead": "2ee810c0a4f1f36d1e0f8378a1fe00c19b4c5bc1"
+    "gitHead": "876b56ca4f98f3299303f2193c0dec8f46a69b84"
 }