Merge pull request #43 from jsenv/extension_automapping_fix

Extension automapping fix

Author: dmail

.github/workflows/performance_impact.yml

@@ -38,6 +38,6 @@ jobs:
       - name: Setup npm
         run: npm install
       - name: Report performance impact
-        run: node ./.github/workflows/performance_impact/report_performance_impact.mjs
+        run: node --expose-gc ./.github/workflows/performance_impact/report_performance_impact.mjs
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

babel.config.cjs

@@ -1,29 +1,10 @@
 /*
- * This file is used to configure a list of babel plugins as documented in
- * https://babeljs.io/docs/en/config-files
- *
- * During dev: babel plugins natively supported by browsers and Node.js are not used.
- * During build:
- *  - When "runtimeSupport" is configured, babel plugins already supported by these runtime won't be used
- *  See https://github.com/jsenv/jsenv-template-node-package/blob/main/script/build/build.mjs#L25
- *  - Otherwise all babel plugins are use
+ * This file configure the list of babel plugins enabled
+ * in this codebase
  *
+ * Read more at https://github.com/jsenv/jsenv-core/tree/master/packages/jsenv-babel-preset
  */
 
-// "@babel/preset-env" transforms async function to generators
-// but it's verbose and slow compared to using promises, so we:
-// 1. Exclude "transform-async-to-generator", "transform-regenerator"
-// 2. Enable "babel-plugin-transform-async-to-promises"
-// See https://github.com/babel/babel/issues/8121
 module.exports = {
-  presets: [
-    [
-      "@babel/preset-env",
-      {
-        modules: false,
-        exclude: ["transform-async-to-generator", "transform-regenerator"],
-      },
-    ],
-  ],
-  plugins: ["babel-plugin-transform-async-to-promises"],
+  presets: ["@jsenv/babel-preset"],
 }

jsenv.config.mjs

@@ -1 +1,10 @@
+/*
+ * This file exports configuration reused by jsenv scripts such as
+ *
+ * script/test/test.mjs
+ * script/build/build.mjs
+ *
+ * Read more at https://github.com/jsenv/jsenv-core#jsenvconfigmjs
+ */
+
 export const projectDirectoryUrl = String(new URL("./", import.meta.url))

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/importmap-node-module",
-  "version": "2.3.1",
+  "version": "2.3.2",
   "description": "Generate importmap for node_modules",
   "license": "MIT",
   "repository": {
@@ -29,7 +29,7 @@
   "scripts": {
     "eslint-check": "node ./node_modules/eslint/bin/eslint.js .",
     "generate-importmap": "node ./script/importmap/generate_importmap.mjs",
-    "measure-performances": "node ./script/performance/generate_performance_report.mjs --local",
+    "measure-performances": "node --expose-gc ./script/performance/generate_performance_report.mjs --local",
     "dist": "npm run build",
     "build": "node --experimental-import-meta-resolve ./script/build/build.mjs",
     "test": "node ./script/test/test.mjs",
@@ -54,10 +54,10 @@
     "@babel/plugin-proposal-class-properties": "7.14.5",
     "@babel/plugin-proposal-decorators": "7.15.4",
     "@babel/plugin-syntax-jsx": "7.14.5",
-    "@babel/preset-env": "7.15.6",
+    "@jsenv/babel-preset": "1.1.0",
     "@jsenv/assert": "2.3.1",
     "@jsenv/codecov-upload": "3.5.0",
-    "@jsenv/core": "22.0.3",
+    "@jsenv/core": "22.2.0",
     "@jsenv/eslint-config": "16.0.6",
     "@jsenv/github-release-package": "1.2.3",
     "@jsenv/importmap-eslint-resolver": "5.1.2",

script/performance/measure_import/measure_import.mjs

@@ -1,4 +1,4 @@
-import { fork } from "node:child_process"
+import { Worker } from "node:worker_threads"
 import { fileURLToPath } from "node:url"
 import {
   measurePerformanceMultipleTimes,
@@ -7,21 +7,21 @@ import {
 } from "@jsenv/performance-impact"
 
 export const measureImport = async ({ iterations = 10 } = {}) => {
-  const childProcessFileUrl = new URL(
-    "./child_process_measuring_import.mjs",
+  if (!global.gc) {
+    throw new Error("missing --expose-gc")
+  }
+  const workerFileUrl = new URL(
+    "./worker_measuring_import.mjs",
     import.meta.url,
   )
-  const childProcessFilePath = fileURLToPath(childProcessFileUrl)
+  const workerFilePath = fileURLToPath(workerFileUrl)
 
   const metrics = await measurePerformanceMultipleTimes(
     async () => {
-      const childProcess = fork(childProcessFilePath, {
-        execArgv: ["--expose-gc"],
-      })
-      const { msEllapsed, heapUsed } = await new Promise((resolve) => {
-        childProcess.on("message", (message) => {
-          resolve(message)
-        })
+      const worker = new Worker(workerFilePath)
+      const { msEllapsed, heapUsed } = await new Promise((resolve, reject) => {
+        worker.on("message", resolve)
+        worker.on("error", reject)
       })
 
       return {

…mport/child_process_measuring_import.mjs …asure_import/worker_measuring_import.mjsscript/performance/measure_import/child_process_measuring_import.mjs renamed to script/performance/measure_import/worker_measuring_import.mjs script/performance/measure_import/child_process_measuring_import.mjs renamed to script/performance/measure_import/worker_measuring_import.mjs

@@ -1,19 +1,21 @@
-/* eslint-disable no-unused-vars */
-import { memoryUsage } from "process"
+import { parentPort } from "node:worker_threads"
+import { memoryUsage } from "node:process"
 
 global.gc()
 const beforeHeapUsed = memoryUsage().heapUsed
 const beforeMs = Date.now()
 
-let namespace = await import(`../../../index.js?t=${Date.now()}`)
+let namespace = await import("@jsenv/importmap-node-module")
 
 const afterMs = Date.now()
-
-const msEllapsed = afterMs - beforeMs
 const afterHeapUsed = memoryUsage().heapUsed
-
-const heapUsed = afterHeapUsed - beforeHeapUsed
-process.send({ msEllapsed, heapUsed })
-
+// eslint-disable-next-line no-unused-vars
 namespace = null
 global.gc()
+
+const heapUsed = afterHeapUsed - beforeHeapUsed
+const msEllapsed = afterMs - beforeMs
+parentPort.postMessage({
+  heapUsed,
+  msEllapsed,
+})

src/internal/from-js/visitSourceFiles.js

@@ -310,15 +310,22 @@ const createImportResolver = ({
         importer,
       ),
     })
-    const packageDirectoryUrl = packageDirectoryUrlFromUrl(
-      url,
+
+    const importerUrl = httpUrlToFileUrl(importer, {
+      projectDirectoryUrl,
+      baseUrl,
+    })
+    const importerPackageDirectoryUrl = packageDirectoryUrlFromUrl(
+      importerUrl,
       projectDirectoryUrl,
     )
-    const packageFileUrl = resolveUrl("package.json", packageDirectoryUrl)
     const scope =
-      packageDirectoryUrl === projectDirectoryUrl
+      importerPackageDirectoryUrl === projectDirectoryUrl
         ? undefined
-        : `./${urlToRelativeUrl(packageDirectoryUrl, projectDirectoryUrl)}`
+        : `./${urlToRelativeUrl(
+            importerPackageDirectoryUrl,
+            projectDirectoryUrl,
+          )}`
     const automapping = {
       scope,
       from: specifier,
@@ -369,6 +376,11 @@ const createImportResolver = ({
     }
     if (magicExtension) {
       if (!extensionlessAutomapping) {
+        const packageDirectoryUrl = packageDirectoryUrlFromUrl(
+          url,
+          projectDirectoryUrl,
+        )
+        const packageFileUrl = resolveUrl("package.json", packageDirectoryUrl)
         const mappingFoundInPackageExports =
           await extensionIsMappedInPackageExports(packageFileUrl)
         if (!mappingFoundInPackageExports) {