jaclang 0.5.4__py3-none-any.whl → 0.5.6__py3-none-any.whl

jaclang/core/construct.py

@@ -44,15 +44,12 @@ class NodeAnchor(ObjectAnchor):
     def get_edges(
         self,
         dir: EdgeDir,
-        filter_type: Optional[type],
         filter_func: Optional[Callable[[list[EdgeArchitype]], list[EdgeArchitype]]],
         target_obj: Optional[list[NodeArchitype]],
     ) -> list[EdgeArchitype]:
         """Get edges connected to this node."""
         edge_list: list[EdgeArchitype] = [*self.edges]
         ret_edges: list[EdgeArchitype] = []
-        if filter_type:
-            edge_list = [e for e in edge_list if isinstance(e, filter_type)]
         edge_list = filter_func(edge_list) if filter_func else edge_list
         for e in edge_list:
             if (
@@ -75,15 +72,12 @@ class NodeAnchor(ObjectAnchor):
     def edges_to_nodes(
         self,
         dir: EdgeDir,
-        filter_type: Optional[type],
         filter_func: Optional[Callable[[list[EdgeArchitype]], list[EdgeArchitype]]],
         target_obj: Optional[list[NodeArchitype]],
     ) -> list[NodeArchitype]:
         """Get set of nodes connected to this node."""
         edge_list: list[EdgeArchitype] = [*self.edges]
         node_list: list[NodeArchitype] = []
-        if filter_type:
-            edge_list = [e for e in edge_list if isinstance(e, filter_type)]
         edge_list = filter_func(edge_list) if filter_func else edge_list
         for e in edge_list:
             if e._jac_.target and e._jac_.source:

jaclang/plugin/default.py

@@ -262,7 +262,6 @@ class JacFeatureDefaults:
         node_obj: NodeArchitype | list[NodeArchitype],
         target_obj: Optional[NodeArchitype | list[NodeArchitype]],
         dir: EdgeDir,
-        filter_type: Optional[type],
         filter_func: Optional[Callable[[list[EdgeArchitype]], list[EdgeArchitype]]],
         edges_only: bool,
     ) -> list[NodeArchitype] | list[EdgeArchitype]:
@@ -278,16 +277,14 @@ class JacFeatureDefaults:
             connected_edges: list[EdgeArchitype] = []
             for node in node_obj:
                 connected_edges += node._jac_.get_edges(
-                    dir, filter_type, filter_func, target_obj=targ_obj_set
+                    dir, filter_func, target_obj=targ_obj_set
                 )
             return list(set(connected_edges))
         else:
             connected_nodes: list[NodeArchitype] = []
             for node in node_obj:
                 connected_nodes.extend(
-                    node._jac_.edges_to_nodes(
-                        dir, filter_type, filter_func, target_obj=targ_obj_set
-                    )
+                    node._jac_.edges_to_nodes(dir, filter_func, target_obj=targ_obj_set)
                 )
             return list(set(connected_nodes))
 
@@ -319,7 +316,6 @@ class JacFeatureDefaults:
         left: NodeArchitype | list[NodeArchitype],
         right: NodeArchitype | list[NodeArchitype],
         dir: EdgeDir,
-        filter_type: Optional[type],
         filter_func: Optional[Callable[[list[EdgeArchitype]], list[EdgeArchitype]]],
     ) -> bool:  # noqa: ANN401
         """Jac's disconnect operator feature."""
@@ -329,17 +325,11 @@ class JacFeatureDefaults:
         for i in left:
             for j in right:
                 edge_list: list[EdgeArchitype] = [*i._jac_.edges]
-                if filter_type:
-                    edge_list = [e for e in edge_list if isinstance(e, filter_type)]
                 edge_list = filter_func(edge_list) if filter_func else edge_list
                 for e in edge_list:
-                    if (
-                        e._jac_.target
-                        and e._jac_.source
-                        and (not filter_type or isinstance(e, filter_type))
-                    ):
+                    if e._jac_.target and e._jac_.source:
                         if (
-                            dir in ["OUT", "ANY"]
+                            dir in ["OUT", "ANY"]  # TODO: Not ideal
                             and i._jac_.obj == e._jac_.source
                             and e._jac_.target == j._jac_.obj
                         ):
@@ -404,3 +394,13 @@ class JacBuiltin:
     def dotgen(node: NodeArchitype, radius: int = 0) -> str:
         """Print the dot graph."""
         return dotgen(node, radius)
+
+
+class JacCmdDefaults:
+    """Jac CLI command."""
+
+    @staticmethod
+    @hookimpl
+    def create_cmd() -> None:
+        """Create Jac CLI cmds."""
+        pass

jaclang/plugin/feature.py

@@ -13,12 +13,13 @@ from jaclang.core.construct import (
     Root,
     WalkerArchitype,
 )
-from jaclang.plugin.spec import JacFeatureSpec, T
+from jaclang.plugin.spec import JacCmdSpec, JacFeatureSpec, T
 
 import pluggy
 
 pm = pluggy.PluginManager("jac")
 pm.add_hookspecs(JacFeatureSpec)
+pm.add_hookspecs(JacCmdSpec)
 
 
 class JacFeature:
@@ -143,7 +144,6 @@ class JacFeature:
         node_obj: NodeArchitype | list[NodeArchitype],
         target_obj: Optional[NodeArchitype | list[NodeArchitype]],
         dir: EdgeDir,
-        filter_type: Optional[type],
         filter_func: Optional[Callable[[list[EdgeArchitype]], list[EdgeArchitype]]],
         edges_only: bool = False,
     ) -> list[NodeArchitype] | list[EdgeArchitype]:
@@ -152,7 +152,6 @@ class JacFeature:
             node_obj=node_obj,
             target_obj=target_obj,
             dir=dir,
-            filter_type=filter_type,
             filter_func=filter_func,
             edges_only=edges_only,
         )
@@ -177,7 +176,6 @@ class JacFeature:
         left: NodeArchitype | list[NodeArchitype],
         right: NodeArchitype | list[NodeArchitype],
         dir: EdgeDir,
-        filter_type: Optional[type],
         filter_func: Optional[Callable[[list[EdgeArchitype]], list[EdgeArchitype]]],
     ) -> bool:
         """Jac's disconnect operator feature."""
@@ -185,7 +183,6 @@ class JacFeature:
             left=left,
             right=right,
             dir=dir,
-            filter_type=filter_type,
             filter_func=filter_func,
         )
 
@@ -220,3 +217,12 @@ class JacBuiltin:
     def dotgen(node: NodeArchitype, radius: int = 0) -> str:
         """Print the dot graph."""
         return pm.hook.dotgen(node=node, radius=radius)
+
+
+class JacCmd:
+    """Jac CLI command."""
+
+    @staticmethod
+    def create_cmd() -> None:
+        """Create Jac CLI cmds."""
+        return pm.hook.create_cmd()

jaclang/plugin/spec.py

@@ -149,7 +149,6 @@ class JacFeatureSpec:
         node_obj: NodeArchitype | list[NodeArchitype],
         target_obj: Optional[NodeArchitype | list[NodeArchitype]],
         dir: EdgeDir,
-        filter_type: Optional[type],
         filter_func: Optional[Callable[[list[EdgeArchitype]], list[EdgeArchitype]]],
         edges_only: bool,
     ) -> list[NodeArchitype] | list[EdgeArchitype]:
@@ -176,7 +175,6 @@ class JacFeatureSpec:
         left: NodeArchitype | list[NodeArchitype],
         right: NodeArchitype | list[NodeArchitype],
         dir: EdgeDir,
-        filter_type: Optional[type],
         filter_func: Optional[Callable[[list[EdgeArchitype]], list[EdgeArchitype]]],
     ) -> bool:  # noqa: ANN401
         """Jac's disconnect operator feature."""
@@ -215,3 +213,13 @@ class JacBuiltin:
     def dotgen(node: NodeArchitype, radius: int = 0) -> str:
         """Print the dot graph."""
         raise NotImplementedError
+
+
+class JacCmdSpec:
+    """Jac CLI command."""
+
+    @staticmethod
+    @hookspec
+    def create_cmd() -> None:
+        """Create Jac CLI cmds."""
+        raise NotImplementedError

{jaclang-0.5.4.dist-info → jaclang-0.5.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: jaclang
-Version: 0.5.4
+Version: 0.5.6
 Home-page: https://github.com/Jaseci-Labs/jaclang
 Author: Jason Mars
 Author-email: jason@jaseci.org

{jaclang-0.5.4.dist-info → jaclang-0.5.6.dist-info}/RECORD

@@ -1,17 +1,17 @@
-jaclang/__init__.py,sha256=jlX-Dhyb7sGC1AyRsK1njdCFrOHg4m6b5ip_MEeeC-s,596
+jaclang/__init__.py,sha256=92Q6E1oxeYXTBn8LWwBHciEeQsYLr82lCwwCzzGn5yw,640
 jaclang/cli/__init__.py,sha256=7aaPgYddIAHBvkdv36ngbfwsimMnfGaTDcaHYMg_vf4,23
-jaclang/cli/cli.py,sha256=mji2LY83eGrsjOAcRd8uDRnb6Tco1rAAnTiEtfukijw,6547
-jaclang/cli/cmdreg.py,sha256=a_xurX21dfgVrxZgQDIQpbMGCHb11nttiUSp5b1AiHw,6641
+jaclang/cli/cli.py,sha256=rSaSxUpyNUZ-HsBiS2iFMWtCeHkomsx5aIpuW9PrD-E,6578
+jaclang/cli/cmdreg.py,sha256=Tmxa3oo1BNOBs605TSOOD-KcIOBhUuIn7ZQtEaEGmco,6676
 jaclang/compiler/__init__.py,sha256=B07SnAx4emUUZoosOsqNwt9JnHnpEvOtjh5z6jz4hII,845
-jaclang/compiler/absyntree.py,sha256=ij9_nfqnptv6birU-c2XLPkRs8BLOyDt_Ao98hDvOjs,63642
+jaclang/compiler/absyntree.py,sha256=54ZmMNDP44oDn5KfJU9fjnEnYmH8U1_6QGpCU4ck2jg,63970
 jaclang/compiler/codeloc.py,sha256=M5kMZ0diqifcH3P0PE3yIvtZaUw8dbgaF_Hrl393ca8,2659
 jaclang/compiler/compile.py,sha256=9sgC1iOibTk0zWSuZMOnAvAxBj0KwUBeY4MVvrpcqz8,2738
 jaclang/compiler/constant.py,sha256=Yzzz1u3GiRcPYUaBNQ4j3kZFLlonv2OiKNdPQuTusf4,5794
-jaclang/compiler/parser.py,sha256=sX91ZAZOIvcO-swKSnJGY913cGAutgH2HakD5k_BlIA,131144
+jaclang/compiler/parser.py,sha256=q8B6DAn3ngB2Dv4q5T7UaxijcvPjEr7XnZtWW6rWjBY,130853
 jaclang/compiler/symtable.py,sha256=mFSKBiTQIJyWAFknokPHSz-tPy19YLu7XW4kP6Hv9ZQ,5171
 jaclang/compiler/workspace.py,sha256=5f_8ShPPT3yY8_vVQhiBRPgyiP_crQhOLy8uEsj-D8k,6741
 jaclang/compiler/__jac_gen__/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jaclang/compiler/__jac_gen__/jac_parser.py,sha256=S2KsBTEHWu4OonYi1t-DCxK8e3u30VZPJCV5sy6Me3w,317930
+jaclang/compiler/__jac_gen__/jac_parser.py,sha256=38dMVW8DITq1vudSB6kWMowybfNVuqjfuH50DWcU_kI,320594
 jaclang/compiler/passes/__init__.py,sha256=0Tw0d130ZjzA05jVcny9cf5NfLjlaM70PKqFnY4zqn4,69
 jaclang/compiler/passes/ir_pass.py,sha256=ZCcERZZfcOxRurJjOlW5UFj-C1mlp44qpDMsUCH2dUQ,4893
 jaclang/compiler/passes/transform.py,sha256=6t-bbX_s615i7_naOIBjT4wvAkvLFM4niRHYyF4my8A,2086
@@ -19,13 +19,13 @@ jaclang/compiler/passes/main/__init__.py,sha256=93aNqSyI2GyRBrzIkxVc7N8JENKPdwtV
 jaclang/compiler/passes/main/def_impl_match_pass.py,sha256=nFKwhbDkyeKldA1A9teON7zW1zJ9lMblGQ3oNF_nzBM,2579
 jaclang/compiler/passes/main/def_use_pass.py,sha256=1NGEfVLy1IsF0iYl6bda6CcrEuiFHTSZHj9pvZcMIFI,8575
 jaclang/compiler/passes/main/import_pass.py,sha256=zZ6E1awZLbOfhWRsHVZCPrS7XpjVmSy7rL4Bdo481rg,5983
-jaclang/compiler/passes/main/pyast_gen_pass.py,sha256=cqeiAYcx_gkXgTN1vMBjG2oWkT4gd2KniNFZsnovlKU,108109
+jaclang/compiler/passes/main/pyast_gen_pass.py,sha256=ZBZKWfft1GYynvFpUoeEH6ZmmHUBNlpZ3TCe9A-pkDY,110371
 jaclang/compiler/passes/main/pyast_load_pass.py,sha256=vHgIYC5YOlv9TT8tXAZ5c7rsFzSBm8kw0AJEeEdY2C4,25332
 jaclang/compiler/passes/main/pybc_gen_pass.py,sha256=CjA9AqyMO3Pv_b5Hh0YI6JmCqIru2ASonO6rhrkau-M,1336
 jaclang/compiler/passes/main/pyout_pass.py,sha256=u2JlV8gF4VF25hIt2GForWqCIMmbSlxDkE24Ehl-Kcc,3016
 jaclang/compiler/passes/main/schedules.py,sha256=ODyLVItL-cXxw0lzwan5RJlWlki2a-mhlkrDUngGTZc,895
 jaclang/compiler/passes/main/sub_node_tab_pass.py,sha256=fGgK0CBWsuD6BS4BsLwXPl1b5UC2N2YEOGa6jNMu8N8,1332
-jaclang/compiler/passes/main/sym_tab_build_pass.py,sha256=ROCh6pVyRXP0kiiIxM-UgQySywcbl3OwgT-LMWOilus,41037
+jaclang/compiler/passes/main/sym_tab_build_pass.py,sha256=g9UyCM1ZPsQ0Rzix3a2asdmstLTn3nZ0Zsp6gSJ363I,41194
 jaclang/compiler/passes/main/type_check_pass.py,sha256=Ithw0PTsEtf2OropKM4YP7XBRfe_bUk6kfn8XHX3NJc,3311
 jaclang/compiler/passes/main/tests/__init__.py,sha256=UBAATLUEH3yuBN4LYKnXXV79kokRc4XB-rX12qfu0ds,28
 jaclang/compiler/passes/main/tests/test_decl_def_match_pass.py,sha256=xxwobYmRS7YbjDojR24F4kd13J3aMCVimxmKUqwCgiM,1358
@@ -39,7 +39,7 @@ jaclang/compiler/passes/main/tests/test_sym_tab_build_pass.py,sha256=XprSqlWlkq2
 jaclang/compiler/passes/main/tests/test_type_check_pass.py,sha256=bzrVcsBZra2HkQH2_qLdX0CY9wbx9gVxs-mSIeWGvqc,1553
 jaclang/compiler/passes/tool/__init__.py,sha256=xekCOXysHIcthWm8NRmQoA1Ah1XV8vFbkfeHphJtUdc,223
 jaclang/compiler/passes/tool/fuse_comments_pass.py,sha256=N9a84qArNuTXX1iaXsBzqcufx6A3zYq2p-1ieH6FmHc,3133
-jaclang/compiler/passes/tool/jac_formatter_pass.py,sha256=5gC23DrtxxNLcwr4la396GKtDJ8GL9A9b2cQlDIuFsY,77392
+jaclang/compiler/passes/tool/jac_formatter_pass.py,sha256=f9VfWZ7SyL2Tz9r-lQYltzsZDTiw_NuxUjQWejsyGkE,77769
 jaclang/compiler/passes/tool/schedules.py,sha256=kmbsCazAMizGAdQuZpFky5BPlYlMXqNw7wOUzdi_wBo,432
 jaclang/compiler/passes/tool/tests/__init__.py,sha256=AeOaZjA1rf6VAr0JqIit6jlcmOzW7pxGr4U1fOwgK_Y,24
 jaclang/compiler/passes/tool/tests/test_fuse_comments_pass.py,sha256=ZeWHsm7VIyyS8KKpoB2SdlHM4jF22fMfSrfTfxt2MQw,398
@@ -52,15 +52,17 @@ jaclang/compiler/tests/test_parser.py,sha256=1FEm2bE8zfwuXbBidF2yOaGJm5StmHLFASG
 jaclang/compiler/tests/test_workspace.py,sha256=SEBcvz_daTbonrLHK9FbjiH86TUbOtVGH-iZ3xkJSMk,3184
 jaclang/compiler/tests/fixtures/__init__.py,sha256=udQ0T6rajpW_nMiYKJNckqP8izZ-pH3P4PNTJEln2NU,36
 jaclang/compiler/tests/fixtures/activity.py,sha256=fSvxYDKufsPeQIrbuh031zHw_hdbRv5iK9mS7dD8E54,263
+jaclang/compiler/tests/fixtures/__jac_gen__/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+jaclang/compiler/tests/fixtures/__jac_gen__/hello_world.py,sha256=KTrjDZb7nsRdlxY3Poc_ShDi_SfIfOQqaqG9SYU_6UA,117
 jaclang/core/__init__.py,sha256=jDDYBCV82qPhmcDVk3NIvHbhng0ebSrXD3xrojg0-eo,34
-jaclang/core/construct.py,sha256=ANa9R2-R-xebP7mJ2y5li_Tefgw8hd2df6v-CikVSKo,12081
+jaclang/core/construct.py,sha256=iuDFWmJesyjt2WkMw8idvSrUtsEdXfZWZ4a5rZOoUHo,11805
 jaclang/core/importer.py,sha256=e1XAyplPOAwg1cQ5_HjRBLSXaQ_IQZ7nyoynUbLmryw,3378
 jaclang/core/jacbuiltins.py,sha256=DyQVrwMH_BL1Fep1lk_3663xHneGAqgBsv3chRXOFss,245
 jaclang/core/utils.py,sha256=ZtacZBZVt21-ZRbdloHIbzDnXuiBmoqlEhEM1kUhPdY,810
 jaclang/plugin/__init__.py,sha256=qLbQ2KjwyTvlV50Q7JTIznyIzuGDPjuwM_ZJjdk-avo,182
-jaclang/plugin/default.py,sha256=he926fZbvIMD5XMEIEdr2gmOz1h1qfZ8flIF95249Ok,12463
-jaclang/plugin/feature.py,sha256=Cvm3_VySnPg58Gtk1X3yLcBtjaEEfGUMeBIyYuTpE_4,6852
-jaclang/plugin/spec.py,sha256=QjJ1Yi_uD0woJbUY9hbc_DvoA7zBGGA2TsEYSS7RkEo,6208
+jaclang/plugin/default.py,sha256=iqtTNUj9vDHG9c3eqS5oJyP2wwJDjUZ2fmuby-AO57E,12233
+jaclang/plugin/feature.py,sha256=ZSMh0qrEia66Bn8g2vlGgq_H5OLKAkZ-gpguLrZsEJA,6908
+jaclang/plugin/spec.py,sha256=SsGQOsVxdtwte9mgNklTQSkqn1Q3lG89AdUNBAGn6NA,6313
 jaclang/plugin/tests/__init__.py,sha256=rn_tNG8jCHWwBc_rx4yFkGc4N1GISb7aPuTFVRTvrTk,38
 jaclang/plugin/tests/test_features.py,sha256=uNQ52HHc0GiOGg5xUZk-ddafdtud0IHN4H_EUAs4er4,3547
 jaclang/utils/__init__.py,sha256=86LQ_LDyWV-JFkYBpeVHpLaVxkqwFDP60XpWXOFZIQk,46
@@ -396,8 +398,8 @@ jaclang/vendor/pluggy/_manager.py,sha256=fcYU7VER0CplRym4jAJ7RCFYl6cfDSeVM589YHH
 jaclang/vendor/pluggy/_result.py,sha256=wXDoVy68bOaOrBzQ0bWFb3HTbpqhvdQMgYwaZvfzxfA,3239
 jaclang/vendor/pluggy/_tracing.py,sha256=kSBr25F_rNklV2QhLD6h1jx6Z1kcKDRbuYvF5jv35pU,2089
 jaclang/vendor/pluggy/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jaclang-0.5.4.dist-info/METADATA,sha256=WOf-iB5OD5fAl8qYl5uKNFq8LiQd2TSM7oHMilE_Qfs,152
-jaclang-0.5.4.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-jaclang-0.5.4.dist-info/entry_points.txt,sha256=Z-snS3MDBdV1Z4znXDZTenyyndovaNjqRkDW1t2kYSs,50
-jaclang-0.5.4.dist-info/top_level.txt,sha256=ZOAoLpE67ozkUJd-v3C59wBNXiteRD8IWPbsYB3M08g,8
-jaclang-0.5.4.dist-info/RECORD,,
+jaclang-0.5.6.dist-info/METADATA,sha256=ui3WOmmjnbfGHbLg4vAbKuzVbHfs4c5zkSMMuTM57ro,152
+jaclang-0.5.6.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+jaclang-0.5.6.dist-info/entry_points.txt,sha256=Z-snS3MDBdV1Z4znXDZTenyyndovaNjqRkDW1t2kYSs,50
+jaclang-0.5.6.dist-info/top_level.txt,sha256=ZOAoLpE67ozkUJd-v3C59wBNXiteRD8IWPbsYB3M08g,8
+jaclang-0.5.6.dist-info/RECORD,,