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

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="virtual:FAVICON_HREF">
+    <link rel="icon" href="ignore: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

@@ -29,7 +29,7 @@ import { memoize } from "@jsenv/utils/src/memoize/memoize.js";
 import { escapeRegexpSpecialChars } from "@jsenv/utils/src/string/escape_regexp_special_chars.js";
 import { fork } from "node:child_process";
 import { uneval } from "@jsenv/uneval";
-import { createVersionGenerator } from "@jsenv/utils/src/versioning/version_generator.js";
+import { createHash } from "node:crypto";
 
 const createReloadableWorker = (workerFileUrl, options = {}) => {
   const workerFilePath = fileURLToPath(workerFileUrl);
@@ -520,7 +520,8 @@ const parseAndTransformWebmanifestUrls = async (urlInfo, context) => {
 
 const jsenvPluginUrlAnalysis = ({
   rootDirectoryUrl,
-  include
+  include,
+  supportedProtocols = ["file:", "data:", "virtual:", "http:", "https:"]
 }) => {
   let getIncludeInfo = () => undefined;
 
@@ -565,12 +566,12 @@ const jsenvPluginUrlAnalysis = ({
         return;
       }
 
-      if (reference.url.startsWith("data:")) {
-        reference.shouldHandle = true;
-        return;
-      }
+      const {
+        protocol
+      } = new URL(reference.url);
+      const protocolIsSupported = supportedProtocols.some(supportedProtocol => protocol === supportedProtocol);
 
-      if (reference.url.startsWith("file:")) {
+      if (protocolIsSupported) {
         reference.shouldHandle = true;
         return;
       }
@@ -1251,13 +1252,14 @@ const resolveSymlink = fileUrl => {
 const jsenvPluginHttpUrls = () => {
   return {
     name: "jsenv:http_urls",
-    appliesDuring: "*" // fetchUrlContent: (urlInfo) => {
-    //   if (urlInfo.url.startsWith("http") || urlInfo.url.startsWith("https")) {
-    //     return { shouldHandle: false }
-    //   }
-    //   return null
-    // },
+    appliesDuring: "*",
+    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
 
+    }
   };
 };
 
@@ -8392,7 +8394,7 @@ const jsenvPluginExplorer = ({
         meta
       }));
       let html = String(readFileSync(new URL(htmlClientFileUrl)));
-      html = html.replace("virtual:FAVICON_HREF", DATA_URL.stringify({
+      html = html.replace("ignore:FAVICON_HREF", DATA_URL.stringify({
         contentType: CONTENT_TYPE.fromUrlExtension(faviconClientFileUrl),
         base64Flag: true,
         data: readFileSync(new URL(faviconClientFileUrl)).toString("base64")
@@ -12377,6 +12379,60 @@ ${globalName}.__v__ = function (specifier) {
 `;
 };
 
+// https://github.com/rollup/rollup/blob/5a5391971d695c808eed0c5d7d2c6ccb594fc689/src/Chunk.ts#L870
+
+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);
+};
+
 const injectServiceWorkerUrls = async ({
   finalGraph,
   finalGraphKitchen,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "27.0.0-alpha.85",
+  "version": "27.0.0-alpha.86",
   "description": "Tool to develop, test and build js projects",
   "license": "MIT",
   "author": {
@@ -73,7 +73,7 @@
     "@jsenv/integrity": "0.0.1",
     "@jsenv/log": "2.0.0",
     "@jsenv/node-esm-resolution": "0.1.0",
-    "@jsenv/server": "12.7.0",
+    "@jsenv/server": "12.7.1",
     "@jsenv/uneval": "1.6.0",
     "@jsenv/sourcemap": "1.0.0",
     "@jsenv/utils": "2.0.0",

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"
 

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/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/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(
@@ -43,11 +47,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
       }