Consolidate hexdoc hooks

pyproject.toml

@@ -103,8 +103,6 @@ hexdoc = "hexdoc._cli.app:app"
 
 [project.entry-points.hexdoc]
 hexdoc = "hexdoc._hooks:HexdocPlugin"
-minecraft = "hexdoc.minecraft._hooks:MinecraftPlugin"
-patchouli = "hexdoc.patchouli._hooks:PatchouliPlugin"
 
 # Pytest
 
@@ -139,6 +137,9 @@ extend-exclude = [
     "[{][{]cookiecutter.output_directory[}][}]",
 ]
 
+[tool.ruff.lint.isort]
+combine-as-imports = true
+
 # type checking
 
 [tool.pyright]

src/hexdoc/_cli/app.py

@@ -155,7 +155,7 @@ def render(
 
     template_names = (
         props.template.render
-        if props.template.was_render_set
+        if props.template.override_default_render
         else pm.default_rendered_templates(props.template.include)
     ) | props.template.extend_render
 

src/hexdoc/_cli/utils/render.py

@@ -4,7 +4,7 @@
 import logging
 import shutil
 from pathlib import Path
-from typing import Any
+from typing import Any, Sequence
 
 from _hexdoc_favicons import Favicons
 from jinja2 import (
@@ -20,6 +20,7 @@
 from jinja2.sandbox import SandboxedEnvironment
 
 from hexdoc.core import Properties, ResourceLocation
+from hexdoc.core.properties import JINJA_NAMESPACE_ALIASES
 from hexdoc.data import HexdocMetadata
 from hexdoc.jinja import (
     IncludeRawExtension,
@@ -37,10 +38,6 @@
 
 
 class HexdocTemplateLoader(BaseLoader):
-    NAMESPACE_ALIASES = {
-        "patchouli": "hexdoc",
-    }
-
     def __init__(
         self,
         included: dict[str, PackageLoader],
@@ -57,7 +54,7 @@ def __init__(
         self.props_file = props_file
 
     def get_source(self, environment: Environment, template: str):
-        for alias, replacement in self.NAMESPACE_ALIASES.items():
+        for alias, replacement in JINJA_NAMESPACE_ALIASES.items():
             if template.startswith(f"{alias}:"):
                 logging.getLogger(__name__).info(
                     f"Replacing {alias} with {replacement} for template {template}"
@@ -80,7 +77,7 @@ def get_source(self, environment: Environment, template: str):
             raise
 
 
-def create_jinja_env(pm: PluginManager, include: list[str], props_file: Path):
+def create_jinja_env(pm: PluginManager, include: Sequence[str], props_file: Path):
     included, extra = pm.load_jinja_templates(include)
 
     env = SandboxedEnvironment(

src/hexdoc/_hooks.py

@@ -2,17 +2,24 @@
 from pathlib import Path
 
 import hexdoc
+from hexdoc.minecraft.recipe import (
+    ingredients as minecraft_ingredients,
+    recipes as minecraft_recipes,
+)
+from hexdoc.patchouli.page import pages as patchouli_pages
 from hexdoc.plugin import (
     DefaultRenderedTemplatesImpl,
     HookReturn,
     LoadJinjaTemplatesImpl,
     LoadResourceDirsImpl,
+    LoadTaggedUnionsImpl,
     ModVersionImpl,
     hookimpl,
 )
 
 
 class HexdocPlugin(
+    LoadTaggedUnionsImpl,
     ModVersionImpl,
     LoadResourceDirsImpl,
     LoadJinjaTemplatesImpl,
@@ -21,7 +28,8 @@ class HexdocPlugin(
     @staticmethod
     @hookimpl
     def hexdoc_mod_version():
-        return "(TODO: remove)"
+        # need to implement this to be able to use `hexdoc export`
+        return ""
 
     @staticmethod
     @hookimpl
@@ -30,6 +38,15 @@ def hexdoc_load_resource_dirs() -> HookReturn[Package]:
 
         return [generated, resources]
 
+    @staticmethod
+    @hookimpl
+    def hexdoc_load_tagged_unions() -> HookReturn[Package]:
+        return [
+            patchouli_pages,
+            minecraft_recipes,
+            minecraft_ingredients,
+        ]
+
     @staticmethod
     @hookimpl
     def hexdoc_load_jinja_templates() -> tuple[Package, str]:

src/hexdoc/core/properties.py

@@ -4,7 +4,7 @@
 from pathlib import Path
 from typing import Any, Self, Sequence
 
-from pydantic import Field, PrivateAttr
+from pydantic import Field, PrivateAttr, field_validator
 from pydantic_settings import BaseSettings, SettingsConfigDict
 
 from hexdoc.model.strip_hidden import StripHiddenModel
@@ -14,10 +14,15 @@
     load_toml_with_placeholders,
     relative_path_root,
 )
+from hexdoc.utils.types import PydanticOrderedSet
 
 from .resource import ResourceLocation
 from .resource_dir import ResourceDir
 
+JINJA_NAMESPACE_ALIASES = {
+    "patchouli": "hexdoc",
+}
+
 
 class EnvironmentVariableProps(BaseSettings):
     model_config = SettingsConfigDict(env_file=".env", extra="allow")
@@ -63,7 +68,7 @@ def _github_repository_parts(self):
 class TemplateProps(StripHiddenModel, validate_assignment=True):
     static_dir: RelativePath | None = None
     icon: RelativePath
-    include: list[str]
+    include: PydanticOrderedSet[str]
 
     render: dict[Path, str] = Field(default_factory=dict)
     extend_render: dict[Path, str] = Field(default_factory=dict)
@@ -73,9 +78,18 @@ class TemplateProps(StripHiddenModel, validate_assignment=True):
     _was_render_set: bool = PrivateAttr(False)
 
     @property
-    def was_render_set(self):
+    def override_default_render(self):
         return self._was_render_set
 
+    @field_validator("include", mode="after")
+    @classmethod
+    def _resolve_aliases(cls, values: PydanticOrderedSet[str]):
+        for alias, replacement in JINJA_NAMESPACE_ALIASES.items():
+            if alias in values:
+                values.remove(alias)
+                values.add(replacement)
+        return values
+
 
 class MinecraftAssetsProps(StripHiddenModel):
     ref: str