[js] more accurate handling of a call stack (fixes #13)

Author: RealyUniqueName

format/js/haxe/CallStack.hx

@@ -1,5 +1,11 @@
 package haxe;
 
+#if js
+import jstack.js.JStack;
+#end
+
+using StringTools;
+
 enum StackItem {
 	CFunction;
 	Module( m : String );
@@ -75,22 +81,35 @@ class CallStack {
 		return jstack.Format.toString(stack);
 	}
 
-	private static function makeStack(s #if cs : cs.system.diagnostics.StackTrace #elseif hl : hl.NativeArray<hl.Bytes> #end) {
+	static var rie10 = ~/at (?:([A-Za-z0-9_. ]+)(?:.*?)\()?(.+?):([0-9]+):([0-9]+)(?:\))?$/;
+	private static function makeStack(s:Dynamic):Array<StackItem> {
 		if (s == null) {
 			return [];
 		} else if ((untyped __js__("typeof"))(s) == "string") {
 			// Return the raw lines in browsers that don't support prepareStackTrace
 			var stack : Array<String> = s.split("\n");
 			if( stack[0] == "Error" ) stack.shift();
 			var m = [];
-			var rie10 = ~/^   at ([A-Za-z0-9_. ]+) \(([^)]+):([0-9]+):([0-9]+)\)$/;
 			for( line in stack ) {
 				if( rie10.match(line) ) {
-					var path = rie10.matched(1).split(".");
-					var meth = path.pop();
+					var item = null;
+					var symbol = rie10.matched(1);
+					if(symbol != null) {
+						var path = rie10.matched(1).trim().split(".");
+						var meth = path.pop();
+						item = meth == "Anonymous function" ? LocalFunction() : meth == "Global code" ? null : Method(path.join("."),meth);
+					}
 					var file = rie10.matched(2);
 					var line = Std.parseInt(rie10.matched(3));
-					m.push(FilePos( meth == "Anonymous function" ? LocalFunction() : meth == "Global code" ? null : Method(path.join("."),meth), file, line ));
+					var column = Std.parseInt(rie10.matched(4));
+					var pos:StackPos = wrapCallSite({
+						getFileName: function() return file,
+						getLineNumber: function() return line,
+						getColumnNumber: function() return column
+					});
+					file = pos.getFileName();
+					line = pos.getLineNumber();
+					m.push(FilePos( item, file, line ));
 				} else
 					m.push(Module(StringTools.trim(line))); // A little weird, but better than nothing
 			}

src/jstack/Tools.hx

@@ -29,14 +29,12 @@ class Tools {
         if (Context.defined('display') || !(Context.defined('debug') || Context.defined('JSTACK_FORCE'))) return;
         if (!Context.defined('js') && !Context.defined('php7') && !Context.defined('JSTACK_HAXE_DEV')) return;
 
-        if (Context.defined('JSTACK_FORMAT')) {
-            if(Context.defined('js')) {
-                Compiler.addClassPath(getJstackRootDir() + 'format/js');
-            } else if(Context.defined('php')) {
-                Compiler.addClassPath(getJstackRootDir() + 'format/php7');
-            } else {
-                throw 'Unexpected behavior';
-            }
+        if(Context.defined('js')) {
+            Compiler.addClassPath(getJstackRootDir() + 'format/js');
+        } else if(Context.defined('php')) {
+            Compiler.addClassPath(getJstackRootDir() + 'format/php7');
+        } else {
+            throw 'Unexpected behavior';
         }
 
         addInjectMetaToEntryPoint();

src/jstack/js/JStack.hx

@@ -18,6 +18,12 @@ class JStack {
     static var mapper : SourceMap;
     /** User-defined callback which will be invoked when sourceMap is loaded */
     static var onReadyCallback : Void->Void;
+    /**
+     * Full name of currently being executed js file.
+     * If JStack fails to resolve current file name, then `currentFile` will be an empty string.
+     */
+    static var currentFile(get,never):String;
+    static var _currentFile:String = null;
 
     /** Native stack lines like: at /home/alex/Work/HaXe/jstack/build/js/test.js:729:22 */
     static var stackFile = ~/^at (.+?js):([0-9]+):([0-9]+)$/;
@@ -70,7 +76,10 @@ class JStack {
             mapper = new SourceMap(sourceMapData);
 
             CallStack.wrapCallSite = function (site) {
-                var pos = mapper.originalPositionFor(site.getLineNumber(), site.getColumnNumber());
+                var pos = null;
+                if(site.getFileName() == currentFile) {
+                    pos = mapper.originalPositionFor(site.getLineNumber(), site.getColumnNumber());
+                }
                 return new StackPos(site, pos);
             }
 
@@ -176,7 +185,7 @@ class JStack {
         switch (item) {
             case Module(line) if (stackFile.match(line)):
                 var file = stackFile.matched(1);
-                if (file != currentFile()) return item;
+                if (file != currentFile) return item;
 
                 var line = Std.parseInt(stackFile.matched(2));
                 var column = Std.parseInt(stackFile.matched(3));
@@ -186,7 +195,7 @@ class JStack {
 
             case Module(line) if (stackFunctionFile.match(line)):
                 var file = stackFunctionFile.matched(2);
-                if (file != currentFile()) return item;
+                if (file != currentFile) return item;
 
                 var line = Std.parseInt(stackFunctionFile.matched(3));
                 var column = Std.parseInt(stackFunctionFile.matched(4));
@@ -206,14 +215,20 @@ class JStack {
         }
     }
 
-    /**
-        Returns full name of currently being executed js file.
-    **/
-    static function currentFile () : Null<String> {
-        if (isNode()) {
-            return untyped __js__('__filename');
+    static function get_currentFile () : String {
+        if(_currentFile == null) {
+            if (isNode()) {
+                _currentFile = untyped __js__('__filename');
+            } else {
+                var erFile = ~/\((.+?):([0-9]+):([0-9]+)\)$/;
+                if(erFile.match(new Error().stack)) {
+                    _currentFile = erFile.matched(1);
+                } else {
+                    _currentFile = '';
+                }
+            }
         }
-        return null;
+        return _currentFile;
     }
 }
 
@@ -234,7 +249,7 @@ class StackPos {
     }
 
     public function getFunctionName () return js.getFunctionName();
-    public function getFileName () return (hx == null || hx.originalLine == null ? js.getFileName() : hx.source);
+    public function getFileName () return (hx == null || hx.source == null ? js.getFileName() : hx.source);
     public function getLineNumber () return (hx == null || hx.originalLine == null ? js.getLineNumber() : hx.originalLine);
 
 }