@jsenv/core 25.4.1 → 25.4.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "25.4.1",
+  "version": "25.4.5",
   "description": "Tool to develop, test and build js projects",
   "license": "MIT",
   "repository": {
@@ -115,7 +115,7 @@
     "@babel/plugin-transform-react-jsx": "7.16.5",
     "@babel/plugin-transform-typescript": "7.16.1",
     "@babel/preset-env": "7.16.5",
-    "@jsenv/assert": "2.4.1",
+    "@jsenv/assert": "2.5.0",
     "@jsenv/babel-preset": "1.1.2",
     "@jsenv/eslint-config": "16.0.9",
     "@jsenv/file-size-impact": "12.1.6",

package/src/importUsingChildProcess.js

@@ -15,6 +15,7 @@ export const importUsingChildProcess = async (
     stderr,
   } = {},
 ) => {
+  fileUrl = String(fileUrl)
   const result = await launchAndExecute({
     stopAfterExecute: true,
     fileRelativeUrl: String(fileUrl),

package/src/internal/compiling/babel_plugin_transform_import_meta.js

@@ -12,10 +12,10 @@ export const babelPluginTransformImportMeta = (api, { importMetaFormat }) => {
     addDefault,
     addNamed,
   } = require("@babel/helper-module-imports")
-  const { parseExpression } = require("@babel/parser")
   let babelState
   const jsValueToAst = (jsValue) => {
-    const valueAst = parseExpression(jsValue, babelState.opts)
+    const { parseExpression } = require("@babel/parser")
+    const valueAst = parseExpression(jsValue, babelState.parserOpts)
     return valueAst
   }
   const visitImportMetaProperty = ({
@@ -23,51 +23,44 @@ export const babelPluginTransformImportMeta = (api, { importMetaFormat }) => {
     replaceWithImport,
     replaceWithValue,
   }) => {
-    if (importMetaPropertyName === "url") {
-      if (importMetaFormat === "esmodule") {
-        // keep native version
-        return
-      }
-      if (importMetaFormat === "systemjs") {
-        // systemjs will handle it
-        return
-      }
-      if (importMetaFormat === "commonjs") {
+    if (importMetaFormat === "esmodule") {
+      // keep native version
+      return
+    }
+    if (importMetaFormat === "systemjs") {
+      // systemjs will handle it
+      return
+    }
+    if (importMetaFormat === "commonjs") {
+      if (importMetaPropertyName === "url") {
         replaceWithImport({
           from: `@jsenv/core/helpers/import-meta/import-meta-url-commonjs.js`,
         })
         return
       }
-      if (importMetaFormat === "global") {
-        replaceWithImport({
-          from: `@jsenv/core/helpers/import-meta/import-meta-url-global.js`,
+      if (importMetaPropertyName === "resolve") {
+        throw createParseError({
+          message: `import.meta.resolve() not supported with commonjs format`,
         })
-        return
       }
+      replaceWithValue(undefined)
       return
     }
-    if (importMetaPropertyName === "resolve") {
-      if (importMetaFormat === "esmodule") {
-        // keep native version
-        return
-      }
-      if (importMetaFormat === "systemjs") {
-        // systemjs will handle it
-        return
-      }
-      if (importMetaFormat === "commonjs") {
-        throw createParseError({
-          message: `import.meta.resolve() not supported with commonjs format`,
+    if (importMetaFormat === "global") {
+      if (importMetaPropertyName === "url") {
+        replaceWithImport({
+          from: `@jsenv/core/helpers/import-meta/import-meta-url-global.js`,
         })
+        return
       }
-      if (importMetaFormat === "global") {
+      if (importMetaPropertyName === "resolve") {
         throw createParseError({
           message: `import.meta.resolve() not supported with global format`,
         })
       }
+      replaceWithValue(undefined)
       return
     }
-    replaceWithValue(undefined)
   }
 
   return {
@@ -77,31 +70,6 @@ export const babelPluginTransformImportMeta = (api, { importMetaFormat }) => {
       babelState = state
     },
 
-    //  visitor: {
-    //     Program(programPath) {
-    //       const paths = []
-    //       programPath.traverse({
-    //         MetaProperty(metaPropertyPath) {
-    //           const metaPropertyNode = metaPropertyPath.node
-    //           if (!metaPropertyNode.meta) {
-    //             return
-    //           }
-    //           if (metaPropertyNode.meta.name !== "import") {
-    //             return
-    //           }
-    //           if (metaPropertyNode.property.name !== "meta") {
-    //             return
-    //           }
-    //           paths.push(metaPropertyPath)
-    //         },
-    //       })
-
-    //       const importAst = addNamespace(programPath, importMetaSpecifier)
-    //       paths.forEach((path) => {
-    //         path.replaceWith(importAst)
-    //       })
-    //     },
-
     visitor: {
       Program(programPath) {
         const metaPropertyPathMap = {}

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

@@ -101,9 +101,7 @@ export const transformJs = async ({
     ...getMinimalBabelPluginMap(),
     "transform-import-meta": [
       babelPluginTransformImportMeta,
-      {
-        importMetaFormat,
-      },
+      { importMetaFormat },
     ],
     ...babelPluginMap,
     ...(babelHelpersInjectionAsImport

package/src/internal/compiling/jsenvCompilerForHtml.js

@@ -139,7 +139,7 @@ export const compileHtml = async ({
       addHtmlMutation,
     })
   }
-  await visitImportmapScript({
+  await visitImportmapScripts({
     logger,
     url,
     compiledUrl,
@@ -245,7 +245,7 @@ const visitRessourceHints = async ({ ressourceHints, addHtmlMutation }) => {
   )
 }
 
-const visitImportmapScript = async ({
+const visitImportmapScripts = async ({
   logger,
   url,
   compiledUrl,
@@ -265,14 +265,15 @@ const visitImportmapScript = async ({
     const type = typeAttribute ? typeAttribute.value : "application/javascript"
     return type === "importmap"
   })
+  const jsenvImportmap = getDefaultImportmap(compiledUrl, {
+    projectDirectoryUrl,
+    compileDirectoryUrl,
+  })
+
   // in case there is no importmap, force the presence
   // so that '@jsenv/core/' are still remapped
   if (importmapScripts.length === 0) {
-    const defaultImportMap = getDefaultImportmap(compiledUrl, {
-      projectDirectoryUrl,
-      compileDirectoryUrl,
-    })
-    const defaultImportMapAsText = JSON.stringify(defaultImportMap, null, "  ")
+    const defaultImportMapAsText = JSON.stringify(jsenvImportmap, null, "  ")
     onHtmlImportmapInfo({
       url: compiledUrl,
       text: defaultImportMapAsText,
@@ -324,6 +325,7 @@ const visitImportmapScript = async ({
       )
       importmap = {}
     }
+    importmap = composeTwoImportMaps(jsenvImportmap, importmap)
     const importmapAsText = JSON.stringify(importmap, null, "  ")
     onHtmlImportmapInfo({
       url: importmapUrl,
@@ -343,10 +345,6 @@ const visitImportmapScript = async ({
     return
   }
 
-  const jsenvImportmap = getDefaultImportmap(compiledUrl, {
-    projectDirectoryUrl,
-    compileDirectoryUrl,
-  })
   const htmlImportmap = JSON.parse(
     getHtmlNodeTextNode(firstImportmapScript).value,
   )

package/src/internal/compiling/jsenv_directory/comparison_utils.js

@@ -20,5 +20,8 @@ export const sameValueInTwoObjects = (object, secondObject) => {
 }
 
 export const sameValuesInTwoArrays = (array, secondArray) => {
-  return array.every((value) => secondArray.includes(value))
+  return (
+    array.length === secondArray.length &&
+    array.every((value) => secondArray.includes(value))
+  )
 }

package/src/internal/compiling/jsenv_directory/compile_context.js

@@ -61,8 +61,9 @@ const readJsenvCoreVersionFromPackageFile = async () => {
     "./package.json",
     jsenvCoreDirectoryUrl,
   )
-  const jsenvCoreVersion = await readFile(jsenvCorePackageFileUrl, {
+  const jsenvCorePackage = await readFile(jsenvCorePackageFileUrl, {
     as: "json",
-  }).version
-  return jsenvCoreVersion
+  })
+  const version = jsenvCorePackage.version
+  return version
 }

package/src/internal/import-resolution/importmap_default.js

@@ -18,7 +18,6 @@ export const getDefaultImportmap = (
     jsenvCoreDirectoryUrl,
     projectDirectoryUrl,
   )
-
   let jsenvCoreUrl
   if (compileDirectoryUrl && urlIsInsideOf(url, compileDirectoryUrl)) {
     jsenvCoreUrl = resolveUrl(
@@ -28,25 +27,11 @@ export const getDefaultImportmap = (
   } else {
     jsenvCoreUrl = jsenvCoreDirectoryUrl
   }
-
+  const jsenvCoreRelativeUrl = urlToRelativeUrl(jsenvCoreUrl, url)
   const importmap = {
     imports: {
-      "@jsenv/core/": makeRelativeMapping(jsenvCoreUrl, url),
+      "@jsenv/core/": `./${jsenvCoreRelativeUrl}`,
     },
   }
   return importmap
 }
-
-// this function just here to ensure relative urls starts with './'
-// so that importmap do not consider them as bare specifiers
-const makeRelativeMapping = (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
-}

package/src/internal/node_launcher/createControllableNodeProcess.js

@@ -277,7 +277,6 @@ export const createControllableNodeProcess = async ({
 
 const sendToProcess = async (childProcess, type, data) => {
   const source = uneval(data, { functionAllowed: true })
-
   return new Promise((resolve, reject) => {
     childProcess.send({ type, data: source }, (error) => {
       if (error) {
@@ -295,12 +294,10 @@ const installProcessOutputListener = (childProcess, callback) => {
     callback({ type: "log", text: String(chunk) })
   }
   childProcess.stdout.on("data", stdoutDataCallback)
-
   const stdErrorDataCallback = (chunk) => {
     callback({ type: "error", text: String(chunk) })
   }
   childProcess.stderr.on("data", stdErrorDataCallback)
-
   return () => {
     childProcess.stdout.removeListener("data", stdoutDataCallback)
     childProcess.stderr.removeListener("data", stdoutDataCallback)

package/src/internal/node_runtime/nodeControllableFile.mjs

@@ -59,8 +59,7 @@ const sendActionFailed = (error) => {
   sendToParent(
     ACTION_RESPONSE_EVENT_NAME,
     // process.send algorithm does not send non enumerable values
-    // because it works with JSON.stringify I guess so use uneval
-
+    // so use @jsenv/uneval
     uneval(
       {
         status: ACTION_RESPONSE_STATUS_FAILED,
@@ -91,7 +90,6 @@ const sendToParent = (type, data) => {
   if (!process.connected) {
     return
   }
-
   // this can keep process alive longer than expected
   // when source is a long string.
   // It means node process may stay alive longer than expected
@@ -111,11 +109,9 @@ const onceProcessMessage = (type, callback) => {
       callback(eval(`(${event.data})`))
     }
   }
-
   const removeListener = () => {
     process.removeListener("message", listener)
   }
-
   process.on("message", listener)
   return removeListener
 }