easycoder 260320.2__tar.gz → 260322.1__tar.gz

{easycoder-260320.2 → easycoder-260322.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: easycoder
-Version: 260320.2
+Version: 260322.1
 Summary: Rapid scripting in English
 Keywords: compiler,scripting,prototyping,programming,coding,python,low code,hypertalk,computer language,learn to code
 Author-email: Graham Trott <gtanyware@gmail.com>

{easycoder-260320.2 → easycoder-260322.1}/easycoder/__init__.py

@@ -3,7 +3,7 @@
 import importlib
 import math
 
-__version__ = "260320.2"
+__version__ = "260322.1"
 
 from .ec_classes import *
 from .ec_compiler import *

{easycoder-260320.2 → easycoder-260322.1}/easycoder/ec_core.py

@@ -2120,7 +2120,7 @@ class Core(Handler):
                 return value
             return None
 
-        if token in ['now', 'today', 'newline', 'tab', 'empty']:
+        if token in ['now', 'today', 'newline', 'tab', 'empty', 'cwd']:
             return value
 
         if token in ['stringify', 'prettify', 'json', 'lowercase', 'uppercase', 'hash', 'random', float, 'integer', 'encode', 'decode']:
@@ -2291,6 +2291,9 @@ class Core(Handler):
             token = self.nextToken()
             if token in ['in', 'of']:
                 value.target = self.nextValue() # type: ignore
+                if self.peek() == 'type':
+                    self.nextToken()
+                    value.filter = self.nextValue() # type: ignore
                 return value
             return None
 
@@ -2361,9 +2364,13 @@ class Core(Handler):
         return ECValue(type=str, content=json.dumps(self.program.argv))
 
     def v_arg(self, v):
-        index = self.textify(v['index'])
+        index = self.textify(v.index)
+        if not hasattr(self.program, 'argv') or self.program.argv is None:
+            RuntimeError(self.program, 'No command-line arguments were provided')
+            return ECValue(type=str, content='')
         if index >= len(self.program.argv):
-            RuntimeError(self.program, 'Index exceeds # of args')
+            RuntimeError(self.program, f'Argument index {index} out of range (only {len(self.program.argv)} args provided)')
+            return ECValue(type=str, content='')
         return ECValue(type=str, content=self.program.argv[index])
 
     def v_bool(self, v):
@@ -2373,8 +2380,8 @@ class Core(Handler):
         return self.v_bool(v)
 
     def v_cos(self, v):
-        angle = self.textify(v['angle'])
-        radius = self.textify(v['radius'])
+        angle = self.textify(v.angle)
+        radius = self.textify(v.radius)
         return ECValue(type=int, content=round(math.cos(angle * 0.01745329) * radius))
 
     def v_count(self, v):
@@ -2453,7 +2460,13 @@ class Core(Handler):
 
     def v_files(self, v):
         path = self.textify(v.target)
-        return ECValue(type=str, content=json.dumps(os.listdir(path)))
+        filter_ext = self.textify(v.filter) if v.filter else None
+        entries = [f for f in os.listdir(path) if os.path.isfile(os.path.join(path, f))]
+        if filter_ext:
+            exts = {e.strip().lstrip('.') for e in filter_ext.split(',')}
+            entries = [f for f in entries if os.path.splitext(f)[1].lstrip('.').lower() in exts]
+        entries.sort()
+        return ECValue(type=str, content=json.dumps(entries))
 
     def v_float(self, v):
         val = self.textify(v.getContent())
@@ -2563,7 +2576,7 @@ class Core(Handler):
         return ECValue(type=str, content=self.program.message)
 
     def v_modification(self, v):
-        fileName = self.textify(v['fileName'])
+        fileName = self.textify(v.fileName)
         ts = int(os.stat(self.resolveLocalPath(fileName)).st_mtime)
         return ECValue(type=int, content=ts)
 
@@ -2575,6 +2588,9 @@ class Core(Handler):
     def v_newline(self, v):
         return ECValue(type=str, content='\n')
 
+    def v_cwd(self, v):
+        return ECValue(type=str, content=os.getcwd())
+
     def v_now(self, v):
         return ECValue(type=int, content=int(time.time() * 1000))
 
@@ -2642,8 +2658,8 @@ class Core(Handler):
         return ECValue(type=str, content='\t')
 
     def v_tan(self, v):
-        angle = self.textify(v['angle'])
-        radius = self.textify(v['radius'])
+        angle = self.textify(v.angle)
+        radius = self.textify(v.radius)
         return ECValue(type=int, content=round(math.tan(angle * 0.01745329) * radius))
 
     def v_ticker(self, v):
@@ -2673,7 +2689,7 @@ class Core(Handler):
 
     def v_type(self, v):
         value = ECValue(type=str)
-        val = self.textify(v['value'])
+        val = self.textify(v.value)
         if val is None:
             value.setContent('none')
         elif type(val) is str:
@@ -2812,6 +2828,7 @@ class Core(Handler):
                 return condition
 
         if token == 'includes':
+            self.nextToken()
             condition.value2 = self.nextValue() # type: ignore
             return condition
 

{easycoder-260320.2 → easycoder-260322.1}/easycoder/ec_mqtt.py

@@ -210,7 +210,7 @@ class ECTopic(ECObject):
             return ""
         if v is None:
             return ""
-        return v['name']
+        return v.name
     
     def getQoS(self):
         v = self.getValue()
@@ -218,7 +218,7 @@ class ECTopic(ECObject):
             return 0
         if v is None:
             return 0
-        return int(v['qos'])
+        return int(v.qos)
     
     def textify(self):
         v = self.getValue()

{easycoder-260320.2 → easycoder-260322.1}/easycoder/ec_program.py

@@ -54,10 +54,14 @@ class Program:
 		if arg in ['-v', '--version']: return
 		if arg[0:6] == 'debug ':
 			print('Debug mode requested')
-			self.scriptName = arg[6:]
+			parts = arg[6:].split()
+			self.scriptName = parts[0]
+			self.argv = parts[1:]
 			self.debugging = True
 		else:
-			self.scriptName = arg
+			parts = arg.split()
+			self.scriptName = parts[0]
+			self.argv = parts[1:]
 			self.debugging = False
 
 		f = open(self.scriptName, 'r')

{easycoder-260320.2 → easycoder-260322.1}/easycoder/ec_server.py

@@ -15,6 +15,7 @@ class ECServer(ECObject):
         self.response_event = threading.Event()
         self.response_value = None
         self.response_status = 200
+        self.response_content_type = None
 
     def setup(self, program, port):
         self.program = program
@@ -40,6 +41,7 @@ class ECServer(ECObject):
             self.response_event.clear()
             self.response_value = None
             self.response_status = 200
+            self.response_content_type = None
 
             if self.onRequestPC is not None:
                 self.program.queueIntent(self.onRequestPC)
@@ -55,6 +57,8 @@ class ECServer(ECObject):
 
             bottle_response.headers['Access-Control-Allow-Origin'] = '*'
             bottle_response.status = self.response_status
+            if self.response_content_type:
+                bottle_response.content_type = self.response_content_type
             return self.response_value or ''
 
         t = threading.Thread(
@@ -74,9 +78,10 @@ class ECServer(ECObject):
     def getBody(self):
         return self.current_request['body'] if self.current_request else ''
 
-    def setResponse(self, value, status=200):
+    def setResponse(self, value, status=200, content_type=None):
         self.response_value = value
         self.response_status = status
+        self.response_content_type = content_type
         self.response_event.set()
 
 ###############################################################################
@@ -187,10 +192,15 @@ class Server(Handler):
             self.checkObjectType(record, ECServer)
             command['server'] = record['name']
             command['status'] = 200
-            if self.peek() == 'with':
+            command['type'] = None
+            while self.peek() == 'with':
                 self.nextToken()
-                self.skip('status')
-                command['status'] = self.nextValue()
+                if self.peek() == 'status':
+                    self.nextToken()
+                    command['status'] = self.nextValue()
+                elif self.peek() == 'type':
+                    self.nextToken()
+                    command['type'] = self.nextValue()
             self.add(command)
             return True
         return False
@@ -200,7 +210,8 @@ class Server(Handler):
         server = self.getObject(record)
         value = self.textify(command['value'])
         status = int(self.textify(command['status'])) if isinstance(command['status'], ECValue) else command['status']
-        server.setResponse(value, status)
+        content_type = self.textify(command['type']) if isinstance(command['type'], ECValue) else command['type']
+        server.setResponse(value, status, content_type)
         return self.nextPC()
 
     #############################################################################

easycoder-260320.2/lsp/.vscode/launch.json

@@ -1,39 +0,0 @@
-{
-  "version": "0.2.0",
-  "configurations": [
-    {
-      "name": "Run EasyCoder Extension",
-      "type": "extensionHost",
-      "request": "launch",
-      "runtimeExecutable": "${execPath}",
-      "args": [
-        "--extensionDevelopmentPath=${workspaceFolder}"
-      ],
-      "outFiles": [
-        "${workspaceFolder}/client/out/**/*.js"
-      ],
-      "preLaunchTask": "lsp: watch",
-      "env": {
-        "EASYCODER_LSP_DEBUGPY": "1"
-      }
-    },
-    {
-      "name": "Attach to EasyCoder LSP (Python)",
-      "type": "python",
-      "request": "attach",
-      "connect": {
-        "host": "127.0.0.1",
-        "port": 5678
-      }
-    }
-  ],
-  "compounds": [
-    {
-      "name": "Run Extension + Attach LSP",
-      "configurations": [
-        "Run EasyCoder Extension",
-        "Attach to EasyCoder LSP (Python)"
-      ]
-    }
-  ]
-}

easycoder-260320.2/lsp/.vscode/tasks.json

@@ -1,22 +0,0 @@
-{
-  "version": "2.0.0",
-  "tasks": [
-    {
-      "label": "lsp: compile",
-      "type": "shell",
-      "options": { "cwd": "${workspaceFolder}" },
-      "command": "npm",
-      "args": ["run", "compile"],
-      "problemMatcher": ["$tsc"]
-    },
-    {
-      "label": "lsp: watch",
-      "type": "shell",
-      "options": { "cwd": "${workspaceFolder}" },
-      "command": "npm",
-      "args": ["run", "watch"],
-      "isBackground": true,
-      "problemMatcher": ["$tsc-watch"]
-    }
-  ]
-}