chore: update black

mecha/api.py

@@ -257,9 +257,12 @@ def prepare_token_stream(
         multiline: Optional[bool] = None,
     ) -> Iterator[TokenStream]:
         """Prepare the token stream for parsing."""
-        with stream.reset(*stream.data), stream.provide(
-            spec=self.spec,
-            multiline=self.spec.multiline if multiline is None else multiline,
+        with (
+            stream.reset(*stream.data),
+            stream.provide(
+                spec=self.spec,
+                multiline=self.spec.multiline if multiline is None else multiline,
+            ),
         ):
             with stream.reset_syntax(comment=r"#.*$", literal=AstLiteral.regex.pattern):
                 with stream.indent(skip=["comment"]), stream.ignore("indent", "dedent"):
@@ -276,8 +279,7 @@ def parse(
         multiline: Optional[bool] = None,
         provide: Optional[JsonDict] = None,
         preprocessor: Optional[Preprocessor] = None,
-    ) -> AstRoot:
-        ...
+    ) -> AstRoot: ...
 
     @overload
     def parse(
@@ -290,8 +292,7 @@ def parse(
         multiline: Optional[bool] = None,
         provide: Optional[JsonDict] = None,
         preprocessor: Optional[Preprocessor] = None,
-    ) -> AstNodeType:
-        ...
+    ) -> AstNodeType: ...
 
     @overload
     def parse(
@@ -304,8 +305,7 @@ def parse(
         multiline: Optional[bool] = None,
         provide: Optional[JsonDict] = None,
         preprocessor: Optional[Preprocessor] = None,
-    ) -> Any:
-        ...
+    ) -> Any: ...
 
     def parse(
         self,
@@ -393,8 +393,7 @@ def compile(
         readonly: Optional[bool] = None,
         initial_step: int = 0,
         report: Optional[DiagnosticCollection] = None,
-    ) -> PackType:
-        ...
+    ) -> PackType: ...
 
     @overload
     def compile(
@@ -407,8 +406,7 @@ def compile(
         readonly: Optional[bool] = None,
         initial_step: int = 0,
         report: Optional[DiagnosticCollection] = None,
-    ) -> None:
-        ...
+    ) -> None: ...
 
     @overload
     def compile(
@@ -423,8 +421,7 @@ def compile(
         readonly: Optional[bool] = None,
         initial_step: int = 0,
         report: Optional[DiagnosticCollection] = None,
-    ) -> TextFileType:
-        ...
+    ) -> TextFileType: ...
 
     @overload
     def compile(
@@ -439,8 +436,7 @@ def compile(
         readonly: Optional[bool] = None,
         initial_step: int = 0,
         report: Optional[DiagnosticCollection] = None,
-    ) -> Function:
-        ...
+    ) -> Function: ...
 
     def compile(
         self,
@@ -616,15 +612,19 @@ def log_reported_diagnostics(self):
     def format_perf(self) -> List[List[str]]:
         """Format perf report."""
         step_headers = [
-            "Lint"
-            if step is self.lint
-            else "Transform"
-            if step is self.transform
-            else "Optimize"
-            if step is self.optimize
-            else "Check"
-            if step is self.check
-            else repr(step)
+            (
+                "Lint"
+                if step is self.lint
+                else (
+                    "Transform"
+                    if step is self.transform
+                    else (
+                        "Optimize"
+                        if step is self.optimize
+                        else "Check" if step is self.check else repr(step)
+                    )
+                )
+            )
             for step in self.steps
         ]
 

mecha/ast.py

@@ -183,14 +183,16 @@ def dump(
             + (
                 "\n" + ("\n".join((f"{prefix}    {type(child)}" if shallow else child.dump(prefix + "    ", shallow, exclude)) for child in attribute) if attribute else prefix + "    <empty>")  # type: ignore
                 if isinstance(attribute := getattr(self, f.name), AbstractChildren)
-                else "\n"
-                + (
-                    f"{prefix}    {type(attribute)}"
-                    if shallow
-                    else attribute.dump(prefix + "    ", shallow, exclude)
+                else (
+                    "\n"
+                    + (
+                        f"{prefix}    {type(attribute)}"
+                        if shallow
+                        else attribute.dump(prefix + "    ", shallow, exclude)
+                    )
+                    if isinstance(attribute, AbstractNode)
+                    else f" {attribute!r}"
                 )
-                if isinstance(attribute, AbstractNode)
-                else f" {attribute!r}"
             )
             for f in fields(self)
             if not exclude or f.name not in exclude
@@ -700,23 +702,19 @@ def evaluate(self) -> Any:
 
     @overload
     @classmethod
-    def from_value(cls, value: Union[bool, int, float, str]) -> "AstNbtValue":
-        ...
+    def from_value(cls, value: Union[bool, int, float, str]) -> "AstNbtValue": ...
 
     @overload
     @classmethod
-    def from_value(cls, value: Mapping[Any, Any]) -> "AstNbtCompound":
-        ...
+    def from_value(cls, value: Mapping[Any, Any]) -> "AstNbtCompound": ...
 
     @overload
     @classmethod
-    def from_value(cls, value: Sequence[Any]) -> "AstNbtList":
-        ...
+    def from_value(cls, value: Sequence[Any]) -> "AstNbtList": ...
 
     @overload
     @classmethod
-    def from_value(cls, value: Any) -> "AstNbt":
-        ...
+    def from_value(cls, value: Any) -> "AstNbt": ...
 
     @classmethod
     def from_value(cls, value: Any) -> "AstNbt":
@@ -1039,9 +1037,9 @@ class AstSelectorAdvancementMatch(AstNode):
     """Ast selector advancement match node."""
 
     key: AstResourceLocation = required_field()
-    value: Union[
-        AstBool, AstChildren[AstSelectorAdvancementPredicateMatch]
-    ] = required_field()
+    value: Union[AstBool, AstChildren[AstSelectorAdvancementPredicateMatch]] = (
+        required_field()
+    )
 
 
 @dataclass(frozen=True, slots=True)

mecha/contrib/annotate_diagnostics.py

@@ -1,6 +1,5 @@
 """Plugin that inserts comments containing mecha diagnostics."""
 
-
 __all__ = [
     "annotate_diagnostics",
 ]

mecha/contrib/bake_macros.py

@@ -1,6 +1,5 @@
 """Plugin for baking static macro invocations."""
 
-
 __all__ = [
     "bake_macros",
     "BakeMacrosOptions",
@@ -85,8 +84,7 @@ def __call__(
         source: TextFileBase[Any],
         *,
         preprocessor: Preprocessor,
-    ) -> AstRoot:
-        ...
+    ) -> AstRoot: ...
 
 
 @dataclass

mecha/contrib/clear_diagnostics.py

@@ -1,6 +1,5 @@
 """Plugin that clears diagnostics."""
 
-
 from beet import Context
 
 from mecha import Mecha

mecha/contrib/debug_ast.py

@@ -1,6 +1,5 @@
 """Plugin for emitting ast."""
 
-
 __all__ = [
     "DebugAstOptions",
     "DebugAstEmitter",

mecha/contrib/embed.py

@@ -1,6 +1,5 @@
 """Plugin for parsing and resolving embeds in json and nbt strings."""
 
-
 __all__ = [
     "AstJsonValueEmbed",
     "AstNbtValueEmbed",
@@ -64,15 +63,13 @@ def __call__(
         *,
         using: str,
         preprocessor: Preprocessor,
-    ) -> AstNode:
-        ...
+    ) -> AstNode: ...
 
 
 class EmbedSerializeCallback(Protocol):
     """Callback required for serializing embed."""
 
-    def __call__(self, node: AstNode) -> str:
-        ...
+    def __call__(self, node: AstNode) -> str: ...
 
 
 class EmbedHandler:

mecha/contrib/implicit_execute.py

@@ -1,6 +1,5 @@
 """Plugin that handles implicit execute commands."""
 
-
 __all__ = [
     "ImplicitExecuteParser",
 ]

mecha/contrib/inline_function_tag.py

@@ -1,6 +1,5 @@
 """Plugin for declaring function tags inline."""
 
-
 __all__ = [
     "InlineFunctionTagHandler",
 ]

mecha/contrib/json_files.py

@@ -1,6 +1,5 @@
 """Plugin for compiling json files with mecha."""
 
-
 __all__ = [
     "JsonFileCompilation",
     "AstJsonRoot",

mecha/contrib/messages.py

@@ -1,6 +1,5 @@
 """Plugin for handling message references in commands."""
 
-
 __all__ = [
     "AstMessageReference",
     "AstMessageReferencePath",

mecha/contrib/nested_location.py

@@ -1,6 +1,5 @@
 """Plugin for handling lexically nested resource locations."""
 
-
 __all__ = [
     "AstNestedLocation",
     "UnresolvedNestedLocation",

mecha/contrib/nested_resources.py

@@ -1,6 +1,5 @@
 """Plugin for handling nested resources."""
 
-
 __all__ = [
     "NestedResources",
     "NestedResourcesTransformer",
@@ -80,9 +79,11 @@ def __init__(
         }
 
         self.text_resources = {
-            f"{file_type.snake_name}_file"
-            if file_type.snake_name in should_disambiguate
-            else file_type.snake_name: file_type
+            (
+                f"{file_type.snake_name}_file"
+                if file_type.snake_name in should_disambiguate
+                else file_type.snake_name
+            ): file_type
             for pack in packs
             for file_type in pack.get_file_types(extend=TextFileBase)
         }
@@ -292,9 +293,11 @@ def nested_resources(self, node: AstRoot):
                         continue
 
                     file_instance = file_type(
-                        content.evaluate()
-                        if isinstance(content, AstJson)
-                        else content.value,
+                        (
+                            content.evaluate()
+                            if isinstance(content, AstJson)
+                            else content.value
+                        ),
                         original=self.database.current.original,
                     )
 

mecha/contrib/nested_yaml.py

@@ -1,6 +1,5 @@
 """Plugin for handling nested yaml."""
 
-
 __all__ = [
     "BaseYamlObjectCollector",
     "BaseYamlArrayCollector",
@@ -243,16 +242,22 @@ def __call__(self, stream: TokenStream) -> Any:
                     with stream.reset("nested_yaml"):
                         return self.original_parser(stream)
 
-        with stream.intercept("newline"), stream.syntax(
-            colon=r":",
-            dash=r"\-",
-            key=r"[a-zA-Z0-9._+-]+",
+        with (
+            stream.intercept("newline"),
+            stream.syntax(
+                colon=r":",
+                dash=r"\-",
+                key=r"[a-zA-Z0-9._+-]+",
+            ),
         ):
             if consume_line_continuation(stream):
                 return self.parse_yaml(stream)
 
-        with stream.ignore("newline"), stream.syntax(
-            string=r'"(?:\\.|[^\\\n])*?"' "|" r"'(?:\\.|[^\\\n])*?'",
+        with (
+            stream.ignore("newline"),
+            stream.syntax(
+                string=r'"(?:\\.|[^\\\n])*?"' "|" r"'(?:\\.|[^\\\n])*?'",
+            ),
         ):
             if token := stream.get("string"):
                 return self.string_collector(

mecha/contrib/raw.py

@@ -1,6 +1,5 @@
 """Plugin for inserting raw commands."""
 
-
 __all__ = [
     "RawCommandSerializer",
 ]

mecha/contrib/relative_location.py

@@ -1,6 +1,5 @@
 """Plugin that resolves relative resource locations."""
 
-
 __all__ = [
     "RelativeResourceLocationParser",
     "resolve_using_database",

mecha/contrib/source_map.py

@@ -1,6 +1,5 @@
 """Plugin that emits source mapping information."""
 
-
 __all__ = [
     "AstSourceMap",
     "SourceMapOptions",
@@ -31,7 +30,9 @@
 
 
 class SourceMapOptions(BaseModel):
-    header: str = "# [source_map] {{ compilation_unit.filename or compilation_unit.resource_location }}"
+    header: str = (
+        "# [source_map] {{ compilation_unit.filename or compilation_unit.resource_location }}"
+    )
 
     class Config:
         extra = "forbid"