inject jstack.JStack.onReady() automatically (fixes #3)

Author: RealyUniqueName

README.md

@@ -5,20 +5,12 @@ 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.
 
-In debug mode Haxe generates a source map, which is utilized by JStack using [source-map library](https://github.com/mozilla/source-map).
+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)
 
 ## Installation
 ```haxe
 haxelib install jstack
 ```
 
 ## Usage
-In most cases all you need to do is just add JStack to compilation with `-lib jstack` compiler flag.
-
-### Accessing call stack before exiting `static main()`
-Source map loading is an asynchronous process, so if you need to access call stack right after your app started, you have to wait until source map is loaded:
-```haxe
-jstack.JStack.onReady(function () {
-    //app start here
-});
-```
+Just add JStack to compilation with `-lib jstack` compiler flag.

extraParams.hxml

@@ -1,2 +1,3 @@
---macro include('jstack')
---macro keep('jstack.JStack')
+--macro include('jstack.JStack')
+--macro keep('jstack.JStack')
+--macro jstack.Tools.addInjectmetaToMain()

haxelib.json

@@ -4,11 +4,9 @@
   "license"      : "MIT",
   "tags"         : ["js", "stack", "callstack", "stacktrace"],
   "description"  : "Friendly stack traces for JS target. Makes haxe.CallStack point to haxe sources.",
-  "version"      : "0.1.1",
-  "releasenote"  : "Public API stubs for not supported targets. ",
+  "version"      : "1.0.0",
+  "releasenote"  : "jstack.JStack.onReady() in automatically injected now.",
   "classPath"    : "src",
   "contributors" : ["RealyUniqueName"],
-  "dependencies" : {
-
-  }
+  "dependencies" : {}
 }

src/jstack/JStack.hx

@@ -25,7 +25,9 @@ class JStack {
 
 
     /**
-     * Invoke `callback` when source map is loaded
+     * Invoke `callback` when source map is loaded.
+     * A call to this method is autonmatically injected in `static main()` function of your app. 
+     * You don't need to use this method manually.
      */
     static public function onReady (callback:Void->Void) : Void
     {
@@ -173,12 +175,4 @@ private class StackPos
 
 }
 
-#else
-
-/**
- * Public API stub for cases when jstack should not work.
- */
-class JStack {
-    static public function onReady (callback:Void->Void) haxe.Timer.delay(callback, 0);
-}
 #end

src/jstack/Tools.hx

@@ -17,8 +17,56 @@ using haxe.io.Path;
  * Macro tools
  */
 class Tools {
+#if macro
     static private inline var SOURCE_MAP_LIB_FILE = '../../js/source-map.min.js';
 
+    /**
+        Inject `json.JStack.onReady()` into app entry point, so that app will not start untill source map is ready.
+    **/
+    static public function addInjectmetaToMain() : Void 
+    {
+        if (Compiler.getDefine('display') != null) return;
+        if (Compiler.getDefine('debug') == null || Compiler.getDefine('js') == null) return;
+
+        var main : String = null;
+        var args = Sys.args();
+        for (i in 0...args.length) {
+            if(args[i] == '-main') {
+                main = args[i + 1];
+                break;
+            }
+        }
+        if (main == null) {
+            Context.warning('Failed to find entry point. Did you specify `-main` directive?', Context.currentPos());
+            return; 
+        }
+        
+        Compiler.addMetadata('@:build(jstack.Tools.injectInMain())', main);
+    }
+#end
+
+    macro static public function injectInMain() : Array<Field> 
+    {
+        var fields = Context.getBuildFields();
+        var injected = false;
+
+        for (field in fields) {
+            if (field.name != 'main') continue;
+
+            switch (field.kind) {
+                case FFun(fn):
+                    fn.expr = macro jstack.JStack.onReady(function() ${fn.expr});
+                case _: 
+                    Context.error('Failed to inject JStack in `main` function.', field.pos);
+            }
+        }
+
+        if (!injected) {
+            Context.error('Failed to find static function main.', Context.currentPos());
+        }
+
+        return fields;
+    }
 
     /**
      * Returns file name of generated output