@knighted/module 1.0.0-rc.4 → 1.0.0-rc.5

package/dist/cjs/format.cjs

@@ -627,6 +627,11 @@ const format = async (src, ast, opts) => {
     const isValidExportName = name => /^[$A-Z_a-z][$\w]*$/.test(name);
     const asExportName = name => isValidExportName(name) ? name : JSON.stringify(name);
     const accessProp = name => isValidExportName(name) ? `${_exports.exportsRename}.${name}` : `${_exports.exportsRename}[${JSON.stringify(name)}]`;
+    const exportValueFor = name => {
+      if (name === '__dirname') return 'import.meta.dirname';
+      if (name === '__filename') return 'import.meta.filename';
+      return name;
+    };
     const tempNameFor = name => {
       const sanitized = name.replace(/[^$\w]/g, '_') || 'value';
       const safe = /^[0-9]/.test(sanitized) ? `_${sanitized}` : sanitized;
@@ -645,7 +650,14 @@ const format = async (src, ast, opts) => {
     const defaultEntry = exportTable.get('default');
     if (defaultEntry) {
       const def = defaultEntry.fromIdentifier ?? _exports.exportsRename;
-      lines.push(`export default ${def};`);
+      const defExpr = exportValueFor(def);
+      if (defExpr !== def) {
+        const temp = tempNameFor(def);
+        lines.push(`const ${temp} = ${defExpr};`);
+        lines.push(`export default ${temp};`);
+      } else {
+        lines.push(`export default ${defExpr};`);
+      }
     }
     for (const [key, entry] of exportTable) {
       if (key === 'default') continue;
@@ -653,7 +665,14 @@ const format = async (src, ast, opts) => {
         warnOnce(`cjs-string-export:${key}`, `Synthesized string-literal export '${key}'. Some tooling may require bracket access to use it.`);
       }
       if (entry.fromIdentifier) {
-        lines.push(`export { ${entry.fromIdentifier} as ${asExportName(key)} };`);
+        const resolved = exportValueFor(entry.fromIdentifier);
+        if (resolved !== entry.fromIdentifier) {
+          const temp = tempNameFor(entry.fromIdentifier);
+          lines.push(`const ${temp} = ${resolved};`);
+          lines.push(`export { ${temp} as ${asExportName(key)} };`);
+        } else {
+          lines.push(`export { ${resolved} as ${asExportName(key)} };`);
+        }
       } else {
         const temp = tempNameFor(key);
         lines.push(`const ${temp} = ${accessProp(key)};`);

package/dist/format.js

@@ -620,6 +620,11 @@ const format = async (src, ast, opts) => {
     const isValidExportName = name => /^[$A-Z_a-z][$\w]*$/.test(name);
     const asExportName = name => isValidExportName(name) ? name : JSON.stringify(name);
     const accessProp = name => isValidExportName(name) ? `${exportsRename}.${name}` : `${exportsRename}[${JSON.stringify(name)}]`;
+    const exportValueFor = name => {
+      if (name === '__dirname') return 'import.meta.dirname';
+      if (name === '__filename') return 'import.meta.filename';
+      return name;
+    };
     const tempNameFor = name => {
       const sanitized = name.replace(/[^$\w]/g, '_') || 'value';
       const safe = /^[0-9]/.test(sanitized) ? `_${sanitized}` : sanitized;
@@ -638,7 +643,14 @@ const format = async (src, ast, opts) => {
     const defaultEntry = exportTable.get('default');
     if (defaultEntry) {
       const def = defaultEntry.fromIdentifier ?? exportsRename;
-      lines.push(`export default ${def};`);
+      const defExpr = exportValueFor(def);
+      if (defExpr !== def) {
+        const temp = tempNameFor(def);
+        lines.push(`const ${temp} = ${defExpr};`);
+        lines.push(`export default ${temp};`);
+      } else {
+        lines.push(`export default ${defExpr};`);
+      }
     }
     for (const [key, entry] of exportTable) {
       if (key === 'default') continue;
@@ -646,7 +658,14 @@ const format = async (src, ast, opts) => {
         warnOnce(`cjs-string-export:${key}`, `Synthesized string-literal export '${key}'. Some tooling may require bracket access to use it.`);
       }
       if (entry.fromIdentifier) {
-        lines.push(`export { ${entry.fromIdentifier} as ${asExportName(key)} };`);
+        const resolved = exportValueFor(entry.fromIdentifier);
+        if (resolved !== entry.fromIdentifier) {
+          const temp = tempNameFor(entry.fromIdentifier);
+          lines.push(`const ${temp} = ${resolved};`);
+          lines.push(`export { ${temp} as ${asExportName(key)} };`);
+        } else {
+          lines.push(`export { ${resolved} as ${asExportName(key)} };`);
+        }
       } else {
         const temp = tempNameFor(key);
         lines.push(`const ${temp} = ${accessProp(key)};`);

package/dist/memberExpression.d.cts

@@ -4,6 +4,10 @@ import type { FormatterOptions } from '../types.cjs';
 type MemberExpressionExtras = {
     onRequireResolve?: () => void;
     requireResolveName?: string;
+    onDiagnostic?: (code: string, message: string, loc?: {
+        start: number;
+        end: number;
+    }) => void;
 };
 export declare const memberExpression: (node: MemberExpression, parent: Node | null, src: MagicString, options: FormatterOptions, shadowed?: Set<string>, extras?: MemberExpressionExtras) => void;
 export {};

package/dist/types.d.cts

@@ -34,11 +34,25 @@ export type ModuleOptions = {
     cjsDefault?: 'module-exports' | 'auto' | 'none';
     /** Handling for top-level await constructs. */
     topLevelAwait?: 'error' | 'wrap' | 'preserve';
+    /** Optional diagnostics sink for warnings/errors emitted during transform. */
+    diagnostics?: (diag: Diagnostic) => void;
+    /** Optional source file path used for diagnostics context. */
+    filePath?: string;
     /** Output directory or file path when writing. */
     out?: string;
     /** Overwrite input files instead of writing to out. */
     inPlace?: boolean;
 };
+export type Diagnostic = {
+    level: 'warning' | 'error';
+    code: string;
+    message: string;
+    filePath?: string;
+    loc?: {
+        start: number;
+        end: number;
+    };
+};
 export type SpannedNode = Node & Span;
 export type ExportsMeta = {
     hasExportsBeenReassigned: boolean;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@knighted/module",
-  "version": "1.0.0-rc.4",
-  "description": "Transforms differences between ES modules and CommonJS.",
+  "version": "1.0.0-rc.5",
+  "description": "Bidirectional transform for ES modules and CommonJS.",
   "type": "module",
   "main": "dist/module.js",
   "exports": {
@@ -44,13 +44,12 @@
     "postpack": "node scripts/restoreImportsToSrc.js"
   },
   "keywords": [
-    "transform",
-    "es module",
+    "esm",
     "commonjs",
-    "require",
-    "require.resolve",
-    "import.meta.url",
-    "import.meta.dirname",
+    "transform",
+    "cjs-to-esm",
+    "esm-to-cjs",
+    "import.meta",
     "__dirname",
     "__filename"
   ],