Fix bundle filename output

kgryte · kgryte · commit 9d26fdd323e9 · 2017-09-25T14:57:53.000-07:00
diff --git a/lib/node_modules/@stdlib/_tools/bundle/scripts/npm_bundles b/lib/node_modules/@stdlib/_tools/bundle/scripts/npm_bundles
@@ -260,7 +260,7 @@ function done( error ) {
 *
 * @private
 * @param {string} name - bundle name
-* @param {boolean} raw - boolean indicating whether to save a raw bundle
+* @param {boolean} raw - boolean indicating whether to write a raw bundle to file
 * @param {boolean} minify - boolean indicating whether to minify a bundle
 * @returns {Callback} callback to be invoked upon generating a bundle
 */
@@ -285,38 +285,68 @@ function clbk( name, raw, minify ) {
 		debug( 'Finished creating bundle: %s', name );
 		b = bundle; // parent scope
 
+		if ( raw ) {
+			return writeBundle( bundle, false );
+		}
+		if ( minify ) {
+			return minifyBundle( bundle );
+		}
+		// NOTE: we assume that: if we are supposed to neither write a "raw" bundle to file nor minify a generated bundle, then the generated bundle was minified during generation.
+		writeBundle( bundle, true );
+	}
+
+	/**
+	* Minifies a bundle and writes the bundle to file.
+	*
+	* @private
+	* @param {(string|Buffer)} bundle - bundle to minify
+	*/
+	function minifyBundle( bundle ) {
+		debug( 'Minifying...' );
+		bundle = uglify.minify( bundle.toString() );
+		debug( 'Finished minifying bundle: %s', name );
+		debug( 'Minification errors: %s', ( bundle.error ) ? bundle.error : '(none)' );
+		writeBundle( bundle.code, true );
+	}
+
+	/**
+	* Writes a bundle to file.
+	*
+	* @private
+	* @param {(string|Buffer)} bundle - bundle to write to file
+	* @param {boolean} isMinified - boolean indicating whether a bundle is minified
+	* @returns {void}
+	*/
+	function writeBundle( bundle, isMinified ) {
+		var fpath;
+		if ( isMinified ) {
+			fpath = join( dir, name+'.min.js' );
+			debug( 'Writing minified bundle to file: %s', fpath );
+			return writeFile( fpath, bundle, onWriteMinify );
+		}
 		fpath = join( dir, name+'.js' );
 		debug( 'Writing bundle to file: %s', fpath );
-		writeFile( fpath, b, onWrite );
+		writeFile( fpath, bundle, onWrite );
 	}
 
 	/**
-	* Callback invoked upon writing a bundle to file.
+	* Callback invoked upon writing an un-minified bundle to file.
 	*
 	* @private
 	* @param {Error} [error] - error object
 	* @returns {void}
 	*/
 	function onWrite( error ) {
-		var bundle;
 		var fpath;
 		if ( error ) {
 			debug( 'Encountered an error when writing bundle to file: %s', error.message );
 			return done( error );
 		}
 		debug( 'Finished writing bundle `%s` to file.', name );
-		if ( !minify ) {
-			return done();
+		if ( minify ) {
+			return minifyBundle( b );
 		}
-		debug( 'Minifying...' );
-		bundle = uglify.minify( b.toString() );
-		debug( 'Finished minifying bundle: %s', name );
-		debug( 'Minification errors: %s', ( bundle.error ) ? bundle.error : '(none)' );
-		bundle = bundle.code;
-
-		fpath = join( dir, name+'.min.js' );
-		debug( 'Writing minified bundle to file: %s', fpath );
-		writeFile( fpath, bundle, onWriteMinify );
+		done();
 	}
 
 	/**
