@jsenv/core 40.6.0 → 40.6.1

package/src/build/build.js

@@ -1144,7 +1144,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,

package/src/dev/start_dev_server.js

@@ -4,7 +4,7 @@ import {
   lookupPackageDirectory,
   readPackageAtOrNull,
 } from "@jsenv/filesystem";
-import { createLogger, createTaskLog } from "@jsenv/humanize";
+import { createLogger, createTaskLog, formatError } from "@jsenv/humanize";
 import {
   composeTwoResponses,
   jsenvAccessControlAllowedHeaders,
@@ -605,7 +605,7 @@ export const startDevServer = async ({
                 url: reference.url,
                 status: 500,
                 statusText: error.reason,
-                statusMessage: error.stack,
+                statusMessage: formatError(error),
                 headers: {
                   "cache-control": "no-store",
                 },

package/src/kitchen/errors.js

@@ -53,6 +53,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),
@@ -93,7 +99,6 @@ ${reason}`,
     });
     return fetchError;
   };
-
   if (error.code === "EPERM") {
     return createFailedToFetchUrlContentError({
       code: "NOT_ALLOWED",
@@ -140,6 +145,9 @@ export 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;
   }
@@ -147,47 +155,8 @@ export 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}"
@@ -278,9 +247,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 {
@@ -289,6 +304,9 @@ const detailsFromFirstReference = (reference) => {
 };
 const getFirstReferenceInProject = (reference) => {
   const ownerUrlInfo = reference.ownerUrlInfo;
+  if (ownerUrlInfo.isRoot) {
+    return reference;
+  }
   if (
     !ownerUrlInfo.url.includes("/node_modules/") &&
     ownerUrlInfo.packageDirectoryUrl ===
@@ -296,7 +314,8 @@ const getFirstReferenceInProject = (reference) => {
   ) {
     return reference;
   }
-  return getFirstReferenceInProject(ownerUrlInfo.firstReference);
+  const { firstReference } = ownerUrlInfo;
+  return getFirstReferenceInProject(firstReference);
 };
 
 const detailsFromPluginController = (pluginController) => {

package/src/kitchen/kitchen.js

@@ -37,7 +37,28 @@ export 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
@@ -57,6 +78,9 @@ export 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";
@@ -128,8 +152,11 @@ export 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) {
@@ -336,6 +363,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({

package/src/plugins/protocol_file/jsenv_plugin_protocol_file.js

@@ -88,6 +88,9 @@ export 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) {