esperanto-source 0.6.11 → 0.6.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8635fadd4a3ed4cb39f5efa5367a34f1283dc7a
-  data.tar.gz: 9cbd863d7d4448d891054486108fa35d14dbcd03
+  metadata.gz: 8d3a38527ae2716f01b7c709513abbde27bd53c1
+  data.tar.gz: 399a28496cfa10ad15a4e8e37deb4f0baece6a54
 SHA512:
-  metadata.gz: 85d9e6571545fd796263690e92da21881b8f1b48236fc19d5a7249aab99dcca136d0ca72b6e566d95fd0f372c234999e33e4beea3f480dc2acfcc2c49bd6e49d
-  data.tar.gz: 46b7683b40cc0e3c5e05af61a86273c173bf174b45bcbf9adb2c726eaac86c6773a3296f989f33f93a91be4511f4f1de97c5b37f6f02b1358811c6330a548717
+  metadata.gz: 712611a44bc8d7c3932a49f1266c7f3b7df74fc789aa8ec179b55aa3c6157328873a62ded8e2231c9e9ebfb9b20065b97bbc97186446d4b94505a50c7df6ba40
+  data.tar.gz: 1e533cf64c625262113c8f04b83c905061ac823936a1c20cae772f4c6c1f606efdc3a297aa3f881adb01301b391e965b3a4711fd0378ca71825198ef358a4a91

data/lib/esperanto/source/version.rb

@@ -1,5 +1,5 @@
 module Esperanto
   module Source
-    VERSION = '0.6.11'
+    VERSION = '0.6.12'
   end
 end

data/vendor/esperanto.browser.js

@@ -1,5 +1,5 @@
 /*
-	esperanto.js v0.6.11 - 2015-02-08
+	esperanto.js v0.6.12 - 2015-02-09
 	http://esperantojs.org
 
 	Released under the MIT License.

data/vendor/esperanto.js

@@ -1,5 +1,5 @@
 /*
-	esperanto.js v0.6.11 - 2015-02-08
+	esperanto.js v0.6.12 - 2015-02-09
 	http://esperantojs.org
 
 	Released under the MIT License.
@@ -1367,7 +1367,7 @@ function getBundle ( options ) {
 	var entry = options.entry.replace( /\.js$/, '' ),
 		modules = [],
 		moduleLookup = {},
-		promiseById = {},
+		promiseByPath = {},
 		skip = options.skip,
 		names = options.names,
 		base = ( options.base ? path.resolve( options.base ) : process.cwd() ) + '/',
@@ -1378,98 +1378,102 @@ function getBundle ( options ) {
 		entry = entry.substring( base.length );
 	}
 
-	return fetchModule( entry, null ).then( function()  {
-		var entryModule, bundle;
-
-		entryModule = moduleLookup[ entry ];
-		modules = sortModules( entryModule, moduleLookup ); // TODO is this necessary? surely it's already sorted because of the fetch order? or do we need to prevent parallel reads?
+	return resolvePath( base, entry, null ).then( function(entryPath ) {
+		return fetchModule( entry, entryPath ).then( function()  {
+			var entryModule, bundle;
+
+			entryModule = moduleLookup[ entry ];
+			modules = sortModules( entryModule, moduleLookup ); // TODO is this necessary? surely it's already sorted because of the fetch order? or do we need to prevent parallel reads?
+
+			bundle = {
+				entry: entry,
+				entryModule: entryModule,
+				base: base,
+				modules: modules,
+				moduleLookup: moduleLookup,
+				externalModules: externalModules,
+				externalModuleLookup: externalModuleLookup,
+				skip: skip,
+				names: names,
+				chains: resolveChains( modules, moduleLookup )
+			};
 
-		bundle = {
-			entry: entry,
-			entryModule: entryModule,
-			base: base,
-			modules: modules,
-			moduleLookup: moduleLookup,
-			externalModules: externalModules,
-			externalModuleLookup: externalModuleLookup,
-			skip: skip,
-			names: names,
-			chains: resolveChains( modules, moduleLookup )
-		};
+			combine( bundle );
 
-		combine( bundle );
+			return bundle;
+		});
+	}, function ( err ) {
+		if ( err.code === 'ENOENT' ) {
+			throw new Error( 'Could not find entry module (' + entry + ')' );
+		}
 
-		return bundle;
+		throw err;
 	});
 
-	function fetchModule ( moduleId, importerPath ) {
-		if ( !hasOwnProp.call( promiseById, moduleId ) ) {
-			promiseById[ moduleId ] = resolvePath( base, moduleId, importerPath, options.resolvePath ).then( function(modulePath ) {
-				return sander.readFile( modulePath ).then( String ).then( function ( source ) {
-					var module, promises;
+	function fetchModule ( moduleId, modulePath ) {
+		if ( !hasOwnProp.call( promiseByPath, modulePath ) ) {
+			promiseByPath[ modulePath ] = sander.readFile( modulePath ).then( String ).then( function ( source ) {
+				var module, promises;
 
-					if ( options.transform ) {
-						source = options.transform( source, modulePath );
+				if ( options.transform ) {
+					source = options.transform( source, modulePath );
 
-						if ( typeof source !== 'string' && !isThenable( source ) ) {
-							throw new Error( 'transform should return String or Promise' );
-						}
+					if ( typeof source !== 'string' && !isThenable( source ) ) {
+						throw new Error( 'transform should return String or Promise' );
 					}
+				}
 
-					module = getModule({
-						source: source,
-						id: moduleId,
-						relativePath: path.relative( base, modulePath ),
-						path: modulePath
-					});
+				module = getModule({
+					source: source,
+					id: moduleId,
+					relativePath: path.relative( base, modulePath ),
+					path: modulePath
+				});
 
-					modules.push( module );
-					moduleLookup[ moduleId ] = module;
+				modules.push( module );
+				moduleLookup[ moduleId ] = module;
 
-					promises = module.imports.map( function(x ) {
-						x.id = resolveId( x.path, module.relativePath );
+				promises = module.imports.map( function(x ) {
+					x.id = resolveId( x.path, module.relativePath );
 
-						if ( x.id === moduleId ) {
-							throw new Error( 'A module (' + moduleId + ') cannot import itself' );
-						}
+					if ( x.id === moduleId ) {
+						throw new Error( 'A module (' + moduleId + ') cannot import itself' );
+					}
 
-						// Some modules can be skipped
-						if ( skip && ~skip.indexOf( x.id ) ) {
-							return;
-						}
+					// Some modules can be skipped
+					if ( skip && ~skip.indexOf( x.id ) ) {
+						return;
+					}
 
+					return resolvePath( base, x.id, modulePath, options.resolvePath ).then( function(modulePath ) {
 						// short-circuit cycles
-						if ( hasOwnProp.call( promiseById, x.id ) ) {
+						if ( hasOwnProp.call( promiseByPath, modulePath ) ) {
 							return;
 						}
 
 						return fetchModule( x.id, modulePath );
-					});
-
-					return getBundle__Promise.all( promises );
+					}, function handleError ( err ) {
+						if ( err.code === 'ENOENT' ) {
+							// Most likely an external module
+							if ( !hasOwnProp.call( externalModuleLookup, x.id ) ) {
+								var externalModule = {
+									id: x.id
+								};
+
+								externalModules.push( externalModule );
+								externalModuleLookup[ x.id ] = externalModule;
+							}
+						} else {
+							throw err;
+						}
+					} );
 				});
-			}, function ( err ) {
-				if ( err.code === 'ENOENT' ) {
-					if ( moduleId === entry ) {
-						throw new Error( 'Could not find entry module (' + entry + ')' );
-					}
-
-					// Most likely an external module
-					if ( !hasOwnProp.call( externalModuleLookup, moduleId ) ) {
-						var externalModule = {
-							id: moduleId
-						};
 
-						externalModules.push( externalModule );
-						externalModuleLookup[ moduleId ] = externalModule;
-					}
-				} else {
-					throw err;
-				}
+				return getBundle__Promise.all( promises );
 			});
 		}
 
-		return promiseById[ moduleId ];
+		return promiseByPath[ modulePath ];
 	}
 }
 

metadata

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