22.1.1

Author: ThomasDarkson

.gitignore

@@ -1,4 +1,5 @@
 dump/
 build.hxml
 bin/
-Main.hx
+Main.hx
+SScript.zip

CHANGELOG.md

@@ -1,3 +1,12 @@
+# 22.1.1
+## Additions
+- Added `FULL` as a Preset mode
+- Added more backward compatibility
+- You can now use `in` while importing with alias
+
+## Changes
+- Default preset mode is now `REGULAR`
+
 # 22.1.0
 ## Additions
 - Added partial backward compatibility for older SScript versions

README.md

@@ -61,6 +61,58 @@ class Main {
 
 ### New features
 
+#### Import
+SScript supports normal imports, wildcard imports and imports with aliases.
+
+```haxe
+import hscript.SScript;
+
+class Main {
+	static function main() {
+		var script:SScript = new SScript();
+		script.doString("
+			import Date;
+			trace(Data.now());
+		");
+	}
+}
+```
+
+##### Wildcard Imports
+```haxe
+import hscript.SScript;
+
+class Main {
+	static function main() {
+		var script:SScript = new SScript();
+		script.doString("
+			import sys.*;
+			trace(FileSystem); // Class<sys.FileSystem>
+		");
+	}
+}
+```
+
+SScript uses a macro for wildcard imports. In most cases, it works fine. However, if you want to disable this feature, you can define `DISABLED_MACRO_SUPERLATIVE` in your project. This is not recommended, however, as doing so will also make the `FULL` preset mode unavailable.
+
+##### Import with Alias
+```haxe
+import hscript.SScript;
+
+class Main 
+{
+	static function main()
+	{
+		var script:SScript = new SScript();
+		script.doString("
+            import sys.FileSystem in L;
+            import sys.io.File as G;
+            trace(L, G); // Class<sys.FileSystem>,Class<sys.io.File>
+		");
+	}
+}
+```
+
 #### String Interpolation
 SScript supports string interpolation. Just like normal haxe, special identifiers, denoted by the dollar sign `$` within a String enclosed by single-quote `'` characters, are evaluated as if they were concatenated identifiers.
 
@@ -103,7 +155,7 @@ class Main {
 			trace(matches.length); // 3
 
 			// Email addresses regular expression
-			// (In files, use one back slash instead
+			// (In files, use one back slash instead)
 			var emailReg = ~/[A-Z0-9._%-]+@[A-Z0-9.-]+\\.[A-Z][A-Z][A-Z]*/i;
 			trace(emailReg.match("superlative@email.com")); // true
 		');
@@ -140,7 +192,7 @@ class Main {
 ```
 
 This makes `import` optional and it is useful for one-time use of a class or enum.
-This feature may be exhausting for weak machines, so if you wish to disable it set `hscript.SScript.defaultImprovedField` to `false`.
+This feature may be exhausting for weak machines and is disabled by default, so if you wish to enable it set `hscript.SScript.defaultImprovedField` to `true`.
 
 ## Reworked Function Arguments
 Function arguments have been reworked, so optional arguments will work like native Haxe.
@@ -170,10 +222,11 @@ class Main {
 Presets are the variables that get set before the script gets executed. 
 
 SScript has a presetting system where you can set multiple preset modes 
-to customize presetting. Currently it has 3 modes, `NONE`, `MINI` and `REGULAR`.
+to customize presetting. Currently it has 4 modes, `NONE`, `MINI`, `REGULAR` and `FULL`.
 
-`MINI` only contains basic classes and extremely lightweight,
-`REGULAR` contains slightly more and it includes more common classes aswell.
+- `MINI` only contains basic classes and extremely lightweight,
+- `REGULAR` contains slightly more and it includes more common classes aswell.
+- `FULL` contains all existing classes, expensive when there are many scripts being handled. (Avaiable only if `DISABLED_MACRO_SUPERLATIVE` is undefined)
 
 Example:
 ```haxe
@@ -182,8 +235,8 @@ import hscript.SScript;
 
 class Main {
 	static function main() {
-		SScript.defaultPreset = PresetMode.REGULAR;
-		var script = new SScript("trace(Json); // haxe.Json class is included with REGULAR");
+		SScript.defaultPreset = PresetMode.FULL;
+		var script = new SScript("trace(Json); // haxe.Json class is included with REGULAR and FULL");
 	}
 }
 ```
@@ -316,6 +369,7 @@ Special objects are especially useful for OpenFL and Flixel states.
 
 Example:
 ```haxe
+import flixel.FlxG;
 import hscript.SScript;
 
 class PlayState extends flixel.FlxState 
@@ -324,10 +378,14 @@ class PlayState extends flixel.FlxState
 	override function create()
 	{
 		sprite = new flixel.FlxSprite();
+		sprite.makeGraphic(FlxG.width, FlxG.height, FlxColor.WHITE);
+		add(sprite);
 
 		var newScript:SScript = new SScript();
 		newScript.setSpecialObject(this);
 		newScript.doString("sprite.visible = false;");
+
+		super.create();
 	}
 }
 ```

haxelib.json

@@ -9,7 +9,7 @@
         "script"
     ],
     "description": "SScript (also known as SuperlativeScript), fork of HScript with fixes and improvements.",
-    "version": "22.1.0",
+    "version": "22.1.1",
     "classPath": "src/",
     "releasenote": "Check CHANGELOG.md",
     "contributors": [

src/hscript/SScript.hx

@@ -104,8 +104,8 @@ class SScript
 
 		`trace(sys.FileSystem.exists("hscript/SScript.hx")); // true` 
 
-		This may be exhausting for old or weak computers. 
-		Set this to null if you experience performance problems.
+		This may be exhausting for old computers since it uses Reflection. 
+		Don't set this to true if you experience performance problems.
 	**/
 	public static var defaultImprovedField:Null<Bool> = false;
 
@@ -117,12 +117,17 @@ class SScript
 	/**
 		Default preset mode for Haxe classes.
 
-		MINI contains only basic classes like `Math`,
-		while REGULAR contains most cross-target Haxe classes.
+		**MINI** contains only basic classes like `Math`.
 
-		Default is `MINI`. Use `NONE` for no preset.
+
+		**REGULAR** contains most cross-target Haxe classes.
+
+		**FULL** contains all existing classes.
+		Can get expensive if you're handling a lot of scripts.
+
+		Default is `REGULAR`. Use `NONE` for no preset.
 	**/
-	public static var defaultPreset:PresetMode = MINI;
+	public static var defaultPreset(default, set):PresetMode = REGULAR;
 
 	/**
 		If not null, when a script is created, the function with this name
@@ -158,7 +163,7 @@ class SScript
 	/**
 		If not null, enables the improved field system for this script.
 
-		Default is `true`.
+		Disabled by default.
 
 		@see `SScript.defaultImprovedField`
 	**/
@@ -1066,4 +1071,19 @@ class SScript
 			interp.improvedField = value;
 		return improvedField = value;
 	}
+
+	static var showedWarning:Bool = false;
+	static function set_defaultPreset(value:PresetMode):PresetMode {
+		#if !DISABLED_MACRO_SUPERLATIVE
+		if (value == FULL && !showedWarning) {
+			trace("You set preset mode to FULL, which contains all existing classes.");
+			trace("If you're handling a lot of scripts, this can get very expensive.");
+			trace("See REGULAR or MINI for alternatives.");
+
+			showedWarning = true;
+		}
+		#end
+
+		return defaultPreset = value;
+	}
 }

src/hscript/backend/Preset.hx

@@ -1,17 +1,23 @@
 package hscript.backend;
 
+import haxe.ds.ArraySort;
+import hscriptBase.Tools;
+
 enum PresetMode
 {
     NONE;
     MINI;
     REGULAR;
+    #if !DISABLED_MACRO_SUPERLATIVE
+    FULL;
+    #end
 }
 
 @:access(hscript.backend.PresetClasses)
 @:access(hscript.SScript)
 class Preset
 {
-    public var haxeMode:PresetMode;
+    public var presetMode:PresetMode;
 
     var script:SScript;
     var _destroyed:Bool = false;
@@ -21,22 +27,26 @@ class Preset
             return;
 
         this.script = script;
-        haxeMode = SScript.defaultPreset;
+        presetMode = SScript.defaultPreset;
     }
 
     function preset()
     {
         if (_destroyed || script == null || script._destroyed)
             return;
 
-        var hArray = switch haxeMode {
+        var hArray = switch presetMode {
             case MINI: PresetClasses.miniHaxe;
             case REGULAR: PresetClasses.regularHaxe;
+            #if !DISABLED_MACRO_SUPERLATIVE
+            case FULL: PresetClasses.fullHaxe;
+            #end
             case _: [];
         }
 
-        for (i in hArray.copy())
+        for (i in hArray.copy()) {
             script.setClass(i);
+        }
     }
 
     function destroy()
@@ -45,7 +55,7 @@ class Preset
             return;
 
         script = null;
-        haxeMode = null;
+        presetMode = null;
 
         _destroyed = true;
     }
@@ -71,4 +81,28 @@ class PresetClasses
 
         array;
     }
+
+    #if !DISABLED_MACRO_SUPERLATIVE
+    static var fullHaxe:Array<Class<Dynamic>> = byMap();
+
+    static function byMap():Array<Class<Dynamic>> {
+        var classes:Array<Class<Dynamic>> = [];
+        @:privateAccess for (i => k in Tools.allClassesAvailable) {
+            classes.push(k);
+        }
+
+        ArraySort.sort(classes, function(a:Class<Dynamic>, b:Class<Dynamic>):Int {
+            var a = Type.getClassName(a).toUpperCase();
+            var b = Type.getClassName(b).toUpperCase();
+
+            if (a < b)
+                return -1;
+            else if (a > b)
+                return 1;
+            else
+                return 0;
+        });
+        return classes;
+    }
+    #end
 }

src/hscriptBase/Parser.hx

@@ -901,7 +901,7 @@ class Parser {
 
 			var tk = token();
 			if( tk == TStatement ) push(tk);
-			else if( Type.enumEq(tk,TId('as')) ) {
+			else if( Type.enumEq(tk,TId('as')) || Type.enumEq(tk,TId('in')) ) {
 				var tk = token();
 				switch tk {
 					case TId(s): asIdent = s;

src/hscriptBase/Tools.hx

@@ -119,7 +119,6 @@ class Tools {
     }
 
     #if !macro
-	static final allNamesAvailable:Array<String> = [];
     static final allClassesAvailable:Map<String, Class<Dynamic>> = {
         function returnMap()
         {
@@ -133,7 +132,6 @@ class Tools {
                     var c = Type.resolveClass(i);
                     if (c != null)
                         map[i] = c;
-					allNamesAvailable.push(i);
                 }
             }
 

src/tea/SScript.hx

@@ -1,8 +1,15 @@
 package tea;
 
+import hscript.backend.Preset;
+
 @:deprecated('Use hscript.SScript instead')
 typedef SScript = hscript.SScript;
 
+@:deprecated('Use hscript.backend.Preset instead')
+typedef TeaPreset = Preset;
+@:deprecated('Use hscript.backend.Preset.PresetMode instead')
+typedef TeaPresetMode = PresetMode;
+
 @:deprecated('Use hscript.SScript.FunctionCall instead')
 typedef Tea = hscript.SScript.FunctionCall;
 @:deprecated('Use hscript.SScript.FunctionCall instead')