requirejs-esm 4.3.0 → 4.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "requirejs-esm",
-  "version": "4.3.0",
+  "version": "4.4.0",
   "description": "A RequireJS plugin converting JavaScript modules from ESM to AMD.",
   "author": "Ferdinand Prantl <prantlf@gmail.com>",
   "license": "MIT",
@@ -78,18 +78,18 @@
     "tiny-glob": "^0.2.9"
   },
   "devDependencies": {
-    "@biomejs/biome": "^2.4.14",
-    "@prantlf/requirejs": "^3.3.1",
-    "@rollup/plugin-commonjs": "^29.0.2",
+    "@biomejs/biome": "^2.4.16",
+    "@prantlf/requirejs": "^3.4.0",
+    "@rollup/plugin-commonjs": "^29.0.3",
     "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-node-resolve": "^16.0.3",
     "c8": "^11.0.0",
     "lit-html": "^1",
-    "rollup": "^4.60.2",
+    "rollup": "^4.61.1",
     "tehanu": "^1.0.1",
     "tehanu-repo-coco": "^1.0.1",
     "tehanu-teru": "^1.0.1",
-    "terser": "^5.46.2"
+    "terser": "^5.48.0"
   },
   "keywords": [
     "requirejs-plugin",

package/src/api.d.ts

@@ -28,6 +28,7 @@ interface TransformAstOptions {
   resolvePath?: ResolvePath
   skipIfNoImportExport?: boolean /*= false */
   useStrict?: boolean /*= true */
+  splitDefaultNamedDeclarations?: boolean /*= false */
   sourceMap?: boolean /*= false */
   onBeforeTransform?: OnBeforeTransform
   onAfterTransform?: OnAfterTransform

package/src/plugin.js

@@ -25,6 +25,9 @@ const {
   // Do not insert `"use strict"` expression to the AMD modules. You'd set it
   // to `false` if your bundler inserts `"use strict"` to the outer scope.
   useStrict,
+  // Split `export default class A {}` to `class A {}; export default A`
+  // to trade easier AST manipulation for 100% code compatibility.
+  splitDefaultNamedDeclarations,
   // Boolean or object with booleans { inline, content }.
   sourceMap,
   // Enable console logging.
@@ -115,6 +118,7 @@ export default {
           /*ecmaVersion,*/
           useStrict,
           skipIfNoImportExport,
+          splitDefaultNamedDeclarations,
           // Always produce the source maps when transpiling in the browser, otherwise
           // the debugging would me impossible. When building and bundling, check if
           // the source maps were enabled for the output.

package/src/transform.js

@@ -18,6 +18,9 @@ export default function transform(text, file, {
   // Do not insert `"use strict"` expression to the AMD modules. You'd set it
   // to `false` if your bundler inserts `"use strict"` to the outer scope.
   useStrict,
+  // Split `export default class A {}` to `class A {}; export default A`
+  // to trade easier AST manipulation for 100% code compatibility.
+  splitDefaultNamedDeclarations,
   // Enable source maps, can be an object with booleans { inline, content }.
   // If set to true, the object will be set to { inline: true, content: true }.
   sourceMap,
@@ -45,6 +48,7 @@ export default function transform(text, file, {
     originalResolvePath,
     useStrict,
     skipIfNoImportExport,
+    splitDefaultNamedDeclarations,
     onBeforeTransform,
     onAfterTransform,
     onBeforeUpdate,

package/src/transformer/esm.js

@@ -87,6 +87,7 @@ export function transformEsmToAmd(program, options) {
     program
   })
 
+  const { splitDefaultNamedDeclarations } = options
   const { body } = program
   let { length } = body
 
@@ -148,47 +149,52 @@ export function transformEsmToAmd(program, options) {
 
       // expression after keyword default
       const { declaration } = statement
+      // export default X
       let exportValue = declaration
-      const needExportExpression = true
-
-      if (declaration.type === 'FunctionDeclaration') {
-        exportValue = toExpression(exportValue)
-      }
-      if (declaration.type === 'ClassDeclaration') {
-        exportValue = toExpression(exportValue)
-        // const classNode = exportValue
-
-        // if (classNode.id) {
-        //   body[i] = classNode
-
-        //   const className = identifier(classNode.id.name)
-        //   let exportStat
-        //   if (i + 1 === length && isOnlyDefaultExport) {
-        //     exportStat = returnStatement(identifier(className))
-        //     needReturnExport = false
-        //   } else {
-        //     exportStat = exportStatement(exportsVar, 'default', className)
-        //   }
-
-        //   program.pushContainer('body', [exportStat])
-        //   needExportExpression = false
-        // } else {
-        //   exportValue = toExpression(classNode)
-        // }
+      let keepDeclaration
+
+      if (declaration.type === 'FunctionDeclaration' ||
+          declaration.type === 'ClassDeclaration') {
+        const { id } = declaration
+        if (id && splitDefaultNamedDeclarations) {
+          // export default function X() {}
+          // export default class X {}
+          exportValue = identifier(declaration.id.name)
+          keepDeclaration = true
+        } else {
+          // export default function () {}
+          // export default class {}
+          exportValue = toExpression(declaration)
+        }
       }
 
-      if (needExportExpression) {
-        let exportStat
+      let exportStat
 
-        if (i + 1 === length && isOnlyDefaultExport) {
-          exportStat = returnStatement(exportValue)
-          needReturnExport = false
-        } else {
-          exportStat = exportStatement(exportsVar, 'default', exportValue)
-        }
+      if (i + 1 === length && isOnlyDefaultExport) {
+        exportStat = returnStatement(exportValue)
+        needReturnExport = false
+      } else {
+        exportStat = exportStatement(exportsVar, 'default', exportValue)
+      }
 
-        body[i] = exportStat
+      // This changes the original code by putting the name of the exported
+      // function or class to the module scope. Being able to access the class
+      // by name simplifies other AST manipulations, which would have to be more
+      // complicated. Or the developer would have to help the manipulator
+      // by separating the export expression to a declaration and an export
+      // of an identifier. Use it if it doesn't break your code.
+      //
+      // // original, the name X is not in the module scope
+      // export default class X {}
+      //
+      // // converted, the name X is in the module scope
+      // class X {}
+      // export default X
+      if (keepDeclaration) {
+        body.splice(i++, 0, declaration)
+        ++length
       }
+      body[i] = exportStat
     }
 
     // export {x as y}