@jsenv/core 29.1.0 → 29.1.2

package/dist/main.js

@@ -9075,6 +9075,7 @@ const createResolveUrlError = ({
     resolveError.name = "RESOLVE_URL_ERROR";
     resolveError.code = code;
     resolveError.reason = reason;
+    resolveError.asResponse = error.asResponse;
     return resolveError;
   };
 
@@ -9115,6 +9116,7 @@ const createFetchUrlContentError = ({
     fetchError.traceLine = reference.trace.line;
     fetchError.traceColumn = reference.trace.column;
     fetchError.traceMessage = reference.trace.message;
+    fetchError.asResponse = error.asResponse;
     return fetchError;
   };
 
@@ -9196,6 +9198,7 @@ const createTransformUrlContentError = ({
       }
     }
 
+    transformError.asResponse = error.asResponse;
     return transformError;
   };
 
@@ -9222,6 +9225,7 @@ const createFinalizeUrlContentError = ({
 
   finalizeError.name = "FINALIZE_URL_CONTENT_ERROR";
   finalizeError.reason = `"finalizeUrlContent" error on "${urlInfo.type}"`;
+  finalizeError.asResponse = error.asResponse;
   return finalizeError;
 };
 
@@ -19833,8 +19837,19 @@ const jsenvPluginUrlResolution = ({
         return new URL(reference.specifier.slice(1), context.rootDirectoryUrl).href;
       }
 
-      const parentUrlInfo = context.urlGraph.getUrlInfo(reference.parentUrl);
-      const urlType = parentUrlInfo ? parentUrlInfo.type : "entry_point";
+      if (reference.type === "sourcemap_comment") {
+        return resolveUrlUsingWebResolution(reference);
+      }
+
+      let urlType;
+
+      if (reference.expectedType) {
+        urlType = reference.expectedType;
+      } else {
+        const parentUrlInfo = context.urlGraph.getUrlInfo(reference.parentUrl);
+        urlType = parentUrlInfo ? parentUrlInfo.type : "entry_point";
+      }
+
       const resolver = resolvers[urlType] || resolvers["*"];
       return resolver(reference, context);
     },
@@ -25598,6 +25613,11 @@ const createFileService = ({
     } catch (e) {
       urlInfo.error = e;
       const originalError = e ? e.cause || e : e;
+
+      if (originalError.asResponse) {
+        return originalError.asResponse();
+      }
+
       const code = originalError.code;
 
       if (code === "PARSE_ERROR") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "29.1.0",
+  "version": "29.1.2",
   "description": "Tool to develop, test and build js projects",
   "license": "MIT",
   "author": {

package/src/dev/file_service.js

@@ -347,6 +347,9 @@ export const createFileService = ({
     } catch (e) {
       urlInfo.error = e
       const originalError = e ? e.cause || e : e
+      if (originalError.asResponse) {
+        return originalError.asResponse()
+      }
       const code = originalError.code
       if (code === "PARSE_ERROR") {
         return {

package/src/kitchen/errors.js

@@ -23,6 +23,7 @@ export const createResolveUrlError = ({
     resolveError.name = "RESOLVE_URL_ERROR"
     resolveError.code = code
     resolveError.reason = reason
+    resolveError.asResponse = error.asResponse
     return resolveError
   }
   if (error.message === "NO_RESOLVE") {
@@ -64,6 +65,7 @@ export const createFetchUrlContentError = ({
     fetchError.traceLine = reference.trace.line
     fetchError.traceColumn = reference.trace.column
     fetchError.traceMessage = reference.trace.message
+    fetchError.asResponse = error.asResponse
     return fetchError
   }
 
@@ -145,6 +147,7 @@ export const createTransformUrlContentError = ({
         })
       }
     }
+    transformError.asResponse = error.asResponse
     return transformError
   }
   return createFailedToTransformError({
@@ -172,6 +175,7 @@ export const createFinalizeUrlContentError = ({
   }
   finalizeError.name = "FINALIZE_URL_CONTENT_ERROR"
   finalizeError.reason = `"finalizeUrlContent" error on "${urlInfo.type}"`
+  finalizeError.asResponse = error.asResponse
   return finalizeError
 }
 

package/src/plugins/url_resolution/jsenv_plugin_url_resolution.js

@@ -98,8 +98,16 @@ export const jsenvPluginUrlResolution = ({
         return new URL(reference.specifier.slice(1), context.rootDirectoryUrl)
           .href
       }
-      const parentUrlInfo = context.urlGraph.getUrlInfo(reference.parentUrl)
-      const urlType = parentUrlInfo ? parentUrlInfo.type : "entry_point"
+      if (reference.type === "sourcemap_comment") {
+        return resolveUrlUsingWebResolution(reference, context)
+      }
+      let urlType
+      if (reference.expectedType) {
+        urlType = reference.expectedType
+      } else {
+        const parentUrlInfo = context.urlGraph.getUrlInfo(reference.parentUrl)
+        urlType = parentUrlInfo ? parentUrlInfo.type : "entry_point"
+      }
       const resolver = resolvers[urlType] || resolvers["*"]
       return resolver(reference, context)
     },