[REALIGN-FEATURE]: edge_ref filter by class instead of instance

Author: amadolid

jaclang/compiler/passes/main/pyast_gen_pass.py

@@ -3443,7 +3443,7 @@ def translate_edge_op_ref(
                 keywords=[
                     self.sync(
                         ast3.keyword(
-                            arg="target_obj",
+                            arg="target_cls",
                             value=(
                                 targ if targ else self.sync(ast3.Constant(value=None))
                             ),

jaclang/core/architype.py

@@ -13,6 +13,7 @@
     ClassVar,
     Iterable,
     Optional,
+    Type,
     TypeVar,
     cast,
 )
@@ -376,7 +377,7 @@ def get_edges(
         self,
         dir: EdgeDir,
         filter_func: Optional[Callable[[list[EdgeArchitype]], list[EdgeArchitype]]],
-        target_obj: Optional[list[NodeArchitype]],
+        target_cls: Optional[list[Type[NodeArchitype]]],
     ) -> list[EdgeArchitype]:
         """Get edges connected to this node."""
         ret_edges: list[EdgeArchitype] = []
@@ -394,15 +395,15 @@ def get_edges(
                     dir in [EdgeDir.OUT, EdgeDir.ANY]
                     and self == source
                     and trg_arch
-                    and (not target_obj or trg_arch in target_obj)
+                    and (not target_cls or trg_arch.__class__ in target_cls)
                     and source.has_read_access(target)
                 ):
                     ret_edges.append(architype)
                 if (
                     dir in [EdgeDir.IN, EdgeDir.ANY]
                     and self == target
                     and src_arch
-                    and (not target_obj or src_arch in target_obj)
+                    and (not target_cls or src_arch.__class__ in target_cls)
                     and target.has_read_access(source)
                 ):
                     ret_edges.append(architype)
@@ -412,7 +413,7 @@ def edges_to_nodes(
         self,
         dir: EdgeDir,
         filter_func: Optional[Callable[[list[EdgeArchitype]], list[EdgeArchitype]]],
-        target_obj: Optional[list[NodeArchitype]],
+        target_cls: Optional[list[Type[NodeArchitype]]],
     ) -> list[NodeArchitype]:
         """Get set of nodes connected to this node."""
         ret_edges: list[NodeArchitype] = []
@@ -430,15 +431,15 @@ def edges_to_nodes(
                     dir in [EdgeDir.OUT, EdgeDir.ANY]
                     and self == source
                     and trg_arch
-                    and (not target_obj or trg_arch in target_obj)
+                    and (not target_cls or trg_arch.__class__ in target_cls)
                     and source.has_read_access(target)
                 ):
                     ret_edges.append(trg_arch)
                 if (
                     dir in [EdgeDir.IN, EdgeDir.ANY]
                     and self == target
                     and src_arch
-                    and (not target_obj or src_arch in target_obj)
+                    and (not target_cls or src_arch.__class__ in target_cls)
                     and target.has_read_access(source)
                 ):
                     ret_edges.append(src_arch)

jaclang/plugin/default.py

@@ -365,32 +365,30 @@ def disengage(walker: WalkerArchitype) -> bool:  # noqa: ANN401
     @hookimpl
     def edge_ref(
         node_obj: NodeArchitype | list[NodeArchitype],
-        target_obj: Optional[NodeArchitype | list[NodeArchitype]],
+        target_cls: Optional[Type[NodeArchitype] | list[Type[NodeArchitype]]],
         dir: EdgeDir,
         filter_func: Optional[Callable[[list[EdgeArchitype]], list[EdgeArchitype]]],
         edges_only: bool,
     ) -> list[NodeArchitype] | list[EdgeArchitype]:
         """Jac's apply_dir stmt feature."""
         if isinstance(node_obj, NodeArchitype):
             node_obj = [node_obj]
-        targ_obj_set: Optional[list[NodeArchitype]] = (
-            [target_obj]
-            if isinstance(target_obj, NodeArchitype)
-            else target_obj if target_obj else None
+        targ_cls_set: Optional[list[Type[NodeArchitype]]] = (
+            [target_cls] if isinstance(target_cls, type) else target_cls
         )
         if edges_only:
             connected_edges: list[EdgeArchitype] = []
             for node in node_obj:
                 connected_edges += node.__jac__.get_edges(
-                    dir, filter_func, target_obj=targ_obj_set
+                    dir, filter_func, target_cls=targ_cls_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_func, target_obj=targ_obj_set
+                        dir, filter_func, target_cls=targ_cls_set
                     )
                 )
             return list(set(connected_nodes))

jaclang/plugin/feature.py

@@ -188,15 +188,15 @@ def disengage(walker: WalkerArchitype) -> bool:  # noqa: ANN401
     @staticmethod
     def edge_ref(
         node_obj: NodeArchitype | list[NodeArchitype],
-        target_obj: Optional[NodeArchitype | list[NodeArchitype]],
+        target_cls: Optional[Type[NodeArchitype] | list[Type[NodeArchitype]]],
         dir: EdgeDir,
         filter_func: Optional[Callable[[list[EdgeArchitype]], list[EdgeArchitype]]],
         edges_only: bool = False,
     ) -> list[NodeArchitype] | list[EdgeArchitype]:
         """Jac's apply_dir stmt feature."""
         return pm.hook.edge_ref(
             node_obj=node_obj,
-            target_obj=target_obj,
+            target_cls=target_cls,
             dir=dir,
             filter_func=filter_func,
             edges_only=edges_only,

jaclang/plugin/spec.py

@@ -173,7 +173,7 @@ def disengage(walker: WalkerArchitype) -> bool:  # noqa: ANN401
     @hookspec(firstresult=True)
     def edge_ref(
         node_obj: NodeArchitype | list[NodeArchitype],
-        target_obj: Optional[NodeArchitype | list[NodeArchitype]],
+        target_cls: Optional[Type[NodeArchitype] | list[Type[NodeArchitype]]],
         dir: EdgeDir,
         filter_func: Optional[Callable[[list[EdgeArchitype]], list[EdgeArchitype]]],
         edges_only: bool,

jaclang/tests/fixtures/disconn.jac

@@ -20,10 +20,10 @@ with entry{
     y++>z;
     apple: int;
     # print(x -:aaa:-> );
-    print([x-->y-->z]);
+    print([x-->b-->c]);
     print([x -->]);
     print(x del--> y);
     print([x -->]);
     print([i.__class__.__name__ for i in (x ++> y)]);
-    print([i.__class__.__name__ for i in (:e:[x[0] --> y])]);
+    print([i.__class__.__name__ for i in (:e:[x[0] --> b])]);
 }