@jsenv/core 36.0.1 → 36.1.0

package/src/plugins/{file_urls/jsenv_plugin_file_urls.js → protocol_file/jsenv_plugin_protocol_file.js}

@@ -12,7 +12,7 @@ import {
 } from "@jsenv/node-esm-resolution";
 import { CONTENT_TYPE } from "@jsenv/utils/src/content_type/content_type.js";
 
-export const jsenvPluginFileUrls = ({
+export const jsenvPluginProtocolFile = ({
   magicExtensions = ["inherit", ".js"],
   magicDirectoryIndex = true,
   preserveSymlinks = false,
@@ -20,7 +20,7 @@ export const jsenvPluginFileUrls = ({
 }) => {
   return [
     {
-      name: "jsenv:file_url_resolution",
+      name: "jsenv:fs_redirection",
       appliesDuring: "*",
       redirectReference: (reference) => {
         // http, https, data, about, ...
@@ -30,6 +30,23 @@ export const jsenvPluginFileUrls = ({
         if (reference.isInline) {
           return null;
         }
+        // ignore root file url
+        if (reference.url === "file:///" || reference.url === "file://") {
+          reference.leadsToADirectory = true;
+          return `ignore:file:///`;
+        }
+        // ignore "./" on new URL("./")
+        if (
+          reference.subtype === "new_url_first_arg" &&
+          reference.specifier === "./"
+        ) {
+          return `ignore:${reference.url}`;
+        }
+        // ignore all new URL second arg
+        if (reference.subtype === "new_url_second_arg") {
+          return `ignore:${reference.url}`;
+        }
+
         const urlObject = new URL(reference.url);
         let stat;
         try {
@@ -41,11 +58,13 @@ export const jsenvPluginFileUrls = ({
             throw e;
           }
         }
+
         const { search, hash } = urlObject;
         let { pathname } = urlObject;
         const pathnameUsesTrailingSlash = pathname.endsWith("/");
         urlObject.search = "";
         urlObject.hash = "";
+
         // force trailing slash on directories
         if (stat && stat.isDirectory() && !pathnameUsesTrailingSlash) {
           urlObject.pathname = `${pathname}/`;
@@ -57,46 +76,32 @@ export const jsenvPluginFileUrls = ({
         }
 
         let url = urlObject.href;
-        const shouldPreserve =
-          stat &&
-          stat.isDirectory() &&
-          // ignore new URL second arg
-          (reference.subtype === "new_url_second_arg" ||
-            // ignore root file url
-            reference.url === "file:///" ||
-            (reference.subtype === "new_url_first_arg" &&
-              reference.specifier === "./"));
-
-        if (shouldPreserve) {
-          reference.shouldHandle = false;
-        } else {
-          const shouldApplyDilesystemMagicResolution =
-            reference.type === "js_import";
-          if (shouldApplyDilesystemMagicResolution) {
-            const filesystemResolution = applyFileSystemMagicResolution(url, {
-              fileStat: stat,
-              magicDirectoryIndex,
-              magicExtensions: getExtensionsToTry(
-                magicExtensions,
-                reference.parentUrl,
-              ),
-            });
-            if (filesystemResolution.stat) {
-              stat = filesystemResolution.stat;
-              url = filesystemResolution.url;
-            }
+        const shouldApplyDilesystemMagicResolution =
+          reference.type === "js_import";
+        if (shouldApplyDilesystemMagicResolution) {
+          const filesystemResolution = applyFileSystemMagicResolution(url, {
+            fileStat: stat,
+            magicDirectoryIndex,
+            magicExtensions: getExtensionsToTry(
+              magicExtensions,
+              reference.parentUrl,
+            ),
+          });
+          if (filesystemResolution.stat) {
+            stat = filesystemResolution.stat;
+            url = filesystemResolution.url;
           }
-          if (stat && stat.isDirectory()) {
-            const directoryAllowed =
-              reference.type === "filesystem" ||
-              (typeof directoryReferenceAllowed === "function" &&
-                directoryReferenceAllowed(reference)) ||
-              directoryReferenceAllowed;
-            if (!directoryAllowed) {
-              const error = new Error("Reference leads to a directory");
-              error.code = "DIRECTORY_REFERENCE_NOT_ALLOWED";
-              throw error;
-            }
+        }
+        if (stat && stat.isDirectory()) {
+          const directoryAllowed =
+            reference.type === "filesystem" ||
+            (typeof directoryReferenceAllowed === "function" &&
+              directoryReferenceAllowed(reference)) ||
+            directoryReferenceAllowed;
+          if (!directoryAllowed) {
+            const error = new Error("Reference leads to a directory");
+            error.code = "DIRECTORY_REFERENCE_NOT_ALLOWED";
+            throw error;
           }
         }
         reference.leadsToADirectory = stat && stat.isDirectory();
@@ -109,7 +114,7 @@ export const jsenvPluginFileUrls = ({
       },
     },
     {
-      name: "jsenv:filesystem_resolution",
+      name: "jsenv:fs_resolution",
       appliesDuring: "*",
       resolveReference: {
         filesystem: (reference, context) => {
@@ -124,10 +129,10 @@ export const jsenvPluginFileUrls = ({
       },
     },
     {
-      name: "jsenv:@fs_resolution",
-      // during dev and test it's a browser running the code
+      name: "jsenv:@fs",
+      // during build it's fine to use "file://"" urls
+      // but during dev it's a browser running the code
       // so absolute file urls needs to be relativized
-      // during build it's fine to use file:// urls
       appliesDuring: "dev",
       resolveReference: (reference) => {
         if (reference.specifier.startsWith("/@fs/")) {

package/src/plugins/{http_urls/jsenv_plugin_http_urls.js → protocol_http/jsenv_plugin_protocol_http.js}

@@ -1,16 +1,17 @@
-export const jsenvPluginHttpUrls = () => {
+export const jsenvPluginProtocolHttp = () => {
   return {
-    name: "jsenv:http_urls",
+    name: "jsenv:protocol_http",
     appliesDuring: "*",
     redirectReference: (reference) => {
+      // TODO: according to some pattern matching jsenv could be allowed
+      // to fetch and transform http urls
       if (
         reference.url.startsWith("http:") ||
         reference.url.startsWith("https:")
       ) {
-        reference.shouldHandle = false;
+        return `ignore:${reference.url}`;
       }
-      // TODO: according to some pattern matching jsenv could be allowed
-      // to fetch and transform http urls
+      return null;
     },
   };
 };

package/src/plugins/reference_analysis/jsenv_plugin_reference_analysis.js

@@ -1,5 +1,3 @@
-import { URL_META } from "@jsenv/url-meta";
-
 import { jsenvPluginReferenceExpectedTypes } from "./jsenv_plugin_reference_expected_types.js";
 import { jsenvPluginDirectoryReferenceAnalysis } from "./directory/jsenv_plugin_directory_reference_analysis.js";
 import { jsenvPluginDataUrlsAnalysis } from "./data_urls/jsenv_plugin_data_urls_analysis.js";
@@ -9,19 +7,12 @@ import { jsenvPluginCssReferenceAnalysis } from "./css/jsenv_plugin_css_referenc
 import { jsenvPluginJsReferenceAnalysis } from "./js/jsenv_plugin_js_reference_analysis.js";
 
 export const jsenvPluginReferenceAnalysis = ({
-  include,
-  supportedProtocols = ["file:", "data:", "virtual:", "http:", "https:"],
-
   inlineContent = true,
   inlineConvertedScript = false,
   fetchInlineUrls = true,
   allowEscapeForVersioning = false,
 }) => {
   return [
-    jsenvPluginReferenceAnalysisInclude({
-      include,
-      supportedProtocols,
-    }),
     jsenvPluginDirectoryReferenceAnalysis(),
     jsenvPluginHtmlReferenceAnalysis({
       inlineContent,
@@ -41,66 +32,6 @@ export const jsenvPluginReferenceAnalysis = ({
   ];
 };
 
-const jsenvPluginReferenceAnalysisInclude = ({
-  include,
-  supportedProtocols,
-}) => {
-  // eslint-disable-next-line no-unused-vars
-  let getIncludeInfo = (url) => undefined;
-
-  return {
-    name: "jsenv:reference_analysis_include",
-    appliesDuring: "*",
-    init: ({ rootDirectoryUrl }) => {
-      if (include) {
-        const associations = URL_META.resolveAssociations(
-          { include },
-          rootDirectoryUrl,
-        );
-        getIncludeInfo = (url) => {
-          const { include } = URL_META.applyAssociations({
-            url,
-            associations,
-          });
-          return include;
-        };
-      }
-    },
-    redirectReference: (reference) => {
-      if (reference.shouldHandle !== undefined) {
-        return;
-      }
-      if (
-        reference.specifier[0] === "#" &&
-        // For Html, css and in general "#" refer to a resource in the page
-        // so that urls must be kept intact
-        // However for js import specifiers they have a different meaning and we want
-        // to resolve them (https://nodejs.org/api/packages.html#imports for instance)
-        reference.type !== "js_import"
-      ) {
-        reference.shouldHandle = false;
-        return;
-      }
-      const includeInfo = getIncludeInfo(reference.url);
-      if (includeInfo === true) {
-        reference.shouldHandle = true;
-        return;
-      }
-      if (includeInfo === false) {
-        reference.shouldHandle = false;
-        return;
-      }
-      const { protocol } = new URL(reference.url);
-      const protocolIsSupported = supportedProtocols.some(
-        (supportedProtocol) => protocol === supportedProtocol,
-      );
-      if (protocolIsSupported) {
-        reference.shouldHandle = true;
-      }
-    },
-  };
-};
-
 const jsenvPluginInlineContentFetcher = () => {
   return {
     name: "jsenv:inline_content_fetcher",

package/src/plugins/resolution_node_esm/jsenv_plugin_node_esm_resolution.js

@@ -1,4 +1,4 @@
-import { urlTypeFromReference } from "../url_type_from_reference.js";
+import { urlTypeFromReference } from "./url_type_from_reference.js";
 import { createNodeEsmResolver } from "./node_esm_resolver.js";
 
 export const jsenvPluginNodeEsmResolution = (resolutionConfig = {}) => {
@@ -41,10 +41,10 @@ export const jsenvPluginNodeEsmResolution = (resolutionConfig = {}) => {
         runtimeCompat,
         preservesSymlink: true,
       });
-      if (!resolvers.js_module) {
+      if (resolvers.js_module === undefined) {
         resolvers.js_module = nodeEsmResolverDefault;
       }
-      if (!resolvers.js_classic) {
+      if (resolvers.js_classic === undefined) {
         resolvers.js_classic = (reference, context) => {
           if (reference.subtype === "self_import_scripts_arg") {
             return nodeEsmResolverDefault(reference, context);

package/src/plugins/resolution_web/jsenv_plugin_web_resolution.js

@@ -1,45 +1,22 @@
-import { urlTypeFromReference } from "../url_type_from_reference.js";
-
-export const jsenvPluginWebResolution = (resolutionConfig = {}) => {
-  const resolvers = {};
-  const resolveUsingWebResolution = (reference, context) => {
-    if (reference.specifier === "/") {
-      const { mainFilePath, rootDirectoryUrl } = context;
-      return String(new URL(mainFilePath, rootDirectoryUrl));
-    }
-    if (reference.specifier[0] === "/") {
-      return new URL(reference.specifier.slice(1), context.rootDirectoryUrl)
-        .href;
-    }
-    return new URL(
-      reference.specifier,
-      // baseUrl happens second argument to new URL() is different from
-      // import.meta.url or document.currentScript.src
-      reference.baseUrl || reference.parentUrl,
-    ).href;
-  };
-  Object.keys(resolutionConfig).forEach((urlType) => {
-    const config = resolutionConfig[urlType];
-    if (config === true) {
-      resolvers[urlType] = resolveUsingWebResolution;
-    } else if (config === false) {
-      resolvers[urlType] = () => null;
-    } else {
-      throw new TypeError(
-        `config must be true or false, got ${config} on "${urlType}"`,
-      );
-    }
-  });
-
+export const jsenvPluginWebResolution = () => {
   return {
     name: "jsenv:web_resolution",
     appliesDuring: "*",
     resolveReference: (reference, context) => {
-      const urlType = urlTypeFromReference(reference, context);
-      const resolver = resolvers[urlType];
-      return resolver
-        ? resolver(reference, context)
-        : resolveUsingWebResolution(reference, context);
+      if (reference.specifier === "/") {
+        const { mainFilePath, rootDirectoryUrl } = context;
+        return String(new URL(mainFilePath, rootDirectoryUrl));
+      }
+      if (reference.specifier[0] === "/") {
+        return new URL(reference.specifier.slice(1), context.rootDirectoryUrl)
+          .href;
+      }
+      return new URL(
+        reference.specifier,
+        // baseUrl happens second argument to new URL() is different from
+        // import.meta.url or document.currentScript.src
+        reference.baseUrl || reference.parentUrl,
+      ).href;
     },
   };
 };

package/src/plugins/ribbon/client/ribbon.js

@@ -47,5 +47,14 @@ export const injectRibbon = ({ text }) => {
 
   const node = document.createElement("div");
   node.innerHTML = html;
+
+  const toolbarStateInLocalStorage = localStorage.hasOwnProperty(
+    "jsenv_toolbar",
+  )
+    ? JSON.parse(localStorage.getItem("jsenv_toolbar"))
+    : {};
+  if (toolbarStateInLocalStorage.ribbonDisplayed === false) {
+    node.querySelector("#jsenv_ribbon_container").style.display = "none";
+  }
   document.body.appendChild(node.firstChild);
 };