esperanto-source 0.6.33 → 0.6.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65022f6e363f203e2251de1f51409bd63dfc4fb3
-  data.tar.gz: ffd82a36c819f34d84bf4095eaf7201dceabaf45
+  metadata.gz: e0bd2e0fafcd3cd4249ae16bc134725936890f37
+  data.tar.gz: d9b4db58f14d64c6b06603592c905afc751cbdc2
 SHA512:
-  metadata.gz: a0d92c351df440c0efe5ea6a3086927edddde74bcb2d9fdf044b53e2e5b8ad0879251351418ca11e14fa80bd83369171d88875f7040cf1109458fb1b7755af26
-  data.tar.gz: 1bb2d6a9a92f30d4de761f8d7380f73794748f493bcbce11b895fdf8fde8b8a80d82d53ae08e83ab0ad02c05478a94b3d94c4494ae54bb778f5d4751443bde05
+  metadata.gz: 9aead4edb4ba8a2e3f16e72989328c88b1a4773085f56995a22da370602d6c31759f35c47446f1fdd99a2bcf5eb76ba8c64d3da6edb8f88e81d6c3eb4499bc81
+  data.tar.gz: fe1477afdfe8f6474739aeabec3d366f35d5844d774ada097c2b8af198d539979ab61c461090a8ffe7e27d888d58e3052e7502ab2a48901b7887ebf02eacf430

data/lib/esperanto/source/version.rb

@@ -1,5 +1,5 @@
 module Esperanto
   module Source
-    VERSION = '0.6.33'
+    VERSION = '0.6.34'
   end
 end

data/vendor/esperanto.browser.js

@@ -1,5 +1,5 @@
 /*
-	esperanto.js v0.6.33 - 2015-05-07
+	esperanto.js v0.6.34 - 2015-05-12
 	http://esperantojs.org
 
 	Released under the MIT License.
@@ -930,12 +930,17 @@
 
 	var magic_string = MagicString;
 
+	var ast_walk__shouldSkip;
+	var ast_walk__shouldAbort;
+
 	function walk ( ast, leave) {var enter = leave.enter, leave = leave.leave;
+		ast_walk__shouldAbort = false;
 		visit( ast, null, enter, leave );
 	}
 
 	var ast_walk__context = {
-		skip: function()  {return ast_walk__context.shouldSkip = true}
+		skip: function()  {return ast_walk__shouldSkip = true},
+		abort: function()  {return ast_walk__shouldAbort = true}
 	};
 
 	var ast_walk__childKeys = {};
@@ -947,12 +952,12 @@
 	}
 
 	function visit ( node, parent, enter, leave ) {
-		if ( !node ) return;
+		if ( !node || ast_walk__shouldAbort ) return;
 
 		if ( enter ) {
-			ast_walk__context.shouldSkip = false;
+			ast_walk__shouldSkip = false;
 			enter.call( ast_walk__context, node, parent );
-			if ( ast_walk__context.shouldSkip ) return;
+			if ( ast_walk__shouldSkip || ast_walk__shouldAbort ) return;
 		}
 
 		var keys = ast_walk__childKeys[ node.type ] || (
@@ -978,7 +983,7 @@
 			}
 		}
 
-		if ( leave ) {
+		if ( leave && !ast_walk__shouldAbort ) {
 			leave( node, parent );
 		}
 	}

data/vendor/esperanto.js

@@ -1,5 +1,5 @@
 /*
-	esperanto.js v0.6.33 - 2015-05-07
+	esperanto.js v0.6.34 - 2015-05-12
 	http://esperantojs.org
 
 	Released under the MIT License.
@@ -32,12 +32,17 @@ function hasNamedExports ( mod ) {
 	}
 }
 
+var ast_walk__shouldSkip = void 0;
+var ast_walk__shouldAbort = void 0;
+
 function walk ( ast, leave) {var enter = leave.enter, leave = leave.leave;
+	ast_walk__shouldAbort = false;
 	visit( ast, null, enter, leave );
 }
 
 var ast_walk__context = {
-	skip: function()  {return ast_walk__context.shouldSkip = true}
+	skip: function()  {return ast_walk__shouldSkip = true},
+	abort: function()  {return ast_walk__shouldAbort = true}
 };
 
 var ast_walk__childKeys = {};
@@ -49,12 +54,12 @@ function isArray ( thing ) {
 }
 
 function visit ( node, parent, enter, leave ) {
-	if ( !node ) return;
+	if ( !node || ast_walk__shouldAbort ) return;
 
 	if ( enter ) {
-		ast_walk__context.shouldSkip = false;
+		ast_walk__shouldSkip = false;
 		enter.call( ast_walk__context, node, parent );
-		if ( ast_walk__context.shouldSkip ) return;
+		if ( ast_walk__shouldSkip || ast_walk__shouldAbort ) return;
 	}
 
 	var keys = ast_walk__childKeys[ node.type ] || (
@@ -80,7 +85,7 @@ function visit ( node, parent, enter, leave ) {
 		}
 	}
 
-	if ( leave ) {
+	if ( leave && !ast_walk__shouldAbort ) {
 		leave( node, parent );
 	}
 }
@@ -755,61 +760,87 @@ function resolveAgainst ( importerPath ) {
 function sortModules ( entry ) {
 	var seen = {};
 	var ordered = [];
-	var swapPairs = [];
+	var hasCycles;
+
+	var strongDeps = {};
+	var stronglyDependsOn = {};
 
 	function visit ( mod ) {
-		seen[ mod.id ] = true;
+		var id = mod.id;
+
+		seen[ id ] = true;
+
+		strongDeps[ id ] = [];
+		stronglyDependsOn[ id ] = {};
 
 		mod.imports.forEach( function(x ) {
 			var imported = x.module;
 
 			if ( imported.isExternal || imported.isSkipped ) return;
 
-			// ignore modules we've already included
-			if ( utils_hasOwnProp.call( seen, imported.id ) ) {
-				if ( shouldSwap( imported, mod ) ) {
-					swapPairs.push([ imported, mod ]);
-				}
+			// if `mod` references a binding from `imported` at the top
+			// level (i.e. outside function bodies), we say that `mod`
+			// strongly depends on `imported. If two modules depend on
+			// each other, this helps us order them such that if a
+			// strongly depends on b, and b weakly depends on a, b
+			// goes first
+			if ( referencesAtTopLevel( mod, imported ) ) {
+				strongDeps[ id ].push( imported );
+			}
 
+			if ( utils_hasOwnProp.call( seen, imported.id ) ) {
+				// we need to prevent an infinite loop, and note that
+				// we need to check for strong/weak dependency relationships
+				hasCycles = true;
 				return;
 			}
 
 			visit( imported );
 		});
 
+		// add second (and third...) order dependencies
+		function addStrongDependencies ( dependency ) {
+			if ( utils_hasOwnProp.call( stronglyDependsOn[ id ], dependency.id ) ) return;
+
+			stronglyDependsOn[ id ][ dependency.id ] = true;
+			strongDeps[ dependency.id ].forEach( addStrongDependencies );
+		}
+
+		strongDeps[ id ].forEach( addStrongDependencies );
+
 		ordered.push( mod );
 	}
 
 	visit( entry );
 
-	swapPairs.forEach( function(b)  {var a = b[0], b = b[1];
-		var aIndex = ordered.indexOf( a );
-		var bIndex = ordered.indexOf( b );
+	var unordered;
 
-		ordered[ aIndex ] = b;
-		ordered[ bIndex ] = a;
-	});
-
-	return ordered;
-}
+	if ( hasCycles ) {
+		unordered = ordered;
+		ordered = [];
 
-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;
+		// unordered is actually semi-ordered, as [ fewer dependencies ... more dependencies ]
+		unordered.forEach( function(x ) {
+			// ensure strong dependencies of x that don't strongly depend on x go first
+			strongDeps[ x.id ].forEach( place );
 
-	return usesAtTopLevel( b, a ) && !usesAtTopLevel( a, b );
-}
+			function place ( dep ) {
+				if ( !stronglyDependsOn[ dep.id ][ x.id ] && !~ordered.indexOf( dep ) ) {
+					strongDeps[ dep.id ].forEach( place );
+					ordered.push( dep );
+				}
+			}
 
-function utils_sortModules__imports ( a, b ) {
-	var i = a.imports.length;
-	while ( i-- ) {
-		if ( a.imports[i].module === b ) {
-			return true;
-		}
+			if ( !~ordered.indexOf( x ) ) {
+				ordered.push( x );
+			}
+		});
 	}
+
+	return ordered;
 }
 
-function usesAtTopLevel ( a, b ) {
+function referencesAtTopLevel ( a, b ) {
 	var bindings = [];
 
 	// find out which bindings a imports from b
@@ -825,16 +856,13 @@ function usesAtTopLevel ( a, b ) {
 
 	walk( a.ast, {
 		enter: function ( node ) {
-			if ( referencedAtTopLevel ) {
-				return this.skip();
-			}
-
 			if ( /^Import/.test( node.type ) || ( node._scope && node._scope.parent ) ) {
 				return this.skip();
 			}
 
 			if ( node.type === 'Identifier' && ~bindings.indexOf( node.name ) ) {
 				referencedAtTopLevel = true;
+				this.abort();
 			}
 		}
 	});

metadata

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