forgotten commit

Author: RealyUniqueName

.gitignore

@@ -1,6 +1,7 @@
 build/*
 build.hxml
 *.iml
+cSpell.json
 .idea
 lab
 .vscode

extraParams.hxml

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

haxelib.json

@@ -4,8 +4,8 @@
   "license"      : "MIT",
   "tags"         : ["js", "stack", "callstack", "stacktrace"],
   "description"  : "Friendly stack traces for JS target. Makes haxe.CallStack point to haxe sources.",
-  "version"      : "1.0.0",
-  "releasenote"  : "jstack.JStack.onReady() in automatically injected now.",
+  "version"      : "1.0.1",
+  "releasenote"  : "Fix locating entry point.",
   "classPath"    : "src",
   "contributors" : ["RealyUniqueName"],
   "dependencies" : {}

src/jstack/JStack.hx

@@ -26,7 +26,7 @@ class JStack {
 
     /**
      * Invoke `callback` when source map is loaded.
-     * A call to this method is autonmatically injected in `static main()` function of your app. 
+     * A call to this method is automatically 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

src/jstack/Tools.hx

@@ -23,10 +23,12 @@ class Tools {
     /**
         Inject `json.JStack.onReady()` into app entry point, so that app will not start untill source map is ready.
     **/
-    static public function addInjectmetaToMain() : Void 
+    static public function addInjectMetaToMain() : Void
     {
-        if (Compiler.getDefine('display') != null) return;
-        if (Compiler.getDefine('debug') == null || Compiler.getDefine('js') == null) return;
+        #if (display || !debug)
+            return;
+        #end
+        if (Context.definedValue('js') == null) return;
 
         var main : String = null;
         var args = Sys.args();
@@ -37,15 +39,15 @@ class Tools {
             }
         }
         if (main == null) {
-            Context.warning('Failed to find entry point. Did you specify `-main` directive?', Context.currentPos());
-            return; 
+            Context.warning('JStack: Failed to find entry point. Did you specify `-main` directive?', (macro {}).pos);
+            return;
         }
-        
+
         Compiler.addMetadata('@:build(jstack.Tools.injectInMain())', main);
     }
 #end
 
-    macro static public function injectInMain() : Array<Field> 
+    macro static public function injectInMain() : Array<Field>
     {
         var fields = Context.getBuildFields();
         var injected = false;
@@ -56,13 +58,14 @@ class Tools {
             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);
+                    injected = true;
+                case _:
+                    Context.error('JStack: Failed to inject JStack in `main` function.', field.pos);
             }
         }
 
         if (!injected) {
-            Context.error('Failed to find static function main.', Context.currentPos());
+            Context.error('JStack: Failed to find static function main.', (macro {}).pos);
         }
 
         return fields;

test.hxml

@@ -0,0 +1,8 @@
+-cp src
+-cp test
+-main Test
+-debug
+
+extraParams.hxml
+
+-js build/test.js

test/Test.hx

@@ -0,0 +1,31 @@
+package;
+
+import haxe.io.Path;
+import haxe.PosInfos;
+import haxe.CallStack;
+
+class Test {
+	static var pos:PosInfos;
+
+	static public function main() {
+		try {
+			throwException();
+		} catch(e:Dynamic) {
+			var fileName = new Path(pos.fileName).file;
+			for(stackItem in CallStack.exceptionStack()) {
+				switch(stackItem) {
+					case FilePos(_, file, line) if(line == pos.lineNumber && fileName == new Path(file).file):
+						trace('Test passed');
+						return;
+					case _:
+				}
+			}
+		}
+		throw "Test FAILED";
+	}
+
+	static function throwException(?pos:PosInfos) {
+		Test.pos = pos;
+		throw 'wtf';
+	}
+}