Defer running lines until the next tick and fix load behavior

kgryte · kgryte · commit 91cf3f2d89c2 · 2019-08-16T19:39:15.000-07:00
diff --git a/lib/node_modules/@stdlib/repl/lib/commands/load.js b/lib/node_modules/@stdlib/repl/lib/commands/load.js
@@ -24,8 +24,6 @@
 
 var logger = require( 'debug' );
 var isString = require( '@stdlib/assert/is-string' ).isPrimitive;
-var noop = require( '@stdlib/utils/noop' );
-var displayPrompt = require( './../display_prompt.js' );
 
 
 // VARIABLES //
@@ -60,14 +58,38 @@ function command( repl ) {
 			repl._ostream.write( 'Error: '+err.message+'\n' );
 			return;
 		}
-		// Reset the display prompt:
-		repl._rli.write( '\n' );
-		displayPrompt( repl, false );
-
-		// FIXME: fix error handling here (e.g., file does not exist, etc)
+		repl.once( 'drain', onDrain );
+
+		/**
+		* Callback invoked upon a 'drain' event.
+		*
+		* @private
+		*/
+		function onDrain() {
+			try {
+				debug( 'Loading a file...' );
+				repl.load( fpath, clbk );
+			} catch ( error ) {
+				debug( 'Error: %s', error.message );
+
+				// TODO: determine whether we need to perform ANSI escape magic here! (the error message gets printed on the wrong line!)
+				repl._ostream.write( 'Error: '+error.message+'\n' );
+			}
+		}
 
-		debug( 'Loading a file...' );
-		repl.load( fpath, noop );
+		/**
+		* Callback invoked upon loading a file.
+		*
+		* @private
+		* @param {Error} [error] - error object
+		*/
+		function clbk( error ) {
+			if ( error ) {
+				debug( 'Error: %s', error.message );
+				return;
+			}
+			debug( 'Successfully loaded file.' );
+		}
 	}
 }
 
diff --git a/lib/node_modules/@stdlib/repl/lib/main.js b/lib/node_modules/@stdlib/repl/lib/main.js
@@ -609,7 +609,9 @@ setNonEnumerableReadOnly( REPL.prototype, 'load', function load( fpath, clbk ) {
 	// Forward each line to the REPL readline interface in order to mimic user input...
 	len = file.length;
 	i = -1;
-	return next();
+
+	// TODO: replace with polyfill
+	process.nextTick( next );
 
 	/**
 	* Callback invoked after draining the command queue.
