esperanto-source 0.6.16 → 0.6.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2db1faeb981d396e1cf561a554bbcb58c5eec0f0
-  data.tar.gz: 812893bfa15d0277c92035235d59884ce01d616d
+  metadata.gz: 4e7da637ba9ff5b37efcc590d016cce3cdac9894
+  data.tar.gz: 43618b690433711be54869fa3072d9b22e01d65e
 SHA512:
-  metadata.gz: 96bea70d8e01aa0d862c9742b1ce3e447d7bc3e53d3bc0471ea47e016c608a443dd85fc568fae6982691d59c4705c25383b0938b6c17ed3aff045fcd1e7ea278
-  data.tar.gz: 50bfb8581beeef06828199996e7f44a5a3016cc45931900d877f598780728f296bc842691f93d2d521f364c89401a6bcdbb64dbd4501d34f37030c7fd01c0822
+  metadata.gz: 23b5ac1323f08b6e5e4075342ddcaef5e07d358624aa3d2983f58e0b5422f2794b41020c6a288406cbb6fc65c68f80892e4df8f59bb58ba993fb0d36127b66d6
+  data.tar.gz: 0b14cd2c7c4d1c0f5bcc677a76802b9efdc5ca56b7f0a5282989ad96a7f849f857ed1277d7fdd711b015e51f19880cab1f650f5301691c91f83ae3e342c8350f

data/lib/esperanto/source/version.rb

@@ -1,5 +1,5 @@
 module Esperanto
   module Source
-    VERSION = '0.6.16'
+    VERSION = '0.6.17'
   end
 end

data/vendor/esperanto.browser.js

@@ -1,5 +1,5 @@
 /*
-	esperanto.js v0.6.16 - 2015-03-02
+	esperanto.js v0.6.17 - 2015-03-01
 	http://esperantojs.org
 
 	Released under the MIT License.
@@ -342,17 +342,15 @@
 	}
 
 	function encode ( value ) {
-		var result;
+		var result, i;
 
 		if ( typeof value === 'number' ) {
 			result = encodeInteger( value );
-		} else if ( Array.isArray( value ) ) {
-			result = '';
-			value.forEach( function ( num ) {
-				result += encodeInteger( num );
-			});
 		} else {
-			throw new Error( 'vlq.encode accepts an integer or an array of integers' );
+			result = '';
+			for ( i = 0; i < value.length; i += 1 ) {
+				result += encodeInteger( value[i] );
+			}
 		}
 
 		return result;
@@ -383,7 +381,7 @@
 
 	var encode__default = encode;
 
-	function encodeMappings ( original, str, mappings, hires, sourceIndex, offsets ) {
+	function encodeMappings ( original, str, mappings, hires, sourcemapLocations, sourceIndex, offsets ) {
 		var lineStart,
 			locations,
 			lines,
@@ -427,7 +425,7 @@
 				}
 
 				else {
-					if ( !hires && ( origin === lastOrigin + 1 ) ) {
+					if ( !hires && ( origin === lastOrigin + 1 ) && !sourcemapLocations[ origin ] ) {
 						// do nothing
 					} else {
 						location = getLocation( locations, origin );
@@ -520,10 +518,16 @@
 		this.original = this.str = string;
 		this.mappings = initMappings( string.length );
 
+		this.sourcemapLocations = {};
+
 		this.indentStr = guessIndent( string );
 	};
 
 	MagicString.prototype = {
+		addSourcemapLocation: function ( char ) {
+			this.sourcemapLocations[ char ] = true;
+		},
+
 		append: function ( content ) {
 			this.str += content;
 			return this;
@@ -560,7 +564,7 @@
 		},
 
 		getMappings: function ( hires, sourceIndex, offsets ) {
-			return encodeMappings( this.original, this.str, this.mappings, hires, sourceIndex, offsets );
+			return encodeMappings( this.original, this.str, this.mappings, hires, this.sourcemapLocations, sourceIndex, offsets );
 		},
 
 		indent: function ( indentStr, options ) {
@@ -1489,7 +1493,7 @@
 
 	var warned = {};
 
-	function packageResult ( body, options, methodName, isBundle ) {
+	function packageResult ( bundleOrModule, body, options, methodName, isBundle ) {
 		var code, map;
 
 		// wrap output
@@ -1514,9 +1518,14 @@
 				sourceMapFile = isAbsolutePath( options.sourceMapFile ) ? options.sourceMapFile : './' + splitPath( options.sourceMapFile ).pop();
 			}
 
+			if ( isBundle ) {
+				markBundleSourcemapLocations( bundleOrModule );
+			} else {
+				markModuleSourcemapLocations( bundleOrModule );
+			}
+
 			map = body.generateMap({
 				includeContent: true,
-				hires: true,
 				file: sourceMapFile,
 				source: (sourceMapFile && !isBundle) ? packageResult__getRelativePath( sourceMapFile, options.sourceMapSource ) : null
 			});
@@ -1573,6 +1582,24 @@
 		}
 	}
 
+	function markBundleSourcemapLocations ( bundle ) {
+		bundle.modules.forEach( function(mod ) {
+			estraverse.traverse( mod.ast, {
+				enter: function(node ) {
+					mod.body.addSourcemapLocation( node.start );
+				}
+			});
+		})
+	}
+
+	function markModuleSourcemapLocations ( mod ) {
+		estraverse.traverse( mod.ast, {
+			enter: function(node ) {
+				mod.body.addSourcemapLocation( node.start );
+			}
+		});
+	}
+
 	/**
 	 * Creates a template function from a template string. The template
 	   may have `<%= someVar %>` interpolators, and the returned function
@@ -1649,7 +1676,7 @@
 
 	var amd__introTemplate = template( 'define(<%= amdName %><%= paths %>function (<%= names %>) {\n\n' );
 
-	function amd__amd ( mod, body, options ) {
+	function amd__amd ( mod, options ) {
 		var seen = {},
 			importNames = [],
 			importPaths = [],
@@ -1676,10 +1703,10 @@
 				seen[ path ] = true;
 			}
 
-			body.remove( x.start, x.next );
+			mod.body.remove( x.start, x.next );
 		});
 
-		transformExportDeclaration( mod.exports[0], body );
+		transformExportDeclaration( mod.exports[0], mod.body );
 
 		intro = amd__introTemplate({
 			amdName: options.amdName ? (("'" + (options.amdName)) + "', ") : '',
@@ -1687,27 +1714,27 @@
 			names: importNames.join( ', ' )
 		});
 
-		body.trim()
+		mod.body.trim()
 			.prepend( "'use strict';\n\n" )
 			.trim()
 			.indent()
 			.prepend( intro )
 			.append( '\n\n});' );
 
-		return packageResult( body, options, 'toAmd' );
+		return packageResult( mod, mod.body, options, 'toAmd' );
 	}
 
-	function cjs__cjs ( mod, body, options ) {
+	function cjs__cjs ( mod, options ) {
 		var seen = {}, exportDeclaration;
 
 		mod.imports.forEach( function(x ) {
 			if ( !hasOwnProp.call( seen, x.path ) ) {
 				var replacement = x.isEmpty ? (("" + (req(x.path))) + ";") : (("var " + (x.as)) + (" = " + (req(x.path))) + ";");
-				body.replace( x.start, x.end, replacement );
+				mod.body.replace( x.start, x.end, replacement );
 
 				seen[ x.path ] = true;
 			} else {
-				body.remove( x.start, x.next );
+				mod.body.remove( x.start, x.next );
 			}
 		});
 
@@ -1717,14 +1744,14 @@
 			switch ( exportDeclaration.type ) {
 				case 'namedFunction':
 				case 'namedClass':
-					body.remove( exportDeclaration.start, exportDeclaration.valueStart );
-					body.replace( exportDeclaration.end, exportDeclaration.end, (("\nmodule.exports = " + (exportDeclaration.node.declaration.id.name)) + ";") );
+					mod.body.remove( exportDeclaration.start, exportDeclaration.valueStart );
+					mod.body.replace( exportDeclaration.end, exportDeclaration.end, (("\nmodule.exports = " + (exportDeclaration.node.declaration.id.name)) + ";") );
 					break;
 
 				case 'anonFunction':
 				case 'anonClass':
 				case 'expression':
-					body.replace( exportDeclaration.start, exportDeclaration.valueStart, 'module.exports = ' );
+					mod.body.replace( exportDeclaration.start, exportDeclaration.valueStart, 'module.exports = ' );
 					break;
 
 				default:
@@ -1732,9 +1759,9 @@
 			}
 		}
 
-		body.prepend( "'use strict';\n\n" ).trimLines();
+		mod.body.prepend( "'use strict';\n\n" ).trimLines();
 
-		return packageResult( body, options, 'toCjs' );
+		return packageResult( mod, mod.body, options, 'toCjs' );
 	}
 
 	function standaloneUmdIntro ( options, indentStr ) {
@@ -1811,7 +1838,7 @@
 		}
 	}
 
-	function umd__umd ( mod, body, options ) {
+	function umd__umd ( mod, options ) {
 		var importNames = [];
 		var importPaths = [];
 		var seen = {};
@@ -1826,7 +1853,7 @@
 		if (!hasImports && !hasExports) {
 			intro = standaloneUmdIntro({
 				amdName: options.amdName,
-			}, body.getIndentString() );
+			}, mod.body.getIndentString() );
 		} else {
 			// gather imports, and remove import declarations
 			mod.imports.forEach( function(x ) {
@@ -1846,10 +1873,10 @@
 					seen[ x.path ] = true;
 				}
 
-				body.remove( x.start, x.next );
+				mod.body.remove( x.start, x.next );
 			});
 
-			transformExportDeclaration( mod.exports[0], body );
+			transformExportDeclaration( mod.exports[0], mod.body );
 
 			intro = defaultUmdIntro({
 				hasExports: hasExports,
@@ -1858,12 +1885,12 @@
 				amdName: options.amdName,
 				absolutePaths: options.absolutePaths,
 				name: options.name
-			}, body.getIndentString() );
+			}, mod.body.getIndentString() );
 		}
 
-		body.indent().prepend( intro ).trimLines().append( '\n\n}));' );
+		mod.body.indent().prepend( intro ).trimLines().append( '\n\n}));' );
 
-		return packageResult( body, options, 'toUmd' );
+		return packageResult( mod, mod.body, options, 'toUmd' );
 	}
 
 	var defaultsMode = {
@@ -2245,7 +2272,7 @@
 
 	strictMode_amd__introTemplate = template( 'define(<%= amdName %><%= paths %>function (<%= names %>) {\n\n\t\'use strict\';\n\n' );
 
-	function strictMode_amd__amd ( mod, body, options ) {var $D$2;
+	function strictMode_amd__amd ( mod, options ) {var $D$2;
 		var importPaths,
 			importNames,
 			intro;
@@ -2261,18 +2288,18 @@
 			amdName: options.amdName ? (("'" + (options.amdName)) + "', ") : '',
 			paths: importPaths.length ? '[' + ( options.absolutePaths ? importPaths.map( resolveAgainst( options.amdName ) ) : importPaths ).map( quote ).join( ', ' ) + '], ' : '',
 			names: importNames.join( ', ' )
-		}).replace( /\t/g, body.getIndentString() );
+		}).replace( /\t/g, mod.body.getIndentString() );
 
-		transformBody( mod, body, {
+		transformBody( mod, mod.body, {
 			intro: intro,
 			outro: '\n\n});',
 			_evilES3SafeReExports: options._evilES3SafeReExports
 		});
 
-		return packageResult( body, options, 'toAmd' );
+		return packageResult( mod, mod.body, options, 'toAmd' );
 	;$D$2 = void 0}
 
-	function strictMode_cjs__cjs ( mod, body, options ) {
+	function strictMode_cjs__cjs ( mod, options ) {
 		var importBlock, seen = {};
 
 		// Create block of require statements
@@ -2292,14 +2319,14 @@
 			return replacement;
 		}).filter( Boolean ).join( '\n' );
 
-		transformBody( mod, body, {
+		transformBody( mod, mod.body, {
 			header: importBlock,
 			_evilES3SafeReExports: options._evilES3SafeReExports
 		});
 
-		body.prepend( "'use strict';\n\n" ).trimLines();
+		mod.body.prepend( "'use strict';\n\n" ).trimLines();
 
-		return packageResult( body, options, 'toCjs' );
+		return packageResult( mod, mod.body, options, 'toCjs' );
 	}
 
 	function strictUmdIntro ( options, indentStr ) {
@@ -2338,7 +2365,7 @@
 		return intro.replace( /\t/g, indentStr );
 	}
 
-	function strictMode_umd__umd ( mod, body, options ) {
+	function strictMode_umd__umd ( mod, options ) {
 		requireName( options );
 
 		var importPaths = (importNames = getImportSummary( mod ))[0], importNames = importNames[1];
@@ -2350,7 +2377,7 @@
 		if (!hasImports && !hasExports) {
 			intro = standaloneUmdIntro({
 				amdName: options.amdName,
-			}, body.getIndentString() );
+			}, mod.body.getIndentString() );
 		} else {
 			intro = strictUmdIntro({
 				hasExports: hasExports,
@@ -2359,16 +2386,16 @@
 				amdName: options.amdName,
 				absolutePaths: options.absolutePaths,
 				name: options.name
-			}, body.getIndentString() );
+			}, mod.body.getIndentString() );
 		}
 
-		transformBody( mod, body, {
+		transformBody( mod, mod.body, {
 			intro: intro,
 			outro: '\n\n}));',
 			_evilES3SafeReExports: options._evilES3SafeReExports
 		});
 
-		return packageResult( body, options, 'toUmd' );
+		return packageResult( mod, mod.body, options, 'toUmd' );
 	}
 
 	var strictMode = {
@@ -2385,46 +2412,46 @@
 
 	var defaultsMode_amd__introTemplate = template( 'define(<%= amdName %><%= amdDeps %>function (<%= names %>) {\n\n\t\'use strict\';\n\n' );
 
-	function defaultsMode_amd__amd ( bundle, body, options ) {
+	function defaultsMode_amd__amd ( bundle, options ) {
 		var defaultName = bundle.entryModule.identifierReplacements.default;
 		if ( defaultName ) {
-			body.append( (("\n\nreturn " + defaultName) + ";") );
+			bundle.body.append( (("\n\nreturn " + defaultName) + ";") );
 		}
 
 		var intro = defaultsMode_amd__introTemplate({
 			amdName: options.amdName ? (("" + (quote(options.amdName))) + ", ") : '',
 			amdDeps: bundle.externalModules.length ? '[' + bundle.externalModules.map( quoteId ).join( ', ' ) + '], ' : '',
 			names: bundle.externalModules.map( getName ).join( ', ' )
-		}).replace( /\t/g, body.getIndentString() );
+		}).replace( /\t/g, bundle.body.getIndentString() );
 
-		body.indent().prepend( intro ).trimLines().append( '\n\n});' );
-		return packageResult( body, options, 'toAmd', true );
+		bundle.body.indent().prepend( intro ).trimLines().append( '\n\n});' );
+		return packageResult( bundle, bundle.body, options, 'toAmd', true );
 	}
 
 	function quoteId ( m ) {
 		return "'" + m.id + "'";
 	}
 
-	function defaultsMode_cjs__cjs ( bundle, body, options ) {
+	function defaultsMode_cjs__cjs ( bundle, options ) {
 		var importBlock = bundle.externalModules.map( function(x ) {
 			return (("var " + (x.name)) + (" = " + (req(x.id))) + ";");
 		}).join( '\n' );
 
 		if ( importBlock ) {
-			body.prepend( importBlock + '\n\n' );
+			bundle.body.prepend( importBlock + '\n\n' );
 		}
 
 		var defaultName = bundle.entryModule.identifierReplacements.default;
 		if ( defaultName ) {
-			body.append( (("\n\nmodule.exports = " + defaultName) + ";") );
+			bundle.body.append( (("\n\nmodule.exports = " + defaultName) + ";") );
 		}
 
-		body.prepend("'use strict';\n\n").trimLines();
+		bundle.body.prepend("'use strict';\n\n").trimLines();
 
-		return packageResult( body, options, 'toCjs', true );
+		return packageResult( bundle, bundle.body, options, 'toCjs', true );
 	}
 
-	function defaultsMode_umd__umd ( bundle, body, options ) {
+	function defaultsMode_umd__umd ( bundle, options ) {
 		requireName( options );
 
 		var entry = bundle.entryModule;
@@ -2436,12 +2463,12 @@
 		if (!hasImports && !hasExports) {
 			intro = standaloneUmdIntro({
 				amdName: options.amdName,
-			}, body.getIndentString() );
+			}, bundle.body.getIndentString() );
 		} else {
 
 			var defaultName = entry.identifierReplacements.default;
 			if ( defaultName ) {
-				body.append( (("\n\nreturn " + defaultName) + ";") );
+				bundle.body.append( (("\n\nreturn " + defaultName) + ";") );
 			}
 
 			var importPaths = bundle.externalModules.map( getId );
@@ -2453,12 +2480,12 @@
 				importNames: importNames,
 				amdName: options.amdName,
 				name: options.name
-			}, body.getIndentString() );
+			}, bundle.body.getIndentString() );
 		}
 
-		body.indent().prepend( intro ).trimLines().append('\n\n}));');
+		bundle.body.indent().prepend( intro ).trimLines().append('\n\n}));');
 
-		return packageResult( body, options, 'toUmd', true );
+		return packageResult( bundle, bundle.body, options, 'toUmd', true );
 	}
 
 	var builders_defaultsMode = {
@@ -2474,7 +2501,7 @@
 
 	var builders_strictMode_amd__introTemplate = template( 'define(<%= amdName %><%= amdDeps %>function (<%= names %>) {\n\n\t\'use strict\';\n\n' );
 
-	function builders_strictMode_amd__amd ( bundle, body, options ) {
+	function builders_strictMode_amd__amd ( bundle, options ) {
 		var externalDefaults = bundle.externalModules.filter( builders_strictMode_amd__needsDefault );
 		var entry = bundle.entryModule;
 
@@ -2492,7 +2519,7 @@
 				return (("var " + (x.name)) + ("__default = ('default' in " + (x.name)) + (" ? " + (x.name)) + ("['default'] : " + (x.name)) + ");");
 			}).join( '\n' );
 
-			body.prepend( defaultsBlock + '\n\n' );
+			bundle.body.prepend( defaultsBlock + '\n\n' );
 		}
 
 		if ( entry.exports.length ) {
@@ -2500,7 +2527,7 @@
 			importNames.unshift( 'exports' );
 
 			if ( entry.defaultExport ) {
-				body.append( '\n\n' + getExportBlock( entry ) );
+				bundle.body.append( '\n\n' + getExportBlock( entry ) );
 			}
 		}
 
@@ -2508,17 +2535,17 @@
 			amdName: options.amdName ? (("" + (quote(options.amdName))) + ", ") : '',
 			amdDeps: importIds.length ? '[' + importIds.map( quote ).join( ', ' ) + '], ' : '',
 			names: importNames.join( ', ' )
-		}).replace( /\t/g, body.getIndentString() );
+		}).replace( /\t/g, bundle.body.getIndentString() );
 
-		body.indent().prepend( intro ).trimLines().append( '\n\n});' );
-		return packageResult( body, options, 'toAmd', true );
+		bundle.body.indent().prepend( intro ).trimLines().append( '\n\n});' );
+		return packageResult( bundle, bundle.body, options, 'toAmd', true );
 	}
 
 	function builders_strictMode_amd__needsDefault ( externalModule ) {
 		return externalModule.needsDefault;
 	}
 
-	function builders_strictMode_cjs__cjs ( bundle, body, options ) {
+	function builders_strictMode_cjs__cjs ( bundle, options ) {
 		var entry = bundle.entryModule;
 
 		var importBlock = bundle.externalModules.map( function(x ) {
@@ -2534,19 +2561,19 @@
 		}).join( '\n' );
 
 		if ( importBlock ) {
-			body.prepend( importBlock + '\n\n' );
+			bundle.body.prepend( importBlock + '\n\n' );
 		}
 
 		if ( entry.defaultExport ) {
-			body.append( '\n\n' + getExportBlock( entry ) );
+			bundle.body.append( '\n\n' + getExportBlock( entry ) );
 		}
 
-		body.prepend("'use strict';\n\n").trimLines();
+		bundle.body.prepend("'use strict';\n\n").trimLines();
 
-		return packageResult( body, options, 'toCjs', true );
+		return packageResult( bundle, bundle.body, options, 'toCjs', true );
 	}
 
-	function builders_strictMode_umd__umd ( bundle, body, options ) {
+	function builders_strictMode_umd__umd ( bundle, options ) {
 		requireName( options );
 
 		var entry = bundle.entryModule;
@@ -2558,11 +2585,11 @@
 		if (!hasImports && !hasExports) {
 			intro = standaloneUmdIntro({
 				amdName: options.amdName,
-			}, body.getIndentString() );
+			}, bundle.body.getIndentString() );
 		} else {
 
 			if ( hasExports && entry.defaultExport ) {
-				body.append( '\n\n' + getExportBlock( entry ) );
+				bundle.body.append( '\n\n' + getExportBlock( entry ) );
 			}
 
 			var importPaths = bundle.externalModules.map( getId );
@@ -2575,12 +2602,12 @@
 				externalDefaults: bundle.externalModules.filter( builders_strictMode_umd__needsDefault ),
 				amdName: options.amdName,
 				name: options.name,
-			}, body.getIndentString() );
+			}, bundle.body.getIndentString() );
 		}
 
-		body.indent().prepend( intro ).trimLines().append('\n\n}));');
+		bundle.body.indent().prepend( intro ).trimLines().append('\n\n}));');
 
-		return packageResult( body, options, 'toUmd', true );
+		return packageResult( bundle, bundle.body, options, 'toUmd', true );
 	}
 
 	function builders_strictMode_umd__needsDefault ( externalModule ) {
@@ -2600,28 +2627,26 @@
 	};
 
 	function concat ( bundle, options ) {
-		var body, intro, outro, indent;
+		var intro, outro, indent;
 
 		// This bundle must be self-contained - no imports or exports
 		if ( bundle.externalModules.length || bundle.entryModule.exports.length ) {
 			throw new Error( (("bundle.concat() can only be used with bundles that have no imports/exports (imports: [" + (bundle.externalModules.map(function(x){return x.id}).join(', '))) + ("], exports: [" + (bundle.entryModule.exports.join(', '))) + "])") );
 		}
 
-		body = bundle.body.clone();
-
 		// TODO test these options
 		intro = 'intro' in options ? options.intro : ("(function () { 'use strict';\n\n");
 		outro = 'outro' in options ? options.outro : '\n\n})();';
 
 		if ( !( 'indent' in options ) || options.indent === true ) {
-			indent = body.getIndentString();
+			indent = bundle.body.getIndentString();
 		} else {
 			indent = options.indent || '';
 		}
 
-		body.trimLines().indent( indent ).prepend( intro ).append( outro );
+		bundle.body.trimLines().indent( indent ).prepend( intro ).append( outro );
 
-		return packageResult( body, options, 'toString', true );
+		return packageResult( bundle, bundle.body, options, 'toString', true );
 	}
 
 	var deprecateMessage = 'options.defaultOnly has been deprecated, and is now standard behaviour. To use named imports/exports, pass `strict: true`.',
@@ -2634,7 +2659,6 @@
 				builder;
 
 			mod = getStandaloneModule({ source: source, getModuleName: options.getModuleName, strict: options.strict });
-			body = mod.body.clone();
 
 			if ( 'defaultOnly' in options && !alreadyWarned ) {
 				// TODO link to a wiki page explaining this, or something
@@ -2657,7 +2681,7 @@
 				builder = moduleBuilders.strictMode[ format ];
 			}
 
-			return builder( mod, body, options );
+			return builder( mod, options );
 		};
 	}
 
@@ -2709,7 +2733,7 @@
 						builder = bundleBuilders.strictMode[ format ];
 					}
 
-					return builder( bundle, bundle.body.clone(), options );
+					return builder( bundle, options );
 				}
 			});
 		}

data/vendor/esperanto.js

@@ -1,5 +1,5 @@
 /*
-	esperanto.js v0.6.16 - 2015-03-02
+	esperanto.js v0.6.17 - 2015-03-01
 	http://esperantojs.org
 
 	Released under the MIT License.
@@ -1362,7 +1362,7 @@ function combine ( bundle ) {
 
 		body.addSource({
 			filename: path.resolve( bundle.base, mod.relativePath ),
-			content: transformBody__transformBody( bundle, mod, mod.body.clone() ),
+			content: transformBody__transformBody( bundle, mod, mod.body ),
 			indentExclusionRanges: mod.ast._templateLiteralRanges
 		});
 	});
@@ -1614,7 +1614,7 @@ function transformExportDeclaration ( declaration, body ) {
 
 var warned = {};
 
-function packageResult ( body, options, methodName, isBundle ) {
+function packageResult ( bundleOrModule, body, options, methodName, isBundle ) {
 	var code, map;
 
 	// wrap output
@@ -1639,9 +1639,14 @@ function packageResult ( body, options, methodName, isBundle ) {
 			sourceMapFile = isAbsolutePath( options.sourceMapFile ) ? options.sourceMapFile : './' + splitPath( options.sourceMapFile ).pop();
 		}
 
+		if ( isBundle ) {
+			markBundleSourcemapLocations( bundleOrModule );
+		} else {
+			markModuleSourcemapLocations( bundleOrModule );
+		}
+
 		map = body.generateMap({
 			includeContent: true,
-			hires: true,
 			file: sourceMapFile,
 			source: (sourceMapFile && !isBundle) ? getRelativePath( sourceMapFile, options.sourceMapSource ) : null
 		});
@@ -1698,6 +1703,24 @@ function getRelativePath ( from, to ) {
 	}
 }
 
+function markBundleSourcemapLocations ( bundle ) {
+	bundle.modules.forEach( function(mod ) {
+		estraverse.traverse( mod.ast, {
+			enter: function(node ) {
+				mod.body.addSourcemapLocation( node.start );
+			}
+		});
+	})
+}
+
+function markModuleSourcemapLocations ( mod ) {
+	estraverse.traverse( mod.ast, {
+		enter: function(node ) {
+			mod.body.addSourcemapLocation( node.start );
+		}
+	});
+}
+
 /**
  * Creates a template function from a template string. The template
    may have `<%= someVar %>` interpolators, and the returned function
@@ -1715,7 +1738,7 @@ function template ( str ) {
 
 var amd__introTemplate = template( 'define(<%= amdName %><%= paths %>function (<%= names %>) {\n\n' );
 
-function amd__amd ( mod, body, options ) {
+function amd__amd ( mod, options ) {
 	var seen = {},
 		importNames = [],
 		importPaths = [],
@@ -1742,10 +1765,10 @@ function amd__amd ( mod, body, options ) {
 			seen[ path ] = true;
 		}
 
-		body.remove( x.start, x.next );
+		mod.body.remove( x.start, x.next );
 	});
 
-	transformExportDeclaration( mod.exports[0], body );
+	transformExportDeclaration( mod.exports[0], mod.body );
 
 	intro = amd__introTemplate({
 		amdName: options.amdName ? (("'" + (options.amdName)) + "', ") : '',
@@ -1753,27 +1776,27 @@ function amd__amd ( mod, body, options ) {
 		names: importNames.join( ', ' )
 	});
 
-	body.trim()
+	mod.body.trim()
 		.prepend( "'use strict';\n\n" )
 		.trim()
 		.indent()
 		.prepend( intro )
 		.append( '\n\n});' );
 
-	return packageResult( body, options, 'toAmd' );
+	return packageResult( mod, mod.body, options, 'toAmd' );
 }
 
-function cjs__cjs ( mod, body, options ) {
+function cjs__cjs ( mod, options ) {
 	var seen = {}, exportDeclaration;
 
 	mod.imports.forEach( function(x ) {
 		if ( !hasOwnProp.call( seen, x.path ) ) {
 			var replacement = x.isEmpty ? (("" + (req(x.path))) + ";") : (("var " + (x.as)) + (" = " + (req(x.path))) + ";");
-			body.replace( x.start, x.end, replacement );
+			mod.body.replace( x.start, x.end, replacement );
 
 			seen[ x.path ] = true;
 		} else {
-			body.remove( x.start, x.next );
+			mod.body.remove( x.start, x.next );
 		}
 	});
 
@@ -1783,14 +1806,14 @@ function cjs__cjs ( mod, body, options ) {
 		switch ( exportDeclaration.type ) {
 			case 'namedFunction':
 			case 'namedClass':
-				body.remove( exportDeclaration.start, exportDeclaration.valueStart );
-				body.replace( exportDeclaration.end, exportDeclaration.end, (("\nmodule.exports = " + (exportDeclaration.node.declaration.id.name)) + ";") );
+				mod.body.remove( exportDeclaration.start, exportDeclaration.valueStart );
+				mod.body.replace( exportDeclaration.end, exportDeclaration.end, (("\nmodule.exports = " + (exportDeclaration.node.declaration.id.name)) + ";") );
 				break;
 
 			case 'anonFunction':
 			case 'anonClass':
 			case 'expression':
-				body.replace( exportDeclaration.start, exportDeclaration.valueStart, 'module.exports = ' );
+				mod.body.replace( exportDeclaration.start, exportDeclaration.valueStart, 'module.exports = ' );
 				break;
 
 			default:
@@ -1798,9 +1821,9 @@ function cjs__cjs ( mod, body, options ) {
 		}
 	}
 
-	body.prepend( "'use strict';\n\n" ).trimLines();
+	mod.body.prepend( "'use strict';\n\n" ).trimLines();
 
-	return packageResult( body, options, 'toCjs' );
+	return packageResult( mod, mod.body, options, 'toCjs' );
 }
 
 function standaloneUmdIntro ( options, indentStr ) {
@@ -1877,7 +1900,7 @@ function requireName ( options ) {
 	}
 }
 
-function umd__umd ( mod, body, options ) {
+function umd__umd ( mod, options ) {
 	var importNames = [];
 	var importPaths = [];
 	var seen = {};
@@ -1892,7 +1915,7 @@ function umd__umd ( mod, body, options ) {
 	if (!hasImports && !hasExports) {
 		intro = standaloneUmdIntro({
 			amdName: options.amdName,
-		}, body.getIndentString() );
+		}, mod.body.getIndentString() );
 	} else {
 		// gather imports, and remove import declarations
 		mod.imports.forEach( function(x ) {
@@ -1912,10 +1935,10 @@ function umd__umd ( mod, body, options ) {
 				seen[ x.path ] = true;
 			}
 
-			body.remove( x.start, x.next );
+			mod.body.remove( x.start, x.next );
 		});
 
-		transformExportDeclaration( mod.exports[0], body );
+		transformExportDeclaration( mod.exports[0], mod.body );
 
 		intro = defaultUmdIntro({
 			hasExports: hasExports,
@@ -1924,12 +1947,12 @@ function umd__umd ( mod, body, options ) {
 			amdName: options.amdName,
 			absolutePaths: options.absolutePaths,
 			name: options.name
-		}, body.getIndentString() );
+		}, mod.body.getIndentString() );
 	}
 
-	body.indent().prepend( intro ).trimLines().append( '\n\n}));' );
+	mod.body.indent().prepend( intro ).trimLines().append( '\n\n}));' );
 
-	return packageResult( body, options, 'toUmd' );
+	return packageResult( mod, mod.body, options, 'toUmd' );
 }
 
 var defaultsMode = {
@@ -2126,7 +2149,7 @@ 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, body, options ) {var $D$4;
+function strictMode_amd__amd ( mod, options ) {var $D$4;
 	var importPaths,
 		importNames,
 		intro;
@@ -2142,18 +2165,18 @@ function strictMode_amd__amd ( mod, body, options ) {var $D$4;
 		amdName: options.amdName ? (("'" + (options.amdName)) + "', ") : '',
 		paths: importPaths.length ? '[' + ( options.absolutePaths ? importPaths.map( resolveAgainst( options.amdName ) ) : importPaths ).map( quote ).join( ', ' ) + '], ' : '',
 		names: importNames.join( ', ' )
-	}).replace( /\t/g, body.getIndentString() );
+	}).replace( /\t/g, mod.body.getIndentString() );
 
-	utils_transformBody__transformBody( mod, body, {
+	utils_transformBody__transformBody( mod, mod.body, {
 		intro: intro,
 		outro: '\n\n});',
 		_evilES3SafeReExports: options._evilES3SafeReExports
 	});
 
-	return packageResult( body, options, 'toAmd' );
+	return packageResult( mod, mod.body, options, 'toAmd' );
 ;$D$4 = void 0}
 
-function strictMode_cjs__cjs ( mod, body, options ) {
+function strictMode_cjs__cjs ( mod, options ) {
 	var importBlock, seen = {};
 
 	// Create block of require statements
@@ -2173,14 +2196,14 @@ function strictMode_cjs__cjs ( mod, body, options ) {
 		return replacement;
 	}).filter( Boolean ).join( '\n' );
 
-	utils_transformBody__transformBody( mod, body, {
+	utils_transformBody__transformBody( mod, mod.body, {
 		header: importBlock,
 		_evilES3SafeReExports: options._evilES3SafeReExports
 	});
 
-	body.prepend( "'use strict';\n\n" ).trimLines();
+	mod.body.prepend( "'use strict';\n\n" ).trimLines();
 
-	return packageResult( body, options, 'toCjs' );
+	return packageResult( mod, mod.body, options, 'toCjs' );
 }
 
 function strictUmdIntro ( options, indentStr ) {
@@ -2219,7 +2242,7 @@ function strictUmdIntro ( options, indentStr ) {
 	return intro.replace( /\t/g, indentStr );
 }
 
-function strictMode_umd__umd ( mod, body, options ) {
+function strictMode_umd__umd ( mod, options ) {
 	requireName( options );
 
 	var importPaths = (importNames = getImportSummary( mod ))[0], importNames = importNames[1];
@@ -2231,7 +2254,7 @@ function strictMode_umd__umd ( mod, body, options ) {
 	if (!hasImports && !hasExports) {
 		intro = standaloneUmdIntro({
 			amdName: options.amdName,
-		}, body.getIndentString() );
+		}, mod.body.getIndentString() );
 	} else {
 		intro = strictUmdIntro({
 			hasExports: hasExports,
@@ -2240,16 +2263,16 @@ function strictMode_umd__umd ( mod, body, options ) {
 			amdName: options.amdName,
 			absolutePaths: options.absolutePaths,
 			name: options.name
-		}, body.getIndentString() );
+		}, mod.body.getIndentString() );
 	}
 
-	utils_transformBody__transformBody( mod, body, {
+	utils_transformBody__transformBody( mod, mod.body, {
 		intro: intro,
 		outro: '\n\n}));',
 		_evilES3SafeReExports: options._evilES3SafeReExports
 	});
 
-	return packageResult( body, options, 'toUmd' );
+	return packageResult( mod, mod.body, options, 'toUmd' );
 }
 
 var strictMode = {
@@ -2266,46 +2289,46 @@ var moduleBuilders = {
 
 var defaultsMode_amd__introTemplate = template( 'define(<%= amdName %><%= amdDeps %>function (<%= names %>) {\n\n\t\'use strict\';\n\n' );
 
-function defaultsMode_amd__amd ( bundle, body, options ) {
+function defaultsMode_amd__amd ( bundle, options ) {
 	var defaultName = bundle.entryModule.identifierReplacements.default;
 	if ( defaultName ) {
-		body.append( (("\n\nreturn " + defaultName) + ";") );
+		bundle.body.append( (("\n\nreturn " + defaultName) + ";") );
 	}
 
 	var intro = defaultsMode_amd__introTemplate({
 		amdName: options.amdName ? (("" + (quote(options.amdName))) + ", ") : '',
 		amdDeps: bundle.externalModules.length ? '[' + bundle.externalModules.map( quoteId ).join( ', ' ) + '], ' : '',
 		names: bundle.externalModules.map( getName ).join( ', ' )
-	}).replace( /\t/g, body.getIndentString() );
+	}).replace( /\t/g, bundle.body.getIndentString() );
 
-	body.indent().prepend( intro ).trimLines().append( '\n\n});' );
-	return packageResult( body, options, 'toAmd', true );
+	bundle.body.indent().prepend( intro ).trimLines().append( '\n\n});' );
+	return packageResult( bundle, bundle.body, options, 'toAmd', true );
 }
 
 function quoteId ( m ) {
 	return "'" + m.id + "'";
 }
 
-function defaultsMode_cjs__cjs ( bundle, body, options ) {
+function defaultsMode_cjs__cjs ( bundle, options ) {
 	var importBlock = bundle.externalModules.map( function(x ) {
 		return (("var " + (x.name)) + (" = " + (req(x.id))) + ";");
 	}).join( '\n' );
 
 	if ( importBlock ) {
-		body.prepend( importBlock + '\n\n' );
+		bundle.body.prepend( importBlock + '\n\n' );
 	}
 
 	var defaultName = bundle.entryModule.identifierReplacements.default;
 	if ( defaultName ) {
-		body.append( (("\n\nmodule.exports = " + defaultName) + ";") );
+		bundle.body.append( (("\n\nmodule.exports = " + defaultName) + ";") );
 	}
 
-	body.prepend("'use strict';\n\n").trimLines();
+	bundle.body.prepend("'use strict';\n\n").trimLines();
 
-	return packageResult( body, options, 'toCjs', true );
+	return packageResult( bundle, bundle.body, options, 'toCjs', true );
 }
 
-function defaultsMode_umd__umd ( bundle, body, options ) {
+function defaultsMode_umd__umd ( bundle, options ) {
 	requireName( options );
 
 	var entry = bundle.entryModule;
@@ -2317,12 +2340,12 @@ function defaultsMode_umd__umd ( bundle, body, options ) {
 	if (!hasImports && !hasExports) {
 		intro = standaloneUmdIntro({
 			amdName: options.amdName,
-		}, body.getIndentString() );
+		}, bundle.body.getIndentString() );
 	} else {
 
 		var defaultName = entry.identifierReplacements.default;
 		if ( defaultName ) {
-			body.append( (("\n\nreturn " + defaultName) + ";") );
+			bundle.body.append( (("\n\nreturn " + defaultName) + ";") );
 		}
 
 		var importPaths = bundle.externalModules.map( getId );
@@ -2334,12 +2357,12 @@ function defaultsMode_umd__umd ( bundle, body, options ) {
 			importNames: importNames,
 			amdName: options.amdName,
 			name: options.name
-		}, body.getIndentString() );
+		}, bundle.body.getIndentString() );
 	}
 
-	body.indent().prepend( intro ).trimLines().append('\n\n}));');
+	bundle.body.indent().prepend( intro ).trimLines().append('\n\n}));');
 
-	return packageResult( body, options, 'toUmd', true );
+	return packageResult( bundle, bundle.body, options, 'toUmd', true );
 }
 
 var builders_defaultsMode = {
@@ -2355,7 +2378,7 @@ function getExportBlock ( entry ) {
 
 var builders_strictMode_amd__introTemplate = template( 'define(<%= amdName %><%= amdDeps %>function (<%= names %>) {\n\n\t\'use strict\';\n\n' );
 
-function builders_strictMode_amd__amd ( bundle, body, options ) {
+function builders_strictMode_amd__amd ( bundle, options ) {
 	var externalDefaults = bundle.externalModules.filter( builders_strictMode_amd__needsDefault );
 	var entry = bundle.entryModule;
 
@@ -2373,7 +2396,7 @@ function builders_strictMode_amd__amd ( bundle, body, options ) {
 			return (("var " + (x.name)) + ("__default = ('default' in " + (x.name)) + (" ? " + (x.name)) + ("['default'] : " + (x.name)) + ");");
 		}).join( '\n' );
 
-		body.prepend( defaultsBlock + '\n\n' );
+		bundle.body.prepend( defaultsBlock + '\n\n' );
 	}
 
 	if ( entry.exports.length ) {
@@ -2381,7 +2404,7 @@ function builders_strictMode_amd__amd ( bundle, body, options ) {
 		importNames.unshift( 'exports' );
 
 		if ( entry.defaultExport ) {
-			body.append( '\n\n' + getExportBlock( entry ) );
+			bundle.body.append( '\n\n' + getExportBlock( entry ) );
 		}
 	}
 
@@ -2389,17 +2412,17 @@ function builders_strictMode_amd__amd ( bundle, body, options ) {
 		amdName: options.amdName ? (("" + (quote(options.amdName))) + ", ") : '',
 		amdDeps: importIds.length ? '[' + importIds.map( quote ).join( ', ' ) + '], ' : '',
 		names: importNames.join( ', ' )
-	}).replace( /\t/g, body.getIndentString() );
+	}).replace( /\t/g, bundle.body.getIndentString() );
 
-	body.indent().prepend( intro ).trimLines().append( '\n\n});' );
-	return packageResult( body, options, 'toAmd', true );
+	bundle.body.indent().prepend( intro ).trimLines().append( '\n\n});' );
+	return packageResult( bundle, bundle.body, options, 'toAmd', true );
 }
 
 function builders_strictMode_amd__needsDefault ( externalModule ) {
 	return externalModule.needsDefault;
 }
 
-function builders_strictMode_cjs__cjs ( bundle, body, options ) {
+function builders_strictMode_cjs__cjs ( bundle, options ) {
 	var entry = bundle.entryModule;
 
 	var importBlock = bundle.externalModules.map( function(x ) {
@@ -2415,19 +2438,19 @@ function builders_strictMode_cjs__cjs ( bundle, body, options ) {
 	}).join( '\n' );
 
 	if ( importBlock ) {
-		body.prepend( importBlock + '\n\n' );
+		bundle.body.prepend( importBlock + '\n\n' );
 	}
 
 	if ( entry.defaultExport ) {
-		body.append( '\n\n' + getExportBlock( entry ) );
+		bundle.body.append( '\n\n' + getExportBlock( entry ) );
 	}
 
-	body.prepend("'use strict';\n\n").trimLines();
+	bundle.body.prepend("'use strict';\n\n").trimLines();
 
-	return packageResult( body, options, 'toCjs', true );
+	return packageResult( bundle, bundle.body, options, 'toCjs', true );
 }
 
-function builders_strictMode_umd__umd ( bundle, body, options ) {
+function builders_strictMode_umd__umd ( bundle, options ) {
 	requireName( options );
 
 	var entry = bundle.entryModule;
@@ -2439,11 +2462,11 @@ function builders_strictMode_umd__umd ( bundle, body, options ) {
 	if (!hasImports && !hasExports) {
 		intro = standaloneUmdIntro({
 			amdName: options.amdName,
-		}, body.getIndentString() );
+		}, bundle.body.getIndentString() );
 	} else {
 
 		if ( hasExports && entry.defaultExport ) {
-			body.append( '\n\n' + getExportBlock( entry ) );
+			bundle.body.append( '\n\n' + getExportBlock( entry ) );
 		}
 
 		var importPaths = bundle.externalModules.map( getId );
@@ -2456,12 +2479,12 @@ function builders_strictMode_umd__umd ( bundle, body, options ) {
 			externalDefaults: bundle.externalModules.filter( builders_strictMode_umd__needsDefault ),
 			amdName: options.amdName,
 			name: options.name,
-		}, body.getIndentString() );
+		}, bundle.body.getIndentString() );
 	}
 
-	body.indent().prepend( intro ).trimLines().append('\n\n}));');
+	bundle.body.indent().prepend( intro ).trimLines().append('\n\n}));');
 
-	return packageResult( body, options, 'toUmd', true );
+	return packageResult( bundle, bundle.body, options, 'toUmd', true );
 }
 
 function builders_strictMode_umd__needsDefault ( externalModule ) {
@@ -2481,28 +2504,26 @@ var bundleBuilders = {
 };
 
 function concat ( bundle, options ) {
-	var body, intro, outro, indent;
+	var intro, outro, indent;
 
 	// This bundle must be self-contained - no imports or exports
 	if ( bundle.externalModules.length || bundle.entryModule.exports.length ) {
 		throw new Error( (("bundle.concat() can only be used with bundles that have no imports/exports (imports: [" + (bundle.externalModules.map(function(x){return x.id}).join(', '))) + ("], exports: [" + (bundle.entryModule.exports.join(', '))) + "])") );
 	}
 
-	body = bundle.body.clone();
-
 	// TODO test these options
 	intro = 'intro' in options ? options.intro : ("(function () { 'use strict';\n\n");
 	outro = 'outro' in options ? options.outro : '\n\n})();';
 
 	if ( !( 'indent' in options ) || options.indent === true ) {
-		indent = body.getIndentString();
+		indent = bundle.body.getIndentString();
 	} else {
 		indent = options.indent || '';
 	}
 
-	body.trimLines().indent( indent ).prepend( intro ).append( outro );
+	bundle.body.trimLines().indent( indent ).prepend( intro ).append( outro );
 
-	return packageResult( body, options, 'toString', true );
+	return packageResult( bundle, bundle.body, options, 'toString', true );
 }
 
 var deprecateMessage = 'options.defaultOnly has been deprecated, and is now standard behaviour. To use named imports/exports, pass `strict: true`.',
@@ -2515,7 +2536,6 @@ function transpileMethod ( format ) {
 			builder;
 
 		mod = getStandaloneModule({ source: source, getModuleName: options.getModuleName, strict: options.strict });
-		body = mod.body.clone();
 
 		if ( 'defaultOnly' in options && !alreadyWarned ) {
 			// TODO link to a wiki page explaining this, or something
@@ -2538,7 +2558,7 @@ function transpileMethod ( format ) {
 			builder = moduleBuilders.strictMode[ format ];
 		}
 
-		return builder( mod, body, options );
+		return builder( mod, options );
 	};
 }
 
@@ -2590,7 +2610,7 @@ var esperanto = {
 					builder = bundleBuilders.strictMode[ format ];
 				}
 
-				return builder( bundle, bundle.body.clone(), options );
+				return builder( bundle, options );
 			}
 		});
 	}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: esperanto-source
 version: !ruby/object:Gem::Version
-  version: 0.6.16
+  version: 0.6.17
 platform: ruby
 authors:
 - Ryunosuke SATO