Bump version.

Fix weird partial module resolution

.github/workflows/ci.yml

@@ -13,7 +13,6 @@ jobs:
     strategy:
       matrix:
         haxe-version:
-          - "3.4.7"
           - stable
           - nightly
         target: 

haxe_libraries/tink_core.hxml

@@ -1,3 +1,3 @@
-# @install: lix --silent download "gh://github.com/haxetink/tink_core#abee932c4e724517090238b6527eac28874c0354" into tink_core/1.27.1/github/abee932c4e724517090238b6527eac28874c0354
+# @install: lix --silent download "haxelib:/tink_core#2.1.0" into tink_core/2.1.0/haxelib
--cp ${HAXE_LIBCACHE}/tink_core/1.27.1/github/abee932c4e724517090238b6527eac28874c0354/src
+-cp ${HAXE_LIBCACHE}/tink_core/2.1.0/haxelib/src
--D tink_core=1.27.1
+-D tink_core=2.1.0

haxe_libraries/travix.hxml

@@ -1,7 +1,7 @@
-# @install: lix --silent download "gh://github.com/back2dos/travix#354c2b2a82cc3b03e2f87cc1b6f0ddc0a6a5c133" into travix/0.15.0/github/354c2b2a82cc3b03e2f87cc1b6f0ddc0a6a5c133
+# @install: lix --silent download "haxelib:/travix#0.15.3" into travix/0.15.3/haxelib
-# @post-install: cd ${HAXE_LIBCACHE}/travix/0.15.0/github/354c2b2a82cc3b03e2f87cc1b6f0ddc0a6a5c133 && haxe -cp src --run travix.PostDownload
+# @post-install: cd ${HAXE_LIBCACHE}/travix/0.15.3/haxelib && haxe -cp src --run travix.PostDownload
-# @run: haxelib run-dir travix ${HAXE_LIBCACHE}/travix/0.15.0/github/354c2b2a82cc3b03e2f87cc1b6f0ddc0a6a5c133
+# @run: haxelib run-dir travix "${HAXE_LIBCACHE}/travix/0.15.3/haxelib"
 -lib tink_cli
--cp ${HAXE_LIBCACHE}/travix/0.15.0/github/354c2b2a82cc3b03e2f87cc1b6f0ddc0a6a5c133/src
+-cp ${HAXE_LIBCACHE}/travix/0.15.3/haxelib/src
--D travix=0.15.0
+-D travix=0.15.3
 --macro travix.Macro.setup()

haxelib.json

@@ -9,8 +9,8 @@
 	"contributors": [
 		"back2dos"
 	],
-	"version": "0.24.0",
+	"version": "1.0.4",
-	"releasenote": "Add eval to Expr/TypedExpr.",
+	"releasenote": "Haxe 5 compat",
 	"tags": [
 		"tink",
 		"macro",

src/tink/MacroApi.hx

@@ -21,7 +21,7 @@ typedef TypeMap<T> = tink.macro.TypeMap<T>;
 
 //TODO: consider adding stuff from haxe.macro.Expr here
 typedef MacroOutcome<D, F> = tink.core.Outcome<D, F>;
-typedef MacroOutcomeTools = tink.OutcomeTools;
+typedef MacroOutcomeTools = tink.core.Outcome.OutcomeTools;
 
 typedef Member = tink.macro.Member;
 typedef Constructor = tink.macro.Constructor;
@@ -33,15 +33,22 @@ class MacroApi {
 
   static var MAIN_CANDIDATES = ['-main', '-x', '--run'];
   static public function getMainClass():Option<String> {
-    var args = Sys.args();
+    #if (haxe_ver >= 4.3)
-
+      return switch haxe.macro.Compiler.getConfiguration().mainClass {
-    for (c in MAIN_CANDIDATES)
+        case null: None;
-      switch args.indexOf(c) {
+        case p: Some(p.pack.concat([p.name]).join('.'));
-        case -1:
-        case v: return Some(args[v+1]);
       }
+    #else
+      var args = Sys.args();
 
-    return None;
+      for (c in MAIN_CANDIDATES)
+        switch args.indexOf(c) {
+          case -1:
+          case v: return Some(args[v+1]);
+        }
+
+      return None;
+    #end
   }
 
   @:persistent static var idCounter = 0;

src/tink/macro/Exprs.hx

@@ -357,7 +357,7 @@ class Exprs {
           expr = [EVars(locals).at(expr.pos), expr].toMBlock(expr.pos);
         Success(Context.typeof(expr));
       }
-      catch (e:haxe.macro.Error) {
+      catch (e:haxe.macro.Expr.Error) {
         e.pos.makeFailure(e.message);
       }
       catch (e:Dynamic) {

src/tink/macro/Member.hx

@@ -98,6 +98,15 @@ abstract Member(Field) from Field to Field {
     return 
       if (this.meta == null) [];
       else [for (tag in this.meta) if (tag.name == name) tag];
+
+  public function hasMeta(name) 
+    return switch this.meta {
+      case null | []: false;
+      case meta:
+        for (m in meta)
+          if (m.name == name) return true;
+        false;
+    }
   
   public inline function asField():Field return this;
   public function publish() 

src/tink/macro/Types.hx

@@ -214,7 +214,7 @@ class Types {
   static public function deduceCommonType(types:Array<Type>):Outcome<Type, Error> {
     var exprs = types.map(function(t) {
       var ct = t.toComplex();
-      return macro (null:$ct);
+      return macro (cast null:$ct);
     });
 
     return switch (macro $a{exprs}).typeof() {

tests/Base.hx

@@ -29,7 +29,9 @@ abstract PhysicalType<T>(Either<Class<T>, Enum<T>>) {
 }
 //TODO: this helper should go somewhere
 class Base extends TestCase {
-  
+  function stringCompare<A>(v1:A, v2:A, ?pos) 
+    assertEquals(Std.string(v1), Std.string(v2), pos);
+
   function fail(msg:String, ?c : PosInfos) {
     currentTest.done = true;
     currentTest.success = false;

tests/Exprs.hx

@@ -21,8 +21,9 @@ class Exprs extends Base {
     var expr = macro (untyped {foo:[{bar:234},'bar']});
     var str = Std.string(untyped {foo:[{bar:234},'bar']});
     assertEquals(Std.string(expr.eval()), Std.string(untyped {foo:[{bar:234},'bar']}));
-    assertEquals(Std.string(Context.typeExpr(expr).eval()), Std.string(untyped {foo:[{bar:234},'bar']}));
 
+    // This doesn't work in Haxe 4.3, which is correct, because typeExpr types an expression into target context, rather than macro context
+    // assertEquals(Std.string(Context.typeExpr(expr).eval()), Std.string(untyped {foo:[{bar:234},'bar']}));
   }
   function testGet() {
     assertEquals('foo', (macro foo).getIdent().sure());

tests/Positions.hx

@@ -6,8 +6,6 @@ import haxe.macro.Expr;
 using tink.MacroApi;
 
 class Positions extends Base {
-  function stringCompare<A>(v1:A, v2:A) 
-    assertEquals(Std.string(v1), Std.string(v2));
   
   function testSanitize() {
     var p:Position = null;
@@ -19,6 +17,6 @@ class Positions extends Base {
   function testBlank() {
     var p:Position = null;
     var t = p.makeBlankType();
-    stringCompare('TMono(<mono>)', cast t.toType().sure());
+    stringCompare('TMono(<mono>)', cast t.toType().sure().reduce());
   }
 }