@jsenv/plugin-commonjs 1.0.0 → 1.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/plugin-commonjs",
-  "version": "1.0.0",
+  "version": "1.0.3",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -13,21 +13,21 @@
   "type": "module",
   "main": "./main.js",
   "dependencies": {
-    "@jsenv/filesystem": "4.1.2",
-    "@jsenv/log": "3.2.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",
+    "@rollup/plugin-commonjs": "22.0.2",
     "@rollup/plugin-json": "4.1.0",
-    "@rollup/plugin-node-resolve": "13.3.0",
+    "@rollup/plugin-node-resolve": "14.0.0",
     "@rollup/plugin-replace": "4.0.0",
     "cjs-module-lexer": "1.2.2",
     "is-valid-identifier": "2.0.2",
     "resolve": "1.22.1",
-    "rollup": "2.77.2",
+    "rollup": "2.79.0",
     "rollup-plugin-node-globals": "1.4.0",
     "rollup-plugin-polyfill-node": "0.10.2",
-    "vm2": "3.9.10"
+    "vm2": "3.9.11"
   },
   "devDependencies": {
     "@jsenv/core": "../../"

package/src/jsenv_plugin_commonjs.js

@@ -1,5 +1,6 @@
 import { URL_META } from "@jsenv/url-meta"
 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,30 +53,32 @@ 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.scenarios.dev ? "development" : "production",
         ...urlInfo.data.commonjs,
@@ -62,22 +86,13 @@ export const jsenvPluginCommonJs = ({
       if (isValid) {
         urlInfo.isValid = isValid
       }
-      const originalReference = context.reference.original
-        ? context.reference.original
-        : context.reference
-      const filename = originalReference.dependsOnPackageJson
-        ? `${originalReference.specifier}${urlToExtension(
-            originalReference.parentUrl,
-          )}`
-        : undefined
       return {
         content,
         contentType: "text/javascript",
         type: "js_module",
-        originalUrl: originalUrlInfo.originalUrl,
-        originalContent: originalUrlInfo.originalContent,
+        originalUrl: commonJsUrlInfo.originalUrl,
+        originalContent: commonJsUrlInfo.originalContent,
         sourcemap,
-        filename,
       }
     },
   }