@jsenv/plugin-commonjs 1.2.4 → 2.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/plugin-commonjs",
-  "version": "1.2.4",
+  "version": "2.0.1",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -24,9 +24,9 @@
     "test": "node --conditions=development ./scripts/test.mjs"
   },
   "dependencies": {
-    "@jsenv/filesystem": "4.2.0",
+    "@jsenv/filesystem": "4.2.2",
     "@jsenv/log": "3.3.4",
-    "@jsenv/url-meta": "7.1.0",
+    "@jsenv/url-meta": "8.1.0",
     "@jsenv/urls": "1.2.8",
     "@rollup/plugin-commonjs": "24.0.1",
     "@rollup/plugin-json": "6.0.0",
@@ -35,7 +35,7 @@
     "cjs-module-lexer": "1.2.2",
     "is-valid-identifier": "2.0.2",
     "resolve": "1.22.1",
-    "rollup": "3.19.1",
+    "rollup": "3.20.1",
     "rollup-plugin-node-globals": "1.4.0",
     "rollup-plugin-polyfill-node": "0.12.0",
     "vm2": "3.9.14"

package/src/cjs_to_esm.js

@@ -1,14 +1,9 @@
 import { readFileSync } from "node:fs"
-import {
-  assertAndNormalizeDirectoryUrl,
-  ensureWindowsDriveLetter,
-} from "@jsenv/filesystem"
+import { ensureWindowsDriveLetter } from "@jsenv/filesystem"
 
 import {
   setUrlExtension,
   setUrlFilename,
-  urlIsInsideOf,
-  moveUrl,
   urlToExtension,
   urlToBasename,
 } from "@jsenv/urls"
@@ -18,33 +13,26 @@ import { reuseOrCreateCompiledFile } from "./compile_cache/compiled_file_cache.j
 export const commonJsToJsModule = ({
   logLevel,
   filesystemCache = true,
-  rootDirectoryUrl,
+  compileCacheDirectoryUrl,
   sourceFileUrl,
   processEnvNodeEnv,
   ...rest
 }) => {
   if (filesystemCache) {
-    rootDirectoryUrl = assertAndNormalizeDirectoryUrl(rootDirectoryUrl)
-    const compileDirectoryUrl = new URL(
-      "./.jsenv/cjs_to_esm/",
-      rootDirectoryUrl,
-    )
     const compiledFileUrl = determineCompiledFileUrl({
       url: sourceFileUrl,
-      rootDirectoryUrl,
-      compileDirectoryUrl,
+      compileCacheDirectoryUrl,
       processEnvNodeEnv,
     })
 
     return reuseOrCreateCompiledFile({
       logLevel,
-      compileDirectoryUrl,
+      compileCacheDirectoryUrl,
       sourceFileUrl,
       compiledFileUrl,
       compile: async () => {
         const { content, sourcemap } = await commonJsToJsModuleRaw({
           logLevel,
-          rootDirectoryUrl,
           sourceFileUrl,
           processEnvNodeEnv,
           ...rest,
@@ -66,7 +54,6 @@ export const commonJsToJsModule = ({
   }
   return commonJsToJsModuleRaw({
     logLevel,
-    rootDirectoryUrl,
     sourceFileUrl,
     ...rest,
   })
@@ -110,23 +97,15 @@ const extractCompileAssets = ({
 
 const determineCompiledFileUrl = ({
   url,
-  rootDirectoryUrl,
-  compileDirectoryUrl,
+  compileCacheDirectoryUrl,
   processEnvNodeEnv,
 }) => {
-  if (!urlIsInsideOf(url, rootDirectoryUrl)) {
-    const fsRootUrl = ensureWindowsDriveLetter("file:///", url)
-    url = `${rootDirectoryUrl}@fs/${url.slice(fsRootUrl.length)}`
-  }
   if (processEnvNodeEnv) {
     const basename = urlToBasename(url)
     const extension = urlToExtension(url)
     url = setUrlFilename(url, `${basename}.${processEnvNodeEnv}${extension}`)
   }
-  return moveUrl({
-    url,
-    from: rootDirectoryUrl,
-    to: compileDirectoryUrl,
-    preferAbsolute: true,
-  })
+  const fsRootUrl = ensureWindowsDriveLetter("file:///", url)
+  url = `${compileCacheDirectoryUrl}@fs/${url.slice(fsRootUrl.length)}`
+  return url
 }

package/src/compile_cache/compiled_file_cache.js

@@ -13,7 +13,7 @@ const { lockForResource } = createLockRegistry()
 
 export const reuseOrCreateCompiledFile = async ({
   logLevel,
-  compileDirectoryUrl,
+  compileCacheDirectoryUrl,
   sourceFileUrl,
   compiledFileUrl,
   compileCacheStrategy,
@@ -21,7 +21,7 @@ export const reuseOrCreateCompiledFile = async ({
   compile,
 }) => {
   const logger = createLogger({ logLevel })
-  await initCompileDirectory({ logger, compileDirectoryUrl })
+  await initCompileCacheDirectory({ logger, compileCacheDirectoryUrl })
   sourceFileUrl = assertAndNormalizeFileUrl(sourceFileUrl)
   if (typeof compile !== "function") {
     throw new TypeError(`compile must be a function, got ${compile}`)
@@ -107,15 +107,18 @@ export const reuseOrCreateCompiledFile = async ({
 }
 
 const initalized = {}
-const initCompileDirectory = async ({ logger, compileDirectoryUrl }) => {
-  if (initalized[compileDirectoryUrl]) {
+const initCompileCacheDirectory = async ({
+  logger,
+  compileCacheDirectoryUrl,
+}) => {
+  if (initalized[compileCacheDirectoryUrl]) {
     return
   }
-  initalized[compileDirectoryUrl] = true
-  logger.debug(`check compile directory at ${compileDirectoryUrl}`)
+  initalized[compileCacheDirectoryUrl] = true
+  logger.debug(`check compile directory at ${compileCacheDirectoryUrl}`)
   const compileContextJsonFileUrl = new URL(
     "./__compile_context__.json",
-    compileDirectoryUrl,
+    compileCacheDirectoryUrl,
   )
   const version = JSON.parse(
     readFileSync(new URL("../../package.json", import.meta.url)),
@@ -132,7 +135,7 @@ const initCompileDirectory = async ({ logger, compileDirectoryUrl }) => {
     } else {
       logger.debug(`${UNICODE.INFO} create an empty directory`)
     }
-    await ensureEmptyDirectory(compileDirectoryUrl)
+    await ensureEmptyDirectory(compileCacheDirectoryUrl)
     writeFileSync(
       compileContextJsonFileUrl,
       JSON.stringify({ version }, null, "  "),

package/src/jsenv_plugin_commonjs.js

@@ -4,6 +4,8 @@ import { defaultLookupPackageScope } from "@jsenv/node-esm-resolution"
 
 import { commonJsToJsModule } from "./cjs_to_esm.js"
 
+const compileCacheDirectoryUrl = new URL("../.cache/", import.meta.url)
+
 export const jsenvPluginCommonJs = ({
   name = "jsenv:commonjs",
   logLevel,
@@ -75,7 +77,7 @@ export const jsenvPluginCommonJs = ({
       )
       const { content, sourcemap, isValid } = await commonJsToJsModule({
         logLevel,
-        rootDirectoryUrl: context.rootDirectoryUrl,
+        compileCacheDirectoryUrl,
         sourceFileUrl: commonJsUrlInfo.url,
         browsers: !nodeRuntimeEnabled,
         processEnvNodeEnv: context.dev ? "development" : "production",