diff --git a/.haxerc b/.haxerc
index b6edbfa..b56acc5 100644
--- a/.haxerc
+++ b/.haxerc
@@ -1,4 +1,4 @@
 {
-  "version": "569e52e",
+  "version": "2dc801f",
   "resolveLibs": "scoped"
 }
\ No newline at end of file
diff --git a/haxe_libraries/hxnodejs.hxml b/haxe_libraries/hxnodejs.hxml
index 577e96a..5ba64b7 100644
--- a/haxe_libraries/hxnodejs.hxml
+++ b/haxe_libraries/hxnodejs.hxml
@@ -1,7 +1,7 @@
-# @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()
+# @install: lix --silent download "gh://github.com/HaxeFoundation/hxnodejs#c9450595b2337587bcdaeacf159019531925f25d" into hxnodejs/12.2.0/github/c9450595b2337587bcdaeacf159019531925f25d
+-cp ${HAXE_LIBCACHE}/hxnodejs/12.2.0/github/c9450595b2337587bcdaeacf159019531925f25d/src
+-D hxnodejs=12.2.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/src/haxeparser/DefinitionConverter.hx b/src/haxeparser/DefinitionConverter.hx
index d3a0f38..24628f5 100644
--- a/src/haxeparser/DefinitionConverter.hx
+++ b/src/haxeparser/DefinitionConverter.hx
@@ -62,7 +62,7 @@ class DefinitionConverter {
 		return def;
 	}
 
-	static function convertAbstract(a:Definition<haxeparser.AbstractFlag, Array<Field>>) {
+	static function convertAbstract(a:Definition<haxeparser.Data.AbstractFlag, Array<Field>>) {
 		var def = getGeneralDefinition(a);
 		var to = [];
 		var from = [];
diff --git a/src/haxeparser/HaxeParser.hx b/src/haxeparser/HaxeParser.hx
index 9e8d69b..9c2c35f 100644
--- a/src/haxeparser/HaxeParser.hx
+++ b/src/haxeparser/HaxeParser.hx
@@ -686,7 +686,7 @@ class HaxeParser extends hxparse.Parser<HaxeTokenSource, Token> implements hxpar
 		}
 	}
 
-	function parseAbstract (doc, meta, flags:Array<{c:ClassFlag, e:EnumFlag, a:haxeparser.AbstractFlag, s:StaticFlag, t:TypedefFlag, pos:Position}>, p1) {
+	function parseAbstract (doc, meta, flags:Array<{c:ClassFlag, e:EnumFlag, a:haxeparser.Data.AbstractFlag, s:StaticFlag, t:TypedefFlag, pos:Position}>, p1) {
 		return switch stream {
 			case [name = typeName(), tl = parseConstraintParams(), st = parseAbstractSubtype(), sl = parseRepeat(parseAbstractRelations)]:
 				var fl = switch stream {
@@ -708,7 +708,7 @@ class HaxeParser extends hxparse.Parser<HaxeTokenSource, Token> implements hxpar
 		}
 	}
 
-	function parseClassContent(doc, meta, flags:Array<{c:ClassFlag, e:EnumFlag, a:haxeparser.AbstractFlag, s:StaticFlag, t:TypedefFlag, pos:Position}>, n, p1) {
+	function parseClassContent(doc, meta, flags:Array<{c:ClassFlag, e:EnumFlag, a:haxeparser.Data.AbstractFlag, s:StaticFlag, t:TypedefFlag, pos:Position}>, n, p1) {
 		var name = typeName();
 		var tl = parseConstraintParams();
 		var hl = parseRepeat(parseClassHerit);
@@ -756,7 +756,7 @@ class HaxeParser extends hxparse.Parser<HaxeTokenSource, Token> implements hxpar
 							flags: c.map(function(i) return i.s),
 							data: FFun(f)
 						}), pos: punion(p1, e.pos)};
-						case [{tok:Kwd(KwdVar), pos:p1}, name = dollarIdent()]:
+					case [{tok:Kwd(KwdVar), pos:p1}, name = dollarIdent()]:
 							switch stream {
 								case [{tok:POpen}, i1 = propertyIdent(), {tok:Comma}, i2 = propertyIdent(), {tok:PClose}]:
 									var t = parseTypeOpt();
@@ -944,7 +944,7 @@ class HaxeParser extends hxparse.Parser<HaxeTokenSource, Token> implements hxpar
 		}
 	}
 
-	function parseAbstractRelations():haxeparser.AbstractFlag {
+	function parseAbstractRelations():haxeparser.Data.AbstractFlag {
 		return switch stream {
 			case [{tok:Const(CIdent("to"))}, t = parseComplexType()]: AbTo(t);
 			case [{tok:Const(CIdent("from"))}, t = parseComplexType()]: AbFrom(t);
@@ -979,7 +979,7 @@ class HaxeParser extends hxparse.Parser<HaxeTokenSource, Token> implements hxpar
 		return parseRepeat(parseClassField);
 	}
 
-	function parseCommonFlags():Array<{c:ClassFlag, e:EnumFlag, a:haxeparser.AbstractFlag, s:StaticFlag, t:TypedefFlag, pos:Position}> {
+	function parseCommonFlags():Array<{c:ClassFlag, e:EnumFlag, a:haxeparser.Data.AbstractFlag, s:StaticFlag, t:TypedefFlag, pos:Position}> {
 		return switch stream {
 			case [{tok:Kwd(KwdPrivate), pos:p}, l = parseCommonFlags()]: aunshift(l, {c:HPrivate, e:EPrivate, a:AbPrivate, s:SPrivate, t:TDPrivate, pos:p});
 			case [{tok:Kwd(KwdExtern), pos:p}, l = parseCommonFlags()]: aunshift(l, {c:HExtern, e:EExtern, a:AbExtern, s:null, t:TDExtern, pos:p});
@@ -1182,7 +1182,7 @@ class HaxeParser extends hxparse.Parser<HaxeTokenSource, Token> implements hxpar
 	}
 
 
-	function parseTypePath2(pack:Array<String>, ident) {
+	function parseTypePath2(pack:Array<String>, ident):TypePath {
 		if (isLowerIdent(ident.name)) {
 			return switch stream {
 				case [{tok:Dot}]:
@@ -2578,7 +2578,7 @@ private class Reificator{
 	}
 }
 
-function mapConstant(c:haxeparser.Constant, p:haxe.macro.Position):haxe.macro.Expr {
+function mapConstant(c:haxeparser.Data.Constant, p:Position):haxe.macro.Expr {
 	var constant:haxe.macro.Expr.Constant = switch (c) {
 		case CInt(v, s):
 			CInt(v, s);