@jsenv/core 22.4.0 → 23.0.0

package/src/internal/compiling/babel_plugin_transform_import_specifier.js

@@ -0,0 +1,86 @@
+// https://github.com/jamiebuilds/babel-handbook/blob/master/translations/en/plugin-handbook.md
+// https://github.com/mjackson/babel-plugin-import-visitor
+
+export const babelPluginTransformImportSpecifier = (
+  babel,
+  { transformImportSpecifier = ({ specifier }) => specifier } = {},
+) => {
+  return {
+    name: "transform-import-specifier",
+
+    // manipulateOptions(opts, parserOpts) {
+    //   parserOpts.plugins.push(
+    //     "dynamicImport",
+    //     "exportDefaultFrom",
+    //     "exportNamespaceFrom",
+    //     "importMeta",
+    //   )
+    // },
+
+    visitor: {
+      CallExpression: (path) => {
+        if (path.node.callee.type !== "Import") {
+          // Some other function call, not import();
+          return
+        }
+
+        if (path.node.arguments[0].type !== "StringLiteral") {
+          // Non-string argument, probably a variable or expression, e.g.
+          // import(moduleId)
+          // import('./' + moduleName)
+          return
+        }
+
+        transformStringLiteralAtPath(
+          path.get("arguments")[0],
+          transformImportSpecifier,
+          babel,
+        )
+      },
+
+      ExportAllDeclaration: (path) => {
+        transformStringLiteralAtPath(
+          path.get("source"),
+          transformImportSpecifier,
+          babel,
+        )
+      },
+
+      ExportNamedDeclaration: (path) => {
+        if (!path.node.source) {
+          // This export has no "source", so it's probably
+          // a local variable or function, e.g.
+          // export { varName }
+          // export const constName = ...
+          // export function funcName() {}
+          return
+        }
+
+        transformStringLiteralAtPath(
+          path.get("source"),
+          transformImportSpecifier,
+          babel,
+        )
+      },
+
+      ImportDeclaration: (path) => {
+        transformStringLiteralAtPath(
+          path.get("source"),
+          transformImportSpecifier,
+          babel,
+        )
+      },
+    },
+  }
+}
+
+const transformStringLiteralAtPath = (path, transform, babel) => {
+  const value = path.node.value
+  const valueTransformed = transform({
+    specifier: value,
+    path,
+  })
+  if (valueTransformed !== value) {
+    path.replaceWith(babel.types.stringLiteral(valueTransformed))
+  }
+}

package/src/internal/compiling/babel_plugins.js

@@ -4,11 +4,13 @@ export const getMinimalBabelPluginMap = () => {
   const syntaxDynamicImport = require("@babel/plugin-syntax-dynamic-import")
   const syntaxImportMeta = require("@babel/plugin-syntax-import-meta")
   const syntaxNumericSeparator = require("@babel/plugin-syntax-numeric-separator")
+  const syntaxImportAssertions = require("@babel/plugin-syntax-import-assertions")
 
   return {
     "syntax-dynamic-import": syntaxDynamicImport,
     "syntax-import-meta": syntaxImportMeta,
     "syntax-numeric-separator": syntaxNumericSeparator,
+    "synyax-import-assertions": syntaxImportAssertions,
   }
 }
 

package/src/internal/compiling/createCompiledFileService.js

@@ -7,6 +7,7 @@ import {
 } from "@jsenv/filesystem"
 
 import { serverUrlToCompileInfo } from "@jsenv/core/src/internal/url_conversion.js"
+import { setUrlExtension } from "../url_utils.js"
 import {
   COMPILE_ID_BUILD_GLOBAL,
   COMPILE_ID_BUILD_GLOBAL_FILES,
@@ -194,20 +195,27 @@ const getCompiler = ({ originalFileUrl, compileMeta }) => {
     return null
   }
 
-  if (!jsenvCompiler && customCompiler) {
-    return customCompiler
-  }
-
   // there is only a jsenvCompiler
   if (jsenvCompiler && !customCompiler) {
     return jsenvCompiler
   }
 
-  // both project and jsenv wants to compile the file
-  // we'll do the custom compilation first, then jsenv compilation
+  // there is a custom compiler and potentially a jsenv compiler
   return async (params) => {
+    // do custom compilation first
     const customResult = await customCompiler(params)
-    const jsenvResult = await jsenvCompiler({
+    // then check if jsenv compiler should apply
+    // to the new result contentType
+    const jsenvCompilerAfterCustomCompilation =
+      getJsenvCompilerAfterCustomCompilation({
+        url: originalFileUrl,
+        contentType: customResult.contentType,
+        compileMeta,
+      })
+    if (!jsenvCompilerAfterCustomCompilation) {
+      return customResult
+    }
+    const jsenvResult = await jsenvCompilerAfterCustomCompilation({
       ...params,
       code: customResult.compiledSource,
       map: customResult.sourcemap,
@@ -216,20 +224,43 @@ const getCompiler = ({ originalFileUrl, compileMeta }) => {
   }
 }
 
+const getJsenvCompilerAfterCustomCompilation = ({
+  url,
+  contentType,
+  compileMeta,
+}) => {
+  const extensionToForce = contentTypeExtensions[contentType]
+  const urlForcingExtension = extensionToForce
+    ? setUrlExtension(url, extensionToForce)
+    : url
+  const { jsenvCompiler } = urlToMeta({
+    url: urlForcingExtension,
+    structuredMetaMap: compileMeta,
+  })
+  return jsenvCompiler
+}
+
+// should match contentType where there is a jsenv compiler
+// back to an extension
+const contentTypeExtensions = {
+  "application/javascript": ".js",
+  "text/html": ".html",
+  "application/importmap+json": ".importmap",
+  // "text/css": ".css",
+}
+
 const babelPluginMapFromCompileId = (
   compileId,
   { babelPluginMap, groupMap },
 ) => {
   const babelPluginMapForGroup = {}
 
-  groupMap[compileId].babelPluginRequiredNameArray.forEach(
-    (babelPluginRequiredName) => {
-      if (babelPluginRequiredName in babelPluginMap) {
-        babelPluginMapForGroup[babelPluginRequiredName] =
-          babelPluginMap[babelPluginRequiredName]
-      }
-    },
-  )
+  groupMap[compileId].pluginRequiredNameArray.forEach((requiredPluginName) => {
+    const babelPlugin = babelPluginMap[requiredPluginName]
+    if (babelPlugin) {
+      babelPluginMapForGroup[requiredPluginName] = babelPlugin
+    }
+  })
 
   Object.keys(babelPluginMap).forEach((key) => {
     if (key.startsWith("syntax-")) {

package/src/internal/compiling/html_source_file_service.js

@@ -15,7 +15,7 @@ import {
   urlToRelativeUrl,
   urlToExtension,
   readFile,
-  urlToBasename,
+  urlToFilename,
   urlIsInsideOf,
 } from "@jsenv/filesystem"
 import { moveImportMap } from "@jsenv/importmap"
@@ -195,7 +195,7 @@ const transformHTMLSourceFile = async ({
         const scriptIdentifier = getUniqueNameForInlineHtmlNode(
           script,
           scripts,
-          `${urlToBasename(fileUrl)}_script_inline_[id].js`,
+          `${urlToFilename(fileUrl)}__inline__[id].js`,
         )
         onInlineModuleScript({
           scriptContent: textNode.value,

package/src/internal/compiling/js-compilation-service/{transformBabelHelperToImportBabelPlugin.js → babel_plugin_babel_helpers_as_jsenv_imports.js}

@@ -12,7 +12,7 @@ import {
 // a named import
 // https://github.com/babel/babel/blob/99f4f6c3b03c7f3f67cf1b9f1a21b80cfd5b0224/packages/babel-plugin-external-helpers/src/index.js
 
-export const transformBabelHelperToImportBabelPlugin = (api) => {
+export const babelPluginBabelHelpersAsJsenvImports = (api) => {
   // https://github.com/babel/babel/tree/master/packages/babel-helper-module-imports
   const { addDefault } = require("@babel/helper-module-imports")
 

package/src/internal/compiling/js-compilation-service/{ensureRegeneratorRuntimeImportBabelPlugin.js → babel_plugin_regenerator_runtime_as_jsenv_import.js}

@@ -12,7 +12,7 @@ const regeneratorRuntimeHelperDirectoryUrl = resolveUrl(
   jsenvCoreDirectoryUrl,
 )
 
-export const ensureRegeneratorRuntimeImportBabelPlugin = (api, options) => {
+export const babelPluginRegeneratorRuntimeAsJsenvImport = (api, options) => {
   const { addSideEffect } = require("@babel/helper-module-imports")
 
   api.assertVersion(7)

package/src/internal/compiling/js-compilation-service/jsenvTransform.js

@@ -2,7 +2,7 @@
 import { urlToFileSystemPath } from "@jsenv/filesystem"
 
 import { require } from "@jsenv/core/src/internal/require.js"
-import { babelPluginTransformImportMeta } from "@jsenv/core/src/internal/babel-plugin-transform-import-meta.js"
+import { babelPluginTransformImportMeta } from "@jsenv/core/src/internal/babel_plugin_transform_import_meta.js"
 import {
   getMinimalBabelPluginMap,
   babelPluginsFromBabelPluginMap,
@@ -11,9 +11,8 @@ import {
 
 import { findAsyncPluginNameInBabelPluginMap } from "./findAsyncPluginNameInBabelPluginMap.js"
 import { ansiToHTML } from "./ansiToHTML.js"
-import { ensureRegeneratorRuntimeImportBabelPlugin } from "./ensureRegeneratorRuntimeImportBabelPlugin.js"
-import { ensureGlobalThisImportBabelPlugin } from "./ensureGlobalThisImportBabelPlugin.js"
-import { transformBabelHelperToImportBabelPlugin } from "./transformBabelHelperToImportBabelPlugin.js"
+import { babelPluginRegeneratorRuntimeAsJsenvImport } from "./babel_plugin_regenerator_runtime_as_jsenv_import.js"
+import { babelPluginBabelHelpersAsJsenvImports } from "./babel_plugin_babel_helpers_as_jsenv_imports.js"
 import { filePathToBabelHelperName } from "./babelHelper.js"
 
 export const jsenvTransform = async ({
@@ -31,7 +30,6 @@ export const jsenvTransform = async ({
   allowTopLevelAwait,
   transformTopLevelAwait,
   transformGenerator,
-  transformGlobalThis,
   regeneratorRuntimeImportPath,
   sourcemapEnabled,
 }) => {
@@ -67,8 +65,8 @@ export const jsenvTransform = async ({
   if (transformGenerator) {
     babelPluginMap = {
       ...babelPluginMap,
-      "ensure-regenerator-runtime-import": [
-        ensureRegeneratorRuntimeImportBabelPlugin,
+      "regenerator-runtime-as-jsenv-import": [
+        babelPluginRegeneratorRuntimeAsJsenvImport,
         {
           regeneratorRuntimeImportPath,
         },
@@ -76,13 +74,6 @@ export const jsenvTransform = async ({
     }
   }
 
-  if (transformGlobalThis) {
-    babelPluginMap = {
-      ...babelPluginMap,
-      "ensure-global-this-import": [ensureGlobalThisImportBabelPlugin],
-    }
-  }
-
   babelPluginMap = {
     ...getMinimalBabelPluginMap(),
     "transform-import-meta": [
@@ -145,8 +136,8 @@ export const jsenvTransform = async ({
     ...babelPluginMap,
     ...(babelHelpersInjectionAsImport
       ? {
-          "transform-babel-helpers-to-import": [
-            transformBabelHelperToImportBabelPlugin,
+          "babel-helpers-as-jsenv-imports": [
+            babelPluginBabelHelpersAsJsenvImports,
           ],
         }
       : {}),

package/src/internal/compiling/js-compilation-service/transformJs.js

@@ -15,7 +15,6 @@ export const transformJs = async ({
   allowTopLevelAwait = true,
   transformTopLevelAwait = true,
   transformGenerator = true,
-  transformGlobalThis = true,
   sourcemapEnabled = true,
 }) => {
   if (typeof projectDirectoryUrl !== "string") {
@@ -51,7 +50,6 @@ export const transformJs = async ({
     allowTopLevelAwait,
     transformTopLevelAwait,
     transformGenerator,
-    transformGlobalThis,
     sourcemapEnabled,
   })
   code = transformResult.code

package/src/internal/compiling/jsenvCompilerForHtml.js

@@ -236,8 +236,6 @@ const mutateRessourceHints = async (htmlAst) => {
       const href = hrefAttribute ? hrefAttribute.value : ""
       if (!href) return
 
-      // - as="script" -> as="fetch" because jsenv uses
-      //   fetch to load ressources (see "fetchSource" in createBrowserRuntime.js)
       // - "modulepreload" -> "preload" because it's now regular js script
       const asAttribute = getHtmlNodeAttributeByName(
         ressourceHint.htmlNode,
@@ -248,7 +246,7 @@ const mutateRessourceHints = async (htmlAst) => {
         mutations.push(() => {
           replaceHtmlNode(
             ressourceHint.htmlNode,
-            `<link rel="preload" as="fetch" crossorigin />`,
+            `<link rel="preload" as="script" />`,
           )
         })
         return
@@ -256,10 +254,7 @@ const mutateRessourceHints = async (htmlAst) => {
 
       if (asAttribute && asAttribute.value === "script") {
         mutations.push(() => {
-          replaceHtmlNode(
-            ressourceHint.htmlNode,
-            `<link as="fetch" crossorigin />`,
-          )
+          replaceHtmlNode(ressourceHint.htmlNode, `<link as="script" />`)
         })
         return
       }

package/src/internal/compiling/rollup_plugin_commonjs_named_exports.js

@@ -66,7 +66,7 @@ export const rollupPluginCommonJsNamedExports = ({ logger }) => {
   }
 }
 
-/**
+/*
  * Attempt #1: Static analysis: Lower Fidelity, but faster.
  * Do our best job to statically scan a file for named exports. This uses "cjs-module-lexer", the
  * same CJS export scanner that Node.js uses internally. Very fast, but only works on some modules,
@@ -117,7 +117,7 @@ const detectStaticExports = ({ logger, fileUrl, visited = new Set() }) => {
   }
 }
 
-/**
+/*
  * Attempt #2b - Sandboxed runtime analysis: More powerful, but slower.
  * This will only work on UMD and very simple CJS files (require not supported).
  * Uses VM2 to run safely sandbox untrusted code (no access no Node.js primitives, just JS).

package/src/internal/compiling/startCompileServer.js

@@ -29,9 +29,7 @@ import {
 } from "@jsenv/filesystem"
 
 import { loadBabelPluginMapFromFile } from "./load_babel_plugin_map_from_file.js"
-import {
-  extractSyntaxBabelPluginMap,
-} from "./babel_plugins.js"
+import { extractSyntaxBabelPluginMap } from "./babel_plugins.js"
 import { generateGroupMap } from "../generateGroupMap/generateGroupMap.js"
 import { createCallbackList } from "../createCallbackList.js"
 import {
@@ -40,7 +38,10 @@ import {
   sourcemapMappingFileInfo,
 } from "../jsenvInternalFiles.js"
 import { jsenvCoreDirectoryUrl } from "../jsenvCoreDirectoryUrl.js"
-import { babelPluginReplaceExpressions } from "../babel-plugin-replace-expressions.js"
+import { babelPluginReplaceExpressions } from "../babel_plugin_replace_expressions.js"
+import { babelPluginGlobalThisAsJsenvImport } from "./babel_plugin_global_this_as_jsenv_import.js"
+import { babelPluginNewStylesheetAsJsenvImport } from "./babel_plugin_new_stylesheet_as_jsenv_import.js"
+import { babelPluginImportAssertions } from "./babel_plugin_import_assertions.js"
 import { createCompiledFileService } from "./createCompiledFileService.js"
 import { urlIsCompilationAsset } from "./compile-directory/compile-asset.js"
 import { createTransformHtmlSourceFileService } from "./html_source_file_service.js"
@@ -136,6 +137,9 @@ export const startCompileServer = async ({
     babelConfigFileUrl,
   })
   babelPluginMap = {
+    "global-this-as-jsenv-import": babelPluginGlobalThisAsJsenvImport,
+    "new-stylesheet-as-jsenv-import": babelPluginNewStylesheetAsJsenvImport,
+    "transform-import-assertions": babelPluginImportAssertions,
     ...babelPluginMapFromFile,
     ...babelPluginMap,
   }
@@ -240,6 +244,7 @@ export const startCompileServer = async ({
     inlineImportMapIntoHTML,
     babelPluginMap,
     customCompilers,
+    jsenvToolbarInjection,
   })
   if (compileServerCanWriteOnFilesystem) {
     await setupOutDirectory({
@@ -915,6 +920,7 @@ const createOutJSONFiles = ({
   env,
   inlineImportMapIntoHTML,
   customCompilers,
+  jsenvToolbarInjection,
 }) => {
   const outJSONFiles = {}
   const outDirectoryUrl = resolveUrl(
@@ -937,6 +943,7 @@ const createOutJSONFiles = ({
     replaceProcessEnvNodeEnv,
     processEnvNodeEnv,
     customCompilerPatterns,
+    jsenvToolbarInjection,
   }
   outJSONFiles.meta = {
     url: metaOutFileUrl,

package/src/internal/escapeTemplateStringSpecialCharacters.js

@@ -0,0 +1,20 @@
+// https://github.com/mgenware/string-to-template-literal/blob/main/src/main.ts#L1
+
+export const escapeTemplateStringSpecialCharacters = (string) => {
+  string = String(string)
+  let i = 0
+  let escapedString = ""
+
+  while (i < string.length) {
+    const char = string[i]
+    i++
+    escapedString += isTemplateStringSpecialChar(char) ? `\\${char}` : char
+  }
+
+  return escapedString
+}
+
+const isTemplateStringSpecialChar = (char) =>
+  templateStringSpecialChars.indexOf(char) > -1
+
+const templateStringSpecialChars = ["\\", "`", "$"]

package/src/internal/executing/coverage/{babel-plugin-instrument.js → babel_plugin_instrument.js}

@@ -1,4 +1,8 @@
-import { resolveUrl, normalizeStructuredMetaMap, urlToMeta } from "@jsenv/filesystem"
+import {
+  resolveUrl,
+  normalizeStructuredMetaMap,
+  urlToMeta,
+} from "@jsenv/filesystem"
 import { require } from "../../require.js"
 
 // https://github.com/istanbuljs/babel-plugin-istanbul/blob/321740f7b25d803f881466ea819d870f7ed6a254/src/index.js
@@ -47,15 +51,22 @@ export const babelPluginInstrument = (api, options) => {
 
           if (useInlineSourceMaps) {
             // https://github.com/istanbuljs/babel-plugin-istanbul/commit/a9e15643d249a2985e4387e4308022053b2cd0ad#diff-1fdf421c05c1140f6d71444ea2b27638R65
-            inputSourceMap = opts.inputSourceMap || file.inputMap ? file.inputMap.sourcemap : null
+            inputSourceMap =
+              opts.inputSourceMap || file.inputMap
+                ? file.inputMap.sourcemap
+                : null
           } else {
             inputSourceMap = opts.inputSourceMap
           }
 
-          this.__dv__ = programVisitor(types, opts.filenameRelative || opts.filename, {
-            coverageVariable: "__coverage__",
-            inputSourceMap,
-          })
+          this.__dv__ = programVisitor(
+            types,
+            opts.filenameRelative || opts.filename,
+            {
+              coverageVariable: "__coverage__",
+              inputSourceMap,
+            },
+          )
           this.__dv__.enter(path)
         },
 

package/src/internal/executing/coverage/relativeUrlToEmptyCoverage.js

@@ -6,7 +6,7 @@ import {
   getMinimalBabelPluginMap,
 } from "@jsenv/core/src/internal/compiling/babel_plugins.js"
 
-import { babelPluginInstrument } from "./babel-plugin-instrument.js"
+import { babelPluginInstrument } from "./babel_plugin_instrument.js"
 import { createEmptyCoverage } from "./createEmptyCoverage.js"
 
 export const relativeUrlToEmptyCoverage = async (

package/src/internal/executing/executeConcurrently.js

@@ -126,14 +126,14 @@ export const executeConcurrently = async (
 
         ...executionParams,
         collectCoverage: coverage,
-        launchParams: {
+        runtimeParams: {
           projectDirectoryUrl,
           compileServerOrigin,
           outDirectoryRelativeUrl,
           collectCoverage: coverage,
           coverageConfig,
           coverageForceIstanbul,
-          ...executionParams.launchParams,
+          ...executionParams.runtimeParams,
         },
         executeParams: {
           fileRelativeUrl,
@@ -186,7 +186,9 @@ export const executeConcurrently = async (
         ) {
           previousExecutionLog = previousExecutionLog.update(log)
         } else {
-          previousExecutionLog = writeLog(log)
+          previousExecutionLog = writeLog(log, {
+            mightUpdate: completedExecutionLogMerging,
+          })
         }
       }
 

package/src/internal/executing/executePlan.js

@@ -1,5 +1,6 @@
+import { mergeRuntimeSupport } from "@jsenv/core/src/internal/generateGroupMap/runtime_support.js"
 import { startCompileServer } from "../compiling/startCompileServer.js"
-import { babelPluginInstrument } from "./coverage/babel-plugin-instrument.js"
+import { babelPluginInstrument } from "./coverage/babel_plugin_instrument.js"
 import { generateExecutionSteps } from "./generateExecutionSteps.js"
 import { executeConcurrently } from "./executeConcurrently.js"
 
@@ -41,7 +42,6 @@ export const executePlan = async (
     babelPluginMap,
     babelConfigFileUrl,
     customCompilers,
-    runtimeSupport,
   } = {},
 ) => {
   if (coverage) {
@@ -54,6 +54,20 @@ export const executePlan = async (
     }
   }
 
+  const runtimeSupport = {}
+  Object.keys(plan).forEach((filePattern) => {
+    const filePlan = plan[filePattern]
+    Object.keys(filePlan).forEach((executionName) => {
+      const executionConfig = filePlan[executionName]
+      const { runtime } = executionConfig
+      if (runtime) {
+        mergeRuntimeSupport(runtimeSupport, {
+          [runtime.name]: runtime.version,
+        })
+      }
+    })
+  })
+
   const compileServer = await startCompileServer({
     cancellationToken,
     compileServerLogLevel,

package/src/internal/executing/generateFileExecutionSteps.js

@@ -2,6 +2,7 @@ import { createDetailedMessage } from "@jsenv/logger"
 
 export const generateFileExecutionSteps = ({ fileRelativeUrl, filePlan }) => {
   const fileExecutionSteps = []
+
   Object.keys(filePlan).forEach((executionName) => {
     const stepConfig = filePlan[executionName]
     if (stepConfig === null || stepConfig === undefined) {
@@ -11,7 +12,7 @@ export const generateFileExecutionSteps = ({ fileRelativeUrl, filePlan }) => {
     if (typeof stepConfig !== "object") {
       throw new TypeError(
         createDetailedMessage(
-          `found unexpected value in plan, they must be object.`,
+          `found unexpected value in plan, they must be object`,
           {
             ["file relative path"]: fileRelativeUrl,
             ["execution name"]: executionName,