@jsenv/core 35.0.5 → 36.0.1

package/src/plugins/plugin_controller.js

@@ -3,12 +3,12 @@ import { performance } from "node:perf_hooks";
 const HOOK_NAMES = [
   "init",
   "serve", // is called only during dev/tests
-  "resolveUrl",
-  "redirectUrl",
+  "resolveReference",
+  "redirectReference",
+  "transformReferenceSearchParams",
+  "formatReference",
   "fetchUrlContent",
   "transformUrlContent",
-  "transformUrlSearchParams",
-  "formatUrl",
   "finalizeUrlContent",
   "bundle", // is called only during build
   "optimizeUrlContent", // is called only during build
@@ -23,7 +23,16 @@ export const createPluginController = (kitchenContext) => {
   // - 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" }) => {
+  const addPlugin = (plugin, { position = "end" }) => {
+    if (Array.isArray(plugin)) {
+      if (position === "start") {
+        plugin = plugin.slice().reverse();
+      }
+      plugin.forEach((plugin) => {
+        addPlugin(plugin, { position });
+      });
+      return;
+    }
     if (plugin === null || typeof plugin !== "object") {
       throw new TypeError(`plugin must be objects, got ${plugin}`);
     }
@@ -60,9 +69,9 @@ export const createPluginController = (kitchenContext) => {
           value: hookValue,
         };
         if (position === "start") {
-          group.push(hook);
-        } else {
           group.unshift(hook);
+        } else {
+          group.push(hook);
         }
       }
     });
@@ -116,10 +125,10 @@ export const createPluginController = (kitchenContext) => {
     return true;
   };
   const pushPlugin = (plugin) => {
-    addPlugin(plugin, { position: "start" });
+    addPlugin(plugin, { position: "end" });
   };
   const unshiftPlugin = (plugin) => {
-    addPlugin(plugin, { position: "end" });
+    addPlugin(plugin, { position: "start" });
   };
 
   let lastPluginUsed = null;
@@ -290,7 +299,7 @@ const assertAndNormalizeReturnValue = (hookName, returnValue) => {
 const returnValueAssertions = [
   {
     name: "url_assertion",
-    appliesTo: ["resolveUrl", "redirectUrl"],
+    appliesTo: ["resolveReference", "redirectReference"],
     assertion: (valueReturned) => {
       if (valueReturned instanceof URL) {
         return valueReturned.href;

package/src/plugins/plugins.js

@@ -1,10 +1,10 @@
-import { jsenvPluginUrlAnalysis } from "./url_analysis/jsenv_plugin_url_analysis.js";
+import { jsenvPluginReferenceAnalysis } from "./reference_analysis/jsenv_plugin_reference_analysis.js";
 import { jsenvPluginImportmap } from "./importmap/jsenv_plugin_importmap.js";
-import { jsenvPluginUrlResolution } from "./url_resolution/jsenv_plugin_url_resolution.js";
-import { jsenvPluginUrlVersion } from "./url_version/jsenv_plugin_url_version.js";
+import { jsenvPluginNodeEsmResolution } from "./resolution_node_esm/jsenv_plugin_node_esm_resolution.js";
+import { jsenvPluginWebResolution } from "./resolution_web/jsenv_plugin_web_resolution.js";
+import { jsenvPluginVersionSearchParam } from "./version_search_param/jsenv_plugin_version_search_param.js";
 import { jsenvPluginFileUrls } from "./file_urls/jsenv_plugin_file_urls.js";
 import { jsenvPluginHttpUrls } from "./http_urls/jsenv_plugin_http_urls.js";
-import { jsenvPluginInlineContentAnalysis } from "./inline_content_analysis/jsenv_plugin_inline_content_analysis.js";
 import { jsenvPluginInlining } from "./inlining/jsenv_plugin_inlining.js";
 import { jsenvPluginSupervisor } from "./supervisor/jsenv_plugin_supervisor.js";
 import { jsenvPluginCommonJsGlobals } from "./commonjs_globals/jsenv_plugin_commonjs_globals.js";
@@ -16,18 +16,16 @@ import { jsenvPluginNodeRuntime } from "./node_runtime/jsenv_plugin_node_runtime
 import { jsenvPluginImportMetaHot } from "./import_meta_hot/jsenv_plugin_import_meta_hot.js";
 import { jsenvPluginAutoreload } from "./autoreload/jsenv_plugin_autoreload.js";
 import { jsenvPluginCacheControl } from "./cache_control/jsenv_plugin_cache_control.js";
-// dev only
-import { jsenvPluginExplorer } from "./explorer/jsenv_plugin_explorer.js";
 // other
 import { jsenvPluginRibbon } from "./ribbon/jsenv_plugin_ribbon.js";
 
 export const getCorePlugins = ({
   rootDirectoryUrl,
-  defaultFileUrl,
   runtimeCompat,
 
-  urlAnalysis = {},
-  urlResolution = {},
+  referenceAnalysis = {},
+  nodeEsmResolution = {},
+  webResolution = {},
   fileSystemMagicRedirection,
   directoryReferenceAllowed,
   supervisor,
@@ -37,14 +35,10 @@ export const getCorePlugins = ({
   clientAutoreload = false,
   clientFileChangeCallbackList,
   clientFilesPruneCallbackList,
-  explorer,
   cacheControl,
   scenarioPlaceholders = true,
   ribbon = true,
 } = {}) => {
-  if (explorer === true) {
-    explorer = {};
-  }
   if (cacheControl === true) {
     cacheControl = {};
   }
@@ -57,31 +51,34 @@ export const getCorePlugins = ({
   if (clientAutoreload === true) {
     clientAutoreload = {};
   }
-
   if (ribbon === true) {
     ribbon = {};
   }
 
   return [
-    jsenvPluginUrlAnalysis({ rootDirectoryUrl, ...urlAnalysis }),
+    jsenvPluginReferenceAnalysis(referenceAnalysis),
     jsenvPluginTranspilation(transpilation),
     jsenvPluginImportmap(),
-    // before node esm to handle bare specifiers
-    // + before node esm to handle importmap before inline content
-    jsenvPluginInlineContentAnalysis(), // before "file urls" to resolve and load inline urls
     ...(inlining ? [jsenvPluginInlining()] : []),
     ...(supervisor ? [jsenvPluginSupervisor(supervisor)] : []), // after inline as it needs inline script to be cooked
+
+    /* When resolving references the following applies by default:
+       - http urls are resolved by jsenvPluginHttpUrls
+       - reference.type === "filesystem" -> resolved by jsenv_plugin_file_urls.js
+       - reference inside a js module -> resolved by node esm
+       - All the rest uses web standard url resolution
+     */
     jsenvPluginFileUrls({
       directoryReferenceAllowed,
       ...fileSystemMagicRedirection,
     }),
     jsenvPluginHttpUrls(),
-    jsenvPluginUrlResolution({
-      runtimeCompat,
-      defaultFileUrl,
-      urlResolution,
-    }),
-    jsenvPluginUrlVersion(),
+    ...(nodeEsmResolution
+      ? [jsenvPluginNodeEsmResolution(nodeEsmResolution)]
+      : []),
+    jsenvPluginWebResolution(webResolution),
+
+    jsenvPluginVersionSearchParam(),
     jsenvPluginCommonJsGlobals(),
     jsenvPluginImportMetaScenarios(),
     ...(scenarioPlaceholders ? [jsenvPluginGlobalScenarios()] : []),
@@ -99,7 +96,6 @@ export const getCorePlugins = ({
         ]
       : []),
     ...(cacheControl ? [jsenvPluginCacheControl(cacheControl)] : []),
-    ...(explorer ? [jsenvPluginExplorer(explorer)] : []),
     ...(ribbon ? [jsenvPluginRibbon({ rootDirectoryUrl, ...ribbon })] : []),
   ];
 };

package/src/plugins/{url_analysis/css/css_urls.js → reference_analysis/css/jsenv_plugin_css_reference_analysis.js}

@@ -5,7 +5,17 @@
 import { parseCssUrls } from "@jsenv/ast";
 import { createMagicSource } from "@jsenv/sourcemap";
 
-export const parseAndTransformCssUrls = async (urlInfo, context) => {
+export const jsenvPluginCssReferenceAnalysis = () => {
+  return {
+    name: "jsenv:css_reference_analysis",
+    appliesDuring: "*",
+    transformUrlContent: {
+      css: parseAndTransformCssUrls,
+    },
+  };
+};
+
+const parseAndTransformCssUrls = async (urlInfo, context) => {
   const cssUrls = await parseCssUrls({
     css: urlInfo.content,
     url: urlInfo.originalUrl,

package/src/plugins/{inline_content_analysis/jsenv_plugin_data_urls.js → reference_analysis/data_urls/jsenv_plugin_data_urls_analysis.js}

@@ -1,32 +1,17 @@
 import { DATA_URL } from "@jsenv/urls";
 import { CONTENT_TYPE } from "@jsenv/utils/src/content_type/content_type.js";
 
-export const jsenvPluginDataUrls = () => {
+export const jsenvPluginDataUrlsAnalysis = () => {
   return {
-    name: "jsenv:data_urls",
+    name: "jsenv:data_urls_analysis",
     appliesDuring: "*",
-    resolveUrl: (reference) => {
+    resolveReference: (reference) => {
       if (!reference.specifier.startsWith("data:")) {
         return null;
       }
       return reference.specifier;
     },
-    fetchUrlContent: (urlInfo) => {
-      if (!urlInfo.url.startsWith("data:")) {
-        return null;
-      }
-      const {
-        contentType,
-        base64Flag,
-        data: urlData,
-      } = DATA_URL.parse(urlInfo.url);
-      urlInfo.data.base64Flag = base64Flag;
-      return {
-        content: contentFromUrlData({ contentType, base64Flag, urlData }),
-        contentType,
-      };
-    },
-    formatUrl: (reference, context) => {
+    formatReference: (reference, context) => {
       if (!reference.generatedUrl.startsWith("data:")) {
         return null;
       }
@@ -49,6 +34,21 @@ export const jsenvPluginDataUrls = () => {
         return specifier;
       })();
     },
+    fetchUrlContent: (urlInfo) => {
+      if (!urlInfo.url.startsWith("data:")) {
+        return null;
+      }
+      const {
+        contentType,
+        base64Flag,
+        data: urlData,
+      } = DATA_URL.parse(urlInfo.url);
+      urlInfo.data.base64Flag = base64Flag;
+      return {
+        content: contentFromUrlData({ contentType, base64Flag, urlData }),
+        contentType,
+      };
+    },
   };
 };
 

package/src/plugins/reference_analysis/directory/jsenv_plugin_directory_reference_analysis.js

@@ -0,0 +1,51 @@
+import { urlToRelativeUrl } from "@jsenv/urls";
+
+export const jsenvPluginDirectoryReferenceAnalysis = () => {
+  return {
+    name: "jsenv:directory_reference_analysis",
+    transformUrlContent: {
+      directory: (urlInfo, context) => {
+        const originalDirectoryReference = findOriginalDirectoryReference(
+          urlInfo,
+          context,
+        );
+        const directoryRelativeUrl = urlToRelativeUrl(
+          urlInfo.url,
+          context.rootDirectoryUrl,
+        );
+        JSON.parse(urlInfo.content).forEach((directoryEntryName) => {
+          context.referenceUtils.found({
+            type: "filesystem",
+            subtype: "directory_entry",
+            specifier: directoryEntryName,
+            trace: {
+              message: `"${directoryRelativeUrl}${directoryEntryName}" entry in directory referenced by ${originalDirectoryReference.trace.message}`,
+            },
+          });
+        });
+      },
+    },
+  };
+};
+
+const findOriginalDirectoryReference = (urlInfo, context) => {
+  const findNonFileSystemAncestor = (urlInfo) => {
+    for (const dependentUrl of urlInfo.dependents) {
+      const dependentUrlInfo = context.urlGraph.getUrlInfo(dependentUrl);
+      if (dependentUrlInfo.type !== "directory") {
+        return [dependentUrlInfo, urlInfo];
+      }
+      const found = findNonFileSystemAncestor(dependentUrlInfo);
+      if (found) {
+        return found;
+      }
+    }
+    return [];
+  };
+  const [ancestor, child] = findNonFileSystemAncestor(urlInfo);
+  if (!ancestor) {
+    return null;
+  }
+  const ref = ancestor.references.find((ref) => ref.url === child.url);
+  return ref;
+};