esperanto-source 0.6.9.1 → 0.6.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56aef57f1e51808d542880756db24d0a32df4925
-  data.tar.gz: 18be8f6107069789bdce3763c8f11e1d12b6b54b
+  metadata.gz: fa2d37c4a2dc23e02b47dd28844b868f49023385
+  data.tar.gz: 2ec273351482319b1c82da3c09f8b9a22e05cbe2
 SHA512:
-  metadata.gz: 896e3ef4d66992cfd0c43908436c24f0287d6fd79ea389c96102e6ed76d1e83672f4cf306e920c6e484552e9c0d99f7152e3f94e9a8533d1c90c8a2ee973780a
-  data.tar.gz: 2891c81249d33bdf3a784b9ad26b604a319b685c5ef3486a2da55b25fb6fdd63eba6c1201d59ce64f1b7feb046f628323a9f402df51cdc131a2c02e36be1b5e4
+  metadata.gz: e8e61eaab45153c2be2c5458aa21e7b819b52605525ece29b0ca5c7db4fb021fc368308789f516885841a6bba5a051f1ca6d3236575a88ec463b787d23ac0ee6
+  data.tar.gz: 8fd331d6f149b88b11160fa3df0e237a6627d9e163fcd4fd5011be63ca28ef88c14448fdc111175427c98d6a39e4c7426a0853540fd7a6edcad7dffcc2857cce

data/lib/esperanto/source/version.rb

@@ -1,5 +1,5 @@
 module Esperanto
   module Source
-    VERSION = '0.6.9.1'
+    VERSION = '0.6.10'
   end
 end

data/vendor/esperanto.browser.js

@@ -1,5 +1,5 @@
 /*
-	esperanto.js v0.6.9 - 2015-02-06
+	esperanto.js v0.6.10 - 2015-02-09
 	http://esperantojs.org
 
 	Released under the MIT License.
@@ -1766,7 +1766,7 @@
 		toUmd: transpileMethod( 'umd' ),
 
 		bundle: function ( options ) {
-			return undefined__default( options ).then( function ( bundle ) {
+			return getBundle( options ).then( function ( bundle ) {
 				return {
 					imports: bundle.externalModules.map( function(mod ) {return mod.id} ),
 					exports: flattenExports( bundle.entryModule.exports ),

data/vendor/esperanto.js

@@ -1,5 +1,5 @@
 /*
-	esperanto.js v0.6.9 - 2015-02-06
+	esperanto.js v0.6.10 - 2015-02-09
 	http://esperantojs.org
 
 	Released under the MIT License.
@@ -805,7 +805,7 @@ function populateIdentifierReplacements ( bundle ) {
 	// then determine which existing identifiers
 	// need to be replaced
 	bundle.modules.forEach( function(mod ) {
-		var moduleIdentifiers, x;
+		var moduleIdentifiers;
 
 		moduleIdentifiers = mod.identifierReplacements;
 
@@ -1179,7 +1179,8 @@ function transformBody__transformBody ( bundle, mod, body ) {var $D$1;
 				if ( name === identifierReplacements.default ) {
 					body.remove( x.start, x.end );
 				} else {
-					body.replace( x.start, x.end, (("var " + (identifierReplacements.default)) + (" = " + (identifierReplacements[name])) + ";") );
+					var original = hasOwnProp.call( identifierReplacements, name ) ? identifierReplacements[ name ] : name;
+					body.replace( x.start, x.end, (("var " + (identifierReplacements.default)) + (" = " + original) + ";") );
 				}
 			}
 
@@ -1360,7 +1361,7 @@ function getModule ( mod ) {var $D$2;
 	return mod;
 ;$D$2 = void 0}
 
-var Promise = sander.Promise;
+var getBundle__Promise = sander.Promise;
 
 function getBundle ( options ) {
 	var entry = options.entry.replace( /\.js$/, '' ),
@@ -1377,7 +1378,7 @@ function getBundle ( options ) {
 		entry = entry.substring( base.length );
 	}
 
-	return fetchModule( entry ).then( function()  {
+	return fetchModule( entry, null ).then( function()  {
 		var entryModule, bundle;
 
 		entryModule = moduleLookup[ entry ];
@@ -1401,68 +1402,53 @@ function getBundle ( options ) {
 		return bundle;
 	});
 
-	function fetchModule ( moduleId ) {
-		var modulePath;
-
-		modulePath = path.resolve( base, moduleId + '.js' );
-
+	function fetchModule ( moduleId, importerPath ) {
 		if ( !hasOwnProp.call( promiseById, moduleId ) ) {
-			promiseById[ moduleId ] = sander.readFile( modulePath ).catch( function ( err ) {
-				if ( err.code === 'ENOENT' ) {
-					modulePath = modulePath.replace( /\.js$/, '/index.js' );
-					return sander.readFile( modulePath );
-				}
+			promiseById[ moduleId ] = resolvePath( base, moduleId, importerPath, options.resolvePath ).then( function(modulePath ) {
+				return sander.readFile( modulePath ).then( String ).then( function ( source ) {
+					var module, promises;
 
-				throw err;
-			}).then( function ( source ) {
-				source = String( source );
-
-				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' );
+						}
 					}
-				}
 
-				return source;
-			}).then( function ( source ) {
-				var module, promises;
+					module = getModule({
+						source: source,
+						id: moduleId,
+						file: modulePath.substring( base.length ),
+						path: modulePath
+					});
 
-				module = getModule({
-					source: source,
-					id: moduleId,
-					file: modulePath.substring( base.length ),
-					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.file );
 
-				promises = module.imports.map( function(x ) {
-					x.id = resolveId( x.path, module.file );
+						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;
-					}
+						// short-circuit cycles
+						if ( hasOwnProp.call( promiseById, x.id ) ) {
+							return;
+						}
 
-					// short-circuit cycles
-					if ( hasOwnProp.call( promiseById, x.id ) ) {
-						return;
-					}
+						return fetchModule( x.id, modulePath );
+					});
 
-					return fetchModule( x.id );
+					return getBundle__Promise.all( promises );
 				});
-
-				return Promise.all( promises );
-			}).catch( function ( err ) {
-				var externalModule;
-
+			}, function ( err ) {
 				if ( err.code === 'ENOENT' ) {
 					if ( moduleId === entry ) {
 						throw new Error( 'Could not find entry module (' + entry + ')' );
@@ -1470,7 +1456,7 @@ function getBundle ( options ) {
 
 					// Most likely an external module
 					if ( !hasOwnProp.call( externalModuleLookup, moduleId ) ) {
-						externalModule = {
+						var externalModule = {
 							id: moduleId
 						};
 
@@ -1487,6 +1473,26 @@ function getBundle ( options ) {
 	}
 }
 
+function resolvePath ( base, moduleId, importerPath, resolver ) {
+	return tryPath( base + moduleId + '.js' )
+		.catch( function () {
+			return tryPath( base + moduleId + path.sep + 'index.js' );
+		})
+		.catch( function ( err ) {
+			if ( resolver ) {
+				return resolver( moduleId, importerPath );
+			} else {
+				throw err;
+			}
+		});
+}
+
+function tryPath ( path ) {
+	return sander.stat( path ).then( function () {
+		return path;
+	});
+}
+
 function isThenable ( obj ) {
 	return obj && typeof obj.then === 'function';
 }

metadata

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