refactor: use pydantic to validate settings

Signed-off-by: Jack Cherng <[email protected]>

plugin/rules/constraint.py

@@ -75,17 +75,11 @@ def make(cls, constraint_rule: StConstraintRule) -> Self:
         """Build this object with the `constraint_rule`."""
         obj = cls()
 
-        if args := constraint_rule.get("args"):
-            # make sure args is always a tuple
-            obj.args = tuple(args) if isinstance(args, list) else (args,)
+        obj.args = tuple(constraint_rule.args)
+        obj.kwargs = constraint_rule.kwargs
+        obj.inverted = constraint_rule.inverted
 
-        if kwargs := constraint_rule.get("kwargs"):
-            obj.kwargs = kwargs
-
-        if (inverted := constraint_rule.get("inverted")) is not None:
-            obj.inverted = bool(inverted)
-
-        if constraint := constraint_rule.get("constraint"):
+        if constraint := constraint_rule.constraint:
             obj.constraint_name = constraint
             if constraint_class := find_constraint(constraint):
                 obj.constraint = constraint_class(*obj.args, **obj.kwargs)

plugin/rules/match.py

@@ -10,7 +10,7 @@
 
 from ..cache import clearable_lru_cache
 from ..snapshot import ViewSnapshot
-from ..types import Optimizable, StMatchRule
+from ..types import Optimizable, StConstraintRule, StMatchRule, StSyntaxRule
 from ..utils import camel_to_snake, list_all_subclasses, remove_suffix
 from .constraint import ConstraintRule
 
@@ -30,8 +30,6 @@ def list_matches() -> Generator[type[AbstractMatch], None, None]:
 
 @dataclass
 class MatchRule(Optimizable):
-    DEFAULT_MATCH_NAME = "any"
-
     match: AbstractMatch | None = None
     match_name: str = ""
     args: tuple[Any, ...] = tuple()
@@ -59,28 +57,24 @@ def test(self, view_snapshot: ViewSnapshot) -> bool:
         return self.match.test(view_snapshot, self.rules)
 
     @classmethod
-    def make(cls, match_rule: StMatchRule) -> Self:
+    def make(cls, match_rule: StSyntaxRule | StMatchRule) -> Self:
         """Build this object with the `match_rule`."""
         obj = cls()
 
-        if args := match_rule.get("args"):
-            # make sure args is always a tuple
-            obj.args = tuple(args) if isinstance(args, list) else (args,)
-
-        if kwargs := match_rule.get("kwargs"):
-            obj.kwargs = kwargs
+        obj.args = tuple(match_rule.args)
+        obj.kwargs = match_rule.kwargs
 
-        match = match_rule.get("match", cls.DEFAULT_MATCH_NAME)
+        match = match_rule.match
         if match_class := find_match(match):
             obj.match_name = match
             obj.match = match_class(*obj.args, **obj.kwargs)
 
         rules_compiled: list[MatchableRule] = []
-        for rule in match_rule.get("rules", []):
+        for rule in match_rule.rules:
             rule_class: type[MatchableRule] | None = None
-            if "constraint" in rule:
+            if isinstance(rule, StConstraintRule):
                 rule_class = ConstraintRule
-            elif "rules" in rule:  # nested MatchRule
+            elif isinstance(rule, StMatchRule):
                 rule_class = MatchRule
             if rule_class and (rule_compiled := rule_class.make(rule)):  # type: ignore
                 rules_compiled.append(rule_compiled)

plugin/rules/syntax.py

@@ -57,23 +57,14 @@ def make(cls, syntax_rule: StSyntaxRule) -> Self:
         """Build this object with the `syntax_rule`."""
         obj = cls()
 
-        if comment := syntax_rule.get("comment"):
-            obj.comment = str(comment)
-
-        syntaxes = syntax_rule.get("syntaxes", [])
-        if isinstance(syntaxes, str):
-            syntaxes = [syntaxes]
-        obj.syntaxes_name = tuple(syntaxes)
-        if target_syntax := find_syntax_by_syntax_likes(syntaxes):
+        obj.syntaxes_name = tuple(syntax_rule.syntaxes)
+        if target_syntax := find_syntax_by_syntax_likes(syntax_rule.syntaxes):
             obj.syntax = target_syntax
 
         # note that an empty string selector should match any scope
-        if (selector := syntax_rule.get("selector")) is not None:
-            obj.selector = selector
+        obj.selector = syntax_rule.selector
 
-        if (on_events := syntax_rule.get("on_events")) is not None:
-            if isinstance(on_events, str):
-                on_events = [on_events]
+        if (on_events := syntax_rule.on_events) is not None:
             obj.on_events = set(drop_falsy(map(ListenerEvent.from_value, on_events)))
 
         if match_rule_compiled := MatchRule.make(syntax_rule):

plugin/settings.py

@@ -2,11 +2,12 @@
 
 from collections import ChainMap
 from itertools import chain
-from typing import Any, Callable, Mapping, MutableMapping
+from typing import Any, Callable, List, Mapping, MutableMapping
 
 import sublime
 import sublime_plugin
 from more_itertools import unique_everseen
+from pydantic import TypeAdapter
 
 from .types import StSyntaxRule
 from .utils import drop_falsy
@@ -34,7 +35,7 @@ def get_st_settings() -> sublime.Settings:
 
 
 def pref_syntax_rules(*, window: sublime.Window | None = None) -> list[StSyntaxRule]:
-    return get_merged_plugin_setting("syntax_rules", [], window=window)
+    return TypeAdapter(List[StSyntaxRule]).validate_python(get_merged_plugin_setting("syntax_rules", [], window=window))
 
 
 def pref_trim_suffixes(*, window: sublime.Window | None = None) -> tuple[str]:

plugin/types.py

@@ -5,9 +5,10 @@
 from collections import UserDict as BuiltinUserDict
 from collections.abc import Generator, Hashable, Iterator, KeysView
 from enum import Enum
-from typing import Any, Generic, TypedDict, TypeVar, Union, overload
+from typing import Any, Generic, TypeVar, Union, overload
 
 import sublime
+from pydantic import BaseModel, Field, field_validator
 from typing_extensions import Self
 
 SyntaxLike = Union[str, sublime.Syntax]
@@ -95,31 +96,37 @@ def optimize(self) -> Generator[Any, None, None]:
         """Does optimizations and returns a generator for dropped objects."""
 
 
-class StConstraintRule(TypedDict):
-    """Typed dict for corresponding ST settings."""
+class StConstraintRule(BaseModel):
+    """Model for a "constraint rule" in settings."""
 
     constraint: str
-    args: list[Any] | Any | None
-    kwargs: dict[str, Any] | None
-    inverted: bool
+    args: list[Any] = Field(default_factory=list)
+    kwargs: dict[str, Any] = Field(default_factory=dict)
+    inverted: bool = False
 
 
-class StMatchRule(TypedDict):
-    """Typed dict for corresponding ST settings."""
+class StMatchRule(BaseModel):
+    """Model for a "match rule" in settings."""
 
-    match: str
-    args: list[Any] | Any | None
-    kwargs: dict[str, Any] | None
-    rules: list[StMatchRule | StConstraintRule]
+    match: str = "any"
+    args: list[Any] = Field(default_factory=list)
+    kwargs: dict[str, Any] = Field(default_factory=dict)
+    rules: list[StConstraintRule | StMatchRule] = Field(default_factory=list)
 
 
 class StSyntaxRule(StMatchRule):
-    """Typed dict for corresponding ST settings."""
+    """Model for a "syntax rule" in settings."""
 
-    comment: str
-    selector: str
-    syntaxes: str | list[str]
-    on_events: str | list[str] | None
+    comment: str = ""
+    selector: str = "text.plain"
+    syntaxes: list[str] = Field(default_factory=list)
+    on_events: list[str] | None = None
+    """Events to listen to, or `None` for all events."""
+
+    @field_validator("syntaxes", "on_events", mode="before")
+    @classmethod
+    def str_to_list_str(cls, v: Any) -> list[str]:
+        return [v] if isinstance(v, str) else v
 
 
 class WindowKeyedDict(UserDict[WindowIdAble, _T]):