cleanup and migration

jac/jaclang/__init__.py

@@ -1,17 +1,22 @@
 """The Jac Programming Language."""
 
-from jaclang.plugin.default import (  # noqa: E402
+from jaclang.plugin.default import (
+    JacAccessValidation,
     JacBuiltin,
     JacCmdDefaults,
     JacFeatureDefaults,
+    JacNode,
 )
-from jaclang.plugin.feature import JacFeature, pm  # noqa: E402
+from jaclang.plugin.feature import JacFeature, hookmanager
 
 jac_import = JacFeature.jac_import
 
-pm.register(JacFeatureDefaults)
-pm.register(JacBuiltin)
-pm.register(JacCmdDefaults)
-pm.load_setuptools_entrypoints("jac")
+
+hookmanager.register(JacFeatureDefaults)
+hookmanager.register(JacBuiltin)
+hookmanager.register(JacCmdDefaults)
+hookmanager.register(JacAccessValidation)
+hookmanager.register(JacNode)
+hookmanager.load_setuptools_entrypoints("jac")
 
 __all__ = ["jac_import"]

jac/jaclang/plugin/builtin.py

@@ -19,17 +19,17 @@ def dotgen(
     dot_file: Optional[str] = None,
 ) -> str:
     """Print the dot graph."""
-    from jaclang.plugin.feature import pm
+    from jaclang.plugin.feature import JacBuiltin as JacB, JacFeature as Jac
 
-    root = pm.hook.get_root()
+    root = Jac.get_root()
     node = node if node is not None else root
     depth = depth if depth is not None else -1
     traverse = traverse if traverse is not None else False
     bfs = bfs if bfs is not None else True
     edge_limit = edge_limit if edge_limit is not None else 512
     node_limit = node_limit if node_limit is not None else 512
 
-    return pm.hook.dotgen(
+    return JacB.dotgen(
         edge_type=edge_type,
         node=node,
         depth=depth,

jac/jaclang/plugin/default.py

@@ -856,7 +856,7 @@ def dotgen(
         node: NodeArchitype,
         depth: int,
         traverse: bool,
-        edge_type: list[str],
+        edge_type: Optional[list[str]],
         bfs: bool,
         edge_limit: int,
         node_limit: int,