@jsenv/core 27.0.0-alpha.4 → 27.0.0-alpha.40

package/src/{omega → plugins}/plugin_controller.js

@@ -1,14 +1,16 @@
+import { timeStart } from "@jsenv/server"
+
 export const createPluginController = ({
   plugins,
   scenario,
   hooks = [
-    "resolve",
-    "normalize",
-    "load",
-    "transform",
-    "transformReferencedUrl",
-    "formatReferencedUrl",
-    "finalize",
+    "resolveUrl",
+    "normalizeUrl",
+    "fetchUrlContent",
+    "transformUrlContent",
+    "transformUrlSearchParams",
+    "formatUrl",
+    "finalizeUrlContent",
     "cooked",
     "destroy",
   ],
@@ -47,7 +49,13 @@ export const createPluginController = ({
     }
     currentPlugin = hook.plugin
     currentHookName = hook.hookName
+    const timeEnd = timeStart(
+      `${currentHookName}-${currentPlugin.name.replace("jsenv:", "")}`,
+    )
     let valueReturned = hookFn(info, context)
+    if (info.timing) {
+      Object.assign(info.timing, timeEnd())
+    }
     valueReturned = assertAndNormalizeReturnValue(hook.hookName, valueReturned)
     currentPlugin = null
     currentHookName = null
@@ -60,7 +68,13 @@ export const createPluginController = ({
     }
     currentPlugin = hook.plugin
     currentHookName = hook.hookName
+    const timeEnd = timeStart(
+      `${currentHookName}-${currentPlugin.name.replace("jsenv:", "")}`,
+    )
     let valueReturned = await hookFn(info, context)
+    if (info.timing) {
+      Object.assign(info.timing, timeEnd())
+    }
     valueReturned = assertAndNormalizeReturnValue(hook.hookName, valueReturned)
     currentPlugin = null
     currentHookName = null
@@ -145,12 +159,18 @@ const flattenAndFilterPlugins = (pluginsRaw, { scenario }) => {
       const { appliesDuring } = pluginEntry
       if (appliesDuring === undefined) {
         console.warn(`"appliesDuring" is undefined on ${pluginEntry.name}`)
+        return
       }
       if (appliesDuring === "*") {
         plugins.push(pluginEntry)
         return
       }
-      if (appliesDuring && appliesDuring[scenario]) {
+      if (typeof appliesDuring !== "object") {
+        throw new Error(
+          `"appliesDuring" must be an object or "*", got ${appliesDuring}`,
+        )
+      }
+      if (appliesDuring[scenario]) {
         plugins.push(pluginEntry)
         return
       }
@@ -203,7 +223,7 @@ const assertAndNormalizeReturnValue = (hookName, returnValue) => {
 const returnValueAssertions = [
   {
     name: "url_assertion",
-    appliesTo: ["resolve", "redirect"],
+    appliesTo: ["resolveUrl", "normalizeUrl"],
     assertion: (valueReturned) => {
       if (valueReturned instanceof URL) {
         return valueReturned.href
@@ -218,13 +238,21 @@ const returnValueAssertions = [
   },
   {
     name: "content_assertion",
-    appliesTo: ["load", "transform", "finalize"],
+    appliesTo: [
+      "fetchUrlContent",
+      "transformUrlContent",
+      "finalizeUrlContent",
+      "optimizeUrlContent",
+    ],
     assertion: (valueReturned) => {
       if (typeof valueReturned === "string" || Buffer.isBuffer(valueReturned)) {
         return { content: valueReturned }
       }
       if (typeof valueReturned === "object") {
-        const { content } = valueReturned
+        const { external, content } = valueReturned
+        if (external) {
+          return undefined
+        }
         if (typeof content !== "string" && !Buffer.isBuffer(content)) {
           throw new Error(
             `Unexpected "content" returned by plugin: it must be a string or a buffer; got ${content}`,

package/src/plugins/plugins.js

@@ -0,0 +1,89 @@
+import { jsenvPluginUrlReferences } from "../plugins/url_references/jsenv_plugin_url_references.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"
+import { jsenvPluginFileSystemMagic } from "./filesystem_magic/jsenv_plugin_filesystem_magic.js"
+import { jsenvPluginInline } from "./inline/jsenv_plugin_inline.js"
+import { jsenvPluginHtmlSupervisor } from "./html_supervisor/jsenv_plugin_html_supervisor.js"
+import { jsenvPluginCommonJsGlobals } from "./commonjs_globals/jsenv_plugin_commonjs_globals.js"
+import { jsenvPluginImportMetaScenarios } from "./import_meta_scenarios/jsenv_plugin_import_meta_scenarios.js"
+import { jsenvPluginInjectGlobals } from "./inject_globals/jsenv_plugin_inject_globals.js"
+import { jsenvPluginTranspilation } from "./transpilation/jsenv_plugin_transpilation.js"
+import { jsenvPluginBundling } from "./bundling/jsenv_plugin_bundling.js"
+import { jsenvPluginMinification } from "./minification/jsenv_plugin_minification.js"
+import { jsenvPluginImportMetaHot } from "./import_meta_hot/jsenv_plugin_import_meta_hot.js"
+import { jsenvPluginAutoreload } from "./autoreload/jsenv_plugin_autoreload.js"
+
+export const getCorePlugins = ({
+  rootDirectoryUrl,
+  urlGraph,
+  scenario,
+
+  htmlSupervisor,
+  nodeEsmResolution,
+  fileSystemMagicResolution,
+  injectedGlobals,
+  transpilation = true,
+  minification = false,
+  bundling = false,
+
+  autoreload = false,
+} = {}) => {
+  if (htmlSupervisor === true) {
+    htmlSupervisor = {}
+  }
+  if (autoreload === true) {
+    autoreload = {}
+  }
+  if (nodeEsmResolution === true) {
+    nodeEsmResolution = {}
+  }
+  return [
+    jsenvPluginUrlReferences(),
+    jsenvPluginTranspilation(transpilation),
+    ...(htmlSupervisor
+      ? [
+          jsenvPluginHtmlSupervisor({
+            rootDirectoryUrl,
+            ...htmlSupervisor,
+          }),
+        ]
+      : []), // before inline as it turns inline <script> into <script src>
+    jsenvPluginInline(), // before "file urls" to resolve and load inline urls
+    jsenvPluginImportmap(), // before node esm to handle bare specifiers before node esm
+    jsenvPluginFileUrls(),
+    jsenvPluginHttpUrls(),
+    jsenvPluginLeadingSlash(),
+    // before url resolution to handle "js_import_export" resolution
+    jsenvPluginNodeEsmResolution({
+      rootDirectoryUrl,
+      ...nodeEsmResolution,
+    }),
+    jsenvPluginUrlResolution(),
+    jsenvPluginFileSystemMagic(fileSystemMagicResolution),
+    jsenvPluginUrlVersion(),
+    jsenvPluginInjectGlobals(injectedGlobals),
+    jsenvPluginCommonJsGlobals(),
+    jsenvPluginImportMetaScenarios(),
+    // jsenvPluginWorkers(),
+
+    jsenvPluginBundling(bundling),
+    jsenvPluginMinification(minification),
+
+    jsenvPluginImportMetaHot(),
+    ...(autoreload
+      ? [
+          jsenvPluginAutoreload({
+            rootDirectoryUrl,
+            urlGraph,
+            scenario,
+            ...autoreload,
+          }),
+        ]
+      : []),
+  ]
+}