@jsenv/core 38.0.1 → 38.0.3

package/dist/jsenv_core.js

@@ -12327,6 +12327,7 @@ const createUrlInfo = (url, context) => {
 
     sourcemap: null,
     sourcemapIsWrong: false,
+    sourcemapReference: null,
 
     generatedUrl: null,
     sourcemapGeneratedUrl: null,
@@ -13101,14 +13102,10 @@ const createUrlInfoTransformer = ({
   sourcemapsComment,
   sourcemapsSources,
   sourcemapsSourcesProtocol,
-  sourcemapsSourcesContent,
+  sourcemapsSourcesContent = true,
   outDirectoryUrl,
   supervisor,
 }) => {
-  if (sourcemapsSourcesContent === undefined) {
-    sourcemapsSourcesContent = true;
-  }
-
   const formatSourcemapSource =
     typeof sourcemapsSources === "function"
       ? (source, urlInfo) => {
@@ -13167,6 +13164,7 @@ const createUrlInfoTransformer = ({
     urlInfo.content = undefined;
     urlInfo.sourcemap = null;
     urlInfo.sourcemapIsWrong = null;
+    urlInfo.sourcemapReference = null;
   };
 
   const setContentProperties = (
@@ -13231,6 +13229,10 @@ const createUrlInfoTransformer = ({
     generatedUrlObject.searchParams.delete("js_module_fallback");
     generatedUrlObject.searchParams.delete("as_js_module");
     generatedUrlObject.searchParams.delete("as_js_classic");
+    generatedUrlObject.searchParams.delete("as_css_module");
+    generatedUrlObject.searchParams.delete("as_json_module");
+    generatedUrlObject.searchParams.delete("as_text_module");
+    generatedUrlObject.searchParams.delete("dynamic_import");
     const urlForSourcemap = generatedUrlObject.href;
     urlInfo.sourcemapGeneratedUrl = generateSourcemapFileUrl(urlForSourcemap);
 
@@ -13257,6 +13259,7 @@ const createUrlInfoTransformer = ({
         specifierLine: line,
         specifierColumn: column,
       });
+      urlInfo.sourcemapReference = sourcemapReference;
       try {
         await sourcemapReference.urlInfo.cook();
         const sourcemapRaw = JSON.parse(sourcemapReference.urlInfo.content);
@@ -13370,11 +13373,11 @@ const createUrlInfoTransformer = ({
     if (!contentIsInlined) {
       writeFileSync(new URL(generatedUrl), urlInfo.content);
     }
-    const { sourcemapGeneratedUrl, sourcemap } = urlInfo;
-    if (sourcemapGeneratedUrl && sourcemap) {
+    const { sourcemapGeneratedUrl, sourcemapReference } = urlInfo;
+    if (sourcemapGeneratedUrl && sourcemapReference) {
       writeFileSync(
         new URL(sourcemapGeneratedUrl),
-        JSON.stringify(sourcemap, null, "  "),
+        sourcemapReference.urlInfo.content,
       );
     }
   };
@@ -13393,25 +13396,28 @@ const createUrlInfoTransformer = ({
     // in this scenarion we don't want to inject sourcemap reference
     // just update the content
 
-    let sourcemapReference = null;
-    for (const referenceToOther of urlInfo.referenceToOthersSet) {
-      if (referenceToOther.type === "sourcemap_comment") {
-        sourcemapReference = referenceToOther;
-        break;
-      }
-    }
+    let sourcemapReference = urlInfo.sourcemapReference;
     if (!sourcemapReference) {
-      sourcemapReference = urlInfo.dependencies.inject({
-        trace: {
-          message: `sourcemap comment placeholder`,
-          url: urlInfo.url,
-        },
-        type: "sourcemap_comment",
-        subtype: urlInfo.contentType === "text/javascript" ? "js" : "css",
-        expectedType: "sourcemap",
-        specifier: urlInfo.sourcemapGeneratedUrl,
-        isInline: sourcemaps === "inline",
-      });
+      for (const referenceToOther of urlInfo.referenceToOthersSet) {
+        if (referenceToOther.type === "sourcemap_comment") {
+          sourcemapReference = referenceToOther;
+          break;
+        }
+      }
+      if (!sourcemapReference) {
+        sourcemapReference = urlInfo.dependencies.inject({
+          trace: {
+            message: `sourcemap comment placeholder`,
+            url: urlInfo.url,
+          },
+          type: "sourcemap_comment",
+          subtype: urlInfo.contentType === "text/javascript" ? "js" : "css",
+          expectedType: "sourcemap",
+          specifier: urlInfo.sourcemapGeneratedUrl,
+          isInline: sourcemaps === "inline",
+        });
+      }
+      urlInfo.sourcemapReference = sourcemapReference;
     }
     const sourcemapUrlInfo = sourcemapReference.urlInfo;
     // It's possible urlInfo content to be modified after being finalized
@@ -14324,6 +14330,9 @@ ${ANSI.color(normalizedReturnValue, ANSI.YELLOW)}
 
     // urlInfo objects are reused, they must be "reset" before cooking them again
     if (urlInfo.error || urlInfo.content !== undefined) {
+      if (urlInfo.isInline) {
+        return;
+      }
       urlInfo.error = null;
       urlInfo.type = null;
       urlInfo.subtype = null;
@@ -20702,7 +20711,7 @@ const createBuildSpecifierManager = ({
           storeOriginalPositions: false,
         });
         const mutations = [];
-        const hintsToInject = [];
+        const hintToInjectMap = new Map();
         visitHtmlNodes(htmlAst, {
           link: (node) => {
             const href = getHtmlNodeAttribute(node, "href");
@@ -20766,12 +20775,12 @@ const createBuildSpecifierManager = ({
               }
               const referencedUrlInfo = referenceToOther.urlInfo;
               if (referencedUrlInfo.data.generatedToShareCode) {
-                hintsToInject.push({ urlInfo: referencedUrlInfo, node });
+                hintToInjectMap.set(referencedUrlInfo, { node });
               }
             }
           },
         });
-        hintsToInject.forEach(({ urlInfo, node }) => {
+        hintToInjectMap.forEach(({ node }, urlInfo) => {
           const buildGeneratedSpecifier = getBuildGeneratedSpecifier(urlInfo);
           const found = findHtmlNode(htmlAst, (htmlNode) => {
             return (
@@ -21183,11 +21192,11 @@ const defaultRuntimeCompat = {
  * @param {boolean|object} [buildParameters.bundling=true]
  *        Reduce number of files written in the build directory
  *  @param {boolean|object} [buildParameters.minification=true]
- *        Minify the content of files generated into the build directory
+ *        Minify the content of files written into the build directory
  * @param {boolean} [buildParameters.versioning=true]
- *        Controls if url in build file contents are versioned
+ *        Use versioning on files written in the build directory
  * @param {('search_param'|'filename')} [buildParameters.versioningMethod="search_param"]
- *        Controls how url are versioned
+ *        Controls how url are versioned in the build directory
  * @param {('none'|'inline'|'file'|'programmatic'} [buildParameters.sourcemaps="none"]
  *        Generate sourcemaps in the build directory
  * @return {Object} buildReturnValue

package/package.json

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

package/src/build/build.js

@@ -73,11 +73,11 @@ export const defaultRuntimeCompat = {
  * @param {boolean|object} [buildParameters.bundling=true]
  *        Reduce number of files written in the build directory
  *  @param {boolean|object} [buildParameters.minification=true]
- *        Minify the content of files generated into the build directory
+ *        Minify the content of files written into the build directory
  * @param {boolean} [buildParameters.versioning=true]
- *        Controls if url in build file contents are versioned
+ *        Use versioning on files written in the build directory
  * @param {('search_param'|'filename')} [buildParameters.versioningMethod="search_param"]
- *        Controls how url are versioned
+ *        Controls how url are versioned in the build directory
  * @param {('none'|'inline'|'file'|'programmatic'} [buildParameters.sourcemaps="none"]
  *        Generate sourcemaps in the build directory
  * @return {Object} buildReturnValue

package/src/build/build_specifier_manager.js

@@ -767,7 +767,7 @@ export const createBuildSpecifierManager = ({
           storeOriginalPositions: false,
         });
         const mutations = [];
-        const hintsToInject = [];
+        const hintToInjectMap = new Map();
         visitHtmlNodes(htmlAst, {
           link: (node) => {
             const href = getHtmlNodeAttribute(node, "href");
@@ -831,12 +831,12 @@ export const createBuildSpecifierManager = ({
               }
               const referencedUrlInfo = referenceToOther.urlInfo;
               if (referencedUrlInfo.data.generatedToShareCode) {
-                hintsToInject.push({ urlInfo: referencedUrlInfo, node });
+                hintToInjectMap.set(referencedUrlInfo, { node });
               }
             }
           },
         });
-        hintsToInject.forEach(({ urlInfo, node }) => {
+        hintToInjectMap.forEach(({ node }, urlInfo) => {
           const buildGeneratedSpecifier = getBuildGeneratedSpecifier(urlInfo);
           const found = findHtmlNode(htmlAst, (htmlNode) => {
             return (

package/src/kitchen/kitchen.js

@@ -456,6 +456,9 @@ ${ANSI.color(normalizedReturnValue, ANSI.YELLOW)}
 
     // urlInfo objects are reused, they must be "reset" before cooking them again
     if (urlInfo.error || urlInfo.content !== undefined) {
+      if (urlInfo.isInline) {
+        return;
+      }
       urlInfo.error = null;
       urlInfo.type = null;
       urlInfo.subtype = null;

package/src/kitchen/url_graph/url_graph.js

@@ -212,6 +212,7 @@ const createUrlInfo = (url, context) => {
 
     sourcemap: null,
     sourcemapIsWrong: false,
+    sourcemapReference: null,
 
     generatedUrl: null,
     sourcemapGeneratedUrl: null,

package/src/kitchen/url_graph/url_info_transformations.js

@@ -18,14 +18,10 @@ export const createUrlInfoTransformer = ({
   sourcemapsComment,
   sourcemapsSources,
   sourcemapsSourcesProtocol,
-  sourcemapsSourcesContent,
+  sourcemapsSourcesContent = true,
   outDirectoryUrl,
   supervisor,
 }) => {
-  if (sourcemapsSourcesContent === undefined) {
-    sourcemapsSourcesContent = true;
-  }
-
   const formatSourcemapSource =
     typeof sourcemapsSources === "function"
       ? (source, urlInfo) => {
@@ -84,6 +80,7 @@ export const createUrlInfoTransformer = ({
     urlInfo.content = undefined;
     urlInfo.sourcemap = null;
     urlInfo.sourcemapIsWrong = null;
+    urlInfo.sourcemapReference = null;
   };
 
   const setContentProperties = (
@@ -148,6 +145,10 @@ export const createUrlInfoTransformer = ({
     generatedUrlObject.searchParams.delete("js_module_fallback");
     generatedUrlObject.searchParams.delete("as_js_module");
     generatedUrlObject.searchParams.delete("as_js_classic");
+    generatedUrlObject.searchParams.delete("as_css_module");
+    generatedUrlObject.searchParams.delete("as_json_module");
+    generatedUrlObject.searchParams.delete("as_text_module");
+    generatedUrlObject.searchParams.delete("dynamic_import");
     const urlForSourcemap = generatedUrlObject.href;
     urlInfo.sourcemapGeneratedUrl = generateSourcemapFileUrl(urlForSourcemap);
 
@@ -174,6 +175,7 @@ export const createUrlInfoTransformer = ({
         specifierLine: line,
         specifierColumn: column,
       });
+      urlInfo.sourcemapReference = sourcemapReference;
       try {
         await sourcemapReference.urlInfo.cook();
         const sourcemapRaw = JSON.parse(sourcemapReference.urlInfo.content);
@@ -287,11 +289,11 @@ export const createUrlInfoTransformer = ({
     if (!contentIsInlined) {
       writeFileSync(new URL(generatedUrl), urlInfo.content);
     }
-    const { sourcemapGeneratedUrl, sourcemap } = urlInfo;
-    if (sourcemapGeneratedUrl && sourcemap) {
+    const { sourcemapGeneratedUrl, sourcemapReference } = urlInfo;
+    if (sourcemapGeneratedUrl && sourcemapReference) {
       writeFileSync(
         new URL(sourcemapGeneratedUrl),
-        JSON.stringify(sourcemap, null, "  "),
+        sourcemapReference.urlInfo.content,
       );
     }
   };
@@ -310,25 +312,28 @@ export const createUrlInfoTransformer = ({
     // in this scenarion we don't want to inject sourcemap reference
     // just update the content
 
-    let sourcemapReference = null;
-    for (const referenceToOther of urlInfo.referenceToOthersSet) {
-      if (referenceToOther.type === "sourcemap_comment") {
-        sourcemapReference = referenceToOther;
-        break;
-      }
-    }
+    let sourcemapReference = urlInfo.sourcemapReference;
     if (!sourcemapReference) {
-      sourcemapReference = urlInfo.dependencies.inject({
-        trace: {
-          message: `sourcemap comment placeholder`,
-          url: urlInfo.url,
-        },
-        type: "sourcemap_comment",
-        subtype: urlInfo.contentType === "text/javascript" ? "js" : "css",
-        expectedType: "sourcemap",
-        specifier: urlInfo.sourcemapGeneratedUrl,
-        isInline: sourcemaps === "inline",
-      });
+      for (const referenceToOther of urlInfo.referenceToOthersSet) {
+        if (referenceToOther.type === "sourcemap_comment") {
+          sourcemapReference = referenceToOther;
+          break;
+        }
+      }
+      if (!sourcemapReference) {
+        sourcemapReference = urlInfo.dependencies.inject({
+          trace: {
+            message: `sourcemap comment placeholder`,
+            url: urlInfo.url,
+          },
+          type: "sourcemap_comment",
+          subtype: urlInfo.contentType === "text/javascript" ? "js" : "css",
+          expectedType: "sourcemap",
+          specifier: urlInfo.sourcemapGeneratedUrl,
+          isInline: sourcemaps === "inline",
+        });
+      }
+      urlInfo.sourcemapReference = sourcemapReference;
     }
     const sourcemapUrlInfo = sourcemapReference.urlInfo;
     // It's possible urlInfo content to be modified after being finalized