shell-lite 0.4.4__tar.gz → 0.4.5__tar.gz

{shell_lite-0.4.4/shell_lite.egg-info → shell_lite-0.4.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: shell-lite
-Version: 0.4.4
+Version: 0.4.5
 Summary: A lightweight, English-like scripting language.
 Author-email: Shrey Naithani <contact@shelllite.tech>
 License: MIT

{shell_lite-0.4.4 → shell_lite-0.4.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "shell-lite"
-version = "0.04.4"
+version = "0.04.5"
 description = "A lightweight, English-like scripting language."
 readme = "README.md"
 requires-python = ">=3.8"

{shell_lite-0.4.4 → shell_lite-0.4.5}/shell_lite/interpreter.py

@@ -3,6 +3,7 @@ from .ast_nodes import *
 from .lexer import Token, Lexer
 from .parser import Parser
 import importlib
+import types
 import operator
 import re
 import os
@@ -128,7 +129,7 @@ class WebBuilder:
             pass
 class Interpreter:
     def __init__(self):
-        print('DEBUG: ShellLite v0.04.4')
+        # print('DEBUG: ShellLite v0.04.5')
         self.global_env = Environment()
         self.global_env.set('str', str)
         self.global_env.set('int', int)
@@ -776,7 +777,12 @@ class Interpreter:
         if node.path in self.std_modules:
             self.current_env.set(node.path, self.std_modules[node.path])
             return
+        
+        # 1. Check File System (ShellLite modules)
         import os 
+        import importlib
+        target_path = None
+        
         if os.path.exists(node.path):
              target_path = node.path
         else:
@@ -789,32 +795,45 @@ class Interpreter:
                      global_path_ext = global_path + ".shl"
                      if os.path.exists(global_path_ext):
                          target_path = global_path_ext
-                     else:
-                         raise FileNotFoundError(f"Could not find imported file: {node.path} (searched local and global modules)")
+
+        # 2. If found on FS, load as ShellLite
+        if target_path:
+            if os.path.isdir(target_path):
+                 main_shl = os.path.join(target_path, "main.shl")
+                 pkg_shl = os.path.join(target_path, f"{os.path.basename(target_path)}.shl")
+                 if os.path.exists(main_shl):
+                     target_path = main_shl
+                 elif os.path.exists(pkg_shl):
+                     target_path = pkg_shl
                  else:
-                     raise FileNotFoundError(f"Could not find imported file: {node.path} (searched local and global modules)")
-        if os.path.isdir(target_path):
-             main_shl = os.path.join(target_path, "main.shl")
-             pkg_shl = os.path.join(target_path, f"{os.path.basename(target_path)}.shl")
-             if os.path.exists(main_shl):
-                 target_path = main_shl
-             elif os.path.exists(pkg_shl):
-                 target_path = pkg_shl
-             else:
-                  raise FileNotFoundError(f"Package '{node.path}' is a folder but has no 'main.shl' or '{os.path.basename(target_path)}.shl'.")
+                      raise FileNotFoundError(f"Package '{node.path}' is a folder but has no 'main.shl' or '{os.path.basename(target_path)}.shl'.")
+            
+            try:
+                with open(target_path, 'r', encoding='utf-8') as f:
+                    code = f.read()
+            except FileNotFoundError:
+                raise FileNotFoundError(f"Could not find imported file: {node.path}")
+                
+            from .lexer import Lexer
+            from .parser import Parser
+            lexer = Lexer(code)
+            tokens = lexer.tokenize()
+            parser = Parser(tokens)
+            statements = parser.parse()
+            for stmt in statements:
+                self.visit(stmt)
+            return
+
+        # 3. BRIDGE: Try importing as a raw Python module
         try:
-            with open(target_path, 'r', encoding='utf-8') as f:
-                code = f.read()
-        except FileNotFoundError:
-            raise FileNotFoundError(f"Could not find imported file: {node.path}")
-        from .lexer import Lexer
-        from .parser import Parser
-        lexer = Lexer(code)
-        tokens = lexer.tokenize()
-        parser = Parser(tokens)
-        statements = parser.parse()
-        for stmt in statements:
-            self.visit(stmt)
+            py_module = importlib.import_module(node.path)
+            self.current_env.set(node.path, py_module)
+            return
+        except ImportError:
+            pass # Fall through to error
+            
+        raise FileNotFoundError(f"Could not find module '{node.path}'. Searched:\n - ShellLite Local/Global\n - Python Site-Packages (The Bridge)")
+
     def _get_class_properties(self, class_def: ClassDef) -> List[tuple[str, Optional[Node]]]:
         if not hasattr(class_def, 'properties'): return []
         # Support both old string list and new tuple list for backward compat if needed, though we updated AST
@@ -1540,7 +1559,7 @@ class Interpreter:
                             self.wfile.write(str(e).encode())
                     except: pass
         server = HTTPServer(('0.0.0.0', port_val), ShellLiteHandler)
-        print(f"\n  ShellLite Server v0.04.4 is running!")
+        print(f"\n  ShellLite Server v0.04.5 is running!")
         print(f"  \u001b[1;36m➜\u001b[0m  Local:   \u001b[1;4;36mhttp://localhost:{port_val}/\u001b[0m\n")
         try: server.serve_forever()
         except KeyboardInterrupt: 

{shell_lite-0.4.4 → shell_lite-0.4.5}/shell_lite/main.py

@@ -58,10 +58,9 @@ def run_file(filename: str):
         print(f"Error: File '{filename}' not found.")
         return
     import sys
-    if 'shell_lite.interpreter' in sys.modules:
-        print(f"DEBUG: shell_lite.interpreter file: {sys.modules['shell_lite.interpreter'].__file__}")
-    from .interpreter_final import Interpreter
-    print(f"DEBUG: Interpreter class: {Interpreter}")
+
+    # Debug prints removed for production
+    from .interpreter import Interpreter
     
     with open(filename, 'r', encoding='utf-8') as f:
         source = f.read()
@@ -72,7 +71,7 @@ def run_repl():
     print("\n" + "="*40)
     print("  ShellLite REPL - English Syntax")
     print("="*40)
-    print("Version: v0.04.4 | Made by Shrey Naithani")
+    print("Version: v0.04.5 | Made by Shrey Naithani")
     print("Commands: Type 'exit' to quit, 'help' for examples.")
     print("Note: Terminal commands (like 'shl install') must be run in CMD/PowerShell, not here.")
 
@@ -203,7 +202,7 @@ def install_globally():
         ps_cmd = f'$oldPath = [Environment]::GetEnvironmentVariable("Path", "User"); if ($oldPath -notlike "*ShellLite*") {{ [Environment]::SetEnvironmentVariable("Path", "$oldPath;{install_dir}", "User") }}'
         subprocess.run(["powershell", "-Command", ps_cmd], capture_output=True)
         
-        print(f"\n[SUCCESS] ShellLite (v0.04.4) is installed!")
+        print(f"\n[SUCCESS] ShellLite (v0.04.5) is installed!")
         print(f"Location: {install_dir}")
         print("\nIMPORTANT STEP REQUIRED:")
         print("1. Close ALL open terminal windows (CMD, PowerShell, VS Code).")

{shell_lite-0.4.4 → shell_lite-0.4.5}/shell_lite/parser.py

@@ -80,7 +80,7 @@ class Parser:
             return self.parse_make()
         elif self.check('INPUT'):
             next_t = self.peek(1)
-            if next_t.type in ('ID', 'TYPE', 'STRING', 'NAME', 'VALUE', 'CLASS', 'STYLE', 'ONCLICK', 'SRC', 'HREF', 'ACTION', 'METHOD'):
+            if next_t.type in ('ID', 'TYPE', 'STRING', 'NAME', 'VALUE', 'CLASS', 'STYLE', 'ONCLICK', 'SRC', 'HREF', 'ACTION', 'METHOD', 'PLACEHOLDER'):
                 input_token = self.consume()
                 return self.parse_id_start_statement(passed_name_token=input_token)
             return self.parse_expression_stmt()

{shell_lite-0.4.4 → shell_lite-0.4.5/shell_lite.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: shell-lite
-Version: 0.4.4
+Version: 0.4.5
 Summary: A lightweight, English-like scripting language.
 Author-email: Shrey Naithani <contact@shelllite.tech>
 License: MIT