esperanto-source 0.6.15 → 0.6.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 073c79d73032cfa4bc9254ddee3bc518d1b23c9b
-  data.tar.gz: 2745f24714e53b4349b4a40392ed8568f8621ae9
+  metadata.gz: 2db1faeb981d396e1cf561a554bbcb58c5eec0f0
+  data.tar.gz: 812893bfa15d0277c92035235d59884ce01d616d
 SHA512:
-  metadata.gz: 3c94906168751c248259d34c8a3ff5fe3f2cab5828fa01fea6c786d571442018752c83d2e3636e5b917c6e92dffb6dd2deb93504f9384fac10d5c6d817d907f5
-  data.tar.gz: 51b20b23bdfabd50989b65e0cc27e794580ab22a4018ec4d94d464dc40549e9ae00865654f32cd72e224dd057d719cca46560e8776789db90f02de509dd4c7eb
+  metadata.gz: 96bea70d8e01aa0d862c9742b1ce3e447d7bc3e53d3bc0471ea47e016c608a443dd85fc568fae6982691d59c4705c25383b0938b6c17ed3aff045fcd1e7ea278
+  data.tar.gz: 50bfb8581beeef06828199996e7f44a5a3016cc45931900d877f598780728f296bc842691f93d2d521f364c89401a6bcdbb64dbd4501d34f37030c7fd01c0822

data/lib/esperanto/source/version.rb

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

data/vendor/esperanto.browser.js

@@ -1,5 +1,5 @@
 /*
-	esperanto.js v0.6.15 - 2015-02-26
+	esperanto.js v0.6.16 - 2015-03-02
 	http://esperantojs.org
 
 	Released under the MIT License.
@@ -1148,11 +1148,11 @@
 			x.isEmpty = true;
 		} else if ( x.specifiers.length === 1 && x.specifiers[0].isDefault ) {
 			x.isDefault = true;
-			x.name = x.specifiers[0].as;
+			x.as = x.specifiers[0].as;
 
 		} else if ( x.specifiers.length === 1 && x.specifiers[0].isBatch ) {
 			x.isBatch = true;
-			x.name = x.specifiers[0].name;
+			x.as = x.specifiers[0].name;
 		} else {
 			x.isNamed = true;
 		}
@@ -1297,6 +1297,32 @@
 		return unscoped;
 	}
 
+	function disallowConflictingImports ( imports ) {
+		var usedNames = {};
+
+		imports.forEach( function(x ) {
+			if ( x.as ) {
+				checkName( x.as );
+			}
+
+			else {
+				x.specifiers.forEach( checkSpecifier );
+			}
+		});
+
+		function checkSpecifier ( s ) {
+			checkName( s.as );
+		}
+
+		function checkName ( name ) {
+			if ( hasOwnProp.call( usedNames, name ) ) {
+				throw new SyntaxError( (("Duplicated import ('" + name) + "')") );
+			}
+
+			usedNames[ name ] = true;
+		}
+	}
+
 	var reserved = 'break case class catch const continue debugger default delete do else export extends finally for function if import in instanceof let new return super switch this throw try typeof var void while with yield'.split( ' ' );
 
 	/**
@@ -1322,17 +1348,52 @@
 		return path.split( pathSplitRE );
 	}
 
-	function getModuleNameHelper ( userFn ) {var usedNames = arguments[1];if(usedNames === void 0)usedNames = {};
-		var nameById = {}, getModuleName;
+	function getStandaloneModule ( options ) {var $D$0;
+		var mod, imports, exports, conflicts = {};
+
+		mod = {
+			body: new MagicString( options.source ),
+			ast: acorn.parse( options.source, {
+				ecmaVersion: 6,
+				locations: true
+			})
+		};
+
+		imports = ($D$0 = findImportsAndExports( mod, options.source, mod.ast ))[0], exports = $D$0[1], $D$0;
+
+		disallowConflictingImports( imports );
+
+		mod.imports = imports;
+		mod.exports = exports;
+
+		if ( options.strict ) {
+			annotateAst( mod.ast );
+
+			// TODO there's probably an easier way to get this array
+			Object.keys( mod.ast._declared ).concat( getUnscopedNames( mod ) ).forEach( function(n ) {
+				conflicts[n] = true;
+			});
+		}
+
+		determineImportNames( imports, options.getModuleName, conflicts );
+
+		return mod;
+	;$D$0 = void 0}
+
+	function determineImportNames ( imports, userFn, usedNames ) {
+		var nameById = {}, inferredNames = {};
+
+		usedNames = usedNames || {};
 
-		getModuleName = function(x ) {
+		imports.forEach( function(x ) {
 			var moduleId, parts, i, prefix = '', name, candidate;
 
 			moduleId = x.path;
 
 			// use existing value
 			if ( hasOwnProp.call( nameById, moduleId ) ) {
-				return nameById[ moduleId ];
+				x.name = nameById[ moduleId ];
+				return;
 			}
 
 			// if user supplied a function, defer to it
@@ -1345,16 +1406,12 @@
 				}
 			}
 
-			else if ( x.isDefault || x.isBatch ) {
-				name = x.name;
-			}
-
 			else {
 				parts = splitPath( moduleId );
-				i = parts.length;
 
 				do {
-					while ( i-- ) {
+					i = parts.length;
+					while ( i-- > 0 ) {
 						candidate = prefix + sanitize( parts.slice( i ).join( '__' ) );
 
 						if ( !hasOwnProp.call( usedNames, candidate ) ) {
@@ -1370,44 +1427,23 @@
 			usedNames[ name ] = true;
 			nameById[ moduleId ] = name;
 
-			return name;
-		};
-
-		return getModuleName;
-	}
-
-	function getStandaloneModule ( options ) {var $D$0;
-		var mod, imports, exports, conflicts = {};
-
-		mod = {
-			body: new MagicString( options.source ),
-			ast: acorn.parse( options.source, {
-				ecmaVersion: 6,
-				locations: true
-			})
-		};
-
-		imports = ($D$0 = findImportsAndExports( mod, options.source, mod.ast ))[0], exports = $D$0[1], $D$0;
-
-
-		mod.imports = imports;
-		mod.exports = exports;
-
-		if ( options.strict ) {
-			annotateAst( mod.ast );
-
-			// TODO there's probably an easier way to get this array
-			Object.keys( mod.ast._declared ).concat( getUnscopedNames( mod ) ).forEach( function(n ) {
-				conflicts[n] = true;
-			});
-		} else {
-			conflicts = mod.ast._declared;
-		}
+			x.name = name;
+		});
 
-		mod.getName = getModuleNameHelper( options.getModuleName, conflicts );
+		// use inferred names for default imports, wherever they
+		// don't clash with path-based names
+		imports.forEach( function(x ) {
+			if ( x.as && !hasOwnProp.call( usedNames, x.as ) ) {
+				inferredNames[ x.path ] = x.as;
+			}
+		});
 
-		return mod;
-	;$D$0 = void 0}
+		imports.forEach( function(x ) {
+			if ( hasOwnProp.call( inferredNames, x.path ) ) {
+				x.name = inferredNames[ x.path ];
+			}
+		});
+	}
 
 	function transformExportDeclaration ( declaration, body ) {
 		var exportedValue;
@@ -1627,12 +1663,12 @@
 			if ( !hasOwnProp.call( seen, path ) ) {
 				importPaths.push( path );
 
-				if ( x.name ) {
+				if ( x.as ) {
 					while ( placeholders ) {
 						importNames.push( '__dep' + importNames.length + '__' );
 						placeholders--;
 					}
-					importNames.push( x.name );
+					importNames.push( x.as );
 				} else {
 					placeholders++;
 				}
@@ -1666,7 +1702,7 @@
 
 		mod.imports.forEach( function(x ) {
 			if ( !hasOwnProp.call( seen, x.path ) ) {
-				var replacement = x.isEmpty ? (("" + (req(x.path))) + ";") : (("var " + (x.name)) + (" = " + (req(x.path))) + ";");
+				var replacement = x.isEmpty ? (("" + (req(x.path))) + ";") : (("var " + (x.as)) + (" = " + (req(x.path))) + ";");
 				body.replace( x.start, x.end, replacement );
 
 				seen[ x.path ] = true;
@@ -1797,12 +1833,12 @@
 				if ( !hasOwnProp.call( seen, x.path ) ) {
 					importPaths.push( x.path );
 
-					if ( x.name ) {
+					if ( x.as ) {
 						while ( placeholders ) {
 							importNames.push( '__dep' + importNames.length + '__' );
 							placeholders--;
 						}
-						importNames.push( x.name );
+						importNames.push( x.as );
 					} else {
 						placeholders++;
 					}
@@ -1836,12 +1872,10 @@
 		umd: umd__umd
 	};
 
-	function gatherImports ( imports, getName ) {
+	function gatherImports ( imports ) {
 		var chains = {}, identifierReplacements = {};
 
 		imports.forEach( function(x ) {
-			var moduleName = getName( x );
-
 			x.specifiers.forEach( function(s ) {
 				var name, replacement;
 
@@ -1850,7 +1884,7 @@
 				}
 
 				name = s.as;
-				replacement = moduleName + ( s.isDefault ? ("['default']") : ("." + (s.name)) );
+				replacement = x.name + ( s.isDefault ? ("['default']") : ("." + (s.name)) );
 
 				if ( !x.passthrough ) {
 					identifierReplacements[ name ] = replacement;
@@ -2077,7 +2111,7 @@
 			earlyExports,
 			lateExports;
 
-		chains = ($D$1 = gatherImports( mod.imports, mod.getName ))[0], identifierReplacements = $D$1[1], $D$1;
+		chains = ($D$1 = gatherImports( mod.imports ))[0], identifierReplacements = $D$1[1], $D$1;
 		exportNames = getExportNames( mod.exports );
 
 		importedBindings = ($D$1 = getReadOnlyIdentifiers( mod.imports ))[0], importedNamespaces = $D$1[1], $D$1;
@@ -2195,7 +2229,7 @@
 						importNames.push( '__dep' + importNames.length + '__' );
 						placeholders--;
 					}
-					importNames.push( mod.getName( x ) );
+					importNames.push( x.name );
 				} else {
 					placeholders++;
 				}
@@ -2249,8 +2283,7 @@
 				if ( x.isEmpty ) {
 					replacement = (("" + (req(x.path))) + ";");
 				} else {
-					name = mod.getName( x );
-					replacement = (("var " + name) + (" = " + (req(x.path))) + ";");
+					replacement = (("var " + (x.name)) + (" = " + (req(x.path))) + ";");
 				}
 
 				seen[ x.path ] = true;

data/vendor/esperanto.js

@@ -1,5 +1,5 @@
 /*
-	esperanto.js v0.6.15 - 2015-02-26
+	esperanto.js v0.6.16 - 2015-03-02
 	http://esperantojs.org
 
 	Released under the MIT License.
@@ -295,11 +295,11 @@ function processImport ( node, passthrough ) {
 		x.isEmpty = true;
 	} else if ( x.specifiers.length === 1 && x.specifiers[0].isDefault ) {
 		x.isDefault = true;
-		x.name = x.specifiers[0].as;
+		x.as = x.specifiers[0].as;
 
 	} else if ( x.specifiers.length === 1 && x.specifiers[0].isBatch ) {
 		x.isBatch = true;
-		x.name = x.specifiers[0].name;
+		x.as = x.specifiers[0].name;
 	} else {
 		x.isNamed = true;
 	}
@@ -444,6 +444,32 @@ function getUnscopedNames ( mod ) {
 	return unscoped;
 }
 
+function disallowConflictingImports ( imports ) {
+	var usedNames = {};
+
+	imports.forEach( function(x ) {
+		if ( x.as ) {
+			checkName( x.as );
+		}
+
+		else {
+			x.specifiers.forEach( checkSpecifier );
+		}
+	});
+
+	function checkSpecifier ( s ) {
+		checkName( s.as );
+	}
+
+	function checkName ( name ) {
+		if ( hasOwnProp.call( usedNames, name ) ) {
+			throw new SyntaxError( (("Duplicated import ('" + name) + "')") );
+		}
+
+		usedNames[ name ] = true;
+	}
+}
+
 var reserved = 'break case class catch const continue debugger default delete do else export extends finally for function if import in instanceof let new return super switch this throw try typeof var void while with yield'.split( ' ' );
 
 /**
@@ -469,17 +495,52 @@ function splitPath ( path ) {
 	return path.split( pathSplitRE );
 }
 
-function getModuleNameHelper ( userFn ) {var usedNames = arguments[1];if(usedNames === void 0)usedNames = {};
-	var nameById = {}, getModuleName;
+function getStandaloneModule ( options ) {var $D$0;
+	var mod, imports, exports, conflicts = {};
 
-	getModuleName = function(x ) {
+	mod = {
+		body: new MagicString( options.source ),
+		ast: acorn.parse( options.source, {
+			ecmaVersion: 6,
+			locations: true
+		})
+	};
+
+	imports = ($D$0 = findImportsAndExports( mod, options.source, mod.ast ))[0], exports = $D$0[1], $D$0;
+
+	disallowConflictingImports( imports );
+
+	mod.imports = imports;
+	mod.exports = exports;
+
+	if ( options.strict ) {
+		annotateAst( mod.ast );
+
+		// TODO there's probably an easier way to get this array
+		Object.keys( mod.ast._declared ).concat( getUnscopedNames( mod ) ).forEach( function(n ) {
+			conflicts[n] = true;
+		});
+	}
+
+	determineImportNames( imports, options.getModuleName, conflicts );
+
+	return mod;
+;$D$0 = void 0}
+
+function determineImportNames ( imports, userFn, usedNames ) {
+	var nameById = {}, inferredNames = {};
+
+	usedNames = usedNames || {};
+
+	imports.forEach( function(x ) {
 		var moduleId, parts, i, prefix = '', name, candidate;
 
 		moduleId = x.path;
 
 		// use existing value
 		if ( hasOwnProp.call( nameById, moduleId ) ) {
-			return nameById[ moduleId ];
+			x.name = nameById[ moduleId ];
+			return;
 		}
 
 		// if user supplied a function, defer to it
@@ -492,16 +553,12 @@ function getModuleNameHelper ( userFn ) {var usedNames = arguments[1];if(usedNam
 			}
 		}
 
-		else if ( x.isDefault || x.isBatch ) {
-			name = x.name;
-		}
-
 		else {
 			parts = splitPath( moduleId );
-			i = parts.length;
 
 			do {
-				while ( i-- ) {
+				i = parts.length;
+				while ( i-- > 0 ) {
 					candidate = prefix + sanitize( parts.slice( i ).join( '__' ) );
 
 					if ( !hasOwnProp.call( usedNames, candidate ) ) {
@@ -517,44 +574,23 @@ function getModuleNameHelper ( userFn ) {var usedNames = arguments[1];if(usedNam
 		usedNames[ name ] = true;
 		nameById[ moduleId ] = name;
 
-		return name;
-	};
-
-	return getModuleName;
-}
-
-function getStandaloneModule ( options ) {var $D$0;
-	var mod, imports, exports, conflicts = {};
-
-	mod = {
-		body: new MagicString( options.source ),
-		ast: acorn.parse( options.source, {
-			ecmaVersion: 6,
-			locations: true
-		})
-	};
-
-	imports = ($D$0 = findImportsAndExports( mod, options.source, mod.ast ))[0], exports = $D$0[1], $D$0;
-
-
-	mod.imports = imports;
-	mod.exports = exports;
-
-	if ( options.strict ) {
-		annotateAst( mod.ast );
-
-		// TODO there's probably an easier way to get this array
-		Object.keys( mod.ast._declared ).concat( getUnscopedNames( mod ) ).forEach( function(n ) {
-			conflicts[n] = true;
-		});
-	} else {
-		conflicts = mod.ast._declared;
-	}
+		x.name = name;
+	});
 
-	mod.getName = getModuleNameHelper( options.getModuleName, conflicts );
+	// use inferred names for default imports, wherever they
+	// don't clash with path-based names
+	imports.forEach( function(x ) {
+		if ( x.as && !hasOwnProp.call( usedNames, x.as ) ) {
+			inferredNames[ x.path ] = x.as;
+		}
+	});
 
-	return mod;
-;$D$0 = void 0}
+	imports.forEach( function(x ) {
+		if ( hasOwnProp.call( inferredNames, x.path ) ) {
+			x.name = inferredNames[ x.path ];
+		}
+	});
+}
 
 function resolveId ( importPath, importerPath ) {
 	var resolved, importerParts, importParts;
@@ -674,9 +710,9 @@ function getUniqueNames ( modules, externalModules, userNames ) {
 	// infer names from default imports
 	modules.forEach( function(mod ) {
 		mod.imports.forEach( function(x ) {
-			if ( x.isDefault && !hasOwnProp.call( names, x.id ) && !hasOwnProp.call( used, x.name ) ) {
-				names[ x.id ] = x.name;
-				used[ x.name ] = true;
+			if ( x.isDefault && !hasOwnProp.call( names, x.id ) && !hasOwnProp.call( used, x.as ) ) {
+				names[ x.id ] = x.as;
+				used[ x.as ] = true;
 			}
 		});
 	});
@@ -814,18 +850,22 @@ function populateIdentifierReplacements ( bundle ) {
 	// then figure out what identifiers need to be created
 	// for default exports
 	bundle.modules.forEach( function(mod ) {
-		var x;
+		var x = mod.defaultExport;
+
+		if ( x ) {
+			var result;
 
-		if ( x = mod.defaultExport ) {
 			if ( x.hasDeclaration && x.name ) {
-				mod.identifierReplacements.default = hasOwnProp.call( conflicts, x.name ) || otherModulesDeclare( mod, x.name ) ?
-					mod.name + '__' + x.name :
+				result = hasOwnProp.call( conflicts, x.name ) || otherModulesDeclare( mod, x.name ) ?
+					(("" + (mod.name)) + ("__" + (x.name)) + "") :
 					x.name;
 			} else {
-				mod.identifierReplacements.default = hasOwnProp.call( conflicts, mod.name ) || otherModulesDeclare( mod, mod.name ) ?
-					mod.name + '__default' :
+				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;
 			}
+
+			mod.identifierReplacements.default = result;
 		}
 	});
 
@@ -1354,6 +1394,8 @@ function getModule ( mod ) {var $D$2;
 
 	imports = ($D$2 = findImportsAndExports( mod, mod.source, mod.ast ))[0], exports = $D$2[1], $D$2;
 
+	disallowConflictingImports( imports );
+
 	mod.imports = imports;
 	mod.exports = exports;
 
@@ -1687,12 +1729,12 @@ function amd__amd ( mod, body, options ) {
 		if ( !hasOwnProp.call( seen, path ) ) {
 			importPaths.push( path );
 
-			if ( x.name ) {
+			if ( x.as ) {
 				while ( placeholders ) {
 					importNames.push( '__dep' + importNames.length + '__' );
 					placeholders--;
 				}
-				importNames.push( x.name );
+				importNames.push( x.as );
 			} else {
 				placeholders++;
 			}
@@ -1726,7 +1768,7 @@ function cjs__cjs ( mod, body, options ) {
 
 	mod.imports.forEach( function(x ) {
 		if ( !hasOwnProp.call( seen, x.path ) ) {
-			var replacement = x.isEmpty ? (("" + (req(x.path))) + ";") : (("var " + (x.name)) + (" = " + (req(x.path))) + ";");
+			var replacement = x.isEmpty ? (("" + (req(x.path))) + ";") : (("var " + (x.as)) + (" = " + (req(x.path))) + ";");
 			body.replace( x.start, x.end, replacement );
 
 			seen[ x.path ] = true;
@@ -1857,12 +1899,12 @@ function umd__umd ( mod, body, options ) {
 			if ( !hasOwnProp.call( seen, x.path ) ) {
 				importPaths.push( x.path );
 
-				if ( x.name ) {
+				if ( x.as ) {
 					while ( placeholders ) {
 						importNames.push( '__dep' + importNames.length + '__' );
 						placeholders--;
 					}
-					importNames.push( x.name );
+					importNames.push( x.as );
 				} else {
 					placeholders++;
 				}
@@ -1896,12 +1938,10 @@ var defaultsMode = {
 	umd: umd__umd
 };
 
-function gatherImports ( imports, getName ) {
+function gatherImports ( imports ) {
 	var chains = {}, identifierReplacements = {};
 
 	imports.forEach( function(x ) {
-		var moduleName = getName( x );
-
 		x.specifiers.forEach( function(s ) {
 			var name, replacement;
 
@@ -1910,7 +1950,7 @@ function gatherImports ( imports, getName ) {
 			}
 
 			name = s.as;
-			replacement = moduleName + ( s.isDefault ? ("['default']") : ("." + (s.name)) );
+			replacement = x.name + ( s.isDefault ? ("['default']") : ("." + (s.name)) );
 
 			if ( !x.passthrough ) {
 				identifierReplacements[ name ] = replacement;
@@ -1952,7 +1992,7 @@ function utils_transformBody__transformBody ( mod, body, options ) {var $D$3;
 		earlyExports,
 		lateExports;
 
-	chains = ($D$3 = gatherImports( mod.imports, mod.getName ))[0], identifierReplacements = $D$3[1], $D$3;
+	chains = ($D$3 = gatherImports( mod.imports ))[0], identifierReplacements = $D$3[1], $D$3;
 	exportNames = getExportNames( mod.exports );
 
 	importedBindings = ($D$3 = getReadOnlyIdentifiers( mod.imports ))[0], importedNamespaces = $D$3[1], $D$3;
@@ -2070,7 +2110,7 @@ function getImportSummary ( mod ) {
 					importNames.push( '__dep' + importNames.length + '__' );
 					placeholders--;
 				}
-				importNames.push( mod.getName( x ) );
+				importNames.push( x.name );
 			} else {
 				placeholders++;
 			}
@@ -2124,8 +2164,7 @@ function strictMode_cjs__cjs ( mod, body, options ) {
 			if ( x.isEmpty ) {
 				replacement = (("" + (req(x.path))) + ";");
 			} else {
-				name = mod.getName( x );
-				replacement = (("var " + name) + (" = " + (req(x.path))) + ";");
+				replacement = (("var " + (x.name)) + (" = " + (req(x.path))) + ";");
 			}
 
 			seen[ x.path ] = true;

metadata

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