haxetink · back2dos · Jun 12, 2020 · Jun 2, 2020 · Jun 2, 2020 · Jun 2, 2020
diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml
@@ -17,26 +17,18 @@ jobs:
     strategy:
       matrix:
         haxe-version:
-          - 3.4.7
           - stable
           - nightly
         target: 
           - interp
           - node
           - node -D tink_core_no_error_pos
           - neko
-          - neko
           - python
           - php
           - cpp
           - js
           - java -D jvm
-        exclude:
-          # jvm only works on nightly for now
-          - haxe-version: 3.4.7
-            target: java -D jvm
-          - haxe-version: stable
-            target: java -D jvm
 
     steps:
     - uses: actions/checkout@v2

diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
-bin
+/bin
+/node_modules
diff --git a/.haxerc b/.haxerc
@@ -1,4 +1,4 @@
 {
-  "version": "4.0.0-rc.5",
+  "version": "4.1.1",
   "resolveLibs": "scoped"
 }
diff --git a/.travis.yml b/.travis.yml
@@ -6,7 +6,7 @@ stages:
   - deploy
 
 language: node_js
-node_js: 8
+node_js: 12
 
 cache:
   directories:
@@ -17,23 +17,22 @@ os:
   # - osx
 
 env:
-  - HAXE_VERSION=3.3.0-rc.1
-  - HAXE_VERSION=3.4.7
+  - HAXE_VERSION=stable
   - HAXE_VERSION=nightly
-  
+
 install:
   - npm i -g lix
   - lix install haxe $HAXE_VERSION
   - lix download
-  
+
 script:
   - lix run travix interp
   - lix run travix neko
   - lix run travix python
   - lix run travix node
   - lix run travix node -D tink_core_no_error_pos
   # - lix run travix flash
-  # - lix run travix java
+  - lix run travix java -D jvm
   # - lix run travix cs
   - lix run travix js
   - lix run travix cpp

diff --git a/.vscode/settings.json b/.vscode/settings.json
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
diff --git a/Run.bat b/Run.bat
diff --git a/dev.hxml b/dev.hxml
@@ -1,4 +1,5 @@
 -cp src
 tests.hxml
 -lib travix
--neko bin/tests.n
+-lib hxnodejs
+-js bin/tests.js
diff --git a/haxe_libraries/ansi.hxml b/haxe_libraries/ansi.hxml
@@ -1,3 +1,3 @@
+# @install: lix --silent download haxelib:ansi#1.0.0 into ansi/1.0.0/haxelib
 -D ansi=1.0.0
-# @install: lix --silent download "haxelib:/ansi#1.0.0" into ansi/1.0.0/haxelib
--cp ${HAXE_LIBCACHE}/ansi/1.0.0/haxelib/src
+-cp ${HAXESHIM_LIBCACHE}/ansi/1.0.0/haxelib/src
diff --git a/haxe_libraries/deep_equal.hxml b/haxe_libraries/deep_equal.hxml
@@ -1,3 +1,3 @@
--D deep_equal=0.3.0
-# @install: lix --silent download "gh://github.com/kevinresol/deep_equal#07aea35baef0b366e72ab7557966014da100b972" into deep_equal/0.3.0/github/07aea35baef0b366e72ab7557966014da100b972
--cp ${HAXE_LIBCACHE}/deep_equal/0.3.0/github/07aea35baef0b366e72ab7557966014da100b972/src
+# @install: lix --silent download "gh://github.com/kevinresol/deep_equal#ed53383b138038b97d1676ec6d63e47248a6df2f" into deep_equal/0.3.2/github/ed53383b138038b97d1676ec6d63e47248a6df2f
+-cp ${HAXE_LIBCACHE}/deep_equal/0.3.2/github/ed53383b138038b97d1676ec6d63e47248a6df2f/src
+-D deep_equal=0.3.2
diff --git a/haxe_libraries/hxcpp.hxml b/haxe_libraries/hxcpp.hxml
@@ -1,4 +1,5 @@
--D hxcpp=4.0.8
-# @install: lix --silent download "haxelib:/hxcpp#4.0.8" into hxcpp/4.0.8/haxelib
-# @run: haxelib run-dir hxcpp ${HAXE_LIBCACHE}/hxcpp/4.0.8/haxelib
--cp ${HAXE_LIBCACHE}/hxcpp/4.0.8/haxelib/
+# @install: lix --silent download "gh://github.com/HaxeFoundation/hxcpp#6944e4d8bc9fe8546473ac9290ee001e7d894019" into hxcpp/4.1.0/github/6944e4d8bc9fe8546473ac9290ee001e7d894019
+# @run: haxelib run-dir hxcpp ${HAXE_LIBCACHE}/hxcpp/4.1.0/github/6944e4d8bc9fe8546473ac9290ee001e7d894019
+# @post-install: cd ${HAXE_LIBCACHE}/hxcpp/4.1.0/github/6944e4d8bc9fe8546473ac9290ee001e7d894019/tools/hxcpp && haxe compile.hxml
+-cp ${HAXE_LIBCACHE}/hxcpp/4.1.0/github/6944e4d8bc9fe8546473ac9290ee001e7d894019/
+-D hxcpp=4.1.0
diff --git a/haxe_libraries/hxcs.hxml b/haxe_libraries/hxcs.hxml
@@ -1,4 +1,4 @@
--D hxcs=4.0.0-alpha
-# @install: lix --silent download "haxelib:/hxcs#4.0.0-alpha" into hxcs/4.0.0-alpha/haxelib
-# @run: haxelib run-dir hxcs ${HAXE_LIBCACHE}/hxcs/4.0.0-alpha/haxelib
--cp ${HAXE_LIBCACHE}/hxcs/4.0.0-alpha/haxelib/
+# @install: lix --silent download "haxelib:/hxcs#3.4.0" into hxcs/3.4.0/haxelib
+# @run: haxelib run-dir hxcs ${HAXE_LIBCACHE}/hxcs/3.4.0/haxelib
+-cp ${HAXE_LIBCACHE}/hxcs/3.4.0/haxelib/
+-D hxcs=3.4.0
diff --git a/haxe_libraries/hxjava.hxml b/haxe_libraries/hxjava.hxml
@@ -1,5 +1,5 @@
--D hxjava=4.0.0-alpha
-# @install: lix --silent download "haxelib:/hxjava#4.0.0-alpha" into hxjava/4.0.0-alpha/haxelib
-# @run: haxelib run-dir hxjava ${HAXE_LIBCACHE}/hxjava/4.0.0-alpha/haxelib
--cp ${HAXE_LIBCACHE}/hxjava/4.0.0-alpha/haxelib/
--java-lib lib/hxjava-std.jar
+# @install: lix --silent download "haxelib:/hxjava#3.2.0" into hxjava/3.2.0/haxelib
+# @run: haxelib run-dir hxjava ${HAXE_LIBCACHE}/hxjava/3.2.0/haxelib
+-cp ${HAXE_LIBCACHE}/hxjava/3.2.0/haxelib/
+-D hxjava=3.2.0
+-java-lib lib/hxjava-std.jar
diff --git a/haxe_libraries/hxnodejs.hxml b/haxe_libraries/hxnodejs.hxml
@@ -1,6 +1,7 @@
--D hxnodejs=10.0.0
-# @install: lix --silent download "haxelib:/hxnodejs#10.0.0" into hxnodejs/10.0.0/haxelib
--cp ${HAXE_LIBCACHE}/hxnodejs/10.0.0/haxelib/src
+# @install: lix --silent download "haxelib:/hxnodejs#12.1.0" into hxnodejs/12.1.0/haxelib
+-cp ${HAXE_LIBCACHE}/hxnodejs/12.1.0/haxelib/src
+-D hxnodejs=12.1.0
 --macro allowPackage('sys')
 # should behave like other target defines and not be defined in macro context
 --macro define('nodejs')
+--macro _internal.SuppressDeprecated.run()
diff --git a/haxe_libraries/tink_chunk.hxml b/haxe_libraries/tink_chunk.hxml
@@ -1,3 +1,3 @@
--D tink_chunk=0.3.0
-# @install: lix --silent download "haxelib:/tink_chunk#0.3.0" into tink_chunk/0.3.0/haxelib
--cp ${HAXE_LIBCACHE}/tink_chunk/0.3.0/haxelib/src
+# @install: lix --silent download "haxelib:/tink_chunk#0.3.1" into tink_chunk/0.3.1/haxelib
+-cp ${HAXE_LIBCACHE}/tink_chunk/0.3.1/haxelib/src
+-D tink_chunk=0.3.1
diff --git a/haxe_libraries/tink_cli.hxml b/haxe_libraries/tink_cli.hxml
@@ -1,8 +1,8 @@
--D tink_cli=0.4.1
-# @install: lix --silent download "haxelib:/tink_cli#0.4.1" into tink_cli/0.4.1/haxelib
+# @install: lix --silent download "haxelib:/tink_cli#0.5.1" into tink_cli/0.5.1/haxelib
 -lib tink_io
 -lib tink_macro
 -lib tink_stringly
--cp ${HAXE_LIBCACHE}/tink_cli/0.4.1/haxelib/src
+-cp ${HAXE_LIBCACHE}/tink_cli/0.5.1/haxelib/src
+-D tink_cli=0.5.1
 # Make sure docs are generated
 -D use-rtti-doc
diff --git a/haxe_libraries/tink_io.hxml b/haxe_libraries/tink_io.hxml
@@ -1,5 +1,5 @@
--D tink_io=0.7.0
-# @install: lix --silent download "haxelib:/tink_io#0.7.0" into tink_io/0.7.0/haxelib
+# @install: lix --silent download "haxelib:/tink_io#0.8.0" into tink_io/0.8.0/haxelib
 -lib tink_chunk
 -lib tink_streams
--cp ${HAXE_LIBCACHE}/tink_io/0.7.0/haxelib/src
+-cp ${HAXE_LIBCACHE}/tink_io/0.8.0/haxelib/src
+-D tink_io=0.8.0
diff --git a/haxe_libraries/tink_macro.hxml b/haxe_libraries/tink_macro.hxml
@@ -1,4 +1,4 @@
--D tink_macro=0.18.0
-# @install: lix --silent download "haxelib:/tink_macro#0.18.0" into tink_macro/0.18.0/haxelib
+# @install: lix --silent download "haxelib:/tink_macro#0.19.1" into tink_macro/0.19.1/haxelib
 -lib tink_core
--cp ${HAXE_LIBCACHE}/tink_macro/0.18.0/haxelib/src
+-cp ${HAXE_LIBCACHE}/tink_macro/0.19.1/haxelib/src
+-D tink_macro=0.19.1
diff --git a/haxe_libraries/tink_priority.hxml b/haxe_libraries/tink_priority.hxml
@@ -1,3 +1,3 @@
+# @install: lix --silent download haxelib:tink_priority#0.1.3 into tink_priority/0.1.3/haxelib
 -D tink_priority=0.1.3
-# @install: lix --silent download "haxelib:/tink_priority#0.1.3" into tink_priority/0.1.3/haxelib
--cp ${HAXE_LIBCACHE}/tink_priority/0.1.3/haxelib/src
+-cp ${HAXESHIM_LIBCACHE}/tink_priority/0.1.3/haxelib/src
diff --git a/haxe_libraries/tink_streams.hxml b/haxe_libraries/tink_streams.hxml
@@ -1,6 +1,6 @@
--D tink_streams=0.3.2
-# @install: lix --silent download "haxelib:/tink_streams#0.3.2" into tink_streams/0.3.2/haxelib
+# @install: lix --silent download "haxelib:/tink_streams#0.3.3" into tink_streams/0.3.3/haxelib
 -lib tink_core
--cp ${HAXE_LIBCACHE}/tink_streams/0.3.2/haxelib/src
+-cp ${HAXE_LIBCACHE}/tink_streams/0.3.3/haxelib/src
+-D tink_streams=0.3.3
 # temp for development, delete this file when pure branch merged
 -D pure
diff --git a/haxe_libraries/tink_stringly.hxml b/haxe_libraries/tink_stringly.hxml
@@ -1,4 +1,4 @@
--D tink_stringly=0.3.1
-# @install: lix --silent download "haxelib:/tink_stringly#0.3.1" into tink_stringly/0.3.1/haxelib
+# @install: lix --silent download "haxelib:/tink_stringly#0.4.0" into tink_stringly/0.4.0/haxelib
 -lib tink_core
--cp ${HAXE_LIBCACHE}/tink_stringly/0.3.1/haxelib/src
+-cp ${HAXE_LIBCACHE}/tink_stringly/0.4.0/haxelib/src
+-D tink_stringly=0.4.0
diff --git a/haxe_libraries/tink_syntaxhub.hxml b/haxe_libraries/tink_syntaxhub.hxml
@@ -1,6 +1,6 @@
+# @install: lix --silent download https://github.com/haxetink/tink_syntaxhub/archive/b8a7e51a48c002cbeedb873f6cec177dbec9b8fd.tar.gz into tink_syntaxhub/0.3.6/github/b8a7e51a48c002cbeedb873f6cec177dbec9b8fd
 -D tink_syntaxhub=0.3.6
-# @install: lix --silent download "gh://github.com/haxetink/tink_syntaxhub#cfc78672e72a2a557bd383332525e17eb9802f79" into tink_syntaxhub/0.3.6/github/cfc78672e72a2a557bd383332525e17eb9802f79
+-cp ${HAXESHIM_LIBCACHE}/tink_syntaxhub/0.3.6/github/b8a7e51a48c002cbeedb873f6cec177dbec9b8fd/src
+--macro tink.SyntaxHub.use()
 -lib tink_priority
--lib tink_macro
--cp ${HAXE_LIBCACHE}/tink_syntaxhub/0.3.6/github/cfc78672e72a2a557bd383332525e17eb9802f79/src
---macro tink.SyntaxHub.use()
+-lib tink_macro
diff --git a/haxe_libraries/tink_testrunner.hxml b/haxe_libraries/tink_testrunner.hxml
@@ -1,6 +1,6 @@
--D tink_testrunner=0.7.2
-# @install: lix --silent download "gh://github.com/haxetink/tink_testrunner#5066b09848994f08c829ccecb6cfe0a46d157be5" into tink_testrunner/0.7.2/github/5066b09848994f08c829ccecb6cfe0a46d157be5
+-D tink_testrunner=0.7.1
+# @install: lix --silent download "gh://github.com/haxetink/tink_testrunner#1928e3a72a4ae2d69b3a38350a6e1bdd89bdead9" into tink_testrunner/0.7.1/github/1928e3a72a4ae2d69b3a38350a6e1bdd89bdead9
 -lib ansi
 -lib tink_macro
 -lib tink_streams
--cp ${HAXE_LIBCACHE}/tink_testrunner/0.7.2/github/5066b09848994f08c829ccecb6cfe0a46d157be5/src
+-cp ${HAXE_LIBCACHE}/tink_testrunner/0.7.1/github/1928e3a72a4ae2d69b3a38350a6e1bdd89bdead9/src
diff --git a/haxe_libraries/tink_unittest.hxml b/haxe_libraries/tink_unittest.hxml
@@ -1,6 +1,6 @@
--D tink_unittest=0.6.2
-# @install: lix --silent download "gh://github.com/haxetink/tink_unittest#b9df9a25bdac55d81e48d1e91d1aece419dfb9c9" into tink_unittest/0.6.2/github/b9df9a25bdac55d81e48d1e91d1aece419dfb9c9
+# @install: lix --silent download "gh://github.com/haxetink/tink_unittest#90ef98109c82f4d4a1ae458efc623465533c692b" into tink_unittest/0.7.0/github/90ef98109c82f4d4a1ae458efc623465533c692b
 -lib tink_syntaxhub
 -lib tink_testrunner
--cp ${HAXE_LIBCACHE}/tink_unittest/0.6.2/github/b9df9a25bdac55d81e48d1e91d1aece419dfb9c9/src
+-cp ${HAXE_LIBCACHE}/tink_unittest/0.7.0/github/90ef98109c82f4d4a1ae458efc623465533c692b/src
+-D tink_unittest=0.7.0
 --macro tink.unit.AssertionBufferInjector.use()
diff --git a/haxe_libraries/travix.hxml b/haxe_libraries/travix.hxml
@@ -1,6 +1,7 @@
--D travix=0.13.1
-# @install: lix --silent download "haxelib:/travix#0.13.1" into travix/0.13.1/haxelib
-# @post-install: cd ${HAXE_LIBCACHE}/travix/0.13.1/haxelib && haxe -cp src --run travix.PostDownload
-# @run: haxelib run-dir travix ${HAXE_LIBCACHE}/travix/0.13.1/haxelib
+# @install: lix --silent download "haxelib:/travix#0.14.1" into travix/0.14.1/haxelib
+# @post-install: cd ${HAXE_LIBCACHE}/travix/0.14.1/haxelib && haxe -cp src --run travix.PostDownload
+# @run: haxelib run-dir travix ${HAXE_LIBCACHE}/travix/0.14.1/haxelib
 -lib tink_cli
--cp ${HAXE_LIBCACHE}/travix/0.13.1/haxelib/src
+-cp ${HAXE_LIBCACHE}/travix/0.14.1/haxelib/src
+-D travix=0.14.1
+--macro travix.Macro.setup()
diff --git a/haxelib.json b/haxelib.json
@@ -6,8 +6,8 @@
 	"contributors": [
 		"back2dos"
 	],
-	"version": "1.26.0",
-	"releasenote": "Add Future.isFuture and Progress. Plus some bug fixes",
+	"version": "2.0.0-alpha",
+	"releasenote": "Improve JS interop. Use latest Haxe 4. Add Lazy.NULL.",
 	"tags": [
 		"tink",
 		"cross",

diff --git a/src/tink/CoreApi.hx b/src/tink/CoreApi.hx
@@ -13,7 +13,7 @@ typedef FutureTrigger<T> = tink.core.Future.FutureTrigger<T>;
 typedef PromiseTrigger<T> = tink.core.Promise.PromiseTrigger<T>;
 
 typedef Outcome<D, F> = tink.core.Outcome<D, F>;
-typedef OutcomeTools = tink.core.Outcome.OutcomeTools;
+@:noCompletion typedef OutcomeTools = tink.core.Outcome.OutcomeTools;
 
 typedef Either<L, R> = tink.core.Either<L, R>;
 typedef Option<T> = tink.core.Option<T>;

diff --git a/src/tink/core/Annex.hx b/src/tink/core/Annex.hx
@@ -1,26 +1,23 @@
 package tink.core;
 
-private typedef AnnexableTo<T> = 
-  #if (haxe_ver >= 3.4)
-    haxe.Constraints.Constructible<T->Void>
-  #else
-    { function new(targeT:T):Void; }
-  #end
+private typedef AnnexableTo<T> = haxe.Constraints.Constructible<T->Void>
 
 #if (java || cs) @:dce #end // this make sure the generic method is not genrated
 class Annex<Target> {
-  
+
   var target:Target;
-  var registry:Map<Dynamic, Dynamic>;
-  
+  var registry:Map<{}, Dynamic>;
+
   public function new(target:Target) {
   	this.target = target;
     this.registry = cast new haxe.ds.ObjectMap();
   }
   #if (java || cs) @:extern #end
-  @:generic public inline function get<A:AnnexableTo<Target>>(c:Class<A>):A 
+  @:generic public inline function get<A:AnnexableTo<Target>>(c:Class<A>):A {
+    var c:{} = cast c;
     return switch registry[c] {
       case null: registry[c] = new A(target);
    	  case v: v;
-  	}
+    }
+  }
 }
diff --git a/src/tink/core/Any.hx b/src/tink/core/Any.hx
@@ -1,9 +1,3 @@
 package tink.core;
 
-#if (haxe_ver >= 3.4)
-typedef Any = std.Any;
-#else
-abstract Any(Dynamic) from Dynamic {
-  @:noCompletion @:to inline function __promote<A>():A return this;
-}
-#end
+typedef Any = std.Any;