@jsenv/core 27.0.0-alpha.85 → 27.0.0-alpha.88

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "27.0.0-alpha.85",
+  "version": "27.0.0-alpha.88",
   "description": "Tool to develop, test and build js projects",
   "license": "MIT",
   "author": {
@@ -65,20 +65,10 @@
     "@babel/plugin-transform-modules-umd": "7.18.0",
     "@c88/v8-coverage": "0.1.1",
     "@financial-times/polyfill-useragent-normaliser": "2.0.1",
-    "@jsenv/abort": "4.2.2",
-    "@jsenv/ast": "1.1.0",
+    "@jsenv/ast": "1.1.1",
     "@jsenv/babel-plugins": "1.0.5",
-    "@jsenv/filesystem": "4.0.9",
-    "@jsenv/importmap": "1.2.0",
-    "@jsenv/integrity": "0.0.1",
-    "@jsenv/log": "2.0.0",
-    "@jsenv/node-esm-resolution": "0.1.0",
-    "@jsenv/server": "12.7.0",
-    "@jsenv/uneval": "1.6.0",
-    "@jsenv/sourcemap": "1.0.0",
-    "@jsenv/utils": "2.0.0",
-    "@jsenv/url-meta": "7.0.0",
-    "@jsenv/urls": "1.2.5",
+    "@jsenv/log": "2.0.1",
+    "@jsenv/sourcemap": "1.0.1",
     "acorn-import-assertions": "1.8.0",
     "construct-style-sheets-polyfill": "3.1.0",
     "cuid": "2.1.8",
@@ -91,6 +81,7 @@
     "pidtree": "0.6.0",
     "regenerator-runtime": "0.13.9",
     "rollup": "2.75.6",
+    "string-width": "5.1.2",
     "strip-ansi": "7.0.1",
     "terser": "5.14.1",
     "v8-to-istanbul": "9.0.0",
@@ -99,14 +90,24 @@
   "devDependencies": {
     "@babel/eslint-parser": "7.18.2",
     "@babel/plugin-syntax-import-assertions": "7.17.12",
+    "@jsenv/abort": "4.2.3",
     "@jsenv/assert": "2.5.4",
     "@jsenv/eslint-config": "16.0.9",
     "@jsenv/file-size-impact": "12.1.13",
+    "@jsenv/filesystem": "4.0.10",
     "@jsenv/https-local": "1.1.0",
+    "@jsenv/importmap": "1.2.1",
     "@jsenv/importmap-node-module": "5.1.3",
+    "@jsenv/integrity": "0.0.1",
+    "@jsenv/node-esm-resolution": "0.1.0",
     "@jsenv/package-workspace": "0.2.1",
     "@jsenv/performance-impact": "2.2.11",
     "@jsenv/pwa": "5.0.0",
+    "@jsenv/server": "12.7.2",
+    "@jsenv/uneval": "1.6.0",
+    "@jsenv/url-meta": "7.0.0",
+    "@jsenv/urls": "1.2.6",
+    "@jsenv/utils": "2.0.1",
     "eslint": "8.17.0",
     "eslint-plugin-html": "6.2.0",
     "eslint-plugin-import": "2.26.0",
@@ -116,4 +117,4 @@
     "prettier": "2.7.1",
     "redux": "4.1.2"
   }
-}
+}

package/src/build/build.js

@@ -28,7 +28,6 @@ import { Abort, raceProcessTeardownEvents } from "@jsenv/abort"
 import { createLogger, loggerToLevels, createTaskLog } from "@jsenv/log"
 import { generateSourcemapFileUrl } from "@jsenv/sourcemap"
 import { parseHtmlString, stringifyHtmlAst } from "@jsenv/ast"
-import { createVersionGenerator } from "@jsenv/utils/src/versioning/version_generator.js"
 
 import { sortByDependencies } from "../omega/url_graph/sort_by_dependencies.js"
 import { createUrlGraph } from "../omega/url_graph.js"
@@ -44,6 +43,7 @@ import { isWebWorkerEntryPointReference } from "../omega/web_workers.js"
 import { GRAPH } from "./graph_utils.js"
 import { createBuilUrlsGenerator } from "./build_urls_generator.js"
 import { injectGlobalVersionMapping } from "./inject_global_version_mappings.js"
+import { createVersionGenerator } from "./version_generator.js"
 import { injectServiceWorkerUrls } from "./inject_service_worker_urls.js"
 import { resyncRessourceHints } from "./resync_ressource_hints.js"
 
@@ -166,7 +166,6 @@ build ${entryPointKeys.length} entry points`)
     const prebuildTask = createTaskLog("prebuild", {
       disabled: infoLogsAreDisabled,
     })
-    let urlCount = 0
     const prebuildRedirections = new Map()
     const rawGraphKitchen = createKitchen({
       signal,
@@ -180,14 +179,6 @@ build ${entryPointKeys.length} entry points`)
       writeGeneratedFiles,
       plugins: [
         ...plugins,
-        {
-          name: "jsenv:build_log",
-          appliesDuring: { build: true },
-          cooked: () => {
-            urlCount++
-            prebuildTask.setRightText(urlCount)
-          },
-        },
         {
           appliesDuring: "build",
           fetchUrlContent: (urlInfo, context) => {

package/src/build/inject_service_worker_urls.js

@@ -1,7 +1,7 @@
 import { createMagicSource } from "@jsenv/sourcemap"
-import { createVersionGenerator } from "@jsenv/utils/src/versioning/version_generator.js"
 
 import { GRAPH } from "./graph_utils.js"
+import { createVersionGenerator } from "./version_generator.js"
 
 export const injectServiceWorkerUrls = async ({
   finalGraph,

package/src/build/version_generator.js

@@ -0,0 +1,60 @@
+import { createHash } from "node:crypto"
+
+import { CONTENT_TYPE } from "@jsenv/utils/src/content_type/content_type.js"
+
+// https://github.com/rollup/rollup/blob/19e50af3099c2f627451a45a84e2fa90d20246d5/src/utils/FileEmitter.ts#L47
+// https://github.com/rollup/rollup/blob/5a5391971d695c808eed0c5d7d2c6ccb594fc689/src/Chunk.ts#L870
+export const createVersionGenerator = () => {
+  const hash = createHash("sha256")
+
+  const augmentWithContent = ({
+    content,
+    contentType = "application/octet-stream",
+    lineBreakNormalization = false,
+  }) => {
+    hash.update(
+      lineBreakNormalization && CONTENT_TYPE.isTextual(contentType)
+        ? normalizeLineBreaks(content)
+        : content,
+    )
+  }
+
+  const augmentWithDependencyVersion = (version) => {
+    hash.update(version)
+  }
+
+  return {
+    augmentWithContent,
+    augmentWithDependencyVersion,
+    generate: () => {
+      return hash.digest("hex").slice(0, 8)
+    },
+  }
+}
+
+const normalizeLineBreaks = (stringOrBuffer) => {
+  if (typeof stringOrBuffer === "string") {
+    const stringWithLinuxBreaks = stringOrBuffer.replace(/\r\n/g, "\n")
+    return stringWithLinuxBreaks
+  }
+  return normalizeLineBreaksForBuffer(stringOrBuffer)
+}
+
+// https://github.com/nodejs/help/issues/1738#issuecomment-458460503
+const normalizeLineBreaksForBuffer = (buffer) => {
+  const int32Array = new Int32Array(buffer, 0, buffer.length)
+  const int32ArrayWithLineBreaksNormalized = int32Array.filter(
+    (element, index, typedArray) => {
+      if (element === 0x0d) {
+        if (typedArray[index + 1] === 0x0a) {
+          // Windows -> Unix
+          return false
+        }
+        // Mac OS -> Unix
+        typedArray[index] = 0x0a
+      }
+      return true
+    },
+  )
+  return Buffer.from(int32ArrayWithLineBreaksNormalized)
+}

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="virtual:FAVICON_HREF" />
+    <link rel="icon" href="ignore:FAVICON_HREF" />
     <style>
       button:focus,
       a:focus,

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

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

package/src/plugins/file_urls/jsenv_plugin_file_urls.js

@@ -58,6 +58,14 @@ export const jsenvPluginFileUrls = ({
           urlObject.pathname = pathname.slice(0, -1)
         }
         if (foundADirectory && directoryReferenceAllowed) {
+          if (
+            // ignore new URL second arg
+            reference.subtype === "new_url_second_arg" ||
+            // ignore root file url
+            reference.url === "file:///"
+          ) {
+            reference.shouldHandle = false
+          }
           reference.data.foundADirectory = true
           const directoryFacadeUrl = urlObject.href
           const directoryUrlRaw = preserveSymlinks

package/src/plugins/http_urls/jsenv_plugin_http_urls.js

@@ -2,11 +2,15 @@ export const jsenvPluginHttpUrls = () => {
   return {
     name: "jsenv:http_urls",
     appliesDuring: "*",
-    // fetchUrlContent: (urlInfo) => {
-    //   if (urlInfo.url.startsWith("http") || urlInfo.url.startsWith("https")) {
-    //     return { shouldHandle: false }
-    //   }
-    //   return null
-    // },
+    redirectUrl: (reference) => {
+      if (
+        reference.url.startsWith("http:") ||
+        reference.url.startsWith("https:")
+      ) {
+        reference.shouldHandle = false
+      }
+      // TODO: according to some pattern matching jsenv could be allowed
+      // to fetch and transform http urls
+    },
   }
 }

package/src/plugins/importmap/jsenv_plugin_importmap.js

@@ -106,7 +106,7 @@ export const jsenvPluginImportmap = () => {
           onHtmlImportmapParsed(null, htmlUrlInfo.url)
           return null
         }
-        const handleInlineImportmap = async (importmap, textNode) => {
+        const handleInlineImportmap = async (importmap, htmlNodeText) => {
           const { line, column, lineEnd, columnEnd, isOriginal } =
             getHtmlNodePosition(importmap, {
               preferOriginal: true,
@@ -127,7 +127,7 @@ export const jsenvPluginImportmap = () => {
               specifierColumn: column,
               specifier: inlineImportmapUrl,
               contentType: "application/importmap+json",
-              content: textNode.value,
+              content: htmlNodeText,
             })
           await context.cook(inlineImportmapUrlInfo, {
             reference: inlineImportmapReference,

package/src/plugins/plugins.js

@@ -49,8 +49,10 @@ export const getCorePlugins = ({
     jsenvPluginUrlAnalysis({ rootDirectoryUrl, ...urlAnalysis }),
     jsenvPluginTranspilation(transpilation),
     ...(htmlSupervisor ? [jsenvPluginHtmlSupervisor(htmlSupervisor)] : []), // before inline as it turns inline <script> into <script src>
+    jsenvPluginImportmap(),
+    // before node esm to handle bare specifiers
+    // + before node esm to handle importmap before inline content
     jsenvPluginInline(), // before "file urls" to resolve and load inline urls
-    jsenvPluginImportmap(), // before node esm to handle bare specifiers before node esm
     jsenvPluginFileUrls({
       directoryReferenceAllowed,
       ...fileSystemMagicResolution,

package/src/plugins/url_analysis/jsenv_plugin_url_analysis.js

@@ -6,7 +6,11 @@ import { parseAndTransformCssUrls } from "./css/css_urls.js"
 import { parseAndTransformJsUrls } from "./js/js_urls.js"
 import { parseAndTransformWebmanifestUrls } from "./webmanifest/webmanifest_urls.js"
 
-export const jsenvPluginUrlAnalysis = ({ rootDirectoryUrl, include }) => {
+export const jsenvPluginUrlAnalysis = ({
+  rootDirectoryUrl,
+  include,
+  supportedProtocols = ["file:", "data:", "virtual:", "http:", "https:"],
+}) => {
   let getIncludeInfo = () => undefined
   if (include) {
     const associations = URL_META.resolveAssociations(
@@ -23,6 +27,9 @@ export const jsenvPluginUrlAnalysis = ({ rootDirectoryUrl, include }) => {
     name: "jsenv:url_analysis",
     appliesDuring: "*",
     redirectUrl: (reference) => {
+      if (reference.shouldHandle !== undefined) {
+        return
+      }
       if (
         reference.specifier[0] === "#" &&
         // For Html, css and in general "#" refer to a ressource in the page
@@ -43,11 +50,11 @@ export const jsenvPluginUrlAnalysis = ({ rootDirectoryUrl, include }) => {
         reference.shouldHandle = false
         return
       }
-      if (reference.url.startsWith("data:")) {
-        reference.shouldHandle = true
-        return
-      }
-      if (reference.url.startsWith("file:")) {
+      const { protocol } = new URL(reference.url)
+      const protocolIsSupported = supportedProtocols.some(
+        (supportedProtocol) => protocol === supportedProtocol,
+      )
+      if (protocolIsSupported) {
         reference.shouldHandle = true
         return
       }