solpython 0.1.1__tar.gz → 0.1.2__tar.gz

{solpython-0.1.1/solpython.egg-info → solpython-0.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: solpython
-Version: 0.1.1
+Version: 0.1.2
 Summary: Python-to-EVM compiler — run Python on-chain via a Solidity smart contract pipeline
 License-Expression: MIT
 Requires-Python: >=3.10

{solpython-0.1.1 → solpython-0.1.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "solpython"
-version = "0.1.1"
+version = "0.1.2"
 description = "Python-to-EVM compiler — run Python on-chain via a Solidity smart contract pipeline"
 readme = "README.md"
 license = "MIT"

{solpython-0.1.1 → solpython-0.1.2}/pysol/__init__.py

@@ -1,3 +1,3 @@
 """solpython — Python-to-EVM compiler, runs Python on-chain."""
 
-__version__ = "0.1.1"
+__version__ = "0.1.2"

{solpython-0.1.1 → solpython-0.1.2}/pysol/executor.py

@@ -111,23 +111,22 @@ def run(source: str, *, verbose: bool = False) -> str:
     return _decode_output(w3, receipt)
 
 
-def _resolve_imports(source: str, script_dir: Path) -> dict[str, str]:
-    """Parse source for import statements and load module files from disk."""
+def _resolve_imports(source: str, script_dir: Path, *, _seen: set[str] | None = None) -> dict[str, str]:
+    """Parse source for import statements and load module files from disk (recursive)."""
+    if _seen is None:
+        _seen = set()
     modules = {}
-    for match in re.finditer(r"^from\s+(\w+)\s+import\s+", source, re.MULTILINE):
-        mod_name = match.group(1)
-        if mod_name in modules:
+    for match in re.finditer(r"^(?:from\s+(\w+)\s+import\s+|import\s+(\w+))", source, re.MULTILINE):
+        mod_name = match.group(1) or match.group(2)
+        if mod_name in _seen:
             continue
+        _seen.add(mod_name)
         mod_path = script_dir / f"{mod_name}.py"
         if mod_path.exists():
-            modules[mod_name] = mod_path.read_text()
-    for match in re.finditer(r"^import\s+(\w+)", source, re.MULTILINE):
-        mod_name = match.group(1)
-        if mod_name in modules:
-            continue
-        mod_path = script_dir / f"{mod_name}.py"
-        if mod_path.exists():
-            modules[mod_name] = mod_path.read_text()
+            mod_src = mod_path.read_text()
+            modules[mod_name] = mod_src
+            nested = _resolve_imports(mod_src, script_dir, _seen=_seen)
+            modules.update(nested)
     return modules
 
 

{solpython-0.1.1 → solpython-0.1.2/solpython.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: solpython
-Version: 0.1.1
+Version: 0.1.2
 Summary: Python-to-EVM compiler — run Python on-chain via a Solidity smart contract pipeline
 License-Expression: MIT
 Requires-Python: >=3.10