Merge pull request #6 from Kriptel/dev

0.2.0-rc

Author: Kriptel

CHANGELOG.md

@@ -7,7 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.2.0-rc] 2024.10.25
+
 ### Fixed
+- Fixed bug with type aliases in RuleScriptedClass.
 - Typos in `README.md`.
 
 ## [0.2.0-beta] 2024.10.14

README.md

@@ -174,7 +174,7 @@ a ??= 'world';
 trace(a) // world
 ```
 
-### Rest
+# Rest
 ```haxe
 var f = function(hello:String, ...rest:Dynamic)
 {

haxelib.json

@@ -3,7 +3,7 @@
   "url" : "https://github.com/Kriptel/RuleScript",
   "license": "MIT",
   "description": "Hscript addon with script classes, imports, usings, properties, string interpolation and more.",
-  "version": "0.2.0-beta",
+  "version": "0.2.0-rc",
   "releasenote": "RuleScripted Classes, Script Properties, Rest and more.",
   "dependencies": {
       "hscript":""

rulescript/macro/RuleScriptedClass.hx

@@ -50,18 +50,21 @@ class RuleScriptedClass
 			fields.push(overrideField(field));
 		}
 
+		if (constructor.isFinal)
+			Context.error("Constructor can't be final in RuleScriptedClass", pos);
+
 		fields.push({
 			name: 'new',
 			access: [APublic],
 			kind: FFun(createConstructor(constructor, curType.meta.has(':strictScriptedConstructor'))),
-			pos: Context.currentPos()
+			pos: pos
 		});
 
 		fields.push({
 			name: '__rulescript',
 			access: [],
 			kind: FVar(macro :rulescript.RuleScript),
-			pos: Context.currentPos()
+			pos: pos
 		});
 
 		var functions = [
@@ -84,7 +87,7 @@ class RuleScriptedClass
 				name: name,
 				access: [APublic],
 				kind: FFun(MacroTools.toFunction(func)),
-				pos: Context.currentPos()
+				pos: pos
 			});
 
 		return fields;
@@ -289,9 +292,11 @@ class RuleScriptedClass
 				var _t = t;
 				var _params = params;
 
-				while (aliasMap.exists(_t.toString()))
+				var className = Context.getLocalClass().get().name;
+
+				while (aliasMap.exists(className + _t.toString()))
 				{
-					_t = switch (aliasMap.get(_t.toString()))
+					_t = switch (aliasMap.get(className + _t.toString()))
 					{
 						case TInst(t, params):
 							_params = params;
@@ -334,7 +339,7 @@ class RuleScriptedClass
 				switch (param)
 				{
 					case TInst(_t, params):
-						aliasMap.set(switch (t.superClass?.t.get().params[id].t)
+						aliasMap.set(Context.getLocalClass().get().name + switch (t.superClass?.t.get().params[id].t)
 						{
 							case TInst(t, params):
 								t.toString();