use sourcemap haxe lib instead of js lib

Author: RealyUniqueName

README.md

@@ -3,7 +3,8 @@
 This library automatically transforms `haxe.CallStack.callStack()` and `haxe.CallStack.exceptionStack()` results to make them point at Haxe sources instead of generated js file.
 The only supported target is `js`.
 
-Works only in debug mode on js target. Does not affect your app if compiled without `-debug` flag or to some other target.
+Works only in debug mode or when `-D JSTACK_FORCE` is enabled on js target.
+Does not affect your app if compiled without `-debug` and `-D JSTACK_FORCE` flags or to some other target.
 
 In debug mode Haxe generates a source map, which is utilized by JStack using [source-map library](https://github.com/mozilla/source-map) (bundled with JStack and embded automatically)
 

haxelib.json

@@ -8,5 +8,7 @@
   "releasenote"  : "Fix locating entry point.",
   "classPath"    : "src",
   "contributors" : ["RealyUniqueName"],
-  "dependencies" : {}
+  "dependencies" : {
+    "sourcemap" : ""
+  }
 }

js/source-map.min.js

@@ -1,14 +1,15 @@
 package jstack;
 
-#if (js && debug)
+#if (js && (debug || JSTACK_FORCE))
 
 import haxe.CallStack;
-import haxe.Json;
+import sourcemap.SourcePos;
 import js.Lib;
 import haxe.io.Path;
 import js.Browser;
 import haxe.Http;
 
+using StringTools;
 
 /**
  * Handles source map
@@ -48,24 +49,11 @@ class JStack {
      */
     public function inject () : Void
     {
-        Tools.embedSourceMapLib();
-
-        var consumer = null;
-        if (untyped __js__("typeof window != 'undefined'")) {
-            consumer = Lib.nativeThis.sourceMap.SourceMapConsumer;
-        } else {
-            consumer = untyped module.exports.SourceMapConsumer;
-        }
-
         loadSourceMap(function (sourceMapData:String) {
-            var mapper = consumer(Json.parse(sourceMapData));
+            var mapper = new SourceMap(sourceMapData);
 
             CallStack.wrapCallSite = function (site) {
-                var pos = mapper.originalPositionFor({
-                    line: site.getLineNumber(),
-                    column: site.getColumnNumber()
-                });
-
+                var pos = mapper.originalPositionFor(site.getLineNumber(), site.getColumnNumber());
                 return new StackPos(site, pos);
             }
 
@@ -160,18 +148,15 @@ private class StackPos
     /** HX side */
     private var hx : Dynamic;
 
-    public function new (js:Dynamic, hx:Dynamic)
+    public function new (js:Dynamic, hx:SourcePos)
     {
-        if (hx.source != null) {
-            hx.source = hx.source.replace('file://', '');
-        }
         this.js = js;
         this.hx = hx;
     }
 
     public function getFunctionName () return js.getFunctionName();
-    public function getFileName () return (hx.line == null ? js.getFileName() : hx.source);
-    public function getLineNumber () return (hx.line == null ? js.getLineNumber() : hx.line);
+    public function getFileName () return (hx == null || hx.originalLine == null ? js.getFileName() : hx.source);
+    public function getLineNumber () return (hx == null || hx.originalLine == null ? js.getLineNumber() : hx.originalLine);
 
 }
 

src/jstack/JStack.hx

@@ -93,19 +93,15 @@ class Tools {
     }
 
 
-    /**
-     * Embeds source-map js library into compiled file
-     */
-    macro static public function embedSourceMapLib () : Expr
-    {
-        var dir = Context.currentPos().getPosInfos().file.directory();
-        var libFile = dir + '/' + SOURCE_MAP_LIB_FILE;
-        var libCode = libFile.getContent();
-
-        return macro untyped __js__($v{libCode});
-    }
-
-
-    public function new () {
-    }
+    // /**
+    //  * Embeds source-map js library into compiled file
+    //  */
+    // macro static public function embedSourceMapLib () : Expr
+    // {
+    //     var dir = Context.currentPos().getPosInfos().file.directory();
+    //     var libFile = dir + '/' + SOURCE_MAP_LIB_FILE;
+    //     var libCode = libFile.getContent();
+
+    //     return macro untyped __js__($v{libCode});
+    // }
 }