@jsenv/core 27.4.0 → 27.5.2

package/src/plugins/transpilation/as_js_classic/jsenv_plugin_as_js_classic_html.js

@@ -11,6 +11,7 @@ import {
   getHtmlNodePosition,
   setHtmlNodeAttributes,
   setHtmlNodeText,
+  analyzeScriptNode,
   injectScriptNodeAsEarlyAsPossible,
   createHtmlNode,
 } from "@jsenv/ast"
@@ -49,12 +50,12 @@ export const jsenvPluginAsJsClassicHtml = ({
           }
         }
         const visitScriptNodes = (node) => {
-          const type = getHtmlNodeAttribute(node, "type")
-          if (type === "module") {
+          const { type } = analyzeScriptNode(node)
+          if (type === "js_module") {
             moduleScriptNodes.push(node)
             return
           }
-          if (type === undefined || type === "text/javascript") {
+          if (type === "js_classic") {
             classicScriptNodes.push(node)
             return
           }

package/src/plugins/transpilation/babel/new_stylesheet/client/new_stylesheet.js

@@ -1,6 +1,7 @@
 /* eslint-disable */
-// copy paste to help finding the file (npm and node modules would make it complex)
+// construct-style-sheets-polyfill@3.1.0
 // to keep in sync with https://github.com/calebdwilliams/construct-style-sheets
+// copy pasted into jsenv codebase to inject this code with more ease
 ;(function () {
   "use strict"
 
@@ -15,29 +16,6 @@
   var defineProperty = Object.defineProperty
   var forEach = Array.prototype.forEach
 
-  var hasBrokenRules = (function () {
-    var style = bootstrapper.createElement("style")
-    style.textContent = '.x{content:"y"}'
-    bootstrapper.body.appendChild(style)
-    return style.sheet.cssRules[0].style.content !== '"y"'
-  })()
-  var brokenRulePatterns = [/content:\s*["']/gm]
-  function fixBrokenRules(content) {
-    return brokenRulePatterns.reduce(function (acc, pattern) {
-      return acc.replace(pattern, "$&%%%")
-    }, content)
-  }
-  var placeholderPatterns = [/(content:\s*["'])%%%/gm]
-  var getCssText = hasBrokenRules
-    ? function (rule) {
-        return placeholderPatterns.reduce(function (acc, pattern) {
-          return acc.replace(pattern, "$1")
-        }, rule.cssText)
-      }
-    : function (rule) {
-        return rule.cssText
-      }
-
   var importPattern = /@import.+?;?$/gm
   function rejectImports(contents) {
     var _contents = contents.replace(importPattern, "")
@@ -48,16 +26,6 @@
     }
     return _contents.trim()
   }
-  function clearRules(sheet) {
-    for (var i = 0; i < sheet.cssRules.length; i++) {
-      sheet.deleteRule(0)
-    }
-  }
-  function insertAllRules(from, to) {
-    forEach.call(from.cssRules, function (rule, i) {
-      to.insertRule(getCssText(rule), i)
-    })
-  }
   function isElementConnected(element) {
     return "isConnected" in element
       ? element.isConnected
@@ -111,9 +79,10 @@
       ? nonConstructedProto.isPrototypeOf(instance)
       : false
   }
-  var $basicStyleSheet = new WeakMap()
+  var $basicStyleElement = new WeakMap()
   var $locations = new WeakMap()
   var $adoptersByLocation = new WeakMap()
+  var $appliedMethods = new WeakMap()
   function addAdopterLocation(sheet, location) {
     var adopter = document.createElement("style")
     $adoptersByLocation.get(sheet).set(location, adopter)
@@ -134,12 +103,14 @@
   }
   function restyleAdopter(sheet, adopter) {
     requestAnimationFrame(function () {
-      clearRules(adopter.sheet)
-      insertAllRules($basicStyleSheet.get(sheet), adopter.sheet)
+      adopter.textContent = $basicStyleElement.get(sheet).textContent
+      $appliedMethods.get(sheet).forEach(function (command) {
+        return adopter.sheet[command.method].apply(adopter.sheet, command.args)
+      })
     })
   }
   function checkInvocationCorrectness(self) {
-    if (!$basicStyleSheet.has(self)) {
+    if (!$basicStyleElement.has(self)) {
       throw new TypeError("Illegal invocation")
     }
   }
@@ -147,9 +118,10 @@
     var self = this
     var style = document.createElement("style")
     bootstrapper.body.appendChild(style)
-    $basicStyleSheet.set(self, style.sheet)
+    $basicStyleElement.set(self, style)
     $locations.set(self, [])
     $adoptersByLocation.set(self, new WeakMap())
+    $appliedMethods.set(self, [])
   }
   var proto$1 = ConstructedStyleSheet.prototype
   proto$1.replace = function replace(contents) {
@@ -164,11 +136,8 @@
     checkInvocationCorrectness(this)
     if (typeof contents === "string") {
       var self_1 = this
-      var style = $basicStyleSheet.get(self_1).ownerNode
-      style.textContent = hasBrokenRules
-        ? fixBrokenRules(rejectImports(contents))
-        : rejectImports(contents)
-      $basicStyleSheet.set(self_1, style.sheet)
+      $basicStyleElement.get(self_1).textContent = rejectImports(contents)
+      $appliedMethods.set(self_1, [])
       $locations.get(self_1).forEach(function (location) {
         if (location.isConnected()) {
           restyleAdopter(self_1, getAdopterByLocation(self_1, location))
@@ -181,7 +150,15 @@
     enumerable: true,
     get: function cssRules() {
       checkInvocationCorrectness(this)
-      return $basicStyleSheet.get(this).cssRules
+      return $basicStyleElement.get(this).sheet.cssRules
+    },
+  })
+  defineProperty(proto$1, "media", {
+    configurable: true,
+    enumerable: true,
+    get: function media() {
+      checkInvocationCorrectness(this)
+      return $basicStyleElement.get(this).sheet.media
     },
   })
   cssStyleSheetMethods.forEach(function (method) {
@@ -189,22 +166,15 @@
       var self = this
       checkInvocationCorrectness(self)
       var args = arguments
+      $appliedMethods.get(self).push({ method: method, args: args })
       $locations.get(self).forEach(function (location) {
         if (location.isConnected()) {
           var sheet = getAdopterByLocation(self, location).sheet
           sheet[method].apply(sheet, args)
         }
       })
-      if (hasBrokenRules) {
-        if (method === "insertRule") {
-          args[0] = fixBrokenRules(args[0])
-        }
-        if (method === "addRule") {
-          args[1] = fixBrokenRules(args[1])
-        }
-      }
-      var basic = $basicStyleSheet.get(self)
-      return basic[method].apply(basic, args)
+      var basicSheet = $basicStyleElement.get(self).sheet
+      return basicSheet[method].apply(basicSheet, args)
     }
   })
   defineProperty(ConstructedStyleSheet, Symbol.hasInstance, {

package/src/plugins/transpilation/import_assertions/jsenv_plugin_import_assertions.js

@@ -14,7 +14,11 @@ import { urlToFilename, injectQueryParams } from "@jsenv/urls"
 
 import { JS_QUOTES } from "@jsenv/utils/src/string/js_quotes.js"
 
-export const jsenvPluginImportAssertions = () => {
+export const jsenvPluginImportAssertions = ({
+  json = "auto",
+  css = "auto",
+  text = "auto",
+}) => {
   const updateReference = (reference, searchParam) => {
     reference.expectedType = "js_module"
     reference.filename = `${urlToFilename(reference.url)}.js`
@@ -33,42 +37,58 @@ export const jsenvPluginImportAssertions = () => {
   const importAssertions = {
     name: "jsenv:import_assertions",
     appliesDuring: "*",
+    init: (context) => {
+      // transpilation is forced during build so that
+      //   - avoid rollup to see import assertions
+      //     We would have to tell rollup to ignore import with assertion
+      //   - means rollup can bundle more js file together
+      //   - means url versioning can work for css inlined in js
+      if (context.scenario === "build") {
+        json = true
+        css = true
+        text = true
+      }
+    },
     redirectUrl: {
       js_import_export: (reference, context) => {
         if (!reference.assert) {
           return null
         }
-        // during build always replace import assertions with the js:
-        // - avoid rollup to see import assertions
-        //   We would have to tell rollup to ignore import with assertion
-        // - means rollup can bundle more js file together
-        // - means url versioning can work for css inlined in js
         if (reference.assert.type === "json") {
-          if (
-            context.scenario !== "build" &&
-            context.isSupportedOnCurrentClients("import_type_json")
-          ) {
-            return null
+          const shouldTranspileJsonImportAssertion =
+            json === true
+              ? true
+              : json === "auto"
+              ? !context.isSupportedOnCurrentClients("import_type_json")
+              : false
+          if (shouldTranspileJsonImportAssertion) {
+            return updateReference(reference, "as_json_module")
           }
-          return updateReference(reference, "as_json_module")
+          return null
         }
         if (reference.assert.type === "css") {
-          if (
-            context.scenario !== "build" &&
-            context.isSupportedOnCurrentClients("import_type_css")
-          ) {
-            return null
+          const shouldTranspileCssImportAssertion =
+            css === true
+              ? true
+              : css === "auto"
+              ? !context.isSupportedOnCurrentClients("import_type_css")
+              : false
+          if (shouldTranspileCssImportAssertion) {
+            return updateReference(reference, "as_css_module")
           }
-          return updateReference(reference, "as_css_module")
+          return null
         }
         if (reference.assert.type === "text") {
-          if (
-            context.scenario !== "build" &&
-            context.isSupportedOnCurrentClients("import_type_text")
-          ) {
-            return null
+          const shouldTranspileTextImportAssertion =
+            text === true
+              ? true
+              : text === "auto"
+              ? !context.isSupportedOnCurrentClients("import_type_text")
+              : false
+          if (shouldTranspileTextImportAssertion) {
+            return updateReference(reference, "as_text_module")
           }
-          return updateReference(reference, "as_text_module")
+          return null
         }
         return null
       },

package/src/plugins/transpilation/jsenv_plugin_transpilation.js

@@ -22,9 +22,14 @@ export const jsenvPluginTranspilation = ({
   babelHelpersAsImport = true,
   getCustomBabelPlugins,
 }) => {
+  if (importAssertions === true) {
+    importAssertions = {}
+  }
   return [
     // import assertions we want it all the time
-    ...(importAssertions ? [jsenvPluginImportAssertions()] : []),
+    ...(importAssertions
+      ? [jsenvPluginImportAssertions(importAssertions)]
+      : []),
     // babel also so that rollup can bundle babel helpers for instance
     jsenvPluginBabel({
       topLevelAwait,

package/src/plugins/url_analysis/html/html_urls.js

@@ -5,6 +5,7 @@ import {
   getHtmlNodePosition,
   setHtmlNodeAttributes,
   getHtmlNodeAttributePosition,
+  analyzeScriptNode,
   parseSrcSet,
   stringifyHtmlAst,
 } from "@jsenv/ast"
@@ -188,16 +189,15 @@ const visitHtmlUrls = ({ url, htmlAst, onUrl }) => {
     },
     // style: () => {},
     script: (node) => {
-      const type = getHtmlNodeAttribute(node, "type")
-      const expectedType = {
-        "undefined": "js_classic",
-        "text/javascript": "js_classic",
-        "module": "js_module",
-        "importmap": "importmap",
-      }[type]
+      const { type } = analyzeScriptNode(node)
+      if (type === "text") {
+        // ignore <script type="whatever" src="./file.js">
+        // per HTML spec https://developer.mozilla.org/en-US/docs/Web/HTML/Element/script#attr-type
+        return
+      }
       visitAttributeAsUrlSpecifier({
         type: "script_src",
-        expectedType,
+        expectedType: type,
         node,
         attributeName: "src",
       })

package/src/test/execute_plan.js

@@ -16,9 +16,6 @@ import { ensureEmptyDirectory, writeFileSync } from "@jsenv/filesystem"
 
 import { babelPluginInstrument } from "./coverage/babel_plugin_instrument.js"
 import { reportToCoverage } from "./coverage/report_to_coverage.js"
-import { createUrlGraph } from "@jsenv/core/src/omega/url_graph.js"
-import { getCorePlugins } from "@jsenv/core/src/plugins/plugins.js"
-import { createKitchen } from "@jsenv/core/src/omega/kitchen.js"
 import { startOmegaServer } from "@jsenv/core/src/omega/omega_server.js"
 import { run } from "@jsenv/core/src/execute/run.js"
 
@@ -43,6 +40,7 @@ export const executePlan = async (
 
     rootDirectoryUrl,
     keepRunning,
+    services,
     defaultMsAllocatedPerExecution,
     maxExecutionsInParallel,
     failFast,
@@ -68,7 +66,7 @@ export const executePlan = async (
     protocol,
     privateKey,
     certificate,
-    ip,
+    host,
     port,
 
     beforeExecutionCallback = () => {},
@@ -198,64 +196,48 @@ export const executePlan = async (
       stopAfterAllSignal,
     }
     if (someNeedsServer) {
-      const urlGraph = createUrlGraph()
-      const kitchen = createKitchen({
-        signal,
-        logger,
-        rootDirectoryUrl,
-        urlGraph,
-        scenario,
-        sourcemaps,
-        runtimeCompat: runtimes,
-        writeGeneratedFiles,
-        plugins: [
-          ...plugins,
-          ...getCorePlugins({
-            rootDirectoryUrl,
-            urlGraph,
-            scenario,
-            runtimeCompat: runtimes,
-
-            htmlSupervisor: true,
-            nodeEsmResolution,
-            fileSystemMagicResolution,
-            transpilation: {
-              ...transpilation,
-              getCustomBabelPlugins: ({ clientRuntimeCompat }) => {
-                if (
-                  coverageEnabled &&
-                  (coverageMethodForBrowsers !== "playwright_api" ||
-                    Object.keys(clientRuntimeCompat)[0] !== "chrome")
-                ) {
-                  return {
-                    "transform-instrument": [
-                      babelPluginInstrument,
-                      {
-                        rootDirectoryUrl,
-                        coverageConfig,
-                      },
-                    ],
-                  }
-                }
-                return {}
-              },
-            },
-          }),
-        ],
-      })
       const server = await startOmegaServer({
         signal: multipleExecutionsOperation.signal,
         logLevel: "warn",
-        rootDirectoryUrl,
-        urlGraph,
-        kitchen,
-        scenario,
         keepProcessAlive: false,
         port,
-        ip,
+        host,
         protocol,
         certificate,
         privateKey,
+        services,
+
+        rootDirectoryUrl,
+        scenario,
+        runtimeCompat: runtimes,
+
+        plugins,
+        htmlSupervisor: true,
+        nodeEsmResolution,
+        fileSystemMagicResolution,
+        transpilation: {
+          ...transpilation,
+          getCustomBabelPlugins: ({ clientRuntimeCompat }) => {
+            if (
+              coverageEnabled &&
+              (coverageMethodForBrowsers !== "playwright_api" ||
+                Object.keys(clientRuntimeCompat)[0] !== "chrome")
+            ) {
+              return {
+                "transform-instrument": [
+                  babelPluginInstrument,
+                  {
+                    rootDirectoryUrl,
+                    coverageConfig,
+                  },
+                ],
+              }
+            }
+            return {}
+          },
+        },
+        sourcemaps,
+        writeGeneratedFiles,
       })
       multipleExecutionsOperation.addEndCallback(async () => {
         await server.stop()

package/src/test/execute_test_plan.js

@@ -90,7 +90,7 @@ export const executeTestPlan = async ({
   protocol,
   privateKey,
   certificate,
-  ip,
+  host,
   port,
 }) => {
   const logger = createLogger({ logLevel })
@@ -177,7 +177,7 @@ export const executeTestPlan = async ({
     protocol,
     privateKey,
     certificate,
-    ip,
+    host,
     port,
   })
   if (