@jsenv/core 29.8.1 → 29.8.3

package/dist/main.js

@@ -11596,14 +11596,12 @@ const jsenvPluginReferenceExpectedTypes = () => {
       reference.isEntryPoint = true;
     }
     if (searchParams.has("js_classic")) {
-      searchParams.delete("js_classic");
       reference.expectedType = "js_classic";
     } else if (searchParams.has("as_js_classic") || searchParams.has("as_js_classic_library")) {
       reference.expectedType = "js_classic";
     } else if (searchParams.has("as_js_module")) {
       reference.expectedType = "js_module";
     } else if (searchParams.has("js_module")) {
-      searchParams.delete("js_module");
       reference.expectedType = "js_module";
     } else if (reference.type === "js_url" && reference.expectedType === undefined && CONTENT_TYPE.fromUrlExtension(reference.url) === "text/javascript") {
       // by default, js referenced by new URL is considered as "js_module"
@@ -11613,13 +11611,10 @@ const jsenvPluginReferenceExpectedTypes = () => {
     }
     if (searchParams.has("worker")) {
       reference.expectedSubtype = "worker";
-      searchParams.delete("worker");
     } else if (searchParams.has("service_worker")) {
       reference.expectedSubtype = "service_worker";
-      searchParams.delete("service_worker");
     } else if (searchParams.has("shared_worker")) {
       reference.expectedSubtype = "shared_worker";
-      searchParams.delete("shared_worker");
     }
     return urlObject.href;
   };
@@ -11628,7 +11623,8 @@ const jsenvPluginReferenceExpectedTypes = () => {
     appliesDuring: "*",
     redirectUrl: {
       script_src: redirectJsUrls,
-      js_url: redirectJsUrls
+      js_url: redirectJsUrls,
+      js_import: redirectJsUrls
     }
   };
 };
@@ -18458,7 +18454,12 @@ const applyPackageSpecifierResolution = (specifier, resolutionContext) => {
     if (browserFieldResolution) {
       return browserFieldResolution;
     }
-    return applyPackageResolve(specifier, resolutionContext);
+    const packageResolution = applyPackageResolve(specifier, resolutionContext);
+    const search = new URL(specifier, "file://").search;
+    if (search) {
+      packageResolution.url = `${packageResolution.url}${search}`;
+    }
+    return packageResolution;
   }
 };
 const applyBrowserFieldResolution = (specifier, resolutionContext) => {
@@ -20283,24 +20284,22 @@ const jsenvPluginImportAssertions = ({
         transpilations.text = true;
       }
     },
-    redirectUrl: {
-      js_import: (reference, context) => {
-        if (!reference.assert) {
-          return null;
-        }
-        const {
-          searchParams
-        } = reference;
-        if (searchParams.has("as_json_module") || searchParams.has("as_css_module") || searchParams.has("as_text_module")) {
-          markAsJsModuleProxy(reference);
-          return null;
-        }
-        const type = reference.assert.type;
-        if (shouldTranspileImportAssertion(context, type)) {
-          return turnIntoJsModuleProxy(reference, type);
-        }
+    redirectUrl: (reference, context) => {
+      if (!reference.assert) {
+        return null;
+      }
+      const {
+        searchParams
+      } = reference;
+      if (searchParams.has("as_json_module") || searchParams.has("as_css_module") || searchParams.has("as_text_module")) {
+        markAsJsModuleProxy(reference);
         return null;
       }
+      const type = reference.assert.type;
+      if (shouldTranspileImportAssertion(context, type)) {
+        return turnIntoJsModuleProxy(reference, type);
+      }
+      return null;
     }
   };
   return [importAssertions, ...jsenvPluginAsModules()];
@@ -23537,6 +23536,8 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
             throw new Error(`urls should be inside build directory at this stage, found "${reference.url}"`);
           }
           const generatedUrlObject = new URL(reference.generatedUrl);
+          generatedUrlObject.searchParams.delete("js_classic");
+          generatedUrlObject.searchParams.delete("js_module");
           generatedUrlObject.searchParams.delete("as_js_classic");
           generatedUrlObject.searchParams.delete("as_js_classic_library");
           generatedUrlObject.searchParams.delete("as_js_module");
@@ -23747,7 +23748,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
                 const dependentUrlInfo = rawGraph.getUrlInfo(dependent);
                 for (const reference of dependentUrlInfo.references) {
                   if (reference.url === referencedUrlInfo.url) {
-                    willAlreadyBeBundled = reference.type === "js_import" && reference.subtype === "import_dynamic" || reference.type === "script_src";
+                    willAlreadyBeBundled = reference.subtype === "import_dynamic" || reference.type === "script_src";
                   }
                 }
               }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "29.8.1",
+  "version": "29.8.3",
   "description": "Tool to develop, test and build js projects",
   "license": "MIT",
   "author": {
@@ -73,7 +73,7 @@
     "@jsenv/importmap": "1.2.1",
     "@jsenv/integrity": "0.0.1",
     "@jsenv/log": "3.3.1",
-    "@jsenv/node-esm-resolution": "0.2.0",
+    "@jsenv/node-esm-resolution": "1.0.0",
     "@jsenv/server": "14.1.10",
     "@jsenv/sourcemap": "1.0.7",
     "@jsenv/uneval": "1.6.0",

package/src/build/build.js

@@ -495,6 +495,8 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
               )
             }
             const generatedUrlObject = new URL(reference.generatedUrl)
+            generatedUrlObject.searchParams.delete("js_classic")
+            generatedUrlObject.searchParams.delete("js_module")
             generatedUrlObject.searchParams.delete("as_js_classic")
             generatedUrlObject.searchParams.delete("as_js_classic_library")
             generatedUrlObject.searchParams.delete("as_js_module")
@@ -725,8 +727,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
                 for (const reference of dependentUrlInfo.references) {
                   if (reference.url === referencedUrlInfo.url) {
                     willAlreadyBeBundled =
-                      (reference.type === "js_import" &&
-                        reference.subtype === "import_dynamic") ||
+                      reference.subtype === "import_dynamic" ||
                       reference.type === "script_src"
                   }
                 }

package/src/plugins/transpilation/import_assertions/jsenv_plugin_import_assertions.js

@@ -63,26 +63,24 @@ export const jsenvPluginImportAssertions = ({
         transpilations.text = true
       }
     },
-    redirectUrl: {
-      js_import: (reference, context) => {
-        if (!reference.assert) {
-          return null
-        }
-        const { searchParams } = reference
-        if (
-          searchParams.has("as_json_module") ||
-          searchParams.has("as_css_module") ||
-          searchParams.has("as_text_module")
-        ) {
-          markAsJsModuleProxy(reference)
-          return null
-        }
-        const type = reference.assert.type
-        if (shouldTranspileImportAssertion(context, type)) {
-          return turnIntoJsModuleProxy(reference, type)
-        }
+    redirectUrl: (reference, context) => {
+      if (!reference.assert) {
         return null
-      },
+      }
+      const { searchParams } = reference
+      if (
+        searchParams.has("as_json_module") ||
+        searchParams.has("as_css_module") ||
+        searchParams.has("as_text_module")
+      ) {
+        markAsJsModuleProxy(reference)
+        return null
+      }
+      const type = reference.assert.type
+      if (shouldTranspileImportAssertion(context, type)) {
+        return turnIntoJsModuleProxy(reference, type)
+      }
+      return null
     },
   }
   return [importAssertions, ...jsenvPluginAsModules()]

package/src/plugins/url_analysis/jsenv_plugin_reference_expected_types.js

@@ -9,7 +9,6 @@ export const jsenvPluginReferenceExpectedTypes = () => {
       reference.isEntryPoint = true
     }
     if (searchParams.has("js_classic")) {
-      searchParams.delete("js_classic")
       reference.expectedType = "js_classic"
     } else if (
       searchParams.has("as_js_classic") ||
@@ -19,7 +18,6 @@ export const jsenvPluginReferenceExpectedTypes = () => {
     } else if (searchParams.has("as_js_module")) {
       reference.expectedType = "js_module"
     } else if (searchParams.has("js_module")) {
-      searchParams.delete("js_module")
       reference.expectedType = "js_module"
     } else if (
       reference.type === "js_url" &&
@@ -34,15 +32,11 @@ export const jsenvPluginReferenceExpectedTypes = () => {
 
     if (searchParams.has("worker")) {
       reference.expectedSubtype = "worker"
-      searchParams.delete("worker")
     } else if (searchParams.has("service_worker")) {
       reference.expectedSubtype = "service_worker"
-      searchParams.delete("service_worker")
     } else if (searchParams.has("shared_worker")) {
       reference.expectedSubtype = "shared_worker"
-      searchParams.delete("shared_worker")
     }
-
     return urlObject.href
   }
 
@@ -52,6 +46,7 @@ export const jsenvPluginReferenceExpectedTypes = () => {
     redirectUrl: {
       script_src: redirectJsUrls,
       js_url: redirectJsUrls,
+      js_import: redirectJsUrls,
     },
   }
 }