fix: handle ordered lists bbcode

Author: Redbot

.gitignore

@@ -7,6 +7,7 @@ output.bbcode
 output.html
 output.md
 output.ast
+input.md
 testme.md
 test2.md
 dist/

src/md2bbcode/main.py

@@ -17,12 +17,13 @@
 from mistune.plugins.spoiler import spoiler
 
 # local
+from md2bbcode.plugins.merge_lists import merge_ordered_lists
 from md2bbcode.renderers.bbcode import BBCodeRenderer
 from md2bbcode.html2bbcode import process_html
 
 def convert_markdown_to_bbcode(markdown_text, domain):
     # Create a Markdown parser instance using the custom BBCode renderer
-    markdown_parser = mistune.create_markdown(renderer=BBCodeRenderer(domain=domain), plugins=[strikethrough, mark, superscript, subscript, insert, table, footnotes, task_lists, def_list, abbr, spoiler, table_in_list])
+    markdown_parser = mistune.create_markdown(renderer=BBCodeRenderer(domain=domain), plugins=[strikethrough, mark, superscript, subscript, insert, table, footnotes, task_lists, def_list, abbr, spoiler, table_in_list, merge_ordered_lists])
 
     # Convert Markdown text to BBCode
     return markdown_parser(markdown_text)

src/md2bbcode/md2ast.py

@@ -10,9 +10,12 @@
 from mistune.plugins.abbr import abbr
 from mistune.plugins.spoiler import spoiler
 
+#local
+from md2bbcode.plugins.merge_lists import merge_ordered_lists
+
 def convert_markdown_to_ast(input_filepath, output_filepath):
     # Initialize Markdown parser with no renderer to produce an AST
-    markdown_parser = mistune.create_markdown(renderer=None, plugins=[strikethrough, mark, superscript, subscript, insert, table, footnotes, task_lists, def_list, abbr, spoiler, table_in_list])
+    markdown_parser = mistune.create_markdown(renderer=None, plugins=[strikethrough, mark, superscript, subscript, insert, table, footnotes, task_lists, def_list, abbr, spoiler, table_in_list, merge_ordered_lists])
 
     # Read the input Markdown file
     with open(input_filepath, 'r', encoding='utf-8') as md_file:

src/md2bbcode/plugins/merge_lists.py

@@ -0,0 +1,83 @@
+from typing import Dict, Any, List
+
+def merge_ordered_lists(md):
+    """
+    A plugin to merge consecutive "top-level" ordered lists into one,
+    and also attach any intervening code blocks or blank lines to the
+    last list item so that the final BBCode appears as a single list
+    with multiple steps.
+
+    This relies on a few assumptions:
+      1) The only tokens between two ordered lists that should be merged
+         are code blocks or blank lines (not normal paragraphs).
+      2) We want any code block(s) right after a list item to appear in
+         that same bullet item.
+    """
+
+    def rewrite_tokens(md, state):
+        tokens = state.tokens
+        merged = []
+        i = 0
+
+        while i < len(tokens):
+            token = tokens[i]
+
+            # Check if this token is a top-level ordered list
+            if (
+                token["type"] == "list"
+                and token.get("attrs", {}).get("ordered", False)
+                and token.get("attrs", {}).get("depth", 0) == 0
+            ):
+                # Start new merged list
+                current_depth = token["attrs"]["depth"]
+                list_items = list(token["children"])  # bullet items in the first list
+                i += 1
+
+                # Continue until we run into something that's not:
+                #   another top-level ordered list,
+                #   or code blocks / blank lines (which we'll attach to the last bullet).
+                while i < len(tokens):
+                    nxt = tokens[i]
+
+                    # If there's another ordered list at the same depth, merge its bullet items
+                    if (
+                        nxt["type"] == "list"
+                        and nxt.get("attrs", {}).get("ordered", False)
+                        and nxt.get("attrs", {}).get("depth", 0) == current_depth
+                    ):
+                        list_items.extend(nxt["children"])
+                        i += 1
+
+                    # If there's a code block or blank line, attach it to the *last* bullet item.
+                    elif nxt["type"] in ["block_code", "blank_line"]:
+                        if list_items:  # attach to last bullet item, if any
+                            list_items[-1]["children"].append(nxt)
+                        i += 1
+
+                    else:
+                        # Not a same-depth list or code block—stop merging
+                        break
+
+                # Create single merged list token
+                merged.append(
+                    {
+                        "type": "list",
+                        "children": list_items,
+                        "attrs": {
+                            "ordered": True,
+                            "depth": current_depth,
+                        },
+                    }
+                )
+
+            else:
+                # If not a top-level ordered list, just keep it as-is
+                merged.append(token)
+                i += 1
+
+        # Replace the old tokens with the merged version
+        state.tokens = merged
+
+    # Attach to before_render_hooks so we can manipulate tokens before rendering
+    md.before_render_hooks.append(rewrite_tokens)
+    return md

src/md2bbcode/renderers/bbcode.py

@@ -107,12 +107,12 @@ def block_code(self, code: str, **attrs) -> str:
             # Check if the language needs special handling
             bbcode_lang = special_cases.get(lang, lang)  # Use the special case if it exists, otherwise use lang as is
             if bbcode_lang:
-                return f"[CODE={bbcode_lang}]{escape_text(code)}[/CODE]\n\n"
+                return f"[CODE={bbcode_lang}]{escape_text(code)}[/CODE]\n"
             else:
-                return f"[CODE]{escape_text(code)}[/CODE]\n\n"
+                return f"[CODE]{escape_text(code)}[/CODE]\n"
         else:
             # No language specified, render with a generic [CODE] tag
-            return f"[CODE]{escape_text(code)}[/CODE]\n\n"
+            return f"[CODE]{escape_text(code)}[/CODE]\n"
 
     def block_quote(self, text: str) -> str:
         return '[QUOTE]\n' + text + '[/QUOTE]\n'
@@ -126,7 +126,9 @@ def block_error(self, text: str) -> str:
         return '[color=red][icode]' + text + '[/icode][/color]\n'
 
     def list(self, text: str, ordered: bool, **attrs) -> str:
-        tag = 'list' if not ordered else 'list=1'
+        # For ordered lists, always use [list=1] to get automatic sequential numbering
+        # For unordered lists, use [list]
+        tag = 'list=1' if ordered else 'list'
         return '[{}]'.format(tag) + text + '[/list]\n'
 
     def list_item(self, text: str) -> str: