refactor: remove builder classes from text-related modules to simplify API

Author: ya7010

examples/formatted_text.py

@@ -33,26 +33,6 @@ def formatted_text(text: tppt.pptx.shape.text.Text) -> tppt.pptx.shape.text.Text
                 width=(400, "pt"),
                 height=(50, "pt"),
             )
-            .text(
-                # Builder pattern.
-                lambda text: text.builder().text_frame(
-                    lambda text_frame: text_frame.builder().paragraph(
-                        lambda paragraph: paragraph.builder().run(
-                            lambda run: run.builder()
-                            .text("Hello, world!")
-                            .font(
-                                lambda font: font.builder()
-                                .color(lambda color: color.builder().rgb("#00FF00"))
-                                .italic(True)
-                            )
-                        )
-                    ),
-                ),
-                left=(50, "pt"),
-                top=(200, "pt"),
-                width=(400, "pt"),
-                height=(50, "pt"),
-            )
         )
         .build()
     )

src/tppt/pptx/dml/color.py

@@ -18,25 +18,9 @@ def rgb(self) -> Color | None:
     def rgb(self, color: Color | LiteralColor):
         self._pptx.rgb = to_pptx_rgb_color(color)
 
-    def builder(self) -> "ColorFormatBuilder":
-        return ColorFormatBuilder(self._pptx)
-
     def to_pptx(self) -> PptxColorFormat:
         return self._pptx
 
     @classmethod
     def from_pptx(cls, pptx_obj: PptxColorFormat) -> Self:
         return cls(pptx_obj)
-
-
-class ColorFormatBuilder:
-    def __init__(self, pptx_obj: PptxColorFormat) -> None:
-        self._pptx = pptx_obj
-
-    def rgb(self, color: Color | LiteralColor) -> Self:
-        self._pptx.rgb = to_pptx_rgb_color(color)
-
-        return self
-
-    def _build(self) -> ColorFormat:
-        return ColorFormat(self._pptx)

src/tppt/pptx/shape/text.py

@@ -1,10 +1,10 @@
-from typing import Callable, Literal, NotRequired, Self
+from typing import Literal, NotRequired, Self
 
 from pptx.enum.text import MSO_ANCHOR, MSO_AUTO_SIZE, PP_ALIGN
 from pptx.shapes.autoshape import Shape as PptxShape
 
 from tppt.pptx.converter import to_pptx_length, to_pptx_rgb_color
-from tppt.pptx.text.text_frame import TextFrame, TextFrameBuilder
+from tppt.pptx.text.text_frame import TextFrame
 from tppt.types._color import Color, LiteralColor
 from tppt.types._length import Length, LiteralLength
 
@@ -73,9 +73,6 @@ def __init__(self, pptx_obj: PptxShape, data: TextData | None = None, /) -> None
     def text_frame(self) -> TextFrame:
         return TextFrame(self._pptx.text_frame)
 
-    def builder(self) -> "TextBuilder":
-        return TextBuilder(self._pptx)
-
     def to_pptx(self) -> PptxShape:
         """Convert to pptx shape."""
         return self._pptx
@@ -84,20 +81,3 @@ def to_pptx(self) -> PptxShape:
     def from_pptx(cls, pptx_obj: PptxShape) -> Self:
         """Create from pptx shape."""
         return cls(pptx_obj)
-
-
-class TextBuilder:
-    def __init__(self, pptx_obj: PptxShape) -> None:
-        self._pptx = pptx_obj
-
-    def text_frame(
-        self, callable: Callable[[TextFrame], TextFrame | TextFrameBuilder]
-    ) -> Self:
-        text_frame = callable(TextFrame(self._pptx.text_frame))
-        if isinstance(text_frame, TextFrameBuilder):
-            text_frame._build()
-
-        return self
-
-    def _build(self) -> Text:
-        return Text(self._pptx)

src/tppt/pptx/slide.py

@@ -12,7 +12,7 @@
 from .shape import RangeProps, Shape
 from .shape.picture import Picture, PictureData, PictureProps
 from .shape.table import DataFrame, Table, TableData, TableProps, dataframe2list
-from .shape.text import Text, TextBuilder, TextData, TextProps
+from .shape.text import Text, TextData, TextProps
 from .slide_layout import SlideLayout
 from .snotes_slide import NotesSlide
 
@@ -96,12 +96,12 @@ def text(self, text: str, **kwargs: Unpack[TextProps]) -> Self: ...
 
     @overload
     def text(
-        self, text: Callable[[Text], Text | TextBuilder], **kwargs: Unpack[RangeProps]
+        self, text: Callable[[Text], Text], **kwargs: Unpack[RangeProps]
     ) -> Self: ...
 
     def text(
         self,
-        text: str | Callable[[Text], Text | TextBuilder],
+        text: str | Callable[[Text], Text],
         **kwargs: Unpack[TextProps],
     ) -> Self:
         def _register(slide: Slide) -> Text:
@@ -124,10 +124,7 @@ def _register(slide: Slide) -> Text:
                 data,
             )
             if isinstance(text, Callable):
-                text_builder = text(text_obj)
-                if isinstance(text_builder, TextBuilder):
-                    text_builder = text_builder._build()
-                return text_builder
+                return text(text_obj)
             else:
                 return text_obj
 

src/tppt/pptx/text/font.py

@@ -1,11 +1,11 @@
-from typing import Callable, Self
+from typing import Self
 
 from pptx.enum.text import MSO_TEXT_UNDERLINE_TYPE
 from pptx.text.text import Font as PptxFont
 
 from tppt.pptx.converter import PptxConvertible, to_pptx_length, to_tppt_length
-from tppt.pptx.dml.color import ColorFormat, ColorFormatBuilder
-from tppt.types._length import Length, LiteralLength
+from tppt.pptx.dml.color import ColorFormat
+from tppt.types._length import Length
 
 
 class Font(PptxConvertible[PptxFont]):
@@ -60,54 +60,9 @@ def color(self) -> ColorFormat:
     def color(self, color: ColorFormat) -> None:
         self._pptx.color = color.to_pptx()
 
-    def builder(self) -> "FontBuilder":
-        return FontBuilder(self._pptx)
-
     def to_pptx(self) -> PptxFont:
         return self._pptx
 
     @classmethod
     def from_pptx(cls, pptx_obj: PptxFont) -> Self:
         return cls(pptx_obj)
-
-
-class FontBuilder:
-    def __init__(self, pptx_obj: PptxFont) -> None:
-        self._pptx = pptx_obj
-
-    def name(self, name: str) -> Self:
-        self._pptx.name = name
-
-        return self
-
-    def size(self, size: Length | LiteralLength) -> Self:
-        self._pptx.size = to_pptx_length(size)
-
-        return self
-
-    def bold(self, bold: bool) -> Self:
-        self._pptx.bold = bold
-
-        return self
-
-    def italic(self, italic: bool) -> Self:
-        self._pptx.italic = italic
-
-        return self
-
-    def underline(self, underline: bool | MSO_TEXT_UNDERLINE_TYPE) -> Self:
-        self._pptx.underline = underline
-
-        return self
-
-    def color(
-        self, callable: Callable[[ColorFormat], ColorFormat | ColorFormatBuilder]
-    ) -> Self:
-        color = callable(ColorFormat(self._pptx.color))
-        if isinstance(color, ColorFormatBuilder):
-            color._build()
-
-        return self
-
-    def _build(self) -> Font:
-        return Font(self._pptx)

src/tppt/pptx/text/hyperlink.py

@@ -17,20 +17,9 @@ def address(self) -> str | None:
     def address(self, address: str | None) -> None:
         self._pptx.address = address
 
-    def builder(self) -> "HyperlinkBuilder":
-        return HyperlinkBuilder(self._pptx)
-
     def to_pptx(self) -> PptxHyperlink:
         return self._pptx
 
     @classmethod
     def from_pptx(cls, pptx_obj: PptxHyperlink) -> Self:
         return cls(pptx_obj)
-
-
-class HyperlinkBuilder:
-    def __init__(self, pptx_obj: PptxHyperlink) -> None:
-        self._pptx = pptx_obj
-
-    def _build(self) -> Hyperlink:
-        return Hyperlink(self._pptx)

src/tppt/pptx/text/paragraph.py

@@ -1,9 +1,9 @@
-from typing import Callable, Self
+from typing import Self
 
 from pptx.text.text import _Paragraph as PptxParagraph
 
 from tppt.pptx.converter import PptxConvertible
-from tppt.pptx.text.run import Run, RunBuilder
+from tppt.pptx.text.run import Run
 
 
 class Paragraph(PptxConvertible[PptxParagraph]):
@@ -17,32 +17,9 @@ def runs(self) -> list[Run]:
     def add_run(self) -> Run:
         return Run(self._pptx.add_run())
 
-    def builder(self) -> "ParagraphBuilder":
-        return ParagraphBuilder(self._pptx)
-
     def to_pptx(self) -> PptxParagraph:
         return self._pptx
 
     @classmethod
     def from_pptx(cls, pptx_obj: PptxParagraph) -> Self:
         return cls(pptx_obj)
-
-
-class ParagraphBuilder:
-    def __init__(self, pptx_obj: PptxParagraph) -> None:
-        self._pptx = pptx_obj
-
-    def text(self, text: str) -> "ParagraphBuilder":
-        self._pptx.text = text
-
-        return self
-
-    def run(self, callable: Callable[[Run], Run | RunBuilder]) -> "ParagraphBuilder":
-        run = callable(Run(self._pptx.add_run()))
-        if isinstance(run, RunBuilder):
-            run._build()
-
-        return self
-
-    def _build(self) -> Paragraph:
-        return Paragraph(self._pptx)

src/tppt/pptx/text/run.py

@@ -1,10 +1,10 @@
-from typing import Callable, Self
+from typing import Self
 
 from pptx.text.text import _Run as PptxRun
 
 from tppt.pptx.converter import PptxConvertible
-from tppt.pptx.text.font import Font, FontBuilder
-from tppt.pptx.text.hyperlink import Hyperlink, HyperlinkBuilder
+from tppt.pptx.text.font import Font
+from tppt.pptx.text.hyperlink import Hyperlink
 
 
 class Run(PptxConvertible[PptxRun]):
@@ -27,41 +27,9 @@ def font(self) -> Font:
     def hyperlink(self) -> Hyperlink:
         return Hyperlink(self._pptx.hyperlink)
 
-    def builder(self) -> "RunBuilder":
-        return RunBuilder(self._pptx)
-
     def to_pptx(self) -> PptxRun:
         return self._pptx
 
     @classmethod
     def from_pptx(cls, pptx_obj: PptxRun) -> Self:
         return cls(pptx_obj)
-
-
-class RunBuilder:
-    def __init__(self, pptx_obj: PptxRun) -> None:
-        self._pptx = pptx_obj
-
-    def text(self, text: str) -> Self:
-        self._pptx.text = text
-
-        return self
-
-    def font(self, callable: Callable[[Font], Font | FontBuilder]) -> Self:
-        font = callable(Font(self._pptx.font))
-        if isinstance(font, FontBuilder):
-            font._build()
-
-        return self
-
-    def hyperlink(
-        self, callable: Callable[[Hyperlink], Hyperlink | HyperlinkBuilder]
-    ) -> Self:
-        hyperlink = callable(Hyperlink(self._pptx.hyperlink))
-        if isinstance(hyperlink, HyperlinkBuilder):
-            hyperlink._build()
-
-        return self
-
-    def _build(self) -> Run:
-        return Run(self._pptx)

src/tppt/pptx/text/text_frame.py

@@ -1,9 +1,9 @@
-from typing import Callable, Self
+from typing import Self
 
 from pptx.text.text import TextFrame as PptxTextFrame
 
 from tppt.pptx.converter import PptxConvertible
-from tppt.pptx.text.paragraph import Paragraph, ParagraphBuilder
+from tppt.pptx.text.paragraph import Paragraph
 
 
 class TextFrame(PptxConvertible[PptxTextFrame]):
@@ -13,29 +13,9 @@ def __init__(self, pptx_obj: PptxTextFrame) -> None:
     def add_paragraph(self) -> Paragraph:
         return Paragraph(self._pptx.add_paragraph())
 
-    def builder(self) -> "TextFrameBuilder":
-        return TextFrameBuilder(self._pptx)
-
     def to_pptx(self) -> PptxTextFrame:
         return self._pptx
 
     @classmethod
     def from_pptx(cls, pptx_obj: PptxTextFrame) -> Self:
         return cls(pptx_obj)
-
-
-class TextFrameBuilder:
-    def __init__(self, pptx_obj: PptxTextFrame) -> None:
-        self._pptx = pptx_obj
-
-    def paragraph(
-        self, callable: Callable[[Paragraph], Paragraph | ParagraphBuilder]
-    ) -> "TextFrameBuilder":
-        paragraph = callable(Paragraph(self._pptx.add_paragraph()))
-        if isinstance(paragraph, ParagraphBuilder):
-            paragraph._build()
-
-        return self
-
-    def _build(self) -> TextFrame:
-        return TextFrame(self._pptx)