esperanto-source 0.6.17.3 → 0.6.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ecd2bf61c210c71df7894596a99f4c52c4ac4dc2
-  data.tar.gz: 87b8156755993f74fb3fda718e5e831e740b8521
+  metadata.gz: 5eed9288fc9bb2887d6c21a1c181b38df7f33238
+  data.tar.gz: 0c66bb5c87139cf500b514f208c53bd167324284
 SHA512:
-  metadata.gz: b5387f60e65537808181490ab8f5ae47bc91c7721198ea73f3d607866afad5110814a832ae66f390ceb8b2d5c3c7fd59644e5b0cac43750bfdd49318a3a70654
-  data.tar.gz: fa197e602ec49f6292292c8c710a3449e406675e464275cfbce7100a6ff5fff325a0ff4c6ad0662cceee8a206ad5f265b2eb0ea25ce06b2cf7b139bcc9948279
+  metadata.gz: be6b159bcf781c1e36cfc0a687cb215a1cecaf6342c9d2ebf225bd8cf0748f650b3bd809374927da128a8ccbf179421acdff482b388fa856ab9e5620dd2956a6
+  data.tar.gz: 0b8ea823e8f5af10c02d21fcc866b8d59cf4c9027892687c4387aadb449d1be05dafba8d586170b0c7f35c7495a17ac9715f3b262873b80d7b7df976c1e8c557

data/lib/esperanto/source/version.rb

@@ -1,5 +1,5 @@
 module Esperanto
   module Source
-    VERSION = '0.6.17.3'
+    VERSION = '0.6.18'
   end
 end

data/vendor/esperanto.browser.js

@@ -1,5 +1,5 @@
 /*
-	esperanto.js v0.6.17 - 2015-03-01
+	esperanto.js v0.6.18 - 2015-03-30
 	http://esperantojs.org
 
 	Released under the MIT License.
@@ -42,7 +42,7 @@
 			return new Buffer( str ).toString( 'base64' );
 		};
 	} else {
-		throw new Error( 'Unsupported environment' );
+		throw new Error( 'Unsupported environment: `window.btoa` or `Buffer` should be supported.' );
 	}
 
 	var btoa = _btoa;
@@ -529,6 +529,10 @@
 		},
 
 		append: function ( content ) {
+			if ( typeof content !== 'string' ) {
+				throw new TypeError( 'appended content must be a string' );
+			}
+
 			this.str += content;
 			return this;
 		},
@@ -675,6 +679,10 @@
 		},
 
 		insert: function ( index, content ) {
+			if ( typeof content !== 'string' ) {
+				throw new TypeError( 'inserted content must be a string' );
+			}
+
 			if ( index === 0 ) {
 				this.prepend( content );
 			} else if ( index === this.original.length ) {
@@ -729,11 +737,41 @@
 		},
 
 		remove: function ( start, end ) {
-			this.replace( start, end, '' );
+			var loc, d, i, currentStart, currentEnd;
+
+			if ( start < 0 || end > this.mappings.length ) {
+				throw new Error( 'Character is out of bounds' );
+			}
+
+			d = 0;
+			currentStart = -1;
+			currentEnd = -1;
+			for ( i = start; i < end; i += 1 ) {
+				loc = this.mappings[i];
+
+				if ( loc !== -1 ) {
+					if ( !~currentStart ) {
+						currentStart = loc;
+					}
+
+					currentEnd = loc + 1;
+
+					this.mappings[i] = -1;
+					d += 1;
+				}
+			}
+
+			this.str = this.str.slice( 0, currentStart ) + this.str.slice( currentEnd );
+
+			adjust( this.mappings, end, this.mappings.length, -d );
 			return this;
 		},
 
 		replace: function ( start, end, content ) {
+			if ( typeof content !== 'string' ) {
+				throw new TypeError( 'replacement content must be a string' );
+			}
+
 			var firstChar, lastChar, d;
 
 			firstChar = this.locate( start );
@@ -934,7 +972,7 @@
 
 		estraverse.traverse( ast, {
 			enter: function ( node ) {
-				if ( node.type === 'ImportDeclaration' ) {
+				if ( node.type === 'ImportDeclaration' || node.type === 'ExportSpecifier' ) {
 					node._skip = true;
 				}
 
@@ -1076,16 +1114,19 @@
 				imports.push( declaration );
 			}
 
-			else if ( node.type === 'ExportDeclaration' ) {
-				declaration = processExport( node, source );
+			else if ( node.type === 'ExportDefaultDeclaration' ) {
+				declaration = processDefaultExport( node, source );
 				exports.push( declaration );
 
-				if ( declaration.isDefault ) {
-					if ( mod.defaultExport ) {
-						throw new Error( 'Duplicate default exports' );
-					}
-					mod.defaultExport = declaration;
+				if ( mod.defaultExport ) {
+					throw new Error( 'Duplicate default exports' );
 				}
+				mod.defaultExport = declaration;
+			}
+
+			else if ( node.type === 'ExportNamedDeclaration' ) {
+				declaration = processExport( node, source );
+				exports.push( declaration );
 
 				if ( node.source ) {
 					// it's both an import and an export, e.g.
@@ -1129,20 +1170,25 @@
 			specifiers: node.specifiers.map( function(s ) {
 				var id;
 
-				if ( s.type === 'ImportBatchSpecifier' ) {
+				if ( s.type === 'ImportNamespaceSpecifier' ) {
 					return {
 						isBatch: true,
-						name: s.name.name,
-						as: s.name.name
+						name: s.local.name, // TODO is this line necessary?
+						as: s.local.name
 					};
 				}
 
-				id = s.id.name;
+				if ( s.type === 'ImportDefaultSpecifier' ) {
+					return {
+						isDefault: true,
+						name: 'default',
+						as: s.local.name
+					}
+				}
 
 				return {
-					isDefault: !!s.default,
-					name: s.default ? 'default' : id,
-					as: s.name ? s.name.name : id
+					name: ( !!passthrough ? s.exported : s.imported ).name,
+					as: s.local.name
 				};
 			})
 		};
@@ -1164,6 +1210,53 @@
 		return x;
 	}
 
+	function processDefaultExport ( node, source ) {
+		var result = {
+			isDefault: true,
+			node: node,
+			start: node.start,
+			end: node.end
+		};
+
+		var d = node.declaration;
+
+		if ( d.type === 'FunctionExpression' ) {
+			// Case 1: `export default function () {...}`
+			result.hasDeclaration = true; // TODO remove in favour of result.type
+			result.type = 'anonFunction';
+		}
+
+		else if ( d.type === 'FunctionDeclaration' ) {
+			// Case 2: `export default function foo () {...}`
+			result.hasDeclaration = true; // TODO remove in favour of result.type
+			result.type = 'namedFunction';
+			result.name = d.id.name;
+		}
+
+		else if ( d.type === 'ClassExpression' ) {
+			// Case 3: `export default class {...}`
+			result.hasDeclaration = true; // TODO remove in favour of result.type
+			result.type = 'anonClass';
+		}
+
+		else if ( d.type === 'ClassDeclaration' ) {
+			// Case 4: `export default class Foo {...}`
+			result.hasDeclaration = true; // TODO remove in favour of result.type
+			result.type = 'namedClass';
+			result.name = d.id.name;
+		}
+
+		else {
+			result.type = 'expression';
+			result.name = 'default';
+		}
+
+		result.value = source.slice( d.start, d.end );
+		result.valueStart = d.start;
+
+		return result;
+	}
+
 	/**
 	 * Generates a representation of an export declaration
 	 * @param {object} node - the original AST node
@@ -1194,62 +1287,23 @@
 			else if ( d.type === 'FunctionDeclaration' ) {
 				result.hasDeclaration = true; // TODO remove in favour of result.type
 				result.type = 'namedFunction';
-				result.isDefault = !!node.default;
 				result.name = d.id.name;
 			}
 
-			else if ( d.type === 'FunctionExpression' ) {
-				result.hasDeclaration = true; // TODO remove in favour of result.type
-				result.isDefault = true;
-
-				// Case 3: `export default function foo () {...}`
-				if ( d.id ) {
-					result.type = 'namedFunction';
-					result.name = d.id.name;
-				}
-
-				// Case 4: `export default function () {...}`
-				else {
-					result.type = 'anonFunction';
-				}
-			}
-
-			// Case 5: `export class Foo {...}`
+			// Case 3: `export class Foo {...}`
 			else if ( d.type === 'ClassDeclaration' ) {
 				result.hasDeclaration = true; // TODO remove in favour of result.type
 				result.type = 'namedClass';
-				result.isDefault = !!node.default;
 				result.name = d.id.name;
 			}
-
-			else if ( d.type === 'ClassExpression' ) {
-				result.hasDeclaration = true; // TODO remove in favour of result.type
-				result.isDefault = true;
-
-				// Case 6: `export default class Foo {...}`
-				if ( d.id ) {
-					result.type = 'namedClass';
-					result.name = d.id.name;
-				}
-
-				// Case 7: `export default class {...}`
-				else {
-					result.type = 'anonClass';
-				}
-			}
-
-			// Case 8: `export default 1 + 2`
-			else {
-				result.type = 'expression';
-				result.isDefault = true;
-				result.name = 'default';
-			}
 		}
 
 		// Case 9: `export { foo, bar };`
 		else {
 			result.type = 'named';
-			result.specifiers = node.specifiers.map( function(s ) {return { name: s.id.name }}  ); // TODO as?
+			result.specifiers = node.specifiers.map( function(s ) {
+				return { name: s.local.name };
+			}); // TODO as?
 		}
 
 		return result;
@@ -1352,24 +1406,36 @@
 		return path.split( pathSplitRE );
 	}
 
-	function getStandaloneModule ( options ) {var $D$0;
-		var mod, imports, exports, conflicts = {};
+	var SOURCEMAPPINGURL_REGEX = /^# sourceMappingURL=/;
+
+	function getStandaloneModule ( options ) {
+		var toRemove = [];
 
-		mod = {
+		var mod = {
 			body: new MagicString( options.source ),
 			ast: acorn.parse( options.source, {
 				ecmaVersion: 6,
-				locations: true
+				sourceType: 'module',
+				onComment: function ( block, text, start, end ) {
+					// sourceMappingURL comments should be removed
+					if ( !block && /^# sourceMappingURL=/.test( text ) ) {
+						toRemove.push({ start: start, end: end });
+					}
+				}
 			})
 		};
 
-		imports = ($D$0 = findImportsAndExports( mod, options.source, mod.ast ))[0], exports = $D$0[1], $D$0;
+		toRemove.forEach( function(end)  {var start = end.start, end = end.end;return mod.body.remove( start, end )} );
+
+		var imports = (exports = findImportsAndExports( mod, options.source, mod.ast ))[0], exports = exports[1];
 
 		disallowConflictingImports( imports );
 
 		mod.imports = imports;
 		mod.exports = exports;
 
+		var conflicts = {};
+
 		if ( options.strict ) {
 			annotateAst( mod.ast );
 
@@ -1382,7 +1448,7 @@
 		determineImportNames( imports, options.getModuleName, conflicts );
 
 		return mod;
-	;$D$0 = void 0}
+	}
 
 	function determineImportNames ( imports, userFn, usedNames ) {
 		var nameById = {}, inferredNames = {};
@@ -1450,44 +1516,48 @@
 	}
 
 	function transformExportDeclaration ( declaration, body ) {
-		var exportedValue;
+		if ( !declaration ) {
+			return;
+		}
 
-		if ( declaration ) {
-			switch ( declaration.type ) {
-				case 'namedFunction':
-				case 'namedClass':
-					body.remove( declaration.start, declaration.valueStart );
-					exportedValue = declaration.name;
-					break;
+		var exportedValue;
 
-				case 'anonFunction':
-				case 'anonClass':
-					if ( declaration.isFinal ) {
-						body.replace( declaration.start, declaration.valueStart, 'return ' );
-					} else {
-						body.replace( declaration.start, declaration.valueStart, 'var __export = ' );
-						exportedValue = '__export';
-					}
+		switch ( declaration.type ) {
+			case 'namedFunction':
+			case 'namedClass':
+				body.remove( declaration.start, declaration.valueStart );
+				exportedValue = declaration.name;
+				break;
+
+			case 'anonFunction':
+			case 'anonClass':
+				if ( declaration.isFinal ) {
+					body.replace( declaration.start, declaration.valueStart, 'return ' );
+				} else {
+					body.replace( declaration.start, declaration.valueStart, 'var __export = ' );
+					exportedValue = '__export';
+				}
 
-					// add semi-colon, if necessary
-					if ( declaration.value.slice( -1 ) !== ';' ) {
-						body.insert( declaration.end, ';' );
-					}
+				// add semi-colon, if necessary
+				// TODO body.original is an implementation detail of magic-string - there
+				// should probably be an API for this sort of thing
+				if ( body.original[ declaration.end - 1 ] !== ';' ) {
+					body.insert( declaration.end, ';' );
+				}
 
-					break;
+				break;
 
-				case 'expression':
-					body.remove( declaration.start, declaration.next );
-					exportedValue = declaration.value;
-					break;
+			case 'expression':
+				body.remove( declaration.start, declaration.next );
+				exportedValue = declaration.value;
+				break;
 
-				default:
-					throw new Error( 'Unexpected export type' );
-			}
+			default:
+				throw new Error( (("Unexpected export type '" + (declaration.type)) + "'") );
+		}
 
-			if ( exportedValue ) {
-				body.append( '\nreturn ' + exportedValue + ';' );
-			}
+		if ( exportedValue ) {
+			body.append( '\nreturn ' + exportedValue + ';' );
 		}
 	}
 
@@ -1744,18 +1814,13 @@
 			switch ( exportDeclaration.type ) {
 				case 'namedFunction':
 				case 'namedClass':
-					mod.body.remove( exportDeclaration.start, exportDeclaration.valueStart );
+					mod.body.remove( exportDeclaration.start, exportDeclaration.node.declaration.start );
 					mod.body.replace( exportDeclaration.end, exportDeclaration.end, (("\nmodule.exports = " + (exportDeclaration.node.declaration.id.name)) + ";") );
 					break;
 
-				case 'anonFunction':
-				case 'anonClass':
-				case 'expression':
-					mod.body.replace( exportDeclaration.start, exportDeclaration.valueStart, 'module.exports = ' );
-					break;
-
 				default:
-					throw new Error( 'Unexpected export type' );
+					mod.body.replace( exportDeclaration.start, exportDeclaration.node.declaration.start, 'module.exports = ' );
+					break;
 			}
 		}
 
@@ -1771,12 +1836,12 @@
 
 		var intro =
 	(("(function (factory) {\
-\n		!(typeof exports === 'object' && typeof module !== 'undefined') &&\
-\n		typeof define === 'function' && define.amd ? define(" + amdName) + "factory) :\
-\n		factory()\
-\n	}(function () { 'use strict';\
+\n	!(typeof exports === 'object' && typeof module !== 'undefined') &&\
+\n	typeof define === 'function' && define.amd ? define(" + amdName) + "factory) :\
+\n	factory()\
+\n}(function () { 'use strict';\
 \n\
-\n	");
+\n");
 
 		return intro.replace( /\t/g, indentStr );
 	}
@@ -1803,12 +1868,12 @@
 
 		var intro =
 	(("(function (global, factory) {\
-\n		typeof exports === 'object' && typeof module !== 'undefined' ? " + cjsExport) + (" :\
-\n		typeof define === 'function' && define.amd ? define(" + amdName) + ("" + amdDeps) + ("factory) :\
-\n		" + globalExport) + ("\
-\n	}(this, function (" + args) + ") { 'use strict';\
+\n	typeof exports === 'object' && typeof module !== 'undefined' ? " + cjsExport) + (" :\
+\n	typeof define === 'function' && define.amd ? define(" + amdName) + ("" + amdDeps) + ("factory) :\
+\n	" + globalExport) + ("\
+\n}(this, function (" + args) + ") { 'use strict';\
 \n\
-\n	");
+\n");
 
 		return intro.replace( /\t/g, indentStr );
 	}
@@ -1999,19 +2064,15 @@
 		}
 	}
 
-	function rewriteIdentifiers ( body, node, identifierReplacements, scope ) {
-		var name, replacement;
-
-		if ( node.type === 'Identifier' ) {
-			name = node.name;
-			replacement = hasOwnProp.call( identifierReplacements, name ) && identifierReplacements[ name ];
+	function replaceIdentifiers ( body, node, identifierReplacements, scope ) {
+		var name = node.name;
+		var replacement = hasOwnProp.call( identifierReplacements, name ) && identifierReplacements[ name ];
 
-			// TODO unchanged identifiers shouldn't have got this far -
-			// remove the `replacement !== name` safeguard once that's the case
-			if ( replacement && replacement !== name && !scope.contains( name, true ) ) {
-				// rewrite
-				body.replace( node.start, node.end, replacement );
-			}
+		// TODO unchanged identifiers shouldn't have got this far -
+		// remove the `replacement !== name` safeguard once that's the case
+		if ( replacement && replacement !== name && !scope.contains( name, true ) ) {
+			// rewrite
+			body.replace( node.start, node.end, replacement );
 		}
 	}
 
@@ -2067,7 +2128,7 @@
 			previousCapturedUpdates = null;
 
 		estraverse.traverse( ast, {
-			enter: function ( node ) {
+			enter: function ( node, parent ) {
 				// we're only interested in references, not property names etc
 				if ( node._skip ) return this.skip();
 
@@ -2096,8 +2157,9 @@
 				// and `capturedUpdates`, which are used elsewhere
 				rewriteExportAssignments( body, node, exportNames, scope, alreadyExported, scope === ast._scope, capturedUpdates );
 
-				// Replace identifiers
-				rewriteIdentifiers( body, node, identifierReplacements, scope );
+				if ( node.type === 'Identifier' && parent.type !== 'FunctionExpression' ) {
+					replaceIdentifiers( body, node, identifierReplacements, scope );
+				}
 
 				// Replace top-level this with undefined ES6 8.1.1.5.4
 				if ( node.type === 'ThisExpression' && node._topLevel ) {
@@ -2128,7 +2190,7 @@
 		return ((" exports." + (c.name)) + (" = " + (c.exportAs)) + ";");
 	}
 
-	function transformBody ( mod, body, options ) {var $D$1;
+	function transformBody ( mod, body, options ) {var $D$0;
 		var chains,
 			identifierReplacements,
 			importedBindings = {},
@@ -2138,10 +2200,10 @@
 			earlyExports,
 			lateExports;
 
-		chains = ($D$1 = gatherImports( mod.imports ))[0], identifierReplacements = $D$1[1], $D$1;
+		chains = ($D$0 = gatherImports( mod.imports ))[0], identifierReplacements = $D$0[1], $D$0;
 		exportNames = getExportNames( mod.exports );
 
-		importedBindings = ($D$1 = getReadOnlyIdentifiers( mod.imports ))[0], importedNamespaces = $D$1[1], $D$1;
+		importedBindings = ($D$0 = getReadOnlyIdentifiers( mod.imports ))[0], importedNamespaces = $D$0[1], $D$0;
 
 		// ensure no conflict with `exports`
 		identifierReplacements.exports = deconflict( 'exports', mod.ast._declared );
@@ -2166,35 +2228,32 @@
 
 		// Remove export statements (but keep declarations)
 		mod.exports.forEach( function(x ) {
-			switch ( x.type ) {
-				case 'varDeclaration': // export var answer = 42;
+			if ( x.isDefault ) {
+				if ( /^named/.test( x.type ) ) {
+					// export default function answer () { return 42; }
 					body.remove( x.start, x.valueStart );
-					return;
+					body.insert( x.end, (("\nexports['default'] = " + (x.name)) + ";") );
+				} else {
+					// everything else
+					body.replace( x.start, x.valueStart, 'exports[\'default\'] = ' );
+				}
+			}
 
-				case 'namedFunction':
-				case 'namedClass':
-					if ( x.isDefault ) {
-						// export default function answer () { return 42; }
-						body.remove( x.start, x.valueStart );
-						body.insert( x.end, (("\nexports['default'] = " + (x.name)) + ";") );
-					} else {
-						// export function answer () { return 42; }
+			else {
+				switch ( x.type ) {
+					case 'varDeclaration': // export var answer = 42; (or let)
+					case 'namedFunction':  // export function answer () {...}
+					case 'namedClass':     // export class answer {...}
 						body.remove( x.start, x.valueStart );
-					}
-					return;
-
-				case 'anonFunction':   // export default function () {}
-				case 'anonClass':      // export default class () {}
-				case 'expression':     // export default 40 + 2;
-					body.replace( x.start, x.valueStart, 'exports[\'default\'] = ' );
-					return;
+						break;
 
-				case 'named':          // export { foo, bar };
-					body.remove( x.start, x.next );
-					break;
+					case 'named':          // export { foo, bar };
+						body.remove( x.start, x.next );
+						break;
 
-				default:
-					throw new Error( 'Unknown export type: ' + x.type );
+					default:
+						body.replace( x.start, x.valueStart, 'exports[\'default\'] = ' );
+				}
 			}
 		});
 
@@ -2234,7 +2293,7 @@
 		if ( options.intro && options.outro ) {
 			body.indent().prepend( options.intro ).trimLines().append( options.outro );
 		}
-	;$D$1 = void 0}
+	;$D$0 = void 0}
 
 	function deconflict ( name, declared ) {
 		while ( hasOwnProp.call( declared, name ) ) {
@@ -2272,12 +2331,12 @@
 
 	strictMode_amd__introTemplate = template( 'define(<%= amdName %><%= paths %>function (<%= names %>) {\n\n\t\'use strict\';\n\n' );
 
-	function strictMode_amd__amd ( mod, options ) {var $D$2;
+	function strictMode_amd__amd ( mod, options ) {var $D$1;
 		var importPaths,
 			importNames,
 			intro;
 
-		importPaths = ($D$2 = getImportSummary( mod ))[0], importNames = $D$2[1], $D$2;
+		importPaths = ($D$1 = getImportSummary( mod ))[0], importNames = $D$1[1], $D$1;
 
 		if ( mod.exports.length ) {
 			importPaths.unshift( 'exports' );
@@ -2297,7 +2356,7 @@
 		});
 
 		return packageResult( mod, mod.body, options, 'toAmd' );
-	;$D$2 = void 0}
+	;$D$1 = void 0}
 
 	function strictMode_cjs__cjs ( mod, options ) {
 		var importBlock, seen = {};
@@ -2350,17 +2409,17 @@
 			defaultsBlock = options.externalDefaults.map( function(x )
 				{return '\t' + ( x.needsNamed ? (("var " + (x.name)) + "__default") : x.name ) +
 					((" = ('default' in " + (x.name)) + (" ? " + (x.name)) + ("['default'] : " + (x.name)) + ");")}
-			).join('\n') + '\n\n';
+		).join('\n') + '\n\n';
 		}
 
 		var intro =
 	(("(function (global, factory) {\
-\n		typeof exports === 'object' && typeof module !== 'undefined' ? factory(" + cjsDeps) + (") :\
-\n		typeof define === 'function' && define.amd ? define(" + amdName) + ("" + amdDeps) + ("factory) :\
-\n		factory(" + globalDeps) + (")\
-\n	}(this, function (" + args) + (") { 'use strict';\
+\n	typeof exports === 'object' && typeof module !== 'undefined' ? factory(" + cjsDeps) + (") :\
+\n	typeof define === 'function' && define.amd ? define(" + amdName) + ("" + amdDeps) + ("factory) :\
+\n	factory(" + globalDeps) + (")\
+\n}(this, function (" + args) + (") { 'use strict';\
 \n\
-\n	" + defaultsBlock) + "");
+\n" + defaultsBlock) + "");
 
 		return intro.replace( /\t/g, indentStr );
 	}

data/vendor/esperanto.js

@@ -1,5 +1,5 @@
 /*
-	esperanto.js v0.6.17 - 2015-03-01
+	esperanto.js v0.6.18 - 2015-03-30
 	http://esperantojs.org
 
 	Released under the MIT License.
@@ -77,7 +77,7 @@ function annotateAst ( ast ) {
 
 	estraverse.traverse( ast, {
 		enter: function ( node ) {
-			if ( node.type === 'ImportDeclaration' ) {
+			if ( node.type === 'ImportDeclaration' || node.type === 'ExportSpecifier' ) {
 				node._skip = true;
 			}
 
@@ -219,16 +219,19 @@ function findImportsAndExports ( mod, source, ast ) {
 			imports.push( declaration );
 		}
 
-		else if ( node.type === 'ExportDeclaration' ) {
-			declaration = processExport( node, source );
+		else if ( node.type === 'ExportDefaultDeclaration' ) {
+			declaration = processDefaultExport( node, source );
 			exports.push( declaration );
 
-			if ( declaration.isDefault ) {
-				if ( mod.defaultExport ) {
-					throw new Error( 'Duplicate default exports' );
-				}
-				mod.defaultExport = declaration;
+			if ( mod.defaultExport ) {
+				throw new Error( 'Duplicate default exports' );
 			}
+			mod.defaultExport = declaration;
+		}
+
+		else if ( node.type === 'ExportNamedDeclaration' ) {
+			declaration = processExport( node, source );
+			exports.push( declaration );
 
 			if ( node.source ) {
 				// it's both an import and an export, e.g.
@@ -272,20 +275,25 @@ function processImport ( node, passthrough ) {
 		specifiers: node.specifiers.map( function(s ) {
 			var id;
 
-			if ( s.type === 'ImportBatchSpecifier' ) {
+			if ( s.type === 'ImportNamespaceSpecifier' ) {
 				return {
 					isBatch: true,
-					name: s.name.name,
-					as: s.name.name
+					name: s.local.name, // TODO is this line necessary?
+					as: s.local.name
 				};
 			}
 
-			id = s.id.name;
+			if ( s.type === 'ImportDefaultSpecifier' ) {
+				return {
+					isDefault: true,
+					name: 'default',
+					as: s.local.name
+				}
+			}
 
 			return {
-				isDefault: !!s.default,
-				name: s.default ? 'default' : id,
-				as: s.name ? s.name.name : id
+				name: ( !!passthrough ? s.exported : s.imported ).name,
+				as: s.local.name
 			};
 		})
 	};
@@ -307,6 +315,53 @@ function processImport ( node, passthrough ) {
 	return x;
 }
 
+function processDefaultExport ( node, source ) {
+	var result = {
+		isDefault: true,
+		node: node,
+		start: node.start,
+		end: node.end
+	};
+
+	var d = node.declaration;
+
+	if ( d.type === 'FunctionExpression' ) {
+		// Case 1: `export default function () {...}`
+		result.hasDeclaration = true; // TODO remove in favour of result.type
+		result.type = 'anonFunction';
+	}
+
+	else if ( d.type === 'FunctionDeclaration' ) {
+		// Case 2: `export default function foo () {...}`
+		result.hasDeclaration = true; // TODO remove in favour of result.type
+		result.type = 'namedFunction';
+		result.name = d.id.name;
+	}
+
+	else if ( d.type === 'ClassExpression' ) {
+		// Case 3: `export default class {...}`
+		result.hasDeclaration = true; // TODO remove in favour of result.type
+		result.type = 'anonClass';
+	}
+
+	else if ( d.type === 'ClassDeclaration' ) {
+		// Case 4: `export default class Foo {...}`
+		result.hasDeclaration = true; // TODO remove in favour of result.type
+		result.type = 'namedClass';
+		result.name = d.id.name;
+	}
+
+	else {
+		result.type = 'expression';
+		result.name = 'default';
+	}
+
+	result.value = source.slice( d.start, d.end );
+	result.valueStart = d.start;
+
+	return result;
+}
+
 /**
  * Generates a representation of an export declaration
  * @param {object} node - the original AST node
@@ -337,62 +392,23 @@ function processExport ( node, source ) {
 		else if ( d.type === 'FunctionDeclaration' ) {
 			result.hasDeclaration = true; // TODO remove in favour of result.type
 			result.type = 'namedFunction';
-			result.isDefault = !!node.default;
 			result.name = d.id.name;
 		}
 
-		else if ( d.type === 'FunctionExpression' ) {
-			result.hasDeclaration = true; // TODO remove in favour of result.type
-			result.isDefault = true;
-
-			// Case 3: `export default function foo () {...}`
-			if ( d.id ) {
-				result.type = 'namedFunction';
-				result.name = d.id.name;
-			}
-
-			// Case 4: `export default function () {...}`
-			else {
-				result.type = 'anonFunction';
-			}
-		}
-
-		// Case 5: `export class Foo {...}`
+		// Case 3: `export class Foo {...}`
 		else if ( d.type === 'ClassDeclaration' ) {
 			result.hasDeclaration = true; // TODO remove in favour of result.type
 			result.type = 'namedClass';
-			result.isDefault = !!node.default;
 			result.name = d.id.name;
 		}
-
-		else if ( d.type === 'ClassExpression' ) {
-			result.hasDeclaration = true; // TODO remove in favour of result.type
-			result.isDefault = true;
-
-			// Case 6: `export default class Foo {...}`
-			if ( d.id ) {
-				result.type = 'namedClass';
-				result.name = d.id.name;
-			}
-
-			// Case 7: `export default class {...}`
-			else {
-				result.type = 'anonClass';
-			}
-		}
-
-		// Case 8: `export default 1 + 2`
-		else {
-			result.type = 'expression';
-			result.isDefault = true;
-			result.name = 'default';
-		}
 	}
 
 	// Case 9: `export { foo, bar };`
 	else {
 		result.type = 'named';
-		result.specifiers = node.specifiers.map( function(s ) {return { name: s.id.name }}  ); // TODO as?
+		result.specifiers = node.specifiers.map( function(s ) {
+			return { name: s.local.name };
+		}); // TODO as?
 	}
 
 	return result;
@@ -495,24 +511,36 @@ function splitPath ( path ) {
 	return path.split( pathSplitRE );
 }
 
-function getStandaloneModule ( options ) {var $D$0;
-	var mod, imports, exports, conflicts = {};
+var SOURCEMAPPINGURL_REGEX = /^# sourceMappingURL=/;
 
-	mod = {
+function getStandaloneModule ( options ) {
+	var toRemove = [];
+
+	var mod = {
 		body: new MagicString( options.source ),
 		ast: acorn.parse( options.source, {
 			ecmaVersion: 6,
-			locations: true
+			sourceType: 'module',
+			onComment: function ( block, text, start, end ) {
+				// sourceMappingURL comments should be removed
+				if ( !block && /^# sourceMappingURL=/.test( text ) ) {
+					toRemove.push({ start: start, end: end });
+				}
+			}
 		})
 	};
 
-	imports = ($D$0 = findImportsAndExports( mod, options.source, mod.ast ))[0], exports = $D$0[1], $D$0;
+	toRemove.forEach( function(end)  {var start = end.start, end = end.end;return mod.body.remove( start, end )} );
+
+	var imports = (exports = findImportsAndExports( mod, options.source, mod.ast ))[0], exports = exports[1];
 
 	disallowConflictingImports( imports );
 
 	mod.imports = imports;
 	mod.exports = exports;
 
+	var conflicts = {};
+
 	if ( options.strict ) {
 		annotateAst( mod.ast );
 
@@ -525,7 +553,7 @@ function getStandaloneModule ( options ) {var $D$0;
 	determineImportNames( imports, options.getModuleName, conflicts );
 
 	return mod;
-;$D$0 = void 0}
+}
 
 function determineImportNames ( imports, userFn, usedNames ) {
 	var nameById = {}, inferredNames = {};
@@ -1069,19 +1097,15 @@ function disallowIllegalReassignment ( node, importedBindings, importedNamespace
 	}
 }
 
-function rewriteIdentifiers ( body, node, identifierReplacements, scope ) {
-	var name, replacement;
-
-	if ( node.type === 'Identifier' ) {
-		name = node.name;
-		replacement = hasOwnProp.call( identifierReplacements, name ) && identifierReplacements[ name ];
+function replaceIdentifiers ( body, node, identifierReplacements, scope ) {
+	var name = node.name;
+	var replacement = hasOwnProp.call( identifierReplacements, name ) && identifierReplacements[ name ];
 
-		// TODO unchanged identifiers shouldn't have got this far -
-		// remove the `replacement !== name` safeguard once that's the case
-		if ( replacement && replacement !== name && !scope.contains( name, true ) ) {
-			// rewrite
-			body.replace( node.start, node.end, replacement );
-		}
+	// TODO unchanged identifiers shouldn't have got this far -
+	// remove the `replacement !== name` safeguard once that's the case
+	if ( replacement && replacement !== name && !scope.contains( name, true ) ) {
+		// rewrite
+		body.replace( node.start, node.end, replacement );
 	}
 }
 
@@ -1137,7 +1161,7 @@ function traverseAst ( ast, body, identifierReplacements, importedBindings, impo
 		previousCapturedUpdates = null;
 
 	estraverse.traverse( ast, {
-		enter: function ( node ) {
+		enter: function ( node, parent ) {
 			// we're only interested in references, not property names etc
 			if ( node._skip ) return this.skip();
 
@@ -1166,8 +1190,9 @@ function traverseAst ( ast, body, identifierReplacements, importedBindings, impo
 			// and `capturedUpdates`, which are used elsewhere
 			rewriteExportAssignments( body, node, exportNames, scope, alreadyExported, scope === ast._scope, capturedUpdates );
 
-			// Replace identifiers
-			rewriteIdentifiers( body, node, identifierReplacements, scope );
+			if ( node.type === 'Identifier' && parent.type !== 'FunctionExpression' ) {
+				replaceIdentifiers( body, node, identifierReplacements, scope );
+			}
 
 			// Replace top-level this with undefined ES6 8.1.1.5.4
 			if ( node.type === 'ThisExpression' && node._topLevel ) {
@@ -1198,7 +1223,7 @@ function exportCapturedUpdate ( c ) {
 	return ((" exports." + (c.name)) + (" = " + (c.exportAs)) + ";");
 }
 
-function transformBody__transformBody ( bundle, mod, body ) {var $D$1;
+function transformBody__transformBody ( bundle, mod, body ) {var $D$0;
 	var identifierReplacements,
 		importedBindings,
 		importedNamespaces,
@@ -1208,7 +1233,7 @@ function transformBody__transformBody ( bundle, mod, body ) {var $D$1;
 		exportBlock;
 
 	identifierReplacements = mod.identifierReplacements;
-	importedBindings = ($D$1 = getReadOnlyIdentifiers( mod.imports ))[0], importedNamespaces = $D$1[1], $D$1;
+	importedBindings = ($D$0 = getReadOnlyIdentifiers( mod.imports ))[0], importedNamespaces = $D$0[1], $D$0;
 
 	exportNames = hasOwnProp.call( bundle.exports, mod.id ) && bundle.exports[ mod.id ];
 
@@ -1319,7 +1344,7 @@ function transformBody__transformBody ( bundle, mod, body ) {var $D$1;
 	}
 
 	return body.trim();
-;$D$1 = void 0}
+;$D$0 = void 0}
 
 function combine ( bundle ) {
 	var body;
@@ -1370,7 +1395,7 @@ function combine ( bundle ) {
 	bundle.body = body;
 }
 
-function getModule ( mod ) {var $D$2;
+function getModule ( mod ) {var $D$1;
 	var imports, exports;
 
 	mod.body = new MagicString( mod.source );
@@ -1378,7 +1403,7 @@ function getModule ( mod ) {var $D$2;
 	try {
 		mod.ast = acorn.parse( mod.source, {
 			ecmaVersion: 6,
-			locations: true
+			sourceType: 'module'
 		});
 
 		annotateAst( mod.ast );
@@ -1392,7 +1417,7 @@ function getModule ( mod ) {var $D$2;
 		throw err;
 	}
 
-	imports = ($D$2 = findImportsAndExports( mod, mod.source, mod.ast ))[0], exports = $D$2[1], $D$2;
+	imports = ($D$1 = findImportsAndExports( mod, mod.source, mod.ast ))[0], exports = $D$1[1], $D$1;
 
 	disallowConflictingImports( imports );
 
@@ -1428,7 +1453,7 @@ function getModule ( mod ) {var $D$2;
 	});
 
 	return mod;
-;$D$2 = void 0}
+;$D$1 = void 0}
 
 var getBundle__Promise = sander.Promise;
 
@@ -1571,44 +1596,48 @@ function isThenable ( obj ) {
 }
 
 function transformExportDeclaration ( declaration, body ) {
-	var exportedValue;
+	if ( !declaration ) {
+		return;
+	}
 
-	if ( declaration ) {
-		switch ( declaration.type ) {
-			case 'namedFunction':
-			case 'namedClass':
-				body.remove( declaration.start, declaration.valueStart );
-				exportedValue = declaration.name;
-				break;
+	var exportedValue;
 
-			case 'anonFunction':
-			case 'anonClass':
-				if ( declaration.isFinal ) {
-					body.replace( declaration.start, declaration.valueStart, 'return ' );
-				} else {
-					body.replace( declaration.start, declaration.valueStart, 'var __export = ' );
-					exportedValue = '__export';
-				}
+	switch ( declaration.type ) {
+		case 'namedFunction':
+		case 'namedClass':
+			body.remove( declaration.start, declaration.valueStart );
+			exportedValue = declaration.name;
+			break;
+
+		case 'anonFunction':
+		case 'anonClass':
+			if ( declaration.isFinal ) {
+				body.replace( declaration.start, declaration.valueStart, 'return ' );
+			} else {
+				body.replace( declaration.start, declaration.valueStart, 'var __export = ' );
+				exportedValue = '__export';
+			}
 
-				// add semi-colon, if necessary
-				if ( declaration.value.slice( -1 ) !== ';' ) {
-					body.insert( declaration.end, ';' );
-				}
+			// add semi-colon, if necessary
+			// TODO body.original is an implementation detail of magic-string - there
+			// should probably be an API for this sort of thing
+			if ( body.original[ declaration.end - 1 ] !== ';' ) {
+				body.insert( declaration.end, ';' );
+			}
 
-				break;
+			break;
 
-			case 'expression':
-				body.remove( declaration.start, declaration.next );
-				exportedValue = declaration.value;
-				break;
+		case 'expression':
+			body.remove( declaration.start, declaration.next );
+			exportedValue = declaration.value;
+			break;
 
-			default:
-				throw new Error( 'Unexpected export type' );
-		}
+		default:
+			throw new Error( (("Unexpected export type '" + (declaration.type)) + "'") );
+	}
 
-		if ( exportedValue ) {
-			body.append( '\nreturn ' + exportedValue + ';' );
-		}
+	if ( exportedValue ) {
+		body.append( '\nreturn ' + exportedValue + ';' );
 	}
 }
 
@@ -1806,18 +1835,13 @@ function cjs__cjs ( mod, options ) {
 		switch ( exportDeclaration.type ) {
 			case 'namedFunction':
 			case 'namedClass':
-				mod.body.remove( exportDeclaration.start, exportDeclaration.valueStart );
+				mod.body.remove( exportDeclaration.start, exportDeclaration.node.declaration.start );
 				mod.body.replace( exportDeclaration.end, exportDeclaration.end, (("\nmodule.exports = " + (exportDeclaration.node.declaration.id.name)) + ";") );
 				break;
 
-			case 'anonFunction':
-			case 'anonClass':
-			case 'expression':
-				mod.body.replace( exportDeclaration.start, exportDeclaration.valueStart, 'module.exports = ' );
-				break;
-
 			default:
-				throw new Error( 'Unexpected export type' );
+				mod.body.replace( exportDeclaration.start, exportDeclaration.node.declaration.start, 'module.exports = ' );
+				break;
 		}
 	}
 
@@ -2005,7 +2029,7 @@ function getExportNames ( exports ) {
 	return result;
 }
 
-function utils_transformBody__transformBody ( mod, body, options ) {var $D$3;
+function utils_transformBody__transformBody ( mod, body, options ) {var $D$2;
 	var chains,
 		identifierReplacements,
 		importedBindings = {},
@@ -2015,10 +2039,10 @@ function utils_transformBody__transformBody ( mod, body, options ) {var $D$3;
 		earlyExports,
 		lateExports;
 
-	chains = ($D$3 = gatherImports( mod.imports ))[0], identifierReplacements = $D$3[1], $D$3;
+	chains = ($D$2 = gatherImports( mod.imports ))[0], identifierReplacements = $D$2[1], $D$2;
 	exportNames = getExportNames( mod.exports );
 
-	importedBindings = ($D$3 = getReadOnlyIdentifiers( mod.imports ))[0], importedNamespaces = $D$3[1], $D$3;
+	importedBindings = ($D$2 = getReadOnlyIdentifiers( mod.imports ))[0], importedNamespaces = $D$2[1], $D$2;
 
 	// ensure no conflict with `exports`
 	identifierReplacements.exports = deconflict( 'exports', mod.ast._declared );
@@ -2043,35 +2067,32 @@ function utils_transformBody__transformBody ( mod, body, options ) {var $D$3;
 
 	// Remove export statements (but keep declarations)
 	mod.exports.forEach( function(x ) {
-		switch ( x.type ) {
-			case 'varDeclaration': // export var answer = 42;
+		if ( x.isDefault ) {
+			if ( /^named/.test( x.type ) ) {
+				// export default function answer () { return 42; }
 				body.remove( x.start, x.valueStart );
-				return;
+				body.insert( x.end, (("\nexports['default'] = " + (x.name)) + ";") );
+			} else {
+				// everything else
+				body.replace( x.start, x.valueStart, 'exports[\'default\'] = ' );
+			}
+		}
 
-			case 'namedFunction':
-			case 'namedClass':
-				if ( x.isDefault ) {
-					// export default function answer () { return 42; }
-					body.remove( x.start, x.valueStart );
-					body.insert( x.end, (("\nexports['default'] = " + (x.name)) + ";") );
-				} else {
-					// export function answer () { return 42; }
+		else {
+			switch ( x.type ) {
+				case 'varDeclaration': // export var answer = 42; (or let)
+				case 'namedFunction':  // export function answer () {...}
+				case 'namedClass':     // export class answer {...}
 					body.remove( x.start, x.valueStart );
-				}
-				return;
-
-			case 'anonFunction':   // export default function () {}
-			case 'anonClass':      // export default class () {}
-			case 'expression':     // export default 40 + 2;
-				body.replace( x.start, x.valueStart, 'exports[\'default\'] = ' );
-				return;
+					break;
 
-			case 'named':          // export { foo, bar };
-				body.remove( x.start, x.next );
-				break;
+				case 'named':          // export { foo, bar };
+					body.remove( x.start, x.next );
+					break;
 
-			default:
-				throw new Error( 'Unknown export type: ' + x.type );
+				default:
+					body.replace( x.start, x.valueStart, 'exports[\'default\'] = ' );
+			}
 		}
 	});
 
@@ -2111,7 +2132,7 @@ function utils_transformBody__transformBody ( mod, body, options ) {var $D$3;
 	if ( options.intro && options.outro ) {
 		body.indent().prepend( options.intro ).trimLines().append( options.outro );
 	}
-;$D$3 = void 0}
+;$D$2 = void 0}
 
 function deconflict ( name, declared ) {
 	while ( hasOwnProp.call( declared, name ) ) {
@@ -2149,12 +2170,12 @@ var strictMode_amd__introTemplate;
 
 strictMode_amd__introTemplate = template( 'define(<%= amdName %><%= paths %>function (<%= names %>) {\n\n\t\'use strict\';\n\n' );
 
-function strictMode_amd__amd ( mod, options ) {var $D$4;
+function strictMode_amd__amd ( mod, options ) {var $D$3;
 	var importPaths,
 		importNames,
 		intro;
 
-	importPaths = ($D$4 = getImportSummary( mod ))[0], importNames = $D$4[1], $D$4;
+	importPaths = ($D$3 = getImportSummary( mod ))[0], importNames = $D$3[1], $D$3;
 
 	if ( mod.exports.length ) {
 		importPaths.unshift( 'exports' );
@@ -2174,7 +2195,7 @@ function strictMode_amd__amd ( mod, options ) {var $D$4;
 	});
 
 	return packageResult( mod, mod.body, options, 'toAmd' );
-;$D$4 = void 0}
+;$D$3 = void 0}
 
 function strictMode_cjs__cjs ( mod, options ) {
 	var importBlock, seen = {};

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: esperanto-source
 version: !ruby/object:Gem::Version
-  version: 0.6.17.3
+  version: 0.6.18
 platform: ruby
 authors:
 - Ryunosuke SATO
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-07 00:00:00.000000000 Z
+date: 2015-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler