@jsenv/core 29.7.0 → 29.8.0

package/package.json

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

package/src/build/build.js

@@ -229,7 +229,7 @@ build ${entryPointKeys.length} entry points`)
       logLevel,
       rootDirectoryUrl,
       urlGraph: rawGraph,
-      scenarios: { build: true },
+      build: true,
       runtimeCompat,
       plugins: [
         ...plugins,
@@ -302,7 +302,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
       logLevel,
       rootDirectoryUrl: buildDirectoryUrl,
       urlGraph: finalGraph,
-      scenarios: { build: true },
+      build: true,
       runtimeCompat,
       plugins: [
         urlAnalysisPlugin,
@@ -497,6 +497,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
             const generatedUrlObject = new URL(reference.generatedUrl)
             generatedUrlObject.searchParams.delete("as_js_classic")
             generatedUrlObject.searchParams.delete("as_js_classic_library")
+            generatedUrlObject.searchParams.delete("as_js_module")
             generatedUrlObject.searchParams.delete("as_json_module")
             generatedUrlObject.searchParams.delete("as_css_module")
             generatedUrlObject.searchParams.delete("as_text_module")
@@ -673,7 +674,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
                   if (dependencyUrlInfo.type === "js_module") {
                     // bundle inline script type module deps
                     dependencyUrlInfo.references.forEach((inlineScriptRef) => {
-                      if (inlineScriptRef.type === "js_import_export") {
+                      if (inlineScriptRef.type === "js_import") {
                         const inlineUrlInfo = rawGraph.getUrlInfo(
                           inlineScriptRef.url,
                         )
@@ -709,7 +710,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
           // For instance we will bundle service worker/workers detected like this
           if (rawUrlInfo.type === "js_module") {
             rawUrlInfo.references.forEach((reference) => {
-              if (reference.type !== "js_url_specifier") {
+              if (reference.type !== "js_url") {
                 return
               }
               const referencedUrlInfo = rawGraph.getUrlInfo(reference.url)
@@ -724,7 +725,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
                 for (const reference of dependentUrlInfo.references) {
                   if (reference.url === referencedUrlInfo.url) {
                     willAlreadyBeBundled =
-                      (reference.type === "js_import_export" &&
+                      (reference.type === "js_import" &&
                         reference.subtype === "import_dynamic") ||
                       reference.type === "script_src"
                   }
@@ -950,7 +951,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
                     return null
                   }
                   if (
-                    reference.type === "js_url_specifier" ||
+                    reference.type === "js_url" ||
                     reference.subtype === "import_dynamic"
                   ) {
                     // __v__() makes versioning dynamic: no need to take into account
@@ -984,6 +985,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
               // this information is already hold into ".nomodule"
               buildUrlObject.searchParams.delete("as_js_classic")
               buildUrlObject.searchParams.delete("as_js_classic_library")
+              buildUrlObject.searchParams.delete("as_js_module")
               buildUrlObject.searchParams.delete("as_json_module")
               buildUrlObject.searchParams.delete("as_css_module")
               buildUrlObject.searchParams.delete("as_text_module")
@@ -1011,7 +1013,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
             logLevel: logger.level,
             rootDirectoryUrl: buildDirectoryUrl,
             urlGraph: finalGraph,
-            scenarios: { build: true },
+            build: true,
             runtimeCompat,
             plugins: [
               urlAnalysisPlugin,
@@ -1099,8 +1101,9 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
                       )})+${parentUrlInfo.jsQuote}`
                   }
                   if (
-                    reference.type === "js_url_specifier" ||
-                    reference.subtype === "import_dynamic"
+                    reference.type === "js_url" ||
+                    reference.subtype === "import_dynamic" ||
+                    reference.subtype === "import_meta_resolve"
                   ) {
                     usedVersionMappings.add(reference.specifier)
                     return () => `__v__(${JSON.stringify(reference.specifier)})`

package/src/dev/file_service.js

@@ -21,7 +21,6 @@ export const createFileService = ({
   serverEventsDispatcher,
 
   rootDirectoryUrl,
-  scenarios,
   runtimeCompat,
 
   plugins,
@@ -116,7 +115,7 @@ export const createFileService = ({
       signal,
       logLevel,
       rootDirectoryUrl,
-      scenarios,
+      dev: true,
       runtimeCompat,
       clientRuntimeCompat: {
         [runtimeName]: runtimeVersion,
@@ -146,9 +145,7 @@ export const createFileService = ({
       sourcemapsSourcesProtocol,
       sourcemapsSourcesContent,
       writeGeneratedFiles,
-      outDirectoryUrl: scenarios.dev
-        ? `${rootDirectoryUrl}.jsenv/${runtimeName}@${runtimeVersion}/`
-        : `${rootDirectoryUrl}.jsenv/build/${runtimeName}@${runtimeVersion}/`,
+      outDirectoryUrl: `${rootDirectoryUrl}.jsenv/${runtimeName}@${runtimeVersion}/`,
     })
     urlGraph.createUrlInfoCallbackRef.current = (urlInfo) => {
       const { watch } = URL_META.applyAssociations({
@@ -218,7 +215,7 @@ export const createFileService = ({
           allServerEvents[serverEventName]({
             rootDirectoryUrl,
             urlGraph,
-            scenarios,
+            dev: true,
             sendServerEvent: (data) => {
               serverEventsDispatcher.dispatch({
                 type: serverEventName,
@@ -236,7 +233,7 @@ export const createFileService = ({
 
     const context = {
       rootDirectoryUrl,
-      scenarios,
+      dev: true,
       runtimeName,
       runtimeVersion,
       urlGraph,

package/src/dev/start_dev_server.js

@@ -196,7 +196,6 @@ export const startDevServer = async ({
           serverEventsDispatcher,
 
           rootDirectoryUrl,
-          scenarios: { dev: true },
           runtimeCompat,
 
           plugins,

package/src/kitchen/compat/{features_compats.js → features_compatibility.js}

@@ -1,4 +1,4 @@
-export const featureCompats = {
+export const featuresCompatMap = {
   script_type_module: {
     edge: "16",
     firefox: "60",
@@ -29,6 +29,9 @@ export const featureCompats = {
     safari: "11.1",
     samsung: "9.2",
   },
+  import_meta_resolve: {
+    chrome: "107",
+  },
   // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/import#browser_compatibility
   import_dynamic: {
     android: "8",

package/src/kitchen/compat/runtime_compat.js

@@ -1,9 +1,9 @@
 import { findHighestVersion } from "@jsenv/utils/src/semantic_versioning/highest_version.js"
 
-import { featureCompats } from "./features_compats.js"
+import { featuresCompatMap } from "./features_compatibility.js"
 
 export const RUNTIME_COMPAT = {
-  featureCompats,
+  featuresCompatMap,
 
   add: (originalRuntimeCompat, feature) => {
     const featureCompat = getFeatureCompat(feature)
@@ -41,7 +41,7 @@ export const RUNTIME_COMPAT = {
 
 const getFeatureCompat = (feature) => {
   if (typeof feature === "string") {
-    const compat = featureCompats[feature]
+    const compat = featuresCompatMap[feature]
     if (!compat) {
       throw new Error(`"${feature}" feature is unknown`)
     }

package/src/kitchen/kitchen.js

@@ -28,14 +28,15 @@ export const createKitchen = ({
   logLevel,
 
   rootDirectoryUrl,
-  scenarios,
+  dev = false,
+  build = false,
   runtimeCompat,
   // during dev/test clientRuntimeCompat is a single runtime
   // during build clientRuntimeCompat is runtimeCompat
   clientRuntimeCompat = runtimeCompat,
   urlGraph,
   plugins,
-  sourcemaps = scenarios.dev ? "inline" : "none", // "programmatic" and "file" also allowed
+  sourcemaps = dev ? "inline" : "none", // "programmatic" and "file" also allowed
   sourcemapsSourcesProtocol,
   sourcemapsSourcesContent,
   sourcemapsSourcesRelative,
@@ -43,16 +44,13 @@ export const createKitchen = ({
   outDirectoryUrl,
 }) => {
   const logger = createLogger({ logLevel })
-  const pluginController = createPluginController({
-    plugins,
-    scenarios,
-  })
   const kitchenContext = {
     signal,
     logger,
     rootDirectoryUrl,
     urlGraph,
-    scenarios,
+    dev,
+    build,
     runtimeCompat,
     clientRuntimeCompat,
     isSupportedOnCurrentClients: (feature) => {
@@ -64,7 +62,18 @@ export const createKitchen = ({
     sourcemaps,
     outDirectoryUrl,
   }
-  pluginController.callHooks("init", kitchenContext)
+  const pluginController = createPluginController(kitchenContext)
+  const pushPlugins = (plugins) => {
+    plugins.forEach((pluginEntry) => {
+      if (Array.isArray(pluginEntry)) {
+        pushPlugins(pluginEntry)
+      } else {
+        pluginController.pushPlugin(pluginEntry)
+      }
+    })
+  }
+  pushPlugins(plugins)
+
   const createReference = ({
     data = {},
     node,
@@ -821,7 +830,7 @@ const applyReferenceEffectsOnUrlInfo = (reference, urlInfo, context) => {
       column: reference.specifierColumn,
     }
     urlInfo.contentType = reference.contentType
-    urlInfo.originalContent = context.scenarios.build
+    urlInfo.originalContent = context.build
       ? urlInfo.originalContent === undefined
         ? reference.content
         : urlInfo.originalContent

package/src/kitchen/url_graph/url_info_transformations.js

@@ -87,6 +87,7 @@ export const createUrlInfoTransformer = ({
     //   during build it's urlInfo.url to be inside the build
     //   but otherwise it's generatedUrl to be inside .jsenv/ directory
     const generatedUrlObject = new URL(urlInfo.generatedUrl)
+    generatedUrlObject.searchParams.delete("as_js_module")
     generatedUrlObject.searchParams.delete("as_js_classic")
     generatedUrlObject.searchParams.delete("as_js_classic_library")
     const urlForSourcemap = generatedUrlObject.href

package/src/kitchen/url_specifier_encoding.js

@@ -29,8 +29,8 @@ export const urlSpecifierEncoding = {
   },
 }
 const formatters = {
-  "js_import_export": { encode: JSON.stringify, decode: JSON.parse },
-  "js_url_specifier": { encode: JSON.stringify, decode: JSON.parse },
+  "js_import": { encode: JSON.stringify, decode: JSON.parse },
+  "js_url": { encode: JSON.stringify, decode: JSON.parse },
   "css_@import": { encode: JSON.stringify, decode: JSON.stringify },
   // https://github.com/webpack-contrib/css-loader/pull/627/files
   "css_url": {

package/src/plugins/bundling/js_module/bundle_js_modules.js

@@ -297,9 +297,11 @@ const rollupPluginJsenv = ({
       const urlInfo = urlGraph.getUrlInfo(fileUrl)
       return {
         code: urlInfo.content,
-        map: urlInfo.sourcemap
-          ? sourcemapConverter.toFilePaths(urlInfo.sourcemap)
-          : null,
+        map:
+          (sourcemaps === "file" || sourcemaps === "inline") &&
+          urlInfo.sourcemap
+            ? sourcemapConverter.toFilePaths(urlInfo.sourcemap)
+            : null,
       }
     },
   }

package/src/plugins/commonjs_globals/jsenv_plugin_commonjs_globals.js

@@ -22,7 +22,7 @@ export const jsenvPluginCommonJsGlobals = () => {
     const isJsModule = urlInfo.type === "js_module"
     const replaceMap = {
       "process.env.NODE_ENV": `("${
-        context.scenarios.dev ? "development" : "production"
+        context.dev ? "development" : "production"
       }")`,
       "global": "globalThis",
       "__filename": isJsModule

package/src/plugins/import_meta_hot/jsenv_plugin_import_meta_hot.js

@@ -16,7 +16,7 @@ export const jsenvPluginImportMetaHot = () => {
     transformUrlContent: {
       html: (htmlUrlInfo, context) => {
         // during build we don't really care to parse html hot dependencies
-        if (context.scenarios.build) {
+        if (context.build) {
           return
         }
         const htmlAst = parseHtmlString(htmlUrlInfo.content)
@@ -69,7 +69,7 @@ export const jsenvPluginImportMetaHot = () => {
         if (importMetaHotPaths.length === 0) {
           return null
         }
-        if (context.scenarios.build) {
+        if (context.build) {
           return removeImportMetaHots(urlInfo, importMetaHotPaths)
         }
         return injectImportMetaHot(urlInfo, context, importMetaHotClientFileUrl)
@@ -97,7 +97,7 @@ const removeImportMetaHots = (urlInfo, importMetaHotPaths) => {
 const injectImportMetaHot = (urlInfo, context, importMetaHotClientFileUrl) => {
   const [importMetaHotClientFileReference] = context.referenceUtils.inject({
     parentUrl: urlInfo.url,
-    type: "js_import_export",
+    type: "js_import",
     expectedType: "js_module",
     specifier: importMetaHotClientFileUrl,
   })

package/src/plugins/import_meta_scenarios/jsenv_plugin_import_meta_scenarios.js

@@ -33,7 +33,7 @@ export const jsenvPluginImportMetaScenarios = () => {
         const replace = (path, value) => {
           replacements.push({ path, value })
         }
-        if (context.scenarios.build) {
+        if (context.build) {
           // during build ensure replacement for tree-shaking
           dev.forEach((path) => {
             replace(path, "undefined")

package/src/plugins/importmap/jsenv_plugin_importmap.js

@@ -58,7 +58,7 @@ export const jsenvPluginImportmap = () => {
     name: "jsenv:importmap",
     appliesDuring: "*",
     resolveUrl: {
-      js_import_export: (reference) => {
+      js_import: (reference) => {
         if (!finalImportmap) {
           return null
         }
@@ -203,7 +203,7 @@ export const jsenvPluginImportmap = () => {
         // by "formatReferencedUrl" making the importmap presence useless.
         // In dev/test we keep importmap into the HTML to see it even if useless
         // Duing build we get rid of it
-        if (context.scenarios.build) {
+        if (context.build) {
           removeHtmlNode(importmap)
         }
         return {

package/src/plugins/placeholders/replace_placeholders.js

@@ -12,7 +12,9 @@ export const replacePlaceholders = (urlInfo, replacements) => {
         start,
         end,
         replacement:
-          urlInfo.type === "js_classic" || urlInfo.type === "js_module"
+          urlInfo.type === "js_classic" ||
+          urlInfo.type === "js_module" ||
+          urlInfo.type === "html"
             ? JSON.stringify(replacements[key], null, "  ")
             : replacements[key],
       })

package/src/plugins/plugin_controller.js

@@ -17,16 +17,33 @@ const HOOK_NAMES = [
   "destroy",
 ]
 
-export const createPluginController = ({ plugins, scenarios }) => {
-  const flatPlugins = flattenAndFilterPlugins(plugins, { scenarios })
+export const createPluginController = (kitchenContext) => {
+  const plugins = []
   // precompute a list of hooks per hookName for one major reason:
   // - When debugging, there is less iteration
   // also it should increase perf as there is less work to do
-
   const hookGroups = {}
   const addPlugin = (plugin, { position = "start" }) => {
+    if (plugin === null || typeof plugin !== "object") {
+      throw new TypeError(`plugin must be objects, got ${plugin}`)
+    }
+    if (!testAppliesDuring(plugin) || !initPlugin(plugin)) {
+      if (plugin.destroy) {
+        plugin.destroy()
+      }
+      return
+    }
+    if (!plugin.name) {
+      plugin.name = "anonymous"
+    }
+    plugins.push(plugin)
     Object.keys(plugin).forEach((key) => {
-      if (key === "name" || key === "appliesDuring" || key === "serverEvents") {
+      if (
+        key === "name" ||
+        key === "appliesDuring" ||
+        key === "init" ||
+        key === "serverEvents"
+      ) {
         return
       }
       const isHook = HOOK_NAMES.includes(key)
@@ -50,15 +67,60 @@ export const createPluginController = ({ plugins, scenarios }) => {
       }
     })
   }
+  const testAppliesDuring = (plugin) => {
+    const { appliesDuring } = plugin
+    if (appliesDuring === undefined) {
+      // console.debug(`"appliesDuring" is undefined on ${pluginEntry.name}`)
+      return true
+    }
+    if (appliesDuring === "*") {
+      return true
+    }
+    if (typeof appliesDuring === "string") {
+      if (appliesDuring !== "dev" && appliesDuring !== "build") {
+        throw new TypeError(
+          `"appliesDuring" must be "dev" or "build", got ${appliesDuring}`,
+        )
+      }
+      if (kitchenContext[appliesDuring]) {
+        return true
+      }
+      return false
+    }
+    if (typeof appliesDuring === "object") {
+      for (const key of Object.keys(appliesDuring)) {
+        if (!appliesDuring[key] && kitchenContext[key]) {
+          return false
+        }
+        if (appliesDuring[key] && kitchenContext[key]) {
+          return true
+        }
+      }
+      // throw new Error(`"appliesDuring" is empty`)
+      return false
+    }
+    throw new TypeError(
+      `"appliesDuring" must be an object or a string, got ${appliesDuring}`,
+    )
+  }
+  const initPlugin = (plugin) => {
+    if (plugin.init) {
+      const initReturnValue = plugin.init(kitchenContext)
+      if (initReturnValue === false) {
+        return false
+      }
+      if (typeof initReturnValue === "function" && !plugin.destroy) {
+        plugin.destroy = initReturnValue
+      }
+    }
+    return true
+  }
   const pushPlugin = (plugin) => {
     addPlugin(plugin, { position: "start" })
   }
   const unshiftPlugin = (plugin) => {
     addPlugin(plugin, { position: "end" })
   }
-  flatPlugins.forEach((plugin) => {
-    pushPlugin(plugin)
-  })
 
   let lastPluginUsed = null
   let currentPlugin = null
@@ -172,7 +234,7 @@ export const createPluginController = ({ plugins, scenarios }) => {
   }
 
   return {
-    plugins: flatPlugins,
+    plugins,
     pushPlugin,
     unshiftPlugin,
     getHookFunction,
@@ -190,69 +252,6 @@ export const createPluginController = ({ plugins, scenarios }) => {
   }
 }
 
-const flattenAndFilterPlugins = (plugins, { scenarios }) => {
-  const flatPlugins = []
-  const visitPluginEntry = (pluginEntry) => {
-    if (Array.isArray(pluginEntry)) {
-      pluginEntry.forEach((value) => visitPluginEntry(value))
-      return
-    }
-    if (typeof pluginEntry === "object" && pluginEntry !== null) {
-      if (!pluginEntry.name) {
-        pluginEntry.name = "anonymous"
-      }
-      const { appliesDuring } = pluginEntry
-      if (appliesDuring === undefined) {
-        // console.debug(`"appliesDuring" is undefined on ${pluginEntry.name}`)
-        flatPlugins.push(pluginEntry)
-        return
-      }
-      if (appliesDuring === "*") {
-        flatPlugins.push(pluginEntry)
-        return
-      }
-      if (typeof appliesDuring === "string") {
-        if (!["dev", "build"].includes(appliesDuring)) {
-          throw new Error(
-            `"appliesDuring" must be "dev" or "build", got ${appliesDuring}`,
-          )
-        }
-        if (scenarios[appliesDuring]) {
-          flatPlugins.push(pluginEntry)
-          return
-        }
-        return
-      }
-      if (typeof appliesDuring !== "object") {
-        throw new Error(
-          `"appliesDuring" must be an object or a string, got ${appliesDuring}`,
-        )
-      }
-      let applies
-      for (const key of Object.keys(appliesDuring)) {
-        if (!appliesDuring[key] && scenarios[key]) {
-          applies = false
-          break
-        }
-        if (appliesDuring[key] && scenarios[key]) {
-          applies = true
-        }
-      }
-      if (applies) {
-        flatPlugins.push(pluginEntry)
-        return
-      }
-      if (pluginEntry.destroy) {
-        pluginEntry.destroy()
-      }
-      return
-    }
-    throw new Error(`plugin must be objects, got ${pluginEntry}`)
-  }
-  plugins.forEach((plugin) => visitPluginEntry(plugin))
-  return flatPlugins
-}
-
 const getHookFunction = (
   hook,
   // can be undefined, reference, or urlInfo

package/src/plugins/ribbon/jsenv_plugin_ribbon.js

@@ -38,7 +38,7 @@ export const jsenvPluginRibbon = ({
           specifier: ribbonClientFileUrl.href,
         })
         const paramsJson = JSON.stringify(
-          { text: context.scenarios.dev ? "DEV" : "BUILD" },
+          { text: context.dev ? "DEV" : "BUILD" },
           null,
           "  ",
         )

package/src/plugins/supervisor/jsenv_plugin_supervisor.js

@@ -302,7 +302,7 @@ export const jsenvPluginSupervisor = ({
         })
         const [scriptTypeModuleSupervisorFileReference] =
           context.referenceUtils.inject({
-            type: "js_import_export",
+            type: "js_import",
             expectedType: "js_module",
             specifier: scriptTypeModuleSupervisorFileUrl,
           })

package/src/plugins/toolbar/jsenv_plugin_toolbar.js

@@ -25,7 +25,7 @@ export const jsenvPluginToolbar = ({ logs = false } = {}) => {
         }
         const htmlAst = parseHtmlString(content)
         const [toolbarInjectorReference] = referenceUtils.inject({
-          type: "js_import_export",
+          type: "js_import",
           expectedType: "js_module",
           specifier: toolbarInjectorClientFileUrl,
         })

package/src/plugins/transpilation/as_js_classic/client/s.js

@@ -428,7 +428,7 @@
   const createMeta = (url) => {
     return {
       url,
-      resolve: (id, parentUrl) => resolveUrl(id, parentUrl),
+      resolve: (id) => resolveUrl(id, url),
     }
   }
 

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

@@ -9,6 +9,7 @@ import { applyBabelPlugins } from "@jsenv/ast"
 import { requireFromJsenv } from "@jsenv/core/src/require_from_jsenv.js"
 import { requireBabelPlugin } from "../babel/require_babel_plugin.js"
 import { babelPluginTransformImportMetaUrl } from "./helpers/babel_plugin_transform_import_meta_url.js"
+import { babelPluginTransformImportMetaResolve } from "./helpers/babel_plugin_transform_import_meta_resolve.js"
 
 // import { jsenvPluginAsJsClassicLibrary } from "./jsenv_plugin_as_js_classic_library.js"
 // because of https://github.com/rpetrich/babel-plugin-transform-async-to-promises/issues/84
@@ -58,6 +59,7 @@ export const convertJsModuleToJsClassic = async ({
               },
             ],
             babelPluginTransformImportMetaUrl,
+            babelPluginTransformImportMetaResolve,
             requireFromJsenv("@babel/plugin-transform-modules-umd"),
           ]),
     ],

package/src/plugins/transpilation/as_js_classic/helpers/babel_plugin_transform_import_meta_resolve.js

@@ -0,0 +1,26 @@
+export const babelPluginTransformImportMetaResolve = () => {
+  return {
+    name: "transform-import-meta-resolve",
+    visitor: {
+      Program: (programPath) => {
+        programPath.traverse({
+          MemberExpression: (path) => {
+            const node = path.node
+            if (
+              node.object.type === "MetaProperty" &&
+              node.object.property.name === "meta" &&
+              node.property.name === "resolve"
+            ) {
+              const firstArg = node.arguments[0]
+              if (firstArg && firstArg.type === "StringLiteral") {
+                path.replaceWithSourceString(
+                  `new URL(${firstArg.value}, document.currentScript.src).href`,
+                )
+              }
+            }
+          },
+        })
+      },
+    },
+  }
+}