@jsenv/core 32.2.0 → 32.2.2

package/dist/{main.js → jsenv.js}

@@ -7467,6 +7467,8 @@ const createUrlInfo = url => {
     // "html", "css", "js_classic", "js_module", "importmap", "json", "webmanifest", ...
     subtype: undefined,
     // "worker", "service_worker", "shared_worker" for js, otherwise undefined
+    typeHint: undefined,
+    subtypeHint: undefined,
     contentType: "",
     // "text/html", "text/css", "text/javascript", "application/json", ...
     url,
@@ -7488,7 +7490,8 @@ const createUrlInfo = url => {
     // maybe move to inlineUrlSite?
 
     timing: {},
-    headers: {}
+    headers: {},
+    debug: false
   };
   // Object.preventExtensions(urlInfo) // useful to ensure all properties are declared here
   return urlInfo;
@@ -9067,8 +9070,8 @@ ${ANSI.color(normalizedReturnValue, ANSI.YELLOW)}
       }
       urlInfo.contentType = contentType;
       urlInfo.headers = headers;
-      urlInfo.type = type || reference.expectedType || inferUrlInfoType(contentType);
-      urlInfo.subtype = subtype || reference.expectedSubtype || "";
+      urlInfo.type = type || reference.expectedType || inferUrlInfoType(urlInfo);
+      urlInfo.subtype = subtype || reference.expectedSubtype || urlInfo.subtypeHint || "";
       // during build urls info are reused and load returns originalUrl/originalContent
       urlInfo.originalUrl = originalUrl || urlInfo.originalUrl;
       if (originalContent !== urlInfo.originalContent) {
@@ -9491,6 +9494,15 @@ const applyReferenceEffectsOnUrlInfo = (reference, urlInfo, context) => {
     urlInfo.originalContent = context.build ? urlInfo.originalContent === undefined ? reference.content : urlInfo.originalContent : reference.content;
     urlInfo.content = reference.content;
   }
+  if (reference.debug) {
+    urlInfo.debug = true;
+  }
+  if (reference.expectedType) {
+    urlInfo.typeHint = reference.expectedType;
+  }
+  if (reference.expectedSubtype) {
+    urlInfo.subtypeHint = reference.expectedSubtype;
+  }
 };
 const adjustUrlSite = (urlInfo, {
   urlGraph,
@@ -9524,7 +9536,10 @@ const adjustUrlSite = (urlInfo, {
     column
   }, urlInfo);
 };
-const inferUrlInfoType = contentType => {
+const inferUrlInfoType = urlInfo => {
+  const {
+    contentType
+  } = urlInfo;
   if (contentType === "text/html") {
     return "html";
   }
@@ -9532,6 +9547,7 @@ const inferUrlInfoType = contentType => {
     return "css";
   }
   if (contentType === "text/javascript") {
+    if (urlInfo.typeHint === "js_classic") return "js_classic";
     return "js_module";
   }
   if (contentType === "application/importmap+json") {
@@ -17174,21 +17190,19 @@ const jsenvPluginUrlResolution = ({
   Object.keys(urlResolution).forEach(urlType => {
     const resolver = urlResolution[urlType];
     if (typeof resolver !== "object") {
-      throw new Error(`Unexpected urlResolution configuration:
-"${urlType}" resolution value must be an object, got ${resolver}`);
+      throw new Error(`urlResolution values must be objects, got ${resolver} on "${urlType}"`);
     }
     let {
       web,
       node_esm,
       ...rest
     } = resolver;
-    const unexpectedKey = Object.keys(rest)[0];
-    if (unexpectedKey) {
-      throw new Error(`Unexpected urlResolution configuration:
-"${urlType}" resolution key must be "web" or "node_esm", found "${Object.keys(rest)[0]}"`);
+    const unexpectedKeys = Object.keys(rest);
+    if (unexpectedKeys.length) {
+      throw new TypeError(`${unexpectedKeys.join(",")}: there is no such configuration on "${urlType}"`);
     }
     if (node_esm === undefined) {
-      node_esm = urlType === "js_import" || urlType === "js_import_script";
+      node_esm = urlType === "js_import";
     }
     if (web === undefined) {
       web = true;
@@ -17208,11 +17222,20 @@ const jsenvPluginUrlResolution = ({
       resolvers[urlType] = resolveUrlUsingWebResolution;
     }
   });
+  const nodeEsmResolverDefault = createNodeEsmResolver({
+    runtimeCompat,
+    preservesSymlink: true
+  });
   if (!resolvers.js_module) {
-    resolvers.js_module = createNodeEsmResolver({
-      runtimeCompat,
-      preservesSymlink: true
-    });
+    resolvers.js_module = nodeEsmResolverDefault;
+  }
+  if (!resolvers.js_classic) {
+    resolvers.js_classic = (reference, context) => {
+      if (reference.subtype === "self_import_scripts_arg") {
+        return nodeEsmResolverDefault(reference, context);
+      }
+      return resolveUrlUsingWebResolution(reference);
+    };
   }
   if (!resolvers["*"]) {
     resolvers["*"] = resolveUrlUsingWebResolution;
@@ -17230,17 +17253,13 @@ const jsenvPluginUrlResolution = ({
       if (reference.type === "sourcemap_comment") {
         return resolveUrlUsingWebResolution(reference);
       }
-      let type;
-      let subtype;
-      const parentUrlInfo = context.urlGraph.getUrlInfo(reference.parentUrl);
+      let urlType;
       if (reference.injected) {
-        type = reference.expectedType;
-        subtype = reference.expectedSubtype;
+        urlType = reference.expectedType;
       } else {
-        type = parentUrlInfo ? parentUrlInfo.type : "entry_point";
-        subtype = parentUrlInfo ? parentUrlInfo.subtype : "";
+        const parentUrlInfo = context.urlGraph.getUrlInfo(reference.parentUrl);
+        urlType = parentUrlInfo ? parentUrlInfo.type : "entry_point";
       }
-      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.2.0",
+  "version": "32.2.2",
   "description": "Tool to develop, test and build js projects",
   "license": "MIT",
   "author": {

package/src/kitchen/kitchen.js

@@ -377,9 +377,9 @@ ${ANSI.color(normalizedReturnValue, ANSI.YELLOW)}
       }
       urlInfo.contentType = contentType
       urlInfo.headers = headers
-      urlInfo.type =
-        type || reference.expectedType || inferUrlInfoType(contentType)
-      urlInfo.subtype = subtype || reference.expectedSubtype || ""
+      urlInfo.type = type || reference.expectedType || inferUrlInfoType(urlInfo)
+      urlInfo.subtype =
+        subtype || reference.expectedSubtype || urlInfo.subtypeHint || ""
       // during build urls info are reused and load returns originalUrl/originalContent
       urlInfo.originalUrl = originalUrl || urlInfo.originalUrl
       if (originalContent !== urlInfo.originalContent) {
@@ -860,6 +860,16 @@ const applyReferenceEffectsOnUrlInfo = (reference, urlInfo, context) => {
       : reference.content
     urlInfo.content = reference.content
   }
+
+  if (reference.debug) {
+    urlInfo.debug = true
+  }
+  if (reference.expectedType) {
+    urlInfo.typeHint = reference.expectedType
+  }
+  if (reference.expectedSubtype) {
+    urlInfo.subtypeHint = reference.expectedSubtype
+  }
 }
 
 const adjustUrlSite = (urlInfo, { urlGraph, url, line, column }) => {
@@ -902,7 +912,8 @@ const adjustUrlSite = (urlInfo, { urlGraph, url, line, column }) => {
   )
 }
 
-const inferUrlInfoType = (contentType) => {
+const inferUrlInfoType = (urlInfo) => {
+  const { contentType } = urlInfo
   if (contentType === "text/html") {
     return "html"
   }
@@ -910,6 +921,7 @@ const inferUrlInfoType = (contentType) => {
     return "css"
   }
   if (contentType === "text/javascript") {
+    if (urlInfo.typeHint === "js_classic") return "js_classic"
     return "js_module"
   }
   if (contentType === "application/importmap+json") {

package/src/kitchen/url_graph.js

@@ -260,6 +260,8 @@ const createUrlInfo = (url) => {
     implicitUrls: new Set(),
     type: undefined, // "html", "css", "js_classic", "js_module", "importmap", "json", "webmanifest", ...
     subtype: undefined, // "worker", "service_worker", "shared_worker" for js, otherwise undefined
+    typeHint: undefined,
+    subtypeHint: undefined,
     contentType: "", // "text/html", "text/css", "text/javascript", "application/json", ...
     url,
     originalUrl: undefined,
@@ -283,6 +285,7 @@ const createUrlInfo = (url) => {
 
     timing: {},
     headers: {},
+    debug: false,
   }
   // Object.preventExtensions(urlInfo) // useful to ensure all properties are declared here
   return urlInfo

package/src/plugins/url_resolution/jsenv_plugin_url_resolution.js

@@ -50,22 +50,20 @@ export const jsenvPluginUrlResolution = ({
     const resolver = urlResolution[urlType]
     if (typeof resolver !== "object") {
       throw new Error(
-        `Unexpected urlResolution configuration:
-"${urlType}" resolution value must be an object, got ${resolver}`,
+        `urlResolution values must be objects, got ${resolver} on "${urlType}"`,
       )
     }
     let { web, node_esm, ...rest } = resolver
-    const unexpectedKey = Object.keys(rest)[0]
-    if (unexpectedKey) {
-      throw new Error(
-        `Unexpected urlResolution configuration:
-"${urlType}" resolution key must be "web" or "node_esm", found "${
-          Object.keys(rest)[0]
-        }"`,
+    const unexpectedKeys = Object.keys(rest)
+    if (unexpectedKeys.length) {
+      throw new TypeError(
+        `${unexpectedKeys.join(
+          ",",
+        )}: there is no such configuration on "${urlType}"`,
       )
     }
     if (node_esm === undefined) {
-      node_esm = urlType === "js_import" || urlType === "js_import_script"
+      node_esm = urlType === "js_import"
     }
     if (web === undefined) {
       web = true
@@ -83,11 +81,20 @@ export const jsenvPluginUrlResolution = ({
     }
   })
 
+  const nodeEsmResolverDefault = createNodeEsmResolver({
+    runtimeCompat,
+    preservesSymlink: true,
+  })
   if (!resolvers.js_module) {
-    resolvers.js_module = createNodeEsmResolver({
-      runtimeCompat,
-      preservesSymlink: true,
-    })
+    resolvers.js_module = nodeEsmResolverDefault
+  }
+  if (!resolvers.js_classic) {
+    resolvers.js_classic = (reference, context) => {
+      if (reference.subtype === "self_import_scripts_arg") {
+        return nodeEsmResolverDefault(reference, context)
+      }
+      return resolveUrlUsingWebResolution(reference, context)
+    }
   }
   if (!resolvers["*"]) {
     resolvers["*"] = resolveUrlUsingWebResolution
@@ -107,19 +114,13 @@ export const jsenvPluginUrlResolution = ({
       if (reference.type === "sourcemap_comment") {
         return resolveUrlUsingWebResolution(reference, context)
       }
-
-      let type
-      let subtype
-      const parentUrlInfo = context.urlGraph.getUrlInfo(reference.parentUrl)
+      let urlType
       if (reference.injected) {
-        type = reference.expectedType
-        subtype = reference.expectedSubtype
+        urlType = reference.expectedType
       } else {
-        type = parentUrlInfo ? parentUrlInfo.type : "entry_point"
-        subtype = parentUrlInfo ? parentUrlInfo.subtype : ""
+        const parentUrlInfo = context.urlGraph.getUrlInfo(reference.parentUrl)
+        urlType = parentUrlInfo ? parentUrlInfo.type : "entry_point"
       }
-      const urlType =
-        subtype === "self_import_scripts_arg" ? "js_import_script" : type
       const resolver = resolvers[urlType] || resolvers["*"]
       return resolver(reference, context)
     },