@jsenv/core 28.5.0 → 29.0.0

package/package.json

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

package/src/build/build.js

@@ -123,8 +123,8 @@ export const build = async ({
   sourcemaps = false,
   sourcemapsSourcesContent,
   urlAnalysis = {},
-  nodeEsmResolution = true,
-  fileSystemMagicResolution,
+  urlResolution,
+  fileSystemMagicRedirection,
   directoryReferenceAllowed,
   transpilation = {},
   bundling = true,
@@ -221,8 +221,8 @@ build ${entryPointKeys.length} entry points`)
           runtimeCompat,
 
           urlAnalysis,
-          nodeEsmResolution,
-          fileSystemMagicResolution,
+          urlResolution,
+          fileSystemMagicRedirection,
           directoryReferenceAllowed,
           transpilation: {
             ...transpilation,
@@ -326,10 +326,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
                 if (rawUrlInfo.content === reference.content) {
                   return true
                 }
-                if (rawUrlInfo.originalContent === reference.content) {
-                  return true
-                }
-                return false
+                return rawUrlInfo.originalContent === reference.content
               })
               const parentUrlInfo = finalGraph.getUrlInfo(reference.parentUrl)
               if (!rawUrlInfo) {
@@ -635,7 +632,6 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
           const bundler = bundlers[rawUrlInfo.type]
           if (bundler) {
             bundler.urlInfos.push(rawUrlInfo)
-            return
           }
         }
         GRAPH.forEach(rawGraph, (rawUrlInfo) => {
@@ -1510,18 +1506,12 @@ const isUsed = (urlInfo) => {
   if (urlInfo.injected) {
     return true
   }
-  if (urlInfo.dependents.size > 0) {
-    return true
-  }
-  return false
+  return urlInfo.dependents.size > 0
 }
 
 const canUseVersionedUrl = (urlInfo) => {
   if (urlInfo.isEntryPoint) {
     return false
   }
-  if (urlInfo.type === "webmanifest") {
-    return false
-  }
-  return true
+  return urlInfo.type !== "webmanifest"
 }

package/src/dev/start_dev_server.js

@@ -39,6 +39,7 @@ export const startDevServer = async ({
     "./jsenv.config.mjs": true,
   },
   clientAutoreload = true,
+  clientMainFileUrl,
   devServerAutoreload = false,
   devServerMainFile = getCallerPosition().url,
   cooldownBetweenFileEvents,
@@ -49,20 +50,11 @@ export const startDevServer = async ({
   runtimeCompat = defaultRuntimeCompat,
   plugins = [],
   urlAnalysis = {},
+  urlResolution,
   supervisor = true,
-  nodeEsmResolution,
-  fileSystemMagicResolution,
+  fileSystemMagicRedirection,
   transpilation,
-  explorer = {
-    groups: {
-      src: {
-        "./src/**/*.html": true,
-      },
-      tests: {
-        "./tests/**/*.test.html": true,
-      },
-    },
-  },
+  explorer = true, // see jsenv_plugin_explorer.js
   // toolbar = false,
 
   sourcemaps = "inline",
@@ -128,9 +120,6 @@ export const startDevServer = async ({
         worker.once("message", resolve)
       })
       const origin = await messagePromise
-      // if (!keepProcessAlive) {
-      //   worker.unref()
-      // }
       return {
         origin,
         stop: () => {
@@ -163,11 +152,12 @@ export const startDevServer = async ({
 
     plugins,
     urlAnalysis,
+    urlResolution,
+    fileSystemMagicRedirection,
     supervisor,
-    nodeEsmResolution,
-    fileSystemMagicResolution,
     transpilation,
     clientFiles,
+    clientMainFileUrl,
     clientAutoreload,
     cooldownBetweenFileEvents,
     explorer,

package/src/execute/runtimes/browsers/from_playwright.js

@@ -355,7 +355,6 @@ export const createRuntimeFromPlaywright = ({
           })
         }
       })
-      return
     }
 
     try {
@@ -479,10 +478,7 @@ const isTargetClosedError = (error) => {
   if (error.message.match(/Protocol error \(.*?\): Browser.*?closed/)) {
     return true
   }
-  if (error.message.includes("browserContext.close: Browser closed")) {
-    return true
-  }
-  return false
+  return error.message.includes("browserContext.close: Browser closed")
 }
 
 const extractTextFromConsoleMessage = (consoleMessage) => {

package/src/omega/kitchen.js

@@ -134,6 +134,7 @@ export const createKitchen = ({
       isResourceHint,
       isImplicit,
       hasVersioningEffect,
+      version: null,
       injected,
       timing: {},
       // for inline resources the reference contains the content
@@ -936,53 +937,3 @@ const determineFileUrlForOutDirectory = ({ urlInfo, context }) => {
     preferAbsolute: true,
   })
 }
-
-// import { getOriginalPosition } from "@jsenv/core/src/utils/sourcemap/original_position.js"
-// const getUrlSite = async (
-//   urlInfo,
-//   { line, column, originalLine, originalColumn },
-// ) => {
-//   if (typeof originalLine === "number") {
-//     return {
-//       url: urlInfo.url,
-//       line: originalLine,
-//       column: originalColumn,
-//     }
-//   }
-//   if (urlInfo.content === urlInfo.originalContent) {
-//     return {
-//       url: urlInfo.url,
-//       line,
-//       column,
-//     }
-//   }
-//   // at this point things were transformed: line and column are generated
-//   // no sourcemap -> cannot map back to original file
-//   const { sourcemap } = urlInfo
-//   if (!sourcemap) {
-//     return {
-//       url: urlInfo.generatedUrl,
-//       content: urlInfo.content,
-//       line,
-//       column,
-//     }
-//   }
-//   const originalPosition = await getOriginalPosition({
-//     sourcemap,
-//     line,
-//     column,
-//   })
-//   // cannot map back to original file
-//   if (!originalPosition || originalPosition.line === null) {
-//     return {
-//       url: urlInfo.generatedUrl,
-//       line,
-//       column,
-//     }
-//   }
-//   return {
-//     url: urlInfo.url,
-//     line: originalPosition.line,
-//     column: originalPosition.column,
-//   }
-// }

package/src/omega/omega_server.js

@@ -30,12 +30,13 @@ export const startOmegaServer = async ({
 
   plugins,
   urlAnalysis,
+  urlResolution,
+  fileSystemMagicRedirection,
   supervisor,
-  nodeEsmResolution,
-  fileSystemMagicResolution,
   transpilation,
   clientAutoreload,
   clientFiles,
+  clientMainFileUrl,
   cooldownBetweenFileEvents,
   explorer,
   sourcemaps,
@@ -92,12 +93,13 @@ export const startOmegaServer = async ({
 
           plugins,
           urlAnalysis,
+          urlResolution,
+          fileSystemMagicRedirection,
           supervisor,
-          nodeEsmResolution,
-          fileSystemMagicResolution,
           transpilation,
           clientAutoreload,
           clientFiles,
+          clientMainFileUrl,
           cooldownBetweenFileEvents,
           explorer,
           sourcemaps,

package/src/omega/server/file_service.js

@@ -26,12 +26,13 @@ export const createFileService = ({
 
   plugins,
   urlAnalysis,
+  urlResolution,
+  fileSystemMagicRedirection,
   supervisor,
-  nodeEsmResolution,
-  fileSystemMagicResolution,
   transpilation,
   clientAutoreload,
   clientFiles,
+  clientMainFileUrl,
   cooldownBetweenFileEvents,
   explorer,
   sourcemaps,
@@ -127,11 +128,12 @@ export const createFileService = ({
           runtimeCompat,
 
           urlAnalysis,
+          urlResolution,
+          fileSystemMagicRedirection,
           supervisor,
-          nodeEsmResolution,
-          fileSystemMagicResolution,
           transpilation,
 
+          clientMainFileUrl,
           clientAutoreload,
           clientFileChangeCallbackList,
           clientFilesPruneCallbackList,
@@ -144,9 +146,7 @@ export const createFileService = ({
       writeGeneratedFiles,
       outDirectoryUrl: scenarios.dev
         ? `${rootDirectoryUrl}.jsenv/${runtimeName}@${runtimeVersion}/`
-        : `${rootDirectoryUrl}.jsenv/${
-            scenarios.test ? "test" : "build"
-          }/${runtimeName}@${runtimeVersion}/`,
+        : `${rootDirectoryUrl}.jsenv/build/${runtimeName}@${runtimeVersion}/`,
     })
     urlGraph.createUrlInfoCallbackRef.current = (urlInfo) => {
       const { watch } = URL_META.applyAssociations({
@@ -352,7 +352,9 @@ export const createFileService = ({
         return {
           url: reference.url,
           status: 200, // let the browser re-throw the syntax error
-          statusText: originalError.reason,
+          // reason becomes the http response statusText, it must not contain invalid chars
+          // https://github.com/nodejs/node/blob/0c27ca4bc9782d658afeaebcec85ec7b28f1cc35/lib/_http_common.js#L221
+          statusText: e.reason,
           statusMessage: originalError.message,
           headers: {
             "content-type": urlInfo.contentType,

package/src/omega/url_specifier_encoding.js

@@ -31,7 +31,7 @@ export const urlSpecifierEncoding = {
 const formatters = {
   "js_import_export": { encode: JSON.stringify, decode: JSON.parse },
   "js_url_specifier": { encode: JSON.stringify, decode: JSON.parse },
-  "css_@import": { encode: JSON.stringify, code: JSON.stringify },
+  "css_@import": { encode: JSON.stringify, decode: JSON.stringify },
   // https://github.com/webpack-contrib/css-loader/pull/627/files
   "css_url": {
     encode: (url) => {

package/src/plugins/autoreload/client/autoreload.js

@@ -197,11 +197,3 @@ window.__server_events__.listenEvents({
     reloader.addMessage(reloadServerEvent.data)
   },
 })
-
-// const findHotMetaUrl = (originalFileRelativeUrl) => {
-//   return Object.keys(urlHotMetas).find((compileUrl) => {
-//     return (
-//       parseCompiledUrl(compileUrl).fileRelativeUrl === originalFileRelativeUrl
-//     )
-//   })
-// }

package/src/plugins/autoreload/jsenv_plugin_autoreload_server.js

@@ -99,7 +99,6 @@ export const jsenvPluginAutoreloadServer = ({
                 return dependentPropagationResult
               }
               // declined by absence of boundary, we can keep searching
-              continue
             }
             if (instructions.length === 0) {
               return {

package/src/plugins/cache_control/jsenv_plugin_cache_control.js

@@ -2,17 +2,7 @@ export const jsenvPluginCacheControl = () => {
   return {
     name: "jsenv:cache_control",
     appliesDuring: "dev",
-    augmentResponse: ({ reference }, context) => {
-      if (context.scenarios.test) {
-        // During dev, all files are put into browser cache for 1 hour because:
-        // 1: Browser cache is a temporary directory created by playwright
-        // 2: We assume source files won't be modified while tests are running
-        return {
-          headers: {
-            "cache-control": `private,max-age=3600,immutable`,
-          },
-        }
-      }
+    augmentResponse: ({ reference }) => {
       if (
         reference.searchParams.has("v") &&
         !reference.searchParams.has("hmr")

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

@@ -365,7 +365,7 @@
         </section>
       </article>
     </div>
-    <script>
+    <script no-supervisor>
       // eslint-disable-next-line no-undef
       const { rootDirectoryUrl, groups, files } = SERVER_PARAMS
 
@@ -479,7 +479,7 @@
 
       document.querySelector("main").appendChild(fileListElement)
     </script>
-    <script>
+    <script no-supervisor>
       // make menu scrollable
       const getMenuWrapperSize = () => {
         return document.querySelector(".menu-wrapper").getBoundingClientRect()

package/src/plugins/explorer/jsenv_plugin_explorer.js

@@ -3,65 +3,85 @@ import { DATA_URL } from "@jsenv/urls"
 import { collectFiles } from "@jsenv/filesystem"
 import { CONTENT_TYPE } from "@jsenv/utils/src/content_type/content_type.js"
 
-export const jsenvPluginExplorer = ({ groups }) => {
-  const htmlClientFileUrl = new URL("./client/explorer.html", import.meta.url)
+export const explorerHtmlFileUrl = new URL(
+  "./client/explorer.html",
+  import.meta.url,
+)
+
+export const jsenvPluginExplorer = ({
+  groups = {
+    src: {
+      "./src/**/*.html": true,
+    },
+    tests: {
+      "./tests/**/*.test.html": true,
+    },
+  },
+  clientMainFileUrl,
+}) => {
   const faviconClientFileUrl = new URL("./client/jsenv.png", import.meta.url)
 
   return {
     name: "jsenv:explorer",
     appliesDuring: "dev",
-    serve: async (request, { rootDirectoryUrl }) => {
-      if (request.pathname !== "/") {
-        return null
-      }
-      const associationsForExplorable = {}
-      Object.keys(groups).forEach((groupName) => {
-        const groupConfig = groups[groupName]
-        associationsForExplorable[groupName] = {
-          "**/.jsenv/": false, // avoid visting .jsenv directory in jsenv itself
-          ...groupConfig,
+    transformUrlContent: {
+      html: async (urlInfo, context) => {
+        if (urlInfo.url !== clientMainFileUrl) {
+          return null
+        }
+        let html = urlInfo.content
+        if (html.includes("ignore:FAVICON_HREF")) {
+          html = html.replace(
+            "ignore:FAVICON_HREF",
+            DATA_URL.stringify({
+              contentType: CONTENT_TYPE.fromUrlExtension(faviconClientFileUrl),
+              base64Flag: true,
+              data: readFileSync(new URL(faviconClientFileUrl)).toString(
+                "base64",
+              ),
+            }),
+          )
+        }
+        if (html.includes("SERVER_PARAMS")) {
+          const associationsForExplorable = {}
+          Object.keys(groups).forEach((groupName) => {
+            const groupConfig = groups[groupName]
+            associationsForExplorable[groupName] = {
+              "**/.jsenv/": false, // avoid visting .jsenv directory in jsenv itself
+              ...groupConfig,
+            }
+          })
+          const matchingFileResultArray = await collectFiles({
+            directoryUrl: context.rootDirectoryUrl,
+            associations: associationsForExplorable,
+            predicate: (meta) =>
+              Object.keys(meta).some((group) => Boolean(meta[group])),
+          })
+          const files = matchingFileResultArray.map(
+            ({ relativeUrl, meta }) => ({
+              relativeUrl,
+              meta,
+            }),
+          )
+
+          html = html.replace(
+            "SERVER_PARAMS",
+            JSON.stringify(
+              {
+                rootDirectoryUrl: context.rootDirectoryUrl,
+                groups,
+                files,
+              },
+              null,
+              "  ",
+            ),
+          )
+          Object.assign(urlInfo.headers, {
+            "cache-control": "no-store",
+          })
         }
-      })
-      const matchingFileResultArray = await collectFiles({
-        directoryUrl: rootDirectoryUrl,
-        associations: associationsForExplorable,
-        predicate: (meta) =>
-          Object.keys(meta).some((group) => Boolean(meta[group])),
-      })
-      const files = matchingFileResultArray.map(({ relativeUrl, meta }) => ({
-        relativeUrl,
-        meta,
-      }))
-      let html = String(readFileSync(new URL(htmlClientFileUrl)))
-      html = html.replace(
-        "ignore:FAVICON_HREF",
-        DATA_URL.stringify({
-          contentType: CONTENT_TYPE.fromUrlExtension(faviconClientFileUrl),
-          base64Flag: true,
-          data: readFileSync(new URL(faviconClientFileUrl)).toString("base64"),
-        }),
-      )
-      html = html.replace(
-        "SERVER_PARAMS",
-        JSON.stringify(
-          {
-            rootDirectoryUrl,
-            groups,
-            files,
-          },
-          null,
-          "  ",
-        ),
-      )
-      return {
-        status: 200,
-        headers: {
-          "cache-control": "no-store",
-          "content-type": "text/html",
-          "content-length": Buffer.byteLength(html),
-        },
-        body: html,
-      }
+        return html
+      },
     },
   }
 }

package/src/plugins/import_meta_hot/html_hot_dependencies.js

@@ -125,14 +125,9 @@ const htmlNodeCanHotReload = (node) => {
       return true
     }
     if (isResourceHint) {
-      // for resource hints html will be notified the underlying resource has changed
-      // but we won't do anything (if the resource is deleted we should?)
-      return true
-    }
-    if (rel === "icon") {
-      return true
+      return false
     }
-    return false
+    return rel === "icon"
   }
   return [
     // "script_src", // script src cannot hot reload

package/src/plugins/plugins.js

@@ -1,8 +1,6 @@
 import { jsenvPluginUrlAnalysis } from "../plugins/url_analysis/jsenv_plugin_url_analysis.js"
-import { jsenvPluginLeadingSlash } from "./leading_slash/jsenv_plugin_leading_slash.js"
 import { jsenvPluginImportmap } from "./importmap/jsenv_plugin_importmap.js"
 import { jsenvPluginUrlResolution } from "./url_resolution/jsenv_plugin_url_resolution.js"
-import { jsenvPluginNodeEsmResolution } from "./node_esm_resolution/jsenv_plugin_node_esm_resolution.js"
 import { jsenvPluginUrlVersion } from "./url_version/jsenv_plugin_url_version.js"
 import { jsenvPluginFileUrls } from "./file_urls/jsenv_plugin_file_urls.js"
 import { jsenvPluginHttpUrls } from "./http_urls/jsenv_plugin_http_urls.js"
@@ -20,38 +18,49 @@ import { jsenvPluginImportMetaHot } from "./import_meta_hot/jsenv_plugin_import_
 import { jsenvPluginAutoreload } from "./autoreload/jsenv_plugin_autoreload.js"
 import { jsenvPluginCacheControl } from "./cache_control/jsenv_plugin_cache_control.js"
 // dev only
-import { jsenvPluginExplorer } from "./explorer/jsenv_plugin_explorer.js"
+import {
+  explorerHtmlFileUrl,
+  jsenvPluginExplorer,
+} from "./explorer/jsenv_plugin_explorer.js"
 
 export const getCorePlugins = ({
   rootDirectoryUrl,
   runtimeCompat,
 
   urlAnalysis = {},
-  supervisor,
-  nodeEsmResolution = true,
-  fileSystemMagicResolution,
+  urlResolution = {},
+  fileSystemMagicRedirection,
   directoryReferenceAllowed,
+  supervisor,
   transpilation = true,
   minification = false,
   bundling = false,
 
+  clientMainFileUrl,
   clientAutoreload = false,
   clientFileChangeCallbackList,
   clientFilesPruneCallbackList,
   explorer,
 } = {}) => {
+  if (explorer === true) {
+    explorer = {}
+  }
   if (supervisor === true) {
     supervisor = {}
   }
-  if (nodeEsmResolution === true) {
-    nodeEsmResolution = {}
-  }
-  if (fileSystemMagicResolution === true) {
-    fileSystemMagicResolution = {}
+  if (fileSystemMagicRedirection === true) {
+    fileSystemMagicRedirection = {}
   }
   if (clientAutoreload === true) {
     clientAutoreload = {}
   }
+  if (clientMainFileUrl === undefined) {
+    clientMainFileUrl = explorer
+      ? String(explorerHtmlFileUrl)
+      : String(new URL("./index.html", rootDirectoryUrl))
+  } else {
+    clientMainFileUrl = String(clientMainFileUrl)
+  }
 
   return [
     jsenvPluginUrlAnalysis({ rootDirectoryUrl, ...urlAnalysis }),
@@ -63,13 +72,14 @@ export const getCorePlugins = ({
     jsenvPluginInline(), // before "file urls" to resolve and load inline urls
     jsenvPluginFileUrls({
       directoryReferenceAllowed,
-      ...fileSystemMagicResolution,
+      ...fileSystemMagicRedirection,
     }),
     jsenvPluginHttpUrls(),
-    jsenvPluginLeadingSlash(),
-    // before url resolution to handle "js_import_export" resolution
-    jsenvPluginNodeEsmResolution(nodeEsmResolution),
-    jsenvPluginUrlResolution(),
+    jsenvPluginUrlResolution({
+      runtimeCompat,
+      urlResolution,
+      clientMainFileUrl,
+    }),
     jsenvPluginUrlVersion(),
     jsenvPluginCommonJsGlobals(),
     jsenvPluginImportMetaScenarios(),
@@ -89,6 +99,13 @@ export const getCorePlugins = ({
         ]
       : []),
     jsenvPluginCacheControl(),
-    ...(explorer ? [jsenvPluginExplorer(explorer)] : []),
+    ...(explorer
+      ? [
+          jsenvPluginExplorer({
+            ...explorer,
+            clientMainFileUrl,
+          }),
+        ]
+      : []),
   ]
 }

package/src/plugins/supervisor/client/supervisor.js

@@ -191,11 +191,13 @@ window.__supervisor__ = (() => {
     }
 
     const stringifyUrlSite = ({ url, line, column }) => {
-      return typeof line === "number" && typeof column === "number"
-        ? `${url}:${line}:${column}`
-        : typeof line === "number"
-        ? `${url}:${line}`
-        : url
+      if (typeof line === "number" && typeof column === "number") {
+        return `${url}:${line}:${column}`
+      }
+      if (typeof line === "number") {
+        return `${url}:${line}`
+      }
+      return url
     }
 
     const resolveUrlSite = ({ url, line, column }) => {
@@ -913,10 +915,7 @@ window.__supervisor__ = (() => {
           if (type && supervisedScriptCandidate.type !== type) {
             return false
           }
-          if (supervisedScriptCandidate.src !== src) {
-            return false
-          }
-          return true
+          return supervisedScriptCandidate.src === src
         },
       )
       if (supervisedScript) {

package/src/plugins/toolbar/client/util/fetch_using_xhr.js

@@ -116,9 +116,6 @@ export const fetchUsingXHR = async (
     if (responseBodyType === "arrayBuffer") {
       return arrayBufferToText(responseBody)
     }
-    // if (responseBodyType === "text" || responseBodyType === 'searchParams') {
-    //   return body
-    // }
     return String(responseBody)
   }