@jsenv/core 27.0.0-alpha.37 → 27.0.0-alpha.38

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "27.0.0-alpha.37",
+  "version": "27.0.0-alpha.38",
   "description": "Tool to develop, test and build js projects",
   "license": "MIT",
   "repository": {
@@ -65,7 +65,7 @@
     "@jsenv/integrity": "0.0.1",
     "@jsenv/log": "1.5.2",
     "@jsenv/logger": "4.0.1",
-    "@jsenv/node-esm-resolution": "0.0.5",
+    "@jsenv/node-esm-resolution": "0.0.6",
     "@jsenv/server": "12.6.1",
     "@jsenv/uneval": "1.6.0",
     "@jsenv/utils": "1.5.0",

package/src/build/build.js

@@ -142,6 +142,10 @@ build ${entryPointKeys.length} entry points`)
         },
       },
       ...getCorePlugins({
+        rootDirectoryUrl,
+        urlGraph: rawGraph,
+        scenario: "build",
+
         nodeEsmResolution,
         fileSystemMagicResolution,
         injectedGlobals,

package/src/plugins/node_esm_resolution/jsenv_plugin_node_esm_resolution.js

@@ -7,25 +7,91 @@
  *   it should likely be an other plugin happening after the others
  */
 
+import { registerFileLifecycle } from "@jsenv/filesystem"
+
 import {
   applyNodeEsmResolution,
-  lookupPackageScope,
-  readPackageJson,
+  defaultLookupPackageScope,
+  defaultReadPackageJson,
 } from "@jsenv/node-esm-resolution"
 
 export const jsenvPluginNodeEsmResolution = ({
+  rootDirectoryUrl,
   // https://nodejs.org/api/esm.html#resolver-algorithm-specification
   packageConditions = ["browser", "import"],
-} = {}) => {
-  const nodeEsmResolution = {
+  filesInvalidatingCache = ["package.json", "package-lock.json"],
+}) => {
+  const packageScopesCache = new Map()
+  const lookupPackageScope = (url) => {
+    const fromCache = packageScopesCache.get(url)
+    if (fromCache) {
+      return fromCache
+    }
+    const packageScope = defaultLookupPackageScope(url)
+    packageScopesCache.set(url, packageScope)
+    return packageScope
+  }
+  const packageJsonsCache = new Map()
+  const readPackageJson = (url) => {
+    const fromCache = packageJsonsCache.get(url)
+    if (fromCache) {
+      return fromCache
+    }
+    const packageJson = defaultReadPackageJson(url)
+    packageJsonsCache.set(url, packageJson)
+    return packageJson
+  }
+
+  const unregisters = []
+  filesInvalidatingCache.forEach((file) => {
+    const unregister = registerFileLifecycle(new URL(file, rootDirectoryUrl), {
+      added: () => {
+        packageScopesCache.clear()
+        packageJsonsCache.clear()
+      },
+      updated: () => {
+        packageScopesCache.clear()
+        packageJsonsCache.clear()
+      },
+      removed: () => {
+        packageScopesCache.clear()
+        packageJsonsCache.clear()
+      },
+      keepProcessAlive: false,
+    })
+    unregisters.push(unregister)
+  })
+
+  return [
+    jsenvPluginNodeEsmResolver({
+      packageConditions,
+      lookupPackageScope,
+      readPackageJson,
+    }),
+    jsenvPluginNodeModulesVersionInUrls({
+      lookupPackageScope,
+      readPackageJson,
+    }),
+  ]
+}
+
+const jsenvPluginNodeEsmResolver = ({
+  packageConditions,
+  lookupPackageScope,
+  readPackageJson,
+}) => {
+  return {
     name: "jsenv:node_esm_resolve",
     appliesDuring: "*",
     resolveUrl: {
       js_import_export: (reference) => {
+        const { parentUrl, specifier } = reference
         const { url } = applyNodeEsmResolution({
           conditions: packageConditions,
-          parentUrl: reference.parentUrl,
-          specifier: reference.specifier,
+          parentUrl,
+          specifier,
+          lookupPackageScope,
+          readPackageJson,
         })
         return url
       },
@@ -39,9 +105,14 @@ export const jsenvPluginNodeEsmResolution = ({
       return null
     },
   }
+}
 
-  const packageVersionInUrl = {
-    name: "jsenv:package_url_version",
+const jsenvPluginNodeModulesVersionInUrls = ({
+  lookupPackageScope,
+  readPackageJson,
+}) => {
+  return {
+    name: "jsenv:node_modules_version_in_urls",
     appliesDuring: {
       dev: true,
       test: true,
@@ -72,6 +143,4 @@ export const jsenvPluginNodeEsmResolution = ({
       }
     },
   }
-
-  return [nodeEsmResolution, packageVersionInUrl]
 }

package/src/plugins/plugins.js

@@ -39,6 +39,9 @@ export const getCorePlugins = ({
   if (autoreload === true) {
     autoreload = {}
   }
+  if (nodeEsmResolution === true) {
+    nodeEsmResolution = {}
+  }
   return [
     jsenvPluginUrlReferences(),
     jsenvPluginTranspilation(transpilation),
@@ -48,7 +51,11 @@ export const getCorePlugins = ({
     jsenvPluginFileUrls(),
     jsenvPluginHttpUrls(),
     jsenvPluginLeadingSlash(),
-    jsenvPluginNodeEsmResolution(nodeEsmResolution), // before url resolution to handle "js_import_export" resolution
+    // before url resolution to handle "js_import_export" resolution
+    jsenvPluginNodeEsmResolution({
+      rootDirectoryUrl,
+      ...nodeEsmResolution,
+    }),
     jsenvPluginUrlResolution(),
     jsenvPluginFileSystemMagic(fileSystemMagicResolution),
     jsenvPluginUrlVersion(),

package/src/test/execute_plan.js

@@ -142,7 +142,10 @@ export const executePlan = async (
         plugins: [
           ...plugins,
           ...getCorePlugins({
+            rootDirectoryUrl,
+            urlGraph,
             scenario,
+
             htmlSupervisor: true,
             nodeEsmResolution,
             fileSystemMagicResolution,