@knighted/module 1.2.0 → 1.2.1

package/dist/cjs/format.cjs

@@ -580,7 +580,10 @@ const format = async (src, ast, opts) => {
           seen.add(propName);
           if (rhs.type === 'Identifier') {
             const rhsId = rhsSourceFor(rhs);
-            if (rhsId === rhs.name) {
+            const rhsName = rhs.name;
+            if (rhsId === rhsName && rhsName === propName) {
+              exportsOut.push(`export { ${propName} };`);
+            } else if (rhsId === rhsName) {
               exportsOut.push(`export { ${rhsId} as ${propName} };`);
             } else {
               exportsOut.push(`export const ${propName} = ${rhsId};`);
@@ -589,9 +592,15 @@ const format = async (src, ast, opts) => {
             exportsOut.push(`export const ${propName} = ${rhsSrc};`);
           }
         }
+
+        // Trim trailing whitespace and one optional semicolon so the idiomatic export
+        // replacement does not leave the original `;` behind (avoids emitting `;;`).
+        let end = write.end;
+        while (end < src.length && (src[end] === ' ' || src[end] === '\t')) end++;
+        if (end < src.length && src[end] === ';') end++;
         replacements.push({
           start: write.start,
-          end: write.end
+          end
         });
       }
       if (!seen.size) return {

package/dist/format.js

@@ -573,7 +573,10 @@ const format = async (src, ast, opts) => {
           seen.add(propName);
           if (rhs.type === 'Identifier') {
             const rhsId = rhsSourceFor(rhs);
-            if (rhsId === rhs.name) {
+            const rhsName = rhs.name;
+            if (rhsId === rhsName && rhsName === propName) {
+              exportsOut.push(`export { ${propName} };`);
+            } else if (rhsId === rhsName) {
               exportsOut.push(`export { ${rhsId} as ${propName} };`);
             } else {
               exportsOut.push(`export const ${propName} = ${rhsId};`);
@@ -582,9 +585,15 @@ const format = async (src, ast, opts) => {
             exportsOut.push(`export const ${propName} = ${rhsSrc};`);
           }
         }
+
+        // Trim trailing whitespace and one optional semicolon so the idiomatic export
+        // replacement does not leave the original `;` behind (avoids emitting `;;`).
+        let end = write.end;
+        while (end < src.length && (src[end] === ' ' || src[end] === '\t')) end++;
+        if (end < src.length && src[end] === ';') end++;
         replacements.push({
           start: write.start,
-          end: write.end
+          end
         });
       }
       if (!seen.size) return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@knighted/module",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "Bidirectional transform for ES modules and CommonJS.",
   "type": "module",
   "main": "dist/module.js",