@jsenv/core 27.0.0-alpha.65 → 27.0.0-alpha.66

package/dist/html/explorer.html

@@ -2,7 +2,7 @@
     <title>Exploring</title>
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta charset="utf-8">
-    <link rel="icon" href="../other/jsenv.png">
+    <link rel="icon" href="virtual:FAVICON_HREF">
     <style>button:focus, a:focus, input:focus, [data-contains-hidden-input] input:focus + * {
   outline-offset: -2px;
   outline-style: none;

package/dist/main.js

@@ -1,5 +1,5 @@
 import { parentPort } from "node:worker_threads";
-import { urlToRelativeUrl, normalizeStructuredMetaMap, urlToMeta, registerFileLifecycle, urlIsInsideOf, urlToExtension, urlToFilename, readFileSync as readFileSync$1, fileSystemPathToUrl, urlToFileSystemPath, isFileSystemPath, bufferToEtag, writeFileSync, ensureWindowsDriveLetter, moveUrl, collectFiles, assertAndNormalizeDirectoryUrl, registerDirectoryLifecycle, resolveUrl, writeFile, ensureEmptyDirectory, writeDirectory, resolveDirectoryUrl, urlToBasename } from "@jsenv/filesystem";
+import { urlToRelativeUrl, normalizeStructuredMetaMap, urlToMeta, registerFileLifecycle, urlIsInsideOf, urlToFilename, urlToExtension, readFileSync as readFileSync$1, fileSystemPathToUrl, urlToFileSystemPath, isFileSystemPath, bufferToEtag, writeFileSync, ensureWindowsDriveLetter, moveUrl, collectFiles, assertAndNormalizeDirectoryUrl, registerDirectoryLifecycle, resolveUrl, writeFile, ensureEmptyDirectory, writeDirectory, resolveDirectoryUrl, urlToBasename } from "@jsenv/filesystem";
 import { createDetailedMessage, createLogger, loggerToLevels } from "@jsenv/logger";
 import { createTaskLog, ANSI, msAsDuration, msAsEllapsedTime, byteAsMemoryUsage, UNICODE, createLog, startSpinner, distributePercentages, byteAsFileSize } from "@jsenv/log";
 import { getCallerPosition } from "@jsenv/utils/src/caller_position.js";
@@ -530,7 +530,11 @@ const jsenvPluginUrlAnalysis = ({
     name: "jsenv:url_analysis",
     appliesDuring: "*",
     redirectUrl: reference => {
-      if (reference.specifier[0] === "#") {
+      if (reference.specifier[0] === "#" && // For Html, css and in general "#" refer to a ressource in the page
+      // so that urls must be kept intact
+      // However for js import specifiers they have a different meaning and we want
+      // to resolve them (https://nodejs.org/api/packages.html#imports for instance)
+      reference.type !== "js_import_export") {
         reference.shouldHandle = false;
         return;
       }
@@ -566,12 +570,12 @@ const jsenvPluginUrlAnalysis = ({
       directory: (urlInfo, context) => {
         const originalDirectoryReference = findOriginalDirectoryReference(urlInfo, context);
         const directoryRelativeUrl = urlToRelativeUrl(urlInfo.url, context.rootDirectoryUrl);
-        JSON.parse(urlInfo.content).forEach(directoryEntry => {
+        JSON.parse(urlInfo.content).forEach(directoryEntryName => {
           context.referenceUtils.found({
             type: "filesystem",
             subtype: "directory_entry",
-            specifier: directoryEntry,
-            trace: `"${directoryRelativeUrl}${directoryEntry}" entry in directory referenced by ${originalDirectoryReference.trace}`
+            specifier: directoryEntryName,
+            trace: `"${directoryRelativeUrl}${directoryEntryName}" entry in directory referenced by ${originalDirectoryReference.trace}`
           });
         });
       }
@@ -1206,11 +1210,20 @@ const jsenvPluginFileUrls = ({
       if (context.reference.expectedType === "directory") {
         if (directoryReferenceAllowed) {
           const directoryEntries = readdirSync(urlObject);
+          let filename;
+
+          if (context.reference.type === "filesystem") {
+            const parentUrlInfo = context.urlGraph.getUrlInfo(context.reference.parentUrl);
+            filename = `${parentUrlInfo.filename}${context.reference.specifier}/`;
+          } else {
+            filename = `${urlToFilename(urlInfo.url)}/`;
+          }
+
           return {
             type: "directory",
             contentType: "application/json",
             content: JSON.stringify(directoryEntries, null, "  "),
-            filename: urlToRelativeUrl(ensurePathnameTrailingSlash(urlInfo.url), context.rootDirectoryUrl)
+            filename
           };
         }
 
@@ -2707,7 +2720,7 @@ export default inlineContent.text`
 // https://github.com/babel/babel/blob/99f4f6c3b03c7f3f67cf1b9f1a21b80cfd5b0224/packages/babel-core/src/tools/build-external-helpers.js
 // the list of possible helpers:
 // https://github.com/babel/babel/blob/99f4f6c3b03c7f3f67cf1b9f1a21b80cfd5b0224/packages/babel-helpers/src/helpers.js#L13
-const babelHelperClientDirectoryUrl = new URL("./node_modules/@jsenv/babel-plugins/src/babel_helpers/", import.meta.url).href; // we cannot use "@jsenv/core/src/*" because babel helper might be injected
+const babelHelperClientDirectoryUrl = new URL("./babel_helpers/", import.meta.url).href; // we cannot use "@jsenv/core/src/*" because babel helper might be injected
 // into node_modules not depending on "@jsenv/core"
 
 const getBabelHelperFileUrl = babelHelperName => {
@@ -8287,7 +8300,7 @@ const jsenvPluginExplorer = ({
         meta
       }));
       let html = String(readFileSync(new URL(htmlClientFileUrl)));
-      html = html.replace("FAVICON_HREF", DataUrl.stringify({
+      html = html.replace("virtual:FAVICON_HREF", DataUrl.stringify({
         contentType: CONTENT_TYPE.fromUrlExtension(faviconClientFileUrl),
         base64Flag: true,
         data: readFileSync(new URL(faviconClientFileUrl)).toString("base64")
@@ -12858,6 +12871,14 @@ const applyUrlVersioning = async ({
           return url;
         },
         formatUrl: reference => {
+          if (!reference.shouldHandle) {
+            if (reference.generatedUrl.startsWith("ignore:")) {
+              return reference.generatedUrl.slice("ignore:".length);
+            }
+
+            return null;
+          }
+
           if (reference.isInline || reference.url.startsWith("data:")) {
             return null;
           }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "27.0.0-alpha.65",
+  "version": "27.0.0-alpha.66",
   "description": "Tool to develop, test and build js projects",
   "license": "MIT",
   "author": {
@@ -77,7 +77,7 @@
     "@jsenv/node-esm-resolution": "0.0.10",
     "@jsenv/server": "12.6.3",
     "@jsenv/uneval": "1.6.0",
-    "@jsenv/utils": "1.8.1",
+    "@jsenv/utils": "1.8.2",
     "construct-style-sheets-polyfill": "3.1.0",
     "cssnano": "5.1.7",
     "cssnano-preset-default": "5.2.7",

package/src/build/build.js

@@ -1116,6 +1116,12 @@ const applyUrlVersioning = async ({
             return url
           },
           formatUrl: (reference) => {
+            if (!reference.shouldHandle) {
+              if (reference.generatedUrl.startsWith("ignore:")) {
+                return reference.generatedUrl.slice("ignore:".length)
+              }
+              return null
+            }
             if (reference.isInline || reference.url.startsWith("data:")) {
               return null
             }

package/src/dev/plugins/explorer/client/explorer.html

@@ -4,7 +4,7 @@
     <title>Exploring</title>
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta charset="utf-8" />
-    <link rel="icon" href="./jsenv.png" />
+    <link rel="icon" href="virtual:FAVICON_HREF" />
     <style>
       button:focus,
       a:focus,

package/src/dev/plugins/explorer/jsenv_plugin_explorer.js

@@ -41,7 +41,7 @@ export const jsenvPluginExplorer = ({ groups }) => {
       }))
       let html = String(readFileSync(new URL(htmlClientFileUrl)))
       html = html.replace(
-        "FAVICON_HREF",
+        "virtual:FAVICON_HREF",
         DataUrl.stringify({
           contentType: CONTENT_TYPE.fromUrlExtension(faviconClientFileUrl),
           base64Flag: true,

package/src/plugins/file_urls/jsenv_plugin_file_urls.js

@@ -4,6 +4,7 @@ import {
   urlIsInsideOf,
   urlToRelativeUrl,
   urlToExtension,
+  urlToFilename,
 } from "@jsenv/filesystem"
 
 import { applyFileSystemMagicResolution } from "@jsenv/node-esm-resolution"
@@ -152,14 +153,20 @@ export const jsenvPluginFileUrls = ({
         if (context.reference.expectedType === "directory") {
           if (directoryReferenceAllowed) {
             const directoryEntries = readdirSync(urlObject)
+            let filename
+            if (context.reference.type === "filesystem") {
+              const parentUrlInfo = context.urlGraph.getUrlInfo(
+                context.reference.parentUrl,
+              )
+              filename = `${parentUrlInfo.filename}${context.reference.specifier}/`
+            } else {
+              filename = `${urlToFilename(urlInfo.url)}/`
+            }
             return {
               type: "directory",
               contentType: "application/json",
               content: JSON.stringify(directoryEntries, null, "  "),
-              filename: urlToRelativeUrl(
-                ensurePathnameTrailingSlash(urlInfo.url),
-                context.rootDirectoryUrl,
-              ),
+              filename,
             }
           }
           const error = new Error("found a directory on filesystem")

package/src/plugins/url_analysis/jsenv_plugin_url_analysis.js

@@ -31,7 +31,14 @@ export const jsenvPluginUrlAnalysis = ({ rootDirectoryUrl, include }) => {
     name: "jsenv:url_analysis",
     appliesDuring: "*",
     redirectUrl: (reference) => {
-      if (reference.specifier[0] === "#") {
+      if (
+        reference.specifier[0] === "#" &&
+        // For Html, css and in general "#" refer to a ressource in the page
+        // so that urls must be kept intact
+        // However for js import specifiers they have a different meaning and we want
+        // to resolve them (https://nodejs.org/api/packages.html#imports for instance)
+        reference.type !== "js_import_export"
+      ) {
         reference.shouldHandle = false
         return
       }
@@ -68,12 +75,12 @@ export const jsenvPluginUrlAnalysis = ({ rootDirectoryUrl, include }) => {
           urlInfo.url,
           context.rootDirectoryUrl,
         )
-        JSON.parse(urlInfo.content).forEach((directoryEntry) => {
+        JSON.parse(urlInfo.content).forEach((directoryEntryName) => {
           context.referenceUtils.found({
             type: "filesystem",
             subtype: "directory_entry",
-            specifier: directoryEntry,
-            trace: `"${directoryRelativeUrl}${directoryEntry}" entry in directory referenced by ${originalDirectoryReference.trace}`,
+            specifier: directoryEntryName,
+            trace: `"${directoryRelativeUrl}${directoryEntryName}" entry in directory referenced by ${originalDirectoryReference.trace}`,
           })
         })
       },