@jsenv/core 39.5.22 → 39.5.24

package/dist/jsenv_core.js

@@ -10875,7 +10875,7 @@ const jsenvPluginImportAttributes = ({
         const originalUrlInfo = urlInfo.getWithoutSearchParam(
           `as_${type}_module`,
           {
-            expectedType: "json",
+            expectedType: type,
           },
         );
         if (!originalUrlInfo) {
@@ -11172,6 +11172,10 @@ const generateHtmlForSyntaxError = (
   const htmlForSyntaxError = String(readFileSync(htmlSyntaxErrorFileUrl));
   const htmlRelativeUrl = urlToRelativeUrl(htmlUrl, rootDirectoryUrl);
   const { line, column } = htmlSyntaxError;
+  if (htmlUrl.startsWith(jsenvCoreDirectoryUrl.href)) {
+    htmlUrl = urlToRelativeUrl(htmlUrl, jsenvCoreDirectoryUrl);
+    htmlUrl = `@jsenv/core/${htmlUrl}`;
+  }
   const urlWithLineAndColumn = `${htmlUrl}:${line}:${column}`;
   const replacers = {
     fileRelativeUrl: htmlRelativeUrl,
@@ -11530,7 +11534,9 @@ const assertAndNormalizeReturnValue = (hook, returnValue, info) => {
     if (!returnValueAssertion.appliesTo.includes(hook.name)) {
       continue;
     }
-    const assertionResult = returnValueAssertion.assertion(returnValue, info);
+    const assertionResult = returnValueAssertion.assertion(returnValue, info, {
+      hook,
+    });
     if (assertionResult !== undefined) {
       // normalization
       returnValue = assertionResult;
@@ -11544,7 +11550,7 @@ const returnValueAssertions = [
   {
     name: "url_assertion",
     appliesTo: ["resolveReference", "redirectReference"],
-    assertion: (valueReturned) => {
+    assertion: (valueReturned, urlInfo, { hook }) => {
       if (valueReturned instanceof URL) {
         return valueReturned.href;
       }
@@ -11552,7 +11558,7 @@ const returnValueAssertions = [
         return undefined;
       }
       throw new Error(
-        `Unexpected value returned by plugin: it must be a string; got ${valueReturned}`,
+        `Unexpected value returned by "${hook.plugin.name}" plugin: it must be a string; got ${valueReturned}`,
       );
     },
   },
@@ -11564,7 +11570,7 @@ const returnValueAssertions = [
       "finalizeUrlContent",
       "optimizeUrlContent",
     ],
-    assertion: (valueReturned, urlInfo) => {
+    assertion: (valueReturned, urlInfo, { hook }) => {
       if (typeof valueReturned === "string" || Buffer.isBuffer(valueReturned)) {
         return { content: valueReturned };
       }
@@ -11575,13 +11581,13 @@ const returnValueAssertions = [
         }
         if (typeof content !== "string" && !Buffer.isBuffer(content) && !body) {
           throw new Error(
-            `Unexpected "content" returned by plugin: it must be a string or a buffer; got ${content}`,
+            `Unexpected "content" returned by "${hook.plugin.name}" ${hook.name} hook: it must be a string or a buffer; got ${content}`,
           );
         }
         return undefined;
       }
       throw new Error(
-        `Unexpected value returned by plugin: it must be a string, a buffer or an object; got ${valueReturned}`,
+        `Unexpected value returned by "${hook.plugin.name}" ${hook.name} hook: it must be a string, a buffer or an object; got ${valueReturned}`,
       );
     },
   },
@@ -12044,17 +12050,18 @@ const isResponseEligibleForIntegrityValidation = (response) => {
 };
 
 const assertFetchedContentCompliance = ({ urlInfo, content }) => {
+  if (urlInfo.status === 404) {
+    return;
+  }
   const { expectedContentType } = urlInfo.firstReference;
   if (expectedContentType && urlInfo.contentType !== expectedContentType) {
     throw new Error(
-      `Unexpected content-type on url: "${expectedContentType}" was expect but got "${urlInfo.contentType}`,
+      `content-type must be "${expectedContentType}", got "${urlInfo.contentType}`,
     );
   }
   const { expectedType } = urlInfo.firstReference;
   if (expectedType && urlInfo.type !== expectedType) {
-    throw new Error(
-      `Unexpected type on url: "${expectedType}" was expect but got "${urlInfo.type}"`,
-    );
+    throw new Error(`type must be "${expectedType}", got "${urlInfo.type}"`);
   }
   const { integrity } = urlInfo.firstReference;
   if (integrity) {
@@ -13431,6 +13438,7 @@ const createUrlInfo = (url, context) => {
     jsQuote: null, // maybe move to inlineUrlSite?
 
     timing: {},
+    status: 200,
     headers: {},
     debug: false,
   };
@@ -14498,21 +14506,16 @@ ${ANSI.color(normalizedReturnValue, ANSI.YELLOW)}
         body,
         isEntryPoint,
       } = fetchUrlContentReturnValue;
-      if (status !== 200) {
-        throw new Error(`unexpected status, ${status}`);
-      }
       if (content === undefined) {
         content = body;
       }
       if (contentType === undefined) {
         contentType = headers["content-type"] || "application/octet-stream";
       }
+      urlInfo.status = status;
       urlInfo.contentType = contentType;
       urlInfo.headers = headers;
-      urlInfo.type =
-        type ||
-        urlInfo.firstReference.expectedType ||
-        inferUrlInfoType(urlInfo);
+      urlInfo.type = type || inferUrlInfoType(urlInfo);
       urlInfo.subtype =
         subtype ||
         urlInfo.firstReference.expectedSubtype ||
@@ -14836,10 +14839,11 @@ const memoizeIsSupported = (runtimeCompat) => {
 
 const inferUrlInfoType = (urlInfo) => {
   const { type, typeHint } = urlInfo;
+  const { contentType } = urlInfo;
+  const { expectedType } = urlInfo.firstReference;
   if (type === "sourcemap" || typeHint === "sourcemap") {
     return "sourcemap";
   }
-  const { contentType } = urlInfo;
   if (contentType === "text/html") {
     return "html";
   }
@@ -14847,7 +14851,12 @@ const inferUrlInfoType = (urlInfo) => {
     return "css";
   }
   if (contentType === "text/javascript") {
-    if (urlInfo.typeHint === "js_classic") return "js_classic";
+    if (expectedType === "js_classic") {
+      return "js_classic";
+    }
+    if (typeHint === "js_classic") {
+      return "js_classic";
+    }
     return "js_module";
   }
   if (contentType === "application/importmap+json") {
@@ -14865,7 +14874,7 @@ const inferUrlInfoType = (urlInfo) => {
   if (CONTENT_TYPE.isTextual(contentType)) {
     return "text";
   }
-  return "other";
+  return expectedType || "other";
 };
 
 const createUrlGraphSummary = (
@@ -18850,10 +18859,13 @@ const jsenvPluginProtocolFile = ({
           };
         }
         const contentType = CONTENT_TYPE.fromUrlExtension(urlInfo.url);
-        if (contentType === "text/html") {
+        const request = urlInfo.context.request;
+        if (request && request.headers["sec-fetch-dest"] === "document") {
           try {
             const fileBuffer = readFileSync(urlObject);
-            const content = String(fileBuffer);
+            const content = CONTENT_TYPE.isTextual(contentType)
+              ? String(fileBuffer)
+              : fileBuffer;
             return {
               content,
               contentType,
@@ -18870,7 +18882,7 @@ const jsenvPluginProtocolFile = ({
             const parentDirectoryContentArray = readdirSync(
               new URL(parentDirectoryUrl),
             );
-            const html = generateHtmlForENOENTOnHtmlFile(
+            const html = generateHtmlForENOENT(
               urlInfo.url,
               parentDirectoryContentArray,
               parentDirectoryUrl,
@@ -18878,6 +18890,7 @@ const jsenvPluginProtocolFile = ({
               directoryListingUrlMocks,
             );
             return {
+              status: 404,
               contentType: "text/html",
               content: html,
               headers: {
@@ -18923,7 +18936,7 @@ const generateHtmlForDirectory = (
   const html = replacePlaceholders$1(htmlForDirectory, replacers);
   return html;
 };
-const generateHtmlForENOENTOnHtmlFile = (
+const generateHtmlForENOENT = (
   url,
   parentDirectoryContentArray,
   parentDirectoryUrl,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "39.5.22",
+  "version": "39.5.24",
   "description": "Tool to develop, test and build js projects",
   "license": "MIT",
   "author": {
@@ -78,7 +78,7 @@
     "@jsenv/node-esm-resolution": "1.0.6",
     "@jsenv/plugin-bundling": "2.7.16",
     "@jsenv/plugin-minification": "1.5.10",
-    "@jsenv/plugin-supervisor": "1.5.27",
+    "@jsenv/plugin-supervisor": "1.5.28",
     "@jsenv/plugin-transpilation": "1.4.84",
     "@jsenv/runtime-compat": "1.3.1",
     "@jsenv/server": "15.3.3",

package/src/kitchen/fetched_content_compliance.js

@@ -1,17 +1,18 @@
 import { validateResponseIntegrity } from "@jsenv/integrity";
 
 export const assertFetchedContentCompliance = ({ urlInfo, content }) => {
+  if (urlInfo.status === 404) {
+    return;
+  }
   const { expectedContentType } = urlInfo.firstReference;
   if (expectedContentType && urlInfo.contentType !== expectedContentType) {
     throw new Error(
-      `Unexpected content-type on url: "${expectedContentType}" was expect but got "${urlInfo.contentType}`,
+      `content-type must be "${expectedContentType}", got "${urlInfo.contentType}`,
     );
   }
   const { expectedType } = urlInfo.firstReference;
   if (expectedType && urlInfo.type !== expectedType) {
-    throw new Error(
-      `Unexpected type on url: "${expectedType}" was expect but got "${urlInfo.type}"`,
-    );
+    throw new Error(`type must be "${expectedType}", got "${urlInfo.type}"`);
   }
   const { integrity } = urlInfo.firstReference;
   if (integrity) {

package/src/kitchen/kitchen.js

@@ -342,21 +342,16 @@ ${ANSI.color(normalizedReturnValue, ANSI.YELLOW)}
         body,
         isEntryPoint,
       } = fetchUrlContentReturnValue;
-      if (status !== 200) {
-        throw new Error(`unexpected status, ${status}`);
-      }
       if (content === undefined) {
         content = body;
       }
       if (contentType === undefined) {
         contentType = headers["content-type"] || "application/octet-stream";
       }
+      urlInfo.status = status;
       urlInfo.contentType = contentType;
       urlInfo.headers = headers;
-      urlInfo.type =
-        type ||
-        urlInfo.firstReference.expectedType ||
-        inferUrlInfoType(urlInfo);
+      urlInfo.type = type || inferUrlInfoType(urlInfo);
       urlInfo.subtype =
         subtype ||
         urlInfo.firstReference.expectedSubtype ||
@@ -680,10 +675,11 @@ const memoizeIsSupported = (runtimeCompat) => {
 
 const inferUrlInfoType = (urlInfo) => {
   const { type, typeHint } = urlInfo;
+  const { contentType } = urlInfo;
+  const { expectedType } = urlInfo.firstReference;
   if (type === "sourcemap" || typeHint === "sourcemap") {
     return "sourcemap";
   }
-  const { contentType } = urlInfo;
   if (contentType === "text/html") {
     return "html";
   }
@@ -691,7 +687,12 @@ const inferUrlInfoType = (urlInfo) => {
     return "css";
   }
   if (contentType === "text/javascript") {
-    if (urlInfo.typeHint === "js_classic") return "js_classic";
+    if (expectedType === "js_classic") {
+      return "js_classic";
+    }
+    if (typeHint === "js_classic") {
+      return "js_classic";
+    }
     return "js_module";
   }
   if (contentType === "application/importmap+json") {
@@ -709,5 +710,5 @@ const inferUrlInfoType = (urlInfo) => {
   if (CONTENT_TYPE.isTextual(contentType)) {
     return "text";
   }
-  return "other";
+  return expectedType || "other";
 };

package/src/kitchen/url_graph/url_graph.js

@@ -226,6 +226,7 @@ const createUrlInfo = (url, context) => {
     jsQuote: null, // maybe move to inlineUrlSite?
 
     timing: {},
+    status: 200,
     headers: {},
     debug: false,
   };

package/src/plugins/html_syntax_error_fallback/jsenv_plugin_html_syntax_error_fallback.js

@@ -1,8 +1,8 @@
 import { parseHtml } from "@jsenv/ast";
+import { generateContentFrame } from "@jsenv/humanize";
 import { urlToRelativeUrl } from "@jsenv/urls";
 import { readFileSync } from "node:fs";
-
-import { generateContentFrame } from "@jsenv/humanize";
+import { jsenvCoreDirectoryUrl } from "../../jsenv_core_directory_url.js";
 
 export const jsenvPluginHtmlSyntaxErrorFallback = () => {
   const htmlSyntaxErrorFileUrl = new URL(
@@ -58,6 +58,10 @@ const generateHtmlForSyntaxError = (
   const htmlForSyntaxError = String(readFileSync(htmlSyntaxErrorFileUrl));
   const htmlRelativeUrl = urlToRelativeUrl(htmlUrl, rootDirectoryUrl);
   const { line, column } = htmlSyntaxError;
+  if (htmlUrl.startsWith(jsenvCoreDirectoryUrl.href)) {
+    htmlUrl = urlToRelativeUrl(htmlUrl, jsenvCoreDirectoryUrl);
+    htmlUrl = `@jsenv/core/${htmlUrl}`;
+  }
   const urlWithLineAndColumn = `${htmlUrl}:${line}:${column}`;
   const replacers = {
     fileRelativeUrl: htmlRelativeUrl,

package/src/plugins/plugin_controller.js

@@ -324,7 +324,9 @@ const assertAndNormalizeReturnValue = (hook, returnValue, info) => {
     if (!returnValueAssertion.appliesTo.includes(hook.name)) {
       continue;
     }
-    const assertionResult = returnValueAssertion.assertion(returnValue, info);
+    const assertionResult = returnValueAssertion.assertion(returnValue, info, {
+      hook,
+    });
     if (assertionResult !== undefined) {
       // normalization
       returnValue = assertionResult;
@@ -338,7 +340,7 @@ const returnValueAssertions = [
   {
     name: "url_assertion",
     appliesTo: ["resolveReference", "redirectReference"],
-    assertion: (valueReturned) => {
+    assertion: (valueReturned, urlInfo, { hook }) => {
       if (valueReturned instanceof URL) {
         return valueReturned.href;
       }
@@ -346,7 +348,7 @@ const returnValueAssertions = [
         return undefined;
       }
       throw new Error(
-        `Unexpected value returned by plugin: it must be a string; got ${valueReturned}`,
+        `Unexpected value returned by "${hook.plugin.name}" plugin: it must be a string; got ${valueReturned}`,
       );
     },
   },
@@ -358,7 +360,7 @@ const returnValueAssertions = [
       "finalizeUrlContent",
       "optimizeUrlContent",
     ],
-    assertion: (valueReturned, urlInfo) => {
+    assertion: (valueReturned, urlInfo, { hook }) => {
       if (typeof valueReturned === "string" || Buffer.isBuffer(valueReturned)) {
         return { content: valueReturned };
       }
@@ -369,13 +371,13 @@ const returnValueAssertions = [
         }
         if (typeof content !== "string" && !Buffer.isBuffer(content) && !body) {
           throw new Error(
-            `Unexpected "content" returned by plugin: it must be a string or a buffer; got ${content}`,
+            `Unexpected "content" returned by "${hook.plugin.name}" ${hook.name} hook: it must be a string or a buffer; got ${content}`,
           );
         }
         return undefined;
       }
       throw new Error(
-        `Unexpected value returned by plugin: it must be a string, a buffer or an object; got ${valueReturned}`,
+        `Unexpected value returned by "${hook.plugin.name}" ${hook.name} hook: it must be a string, a buffer or an object; got ${valueReturned}`,
       );
     },
   },

package/src/plugins/protocol_file/jsenv_plugin_protocol_file.js

@@ -118,10 +118,13 @@ export const jsenvPluginProtocolFile = ({
           };
         }
         const contentType = CONTENT_TYPE.fromUrlExtension(urlInfo.url);
-        if (contentType === "text/html") {
+        const request = urlInfo.context.request;
+        if (request && request.headers["sec-fetch-dest"] === "document") {
           try {
             const fileBuffer = readFileSync(urlObject);
-            const content = String(fileBuffer);
+            const content = CONTENT_TYPE.isTextual(contentType)
+              ? String(fileBuffer)
+              : fileBuffer;
             return {
               content,
               contentType,
@@ -138,7 +141,7 @@ export const jsenvPluginProtocolFile = ({
             const parentDirectoryContentArray = readdirSync(
               new URL(parentDirectoryUrl),
             );
-            const html = generateHtmlForENOENTOnHtmlFile(
+            const html = generateHtmlForENOENT(
               urlInfo.url,
               parentDirectoryContentArray,
               parentDirectoryUrl,
@@ -146,6 +149,7 @@ export const jsenvPluginProtocolFile = ({
               directoryListingUrlMocks,
             );
             return {
+              status: 404,
               contentType: "text/html",
               content: html,
               headers: {
@@ -191,7 +195,7 @@ const generateHtmlForDirectory = (
   const html = replacePlaceholders(htmlForDirectory, replacers);
   return html;
 };
-const generateHtmlForENOENTOnHtmlFile = (
+const generateHtmlForENOENT = (
   url,
   parentDirectoryContentArray,
   parentDirectoryUrl,