jaclang 0.7.9__py3-none-any.whl → 0.7.10__py3-none-any.whl

jaclang/cli/cli.py

@@ -243,7 +243,7 @@ def test(
 
     jac test => jac test -d .
     """
-    Jac.run_test(
+    failcount = Jac.run_test(
         filepath=filepath,
         filter=filter,
         xit=xit,
@@ -251,6 +251,8 @@ def test(
         directory=directory,
         verbose=verbose,
     )
+    if failcount:
+        raise SystemExit(f"Tests failed: {failcount}")
 
 
 @cmd_registry.register

jaclang/langserve/engine.py

@@ -62,21 +62,35 @@ class ModuleInfo:
         """Return uri."""
         return uris.from_fs_path(self.ir.loc.mod_path)
 
-    @property
-    def has_syntax_error(self) -> bool:
-        """Return if there are syntax errors."""
-        return len(self.errors) > 0 and self.alev == ALev.QUICK
-
-    def update_with(self, new_info: ModuleInfo, refresh: bool = False) -> None:
+    def update_with(
+        self,
+        build: Pass,
+        alev: ALev,
+        refresh: bool = False,
+        mod_override: Optional[ast.Module] = None,
+    ) -> None:
         """Update module info."""
-        self.ir = new_info.ir
+        target_mod = mod_override if mod_override else build.ir
+        if not isinstance(target_mod, ast.Module):
+            return
+        self.ir = target_mod  # if alev > ALev.QUICK else self.ir
         if refresh:
-            self.errors = new_info.errors
-            self.warnings = new_info.warnings
+            self.errors = build.errors_had
+            self.warnings = build.warnings_had
         else:
-            self.errors += [i for i in new_info.errors if i not in self.errors]
-            self.warnings += [i for i in new_info.warnings if i not in self.warnings]
-        self.alev = new_info.alev
+            self.errors += [
+                i
+                for i in build.errors_had
+                if i not in self.errors
+                if i.loc.mod_path == target_mod.loc.mod_path
+            ]
+            self.warnings += [
+                i
+                for i in build.warnings_had
+                if i not in self.warnings
+                if i.loc.mod_path == target_mod.loc.mod_path
+            ]
+        self.alev = alev
         self.diagnostics = self.gen_diagnostics()
         if self.alev == ALev.TYPE:
             self.sem_tokens = self.gen_sem_tokens()
@@ -158,36 +172,36 @@ class JacLangServer(LanguageServer):
         if not isinstance(build.ir, ast.Module):
             self.log_error("Error with module build.")
             return
-        new_mod = ModuleInfo(
-            ir=build.ir,
-            errors=[
-                i
-                for i in build.errors_had
-                if i.loc.mod_path == uris.to_fs_path(file_path)
-            ],
-            warnings=[
-                i
-                for i in build.warnings_had
-                if i.loc.mod_path == uris.to_fs_path(file_path)
-            ],
-            alev=alev,
-        )
         if file_path in self.modules:
-            self.modules[file_path].update_with(new_mod, refresh=refresh)
+            self.modules[file_path].update_with(build, alev, refresh=refresh)
         else:
-            self.modules[file_path] = new_mod
-        for p in build.ir.mod_deps.keys():
-            uri = uris.from_fs_path(p)
-            new_mod = ModuleInfo(
-                ir=build.ir.mod_deps[p],
-                errors=[i for i in build.errors_had if i.loc.mod_path == p],
-                warnings=[i for i in build.warnings_had if i.loc.mod_path == p],
+            self.modules[file_path] = ModuleInfo(
+                ir=build.ir,
+                errors=[
+                    i
+                    for i in build.errors_had
+                    if i.loc.mod_path == uris.to_fs_path(file_path)
+                ],
+                warnings=[
+                    i
+                    for i in build.warnings_had
+                    if i.loc.mod_path == uris.to_fs_path(file_path)
+                ],
                 alev=alev,
             )
+        for p in build.ir.mod_deps.keys():
+            uri = uris.from_fs_path(p)
             if not refresh and uri in self.modules:
-                self.modules[uri].update_with(new_mod)
+                self.modules[uri].update_with(
+                    build, alev, mod_override=build.ir.mod_deps[p], refresh=refresh
+                )
             else:
-                self.modules[uri] = new_mod
+                self.modules[uri] = ModuleInfo(
+                    ir=build.ir.mod_deps[p],
+                    errors=[i for i in build.errors_had if i.loc.mod_path == p],
+                    warnings=[i for i in build.warnings_had if i.loc.mod_path == p],
+                    alev=alev,
+                )
             self.modules[uri].parent = (
                 self.modules[file_path] if file_path != uri else None
             )
@@ -347,7 +361,9 @@ class JacLangServer(LanguageServer):
 
     def get_document_symbols(self, file_path: str) -> list[lspt.DocumentSymbol]:
         """Return document symbols for a file."""
-        if root_node := self.modules[file_path].ir._sym_tab:
+        if file_path in self.modules and (
+            root_node := self.modules[file_path].ir._sym_tab
+        ):
             return collect_symbols(root_node)
         return []
 

jaclang/plugin/default.py

@@ -251,9 +251,10 @@ class JacFeatureDefaults:
         maxfail: Optional[int],
         directory: Optional[str],
         verbose: bool,
-    ) -> bool:
+    ) -> int:
         """Run the test suite in the specified .jac file."""
         test_file = False
+        ret_count = 0
         if filepath:
             if filepath.endswith(".jac"):
                 base, mod_name = os.path.split(filepath)
@@ -262,6 +263,7 @@ class JacFeatureDefaults:
                 JacTestCheck.reset()
                 Jac.jac_import(target=mod_name, base_path=base)
                 JacTestCheck.run_test(xit, maxfail, verbose)
+                ret_count = JacTestCheck.failcount
             else:
                 print("Not a .jac file.")
         else:
@@ -293,10 +295,11 @@ class JacFeatureDefaults:
                 if JacTestCheck.breaker and (xit or maxfail):
                     break
             JacTestCheck.breaker = False
+            ret_count += JacTestCheck.failcount
             JacTestCheck.failcount = 0
             print("No test files found.") if not test_file else None
 
-        return True
+        return ret_count
 
     @staticmethod
     @hookimpl

jaclang/plugin/feature.py

@@ -132,7 +132,7 @@ class JacFeature:
         maxfail: Optional[int] = None,
         directory: Optional[str] = None,
         verbose: bool = False,
-    ) -> bool:
+    ) -> int:
         """Run the test suite in the specified .jac file."""
         return pm.hook.run_test(
             filepath=filepath,

jaclang/plugin/spec.py

@@ -121,7 +121,7 @@ class JacFeatureSpec:
         maxfail: Optional[int],
         directory: Optional[str],
         verbose: bool,
-    ) -> bool:
+    ) -> int:
         """Run the test suite in the specified .jac file."""
         raise NotImplementedError
 

jaclang/tests/test_man_code.py

@@ -2,6 +2,7 @@
 
 import io
 import sys
+from contextlib import suppress
 
 from jaclang.cli import cli
 from jaclang.utils.test import TestCase
@@ -114,11 +115,12 @@ class JacCliTests(TestCase):
         sys.stdout = stdio_block
 
         # Execute the function
-        cli.test(
-            self.fixture_abs_path(
-                "../../../examples/manual_code/circle_clean_tests.jac"
+        with suppress(SystemExit):
+            cli.test(
+                self.fixture_abs_path(
+                    "../../../examples/manual_code/circle_clean_tests.jac"
+                )
             )
-        )
 
         sys.stderr = sys.__stderr__
         sys.stdout = sys.__stdout__

jaclang/utils/helpers.py

@@ -108,12 +108,12 @@ def auto_generate_refs() -> None:
         heading = heading.strip()
         heading_snakecase = heading_to_snake(heading)
         content = (
-            f'## {heading}\n**Grammar Snippet**\n```yaml linenums="{lines[0]}"\n--8<-- '
-            f'"jaclang/compiler/jac.lark:{lines[0]}:{lines[1]}"\n```\n'
-            f'**Code Example**\n=== "Jac"\n    ```jac linenums="1"\n    --8<-- "examples/reference/'
+            f'## {heading}\n**Code Example**\n=== "Jac"\n    ```jac linenums="1"\n    --8<-- "examples/reference/'
             f'{heading_snakecase}.jac"\n'
             f'    ```\n=== "Python"\n    ```python linenums="1"\n    --8<-- "examples/reference/'
             f'{heading_snakecase}.py"\n    ```\n'
+            f'??? example "Jac Grammar Snippet"\n    ```yaml linenums="{lines[0]}"\n    --8<-- '
+            f'"jaclang/compiler/jac.lark:{lines[0]}:{lines[1]}"\n    ```\n'
             "**Description**\n\n--8<-- "
             f'"examples/reference/'
             f'{heading_snakecase}.md"\n'

{jaclang-0.7.9.dist-info → jaclang-0.7.10.dist-info}/METADATA

@@ -1,10 +1,10 @@
 Metadata-Version: 2.1
 Name: jaclang
-Version: 0.7.9
+Version: 0.7.10
 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
-Keywords: jac,jaclang,programming-language,machine-learning,artificial-intelligence
+Keywords: jac,jaclang,jaseci,python,programming-language,machine-learning,artificial-intelligence
 Author: Jason Mars
 Author-email: jason@jaseci.org
 Requires-Python: >=3.11.0,<4.0.0

{jaclang-0.7.9.dist-info → jaclang-0.7.10.dist-info}/RECORD

@@ -2,7 +2,7 @@ jaclang/__init__.py,sha256=quKqbhKk5CQ0k798jIXMbeAKzQxD0yhOpQGSvYD6TD8,399
 jaclang/cli/.gitignore,sha256=NYuons2lzuCpCdefMnztZxeSMgtPVJF6R6zSgVDOV20,27
 jaclang/cli/__init__.py,sha256=7aaPgYddIAHBvkdv36ngbfwsimMnfGaTDcaHYMg_vf4,23
 jaclang/cli/cli.md,sha256=4BPJGdcyvs_rXgd_DPEGjkKSGe5ureXXYaQsf-_z_LU,5939
-jaclang/cli/cli.py,sha256=8CbN_oqMhZ71AJhgA9J0Q551GMO3ey273dgaFPckLyI,13582
+jaclang/cli/cli.py,sha256=LUu53it5DMotyuhY1f28twR3KTR2inhrYyml9Ga00NI,13667
 jaclang/cli/cmdreg.py,sha256=u0jAd6A8czt7tBgPBBKBhYAG4By1FrjEGaTU2XFKeYs,8372
 jaclang/compiler/.gitignore,sha256=n1k2_xXTorp9PY8hhYM4psHircn-NMaFx95bSgDKopo,10
 jaclang/compiler/__init__.py,sha256=P8h-q53h-MTK8Wmvpb7sP5R6Ojz94Y2F9nqMwIUt0d4,3064
@@ -126,7 +126,7 @@ jaclang/core/memory.py,sha256=7QukfL6wDBXrdpRn01yu4RMNkmIMNqFiKrI0zfpGSy4,2947
 jaclang/core/test.py,sha256=HRCl3cf0uPTe58Kcx_sBUb6ow8J53rnmpFOhA7g9oAA,2851
 jaclang/core/utils.py,sha256=uzEsRSuNSMMo7dlvCozGv0TnpUmHEjGNzUTZt1Df2gQ,7741
 jaclang/langserve/__init__.py,sha256=3qbnivBBcLZCfmDYRMIeKkG08Lx7XQsJJg-qG8TU8yc,51
-jaclang/langserve/engine.py,sha256=ntvJB2silUagQZFLOahyXqh0Ef7E3uiMsE14PzunFOU,16708
+jaclang/langserve/engine.py,sha256=9Uyzn00usblkej_dc8J0g8DCZhPxgvbHEgYinyzUV-k,17212
 jaclang/langserve/server.py,sha256=4WrJXEVYWEcTjXlNoRx0patf34tjPXENKg35ofSYhtI,4121
 jaclang/langserve/tests/__init__.py,sha256=iDM47k6c3vahaWhwxpbkdEOshbmX-Zl5x669VONjS2I,23
 jaclang/langserve/tests/defaults.py,sha256=8UWHuCHY-WatPcWFhyX9-4KLuJgODTlLNj0wNnKomIM,7608
@@ -151,9 +151,9 @@ jaclang/langserve/tests/test_server.py,sha256=Bmllojot7c40rq0mDMOAiOyowY0-ECh_qA
 jaclang/langserve/utils.py,sha256=JS_XxDAtqTO4r0wSQjxgGqHwx9xTN_JZpNI1YP-kgbY,9868
 jaclang/plugin/__init__.py,sha256=5t2krHKt_44PrCTGojzxEimxpNHYVQcn89jAiCSXE_k,165
 jaclang/plugin/builtin.py,sha256=MEMPUnj_rlwcCNmUkfH5S8iazMnQ6fpp6tls4fh5z7k,1188
-jaclang/plugin/default.py,sha256=PBRhDnMChwLbV-Mzuy5Uss1ziRZ3UNCnGfOb1D6fOP4,23533
-jaclang/plugin/feature.py,sha256=fhyQRNYOkcXlYn1ObFPqdOHPhtC_lGQfgd7RD2ooLUY,9792
-jaclang/plugin/spec.py,sha256=CMu6rzi94eIZaqsFz3NIbN3upJgGneb4FE_7Rly7slE,8893
+jaclang/plugin/default.py,sha256=QF-ITQrpr_8zpX6P7PCuvD0CxPteY_EsEwDZSiUiSEA,23658
+jaclang/plugin/feature.py,sha256=V1-Zis7DwLK1QrL1h89Dk_M45hNe5iyISE37PR_aFKU,9791
+jaclang/plugin/spec.py,sha256=WjqNywrQYR8aSVa47Kx2RqgTFDfvWe2vydNIjxysy5M,8892
 jaclang/plugin/tests/__init__.py,sha256=rn_tNG8jCHWwBc_rx4yFkGc4N1GISb7aPuTFVRTvrTk,38
 jaclang/plugin/tests/fixtures/impl_match.jac,sha256=WEhcA1GlovusITEFO2bOjYYqiiULyYGKhM17uK2GqnI,91
 jaclang/plugin/tests/fixtures/impl_match_impl.jac,sha256=k1385r7Hdlq6mUKxEHa3VOKJUIWH08hYg2kErhbYwFM,31
@@ -245,11 +245,11 @@ jaclang/tests/fixtures/with_context.jac,sha256=cDA_4YWe5UVmQRgcpktzkZ_zsswQpV_T2
 jaclang/tests/test_bugs.py,sha256=tBPsIlSPqZDIz4QaScNRT-WdGIdJ0uU-aRBWq1XUZ6o,555
 jaclang/tests/test_cli.py,sha256=tnqdx8W5jTlsDJYR3713EikJqCbcgWEknEwuRHByvWk,8703
 jaclang/tests/test_language.py,sha256=T0DqM3aFjJ5_0oWqKhEkOyY1eruv-uGRgWkjWWcngXE,34671
-jaclang/tests/test_man_code.py,sha256=Kq93zg3hEfiouvpWvmfCgR6lDT5RKDp28k5ZaWe1Xeg,4519
+jaclang/tests/test_man_code.py,sha256=fLaN9TxvaTsiEBcud0VO1KOsv0EjonNnuS-JcRHyji4,4606
 jaclang/tests/test_reference.py,sha256=FoZQS-U9teiag8mAmX5X6ak4fuCOv00mvOyqJ44Zkc8,3379
 jaclang/tests/test_settings.py,sha256=TIX5uiu8H9IpZN2__uFiclcdCpBpPpcAwtlEHyFC4kk,1999
 jaclang/utils/__init__.py,sha256=86LQ_LDyWV-JFkYBpeVHpLaVxkqwFDP60XpWXOFZIQk,46
-jaclang/utils/helpers.py,sha256=v-jQ-SDzGLrrLXKxoL1PaCguJqcV-X1UlwjWSL3GNAI,6142
+jaclang/utils/helpers.py,sha256=aPAIj7j_Gqg0DToFj-DEbfea6gIbiBhAEFDtxw-Av4c,6168
 jaclang/utils/lang_tools.py,sha256=5R-Pe_ylXqWEPXrUGsQ3Vy7rrItf_mbyK19ptFSKiJI,10020
 jaclang/utils/log.py,sha256=G8Y_DnETgTh9xzvlW5gh9zqJ1ap4YY_MDTwIMu5Uc0Y,262
 jaclang/utils/test.py,sha256=Ll3H2l8U2OVQGHAkohsryDXIKSJHJseQSrMHS8JQTiw,5414
@@ -1478,7 +1478,7 @@ jaclang/vendor/typing_extensions-4.12.2.dist-info/METADATA,sha256=BeUQIa8cnYbrjW
 jaclang/vendor/typing_extensions-4.12.2.dist-info/RECORD,sha256=XS4fBVrPI7kaNZ56Ggl2RGa76jySWLqTzcrUpZIQTVM,418
 jaclang/vendor/typing_extensions-4.12.2.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
 jaclang/vendor/typing_extensions.py,sha256=gwekpyG9DVG3lxWKX4ni8u7nk3We5slG98mA9F3DJQw,134451
-jaclang-0.7.9.dist-info/METADATA,sha256=uil9KBvccbzWC-m1gQEOrUjkRXcGBRyIctKEbLvQgGY,4807
-jaclang-0.7.9.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-jaclang-0.7.9.dist-info/entry_points.txt,sha256=8sMi4Tvi9f8tQDN2QAXsSA2icO27zQ4GgEdph6bNEZM,49
-jaclang-0.7.9.dist-info/RECORD,,
+jaclang-0.7.10.dist-info/METADATA,sha256=ZGjbf_LoUyPYl01OoQViBQMvVuO0xsJAFz9IeQSUGXo,4822
+jaclang-0.7.10.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+jaclang-0.7.10.dist-info/entry_points.txt,sha256=8sMi4Tvi9f8tQDN2QAXsSA2icO27zQ4GgEdph6bNEZM,49
+jaclang-0.7.10.dist-info/RECORD,,