@jsenv/core 20.3.2 → 21.0.0

package/src/internal/compiling/transformResultToCompilationResult.js

@@ -4,6 +4,7 @@ import {
   readFile,
   ensureWindowsDriveLetter,
 } from "@jsenv/filesystem"
+
 import {
   replaceBackSlashesWithSlashes,
   startsWithWindowsDriveLetter,
@@ -20,7 +21,7 @@ import { testFilePresence } from "./compile-directory/fs-optimized-for-cache.js"
 const isWindows = process.platform === "win32"
 
 export const transformResultToCompilationResult = async (
-  { code, map, contentType = "application/javascript", metadata = {} },
+  { contentType, code, map, metadata = {} },
   {
     projectDirectoryUrl,
     originalFileContent,
@@ -37,6 +38,9 @@ export const transformResultToCompilationResult = async (
     sourcemapMethod = "comment", // "comment", "inline"
   },
 ) => {
+  if (typeof contentType !== "string") {
+    throw new TypeError(`contentType must be a string, got ${contentType}`)
+  }
   if (typeof projectDirectoryUrl !== "string") {
     throw new TypeError(
       `projectDirectoryUrl must be a string, got ${projectDirectoryUrl}`,
@@ -146,8 +150,9 @@ export const transformResultToCompilationResult = async (
   }
 
   return {
-    compiledSource: output,
     contentType,
+    compiledSource: output,
+    sourcemap: map,
     sources,
     sourcesContent,
     assets,

package/src/internal/executing/executePlan.js

@@ -39,7 +39,7 @@ export const executePlan = async (
     compileServerCanReadFromFilesystem,
     compileServerCanWriteOnFilesystem,
     babelPluginMap,
-    convertMap,
+    customCompilers,
     runtimeSupport,
   } = {},
 ) => {
@@ -78,7 +78,7 @@ export const executePlan = async (
     compileServerCanWriteOnFilesystem,
     keepProcessAlive: true, // to be sure it stays alive
     babelPluginMap,
-    convertMap,
+    customCompilers,
     runtimeSupport,
   })
 

package/src/internal/runtime/createBrowserRuntime/scanBrowserRuntimeFeatures.js

@@ -21,8 +21,7 @@ export const scanBrowserRuntimeFeatures = async ({
     groupMap,
   })
   const groupInfo = groupMap[compileId]
-  const { inlineImportMapIntoHTML, customCompilerNames, convertPatterns } =
-    envJson
+  const { inlineImportMapIntoHTML, customCompilerPatterns } = envJson
 
   const featuresReport = {
     babelPluginRequiredNames: babelPluginRequiredNamesFromGroupInfo(groupInfo, {
@@ -32,16 +31,14 @@ export const scanBrowserRuntimeFeatures = async ({
       failFastOnFeatureDetection,
       groupInfo,
       inlineImportMapIntoHTML,
-      customCompilerNames,
+      customCompilerPatterns,
       coverageInstrumentationRequired,
     })),
-    customCompilerNames,
-    convertPatterns,
+    customCompilerPatterns,
   }
 
   const canAvoidCompilation =
-    featuresReport.convertPatterns.length === 0 &&
-    featuresReport.customCompilerNames.length === 0 &&
+    featuresReport.customCompilerPatterns.length === 0 &&
     featuresReport.jsenvPluginRequiredNames.length === 0 &&
     featuresReport.babelPluginRequiredNames.length === 0 &&
     featuresReport.importmapSupported &&

package/src/internal/toolbar/compilation/toolbar.compilation.js

@@ -166,21 +166,13 @@ const getBrowserSupportMessage = ({
     )
   }
 
-  const { convertPatterns } = featuresReport
-  const convertPatternCount = convertPatterns.length
-  if (convertPatternCount === 0) {
-    // no need to talk about something unused
-  } else {
-    parts.push(`convertMap is used with the following keys: ${convertPatterns}`)
-  }
-
-  const { customCompilerNames } = featuresReport
-  const customCompilerCount = customCompilerNames.length
+  const { customCompilerPatterns } = featuresReport
+  const customCompilerCount = customCompilerPatterns.length
   if (customCompilerCount === 0) {
     // no need to talk about something unused
   } else {
     parts.push(
-      `${customCompilerCount} custom compilers enabled: ${customCompilerNames}`,
+      `${customCompilerCount} custom compilers enabled: ${customCompilerPatterns}`,
     )
   }
 

package/src/startExploring.js

@@ -44,7 +44,6 @@ export const startExploring = async ({
   keepProcessAlive = true,
 
   babelPluginMap,
-  convertMap,
   runtimeSupportDuringDev = jsenvRuntimeSupportDuringDev,
   compileServerLogLevel,
   compileServerCanReadFromFilesystem,
@@ -116,7 +115,6 @@ export const startExploring = async ({
       compileServerCertificate,
       compileServerPrivateKey,
       babelPluginMap,
-      convertMap,
       runtimeSupport: runtimeSupportDuringDev,
       livereloadWatchConfig,
     })

package/src/textToJavaScriptModule.js

@@ -0,0 +1,10 @@
+export const textToJavaScriptModule = async ({ code, url }) => {
+  return {
+    compiledSource: `export default "${JSON.stringify(code)}"`,
+    contentType: "application/javascript",
+    sources: [url],
+    sourcesContent: [code],
+    assets: [],
+    assetsContent: [],
+  }
+}

package/src/internal/compiling/transformImportmap.js

@@ -1,94 +0,0 @@
-/**
- * allows the following:
- *
- * import "@jsenv/core/helpers/regenerator-runtime/regenerator-runtime.js"
- * -> searches a file inside @jsenv/core/*
- *
- */
-
-import { urlToRelativeUrl, urlIsInsideOf } from "@jsenv/filesystem"
-import { composeTwoImportMaps } from "@jsenv/import-map"
-import { jsenvCoreDirectoryUrl } from "../jsenvCoreDirectoryUrl.js"
-
-export const transformImportmap = async (
-  importmapBeforeTransformation,
-  { originalFileUrl },
-) => {
-  const importMapForProject = JSON.parse(importmapBeforeTransformation)
-
-  const topLevelRemappingForJsenvCore = {
-    "@jsenv/core/": urlToRelativeUrlRemapping(
-      jsenvCoreDirectoryUrl,
-      originalFileUrl,
-    ),
-  }
-
-  const importmapForSelfImport = {
-    imports: topLevelRemappingForJsenvCore,
-    scopes: generateJsenvCoreScopes({
-      importMapForProject,
-      topLevelRemappingForJsenvCore,
-    }),
-  }
-
-  const importMap = [importmapForSelfImport, importMapForProject].reduce(
-    (previous, current) => composeTwoImportMaps(previous, current),
-    {},
-  )
-
-  const scopes = importMap.scopes || {}
-  const projectTopLevelMappings = importMapForProject.imports || {}
-  Object.keys(scopes).forEach((scope) => {
-    const scopedMappings = scopes[scope]
-    Object.keys(projectTopLevelMappings).forEach((key) => {
-      if (key in scopedMappings) {
-        scopedMappings[key] = projectTopLevelMappings[key]
-      }
-    })
-  })
-
-  return {
-    compiledSource: JSON.stringify(importMap, null, "  "),
-    contentType: "application/importmap+json",
-    sources: [originalFileUrl],
-    sourcesContent: [importmapBeforeTransformation],
-    assets: [],
-    assetsContent: [],
-  }
-}
-
-// this function just here to ensure relative urls starts with './'
-// so that importmap do not consider them as bare specifiers
-const urlToRelativeUrlRemapping = (url, baseUrl) => {
-  const relativeUrl = urlToRelativeUrl(url, baseUrl)
-
-  if (urlIsInsideOf(url, baseUrl)) {
-    if (relativeUrl.startsWith("../")) return relativeUrl
-    if (relativeUrl.startsWith("./")) return relativeUrl
-    return `./${relativeUrl}`
-  }
-
-  return relativeUrl
-}
-
-const generateJsenvCoreScopes = ({
-  importMapForProject,
-  topLevelRemappingForJsenvCore,
-}) => {
-  const { scopes } = importMapForProject
-
-  if (!scopes) {
-    return undefined
-  }
-
-  // I must ensure jsenvCoreImports wins by default in every scope
-  // because scope may contains stuff like
-  // "/": "/"
-  // "/": "/folder/"
-  // to achieve this, we set jsenvCoreImports into every scope
-  const scopesForJsenvCore = {}
-  Object.keys(scopes).forEach((scopeKey) => {
-    scopesForJsenvCore[scopeKey] = topLevelRemappingForJsenvCore
-  })
-  return scopesForJsenvCore
-}