@jsenv/plugin-commonjs 0.0.5 → 0.0.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/plugin-commonjs",
-  "version": "0.0.5",
+  "version": "0.0.8",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -14,8 +14,10 @@
   "type": "module",
   "main": "./main.js",
   "dependencies": {
-    "@jsenv/filesystem": "3.1.0",
+    "@jsenv/filesystem": "4.0.1",
     "@jsenv/logger": "4.0.1",
+    "@jsenv/log": "1.6.3",
+    "@jsenv/urls": "1.1.1",
     "@rollup/plugin-commonjs": "22.0.0",
     "@rollup/plugin-json": "4.1.0",
     "@rollup/plugin-node-resolve": "13.3.0",

package/src/cjs_to_esm.js

@@ -1,14 +1,17 @@
 import { readFileSync } from "node:fs"
 import {
   assertAndNormalizeDirectoryUrl,
+  ensureWindowsDriveLetter,
+} from "@jsenv/filesystem"
+
+import {
+  setUrlExtension,
+  setUrlFilename,
   urlIsInsideOf,
   moveUrl,
-  ensureWindowsDriveLetter,
   urlToExtension,
   urlToBasename,
-} from "@jsenv/filesystem"
-
-import { setUrlExtension, setUrlFilename } from "@jsenv/utils/urls/url_utils.js"
+} from "@jsenv/urls"
 import { commonJsToJsModuleRaw } from "./cjs_to_esm_raw.js"
 import { reuseOrCreateCompiledFile } from "./compile_cache/compiled_file_cache.js"
 

package/src/compile_cache/update_compile_cache.js

@@ -1,10 +1,7 @@
 import { existsSync, utimesSync } from "node:fs"
 import { fileURLToPath } from "node:url"
-import {
-  urlToRelativeUrl,
-  writeFileSync,
-  bufferToEtag,
-} from "@jsenv/filesystem"
+import { urlToRelativeUrl } from "@jsenv/urls"
+import { writeFileSync, bufferToEtag } from "@jsenv/filesystem"
 
 export const updateCompileCache = ({
   logger,

package/src/jsenv_plugin_commonjs.js

@@ -1,11 +1,13 @@
-import { normalizeStructuredMetaMap, urlToMeta } from "@jsenv/url-meta"
+import { URL_META, injectQueryParams } from "@jsenv/urls"
 
-import { fetchOriginalUrlInfo } from "@jsenv/utils/graph/fetch_original_url_info.js"
-import { injectQueryParams } from "@jsenv/utils/urls/url_utils.js"
 import { commonJsToJsModule } from "./cjs_to_esm.js"
 
-export const jsenvPluginCommonJs = ({ logLevel, include }) => {
-  const structuredMetaMap = normalizeStructuredMetaMap(
+export const jsenvPluginCommonJs = ({
+  name = "jsenv:commonjs",
+  logLevel,
+  include,
+}) => {
+  const associations = URL_META.resolveAssociations(
     {
       commonjs: include,
     },
@@ -13,13 +15,13 @@ export const jsenvPluginCommonJs = ({ logLevel, include }) => {
   )
 
   return {
-    name: "jsenv:commonjs",
+    name,
     appliesDuring: "*",
     redirectUrl: {
       js_import_export: (reference) => {
-        const { commonjs } = urlToMeta({
+        const { commonjs } = URL_META.applyAssociations({
           url: reference.url,
-          structuredMetaMap,
+          associations,
         })
         if (!commonjs) {
           return null
@@ -31,7 +33,7 @@ export const jsenvPluginCommonJs = ({ logLevel, include }) => {
       },
     },
     fetchUrlContent: async (urlInfo, context) => {
-      const originalUrlInfo = await fetchOriginalUrlInfo({
+      const originalUrlInfo = await context.fetchOriginalUrlInfo({
         urlInfo,
         context,
         searchParam: "cjs_as_js_module",
@@ -53,6 +55,8 @@ export const jsenvPluginCommonJs = ({ logLevel, include }) => {
         ...urlInfo.data.commonjs,
       })
       return {
+        originalUrl: originalUrlInfo.originalUrl,
+        originalContent: originalUrlInfo.originalContent,
         type: "js_module",
         contentType: "text/javascript",
         content,