Merge pull request #59 from Apitax/scriptax4

Scriptax4 Release

Author: ShawnClake

.gitignore

@@ -4,7 +4,7 @@ v8-compile-cache-0/
 __pycache__/
 *.py[cod]
 
-
+.vscode/
 .idea/
 venv/
 3415-ref/

scriptax/__init__.py

@@ -1 +0,0 @@
-

scriptax/catalogs/__init__.py

@@ -1,3 +0,0 @@
-
-
- 

scriptax/drivers/__init__.py

@@ -1 +0,0 @@
-

scriptax/drivers/builtin/Scriptax.py

@@ -5,6 +5,9 @@
 from apitaxcore.utilities.Numbers import round2str
 from scriptax.flow.ScriptaxExecutor import Scriptax as ScriptaxExecutor
 from apitaxcore.models.State import State
+from scriptax.parser.utils.BoilerPlate import read_file
+from pathlib import Path
+from antlr4 import InputStream
 
 
 class Scriptax(Driver):
@@ -36,7 +39,7 @@ def handleDriverScript(self, command: Command) -> ApitaxResponse:
 
         executionTime = round2str(time() - t0)
 
-        if (command.options.debug):
+        if command.options.debug:
             State.log.log('>> Script Finished Processing in ' + executionTime + 's')
             State.log.log('')
 
@@ -45,7 +48,7 @@ def handleDriverScript(self, command: Command) -> ApitaxResponse:
         response.body.add({'commandtax': command.command[0]})
         response.body.add({'execution-time': executionTime})
 
-        if (result[1].isError()):
+        if result[1].is_error():
             response.body.add({'error': result[1].message})
             response.status = 500
         else:
@@ -54,10 +57,9 @@ def handleDriverScript(self, command: Command) -> ApitaxResponse:
         return response
 
     def handleDriverCommand(self, command: Command) -> ApitaxResponse:
-        if(self.isDriverScriptable()):
+        if self.isDriverScriptable():
             return self.handleDriverScript(command)
 
-    def getDriverScript(self, path) -> str:
-        if path == 'bob/bob.ah':
-            return "from scriptax import tester.bobytest(helloo='nope') as Slurp; sig(testingthis='beaut'); extends(Slurp); api getSig() {log(parent.testingthis); Slurp.doSig(); } api doBob() {log('THIS IS THE BOBBY');log(addOne(somenum=6));} api addOne(somenum) {return addOneRecursive(num=somenum);} api addOneRecursive(num) { num += 1; if(num < 10) num = addOneRecursive(num=num); return num;}"
-        return "sig(helloo='yup'); api doSig() {log(parent.helloo);} api addOne(num) { if(num > 5) return num + 1; else return num; } api getPath () {log('method in script with path: ' + parent.path);} api resetPath () {parent.path='RESET';} api setPath(path){parent.path=path;} api test () {log('testing method');} log('Received filepath: " + path + "'); path='" + path + "'; arbVal=42;"
+    def getDriverScript(self, path: str) -> InputStream:
+        path = Path(Path(__file__).resolve().parents[2]).joinpath('tests', 'scriptax', path)
+        return read_file(path)

scriptax/exceptions/InvalidExpression.py

@@ -0,0 +1,2 @@
+class InvalidExpression(Exception):
+    pass

scriptax/exceptions/InvalidParameters.py

@@ -0,0 +1,2 @@
+class InvalidParameters(Exception):
+    pass

scriptax/exceptions/InvalidSymbolAccess.py

@@ -0,0 +1,5 @@
+from scriptax.exceptions.SymbolError import SymbolError
+
+
+class InvalidSymbolAccess(SymbolError):
+    pass

scriptax/exceptions/InvalidType.py

@@ -0,0 +1,2 @@
+class InvalidType(Exception):
+    pass

scriptax/exceptions/SymbolError.py

@@ -0,0 +1,2 @@
+class SymbolError(Exception):
+    pass

scriptax/exceptions/SymbolNotFound.py

@@ -0,0 +1,5 @@
+from scriptax.exceptions.SymbolError import SymbolError
+
+
+class SymbolNotFound(SymbolError):
+    pass

scriptax/exceptions/__init__.py

@@ -1,14 +1,14 @@
 # System import
 
 # Application import
-from scriptax.parser.utils.BoilerPlate import customizableParser
+from scriptax.parser.utils.BoilerPlate import customizable_parser
 from apitaxcore.utilities.Files import getPath
 from apitaxcore.flow.LoadedDrivers import LoadedDrivers
 from apitaxcore.models.State import State
 
 
 # Script is used to automate the execution of many commands
-class Scriptax():
+class Scriptax:
     def __init__(self, parameters, options):
         self.options = options
         self.parameters = parameters
@@ -26,6 +26,6 @@ def execute(self, filepath) -> tuple:
 
         scriptax = self.options.driver.getDriverScript(filepath)
 
-        result = customizableParser(scriptax, parameters=self.parameters, options=self.options, file=getPath(filepath))
+        result = customizable_parser(scriptax, parameters=self.parameters, options=self.options, file=getPath(filepath))
 
         return result

scriptax/flow/ScriptaxExecutor.py

@@ -1 +0,0 @@
-

scriptax/flow/__init__.py

@@ -1 +0,0 @@
-