requirejs-esm 4.3.0 → 4.4.0

package/README.md

@@ -128,6 +128,9 @@ The `esm` plugin supports configuration with the following defaults:
     // 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: true,
+    // Split `export default class A {}` to `class A {}; export default A`
+    // to trade easier AST manipulation for 100% code compatibility.
+    splitDefaultNamedDeclarations: false,
     // 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: false,
@@ -184,7 +187,7 @@ The returned object:
 }
 ```
 
-## Skipping ann Forcing Transformation
+## Skipping and Forcing Transformation
 
 If the option `skipIfNoImportExport` of `transform` is set to `true` and the input source contains neither `import` nor `export` statements, the input source won't be enclosed in the AMD wrapper. The input will be assumed to be in AMD/UMD format already.
 

package/bin/esm2requirejs.js

@@ -17,6 +17,7 @@ program.description('Transforms an ESM module to AMD or adapts an AMD module for
   .option('-r, --rewrite', 'rewrite the input files with the adapted output')
   .option('-s, --source-map', 'write inline source maps to the adapted output')
   .option('-a, --skip-if-no-import-export', 'assume AMD/UMD if there\'re no import or export statements')
+  .option('-d, --split-default-named-declarations', 'split default named export to declaration and export')
   .option('-v, --verbose', 'print progress and call stack in case of error')
   .argument('[files...]')
   .on('--help', () => {
@@ -37,6 +38,7 @@ const {
   plugin: pluginName,
   sourceMap,
   skipIfNoImportExport,
+  splitDefaultNamedDeclarations,
   output: outputFile,
   rewrite,
   verbose
@@ -60,6 +62,7 @@ if (!args.length) {
         pluginName,
         sourceMap,
         skipIfNoImportExport,
+        splitDefaultNamedDeclarations,
         verbose
       })
       if (updated) {

package/dist/api.js

@@ -10541,7 +10541,7 @@
   			var isInstance = false;
         try {
           isInstance = this instanceof a;
-        } catch {}
+        } catch (e) {}
   			if (isInstance) {
           return Reflect.construct(f, arguments, this.constructor);
   			}
@@ -10715,7 +10715,7 @@
   function requireLib () {
   	if (hasRequiredLib) return lib;
   	hasRequiredLib = 1;
-  	(function (exports$1) {
+  	(function (exports) {
 
   		function _(message, opts) {
   		    return `${opts && opts.context ? opts.context : "Value"} ${message}.`;
@@ -10858,31 +10858,31 @@
   		    };
   		}
 
-  		exports$1.any = V => {
+  		exports.any = V => {
   		    return V;
   		};
 
-  		exports$1.void = function () {
+  		exports.void = function () {
   		    return undefined;
   		};
 
-  		exports$1.boolean = function (val) {
+  		exports.boolean = function (val) {
   		    return !!val;
   		};
 
-  		exports$1.byte = createIntegerConversion(8, { unsigned: false });
-  		exports$1.octet = createIntegerConversion(8, { unsigned: true });
+  		exports.byte = createIntegerConversion(8, { unsigned: false });
+  		exports.octet = createIntegerConversion(8, { unsigned: true });
 
-  		exports$1.short = createIntegerConversion(16, { unsigned: false });
-  		exports$1["unsigned short"] = createIntegerConversion(16, { unsigned: true });
+  		exports.short = createIntegerConversion(16, { unsigned: false });
+  		exports["unsigned short"] = createIntegerConversion(16, { unsigned: true });
 
-  		exports$1.long = createIntegerConversion(32, { unsigned: false });
-  		exports$1["unsigned long"] = createIntegerConversion(32, { unsigned: true });
+  		exports.long = createIntegerConversion(32, { unsigned: false });
+  		exports["unsigned long"] = createIntegerConversion(32, { unsigned: true });
 
-  		exports$1["long long"] = createIntegerConversion(64, { unsigned: false });
-  		exports$1["unsigned long long"] = createIntegerConversion(64, { unsigned: true });
+  		exports["long long"] = createIntegerConversion(64, { unsigned: false });
+  		exports["unsigned long long"] = createIntegerConversion(64, { unsigned: true });
 
-  		exports$1.double = (V, opts) => {
+  		exports.double = (V, opts) => {
   		    const x = +V;
 
   		    if (!Number.isFinite(x)) {
@@ -10892,13 +10892,13 @@
   		    return x;
   		};
 
-  		exports$1["unrestricted double"] = V => {
+  		exports["unrestricted double"] = V => {
   		    const x = +V;
 
   		    return x;
   		};
 
-  		exports$1.float = (V, opts) => {
+  		exports.float = (V, opts) => {
   		    const x = +V;
 
   		    if (!Number.isFinite(x)) {
@@ -10918,7 +10918,7 @@
   		    return y;
   		};
 
-  		exports$1["unrestricted float"] = V => {
+  		exports["unrestricted float"] = V => {
   		    const x = +V;
 
   		    if (isNaN(x)) {
@@ -10932,7 +10932,7 @@
   		    return Math.fround(x);
   		};
 
-  		exports$1.DOMString = function (V, opts) {
+  		exports.DOMString = function (V, opts) {
   		    if (opts === undefined) {
   		        opts = {};
   		    }
@@ -10948,8 +10948,8 @@
   		    return String(V);
   		};
 
-  		exports$1.ByteString = (V, opts) => {
-  		    const x = exports$1.DOMString(V, opts);
+  		exports.ByteString = (V, opts) => {
+  		    const x = exports.DOMString(V, opts);
   		    let c;
   		    for (let i = 0; (c = x.codePointAt(i)) !== undefined; ++i) {
   		        if (c > 255) {
@@ -10960,8 +10960,8 @@
   		    return x;
   		};
 
-  		exports$1.USVString = (V, opts) => {
-  		    const S = exports$1.DOMString(V, opts);
+  		exports.USVString = (V, opts) => {
+  		    const S = exports.DOMString(V, opts);
   		    const n = S.length;
   		    const U = [];
   		    for (let i = 0; i < n; ++i) {
@@ -10988,7 +10988,7 @@
   		    return U.join("");
   		};
 
-  		exports$1.object = (V, opts) => {
+  		exports.object = (V, opts) => {
   		    if (type(V) !== "Object") {
   		        throw new TypeError(_("is not an object", opts));
   		    }
@@ -11015,7 +11015,7 @@
   		].forEach(func => {
   		    const name = func.name;
   		    const article = /^[AEIOU]/.test(name) ? "an" : "a";
-  		    exports$1[name] = (V, opts) => {
+  		    exports[name] = (V, opts) => {
   		        if (!(V instanceof func)) {
   		            throw new TypeError(_(`is not ${article} ${name} object`, opts));
   		        }
@@ -11026,7 +11026,7 @@
 
   		// Common definitions
 
-  		exports$1.ArrayBufferView = (V, opts) => {
+  		exports.ArrayBufferView = (V, opts) => {
   		    if (!ArrayBuffer.isView(V)) {
   		        throw new TypeError(_("is not a view on an ArrayBuffer object", opts));
   		    }
@@ -11034,7 +11034,7 @@
   		    return V;
   		};
 
-  		exports$1.BufferSource = (V, opts) => {
+  		exports.BufferSource = (V, opts) => {
   		    if (!(ArrayBuffer.isView(V) || V instanceof ArrayBuffer)) {
   		        throw new TypeError(_("is not an ArrayBuffer object or a view on one", opts));
   		    }
@@ -11042,11 +11042,11 @@
   		    return V;
   		};
 
-  		exports$1.DOMTimeStamp = exports$1["unsigned long long"];
+  		exports.DOMTimeStamp = exports["unsigned long long"];
 
-  		exports$1.Function = convertCallbackFunction;
+  		exports.Function = convertCallbackFunction;
 
-  		exports$1.VoidFunction = convertCallbackFunction; 
+  		exports.VoidFunction = convertCallbackFunction; 
   	} (lib));
   	return lib;
   }
@@ -11058,7 +11058,7 @@
   function requireUtils () {
   	if (hasRequiredUtils) return utils.exports;
   	hasRequiredUtils = 1;
-  	(function (module, exports$1) {
+  	(function (module, exports) {
 
   		// Returns "Type(value) is Object" in ES terminology.
   		function isObject(value) {
@@ -79148,7 +79148,7 @@
   function requireLodash_sortby () {
   	if (hasRequiredLodash_sortby) return lodash_sortby.exports;
   	hasRequiredLodash_sortby = 1;
-  	(function (module, exports$1) {
+  	(function (module, exports) {
   		/** Used as the size to enable large array optimizations. */
   		var LARGE_ARRAY_SIZE = 200;
 
@@ -79242,7 +79242,7 @@
   		var root = freeGlobal || freeSelf || Function('return this')();
 
   		/** Detect free variable `exports`. */
-  		var freeExports = exports$1 && !exports$1.nodeType && exports$1;
+  		var freeExports = exports && !exports.nodeType && exports;
 
   		/** Detect free variable `module`. */
   		var freeModule = freeExports && 'object' == 'object' && module && !module.nodeType && module;
@@ -84031,15 +84031,15 @@
   function requireBinarySearch () {
   	if (hasRequiredBinarySearch) return binarySearch;
   	hasRequiredBinarySearch = 1;
-  	(function (exports$1) {
+  	(function (exports) {
   		/*
   		 * Copyright 2011 Mozilla Foundation and contributors
   		 * Licensed under the New BSD license. See LICENSE or:
   		 * http://opensource.org/licenses/BSD-3-Clause
   		 */
 
-  		exports$1.GREATEST_LOWER_BOUND = 1;
-  		exports$1.LEAST_UPPER_BOUND = 2;
+  		exports.GREATEST_LOWER_BOUND = 1;
+  		exports.LEAST_UPPER_BOUND = 2;
 
   		/**
   		 * Recursive implementation of binary search.
@@ -84078,7 +84078,7 @@
 
   		    // The exact needle element was not found in this haystack. Determine if
   		    // we are in termination case (3) or (2) and return the appropriate thing.
-  		    if (aBias == exports$1.LEAST_UPPER_BOUND) {
+  		    if (aBias == exports.LEAST_UPPER_BOUND) {
   		      return aHigh < aHaystack.length ? aHigh : -1;
   		    }
   		    return mid;
@@ -84091,7 +84091,7 @@
   		  }
 
   		  // we are in termination case (3) or (2) and return the appropriate thing.
-  		  if (aBias == exports$1.LEAST_UPPER_BOUND) {
+  		  if (aBias == exports.LEAST_UPPER_BOUND) {
   		    return mid;
   		  }
   		  return aLow < 0 ? -1 : aLow;
@@ -84115,13 +84115,13 @@
   		 *     searching for, respectively, if the exact element cannot be found.
   		 *     Defaults to 'binarySearch.GREATEST_LOWER_BOUND'.
   		 */
-  		exports$1.search = function search(aNeedle, aHaystack, aCompare, aBias) {
+  		exports.search = function search(aNeedle, aHaystack, aCompare, aBias) {
   		  if (aHaystack.length === 0) {
   		    return -1;
   		  }
 
   		  let index = recursiveSearch(-1, aHaystack.length, aNeedle, aHaystack,
-  		                              aCompare, aBias || exports$1.GREATEST_LOWER_BOUND);
+  		                              aCompare, aBias || exports.GREATEST_LOWER_BOUND);
   		  if (index < 0) {
   		    return -1;
   		  }
@@ -86524,7 +86524,7 @@
     const { length } = body;
 
     const imports = [];
-    const exports$1 = [];
+    const exports = [];
 
     for (let i = 0; i < length; ++i) {
       const node = body[i];
@@ -86552,7 +86552,7 @@
 
       // export default
       else if (node.type === 'ExportDefaultDeclaration') {
-        exports$1.push({ node, default: true });
+        exports.push({ node, default: true });
       }
 
       // export {x as y}
@@ -86564,29 +86564,29 @@
 
         // export var a = 1
         if (!specifiers.length) {
-          exports$1.push({ node });
+          exports.push({ node });
         } else { // export {x as y}
           // export { ... } from "module"
           const { source } = node;
           if (source) {
-            exports$1.push({ node, source, import: true });
+            exports.push({ node, source, import: true });
             const specifiers = node.specifiers.map(({ exported: imported, local }) => ({ imported, local }));
             imports.push({ node, source, specifiers, export: true });
           } else {
-            exports$1.push({ node });
+            exports.push({ node });
           }
         }
       }
 
       // export * from "module"
       if (node.type === 'ExportAllDeclaration') {
-        exports$1.push({ node, import: true });
+        exports.push({ node, import: true });
         const { source } = node;
         imports.push({ node, source, export: true });
       }
     }
 
-    return { imports, exports: exports$1 }
+    return { imports, exports }
   }
 
   // Transforms the module format from ESM to AMD.
@@ -86596,6 +86596,7 @@
       program
     });
 
+    const { splitDefaultNamedDeclarations } = options;
     const { body } = program;
     let { length } = body;
 
@@ -86657,46 +86658,52 @@
 
         // expression after keyword default
         const { declaration } = statement;
+        // export default X
         let exportValue = declaration;
-
-        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);
+          }
         }
 
-        {
-          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}
@@ -87004,6 +87011,9 @@
     // 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,
@@ -87031,6 +87041,7 @@
       originalResolvePath: resolvePath,
       useStrict,
       skipIfNoImportExport,
+      splitDefaultNamedDeclarations,
       onBeforeTransform,
       onAfterTransform,
       onBeforeUpdate,