@jsenv/core 32.1.2 → 32.2.0

package/dist/main.js

@@ -17152,6 +17152,7 @@ const addRelationshipWithPackageJson = ({
  * - "css_@import"
  * - "css_url"
  * - "js_import"
+ * - "js_import_script"
  * - "js_url"
  * - "js_inline_content"
  * - "sourcemap_comment"
@@ -17187,7 +17188,7 @@ const jsenvPluginUrlResolution = ({
 "${urlType}" resolution key must be "web" or "node_esm", found "${Object.keys(rest)[0]}"`);
     }
     if (node_esm === undefined) {
-      node_esm = urlType === "js_module";
+      node_esm = urlType === "js_import" || urlType === "js_import_script";
     }
     if (web === undefined) {
       web = true;
@@ -17229,13 +17230,17 @@ const jsenvPluginUrlResolution = ({
       if (reference.type === "sourcemap_comment") {
         return resolveUrlUsingWebResolution(reference);
       }
-      let urlType;
+      let type;
+      let subtype;
+      const parentUrlInfo = context.urlGraph.getUrlInfo(reference.parentUrl);
       if (reference.injected) {
-        urlType = reference.expectedType;
+        type = reference.expectedType;
+        subtype = reference.expectedSubtype;
       } else {
-        const parentUrlInfo = context.urlGraph.getUrlInfo(reference.parentUrl);
-        urlType = parentUrlInfo ? parentUrlInfo.type : "entry_point";
+        type = parentUrlInfo ? parentUrlInfo.type : "entry_point";
+        subtype = parentUrlInfo ? parentUrlInfo.subtype : "";
       }
+      const urlType = subtype === "self_import_scripts_arg" ? "js_import_script" : type;
       const resolver = resolvers[urlType] || resolvers["*"];
       return resolver(reference, context);
     },

package/package.json

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

package/src/plugins/url_resolution/jsenv_plugin_url_resolution.js

@@ -21,6 +21,7 @@
  * - "css_@import"
  * - "css_url"
  * - "js_import"
+ * - "js_import_script"
  * - "js_url"
  * - "js_inline_content"
  * - "sourcemap_comment"
@@ -64,7 +65,7 @@ export const jsenvPluginUrlResolution = ({
       )
     }
     if (node_esm === undefined) {
-      node_esm = urlType === "js_module"
+      node_esm = urlType === "js_import" || urlType === "js_import_script"
     }
     if (web === undefined) {
       web = true
@@ -106,13 +107,19 @@ export const jsenvPluginUrlResolution = ({
       if (reference.type === "sourcemap_comment") {
         return resolveUrlUsingWebResolution(reference, context)
       }
-      let urlType
+
+      let type
+      let subtype
+      const parentUrlInfo = context.urlGraph.getUrlInfo(reference.parentUrl)
       if (reference.injected) {
-        urlType = reference.expectedType
+        type = reference.expectedType
+        subtype = reference.expectedSubtype
       } else {
-        const parentUrlInfo = context.urlGraph.getUrlInfo(reference.parentUrl)
-        urlType = parentUrlInfo ? parentUrlInfo.type : "entry_point"
+        type = parentUrlInfo ? parentUrlInfo.type : "entry_point"
+        subtype = parentUrlInfo ? parentUrlInfo.subtype : ""
       }
+      const urlType =
+        subtype === "self_import_scripts_arg" ? "js_import_script" : type
       const resolver = resolvers[urlType] || resolvers["*"]
       return resolver(reference, context)
     },