@jsenv/plugin-commonjs 0.4.0 → 1.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/plugin-commonjs",
-  "version": "0.4.0",
+  "version": "1.0.2",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -13,8 +13,8 @@
   "type": "module",
   "main": "./main.js",
   "dependencies": {
-    "@jsenv/filesystem": "4.1.1",
-    "@jsenv/log": "3.1.0",
+    "@jsenv/filesystem": "4.1.3",
+    "@jsenv/log": "3.3.0",
     "@jsenv/url-meta": "7.0.0",
     "@jsenv/urls": "1.2.7",
     "@rollup/plugin-commonjs": "22.0.1",
@@ -24,9 +24,9 @@
     "cjs-module-lexer": "1.2.2",
     "is-valid-identifier": "2.0.2",
     "resolve": "1.22.1",
-    "rollup": "2.77.0",
+    "rollup": "2.77.2",
     "rollup-plugin-node-globals": "1.4.0",
-    "rollup-plugin-polyfill-node": "0.10.1",
+    "rollup-plugin-polyfill-node": "0.10.2",
     "vm2": "3.9.10"
   },
   "devDependencies": {

package/src/compile_cache/compiled_file_cache.js

@@ -9,7 +9,7 @@ import { validateCompileCache } from "./validate_compile_cache.js"
 import { createLockRegistry } from "./file_lock_registry.js"
 import { updateCompileCache } from "./update_compile_cache.js"
 
-const { lockForRessource } = createLockRegistry()
+const { lockForResource } = createLockRegistry()
 
 export const reuseOrCreateCompiledFile = async ({
   logLevel,
@@ -165,7 +165,7 @@ const readCompileContextFile = ({ logger, compileContextJsonFileUrl }) => {
 }
 
 const startAsap = async (fn, { compiledFileUrl }) => {
-  const unlockLocal = await lockForRessource(compiledFileUrl)
+  const unlockLocal = await lockForResource(compiledFileUrl)
   try {
     return await fn()
   } finally {

package/src/compile_cache/file_lock_registry.js

@@ -1,13 +1,13 @@
 export const createLockRegistry = () => {
   let lockArray = []
-  const lockForRessource = async (ressource) => {
-    const currentLock = lockArray.find((lock) => lock.ressource === ressource)
+  const lockForResource = async (resource) => {
+    const currentLock = lockArray.find((lock) => lock.resource === resource)
     let unlockResolve
     const unlocked = new Promise((resolve) => {
       unlockResolve = resolve
     })
     const lock = {
-      ressource,
+      resource,
       unlocked,
     }
     lockArray = [...lockArray, lock]
@@ -20,5 +20,5 @@ export const createLockRegistry = () => {
     }
     return unlock
   }
-  return { lockForRessource }
+  return { lockForResource }
 }

package/src/jsenv_plugin_commonjs.js

@@ -1,5 +1,6 @@
 import { URL_META } from "@jsenv/url-meta"
-import { injectQueryParams } from "@jsenv/urls"
+import { injectQueryParams, urlToExtension } from "@jsenv/urls"
+import { defaultLookupPackageScope } from "@jsenv/node-esm-resolution"
 
 import { commonJsToJsModule } from "./cjs_to_esm.js"
 
@@ -8,6 +9,23 @@ export const jsenvPluginCommonJs = ({
   logLevel,
   include,
 }) => {
+  const markAsJsModuleProxy = (reference) => {
+    reference.expectedType = "js_module"
+    const packageFileUrl = defaultLookupPackageScope(reference.url)
+    if (packageFileUrl) {
+      reference.filename = `${reference.specifier}${urlToExtension(
+        reference.parentUrl,
+      )}`
+    }
+  }
+  const turnIntoJsModuleProxy = (reference) => {
+    const urlTransformed = injectQueryParams(reference.url, {
+      cjs_as_js_module: "",
+    })
+    markAsJsModuleProxy(reference)
+    return urlTransformed
+  }
+
   let associations
 
   return {
@@ -23,6 +41,10 @@ export const jsenvPluginCommonJs = ({
     },
     redirectUrl: {
       js_import_export: (reference) => {
+        if (reference.searchParams.has("cjs_as_js_module")) {
+          markAsJsModuleProxy(reference)
+          return null
+        }
         const { commonjs } = URL_META.applyAssociations({
           url: reference.url,
           associations,
@@ -31,35 +53,34 @@ export const jsenvPluginCommonJs = ({
           return null
         }
         reference.data.commonjs = commonjs
-        return injectQueryParams(reference.url, {
-          cjs_as_js_module: "",
-        })
+        return turnIntoJsModuleProxy(reference)
       },
     },
     fetchUrlContent: async (urlInfo, context) => {
-      const originalUrlInfo = await context.fetchOriginalUrlInfo({
-        urlInfo,
-        context,
-        searchParam: "cjs_as_js_module",
-        // during this fetch we don't want to alter the original file
-        // so we consider it as text
-        expectedType: "text",
-      })
-      if (!originalUrlInfo) {
+      const [commonJsReference, commonJsUrlInfo] =
+        context.getWithoutSearchParam({
+          urlInfo,
+          context,
+          searchParam: "cjs_as_js_module",
+          // during this fetch we don't want to alter the original file
+          // so we consider it as text
+          expectedType: "text",
+        })
+      if (!commonJsReference) {
         return null
       }
+      await context.fetchUrlContent(commonJsUrlInfo, {
+        reference: commonJsReference,
+      })
       const nodeRuntimeEnabled = Object.keys(context.runtimeCompat).includes(
         "node",
       )
       const { content, sourcemap, isValid } = await commonJsToJsModule({
         logLevel,
         rootDirectoryUrl: context.rootDirectoryUrl,
-        sourceFileUrl: originalUrlInfo.url,
+        sourceFileUrl: commonJsUrlInfo.url,
         browsers: !nodeRuntimeEnabled,
-        processEnvNodeEnv:
-          context.scenario === "dev" || context.scenario === "test"
-            ? "development"
-            : "production",
+        processEnvNodeEnv: context.scenarios.dev ? "development" : "production",
         ...urlInfo.data.commonjs,
       })
       if (isValid) {
@@ -69,8 +90,8 @@ export const jsenvPluginCommonJs = ({
         content,
         contentType: "text/javascript",
         type: "js_module",
-        originalUrl: originalUrlInfo.originalUrl,
-        originalContent: originalUrlInfo.originalContent,
+        originalUrl: commonJsUrlInfo.originalUrl,
+        originalContent: commonJsUrlInfo.originalContent,
         sourcemap,
       }
     },

package/tests/cjs_cache/cjs_cache.manual_test.mjs

@@ -13,5 +13,5 @@ await startDevServer({
     }),
   ],
   clientAutoreload: false,
-  htmlSupervisor: false,
+  supervisor: false,
 })

package/tests/cjs_cache/cjs_cache.test.mjs

@@ -29,7 +29,7 @@ const devServer = await startDevServer({
     }),
   ],
   clientAutoreload: false,
-  htmlSupervisor: false,
+  supervisor: false,
 })
 const browser = await chromium.launch({
   headless: !debug,