@jsenv/core 29.1.7 → 29.1.9

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

@@ -16,7 +16,8 @@ import {
   injectScriptNodeAsEarlyAsPossible,
   createHtmlNode,
 } from "@jsenv/ast"
-import { injectQueryParams } from "@jsenv/urls"
+import { injectQueryParams, urlToRelativeUrl } from "@jsenv/urls"
+import { SOURCEMAP } from "@jsenv/sourcemap"
 
 export const jsenvPluginAsJsClassicHtml = ({
   systemJsInjection,
@@ -32,10 +33,14 @@ export const jsenvPluginAsJsClassicHtml = ({
     name: "jsenv:as_js_classic_html",
     appliesDuring: "*",
     init: (context) => {
-      shouldTransformScriptTypeModule =
-        !context.isSupportedOnCurrentClients("script_type_module") ||
-        !context.isSupportedOnCurrentClients("import_dynamic") ||
-        !context.isSupportedOnCurrentClients("import_meta")
+      const nodeRuntimeEnabled = Object.keys(context.runtimeCompat).includes(
+        "node",
+      )
+      shouldTransformScriptTypeModule = nodeRuntimeEnabled
+        ? false
+        : !context.isSupportedOnCurrentClients("script_type_module") ||
+          !context.isSupportedOnCurrentClients("import_dynamic") ||
+          !context.isSupportedOnCurrentClients("import_meta")
     },
     redirectUrl: {
       link_href: (reference) => {
@@ -63,6 +68,15 @@ export const jsenvPluginAsJsClassicHtml = ({
         }
         return null
       },
+      js_url_specifier: (reference) => {
+        if (
+          shouldTransformScriptTypeModule &&
+          reference.expectedType === "js_module"
+        ) {
+          return turnIntoJsClassicProxy(reference)
+        }
+        return null
+      },
     },
     finalizeUrlContent: {
       html: async (urlInfo, context) => {
@@ -162,10 +176,25 @@ export const jsenvPluginAsJsClassicHtml = ({
           }
           if (needsSystemJs) {
             mutations.push(async () => {
-              const systemJsFileContent = readFileSync(
+              let systemJsFileContent = readFileSync(
                 new URL(systemJsClientFileUrl),
                 { encoding: "utf8" },
               )
+              const sourcemapFound = SOURCEMAP.readComment({
+                contentType: "text/javascript",
+                content: systemJsFileContent,
+              })
+              if (sourcemapFound) {
+                const sourcemapFileUrl = new URL(
+                  sourcemapFound.specifier,
+                  systemJsClientFileUrl,
+                )
+                systemJsFileContent = SOURCEMAP.writeComment({
+                  contentType: "text/javascript",
+                  content: systemJsFileContent,
+                  specifier: urlToRelativeUrl(sourcemapFileUrl, urlInfo.url),
+                })
+              }
               const [systemJsReference, systemJsUrlInfo] =
                 context.referenceUtils.inject({
                   type: "script_src",

package/src/plugins/url_analysis/jsenv_plugin_reference_expected_types.js

@@ -0,0 +1,55 @@
+import { CONTENT_TYPE } from "@jsenv/utils/src/content_type/content_type.js"
+
+export const jsenvPluginReferenceExpectedTypes = () => {
+  const redirectJsUrls = (reference) => {
+    const urlObject = new URL(reference.url)
+    const { searchParams } = urlObject
+
+    if (searchParams.has("entry_point")) {
+      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("js_module")) {
+      searchParams.delete("js_module")
+      reference.expectedType = "js_module"
+    } else if (
+      reference.type === "js_url_specifier" &&
+      reference.expectedType === undefined &&
+      CONTENT_TYPE.fromUrlExtension(reference.url) === "text/javascript"
+    ) {
+      // by default, js referenced by new URL is considered as "js_module"
+      // in case this is not desired code must use "?js_classic" like
+      // new URL('./file.js?js_classic', import.meta.url)
+      reference.expectedType = "js_module"
+    }
+
+    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
+  }
+
+  return {
+    name: "jsenv:reference_expected_types",
+    appliesDuring: "*",
+    redirectUrl: {
+      script_src: redirectJsUrls,
+      js_url_specifier: redirectJsUrls,
+    },
+  }
+}

package/src/plugins/url_analysis/jsenv_plugin_url_analysis.js

@@ -1,6 +1,7 @@
 import { URL_META } from "@jsenv/url-meta"
 import { urlToRelativeUrl } from "@jsenv/urls"
 
+import { jsenvPluginReferenceExpectedTypes } from "./jsenv_plugin_reference_expected_types.js"
 import { parseAndTransformHtmlUrls } from "./html/html_urls.js"
 import { parseAndTransformCssUrls } from "./css/css_urls.js"
 import { parseAndTransformJsUrls } from "./js/js_urls.js"
@@ -24,69 +25,72 @@ export const jsenvPluginUrlAnalysis = ({
     }
   }
 
-  return {
-    name: "jsenv:url_analysis",
-    appliesDuring: "*",
-    redirectUrl: (reference) => {
-      if (reference.shouldHandle !== undefined) {
-        return
-      }
-      if (
-        reference.specifier[0] === "#" &&
-        // For Html, css and in general "#" refer to a resource in the page
-        // so that urls must be kept intact
-        // However for js import specifiers they have a different meaning and we want
-        // to resolve them (https://nodejs.org/api/packages.html#imports for instance)
-        reference.type !== "js_import_export"
-      ) {
-        reference.shouldHandle = false
-        return
-      }
-      const includeInfo = getIncludeInfo(reference.url)
-      if (includeInfo === true) {
-        reference.shouldHandle = true
-        return
-      }
-      if (includeInfo === false) {
-        reference.shouldHandle = false
-        return
-      }
-      const { protocol } = new URL(reference.url)
-      const protocolIsSupported = supportedProtocols.some(
-        (supportedProtocol) => protocol === supportedProtocol,
-      )
-      if (protocolIsSupported) {
-        reference.shouldHandle = true
-      }
-    },
-    transformUrlContent: {
-      html: parseAndTransformHtmlUrls,
-      css: parseAndTransformCssUrls,
-      js_classic: parseAndTransformJsUrls,
-      js_module: parseAndTransformJsUrls,
-      webmanifest: parseAndTransformWebmanifestUrls,
-      directory: (urlInfo, context) => {
-        const originalDirectoryReference = findOriginalDirectoryReference(
-          urlInfo,
-          context,
-        )
-        const directoryRelativeUrl = urlToRelativeUrl(
-          urlInfo.url,
-          context.rootDirectoryUrl,
+  return [
+    {
+      name: "jsenv:url_analysis",
+      appliesDuring: "*",
+      redirectUrl: (reference) => {
+        if (reference.shouldHandle !== undefined) {
+          return
+        }
+        if (
+          reference.specifier[0] === "#" &&
+          // For Html, css and in general "#" refer to a resource in the page
+          // so that urls must be kept intact
+          // However for js import specifiers they have a different meaning and we want
+          // to resolve them (https://nodejs.org/api/packages.html#imports for instance)
+          reference.type !== "js_import_export"
+        ) {
+          reference.shouldHandle = false
+          return
+        }
+        const includeInfo = getIncludeInfo(reference.url)
+        if (includeInfo === true) {
+          reference.shouldHandle = true
+          return
+        }
+        if (includeInfo === false) {
+          reference.shouldHandle = false
+          return
+        }
+        const { protocol } = new URL(reference.url)
+        const protocolIsSupported = supportedProtocols.some(
+          (supportedProtocol) => protocol === supportedProtocol,
         )
-        JSON.parse(urlInfo.content).forEach((directoryEntryName) => {
-          context.referenceUtils.found({
-            type: "filesystem",
-            subtype: "directory_entry",
-            specifier: directoryEntryName,
-            trace: {
-              message: `"${directoryRelativeUrl}${directoryEntryName}" entry in directory referenced by ${originalDirectoryReference.trace.message}`,
-            },
+        if (protocolIsSupported) {
+          reference.shouldHandle = true
+        }
+      },
+      transformUrlContent: {
+        html: parseAndTransformHtmlUrls,
+        css: parseAndTransformCssUrls,
+        js_classic: parseAndTransformJsUrls,
+        js_module: parseAndTransformJsUrls,
+        webmanifest: parseAndTransformWebmanifestUrls,
+        directory: (urlInfo, context) => {
+          const originalDirectoryReference = findOriginalDirectoryReference(
+            urlInfo,
+            context,
+          )
+          const directoryRelativeUrl = urlToRelativeUrl(
+            urlInfo.url,
+            context.rootDirectoryUrl,
+          )
+          JSON.parse(urlInfo.content).forEach((directoryEntryName) => {
+            context.referenceUtils.found({
+              type: "filesystem",
+              subtype: "directory_entry",
+              specifier: directoryEntryName,
+              trace: {
+                message: `"${directoryRelativeUrl}${directoryEntryName}" entry in directory referenced by ${originalDirectoryReference.trace.message}`,
+              },
+            })
           })
-        })
+        },
       },
     },
-  }
+    jsenvPluginReferenceExpectedTypes(),
+  ]
 }
 
 const findOriginalDirectoryReference = (urlInfo, context) => {