update

Author: SilverRainZ

src/sphinxnotes/data/data.py

@@ -57,7 +57,9 @@ class Flag:
 class BoolFlag(Flag):
     default: bool = False
 
-type FlagStore = Lit['assign'] | Lit['append'] 
+
+type FlagStore = Lit['assign'] | Lit['append']
+
 
 @dataclass(frozen=True)
 class OperFlag(Flag):
@@ -71,7 +73,6 @@ class OperFlag(Flag):
 ############
 
 
-
 class Registry:
     """Stores supported element types and element forms (containers)."""
 
@@ -114,20 +115,17 @@ def _str_conv(v: str) -> str:
         str: _str_conv,
     }
 
-
     forms: dict[str, Form] = {
         'list': Form(ctype=list, sep=','),
         'lines': Form(ctype=list, sep='\n'),
         'words': Form(ctype=list, sep=' '),
     }
 
-
     """Builtin flags."""
 
     _required_flag = BoolFlag('required')
     _sep_flag = OperFlag('sep', etype=str)
 
-
     flags: dict[str, BoolFlag] = {
         'required': _required_flag,
         'require': _required_flag,
@@ -138,7 +136,6 @@ def _str_conv(v: str) -> str:
         'separate': _sep_flag,
         'sep': _sep_flag,
     }
-    
 
 
 ##########################
@@ -200,7 +197,6 @@ def __post_init__(self) -> None:
             if flag.name not in self.flags:
                 self.flags[flag.name] = flag.default
 
-
     def parse(self, rawval: str | None) -> Value:
         """
         Parses the raw input string into the target Value.
@@ -337,8 +333,7 @@ def _apply_modifier(self, mod: str):
                 vals.append(val)
             else:
                 raise ValueError(
-                    f'unsupported flag store: "{flag.store}". '
-                    f'available: {FlagStore}'
+                    f'unsupported flag store: "{flag.store}". available: {FlagStore}'
                 )
 
             # Deal with builtin flags.
@@ -358,12 +353,30 @@ def _apply_modifier(self, mod: str):
         raise ValueError(f"unknown modifier: '{mod}'")
 
 
-@dataclass
+@dataclass(frozen=True)
 class Schema(object):
     name: Field | None
     attrs: dict[str, Field] | Field
     content: Field | None
 
+    @classmethod
+    def from_dsl(
+        cls,
+        name: str | None = None,
+        attrs: str | dict[str, str] = {},
+        content=str | None,
+    ) -> Schema:
+        name_field = Field.from_dsl(name) if name else None
+
+        if isinstance(attrs, str):
+            attrs_field = Field.from_dsl(attrs)
+        else:
+            attrs_field = {k: Field.from_dsl(v) for k, v in attrs.items()}
+
+        cont_field = Field.from_dsl(name) if name else None
+
+        return Schema(name_field, attrs_field, cont_field)
+
     def _parse_single(
         self, field: tuple[str, Field | None], rawval: str | None
     ) -> Value: