@jsenv/core 40.5.3 → 40.6.1

package/dist/build/build.js

@@ -183,6 +183,12 @@ ${reason}`,
     });
     return error;
   }
+  if (error.code === "PROTOCOL_NOT_SUPPORTED") {
+    const notSupportedError = createFailedToResolveUrlError({
+      reason: error.message,
+    });
+    return notSupportedError;
+  }
   return createFailedToResolveUrlError({
     reason: `An error occured during specifier resolution`,
     ...detailsFromValueThrown(error),
@@ -223,7 +229,6 @@ ${reason}`,
     });
     return fetchError;
   };
-
   if (error.code === "EPERM") {
     return createFailedToFetchUrlContentError({
       code: "NOT_ALLOWED",
@@ -270,6 +275,9 @@ const createTransformUrlContentError = ({
   if (error.code === "MODULE_NOT_FOUND") {
     return error;
   }
+  if (error.code === "PROTOCOL_NOT_SUPPORTED") {
+    return error;
+  }
   if (error.code === "DIRECTORY_REFERENCE_NOT_ALLOWED") {
     return error;
   }
@@ -277,47 +285,8 @@ const createTransformUrlContentError = ({
     if (error.isJsenvCookingError) {
       return error;
     }
+    const trace = getErrorTrace(error, urlInfo.firstReference);
     const reference = urlInfo.firstReference;
-    let trace = reference.trace;
-    let line = error.line;
-    let column = error.column;
-    if (urlInfo.isInline) {
-      line = trace.line + line;
-      line = line - 1;
-      trace = {
-        ...trace,
-        line,
-        column,
-        codeFrame: generateContentFrame({
-          line,
-          column,
-          content: urlInfo.inlineUrlSite.content,
-        }),
-        message: stringifyUrlSite({
-          url: urlInfo.inlineUrlSite.url,
-          line,
-          column,
-          content: urlInfo.inlineUrlSite.content,
-        }),
-      };
-    } else {
-      trace = {
-        url: urlInfo.url,
-        line,
-        column: error.column,
-        codeFrame: generateContentFrame({
-          line,
-          column: error.column,
-          content: urlInfo.content,
-        }),
-        message: stringifyUrlSite({
-          url: urlInfo.url,
-          line,
-          column: error.column,
-          content: urlInfo.content,
-        }),
-      };
-    }
     const transformError = new Error(
       createDetailedMessage(
         `parse error on "${urlInfo.type}"
@@ -408,9 +377,55 @@ ${reference.trace.message}`,
   return finalizeError;
 };
 
+const getErrorTrace = (error, reference) => {
+  const urlInfo = reference.urlInfo;
+  let trace = reference.trace;
+  let line = error.line;
+  let column = error.column;
+  if (urlInfo.isInline) {
+    line = trace.line + line;
+    line = line - 1;
+    return {
+      ...trace,
+      line,
+      column,
+      codeFrame: generateContentFrame({
+        line,
+        column,
+        content: urlInfo.inlineUrlSite.content,
+      }),
+      message: stringifyUrlSite({
+        url: urlInfo.inlineUrlSite.url,
+        line,
+        column,
+        content: urlInfo.inlineUrlSite.content,
+      }),
+    };
+  }
+  return {
+    url: urlInfo.url,
+    line,
+    column: error.column,
+    codeFrame: generateContentFrame({
+      line,
+      column: error.column,
+      content: urlInfo.content,
+    }),
+    message: stringifyUrlSite({
+      url: urlInfo.url,
+      line,
+      column: error.column,
+      content: urlInfo.content,
+    }),
+  };
+};
+
 const detailsFromFirstReference = (reference) => {
   const referenceInProject = getFirstReferenceInProject(reference);
-  if (referenceInProject === reference) {
+  if (
+    referenceInProject === reference ||
+    referenceInProject.type === "http_request"
+  ) {
     return {};
   }
   return {
@@ -419,6 +434,9 @@ const detailsFromFirstReference = (reference) => {
 };
 const getFirstReferenceInProject = (reference) => {
   const ownerUrlInfo = reference.ownerUrlInfo;
+  if (ownerUrlInfo.isRoot) {
+    return reference;
+  }
   if (
     !ownerUrlInfo.url.includes("/node_modules/") &&
     ownerUrlInfo.packageDirectoryUrl ===
@@ -426,7 +444,8 @@ const getFirstReferenceInProject = (reference) => {
   ) {
     return reference;
   }
-  return getFirstReferenceInProject(ownerUrlInfo.firstReference);
+  const { firstReference } = ownerUrlInfo;
+  return getFirstReferenceInProject(firstReference);
 };
 
 const detailsFromPluginController = (pluginController) => {
@@ -2668,7 +2687,28 @@ const createKitchen = ({
 
   ignore,
   ignoreProtocol = "remove",
-  supportedProtocols = ["file:", "data:", "virtual:", "http:", "https:"],
+  supportedProtocols = [
+    "file:",
+    "data:",
+    // eslint-disable-next-line no-script-url
+    "javascript:",
+    "virtual:",
+    "ignore:",
+    "http:",
+    "https:",
+    "chrome:",
+    "chrome-extension:",
+    "chrome-untrusted:",
+    "isolated-app:",
+  ],
+  includedProtocols = [
+    "file:",
+    "data:",
+    "virtual:",
+    "ignore:",
+    "http:",
+    "https:",
+  ],
 
   // during dev/test clientRuntimeCompat is a single runtime
   // during build clientRuntimeCompat is runtimeCompat
@@ -2688,6 +2728,9 @@ const createKitchen = ({
 
   const nodeRuntimeEnabled = Object.keys(runtimeCompat).includes("node");
   const packageConditions = [nodeRuntimeEnabled ? "node" : "browser", "import"];
+  if (nodeRuntimeEnabled) {
+    supportedProtocols.push("node:");
+  }
 
   if (packageDependencies === "auto") {
     packageDependencies = build && nodeRuntimeEnabled ? "ignore" : "include";
@@ -2759,8 +2802,11 @@ const createKitchen = ({
 
   const isIgnoredByProtocol = (url) => {
     const { protocol } = new URL(url);
-    const protocolIsSupported = supportedProtocols.includes(protocol);
-    return !protocolIsSupported;
+    const protocolIsIncluded = includedProtocols.includes(protocol);
+    if (protocolIsIncluded) {
+      return false;
+    }
+    return true;
   };
   const isIgnoredBecauseInPackageDependencies = (() => {
     if (packageDependencies === undefined) {
@@ -2967,6 +3013,21 @@ ${ANSI.color(normalizedReturnValue, ANSI.YELLOW)}
       }
       reference.generatedUrl = reference.url;
       reference.generatedSearchParams = reference.searchParams;
+      if (dev) {
+        let url = reference.url;
+        let { protocol } = new URL(url);
+        if (protocol === "ignore:") {
+          url = url.slice("ignore:".length);
+          protocol = new URL(url, "http://example.com").protocol;
+        }
+        if (!supportedProtocols.includes(protocol)) {
+          const protocolNotSupportedError = new Error(
+            `Unsupported protocol "${protocol}" for url "${url}"`,
+          );
+          protocolNotSupportedError.code = "PROTOCOL_NOT_SUPPORTED";
+          throw protocolNotSupportedError;
+        }
+      }
       return reference;
     } catch (error) {
       throw createResolveUrlError({
@@ -5594,13 +5655,32 @@ const createNodeEsmResolver = ({
       return null; // let it to jsenv_web_resolution
     }
     const { specifier } = reference;
-    const conditions = buildPackageConditions(specifier, parentUrl);
-    const { url, type, isMain, packageDirectoryUrl } = applyNodeEsmResolution({
+    // specifiers like "#something" have a special meaning for Node.js
+    // but can also be used in .css and .html files for example and should not be modified
+    // by node esm resolution
+    const webResolutionFallback =
+      ownerUrlInfo.type !== "js_module" ||
+      reference.type === "sourcemap_comment";
+    const conditions = buildPackageConditions(specifier, parentUrl, {
+      webResolutionFallback,
+    });
+    let resolution;
+    const nodeEsmResolutionParams = {
       conditions,
       parentUrl,
       specifier,
       preservesSymlink,
-    });
+    };
+    if (webResolutionFallback) {
+      try {
+        resolution = applyNodeEsmResolution(nodeEsmResolutionParams);
+      } catch {
+        return null; // delegate to web_resolution plugin
+      }
+    } else {
+      resolution = applyNodeEsmResolution(nodeEsmResolutionParams);
+    }
+    const { url, type, isMain, packageDirectoryUrl } = resolution;
     // try to give a more meaningful filename after build
     if (isMain && packageDirectoryUrl) {
       const basename = urlToBasename(url);
@@ -5669,12 +5749,26 @@ const createBuildPackageConditions = (
   const nodeRuntimeEnabled = Object.keys(runtimeCompat).includes("node");
   // https://nodejs.org/api/esm.html#resolver-algorithm-specification
   const processArgConditions = readCustomConditionsFromProcessArgs();
-  const devResolver = (specifier, importer) => {
+  const devResolver = (specifier, importer, { webResolutionFallback }) => {
     if (isBareSpecifier$1(specifier)) {
-      const { url } = applyNodeEsmResolution({
-        specifier,
-        parentUrl: importer,
-      });
+      let url;
+      if (webResolutionFallback) {
+        try {
+          const resolution = applyNodeEsmResolution({
+            specifier,
+            parentUrl: importer,
+          });
+          url = resolution.url;
+        } catch {
+          url = new URL(specifier, importer).href;
+        }
+      } else {
+        const resolution = applyNodeEsmResolution({
+          specifier,
+          parentUrl: importer,
+        });
+        url = resolution.url;
+      }
       return !url.includes("/node_modules/");
     }
     return !importer.includes("/node_modules/");
@@ -5778,12 +5872,12 @@ const createBuildPackageConditions = (
   }
 
   const conditionCandidateArray = Object.keys(conditionResolvers);
-  return (specifier, importer) => {
+  return (specifier, importer, params) => {
     const conditions = [];
     for (const conditionCandidate of conditionCandidateArray) {
       const conditionResolver = conditionResolvers[conditionCandidate];
       if (typeof conditionResolver === "function") {
-        if (conditionResolver(specifier, importer)) {
+        if (conditionResolver(specifier, importer, params)) {
           conditions.push(conditionCandidate);
         }
       } else if (conditionResolver) {
@@ -5907,8 +6001,7 @@ const jsenvPluginNodeEsmResolution = (
         if (config === true) {
           resolver = nodeEsmResolverDefault;
         } else if (config === false) {
-          // resolverMap.set(urlType, () => null);
-          continue;
+          resolver = null;
         } else if (typeof config === "object") {
           resolver = resolverFromObject(config, { kitchenContext, urlType });
         } else {
@@ -5923,6 +6016,9 @@ const jsenvPluginNodeEsmResolution = (
           resolverMap.set(urlType, resolver);
         }
       }
+      if (!anyTypeResolver) {
+        anyTypeResolver = nodeEsmResolverDefault;
+      }
 
       if (!resolverMap.has("js_module")) {
         resolverMap.set("js_module", nodeEsmResolverDefault);
@@ -5948,8 +6044,11 @@ const jsenvPluginNodeEsmResolution = (
       }
       const urlType = urlTypeFromReference(reference);
       const resolver = resolverMap.get(urlType);
-      if (resolver) {
-        return resolver(reference);
+      if (resolver !== undefined) {
+        if (typeof resolver === "function") {
+          return resolver(reference);
+        }
+        return resolver;
       }
       if (anyTypeResolver) {
         return anyTypeResolver(reference);
@@ -6805,6 +6904,9 @@ const jsenvPluginProtocolFile = ({
       name: "jsenv:directory_as_json",
       appliesDuring: "*",
       fetchUrlContent: (urlInfo) => {
+        if (!urlInfo.url.startsWith("file:")) {
+          return null;
+        }
         const { firstReference } = urlInfo;
         let { fsStat } = firstReference;
         if (!fsStat) {
@@ -11744,7 +11846,7 @@ const prepareEntryPointBuild = async (
         // - no plugin putting reference.mustIgnore on https urls
         // At this stage it's only about redirecting urls to the build directory
         // consequently only a subset or urls are supported
-        supportedProtocols: ["file:", "data:", "virtual:", "ignore:"],
+        includedProtocols: ["file:", "data:", "virtual:", "ignore:"],
         ignore,
         ignoreProtocol: "remove",
         build: true,