@hirarijs/loader-cjs-interop 1.0.9 → 1.0.11

package/dist/index.cjs

@@ -35,10 +35,15 @@ __export(index_exports, {
 module.exports = __toCommonJS(index_exports);
 var import_module = require("module");
 var import_path = __toESM(require("path"), 1);
+var import_loader = require("@hirarijs/loader");
 var import_meta = {};
 var extensions = [".js", ".cjs"];
 var isValidIdent = (name) => /^[A-Za-z_$][0-9A-Za-z_$]*$/.test(name);
+var WRAP_MARK = "__HIRARI_CJS_INTEROP_WRAPPED__";
 function runTransform(code, filename, ctx) {
+  if (code.includes(WRAP_MARK)) {
+    return { code, continue: true };
+  }
   const opts = ctx.loaderConfig.pluginOptions?.["@hirarijs/loader-cjs-interop"] || {};
   const ignoreNm = opts.ignoreNodeModules !== false && opts.allowNodeModules !== true;
   if (ignoreNm && filename.includes("node_modules")) {
@@ -47,35 +52,34 @@ function runTransform(code, filename, ctx) {
   if (opts.aliases) {
     for (const [key, target] of Object.entries(opts.aliases)) {
       if (filename.includes(`node_modules/${key}`) || filename.includes(`node_modules\\${key}`)) {
-        const aliased = import_path.default.isAbsolute(target) ? target : import_path.default.resolve(process.cwd(), target);
-        filename = aliased;
+        filename = import_path.default.isAbsolute(target) ? target : import_path.default.resolve(process.cwd(), target);
         break;
       }
     }
   }
-  let mod;
+  let exportKeys = [];
   try {
     const req = (0, import_module.createRequire)(import_meta.url);
-    mod = req(filename);
+    const mod = req(filename);
+    if (mod && typeof mod === "object") {
+      exportKeys = Object.keys(mod).filter((k) => k !== "default" && isValidIdent(k));
+    }
   } catch {
     return { code, continue: true };
   }
-  const exportKeys = mod && typeof mod === "object" ? Object.keys(mod).filter((k) => k !== "default" && isValidIdent(k)) : [];
   const lines = [];
+  lines.push(`// ${WRAP_MARK}`);
   lines.push(`import { createRequire } from 'module';`);
-  lines.push(`const _req = createRequire(import.meta.url);`);
+  lines.push(`const _req = createRequire(${import_loader.IMPORT_META_URL_VARIABLE});`);
   lines.push(`const _cjs = _req(${JSON.stringify(filename)});`);
   lines.push(
     `const _default = (_cjs && _cjs.__esModule && 'default' in _cjs) ? _cjs.default : _cjs;`
   );
   lines.push(`export default _default;`);
   lines.push(`export const __esModule = true;`);
-  if (exportKeys.length > 0) {
-    for (const key of exportKeys) {
-      lines.push(`export const ${key} = _cjs[${JSON.stringify(key)}];`);
-    }
+  for (const key of exportKeys) {
+    lines.push(`export const ${key} = _cjs[${JSON.stringify(key)}];`);
   }
-  console.log(lines.join("\n"));
   return {
     code: lines.join("\n"),
     map: void 0,

package/dist/index.js

@@ -1,9 +1,16 @@
 // src/index.ts
 import { createRequire } from "module";
 import path from "path";
+import {
+  IMPORT_META_URL_VARIABLE
+} from "@hirarijs/loader";
 var extensions = [".js", ".cjs"];
 var isValidIdent = (name) => /^[A-Za-z_$][0-9A-Za-z_$]*$/.test(name);
+var WRAP_MARK = "__HIRARI_CJS_INTEROP_WRAPPED__";
 function runTransform(code, filename, ctx) {
+  if (code.includes(WRAP_MARK)) {
+    return { code, continue: true };
+  }
   const opts = ctx.loaderConfig.pluginOptions?.["@hirarijs/loader-cjs-interop"] || {};
   const ignoreNm = opts.ignoreNodeModules !== false && opts.allowNodeModules !== true;
   if (ignoreNm && filename.includes("node_modules")) {
@@ -12,35 +19,34 @@ function runTransform(code, filename, ctx) {
   if (opts.aliases) {
     for (const [key, target] of Object.entries(opts.aliases)) {
       if (filename.includes(`node_modules/${key}`) || filename.includes(`node_modules\\${key}`)) {
-        const aliased = path.isAbsolute(target) ? target : path.resolve(process.cwd(), target);
-        filename = aliased;
+        filename = path.isAbsolute(target) ? target : path.resolve(process.cwd(), target);
         break;
       }
     }
   }
-  let mod;
+  let exportKeys = [];
   try {
     const req = createRequire(import.meta.url);
-    mod = req(filename);
+    const mod = req(filename);
+    if (mod && typeof mod === "object") {
+      exportKeys = Object.keys(mod).filter((k) => k !== "default" && isValidIdent(k));
+    }
   } catch {
     return { code, continue: true };
   }
-  const exportKeys = mod && typeof mod === "object" ? Object.keys(mod).filter((k) => k !== "default" && isValidIdent(k)) : [];
   const lines = [];
+  lines.push(`// ${WRAP_MARK}`);
   lines.push(`import { createRequire } from 'module';`);
-  lines.push(`const _req = createRequire(import.meta.url);`);
+  lines.push(`const _req = createRequire(${IMPORT_META_URL_VARIABLE});`);
   lines.push(`const _cjs = _req(${JSON.stringify(filename)});`);
   lines.push(
     `const _default = (_cjs && _cjs.__esModule && 'default' in _cjs) ? _cjs.default : _cjs;`
   );
   lines.push(`export default _default;`);
   lines.push(`export const __esModule = true;`);
-  if (exportKeys.length > 0) {
-    for (const key of exportKeys) {
-      lines.push(`export const ${key} = _cjs[${JSON.stringify(key)}];`);
-    }
+  for (const key of exportKeys) {
+    lines.push(`export const ${key} = _cjs[${JSON.stringify(key)}];`);
   }
-  console.log(lines.join("\n"));
   return {
     code: lines.join("\n"),
     map: void 0,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hirarijs/loader-cjs-interop",
-  "version": "1.0.9",
+  "version": "1.0.11",
   "description": "CJS interop loader plugin that exposes named exports for CommonJS modules",
   "type": "module",
   "main": "./dist/index.cjs",
@@ -20,7 +20,7 @@
     "dist"
   ],
   "scripts": {
-    "build": "tsup src/index.ts --format esm,cjs --dts",
+    "build": "tsup src/index.ts --format esm,cjs --dts --target es2020 --tsconfig tsconfig.json",
     "test": "node --test"
   },
   "peerDependencies": {