@jsenv/core 25.0.0 → 25.2.0

package/src/internal/compiling/createCompiledFileService.js

@@ -38,7 +38,9 @@ export const createCompiledFileService = ({
   logger,
 
   projectDirectoryUrl,
+  jsenvDirectoryRelativeUrl,
   outDirectoryRelativeUrl,
+  jsenvRemoteDirectory,
 
   runtimeSupport,
   babelPluginMap,
@@ -89,12 +91,9 @@ export const createCompiledFileService = ({
 
   const importmapInfos = {}
 
-  return (request, { pushResponse, redirectRequest }) => {
+  return async (request, { pushResponse, redirectRequest }) => {
     const { origin, ressource } = request
-    // we use "ressourceToPathname" to remove eventual query param from the url
-    // Without this a pattern like "**/*.js" would not match "file.js?t=1"
-    // This would result in file not being compiled when they should
-    const requestUrl = `${origin}${ressourceToPathname(ressource)}`
+    const requestUrl = `${origin}${ressource}`
 
     const requestCompileInfo = serverUrlToCompileInfo(requestUrl, {
       outDirectoryRelativeUrl,
@@ -140,8 +139,6 @@ export const createCompiledFileService = ({
     }
 
     const originalFileRelativeUrl = afterCompileId
-    projectFileRequestedCallback(originalFileRelativeUrl, request)
-
     const originalFileUrl = `${projectDirectoryUrl}${originalFileRelativeUrl}`
     const compileDirectoryRelativeUrl = `${outDirectoryRelativeUrl}${compileId}/`
     const compileDirectoryUrl = resolveDirectoryUrl(
@@ -152,23 +149,22 @@ export const createCompiledFileService = ({
       originalFileRelativeUrl,
       compileDirectoryUrl,
     )
-
     const compiler = getCompiler({ originalFileUrl, compileMeta })
     // no compiler -> serve original file
-    // we don't redirect otherwise it complexify ressource tracking
-    // and url resolution
+    // we redirect "internally" (we dont send 304 to the browser)
+    // to keep ressource tracking and url resolution simple
     if (!compiler) {
       return redirectRequest({
         pathname: `/${originalFileRelativeUrl}`,
       })
     }
-
     // compile this if needed
     const compileResponsePromise = compileFile({
       compileServerOperation,
       logger,
 
       projectDirectoryUrl,
+      jsenvRemoteDirectory,
       originalFileUrl,
       compiledFileUrl,
 
@@ -181,14 +177,16 @@ export const createCompiledFileService = ({
         return compiler({
           logger,
 
-          code,
-          url: originalFileUrl,
-          compiledUrl: compiledFileUrl,
           projectDirectoryUrl,
+          jsenvRemoteDirectory,
           compileServerOrigin: request.origin,
+          jsenvDirectoryRelativeUrl,
           outDirectoryRelativeUrl,
-          compileId,
+          url: originalFileUrl,
+          compiledUrl: compiledFileUrl,
           request,
+
+          compileId,
           babelPluginMap: shakeBabelPluginMap({
             babelPluginMap,
             missingFeatureNames: groupMap[compileId].missingFeatureNames,
@@ -204,6 +202,7 @@ export const createCompiledFileService = ({
           topLevelAwait,
           prependSystemJs,
 
+          code,
           sourcemapMethod,
           sourcemapExcludeSources,
           jsenvEventSourceClientInjection,
@@ -238,6 +237,14 @@ const canAvoidSystemJs = ({
 }
 
 const getCompiler = ({ originalFileUrl, compileMeta }) => {
+  // we remove eventual query param from the url
+  // Without this a pattern like "**/*.js" would not match "file.js?t=1"
+  // This would result in file not being compiled when they should
+  // Ideally we would do a first pass with the query param and a second without
+  const urlObject = new URL(originalFileUrl)
+  urlObject.search = ""
+  originalFileUrl = urlObject.href
+
   const { jsenvCompiler, customCompiler } = urlToMeta({
     url: originalFileUrl,
     structuredMetaMap: compileMeta,
@@ -307,12 +314,3 @@ const contentTypeExtensions = {
   "application/importmap+json": ".importmap",
   // "text/css": ".css",
 }
-
-const ressourceToPathname = (ressource) => {
-  const searchSeparatorIndex = ressource.indexOf("?")
-  const pathname =
-    searchSeparatorIndex === -1
-      ? ressource
-      : ressource.slice(0, searchSeparatorIndex)
-  return pathname
-}

package/src/internal/compiling/html_source_file_service.js

@@ -41,7 +41,7 @@ import {
   removeHtmlNodeAttribute,
   getHtmlNodeTextNode,
   setHtmlNodeText,
-  getUniqueNameForInlineHtmlNode,
+  getIdForInlineHtmlNode,
 } from "./compileHtml.js"
 import { jsenvCoreDirectoryUrl } from "../jsenvCoreDirectoryUrl.js"
 
@@ -121,8 +121,8 @@ export const createTransformHtmlSourceFileService = ({
       jsenvScriptInjection,
       jsenvEventSourceClientInjection,
       jsenvToolbarInjection,
-      onInlineModuleScript: ({ scriptContent, scriptIdentifier }) => {
-        const inlineScriptUrl = resolveUrl(scriptIdentifier, fileUrl)
+      onInlineModuleScript: ({ scriptContent, scriptSpecifier }) => {
+        const inlineScriptUrl = resolveUrl(scriptSpecifier, fileUrl)
         htmlInlineScriptMap.set(inlineScriptUrl, {
           htmlFileUrl: fileUrl,
           scriptContent,
@@ -232,35 +232,35 @@ const transformHTMLSourceFile = async ({
     const { scripts } = parseHtmlAstRessources(htmlAst)
     scripts.forEach((script) => {
       const typeAttribute = getHtmlNodeAttributeByName(script, "type")
+      const type = typeAttribute ? typeAttribute.value : ""
       const srcAttribute = getHtmlNodeAttributeByName(script, "src")
-
-      // remote
-      if (typeAttribute && typeAttribute.value === "module" && srcAttribute) {
+      const src = srcAttribute ? srcAttribute.value : ""
+      if (type === "module" && src) {
         removeHtmlNodeAttribute(script, srcAttribute)
+        // Ideally jsenv should take into account eventual
+        // "integrity" and "crossorigin" attribute during "executeFileUsingDynamicImport"
         setHtmlNodeText(
           script,
           `window.__jsenv__.executeFileUsingDynamicImport(${JSON.stringify(
-            srcAttribute.value,
+            src,
           )})`,
         )
         return
       }
-      // inline
       const textNode = getHtmlNodeTextNode(script)
-      if (typeAttribute && typeAttribute.value === "module" && textNode) {
-        const scriptIdentifier = getUniqueNameForInlineHtmlNode(
-          script,
-          scripts,
-          `${urlToFilename(fileUrl)}__inline__[id].js`,
-        )
+      if (type === "module" && textNode) {
+        const scriptId = getIdForInlineHtmlNode(script, scripts)
+        const scriptSpecifier = `${urlToFilename(
+          fileUrl,
+        )}__inline__${scriptId}.js`
         onInlineModuleScript({
           scriptContent: textNode.value,
-          scriptIdentifier,
+          scriptSpecifier,
         })
         setHtmlNodeText(
           script,
           `window.__jsenv__.executeFileUsingDynamicImport(${JSON.stringify(
-            `./${scriptIdentifier}`,
+            `./${scriptSpecifier}`,
           )})`,
         )
         return
@@ -275,7 +275,8 @@ const transformHTMLSourceFile = async ({
     projectDirectoryUrl,
   })
 
-  return stringifyHtmlAst(htmlAst)
+  const htmlTransformed = stringifyHtmlAst(htmlAst)
+  return htmlTransformed
 }
 
 const visitImportmapScripts = async ({
@@ -315,14 +316,12 @@ const visitImportmapScripts = async ({
           )
           return
         }
-
         const importMapContent = await importMapResponse.json()
         const importMapInlined = moveImportMap(
           importMapContent,
           importMapUrl,
           htmlFileUrl,
         )
-
         replaceHtmlNode(
           importmapScript,
           `<script type="importmap">${JSON.stringify(

package/src/internal/compiling/js-compilation-service/jsenvTransform.js

@@ -6,6 +6,7 @@ import {
   getMinimalBabelPluginMap,
   babelPluginsFromBabelPluginMap,
 } from "@jsenv/core/src/internal/compiling/babel_plugins.js"
+import { babelPluginProxyExternalImports } from "@jsenv/core/src/internal/compiling/babel_plugin_proxy_external_imports.js"
 import { babelPluginImportMetadata } from "@jsenv/core/src/internal/compiling/babel_plugin_import_metadata.js"
 
 import { ansiToHTML } from "./ansiToHTML.js"
@@ -15,9 +16,7 @@ import { babelPluginSystemJsPrepend } from "./babel_plugin_systemjs_prepend.js"
 import { filePathToBabelHelperName } from "./babelHelper.js"
 
 export const jsenvTransform = async ({
-  code,
-  map, // optional
-  ast, // optional
+  jsenvRemoteDirectory,
   url,
   relativeUrl, // optional
 
@@ -25,12 +24,15 @@ export const jsenvTransform = async ({
   moduleOutFormat,
   importMetaFormat = moduleOutFormat,
   topLevelAwait,
-
   babelHelpersInjectionAsImport,
   prependSystemJs,
   transformGenerator,
   regeneratorRuntimeImportPath,
+
   sourcemapEnabled,
+  ast, // optional
+  map, // optional
+  code,
 }) => {
   const transformModulesSystemJs = require("@babel/plugin-transform-modules-systemjs")
   const proposalDynamicImport = require("@babel/plugin-proposal-dynamic-import")
@@ -146,6 +148,14 @@ export const jsenvTransform = async ({
           ],
         }
       : {}),
+    ...(jsenvRemoteDirectory
+      ? {
+          "proxy-external-imports": [
+            babelPluginProxyExternalImports,
+            { jsenvRemoteDirectory },
+          ],
+        }
+      : {}),
     "import-metadata": [babelPluginImportMetadata],
   }
   if (moduleOutFormat === "systemjs") {

package/src/internal/compiling/js-compilation-service/transformJs.js

@@ -3,10 +3,9 @@ import { urlToRelativeUrl } from "@jsenv/filesystem"
 import { jsenvTransform } from "./jsenvTransform.js"
 
 export const transformJs = async ({
-  code,
-  map,
-  url,
   projectDirectoryUrl,
+  jsenvRemoteDirectory,
+  url,
 
   babelPluginMap,
   moduleOutFormat = "esmodule",
@@ -16,6 +15,9 @@ export const transformJs = async ({
   topLevelAwait,
   transformGenerator = true,
   sourcemapEnabled = true,
+
+  map,
+  code,
 }) => {
   if (typeof projectDirectoryUrl !== "string") {
     throw new TypeError(
@@ -40,12 +42,14 @@ export const transformJs = async ({
   }
 
   const transformResult = await jsenvTransform({
-    code,
-    map,
     url,
     relativeUrl: url.startsWith(projectDirectoryUrl)
       ? urlToRelativeUrl(url, projectDirectoryUrl)
       : undefined,
+    projectDirectoryUrl,
+    jsenvRemoteDirectory,
+    code,
+    map,
 
     babelPluginMap,
     moduleOutFormat,