jaclang 0.7.14__py3-none-any.whl → 0.7.16__py3-none-any.whl

jaclang/tests/test_language.py

@@ -60,6 +60,7 @@ class JacLanguageTests(TestCase):
 
     def test_simple_jac_red(self) -> None:
         """Parse micro jac file."""
+        Jac.context().init_memory(base_path=self.examples_abs_path(""))
         captured_output = io.StringIO()
         sys.stdout = captured_output
         jac_import("micro.simple_walk", base_path=self.examples_abs_path(""))
@@ -106,7 +107,7 @@ class JacLanguageTests(TestCase):
             stdout_value,
             "{'apple': None, 'pineapple': None}\n"
             "This is a long\n"
-            "        line of code.\n"
+            "    line of code.\n"
             "{'a': 'apple', 'b': 'ball', 'c': 'cat', 'd': 'dog', 'e': 'elephant'}\n",
         )
 
@@ -151,6 +152,7 @@ class JacLanguageTests(TestCase):
 
     def test_filter_compr(self) -> None:
         """Testing filter comprehension."""
+        Jac.context().init_memory(base_path=self.examples_abs_path("./"))
         captured_output = io.StringIO()
         sys.stdout = captured_output
         jac_import(
@@ -207,16 +209,45 @@ class JacLanguageTests(TestCase):
     def test_deep_imports(self) -> None:
         """Parse micro jac file."""
         Jac.get_root()._jac_.edges.clear()
+        Jac.context().init_memory(base_path=self.fixture_abs_path("./"))
         captured_output = io.StringIO()
         sys.stdout = captured_output
+
         jac_import("deep_import", base_path=self.fixture_abs_path("./"))
         sys.stdout = sys.__stdout__
         stdout_value = captured_output.getvalue()
         self.assertEqual(stdout_value.split("\n")[0], "one level deeperslHello World!")
 
+    def test_deep_imports_mods(self) -> None:
+        """Parse micro jac file."""
+        import sys
+
+        targets = [
+            "deep",
+            "deep.deeper",
+            "deep.mycode",
+            "deep.deeper.snd_lev",
+            "deep.one_lev",
+        ]
+        for i in targets:
+            if i in sys.modules:
+                del sys.modules[i]
+        Jac.get_root()._jac_.edges.clear()
+        Jac.context().init_memory(base_path=self.fixture_abs_path("./"))
+        captured_output = io.StringIO()
+        sys.stdout = captured_output
+        jac_import("deep_import_mods", base_path=self.fixture_abs_path("./"))
+        sys.stdout = sys.__stdout__
+        stdout_value = captured_output.getvalue()
+        mods = eval(stdout_value)
+        for i in targets:
+            self.assertIn(i, mods)
+        self.assertEqual(len([i for i in mods if i.startswith("deep")]), 5)
+
     def test_deep_outer_imports_one(self) -> None:
         """Parse micro jac file."""
         Jac.get_root()._jac_.edges.clear()
+        Jac.context().init_memory(base_path=self.fixture_abs_path("./"))
         captured_output = io.StringIO()
         sys.stdout = captured_output
         jac_import(
@@ -230,6 +261,7 @@ class JacLanguageTests(TestCase):
     def test_deep_outer_imports_from_loc(self) -> None:
         """Parse micro jac file."""
         Jac.get_root()._jac_.edges.clear()
+        Jac.context().init_memory(base_path=self.fixture_abs_path("./deep/deeper/"))
         captured_output = io.StringIO()
         sys.stdout = captured_output
         os.chdir(self.fixture_abs_path("./deep/deeper/"))
@@ -383,6 +415,7 @@ class JacLanguageTests(TestCase):
 
     def test_typed_filter_compr(self) -> None:
         """Parse micro jac file."""
+        Jac.context().init_memory(base_path=self.examples_abs_path(""))
         captured_output = io.StringIO()
         sys.stdout = captured_output
         jac_import(
@@ -446,9 +479,11 @@ class JacLanguageTests(TestCase):
         ) as f:
             registry = pickle.load(f)
 
-        self.assertEqual(len(registry.registry), 3)
-        self.assertEqual(len(list(registry.registry.items())[0][1]), 10)
-        self.assertEqual(list(registry.registry.items())[1][0].scope, "Person")
+        self.assertEqual(len(registry.registry), 9)
+        self.assertEqual(len(list(registry.registry.items())[0][1]), 2)
+        self.assertEqual(list(registry.registry.items())[3][0].scope, "Person")
+        _, sem_info = registry.lookup(name="normal_ability")
+        self.assertEqual(len(sem_info.get_children(registry)), 2)
 
     def test_enum_inside_arch(self) -> None:
         """Test Enum as member stmt."""
@@ -541,6 +576,7 @@ class JacLanguageTests(TestCase):
         self.assertIn("class X {\n    with entry {\n        a_b = 67;", output)
         self.assertIn("br = b'Hello\\\\\\\\nWorld'", output)
         self.assertIn("class Circle {\n    can init(radius: float", output)
+        self.assertIn("<>node = 90;    \n    print(<>node) ;\n}\n", output)
 
     def test_needs_import_3(self) -> None:
         """Test py ast to Jac ast conversion output."""
@@ -678,12 +714,12 @@ class JacLanguageTests(TestCase):
         import jaclang.compiler.absyntree as ast
         import ast as py_ast
 
-        module_paths = ["random", "tkinter"]
+        module_paths = ["random", "ast"]
         for module_path in module_paths:
             stdlib_dir = sysconfig.get_paths()["stdlib"]
             file_path = os.path.join(
                 stdlib_dir,
-                module_path + (".py" if module_path == "random" else "/__init__.py"),
+                module_path + ".py",
             )
             with open(file_path) as f:
                 jac_ast = PyastBuildPass(
@@ -696,7 +732,7 @@ class JacLanguageTests(TestCase):
             if module_path == "random":
                 self.assertIn("ModulePath - statistics -", gen_ast)
             else:
-                self.assertIn("+-- Name - TclError - Type: No", gen_ast)
+                self.assertIn("+-- Name - NodeTransformer - Type: No", gen_ast)
         settings.py_raise = False
 
     def test_deep_py_load_imports(self) -> None:  # we can get rid of this, isn't?
@@ -772,6 +808,16 @@ class JacLanguageTests(TestCase):
         self.assertEqual(len(mypass.errors_had), 0)
         self.assertEqual(len(mypass.warnings_had), 0)
 
+    def test_circle_override1_type_check_pass(self) -> None:
+        """Test conn assign on edges."""
+        Jac.get_root()._jac_.edges.clear()
+        mypass = jac_file_to_pass(
+            self.examples_abs_path("manual_code/circle.jac"),
+            schedule=py_code_gen_typed,
+        )
+        self.assertEqual(len(mypass.errors_had), 0)
+        self.assertEqual(len(mypass.warnings_had), 0)
+
     def test_self_with_no_sig(self) -> None:  # we can get rid of this, isn't?
         """Test py ast to Jac ast conversion output."""
         captured_output = io.StringIO()
@@ -849,3 +895,24 @@ class JacLanguageTests(TestCase):
         sys.stdout = sys.__stdout__
         stdout_value = captured_output.getvalue()
         self.assertIn("i work", stdout_value)
+
+    def test_double_import_exec(self) -> None:
+        """Test importing python."""
+        captured_output = io.StringIO()
+        sys.stdout = captured_output
+        jac_import("dblhello", base_path=self.fixture_abs_path("./"))
+        sys.stdout = sys.__stdout__
+        stdout_value = captured_output.getvalue()
+        self.assertEqual(stdout_value.count("Hello World!"), 1)
+        self.assertIn("im still here", stdout_value)
+
+    def test_cls_method(self) -> None:
+        """Test class method output."""
+        captured_output = io.StringIO()
+        sys.stdout = captured_output
+        jac_import("cls_method", base_path=self.fixture_abs_path("./"))
+        sys.stdout = sys.__stdout__
+        stdout_value = captured_output.getvalue().split("\n")
+        self.assertEqual("MyClass", stdout_value[0])
+        self.assertEqual("Hello, World1! Hello, World2!", stdout_value[1])
+        self.assertEqual("Hello, World! Hello, World22!", stdout_value[2])

jaclang/tests/test_reference.py

@@ -53,6 +53,12 @@ class JacReferenceTests(TestCase):
 
         def execute_and_capture_output(code: str | bytes, filename: str = "") -> str:
             Jac.get_root().reset()
+            Jac.context().init_memory(
+                base_path=os.path.join(
+                    os.path.dirname(os.path.dirname(jaclang.__file__)),
+                    "examples/reference",
+                )
+            )
             f = io.StringIO()
             with redirect_stdout(f):
                 exec(

jaclang/utils/helpers.py

@@ -5,7 +5,7 @@ import marshal
 import os
 import pdb
 import re
-from typing import Optional
+from traceback import TracebackException
 
 
 def pascal_to_snake(pascal_string: str) -> str:
@@ -127,26 +127,6 @@ def auto_generate_refs() -> None:
                 md_file.write("")
 
 
-def import_target_to_relative_path(
-    level: int, target: str, base_path: Optional[str] = None
-) -> str:
-    """Convert an import target string into a relative file path."""
-    if not base_path:
-        base_path = os.getcwd()
-    parts = target.split(".")
-    traversal_levels = level - 1 if level > 0 else 0
-    actual_parts = parts[traversal_levels:]
-    for _ in range(traversal_levels):
-        base_path = os.path.dirname(base_path)
-    relative_path = os.path.join(base_path, *actual_parts)
-    relative_path = (
-        relative_path + ".jac"
-        if os.path.exists(relative_path + ".jac")
-        else relative_path
-    )
-    return relative_path
-
-
 def is_standard_lib_module(module_path: str) -> bool:
     """Check if a module is a standard library module."""
     import os
@@ -158,6 +138,50 @@ def is_standard_lib_module(module_path: str) -> bool:
     return os.path.isfile(file_path) or os.path.isdir(direc_path)
 
 
+def dump_traceback(e: Exception) -> str:
+    """Dump the stack frames of the exception."""
+    trace_dump = ""
+
+    # Utility function to get the error line char offset.
+    def byte_offset_to_char_offset(string: str, offset: int) -> int:
+        return len(string.encode("utf-8")[:offset].decode("utf-8", errors="replace"))
+
+    tb = TracebackException(type(e), e, e.__traceback__, limit=None, compact=True)
+    trace_dump += f"Error: {str(e)}"
+
+    # The first frame is the call the to the above `exec` function, not usefull to the enduser,
+    # and Make the most recent call first.
+    tb.stack.pop(0)
+    tb.stack.reverse()
+
+    # FIXME: should be some settings, we should replace to ensure the anchors length match.
+    dump_tab_width = 4
+
+    for idx, frame in enumerate(tb.stack):
+        func_signature = frame.name + ("()" if frame.name.isidentifier() else "")
+
+        # Pretty print the most recent call's location.
+        if idx == 0 and (frame.line and frame.line.strip() != ""):
+            line_o = frame._original_line.rstrip()  # type: ignore [attr-defined]
+            line_s = frame.line.rstrip() if frame.line else ""
+            stripped_chars = len(line_o) - len(line_s)
+            trace_dump += f'\n{" " * (dump_tab_width * 2)}{line_s}'
+            if frame.colno is not None and frame.end_colno is not None:
+                off_start = byte_offset_to_char_offset(line_o, frame.colno)
+                off_end = byte_offset_to_char_offset(line_o, frame.end_colno)
+
+                # A bunch of caret '^' characters under the error location.
+                anchors = (" " * (off_start - stripped_chars - 1)) + "^" * len(
+                    line_o[off_start:off_end].replace("\t", " " * dump_tab_width)
+                )
+
+                trace_dump += f'\n{" " * (dump_tab_width * 2)}{anchors}'
+
+        trace_dump += f'\n{" " * dump_tab_width}at {func_signature} {frame.filename}:{frame.lineno}'
+
+    return trace_dump
+
+
 class Jdb(pdb.Pdb):
     """Jac debugger."""
 

jaclang/utils/test.py

@@ -5,15 +5,24 @@ import os
 from typing import Callable, Optional
 from unittest import TestCase as _TestCase
 
+from _pytest.logging import LogCaptureFixture
 
 import jaclang
 from jaclang.compiler.passes import Pass
 from jaclang.utils.helpers import get_ast_nodes_as_snake_case as ast_snakes
 
+import pytest
+
 
 class TestCase(_TestCase):
     """Base test case for Jaseci."""
 
+    # Reference: https://stackoverflow.com/a/50375022
+    @pytest.fixture(autouse=True)
+    def inject_fixtures(self, caplog: LogCaptureFixture) -> None:
+        """Store the logger capture records within the tests."""
+        self.caplog = caplog
+
     def setUp(self) -> None:
         """Set up test case."""
         return super().setUp()

jaclang/utils/treeprinter.py

@@ -248,10 +248,6 @@ def _build_symbol_tree_common(
         symbol_node = SymbolTree(node_name=f"{sym.sym_name}", parent=symbols)
         SymbolTree(node_name=f"{sym.access} {sym.sym_type}", parent=symbol_node)
 
-        # if isinstance(node.owner, ast.AstSymbolNode) and node.owner.sym_info:
-        #     print("From tree printer", id(node.owner))
-        #     SymbolTree(node_name=f"Datatype: {node.owner.sym_info.typ}", parent=symbol_node)
-
         if sym.decl and sym.decl.loc.first_line > 0:
             SymbolTree(
                 node_name=f"decl: line {sym.decl.loc.first_line}, col {sym.decl.loc.col_start}",

{jaclang-0.7.14.dist-info → jaclang-0.7.16.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: jaclang
-Version: 0.7.14
+Version: 0.7.16
 Summary: Jac is a unique and powerful programming language that runs on top of Python, offering an unprecedented level of intelligence and intuitive understanding.
 Home-page: https://jaseci.org
 License: MIT
@@ -28,7 +28,7 @@ Description-Content-Type: text/markdown
 
 [Jac Website] | [Getting started] | [Learn] | [Documentation] | [Contributing]
 
-  [![PyPI version](https://img.shields.io/pypi/v/jaclang.svg)](https://pypi.org/project/jaclang/) [![Tests](https://github.com/chandralegend/jaclang/actions/workflows/run_pytest.yml/badge.svg?branch=main)](https://github.com/chandralegend/jaclang/actions/workflows/run_pytest.yml) [![codecov](https://codecov.io/github/chandralegend/jaclang/graph/badge.svg?token=OAX26B0FE4)](https://codecov.io/github/chandralegend/jaclang)
+  [![PyPI version](https://img.shields.io/pypi/v/jaclang.svg)](https://pypi.org/project/jaclang/) [![Tests](https://github.com/Jaseci-Labs/jaclang/actions/workflows/run_pytest.yml/badge.svg)](https://github.com/Jaseci-Labs/jaclang/actions/workflows/run_pytest.yml) [![codecov](https://codecov.io/github/chandralegend/jaclang/graph/badge.svg?token=OAX26B0FE4)](https://codecov.io/github/chandralegend/jaclang)
 </div>
 
 This is the main source code repository for the [Jac] programming language. It contains the compiler, language server, and documentation.
@@ -97,3 +97,4 @@ Third-party logos may be subject to third-party copyrights and trademarks. See [
 [jaseci]: https://jaseci.org/
 [media-guide]: https://jaseci.org/policies/logo-policy-and-media-guide/
 [policies-licenses]: https://www.jaseci.org/policies/licenses
+