@jsenv/core 27.0.0-alpha.8 → 27.0.0-alpha.80

package/src/{omega/core_plugins → plugins}/html_supervisor/jsenv_plugin_html_supervisor.js

@@ -2,38 +2,33 @@
  * Things happening here
  * - html supervisor module injection
  * - scripts are wrapped to be supervised
- *
- * TODO:
- *  - if ressource is referenced by ressource hint we should do sthing?
- *   I think so when we inject ?js_classic
  */
 
-import { injectQueryParams } from "@jsenv/utils/urls/url_utils.js"
 import {
   parseHtmlString,
   stringifyHtmlAst,
   visitHtmlAst,
   getHtmlNodeAttributeByName,
   removeHtmlNodeAttributeByName,
-  setHtmlNodeText,
-  assignHtmlNodeAttributes,
   parseScriptNode,
   injectScriptAsEarlyAsPossible,
   createHtmlNode,
   htmlNodePosition,
-  removeHtmlNodeText,
   getHtmlNodeTextNode,
+  removeHtmlNodeText,
+  setHtmlNodeGeneratedText,
 } from "@jsenv/utils/html_ast/html_ast.js"
-import { generateInlineContentUrl } from "@jsenv/utils/urls/inline_content_url_generator.js"
+import { generateInlineContentUrl } from "@jsenv/urls"
 
 export const jsenvPluginHtmlSupervisor = ({
   logs = false,
   measurePerf = false,
-} = {}) => {
+}) => {
   const htmlSupervisorSetupFileUrl = new URL(
-    "./client/html_supervisor_setup.js",
+    "./client/html_supervisor_setup.js?js_classic",
     import.meta.url,
   ).href
+
   const htmlSupervisorInstallerFileUrl = new URL(
     "./client/html_supervisor_installer.js",
     import.meta.url,
@@ -45,7 +40,7 @@ export const jsenvPluginHtmlSupervisor = ({
       dev: true,
       test: true,
     },
-    transform: {
+    transformUrlContent: {
       html: ({ url, content }, { referenceUtils }) => {
         const htmlAst = parseHtmlString(content)
         const scriptsToSupervise = []
@@ -64,27 +59,22 @@ export const jsenvPluginHtmlSupervisor = ({
             lineEnd,
             columnEnd,
           })
-          if (scriptCategory === "classic") {
-            inlineScriptUrl = injectQueryParams(inlineScriptUrl, {
-              js_classic: "",
-            })
-          }
           const [inlineScriptReference] = referenceUtils.foundInline({
             type: "script_src",
-            line: line - 1,
-            column,
-            isOriginal,
+            expectedType: { classic: "js_classic", module: "js_module" }[
+              scriptCategory
+            ],
+            isOriginalPosition: isOriginal,
+            specifierLine: line - 1,
+            specifierColumn: column,
             specifier: inlineScriptUrl,
-            contentType: "application/javascript",
+            contentType: "text/javascript",
             content: textNode.value,
           })
-          assignHtmlNodeAttributes(node, {
-            "src": inlineScriptReference.generatedSpecifier,
-            "src-generated-from-inline-content": "",
-          })
           removeHtmlNodeText(node)
           scriptsToSupervise.push({
             node,
+            isInline: true,
             type: scriptCategory,
             src: inlineScriptReference.generatedSpecifier,
           })
@@ -105,10 +95,17 @@ export const jsenvPluginHtmlSupervisor = ({
           const crossorigin = crossoriginAttribute
             ? crossoriginAttribute.value
             : undefined
+          const deferAttribute = getHtmlNodeAttributeByName(node, "crossorigin")
+          const defer = deferAttribute ? deferAttribute.value : undefined
+          const asyncAttribute = getHtmlNodeAttributeByName(node, "crossorigin")
+          const async = asyncAttribute ? asyncAttribute.value : undefined
+          removeHtmlNodeAttributeByName(node, "src")
           scriptsToSupervise.push({
             node,
             type: scriptCategory,
             src: srcAttribute.value,
+            defer,
+            async,
             integrity,
             crossorigin,
           })
@@ -146,11 +143,9 @@ export const jsenvPluginHtmlSupervisor = ({
             return
           }
         })
-        if (scriptsToSupervise.length === 0) {
-          return null
-        }
         const [htmlSupervisorInstallerFileReference] = referenceUtils.inject({
           type: "js_import_export",
+          expectedType: "js_module",
           specifier: htmlSupervisorInstallerFileUrl,
         })
         injectScriptAsEarlyAsPossible(
@@ -159,25 +154,24 @@ export const jsenvPluginHtmlSupervisor = ({
             "tagName": "script",
             "type": "module",
             "textContent": `
-import { installHtmlSupervisor } from ${
-              htmlSupervisorInstallerFileReference.generatedSpecifier
-            }
-installHtmlSupervisor(${JSON.stringify(
-              {
-                logs,
-                measurePerf,
-              },
-              null,
-              "  ",
-            )})`,
+      import { installHtmlSupervisor } from ${
+        htmlSupervisorInstallerFileReference.generatedSpecifier
+      }
+      installHtmlSupervisor(${JSON.stringify(
+        {
+          logs,
+          measurePerf,
+        },
+        null,
+        "        ",
+      )})`,
             "injected-by": "jsenv:html_supervisor",
           }),
         )
         const [htmlSupervisorSetupFileReference] = referenceUtils.inject({
           type: "script_src",
-          specifier: injectQueryParams(htmlSupervisorSetupFileUrl, {
-            js_classic: "",
-          }),
+          expectedType: "js_classic",
+          specifier: htmlSupervisorSetupFileUrl,
         })
         injectScriptAsEarlyAsPossible(
           htmlAst,
@@ -188,22 +182,32 @@ installHtmlSupervisor(${JSON.stringify(
           }),
         )
         scriptsToSupervise.forEach(
-          ({ node, type, src, integrity, crossorigin }) => {
-            removeHtmlNodeAttributeByName(node, "src")
-            assignHtmlNodeAttributes(node, {
-              "content-src": src,
-            })
-            setHtmlNodeText(
-              node,
-              generateCodeToSuperviseScript({
+          ({
+            node,
+            isInline,
+            type,
+            src,
+            defer,
+            async,
+            integrity,
+            crossorigin,
+          }) => {
+            setHtmlNodeGeneratedText(node, {
+              generatedText: generateCodeToSuperviseScript({
                 type,
                 src,
+                isInline,
+                defer,
+                async,
                 integrity,
                 crossorigin,
                 htmlSupervisorInstallerSpecifier:
                   htmlSupervisorInstallerFileReference.generatedSpecifier,
               }),
-            )
+              generatedBy: "jsenv:html_supervisor",
+              generatedFromSrc: src,
+              generatedFromInlineContent: isInline,
+            })
           },
         )
         const htmlModified = stringifyHtmlAst(htmlAst)
@@ -220,14 +224,28 @@ installHtmlSupervisor(${JSON.stringify(
 const generateCodeToSuperviseScript = ({
   type,
   src,
+  isInline,
+  defer,
+  async,
   integrity,
   crossorigin,
   htmlSupervisorInstallerSpecifier,
 }) => {
-  const paramsAsJson = JSON.stringify({ src, integrity, crossorigin })
+  const paramsAsJson = JSON.stringify({
+    src,
+    isInline,
+    defer,
+    async,
+    integrity,
+    crossorigin,
+  })
   if (type === "module") {
-    return `import { superviseScriptTypeModule } from ${htmlSupervisorInstallerSpecifier}
-superviseScriptTypeModule(${paramsAsJson})`
+    return `
+      import { superviseScriptTypeModule } from ${htmlSupervisorInstallerSpecifier}
+      superviseScriptTypeModule(${paramsAsJson})
+`
   }
-  return `window.__html_supervisor__.superviseScript(${paramsAsJson})`
+  return `
+      window.__html_supervisor__.superviseScript(${paramsAsJson})
+`
 }

package/src/plugins/http_urls/jsenv_plugin_http_urls.js

@@ -0,0 +1,12 @@
+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
+    // },
+  }
+}

package/src/{dev/plugins/autoreload → plugins/import_meta_hot}/babel_plugin_metadata_import_meta_hot.js

@@ -16,13 +16,12 @@ export const babelPluginMetadataImportMetaHot = () => {
   }
 }
 const collectImportMetaProperties = (programPath) => {
-  let importMetaHotDetected = false
+  const importMetaHotPaths = []
   let hotDecline = false
   let hotAcceptSelf = false
   let hotAcceptDependencies = []
   programPath.traverse({
     MemberExpression(path) {
-      if (importMetaHotDetected) return
       const { node } = path
       const { object } = node
       if (object.type !== "MetaProperty") {
@@ -35,7 +34,7 @@ const collectImportMetaProperties = (programPath) => {
       const { property } = node
       const { name } = property
       if (name === "hot") {
-        importMetaHotDetected = true
+        importMetaHotPaths.push(path)
       }
     },
     CallExpression(path) {
@@ -64,7 +63,7 @@ const collectImportMetaProperties = (programPath) => {
               )
             }
             return {
-              specifierPath: firstArgPath.get(index),
+              specifierPath: firstArgPath.get(String(index)),
             }
           })
           return
@@ -79,7 +78,7 @@ const collectImportMetaProperties = (programPath) => {
     },
   })
   return {
-    importMetaHotDetected,
+    importMetaHotPaths,
     hotDecline,
     hotAcceptSelf,
     hotAcceptDependencies,

package/src/{dev/plugins/autoreload → plugins/import_meta_hot}/client/import_meta_hot.js

@@ -40,7 +40,9 @@ export const createImportMetaHot = (importMetaUrl) => {
         })
         return
       }
-      throw new Error(`invalid call to hot.accept()`)
+      throw new Error(
+        `invalid call to import.meta.hot.accept(), received ${firstArg}`,
+      )
     },
     dispose: (callback) => {
       addUrlMeta(url, {

package/src/{dev/plugins/autoreload → plugins/import_meta_hot}/html_hot_dependencies.js

@@ -53,7 +53,7 @@ export const collectHotDataFromHtmlAst = (htmlAst) => {
       })
       visitUrlSpecifierAttribute({
         node,
-        attributeName: "content-href",
+        attributeName: "generated-from-href",
         hotAccepted,
       })
     }
@@ -65,7 +65,7 @@ export const collectHotDataFromHtmlAst = (htmlAst) => {
       })
       visitUrlSpecifierAttribute({
         node,
-        attributeName: "content-src",
+        attributeName: "generated-from-src",
         hotAccepted,
       })
     }
@@ -103,7 +103,7 @@ export const collectHotDataFromHtmlAst = (htmlAst) => {
   }
   iterate(htmlAst, {})
 
-  return { hotReferences }
+  return hotReferences
 }
 
 const nodeNamesWithHref = ["link", "a", "image", "use"]
@@ -125,7 +125,7 @@ const getNodeContext = (node) => {
 
 const htmlNodeCanHotReload = (node) => {
   if (node.nodeName === "link") {
-    const { isStylesheet, isRessourceHint } = parseLinkNode(node)
+    const { isStylesheet, isRessourceHint, rel } = parseLinkNode(node)
     if (isStylesheet) {
       // stylesheets can be hot replaced by default
       return true
@@ -135,6 +135,9 @@ const htmlNodeCanHotReload = (node) => {
       // but we won't do anything (if the ressource is deleted we should?)
       return true
     }
+    if (rel === "icon") {
+      return true
+    }
     return false
   }
   return [

package/src/plugins/import_meta_hot/jsenv_plugin_import_meta_hot.js

@@ -0,0 +1,100 @@
+import { createMagicSource } from "@jsenv/utils/sourcemap/magic_source.js"
+import { parseHtmlString } from "@jsenv/utils/html_ast/html_ast.js"
+import { applyBabelPlugins } from "@jsenv/utils/js_ast/apply_babel_plugins.js"
+import { collectHotDataFromHtmlAst } from "./html_hot_dependencies.js"
+import { babelPluginMetadataImportMetaHot } from "./babel_plugin_metadata_import_meta_hot.js"
+
+export const jsenvPluginImportMetaHot = () => {
+  const importMetaHotClientFileUrl = new URL(
+    "./client/import_meta_hot.js",
+    import.meta.url,
+  ).href
+
+  return {
+    name: "jsenv:import_meta_hot",
+    appliesDuring: "*",
+    transformUrlContent: {
+      html: (htmlUrlInfo, context) => {
+        // during build we don't really care to parse html hot dependencies
+        if (context.scenario === "build") {
+          return
+        }
+        const htmlAst = parseHtmlString(htmlUrlInfo.content)
+        const hotReferences = collectHotDataFromHtmlAst(htmlAst)
+        htmlUrlInfo.data.hotDecline = false
+        htmlUrlInfo.data.hotAcceptSelf = false
+        htmlUrlInfo.data.hotAcceptDependencies = hotReferences.map(
+          ({ type, specifier }) => {
+            const [reference] = context.referenceUtils.found({
+              type,
+              specifier,
+            })
+            return reference.url
+          },
+        )
+      },
+      css: (cssUrlInfo) => {
+        cssUrlInfo.data.hotDecline = false
+        cssUrlInfo.data.hotAcceptSelf = false
+        cssUrlInfo.data.hotAcceptDependencies = []
+      },
+      js_module: async (urlInfo, context) => {
+        if (!urlInfo.content.includes("import.meta.hot")) {
+          return null
+        }
+        const { metadata } = await applyBabelPlugins({
+          babelPlugins: [babelPluginMetadataImportMetaHot],
+          urlInfo,
+        })
+        const {
+          importMetaHotPaths,
+          hotDecline,
+          hotAcceptSelf,
+          hotAcceptDependencies,
+        } = metadata
+        urlInfo.data.hotDecline = hotDecline
+        urlInfo.data.hotAcceptSelf = hotAcceptSelf
+        urlInfo.data.hotAcceptDependencies = hotAcceptDependencies
+        if (importMetaHotPaths.length === 0) {
+          return null
+        }
+        if (context.scenario === "build") {
+          return removeImportMetaHots(urlInfo, importMetaHotPaths)
+        }
+        return injectImportMetaHot(urlInfo, context, importMetaHotClientFileUrl)
+      },
+    },
+  }
+}
+
+const removeImportMetaHots = (urlInfo, importMetaHotPaths) => {
+  const magicSource = createMagicSource(urlInfo.content)
+  importMetaHotPaths.forEach((path) => {
+    magicSource.replace({
+      start: path.node.start,
+      end: path.node.end,
+      replacement: "undefined",
+    })
+  })
+  return magicSource.toContentAndSourcemap()
+}
+
+// For some reason using magic source here produce
+// better sourcemap than doing the equivalent with babel
+// I suspect it's because I was doing injectAstAfterImport(programPath, ast.program.body[0])
+// which is likely not well supported by babel
+const injectImportMetaHot = (urlInfo, context, importMetaHotClientFileUrl) => {
+  const [importMetaHotClientFileReference] = context.referenceUtils.inject({
+    parentUrl: urlInfo.url,
+    type: "js_import_export",
+    expectedType: "js_module",
+    specifier: importMetaHotClientFileUrl,
+  })
+  const magicSource = createMagicSource(urlInfo.content)
+  magicSource.prepend(
+    `import { createImportMetaHot } from ${importMetaHotClientFileReference.generatedSpecifier}
+import.meta.hot = createImportMetaHot(import.meta.url)
+`,
+  )
+  return magicSource.toContentAndSourcemap()
+}

package/src/{omega/core_plugins → plugins}/import_meta_scenarios/jsenv_plugin_import_meta_scenarios.js

@@ -12,18 +12,22 @@
 import { applyBabelPlugins } from "@jsenv/utils/js_ast/apply_babel_plugins.js"
 import { createMagicSource } from "@jsenv/utils/sourcemap/magic_source.js"
 
-import { collectProgramImportMetas } from "@jsenv/utils/js_ast/program_import_metas.js"
-
 export const jsenvPluginImportMetaScenarios = () => {
   return {
     name: "jsenv:import_meta_scenario",
     appliesDuring: "*",
-    transform: {
-      js_module: async ({ url, content }, { scenario }) => {
+    transformUrlContent: {
+      js_module: async (urlInfo, { scenario }) => {
+        if (
+          !urlInfo.content.includes("import.meta.dev") &&
+          !urlInfo.content.includes("import.meta.test") &&
+          !urlInfo.content.includes("import.meta.build")
+        ) {
+          return null
+        }
         const { metadata } = await applyBabelPlugins({
           babelPlugins: [babelPluginMetadataImportMetaScenarios],
-          url,
-          content,
+          urlInfo,
         })
         const { dev = [], test = [], build = [] } = metadata.importMetaScenarios
         const replacements = []
@@ -59,7 +63,7 @@ export const jsenvPluginImportMetaScenarios = () => {
             replace(path, "true")
           })
         }
-        const magicSource = createMagicSource(content)
+        const magicSource = createMagicSource(urlInfo.content)
         replacements.forEach(({ path, value }) => {
           magicSource.replace({
             start: path.node.start,
@@ -78,7 +82,28 @@ const babelPluginMetadataImportMetaScenarios = () => {
     name: "metadata-import-meta-scenarios",
     visitor: {
       Program(programPath, state) {
-        const importMetas = collectProgramImportMetas(programPath)
+        const importMetas = {}
+        programPath.traverse({
+          MemberExpression(path) {
+            const { node } = path
+            const { object } = node
+            if (object.type !== "MetaProperty") {
+              return
+            }
+            const { property: objectProperty } = object
+            if (objectProperty.name !== "meta") {
+              return
+            }
+            const { property } = node
+            const { name } = property
+            const importMetaPaths = importMetas[name]
+            if (importMetaPaths) {
+              importMetaPaths.push(path)
+            } else {
+              importMetas[name] = [path]
+            }
+          },
+        })
         state.file.metadata.importMetaScenarios = {
           dev: importMetas.dev,
           test: importMetas.test,

package/src/plugins/import_meta_url/client/import_meta_url_browser.js

@@ -0,0 +1,52 @@
+const getCurrentScriptSrc = () => {
+  const { currentScript } = document
+  if (currentScript) return currentScript.src
+
+  // https://github.com/amiller-gh/currentScript-polyfill
+
+  const scripts = Array.prototype.slice.call(
+    document.getElementsByTagName("script"),
+  )
+
+  const readyScript = scripts.find((script) => {
+    return script.readyState === "interactive"
+  })
+  if (readyScript) return readyScript
+
+  try {
+    throw new Error()
+  } catch (err) {
+    // Find the second match for the "at" string to get file src url from stack.
+    // Specifically works with the format of stack traces in IE.
+    const stackDetails = /.*at [^(]*\((.*):(.+):(.+)\)$/gi.exec(err.stack)
+    const scriptLocation = (stackDetails || [false])[1]
+    const line = (stackDetails || [false])[2]
+    const currentLocation = document.location.href.replace(
+      document.location.hash,
+      "",
+    )
+
+    if (scriptLocation === currentLocation) {
+      const source = document.documentElement.outerHTML
+      const codeRegExp = new RegExp(
+        `(?:[^\\n]+?\\n){0,${
+          line - 2
+        }}[^<]*<script>([\\d\\D]*?)<\\/script>[\\d\\D]*`,
+        "i",
+      )
+      const code = source.replace(codeRegExp, "$1").trim()
+
+      return scripts.find((script) => {
+        return script.innerHTML && script.innerHTML.trim() === code
+      })
+    }
+
+    return scripts.find((script) => {
+      return script.src === scriptLocation
+    })
+  }
+}
+
+const url = getCurrentScriptSrc()
+
+export default url

package/src/plugins/import_meta_url/client/import_meta_url_commonjs.mjs

@@ -0,0 +1,9 @@
+/* global __filename */
+
+const filenameContainsBackSlashes = __filename.indexOf("\\") > -1
+
+const url = filenameContainsBackSlashes
+  ? `file:///${__filename.replace(/\\/g, "/")}`
+  : `file://${__filename}`
+
+export default url