@jsenv/core 29.1.9 → 29.1.11

package/dist/main.js

@@ -1586,7 +1586,7 @@ const collectFiles = async ({
         const relativeUrl = urlToRelativeUrl(directoryChildNodeUrl, rootDirectoryUrl);
         matchingFileResultArray.push({
           url: new URL(relativeUrl, rootDirectoryUrl).href,
-          relativeUrl,
+          relativeUrl: decodeURIComponent(relativeUrl),
           meta,
           fileStats: directoryChildNodeStats
         });
@@ -9144,10 +9144,19 @@ const createFetchUrlContentError = ({
     fetchError.code = code;
     fetchError.reason = reason;
     fetchError.url = urlInfo.url;
-    fetchError.traceUrl = reference.trace.url;
-    fetchError.traceLine = reference.trace.line;
-    fetchError.traceColumn = reference.trace.column;
-    fetchError.traceMessage = reference.trace.message;
+
+    if (code === "PARSE_ERROR") {
+      fetchError.traceUrl = error.traceUrl;
+      fetchError.traceLine = error.traceLine;
+      fetchError.traceColumn = error.traceColumn;
+      fetchError.traceMessage = error.traceMessage;
+    } else {
+      fetchError.traceUrl = reference.trace.url;
+      fetchError.traceLine = reference.trace.line;
+      fetchError.traceColumn = reference.trace.column;
+      fetchError.traceMessage = reference.trace.message;
+    }
+
     fetchError.asResponse = error.asResponse;
     return fetchError;
   };
@@ -9173,6 +9182,15 @@ const createFetchUrlContentError = ({
     });
   }
 
+  if (error.code === "PARSE_ERROR") {
+    return createFailedToFetchUrlContentError({
+      "code": "PARSE_ERROR",
+      "reason": error.reason,
+      "parse error message": error.cause.message,
+      "parse error trace": error.traceMessage
+    });
+  }
+
   return createFailedToFetchUrlContentError({
     reason: `An error occured during "fetchUrlContent"`,
     ...detailsFromValueThrown(error)
@@ -9207,7 +9225,8 @@ const createTransformUrlContentError = ({
     transformError.traceMessage = reference.trace.message;
 
     if (code === "PARSE_ERROR") {
-      transformError.reason = reason;
+      transformError.reason = `parse error on ${urlInfo.type}`;
+      transformError.cause = error;
 
       if (urlInfo.isInline) {
         transformError.traceLine = reference.trace.line + error.line - 1;
@@ -16788,7 +16807,13 @@ const jsenvPluginAsJsClassicHtml = ({
                   break;
                 }
               } catch (e) {
-                if (context.scenarios.dev) ; else {
+                if (context.scenarios.dev) {
+                  needsSystemJs = true; // ignore cooking error, the browser will trigger it again on fetch
+                  // + disable cache for this html file because when browser will reload
+                  // the error might be gone and we might need to inject systemjs
+
+                  urlInfo.headers["cache-control"] = "no-store";
+                } else {
                   throw e;
                 }
               }
@@ -24414,15 +24439,37 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
               return;
             }
           } // File referenced with new URL('./file.js', import.meta.url)
-          // are entry points that can be bundled
+          // are entry points that should be bundled
           // For instance we will bundle service worker/workers detected like this
 
 
           if (rawUrlInfo.type === "js_module") {
             rawUrlInfo.references.forEach(reference => {
-              if (reference.type === "js_url_specifier") {
-                const urlInfo = rawGraph.getUrlInfo(reference.url);
-                addToBundlerIfAny(urlInfo);
+              if (reference.type !== "js_url_specifier") {
+                return;
+              }
+
+              const referencedUrlInfo = rawGraph.getUrlInfo(reference.url);
+              const bundler = bundlers[referencedUrlInfo.type];
+
+              if (!bundler) {
+                return;
+              }
+
+              let willAlreadyBeBundled = true;
+
+              for (const dependent of referencedUrlInfo.dependents) {
+                const dependentUrlInfo = rawGraph.getUrlInfo(dependent);
+
+                for (const reference of dependentUrlInfo.references) {
+                  if (reference.url === referencedUrlInfo.url) {
+                    willAlreadyBeBundled = reference.type === "js_import_export" && reference.subtype === "import_dynamic" || reference.type === "script_src";
+                  }
+                }
+              }
+
+              if (!willAlreadyBeBundled) {
+                bundler.urlInfos.push(referencedUrlInfo);
               }
             });
           }
@@ -25741,17 +25788,32 @@ const createFileService = ({
       const code = originalError.code;
 
       if (code === "PARSE_ERROR") {
+        // when possible let browser re-throw the syntax error
+        // it's not possible to do that when url info content is not available
+        // (happens for as_js_classic library for instance)
+        if (urlInfo.content !== undefined) {
+          return {
+            url: reference.url,
+            status: 200,
+            // reason becomes the http response statusText, it must not contain invalid chars
+            // https://github.com/nodejs/node/blob/0c27ca4bc9782d658afeaebcec85ec7b28f1cc35/lib/_http_common.js#L221
+            statusText: e.reason,
+            statusMessage: originalError.message,
+            headers: {
+              "content-type": urlInfo.contentType,
+              "content-length": Buffer.byteLength(urlInfo.content),
+              "cache-control": "no-store"
+            },
+            body: urlInfo.content
+          };
+        }
+
         return {
           url: reference.url,
-          status: 200,
-          // let the browser re-throw the syntax error
-          // reason becomes the http response statusText, it must not contain invalid chars
-          // https://github.com/nodejs/node/blob/0c27ca4bc9782d658afeaebcec85ec7b28f1cc35/lib/_http_common.js#L221
+          status: 500,
           statusText: e.reason,
           statusMessage: originalError.message,
           headers: {
-            "content-type": urlInfo.contentType,
-            "content-length": Buffer.byteLength(urlInfo.content),
             "cache-control": "no-store"
           },
           body: urlInfo.content

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "29.1.9",
+  "version": "29.1.11",
   "description": "Tool to develop, test and build js projects",
   "license": "MIT",
   "author": {
@@ -68,7 +68,7 @@
     "@jsenv/abort": "4.2.4",
     "@jsenv/ast": "1.3.2",
     "@jsenv/babel-plugins": "1.0.7",
-    "@jsenv/filesystem": "4.1.4",
+    "@jsenv/filesystem": "4.1.5",
     "@jsenv/importmap": "1.2.1",
     "@jsenv/integrity": "0.0.1",
     "@jsenv/log": "3.3.1",

package/src/build/build.js

@@ -686,13 +686,33 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
             }
           }
           // File referenced with new URL('./file.js', import.meta.url)
-          // are entry points that can be bundled
+          // are entry points that should be bundled
           // For instance we will bundle service worker/workers detected like this
           if (rawUrlInfo.type === "js_module") {
             rawUrlInfo.references.forEach((reference) => {
-              if (reference.type === "js_url_specifier") {
-                const urlInfo = rawGraph.getUrlInfo(reference.url)
-                addToBundlerIfAny(urlInfo)
+              if (reference.type !== "js_url_specifier") {
+                return
+              }
+              const referencedUrlInfo = rawGraph.getUrlInfo(reference.url)
+              const bundler = bundlers[referencedUrlInfo.type]
+              if (!bundler) {
+                return
+              }
+
+              let willAlreadyBeBundled = true
+              for (const dependent of referencedUrlInfo.dependents) {
+                const dependentUrlInfo = rawGraph.getUrlInfo(dependent)
+                for (const reference of dependentUrlInfo.references) {
+                  if (reference.url === referencedUrlInfo.url) {
+                    willAlreadyBeBundled =
+                      (reference.type === "js_import_export" &&
+                        reference.subtype === "import_dynamic") ||
+                      reference.type === "script_src"
+                  }
+                }
+              }
+              if (!willAlreadyBeBundled) {
+                bundler.urlInfos.push(referencedUrlInfo)
               }
             })
           }

package/src/dev/file_service.js

@@ -361,16 +361,31 @@ export const createFileService = ({
       }
       const code = originalError.code
       if (code === "PARSE_ERROR") {
+        // when possible let browser re-throw the syntax error
+        // it's not possible to do that when url info content is not available
+        // (happens for as_js_classic library for instance)
+        if (urlInfo.content !== undefined) {
+          return {
+            url: reference.url,
+            status: 200,
+            // reason becomes the http response statusText, it must not contain invalid chars
+            // https://github.com/nodejs/node/blob/0c27ca4bc9782d658afeaebcec85ec7b28f1cc35/lib/_http_common.js#L221
+            statusText: e.reason,
+            statusMessage: originalError.message,
+            headers: {
+              "content-type": urlInfo.contentType,
+              "content-length": Buffer.byteLength(urlInfo.content),
+              "cache-control": "no-store",
+            },
+            body: urlInfo.content,
+          }
+        }
         return {
           url: reference.url,
-          status: 200, // let the browser re-throw the syntax error
-          // reason becomes the http response statusText, it must not contain invalid chars
-          // https://github.com/nodejs/node/blob/0c27ca4bc9782d658afeaebcec85ec7b28f1cc35/lib/_http_common.js#L221
+          status: 500,
           statusText: e.reason,
           statusMessage: originalError.message,
           headers: {
-            "content-type": urlInfo.contentType,
-            "content-length": Buffer.byteLength(urlInfo.content),
             "cache-control": "no-store",
           },
           body: urlInfo.content,

package/src/kitchen/errors.js

@@ -61,10 +61,17 @@ export const createFetchUrlContentError = ({
     fetchError.code = code
     fetchError.reason = reason
     fetchError.url = urlInfo.url
-    fetchError.traceUrl = reference.trace.url
-    fetchError.traceLine = reference.trace.line
-    fetchError.traceColumn = reference.trace.column
-    fetchError.traceMessage = reference.trace.message
+    if (code === "PARSE_ERROR") {
+      fetchError.traceUrl = error.traceUrl
+      fetchError.traceLine = error.traceLine
+      fetchError.traceColumn = error.traceColumn
+      fetchError.traceMessage = error.traceMessage
+    } else {
+      fetchError.traceUrl = reference.trace.url
+      fetchError.traceLine = reference.trace.line
+      fetchError.traceColumn = reference.trace.column
+      fetchError.traceMessage = reference.trace.message
+    }
     fetchError.asResponse = error.asResponse
     return fetchError
   }
@@ -87,6 +94,14 @@ export const createFetchUrlContentError = ({
       reason: "no entry on filesystem",
     })
   }
+  if (error.code === "PARSE_ERROR") {
+    return createFailedToFetchUrlContentError({
+      "code": "PARSE_ERROR",
+      "reason": error.reason,
+      "parse error message": error.cause.message,
+      "parse error trace": error.traceMessage,
+    })
+  }
   return createFailedToFetchUrlContentError({
     reason: `An error occured during "fetchUrlContent"`,
     ...detailsFromValueThrown(error),
@@ -126,7 +141,8 @@ export const createTransformUrlContentError = ({
     transformError.traceColumn = reference.trace.column
     transformError.traceMessage = reference.trace.message
     if (code === "PARSE_ERROR") {
-      transformError.reason = reason
+      transformError.reason = `parse error on ${urlInfo.type}`
+      transformError.cause = error
       if (urlInfo.isInline) {
         transformError.traceLine = reference.trace.line + error.line - 1
         transformError.traceColumn = reference.trace.column + error.column

package/src/plugins/transpilation/as_js_classic/jsenv_plugin_as_js_classic_html.js

@@ -167,7 +167,11 @@ export const jsenvPluginAsJsClassicHtml = ({
                 }
               } catch (e) {
                 if (context.scenarios.dev) {
+                  needsSystemJs = true
                   // ignore cooking error, the browser will trigger it again on fetch
+                  // + disable cache for this html file because when browser will reload
+                  // the error might be gone and we might need to inject systemjs
+                  urlInfo.headers["cache-control"] = "no-store"
                 } else {
                   throw e
                 }