solpython 0.1.1__py3-none-any.whl → 0.1.2__py3-none-any.whl

pysol/__init__.py

@@ -1,3 +1,3 @@
 """solpython — Python-to-EVM compiler, runs Python on-chain."""
 
-__version__ = "0.1.1"
+__version__ = "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.dist-info → solpython-0.1.2.dist-info}/METADATA

@@ -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.dist-info → solpython-0.1.2.dist-info}/RECORD

@@ -1,14 +1,14 @@
-pysol/__init__.py,sha256=CrThJr4pnScCO4lsl6ltTLk0JWxiQZ9ZRNb18AyhFmU,89
+pysol/__init__.py,sha256=zJrpUdldW1PEsvELG18k6eCi5QLv7Yy7Xu_7JYtcpY4,89
 pysol/build.py,sha256=HUF8iFaegQcCY0DP45xsoFUCEWqPqIaXb4YhwXABETk,4483
-pysol/executor.py,sha256=WaRZd3fOchFoACkn-e86RbcFUWpe0mw5zWLuxZ7LBTI,5517
+pysol/executor.py,sha256=sezxdR7EmzUk07hpBMrOlF1Ks4KI57csSZpPfIt7tpw,5516
 pysol/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pysol/cli/main.py,sha256=ElB-LXK7Br0vtn84i-QhPNBDzAOLu_d9RBIWJxNCFlU,3280
 pysol/contracts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pysol/contracts/artifacts/PythonCompiler.json,sha256=01k6L0j8ZBWn2JG6CNdlRmhxpa-cHewJjY86-V3XfnU,437747
 pysol/contracts/artifacts/VM.json,sha256=_qK4oc1KN2Zy0bhRMvrGorYhp2mHbKWGddqjQv4kSEE,91038
-solpython-0.1.1.dist-info/licenses/LICENSE,sha256=GTNYUQJMKq5FV1co1N2BKUIxkAPPa2FCc8sLKO7x9FA,1065
-solpython-0.1.1.dist-info/METADATA,sha256=ggj-hf8P8w51exL1auqa656jxxylwE1idX-n2UpEqaA,6497
-solpython-0.1.1.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-solpython-0.1.1.dist-info/entry_points.txt,sha256=_s3EKcXf0MyFyfvA2r3llhjghAuMwS0PNRgFLxERppo,84
-solpython-0.1.1.dist-info/top_level.txt,sha256=rM0iJ3CoB_QH43ATGuXjYgViiQkxBgtslv7tJqxUulM,6
-solpython-0.1.1.dist-info/RECORD,,
+solpython-0.1.2.dist-info/licenses/LICENSE,sha256=GTNYUQJMKq5FV1co1N2BKUIxkAPPa2FCc8sLKO7x9FA,1065
+solpython-0.1.2.dist-info/METADATA,sha256=Anb1PbwQ_nb3OmvZvzMdIPzKYFxCPku6c5BZIZrXyQY,6497
+solpython-0.1.2.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+solpython-0.1.2.dist-info/entry_points.txt,sha256=_s3EKcXf0MyFyfvA2r3llhjghAuMwS0PNRgFLxERppo,84
+solpython-0.1.2.dist-info/top_level.txt,sha256=rM0iJ3CoB_QH43ATGuXjYgViiQkxBgtslv7tJqxUulM,6
+solpython-0.1.2.dist-info/RECORD,,