esperanto-source 0.6.30 → 0.6.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7678b65420048b28faebd971f2f409738942b66
-  data.tar.gz: e2a1cb859e3d99f8ce0875d3ec8e924bc51ff0c2
+  metadata.gz: 93187dc47b5708726735e42b9f323c6c2db3765a
+  data.tar.gz: 7b5ebf1e30fefec34fecc41287a3edefb57d1be7
 SHA512:
-  metadata.gz: cad97fe6f7a8b7619cb142aecf6acad48342ed70c2e35404a7041888107684fb8644ad4f83cec108d7be6f3124838e455496b6674b600a28157aa7c4fe8c72fc
-  data.tar.gz: 80788a678e62c3a807e0676a3436ee83baf5838be36381b96c594551e3f8fb6292d523c70a0977023a6e3037377e292ab0936b39fb474ce71fea90e3c03be350
+  metadata.gz: c15eb97c1e1900df87cbfe4f4587b824a5e6a86d42792fa4748b836707244ad5954f314210d1bc05de7f5d83247023620f8c15b9b7394bc410856063931e0b8e
+  data.tar.gz: 699ec2c9d140367d5abb7729b003277aeb610630586037ae11e0bd445256d9bb6d68acf2d056cccea37982d3b25c235608e0c45658b20d3b9fead33b7449e86e

data/lib/esperanto/source/version.rb

@@ -1,5 +1,5 @@
 module Esperanto
   module Source
-    VERSION = '0.6.30'
+    VERSION = '0.6.31'
   end
 end

data/vendor/esperanto.browser.js

@@ -12,7 +12,6 @@
 }(this, function (acorn) { 'use strict';
 
 	var hasOwnProp = Object.prototype.hasOwnProperty;
-	var utils_hasOwnProp = hasOwnProp;
 
 	function hasNamedImports ( mod ) {
 		var i = mod.imports.length;
@@ -68,9 +67,7 @@
 		}
 	};
 
-	var src_SourceMap = SourceMap;
-
-	function utils_getRelativePath__getRelativePath ( from, to ) {
+	function getRelativePath__getRelativePath ( from, to ) {
 		var fromParts, toParts, i;
 
 		fromParts = from.split( /[\/\\]/ );
@@ -146,10 +143,10 @@
 				getSemis( this.outro )
 			);
 
-			return new src_SourceMap({
+			return new SourceMap({
 				file: ( options.file ? options.file.split( /[\/\\]/ ).pop() : null ),
 				sources: this.sources.map( function ( source ) {
-					return options.file ? utils_getRelativePath__getRelativePath( options.file, source.filename ) : source.filename;
+					return options.file ? getRelativePath__getRelativePath( options.file, source.filename ) : source.filename;
 				}),
 				sourcesContent: this.sources.map( function ( source ) {
 					return options.includeContent ? source.content.original : null;
@@ -255,7 +252,7 @@
 		}
 	};
 
-	var src_Bundle = Bundle;
+
 
 	function stringify ( source ) {
 		return source.content.toString();
@@ -345,15 +342,17 @@
 	}
 
 	function encode ( value ) {
-		var result, i;
+		var result;
 
 		if ( typeof value === 'number' ) {
 			result = encodeInteger( value );
-		} else {
+		} else if ( Array.isArray( value ) ) {
 			result = '';
-			for ( i = 0; i < value.length; i += 1 ) {
-				result += encodeInteger( value[i] );
-			}
+			value.forEach( function ( num ) {
+				result += encodeInteger( num );
+			});
+		} else {
+			throw new Error( 'vlq.encode accepts an integer or an array of integers' );
 		}
 
 		return result;
@@ -382,7 +381,7 @@
 		return result;
 	}
 
-	var utils_encode = encode;
+	var encode__default = encode;
 
 	function encodeMappings ( original, str, mappings, hires, sourcemapLocations, sourceIndex, offsets ) {
 		var lineStart,
@@ -473,7 +472,7 @@
 
 				firstSegment = false;
 
-				return utils_encode( arr );
+				return encode__default( arr );
 			}).join( ',' );
 		}).join( ';' );
 
@@ -557,9 +556,9 @@
 		generateMap: function ( options ) {
 			options = options || {};
 
-			return new src_SourceMap({
+			return new SourceMap({
 				file: ( options.file ? options.file.split( /[\/\\]/ ).pop() : null ),
-				sources: [ options.source ? utils_getRelativePath__getRelativePath( options.file || '', options.source ) : null ],
+				sources: [ options.source ? getRelativePath__getRelativePath( options.file || '', options.source ) : null ],
 				sourcesContent: options.includeContent ? [ this.original ] : [ null ],
 				names: [],
 				mappings: this.getMappings( options.hires, 0 )
@@ -880,7 +879,7 @@
 		}
 	};
 
-	MagicString.Bundle = src_Bundle;
+	MagicString.Bundle = Bundle;
 
 	function adjust ( mappings, start, end, d ) {
 		var i = end;
@@ -931,35 +930,33 @@
 		return result;
 	}
 
-	var magic_string = MagicString;
-
 	function walk ( ast, leave) {var enter = leave.enter, leave = leave.leave;
 		visit( ast, null, enter, leave );
 	}
 
-	var ast_walk__context = {
-		skip: function()  {return ast_walk__context.shouldSkip = true}
+	var walk__context = {
+		skip: function()  {return walk__context.shouldSkip = true}
 	};
 
-	var ast_walk__childKeys = {};
+	var walk__childKeys = {};
 
-	var ast_walk__toString = Object.prototype.toString;
+	var walk__toString = Object.prototype.toString;
 
 	function isArray ( thing ) {
-		return ast_walk__toString.call( thing ) === '[object Array]';
+		return walk__toString.call( thing ) === '[object Array]';
 	}
 
 	function visit ( node, parent, enter, leave ) {
 		if ( !node ) return;
 
 		if ( enter ) {
-			ast_walk__context.shouldSkip = false;
-			enter.call( ast_walk__context, node, parent );
-			if ( ast_walk__context.shouldSkip ) return;
+			walk__context.shouldSkip = false;
+			enter.call( walk__context, node, parent );
+			if ( walk__context.shouldSkip ) return;
 		}
 
-		var keys = ast_walk__childKeys[ node.type ] || (
-			ast_walk__childKeys[ node.type ] = Object.keys( node ).filter( function(key ) {return typeof node[ key ] === 'object'} )
+		var keys = walk__childKeys[ node.type ] || (
+			walk__childKeys[ node.type ] = Object.keys( node ).filter( function(key ) {return typeof node[ key ] === 'object'} )
 		);
 
 		var key, value, i, j;
@@ -1410,7 +1407,7 @@
 					});
 				});
 			}
-			return utils_hasOwnProp.call( importedNames, name );
+			return hasOwnProp.call( importedNames, name );
 		}
 
 		walk( mod.ast, {
@@ -1462,7 +1459,7 @@
 		}
 
 		function checkName ( name ) {
-			if ( utils_hasOwnProp.call( usedNames, name ) ) {
+			if ( hasOwnProp.call( usedNames, name ) ) {
 				throw new SyntaxError( (("Duplicated import ('" + name) + "')") );
 			}
 
@@ -1509,7 +1506,7 @@
 		var toRemove = [];
 
 		var mod = {
-			body: new magic_string( code ),
+			body: new MagicString( code ),
 			ast: ast || ( acorn.parse( code, {
 				ecmaVersion: 6,
 				sourceType: 'module',
@@ -1558,7 +1555,7 @@
 			moduleId = x.path;
 
 			// use existing value
-			if ( utils_hasOwnProp.call( nameById, moduleId ) ) {
+			if ( hasOwnProp.call( nameById, moduleId ) ) {
 				x.name = nameById[ moduleId ];
 				return;
 			}
@@ -1567,7 +1564,7 @@
 			if ( userFn && ( name = userFn( moduleId ) ) ) {
 				name = sanitize( name );
 
-				if ( utils_hasOwnProp.call( usedNames, name ) ) {
+				if ( hasOwnProp.call( usedNames, name ) ) {
 					// TODO write a test for this
 					throw new Error( (("Naming collision: module " + moduleId) + (" cannot be called " + name) + "") );
 				}
@@ -1584,7 +1581,7 @@
 					while ( i-- > 0 ) {
 						candidate = prefix + sanitize( parts.slice( i ).join( '__' ) );
 
-						if ( !utils_hasOwnProp.call( usedNames, candidate ) ) {
+						if ( !hasOwnProp.call( usedNames, candidate ) ) {
 							name = candidate;
 							break;
 						}
@@ -1603,13 +1600,13 @@
 		// use inferred names for default imports, wherever they
 		// don't clash with path-based names
 		imports.forEach( function(x ) {
-			if ( x.as && !utils_hasOwnProp.call( usedNames, x.as ) ) {
+			if ( x.as && !hasOwnProp.call( usedNames, x.as ) ) {
 				inferredNames[ x.path ] = x.as;
 			}
 		});
 
 		imports.forEach( function(x ) {
-			if ( utils_hasOwnProp.call( inferredNames, x.path ) ) {
+			if ( hasOwnProp.call( inferredNames, x.path ) ) {
 				x.name = inferredNames[ x.path ];
 			}
 		});
@@ -1663,7 +1660,7 @@
 
 	var ABSOLUTE_PATH = /^(?:[A-Z]:)?[\/\\]/i;
 
-	var utils_packageResult__warned = {};
+	var packageResult__warned = {};
 
 	function packageResult ( bundleOrModule, body, options, methodName, isBundle ) {
 		// wrap output
@@ -1698,7 +1695,7 @@
 			map = body.generateMap({
 				includeContent: true,
 				file: sourceMapFile,
-				source: ( sourceMapFile && !isBundle ) ? utils_packageResult__getRelativePath( sourceMapFile, options.sourceMapSource ) : null
+				source: ( sourceMapFile && !isBundle ) ? packageResult__getRelativePath( sourceMapFile, options.sourceMapSource ) : null
 			});
 
 			if ( options.sourceMap === 'inline' ) {
@@ -1715,9 +1712,9 @@
 			code: code,
 			map: map,
 			toString: function () {
-				if ( !utils_packageResult__warned[ methodName ] ) {
+				if ( !packageResult__warned[ methodName ] ) {
 					console.log( (("Warning: esperanto." + methodName) + "() returns an object with a 'code' property. You should use this instead of using the returned value directly") );
-					utils_packageResult__warned[ methodName ] = true;
+					packageResult__warned[ methodName ] = true;
 				}
 
 				return code;
@@ -1725,7 +1722,7 @@
 		};
 	}
 
-	function utils_packageResult__getRelativePath ( from, to ) {
+	function packageResult__getRelativePath ( from, to ) {
 		var fromParts, toParts, i;
 
 		fromParts = splitPath( from );
@@ -1797,7 +1794,7 @@
 			resolved = importerParts.concat( importParts ).join( '/' );
 		}
 
-		return resolved.replace( /\.js$/, '' );
+		return resolved;
 	}
 
 	function resolveAgainst ( importerPath ) {
@@ -1857,9 +1854,9 @@
 		}
 
 		var intro = (("\
-\ndefine(" + (processName(name))) + ("" + (processIds(ids))) + ("function (" + (names.join( ', ' ))) + ") {\
+\n	define(" + (processName(name))) + ("" + (processIds(ids))) + ("function (" + (names.join( ', ' ))) + ") {\
 \n\
-\n");
+\n	");
 
 		if ( useStrict ) {
 			intro += (("" + indentStr) + "'use strict';\n\n");
@@ -1868,7 +1865,7 @@
 		return intro;
 	}
 
-	function defaultsMode_amd__amd ( mod, options ) {
+	function amd__amd ( mod, options ) {
 		mod.imports.forEach( function(x ) {
 			mod.body.remove( x.start, x.next );
 		});
@@ -1892,11 +1889,11 @@
 		return packageResult( mod, mod.body, options, 'toAmd' );
 	}
 
-	function defaultsMode_cjs__cjs ( mod, options ) {
+	function cjs__cjs ( mod, options ) {
 		var seen = {};
 
 		mod.imports.forEach( function(x ) {
-			if ( !utils_hasOwnProp.call( seen, x.path ) ) {
+			if ( !hasOwnProp.call( seen, x.path ) ) {
 				var replacement = x.isEmpty ? (("" + (req(x.path))) + ";") : (("var " + (x.as)) + (" = " + (req(x.path))) + ";");
 				mod.body.replace( x.start, x.end, replacement );
 
@@ -1936,12 +1933,12 @@
 		if ( !hasExports && !imports.length ) {
 			intro =
 				(("(function (factory) {\
-\n				!(typeof exports === 'object' && typeof module !== 'undefined') &&\
-\n				typeof define === 'function' && define.amd ? define(" + (processName(amdName))) + ("factory) :\
-\n				factory()\
-\n			}(function () {" + useStrictPragma) + "\
+\n					!(typeof exports === 'object' && typeof module !== 'undefined') &&\
+\n					typeof define === 'function' && define.amd ? define(" + (processName(amdName))) + ("factory) :\
+\n					factory()\
+\n				}(function () {" + useStrictPragma) + "\
 \n\
-\n			");
+\n				");
 		}
 
 		else {
@@ -1965,7 +1962,7 @@
 					defaultsBlock = 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';
 				}
 			} else {
 				amdExport = (("define(" + (processName(amdName))) + ("" + (processIds(ids))) + "factory)");
@@ -1977,12 +1974,12 @@
 
 			intro =
 				(("(function (global, factory) {\
-\n				typeof exports === 'object' && typeof module !== 'undefined' ? " + cjsExport) + (" :\
-\n				typeof define === 'function' && define.amd ? " + amdExport) + (" :\
-\n				" + globalExport) + ("\
-\n			}(this, function (" + (names.join( ', ' ))) + (") {" + useStrictPragma) + ("\
+\n					typeof exports === 'object' && typeof module !== 'undefined' ? " + cjsExport) + (" :\
+\n					typeof define === 'function' && define.amd ? " + amdExport) + (" :\
+\n					" + globalExport) + ("\
+\n				}(this, function (" + (names.join( ', ' ))) + (") {" + useStrictPragma) + ("\
 \n\
-\n			" + defaultsBlock) + "");
+\n				" + defaultsBlock) + "");
 
 		}
 
@@ -2006,17 +2003,15 @@
 	EsperantoError.prototype.constructor = EsperantoError;
 	EsperantoError.prototype.name = 'EsperantoError';
 
-	var utils_EsperantoError = EsperantoError;
-
 	function requireName ( options ) {
 		if ( !options.name ) {
-			throw new utils_EsperantoError( 'You must supply a `name` option for UMD modules', {
+			throw new EsperantoError( 'You must supply a `name` option for UMD modules', {
 				code: 'MISSING_NAME'
 			});
 		}
 	}
 
-	function defaultsMode_umd__umd ( mod, options ) {
+	function umd__umd ( mod, options ) {
 		requireName( options );
 
 		mod.imports.forEach( function(x ) {
@@ -2041,9 +2036,9 @@
 	}
 
 	var defaultsMode = {
-		amd: defaultsMode_amd__amd,
-		cjs: defaultsMode_cjs__cjs,
-		umd: defaultsMode_umd__umd
+		amd: amd__amd,
+		cjs: cjs__cjs,
+		umd: umd__umd
 	};
 
 	function gatherImports ( imports ) {
@@ -2140,14 +2135,14 @@
 
 		var name = assignee.name;
 
-		if ( utils_hasOwnProp.call( isNamespaceAssignment ? importedNamespaces : importedBindings, name ) && !scope.contains( name ) ) {
+		if ( hasOwnProp.call( isNamespaceAssignment ? importedNamespaces : importedBindings, name ) && !scope.contains( name ) ) {
 			throw new Error( ( isNamespaceAssignment ? namespaceMessage : bindingMessage ) + '`' + name + '`' );
 		}
 	}
 
 	function replaceIdentifiers ( body, node, identifierReplacements, scope ) {
 		var name = node.name;
-		var replacement = utils_hasOwnProp.call( identifierReplacements, name ) && identifierReplacements[ 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
@@ -2178,7 +2173,7 @@
 			return; // shadows an export
 		}
 
-		if ( exports && utils_hasOwnProp.call( exports, name ) ) {
+		if ( exports && hasOwnProp.call( exports, name ) ) {
 			var exportAs = exports[ name ];
 
 			if ( !!capturedUpdates ) {
@@ -2366,7 +2361,7 @@
 	}
 
 	function deconflict ( name, declared ) {
-		while ( utils_hasOwnProp.call( declared, name ) ) {
+		while ( hasOwnProp.call( declared, name ) ) {
 			name = '_' + name;
 		}
 
@@ -2397,7 +2392,7 @@
 
 		// Create block of require statements
 		var importBlock = mod.imports.map( function(x ) {
-			if ( !utils_hasOwnProp.call( seen, x.path ) ) {
+			if ( !hasOwnProp.call( seen, x.path ) ) {
 				seen[ x.path ] = true;
 
 				if ( x.isEmpty ) {
@@ -2455,7 +2450,7 @@
 		strictMode: strictMode
 	};
 
-	function builders_defaultsMode_amd__amd ( bundle, options ) {
+	function defaultsMode_amd__amd ( bundle, options ) {
 		var defaultName = bundle.entryModule.identifierReplacements.default;
 		if ( defaultName ) {
 			bundle.body.append( (("\n\nreturn " + defaultName) + ";") );
@@ -2472,7 +2467,7 @@
 		return packageResult( bundle, bundle.body, options, 'toAmd', true );
 	}
 
-	function builders_defaultsMode_cjs__cjs ( bundle, options ) {
+	function defaultsMode_cjs__cjs ( bundle, options ) {
 		var importBlock = bundle.externalModules.map( function(x ) {
 			return (("var " + (x.name)) + (" = " + (req(x.id))) + ";");
 		}).join( '\n' );
@@ -2493,7 +2488,7 @@
 		return packageResult( bundle, bundle.body, options, 'toCjs', true );
 	}
 
-	function builders_defaultsMode_umd__umd ( bundle, options ) {
+	function defaultsMode_umd__umd ( bundle, options ) {
 		requireName( options );
 
 		var entry = bundle.entryModule;
@@ -2517,9 +2512,9 @@
 	}
 
 	var builders_defaultsMode = {
-		amd: builders_defaultsMode_amd__amd,
-		cjs: builders_defaultsMode_cjs__cjs,
-		umd: builders_defaultsMode_umd__umd
+		amd: defaultsMode_amd__amd,
+		cjs: defaultsMode_cjs__cjs,
+		umd: defaultsMode_umd__umd
 	};
 
 	function getExportBlock ( entry ) {
@@ -2731,7 +2726,7 @@
 
 						bundle.modules.forEach( function(mod ) {
 							mod.imports.forEach( function(x ) {
-								if ( utils_hasOwnProp.call( bundle.externalModuleLookup, x.id ) && ( !x.isDefault && !x.isBatch ) ) {
+								if ( hasOwnProp.call( bundle.externalModuleLookup, x.id ) && ( !x.isDefault && !x.isBatch ) ) {
 									throw new Error( 'You can only have named external imports in strict mode (pass `strict: true`)' );
 								}
 							});

data/vendor/esperanto.js

@@ -9,11 +9,10 @@
 
 var acorn = require('acorn');
 var MagicString = require('magic-string');
-var _path = require('path');
+var path = require('path');
 var sander = require('sander');
 
 var hasOwnProp = Object.prototype.hasOwnProperty;
-var utils_hasOwnProp = hasOwnProp;
 
 function hasNamedImports ( mod ) {
 	var i = mod.imports.length;
@@ -39,29 +38,29 @@ function walk ( ast, leave) {var enter = leave.enter, leave = leave.leave;
 	visit( ast, null, enter, leave );
 }
 
-var ast_walk__context = {
-	skip: function()  {return ast_walk__context.shouldSkip = true}
+var walk__context = {
+	skip: function()  {return walk__context.shouldSkip = true}
 };
 
-var ast_walk__childKeys = {};
+var walk__childKeys = {};
 
-var ast_walk__toString = Object.prototype.toString;
+var walk__toString = Object.prototype.toString;
 
 function isArray ( thing ) {
-	return ast_walk__toString.call( thing ) === '[object Array]';
+	return walk__toString.call( thing ) === '[object Array]';
 }
 
 function visit ( node, parent, enter, leave ) {
 	if ( !node ) return;
 
 	if ( enter ) {
-		ast_walk__context.shouldSkip = false;
-		enter.call( ast_walk__context, node, parent );
-		if ( ast_walk__context.shouldSkip ) return;
+		walk__context.shouldSkip = false;
+		enter.call( walk__context, node, parent );
+		if ( walk__context.shouldSkip ) return;
 	}
 
-	var keys = ast_walk__childKeys[ node.type ] || (
-		ast_walk__childKeys[ node.type ] = Object.keys( node ).filter( function(key ) {return typeof node[ key ] === 'object'} )
+	var keys = walk__childKeys[ node.type ] || (
+		walk__childKeys[ node.type ] = Object.keys( node ).filter( function(key ) {return typeof node[ key ] === 'object'} )
 	);
 
 	var key, value, i, j;
@@ -512,7 +511,7 @@ function getUnscopedNames ( mod ) {
 				});
 			});
 		}
-		return utils_hasOwnProp.call( importedNames, name );
+		return hasOwnProp.call( importedNames, name );
 	}
 
 	walk( mod.ast, {
@@ -564,7 +563,7 @@ function disallowConflictingImports ( imports ) {
 	}
 
 	function checkName ( name ) {
-		if ( utils_hasOwnProp.call( usedNames, name ) ) {
+		if ( hasOwnProp.call( usedNames, name ) ) {
 			throw new SyntaxError( (("Duplicated import ('" + name) + "')") );
 		}
 
@@ -660,7 +659,7 @@ function determineImportNames ( imports, userFn, usedNames ) {
 		moduleId = x.path;
 
 		// use existing value
-		if ( utils_hasOwnProp.call( nameById, moduleId ) ) {
+		if ( hasOwnProp.call( nameById, moduleId ) ) {
 			x.name = nameById[ moduleId ];
 			return;
 		}
@@ -669,7 +668,7 @@ function determineImportNames ( imports, userFn, usedNames ) {
 		if ( userFn && ( name = userFn( moduleId ) ) ) {
 			name = sanitize( name );
 
-			if ( utils_hasOwnProp.call( usedNames, name ) ) {
+			if ( hasOwnProp.call( usedNames, name ) ) {
 				// TODO write a test for this
 				throw new Error( (("Naming collision: module " + moduleId) + (" cannot be called " + name) + "") );
 			}
@@ -686,7 +685,7 @@ function determineImportNames ( imports, userFn, usedNames ) {
 				while ( i-- > 0 ) {
 					candidate = prefix + sanitize( parts.slice( i ).join( '__' ) );
 
-					if ( !utils_hasOwnProp.call( usedNames, candidate ) ) {
+					if ( !hasOwnProp.call( usedNames, candidate ) ) {
 						name = candidate;
 						break;
 					}
@@ -705,13 +704,13 @@ function determineImportNames ( imports, userFn, usedNames ) {
 	// use inferred names for default imports, wherever they
 	// don't clash with path-based names
 	imports.forEach( function(x ) {
-		if ( x.as && !utils_hasOwnProp.call( usedNames, x.as ) ) {
+		if ( x.as && !hasOwnProp.call( usedNames, x.as ) ) {
 			inferredNames[ x.path ] = x.as;
 		}
 	});
 
 	imports.forEach( function(x ) {
-		if ( utils_hasOwnProp.call( inferredNames, x.path ) ) {
+		if ( hasOwnProp.call( inferredNames, x.path ) ) {
 			x.name = inferredNames[ x.path ];
 		}
 	});
@@ -743,7 +742,7 @@ function resolveId ( importPath, importerPath ) {
 		resolved = importerParts.concat( importParts ).join( '/' );
 	}
 
-	return resolved.replace( /\.js$/, '' );
+	return resolved;
 }
 
 function resolveAgainst ( importerPath ) {
@@ -766,7 +765,7 @@ function sortModules ( entry, moduleLookup ) {
 			if ( !imported ) return;
 
 			// ignore modules we've already included
-			if ( utils_hasOwnProp.call( seen, imported.id ) ) {
+			if ( hasOwnProp.call( seen, imported.id ) ) {
 				if ( shouldSwap( imported, mod ) ) {
 					swapPairs.push([ imported, mod ]);
 				}
@@ -795,12 +794,12 @@ function sortModules ( entry, moduleLookup ) {
 
 function shouldSwap ( a, b ) {
 	// if these modules don't import each other, abort
-	if ( !( utils_sortModules__imports( a, b ) && utils_sortModules__imports( b, a ) ) ) return;
+	if ( !( sortModules__imports( a, b ) && sortModules__imports( b, a ) ) ) return;
 
 	return usesAtTopLevel( b, a ) && !usesAtTopLevel( a, b );
 }
 
-function utils_sortModules__imports ( a, b ) {
+function sortModules__imports ( a, b ) {
 	var i = a.imports.length;
 	while ( i-- ) {
 		if ( a.imports[i].id === b.id ) {
@@ -854,7 +853,7 @@ function resolveChains ( modules, moduleLookup ) {
 				if ( s.isBatch ) {
 					// if this is an internal module, we need to tell that module that
 					// it needs to export an object full of getters
-					if ( utils_hasOwnProp.call( moduleLookup, x.id ) ) {
+					if ( hasOwnProp.call( moduleLookup, x.id ) ) {
 						moduleLookup[ x.id ]._exportsNamespace = true;
 					}
 
@@ -869,7 +868,7 @@ function resolveChains ( modules, moduleLookup ) {
 			if ( !x.specifiers ) return;
 
 			x.specifiers.forEach( function(s ) {
-				if ( utils_hasOwnProp.call( origin, s.name ) ) {
+				if ( hasOwnProp.call( origin, s.name ) ) {
 					chains[ (("" + (mod.id)) + ("@" + (s.name)) + "") ] = origin[ s.name ];
 				}
 			});
@@ -907,7 +906,7 @@ function getUniqueNames ( bundle ) {
 	// infer names from default imports - e.g. with `import _ from './utils'`,
 	// use '_' instead of generating a name from 'utils'
 	function inferName ( x ) {
-		if ( x.isDefault && !utils_hasOwnProp.call( names, x.id ) && !utils_hasOwnProp.call( used, x.as ) ) {
+		if ( x.isDefault && !hasOwnProp.call( names, x.id ) && !hasOwnProp.call( used, x.as ) ) {
 			names[ x.id ] = x.as;
 			used[ x.as ] = true;
 		}
@@ -920,7 +919,7 @@ function getUniqueNames ( bundle ) {
 	// introducing conflicts
 	modules.concat( externalModules ).forEach( function(mod ) {
 		// is this already named?
-		if ( utils_hasOwnProp.call( names, mod.id ) ) {
+		if ( hasOwnProp.call( names, mod.id ) ) {
 			mod.name = names[ mod.id ];
 			return;
 		}
@@ -932,12 +931,12 @@ function getUniqueNames ( bundle ) {
 		while ( i-- ) {
 			name = sanitize( parts.slice( i ).join( '_' ) );
 
-			if ( !utils_hasOwnProp.call( used, name ) ) {
+			if ( !hasOwnProp.call( used, name ) ) {
 				break;
 			}
 		}
 
-		while ( utils_hasOwnProp.call( used, name ) ) {
+		while ( hasOwnProp.call( used, name ) ) {
 			name = '_' + name;
 		}
 
@@ -1008,7 +1007,7 @@ function topLevelScopeConflicts ( bundle ) {
 
 		// merge this module's top scope with bundle top scope
 		names.forEach( function(name ) {
-			if ( utils_hasOwnProp.call( inBundle, name ) ) {
+			if ( hasOwnProp.call( inBundle, name ) ) {
 				conflicts[ name ] = true;
 			} else {
 				inBundle[ name ] = true;
@@ -1032,11 +1031,11 @@ function populateIdentifierReplacements ( bundle ) {
 			var result;
 
 			if ( x.hasDeclaration && x.name ) {
-				result = utils_hasOwnProp.call( conflicts, x.name ) || otherModulesDeclare( mod, x.name ) ?
+				result = hasOwnProp.call( conflicts, x.name ) || otherModulesDeclare( mod, x.name ) ?
 					(("" + (mod.name)) + ("__" + (x.name)) + "") :
 					x.name;
 			} else {
-				result = utils_hasOwnProp.call( conflicts, mod.name ) || ( x.value !== mod.name && ~mod.ast._topLevelNames.indexOf( mod.name )) || otherModulesDeclare( mod, mod.name ) ?
+				result = hasOwnProp.call( conflicts, mod.name ) || ( x.value !== mod.name && ~mod.ast._topLevelNames.indexOf( mod.name )) || otherModulesDeclare( mod, mod.name ) ?
 					(("" + (mod.name)) + "__default") :
 					mod.name;
 			}
@@ -1051,7 +1050,7 @@ function populateIdentifierReplacements ( bundle ) {
 		var moduleIdentifiers = mod.identifierReplacements;
 
 		mod.ast._topLevelNames.forEach( function(n ) {
-			moduleIdentifiers[n] = utils_hasOwnProp.call( conflicts, n ) ?
+			moduleIdentifiers[n] = hasOwnProp.call( conflicts, n ) ?
 				(("" + (mod.name)) + ("__" + n) + "") :
 				n;
 		});
@@ -1063,7 +1062,7 @@ function populateIdentifierReplacements ( bundle ) {
 				return;
 			}
 
-			externalModule = utils_hasOwnProp.call( bundle.externalModuleLookup, x.id ) && bundle.externalModuleLookup[ x.id ];
+			externalModule = hasOwnProp.call( bundle.externalModuleLookup, x.id ) && bundle.externalModuleLookup[ x.id ];
 
 			x.specifiers.forEach( function(s ) {
 				var moduleId, mod, moduleName, specifierName, replacement, hash, isChained, separatorIndex;
@@ -1079,7 +1078,7 @@ function populateIdentifierReplacements ( bundle ) {
 
 					// If this is a chained import, get the origin
 					hash = (("" + moduleId) + ("@" + specifierName) + "");
-					while ( utils_hasOwnProp.call( bundle.chains, hash ) ) {
+					while ( hasOwnProp.call( bundle.chains, hash ) ) {
 						hash = bundle.chains[ hash ];
 						isChained = true;
 					}
@@ -1107,7 +1106,7 @@ function populateIdentifierReplacements ( bundle ) {
 							replacement = mod.identifierReplacements.default;
 						}
 					} else if ( !externalModule ) {
-						replacement = utils_hasOwnProp.call( conflicts, specifierName ) ?
+						replacement = hasOwnProp.call( conflicts, specifierName ) ?
 							(("" + moduleName) + ("__" + specifierName) + "") :
 							specifierName;
 					} else {
@@ -1133,7 +1132,7 @@ function populateIdentifierReplacements ( bundle ) {
 				continue;
 			}
 
-			if ( utils_hasOwnProp.call( otherMod.ast._declared, replacement ) ) {
+			if ( hasOwnProp.call( otherMod.ast._declared, replacement ) ) {
 				return true;
 			}
 		}
@@ -1225,14 +1224,14 @@ function disallowIllegalReassignment ( node, importedBindings, importedNamespace
 
 	var name = assignee.name;
 
-	if ( utils_hasOwnProp.call( isNamespaceAssignment ? importedNamespaces : importedBindings, name ) && !scope.contains( name ) ) {
+	if ( hasOwnProp.call( isNamespaceAssignment ? importedNamespaces : importedBindings, name ) && !scope.contains( name ) ) {
 		throw new Error( ( isNamespaceAssignment ? namespaceMessage : bindingMessage ) + '`' + name + '`' );
 	}
 }
 
 function replaceIdentifiers ( body, node, identifierReplacements, scope ) {
 	var name = node.name;
-	var replacement = utils_hasOwnProp.call( identifierReplacements, name ) && identifierReplacements[ 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
@@ -1263,7 +1262,7 @@ function rewriteExportAssignments ( body, node, parent, exports, scope, captured
 		return; // shadows an export
 	}
 
-	if ( exports && utils_hasOwnProp.call( exports, name ) ) {
+	if ( exports && hasOwnProp.call( exports, name ) ) {
 		var exportAs = exports[ name ];
 
 		if ( !!capturedUpdates ) {
@@ -1360,11 +1359,11 @@ function exportCapturedUpdate ( c ) {
 	return ((" exports." + (c.exportAs)) + (" = " + (c.name)) + ";");
 }
 
-function combine_transformBody__transformBody ( bundle, mod, body ) {
+function transformBody__transformBody ( bundle, mod, body ) {
 	var identifierReplacements = mod.identifierReplacements;
 	var importedBindings = (importedNamespaces = getReadOnlyIdentifiers( mod.imports ))[0], importedNamespaces = importedNamespaces[1];
 
-	var exportNames = utils_hasOwnProp.call( bundle.exports, mod.id ) && bundle.exports[ mod.id ];
+	var exportNames = hasOwnProp.call( bundle.exports, mod.id ) && bundle.exports[ mod.id ];
 
 	traverseAst( mod.ast, body, identifierReplacements, importedBindings, importedNamespaces, exportNames );
 
@@ -1402,7 +1401,7 @@ function combine_transformBody__transformBody ( bundle, mod, body ) {
 				if ( name === identifierReplacements.default ) {
 					body.remove( x.start, x.end );
 				} else {
-					var original = utils_hasOwnProp.call( identifierReplacements, name ) ? identifierReplacements[ name ] : name;
+					var original = hasOwnProp.call( identifierReplacements, name ) ? identifierReplacements[ name ] : name;
 					body.replace( x.start, x.end, (("var " + (identifierReplacements.default)) + (" = " + original) + ";") );
 				}
 			}
@@ -1508,8 +1507,8 @@ function combine ( bundle ) {
 		});
 
 		bundle.body.addSource({
-			filename: _path.resolve( bundle.base, mod.relativePath ),
-			content: combine_transformBody__transformBody( bundle, mod, mod.body ),
+			filename: path.resolve( bundle.base, mod.relativePath ),
+			content: transformBody__transformBody( bundle, mod, mod.body ),
 			indentExclusionRanges: mod.ast._templateLiteralRanges
 		});
 	});
@@ -1582,7 +1581,7 @@ function getModule ( mod ) {
 	return mod;
 }
 
-var bundler_getBundle__Promise = sander.Promise;
+var getBundle__Promise = sander.Promise;
 
 function getBundle ( options ) {
 	var entry = options.entry.replace( /\.js$/, '' );
@@ -1592,7 +1591,7 @@ function getBundle ( options ) {
 	var promiseByPath = {};
 	var skip = options.skip;
 	var names = options.names;
-	var base = ( options.base ? _path.resolve( options.base ) : process.cwd() ) + '/';
+	var base = ( options.base ? path.resolve( options.base ) : process.cwd() ) + '/';
 	var externalModules = [];
 	var externalModuleLookup = {};
 
@@ -1631,12 +1630,12 @@ function getBundle ( options ) {
 	});
 
 	function fetchModule ( moduleId, relativePath ) {
-		var absolutePath = _path.resolve( base, relativePath );
+		var absolutePath = path.resolve( base, relativePath );
 
-		if ( !utils_hasOwnProp.call( promiseByPath, relativePath ) ) {
+		if ( !hasOwnProp.call( promiseByPath, relativePath ) ) {
 			promiseByPath[ relativePath ] = (
-				utils_hasOwnProp.call( userModules, relativePath ) ?
-					bundler_getBundle__Promise.resolve( userModules[ relativePath ] ) :
+				hasOwnProp.call( userModules, relativePath ) ?
+					getBundle__Promise.resolve( userModules[ relativePath ] ) :
 					sander.readFile( absolutePath ).then( String )
 			).then( function ( source ) {
 				var code, ast;
@@ -1683,7 +1682,7 @@ function getBundle ( options ) {
 
 					return resolvePath( base, userModules, x.id, absolutePath, options.resolvePath ).then( function(relativePath ) {
 						// short-circuit cycles
-						if ( utils_hasOwnProp.call( promiseByPath, relativePath ) ) {
+						if ( hasOwnProp.call( promiseByPath, relativePath ) ) {
 							return;
 						}
 
@@ -1691,7 +1690,7 @@ function getBundle ( options ) {
 					}, function handleError ( err ) {
 						if ( err.code === 'ENOENT' ) {
 							// Most likely an external module
-							if ( !utils_hasOwnProp.call( externalModuleLookup, x.id ) ) {
+							if ( !hasOwnProp.call( externalModuleLookup, x.id ) ) {
 								var externalModule = {
 									id: x.id
 								};
@@ -1705,7 +1704,7 @@ function getBundle ( options ) {
 					} );
 				});
 
-				return bundler_getBundle__Promise.all( promises );
+				return getBundle__Promise.all( promises );
 			});
 		}
 
@@ -1714,10 +1713,12 @@ function getBundle ( options ) {
 }
 
 function resolvePath ( base, userModules, moduleId, importerPath, resolver ) {
-	return tryPath( base, moduleId + '.js', userModules )
-		.catch( function()  {return tryPath( base, moduleId + _path.sep + 'index.js', userModules )} )
+	var noExt = moduleId.replace( /\.js$/, '' );
+
+	return tryPath( base, noExt + '.js', userModules )
+		.catch( function()  {return tryPath( base, noExt + path.sep + 'index.js', userModules )} )
 		.catch( function ( err ) {
-			var resolvedPromise = resolver && bundler_getBundle__Promise.resolve( resolver( moduleId, importerPath ) );
+			var resolvedPromise = resolver && getBundle__Promise.resolve( resolver( moduleId, importerPath ) );
 
 			if ( resolvedPromise ) {
 				return resolvedPromise.then( function(resolvedPath ) {
@@ -1737,8 +1738,8 @@ function resolvePath ( base, userModules, moduleId, importerPath, resolver ) {
 }
 
 function tryPath ( base, filename, userModules ) {
-	if ( utils_hasOwnProp.call( userModules, filename ) ) {
-		return bundler_getBundle__Promise.resolve( filename );
+	if ( hasOwnProp.call( userModules, filename ) ) {
+		return getBundle__Promise.resolve( filename );
 	}
 	return sander.stat( base, filename ).then( function()  {return filename} );
 }
@@ -1795,7 +1796,7 @@ function transformExportDeclaration ( declaration, body ) {
 
 var ABSOLUTE_PATH = /^(?:[A-Z]:)?[\/\\]/i;
 
-var utils_packageResult__warned = {};
+var packageResult__warned = {};
 
 function packageResult ( bundleOrModule, body, options, methodName, isBundle ) {
 	// wrap output
@@ -1847,9 +1848,9 @@ function packageResult ( bundleOrModule, body, options, methodName, isBundle ) {
 		code: code,
 		map: map,
 		toString: function () {
-			if ( !utils_packageResult__warned[ methodName ] ) {
+			if ( !packageResult__warned[ methodName ] ) {
 				console.log( (("Warning: esperanto." + methodName) + "() returns an object with a 'code' property. You should use this instead of using the returned value directly") );
-				utils_packageResult__warned[ methodName ] = true;
+				packageResult__warned[ methodName ] = true;
 			}
 
 			return code;
@@ -1965,7 +1966,7 @@ function amdIntro (useStrict) {var name = useStrict.name, imports = useStrict.im
 	return intro;
 }
 
-function defaultsMode_amd__amd ( mod, options ) {
+function amd__amd ( mod, options ) {
 	mod.imports.forEach( function(x ) {
 		mod.body.remove( x.start, x.next );
 	});
@@ -1989,11 +1990,11 @@ function defaultsMode_amd__amd ( mod, options ) {
 	return packageResult( mod, mod.body, options, 'toAmd' );
 }
 
-function defaultsMode_cjs__cjs ( mod, options ) {
+function cjs__cjs ( mod, options ) {
 	var seen = {};
 
 	mod.imports.forEach( function(x ) {
-		if ( !utils_hasOwnProp.call( seen, x.path ) ) {
+		if ( !hasOwnProp.call( seen, x.path ) ) {
 			var replacement = x.isEmpty ? (("" + (req(x.path))) + ";") : (("var " + (x.as)) + (" = " + (req(x.path))) + ";");
 			mod.body.replace( x.start, x.end, replacement );
 
@@ -2103,17 +2104,15 @@ EsperantoError.prototype = new Error();
 EsperantoError.prototype.constructor = EsperantoError;
 EsperantoError.prototype.name = 'EsperantoError';
 
-var utils_EsperantoError = EsperantoError;
-
 function requireName ( options ) {
 	if ( !options.name ) {
-		throw new utils_EsperantoError( 'You must supply a `name` option for UMD modules', {
+		throw new EsperantoError( 'You must supply a `name` option for UMD modules', {
 			code: 'MISSING_NAME'
 		});
 	}
 }
 
-function defaultsMode_umd__umd ( mod, options ) {
+function umd__umd ( mod, options ) {
 	requireName( options );
 
 	mod.imports.forEach( function(x ) {
@@ -2138,9 +2137,9 @@ function defaultsMode_umd__umd ( mod, options ) {
 }
 
 var defaultsMode = {
-	amd: defaultsMode_amd__amd,
-	cjs: defaultsMode_cjs__cjs,
-	umd: defaultsMode_umd__umd
+	amd: amd__amd,
+	cjs: cjs__cjs,
+	umd: umd__umd
 };
 
 function gatherImports ( imports ) {
@@ -2277,7 +2276,7 @@ function utils_transformBody__transformBody ( mod, body, options ) {
 }
 
 function deconflict ( name, declared ) {
-	while ( utils_hasOwnProp.call( declared, name ) ) {
+	while ( hasOwnProp.call( declared, name ) ) {
 		name = '_' + name;
 	}
 
@@ -2308,7 +2307,7 @@ function strictMode_cjs__cjs ( mod, options ) {
 
 	// Create block of require statements
 	var importBlock = mod.imports.map( function(x ) {
-		if ( !utils_hasOwnProp.call( seen, x.path ) ) {
+		if ( !hasOwnProp.call( seen, x.path ) ) {
 			seen[ x.path ] = true;
 
 			if ( x.isEmpty ) {
@@ -2366,7 +2365,7 @@ var moduleBuilders = {
 	strictMode: strictMode
 };
 
-function builders_defaultsMode_amd__amd ( bundle, options ) {
+function defaultsMode_amd__amd ( bundle, options ) {
 	var defaultName = bundle.entryModule.identifierReplacements.default;
 	if ( defaultName ) {
 		bundle.body.append( (("\n\nreturn " + defaultName) + ";") );
@@ -2383,7 +2382,7 @@ function builders_defaultsMode_amd__amd ( bundle, options ) {
 	return packageResult( bundle, bundle.body, options, 'toAmd', true );
 }
 
-function builders_defaultsMode_cjs__cjs ( bundle, options ) {
+function defaultsMode_cjs__cjs ( bundle, options ) {
 	var importBlock = bundle.externalModules.map( function(x ) {
 		return (("var " + (x.name)) + (" = " + (req(x.id))) + ";");
 	}).join( '\n' );
@@ -2404,7 +2403,7 @@ function builders_defaultsMode_cjs__cjs ( bundle, options ) {
 	return packageResult( bundle, bundle.body, options, 'toCjs', true );
 }
 
-function builders_defaultsMode_umd__umd ( bundle, options ) {
+function defaultsMode_umd__umd ( bundle, options ) {
 	requireName( options );
 
 	var entry = bundle.entryModule;
@@ -2428,9 +2427,9 @@ function builders_defaultsMode_umd__umd ( bundle, options ) {
 }
 
 var builders_defaultsMode = {
-	amd: builders_defaultsMode_amd__amd,
-	cjs: builders_defaultsMode_cjs__cjs,
-	umd: builders_defaultsMode_umd__umd
+	amd: defaultsMode_amd__amd,
+	cjs: defaultsMode_cjs__cjs,
+	umd: defaultsMode_umd__umd
 };
 
 function getExportBlock ( entry ) {
@@ -2642,7 +2641,7 @@ var esperanto = {
 
 					bundle.modules.forEach( function(mod ) {
 						mod.imports.forEach( function(x ) {
-							if ( utils_hasOwnProp.call( bundle.externalModuleLookup, x.id ) && ( !x.isDefault && !x.isBatch ) ) {
+							if ( hasOwnProp.call( bundle.externalModuleLookup, x.id ) && ( !x.isDefault && !x.isBatch ) ) {
 								throw new Error( 'You can only have named external imports in strict mode (pass `strict: true`)' );
 							}
 						});

metadata

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