@jsenv/core 38.3.0 → 38.3.1

package/README.md

@@ -1,8 +1,6 @@
 # @jsenv/core [![npm package](https://img.shields.io/npm/v/@jsenv/core.svg?logo=npm&label=package)](https://www.npmjs.com/package/@jsenv/core)
 
-Jsenv is a tool to develop test and build projects using JavaScript. Jsenv is simple, easy to understand and well documented.
-
-Jsenv cares a lot about the developper experience, especially when it comes to tests.
+Jsenv is a tool to develop test and build projects using JavaScript. Jsenv encourages standards and simplicity.
 
 The pillars of jsenv are:
 
@@ -11,6 +9,8 @@ The pillars of jsenv are:
 3. A build server serving build files
 4. A test runner executing test files in web browser(s)
 
+Jsenv cares a lot about the developer experience. As a result it can be enjoyed by people without much experience in tooling. Or by people wanting to use a simple tool, without hidden complexities.
+
 [Link to documentation](<https://github.com/jsenv/core/wiki/A)-directory-structure>)
 
 # The best parts

package/dist/jsenv_core.js

@@ -15759,22 +15759,39 @@ const jsenvPluginHtmlReferenceAnalysis = ({
 
   let globalImportmap = null;
   const importmaps = {};
-  const onImportmapParsed = (htmlUrl, importmap) => {
-    if (importmap) {
-      importmaps[htmlUrl] = normalizeImportMap(importmap, htmlUrl);
-    } else {
-      importmaps[htmlUrl] = null;
-    }
-    globalImportmap = Object.keys(importmaps).reduce((previous, url) => {
-      const importmap = importmaps[url];
-      if (!previous) {
-        return importmap;
+  let importmapLoadingCount = 0;
+  const allImportmapLoadedCallbackSet = new Set();
+  const startLoadingImportmap = (htmlUrlInfo) => {
+    importmapLoadingCount++;
+    return (importmapUrlInfo) => {
+      const htmlUrl = htmlUrlInfo.url;
+      if (importmapUrlInfo) {
+        // importmap was found in this HTML file and is known
+        const importmap = JSON.parse(importmapUrlInfo.content);
+        importmaps[htmlUrl] = normalizeImportMap(importmap, htmlUrl);
+      } else {
+        // no importmap in this HTML file
+        importmaps[htmlUrl] = null;
       }
-      if (!importmap) {
-        return previous;
+      globalImportmap = Object.keys(importmaps).reduce((previous, url) => {
+        const importmap = importmaps[url];
+        if (!previous) {
+          return importmap;
+        }
+        if (!importmap) {
+          return previous;
+        }
+        return composeTwoImportMaps(previous, importmap);
+      }, null);
+
+      importmapLoadingCount--;
+      if (importmapLoadingCount === 0) {
+        allImportmapLoadedCallbackSet.forEach((callback) => {
+          callback();
+        });
+        allImportmapLoadedCallbackSet.clear();
       }
-      return composeTwoImportMaps(previous, importmap);
-    }, null);
+    };
   };
 
   return {
@@ -15813,16 +15830,18 @@ const jsenvPluginHtmlReferenceAnalysis = ({
       },
     },
     transformUrlContent: {
+      js_module: async () => {
+        // wait for importmap if any
+        // so that resolveReference can happen with importmap
+        if (importmapLoadingCount) {
+          await new Promise((resolve) => {
+            allImportmapLoadedCallbackSet.add(resolve);
+          });
+        }
+      },
       html: async (urlInfo) => {
         let importmapFound = false;
-        let importmapParsedCallbackSet = new Set();
-        const onImportmapReady = (importmap) => {
-          onImportmapParsed(urlInfo.url, importmap);
-          importmapParsedCallbackSet.forEach((callback) => {
-            callback();
-          });
-          importmapParsedCallbackSet.clear();
-        };
+        const importmapLoaded = startLoadingImportmap(urlInfo);
 
         const content = urlInfo.content;
         const htmlAst = parseHtmlString(content);
@@ -15962,11 +15981,6 @@ const jsenvPluginHtmlReferenceAnalysis = ({
           });
 
           actions.push(async () => {
-            if (expectedType === "js_module" && importmapFound) {
-              await new Promise((resolve) => {
-                importmapParsedCallbackSet.add(resolve);
-              });
-            }
             await inlineReference.urlInfo.cook();
             mutations.push(() => {
               if (hotAccept) {
@@ -16078,7 +16092,7 @@ const jsenvPluginHtmlReferenceAnalysis = ({
                   importmapReferenceInlined.urlInfo;
                 actions.push(async () => {
                   await importmapInlineUrlInfo.cook();
-                  onImportmapReady(JSON.parse(importmapInlineUrlInfo.content));
+                  importmapLoaded(importmapInlineUrlInfo);
                   mutations.push(() => {
                     setHtmlNodeText(
                       scriptNode,
@@ -16109,9 +16123,7 @@ const jsenvPluginHtmlReferenceAnalysis = ({
                   const inlineImportmapUrlInfo = importmapReference.urlInfo;
                   actions.push(async () => {
                     await inlineImportmapUrlInfo.cook();
-                    onImportmapReady(
-                      JSON.parse(inlineImportmapUrlInfo.content),
-                    );
+                    importmapLoaded(inlineImportmapUrlInfo);
                     mutations.push(() => {
                       setHtmlNodeText(
                         scriptNode,
@@ -16227,7 +16239,7 @@ const jsenvPluginHtmlReferenceAnalysis = ({
           },
         });
         if (!importmapFound) {
-          onImportmapReady();
+          importmapLoaded();
         }
         finalizeCallbacks.forEach((finalizeCallback) => {
           finalizeCallback();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "38.3.0",
+  "version": "38.3.1",
   "description": "Tool to develop, test and build js projects",
   "license": "MIT",
   "author": {

package/src/plugins/reference_analysis/html/jsenv_plugin_html_reference_analysis.js

@@ -45,22 +45,39 @@ export const jsenvPluginHtmlReferenceAnalysis = ({
 
   let globalImportmap = null;
   const importmaps = {};
-  const onImportmapParsed = (htmlUrl, importmap) => {
-    if (importmap) {
-      importmaps[htmlUrl] = normalizeImportMap(importmap, htmlUrl);
-    } else {
-      importmaps[htmlUrl] = null;
-    }
-    globalImportmap = Object.keys(importmaps).reduce((previous, url) => {
-      const importmap = importmaps[url];
-      if (!previous) {
-        return importmap;
+  let importmapLoadingCount = 0;
+  const allImportmapLoadedCallbackSet = new Set();
+  const startLoadingImportmap = (htmlUrlInfo) => {
+    importmapLoadingCount++;
+    return (importmapUrlInfo) => {
+      const htmlUrl = htmlUrlInfo.url;
+      if (importmapUrlInfo) {
+        // importmap was found in this HTML file and is known
+        const importmap = JSON.parse(importmapUrlInfo.content);
+        importmaps[htmlUrl] = normalizeImportMap(importmap, htmlUrl);
+      } else {
+        // no importmap in this HTML file
+        importmaps[htmlUrl] = null;
       }
-      if (!importmap) {
-        return previous;
+      globalImportmap = Object.keys(importmaps).reduce((previous, url) => {
+        const importmap = importmaps[url];
+        if (!previous) {
+          return importmap;
+        }
+        if (!importmap) {
+          return previous;
+        }
+        return composeTwoImportMaps(previous, importmap);
+      }, null);
+
+      importmapLoadingCount--;
+      if (importmapLoadingCount === 0) {
+        allImportmapLoadedCallbackSet.forEach((callback) => {
+          callback();
+        });
+        allImportmapLoadedCallbackSet.clear();
       }
-      return composeTwoImportMaps(previous, importmap);
-    }, null);
+    };
   };
 
   return {
@@ -99,16 +116,18 @@ export const jsenvPluginHtmlReferenceAnalysis = ({
       },
     },
     transformUrlContent: {
+      js_module: async () => {
+        // wait for importmap if any
+        // so that resolveReference can happen with importmap
+        if (importmapLoadingCount) {
+          await new Promise((resolve) => {
+            allImportmapLoadedCallbackSet.add(resolve);
+          });
+        }
+      },
       html: async (urlInfo) => {
         let importmapFound = false;
-        let importmapParsedCallbackSet = new Set();
-        const onImportmapReady = (importmap) => {
-          onImportmapParsed(urlInfo.url, importmap);
-          importmapParsedCallbackSet.forEach((callback) => {
-            callback();
-          });
-          importmapParsedCallbackSet.clear();
-        };
+        const importmapLoaded = startLoadingImportmap(urlInfo);
 
         const content = urlInfo.content;
         const htmlAst = parseHtmlString(content);
@@ -248,11 +267,6 @@ export const jsenvPluginHtmlReferenceAnalysis = ({
           });
 
           actions.push(async () => {
-            if (expectedType === "js_module" && importmapFound) {
-              await new Promise((resolve) => {
-                importmapParsedCallbackSet.add(resolve);
-              });
-            }
             await inlineReference.urlInfo.cook();
             mutations.push(() => {
               if (hotAccept) {
@@ -366,7 +380,7 @@ export const jsenvPluginHtmlReferenceAnalysis = ({
                   importmapReferenceInlined.urlInfo;
                 actions.push(async () => {
                   await importmapInlineUrlInfo.cook();
-                  onImportmapReady(JSON.parse(importmapInlineUrlInfo.content));
+                  importmapLoaded(importmapInlineUrlInfo);
                   mutations.push(() => {
                     setHtmlNodeText(
                       scriptNode,
@@ -397,9 +411,7 @@ export const jsenvPluginHtmlReferenceAnalysis = ({
                   const inlineImportmapUrlInfo = importmapReference.urlInfo;
                   actions.push(async () => {
                     await inlineImportmapUrlInfo.cook();
-                    onImportmapReady(
-                      JSON.parse(inlineImportmapUrlInfo.content),
-                    );
+                    importmapLoaded(inlineImportmapUrlInfo);
                     mutations.push(() => {
                       setHtmlNodeText(
                         scriptNode,
@@ -515,7 +527,7 @@ export const jsenvPluginHtmlReferenceAnalysis = ({
           },
         });
         if (!importmapFound) {
-          onImportmapReady();
+          importmapLoaded();
         }
         finalizeCallbacks.forEach((finalizeCallback) => {
           finalizeCallback();