ophinode 0.0.1a1__tar.gz → 0.0.1a2__tar.gz

{ophinode-0.0.1a1 → ophinode-0.0.1a2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ophinode
-Version: 0.0.1a1
+Version: 0.0.1a2
 Summary: A static site generator written in Python
 Project-URL: Homepage, https://github.com/deflatedlatte/ophinode
 Project-URL: Issues, https://github.com/deflatedlatte/ophinode/issues
@@ -44,7 +44,7 @@ class MainPage:
             Title("Main Page")
         ]
 
-render_page(MainPage(), HTML5Layout())
+print(render_page(MainPage(), HTML5Layout()))
 
 ```
 

{ophinode-0.0.1a1 → ophinode-0.0.1a2}/README.md

@@ -30,7 +30,7 @@ class MainPage:
             Title("Main Page")
         ]
 
-render_page(MainPage(), HTML5Layout())
+print(render_page(MainPage(), HTML5Layout()))
 
 ```
 

{ophinode-0.0.1a1 → ophinode-0.0.1a2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "ophinode"
-version = "0.0.1a1"
+version = "0.0.1a2"
 authors = [
   { name="deflatedlatte", email="deflatedlatte@gmail.com" },
 ]

{ophinode-0.0.1a1 → ophinode-0.0.1a2}/src/ophinode/nodes/html.py

@@ -199,9 +199,14 @@ class OpenElement(Element, OpenRenderable, Expandable, Preparable):
     def __init__(
         self,
         *args,
+        cls = None,
+        className = None,
         class_name = None,
+        htmlFor = None,
         html_for = None,
+        htmlAs = None,
         html_as = None,
+        htmlAsync = None,
         html_async = None,
         accept_charset = None,
         escape_ampersands = None,
@@ -214,12 +219,22 @@ class OpenElement(Element, OpenRenderable, Expandable, Preparable):
             for c in children:
                 self._children.append(c)
         self._attributes = dict(kwargs)
+        if cls is not None:
+            self._attributes["class"] = cls
+        if className is not None:
+            self._attributes["class"] = className
         if class_name is not None:
             self._attributes["class"] = class_name
+        if htmlFor is not None:
+            self._attributes["for"] = htmlFor
         if html_for is not None:
             self._attributes["for"] = html_for
+        if htmlAs is not None:
+            self._attributes["as"] = htmlAs
         if html_as is not None:
             self._attributes["as"] = html_as
+        if htmlAsync is not None:
+            self._attributes["async"] = htmlAsync
         if html_async is not None:
             self._attributes["async"] = html_async
         if accept_charset is not None:
@@ -273,9 +288,14 @@ class ClosedElement(Element, ClosedRenderable):
     def __init__(
         self,
         *,
+        cls = None,
+        className = None,
         class_name = None,
+        htmlFor = None,
         html_for = None,
+        htmlAs = None,
         html_as = None,
+        htmlAsync = None,
         html_async = None,
         accept_charset = None,
         escape_ampersands = None,
@@ -283,12 +303,22 @@ class ClosedElement(Element, ClosedRenderable):
         **kwargs
     ):
         self._attributes = dict(kwargs)
+        if cls is not None:
+            self._attributes["class"] = cls
+        if className is not None:
+            self._attributes["class"] = className
         if class_name is not None:
             self._attributes["class"] = class_name
+        if htmlFor is not None:
+            self._attributes["for"] = htmlFor
         if html_for is not None:
             self._attributes["for"] = html_for
+        if htmlAs is not None:
+            self._attributes["as"] = htmlAs
         if html_as is not None:
             self._attributes["as"] = html_as
+        if htmlAsync is not None:
+            self._attributes["async"] = htmlAsync
         if html_async is not None:
             self._attributes["async"] = html_async
         if accept_charset is not None:
@@ -330,6 +360,33 @@ class MetaElement(ClosedElement):
 class StyleElement(OpenElement):
     tag = "style"
 
+    def __init__(self, *args, escape_tag_delimiters = None, **kwargs):
+        if escape_tag_delimiters is None:
+            # stylesheets might contain angle brackets, so it is better to
+            # disable tag delimiter escaping by default
+            escape_tag_delimiters = False
+        super().__init__(
+            *args,
+            escape_tag_delimiters=escape_tag_delimiters,
+            **kwargs
+        )
+
+    def expand(self, context: "ophinode.rendering.RenderContext"):
+        expansion = []
+        for c in self._children:
+            if isinstance(c, str):
+                # Stylesheets might contain "</style", so it must be escaped
+                content = c.replace("</script", "\\3C/script")
+                node = TextNode(content)
+                if self._escape_ampersands is not None:
+                    node.escape_ampersands(self._escape_ampersands)
+                if self._escape_tag_delimiters is not None:
+                    node.escape_tag_delimiters(self._escape_tag_delimiters)
+                expansion.append(node)
+            else:
+                expansion.append(c)
+        return expansion
+
 Head = HeadElement
 Title = TitleElement
 Base = BaseElement
@@ -402,6 +459,7 @@ H4 = HeadingLevel4Element
 H5 = HeadingLevel5Element
 H6 = HeadingLevel6Element
 HGroup = HeadingGroupElement
+Hgroup = HeadingGroupElement
 Header = HeaderElement
 Footer = FooterElement
 Address = AddressElement
@@ -462,17 +520,26 @@ class DivisionElement(OpenElement):
 
 P = ParagraphElement
 HR = HorizontalRuleElement
+Hr = HorizontalRuleElement
 Pre = PreformattedTextElement
 BlockQuote = BlockQuotationElement
+Blockquote = BlockQuotationElement
 OL = OrderedListElement
+Ol = OrderedListElement
 UL = UnorderedListElement
+Ul = UnorderedListElement
 Menu = MenuElement
 LI = ListItemElement
+Li = ListItemElement
 DL = DescriptionListElement
+Dl = DescriptionListElement
 DT = DescriptionTermElement
+Dt = DescriptionTermElement
 DD = DescriptionDetailsElement
+Dd = DescriptionDetailsElement
 Figure = FigureElement
 FigCaption = FigureCaptionElement
+Figcaption = FigureCaptionElement
 Main = MainElement
 Search = SearchElement
 Div = DivisionElement
@@ -594,6 +661,7 @@ class LineBreakOpportunityElement(ClosedElement):
 
 A = AnchorElement
 EM = EmphasisElement
+Em = EmphasisElement
 Strong = StrongImportanceElement
 Small = SmallPrintElement
 S = StrikethroughElement
@@ -603,7 +671,9 @@ Dfn = DefinitionElement
 Abbr = AbbreviationElement
 Ruby = RubyAnnotationElement
 RT = RubyTextElement
+Rt = RubyTextElement
 RP = RubyParenthesesElement
+Rp = RubyParenthesesElement
 Data = DataElement
 Time = TimeElement
 Code = CodeElement
@@ -617,10 +687,14 @@ B = BoldTextElement
 U = UnarticulatedAnnotationElement
 Mark = MarkedTextElement
 BDI = BidirectionalIsolateElement
+Bdi = BidirectionalIsolateElement
 BDO = BidirectionalOverrideElement
+Bdo = BidirectionalOverrideElement
 Span = SpanElement
 BR = LineBreakElement
+Br = LineBreakElement
 WBR = LineBreakOpportunityElement
+Wbr = LineBreakOpportunityElement
 
 # --- Edits ---
 
@@ -673,6 +747,7 @@ Picture = PictureElement
 Source = SourceElement
 Image = ImageElement
 IFrame = InlineFrameElement
+Iframe = InlineFrameElement
 Embed = EmbeddedContentElement
 Object = ExternalObjectElement
 Video = VideoElement
@@ -716,13 +791,20 @@ class TableHeaderCellElement(OpenElement):
 Table = TableElement
 Caption = TableCaptionElement
 ColGroup = TableColumnGroupElement
+Colgroup = TableColumnGroupElement
 Column = TableColumnElement
 TBody = TableBodyElement
+Tbody = TableBodyElement
 THead = TableHeadElement
+Thead = TableHeadElement
 TFoot = TableFootElement
+Tfoot = TableFootElement
 TR = TableRowElement
+Tr = TableRowElement
 TD = TableDataCellElement
+Td = TableDataCellElement
 TH = TableHeaderCellElement
+Th = TableHeaderCellElement
 
 # --- Forms ---
 
@@ -778,11 +860,14 @@ Input = InputElement
 Button = ButtonElement
 Select = SelectElement
 DataList = DataListElement
+Datalist = DataListElement
 OptGroup = OptionGroupElement
+Optgroup = OptionGroupElement
 Option = OptionElement
 Progress = ProgressElement
 Meter = MeterElement
 FieldSet = FieldSetElement
+Fieldset = FieldSetElement
 Legend = FieldSetLegendElement
 
 # --- Interactive elements ---
@@ -806,6 +891,55 @@ Dialog = DialogElement
 class ScriptElement(OpenElement):
     tag = "script"
 
+    def __init__(self, *args, escape_tag_delimiters = None, **kwargs):
+        if escape_tag_delimiters is None:
+            # javascript code might contain angle brackets,
+            # so it is better to disable tag delimiter escaping by default
+            escape_tag_delimiters = False
+        super().__init__(
+            *args,
+            escape_tag_delimiters=escape_tag_delimiters,
+            **kwargs
+        )
+
+    def expand(self, context: "ophinode.rendering.RenderContext"):
+        expansion = []
+        for c in self._children:
+            if isinstance(c, str):
+                # Due to restrictions for contents of script elements, some
+                # sequences of characters must be replaced before constructing
+                # a script element.
+                # 
+                # Unfortunately, correctly replacing such character sequences
+                # require a full lexical analysis on the script content, but
+                # ophinode is currently incapable of doing so.
+                #
+                # However, the sequences are expected to be rarely seen
+                # outside literals, so replacements are done nonetheless.
+                #
+                # This behavior might change in the later versions of ophinode
+                # when it starts to better support inline scripting.
+                #
+                # Read https://html.spec.whatwg.org/multipage/scripting.html#restrictions-for-contents-of-script-elements
+                # for more information.
+                #
+                content = c.replace(
+                    "<!--", "\\x3C!--"
+                ).replace(
+                    "<script", "\\x3Cscript"
+                ).replace(
+                    "</script", "\\x3C/script"
+                )
+                node = TextNode(content)
+                if self._escape_ampersands is not None:
+                    node.escape_ampersands(self._escape_ampersands)
+                if self._escape_tag_delimiters is not None:
+                    node.escape_tag_delimiters(self._escape_tag_delimiters)
+                expansion.append(node)
+            else:
+                expansion.append(c)
+        return expansion
+
 class NoScriptElement(OpenElement):
     tag = "noscript"
 
@@ -820,6 +954,7 @@ class CanvasElement(OpenElement):
 
 Script = ScriptElement
 NoScript = NoScriptElement
+Noscript = NoScriptElement
 Template = TemplateElement
 Slot = SlotElement
 Canvas = CanvasElement