Add type hints where missing

funnel/utils/markdown/mdit_plugins/block_code_ext.py

@@ -2,13 +2,13 @@
 
 from __future__ import annotations
 
-from collections.abc import MutableMapping, Sequence
+from collections.abc import Sequence
 from typing import Any
 
 from markdown_it import MarkdownIt
 from markdown_it.renderer import RendererHTML
 from markdown_it.token import Token
-from markdown_it.utils import OptionsDict
+from markdown_it.utils import EnvType, OptionsDict
 
 __all__ = ['block_code_extend_plugin']
 
@@ -18,7 +18,7 @@ def fence(
     tokens: Sequence[Token],
     idx: int,
     options: OptionsDict,
-    env: MutableMapping,
+    env: EnvType,
 ) -> str:
     output = RendererHTML.fence(renderer, tokens, idx, options, env)
     output = output.replace('<pre><code>', '<pre><code class="language-none">')
@@ -30,7 +30,7 @@ def code_block(
     tokens: Sequence[Token],
     idx: int,
     options: OptionsDict,
-    env: MutableMapping,
+    env: EnvType,
 ) -> str:
     output = RendererHTML.code_block(renderer, tokens, idx, options, env)
     output = output.replace('<pre><code>', '<pre><code class="language-none">')

funnel/utils/markdown/mdit_plugins/del_tag.py

@@ -2,12 +2,12 @@
 
 from __future__ import annotations
 
-from collections.abc import MutableMapping, Sequence
+from collections.abc import Sequence
 
 from markdown_it import MarkdownIt
 from markdown_it.renderer import RendererHTML
 from markdown_it.token import Token
-from markdown_it.utils import OptionsDict
+from markdown_it.utils import EnvType, OptionsDict
 
 __all__ = ['del_plugin']
 
@@ -17,7 +17,7 @@ def del_open(
     tokens: Sequence[Token],
     idx: int,
     options: OptionsDict,
-    env: MutableMapping,
+    env: EnvType,
 ) -> str:
     return '<del>'
 
@@ -27,7 +27,7 @@ def del_close(
     tokens: Sequence[Token],
     idx: int,
     options: OptionsDict,
-    env: MutableMapping,
+    env: EnvType,
 ) -> str:
     return '</del>'
 

funnel/utils/markdown/mdit_plugins/embeds.py

@@ -8,15 +8,15 @@
 from __future__ import annotations
 
 import re
-from collections.abc import MutableMapping, Sequence
+from collections.abc import Sequence
 from math import floor
 
 from markdown_it import MarkdownIt
 from markdown_it.common.utils import charCodeAt
 from markdown_it.renderer import RendererHTML
 from markdown_it.rules_block import StateBlock
 from markdown_it.token import Token
-from markdown_it.utils import OptionsDict
+from markdown_it.utils import EnvType, OptionsDict
 
 __all__ = ['embeds_plugin']
 
@@ -43,7 +43,7 @@ def render(
         tokens: Sequence[Token],
         idx: int,
         options: OptionsDict,
-        env: MutableMapping,
+        env: EnvType,
     ) -> str:
         token = tokens[idx]
         content = md.utils.escapeHtml(token.content)

funnel/utils/markdown/mdit_plugins/footnote_ext.py

@@ -2,13 +2,13 @@
 
 from __future__ import annotations
 
-from collections.abc import MutableMapping, Sequence
+from collections.abc import Sequence
 from typing import Any
 
 from markdown_it import MarkdownIt
 from markdown_it.renderer import RendererHTML
 from markdown_it.token import Token
-from markdown_it.utils import OptionsDict
+from markdown_it.utils import EnvType, OptionsDict
 from mdit_py_plugins.footnote.index import render_footnote_caption
 
 __all__ = ['footnote_extend_plugin']
@@ -19,7 +19,7 @@ def caption(
     tokens: Sequence[Token],
     idx: int,
     options: OptionsDict,
-    env: MutableMapping,
+    env: EnvType,
 ) -> str:
     output = render_footnote_caption(renderer, tokens, idx, options, env)
     return output.replace('[', '').replace(']', '')

funnel/utils/markdown/mdit_plugins/ins_tag.py

@@ -6,14 +6,14 @@
 
 from __future__ import annotations
 
-from collections.abc import MutableMapping, Sequence
+from collections.abc import Sequence
 
 from markdown_it import MarkdownIt
 from markdown_it.renderer import RendererHTML
 from markdown_it.rules_inline import StateInline
 from markdown_it.rules_inline.state_inline import Delimiter
 from markdown_it.token import Token
-from markdown_it.utils import OptionsDict
+from markdown_it.utils import EnvType, OptionsDict
 
 __all__ = ['ins_plugin']
 
@@ -124,7 +124,7 @@ def ins_open(
     tokens: Sequence[Token],
     idx: int,
     options: OptionsDict,
-    env: MutableMapping,
+    env: EnvType,
 ) -> str:
     return '<ins>'
 
@@ -134,7 +134,7 @@ def ins_close(
     tokens: Sequence[Token],
     idx: int,
     options: OptionsDict,
-    env: MutableMapping,
+    env: EnvType,
 ) -> str:
     return '</ins>'
 

funnel/utils/markdown/mdit_plugins/mark_tag.py

@@ -6,14 +6,14 @@
 
 from __future__ import annotations
 
-from collections.abc import MutableMapping, Sequence
+from collections.abc import Sequence
 
 from markdown_it import MarkdownIt
 from markdown_it.renderer import RendererHTML
 from markdown_it.rules_inline import StateInline
 from markdown_it.rules_inline.state_inline import Delimiter
 from markdown_it.token import Token
-from markdown_it.utils import OptionsDict
+from markdown_it.utils import EnvType, OptionsDict
 
 __all__ = ['mark_plugin']
 
@@ -141,7 +141,7 @@ def mark_open(
     tokens: Sequence[Token],
     idx: int,
     options: OptionsDict,
-    env: MutableMapping,
+    env: EnvType,
 ) -> str:
     return '<mark>'
 
@@ -151,7 +151,7 @@ def mark_close(
     tokens: Sequence[Token],
     idx: int,
     options: OptionsDict,
-    env: MutableMapping,
+    env: EnvType,
 ) -> str:
     return '</mark>'
 

funnel/utils/markdown/mdit_plugins/sub_tag.py

@@ -8,13 +8,13 @@
 from __future__ import annotations
 
 import re
-from collections.abc import MutableMapping, Sequence
+from collections.abc import Sequence
 
 from markdown_it import MarkdownIt
 from markdown_it.renderer import RendererHTML
 from markdown_it.rules_inline import StateInline
 from markdown_it.token import Token
-from markdown_it.utils import OptionsDict
+from markdown_it.utils import EnvType, OptionsDict
 
 __all__ = ['sub_plugin']
 
@@ -82,7 +82,7 @@ def sub_open(
     tokens: Sequence[Token],
     idx: int,
     options: OptionsDict,
-    env: MutableMapping,
+    env: EnvType,
 ) -> str:
     return '<sub>'
 
@@ -92,7 +92,7 @@ def sub_close(
     tokens: Sequence[Token],
     idx: int,
     options: OptionsDict,
-    env: MutableMapping,
+    env: EnvType,
 ) -> str:
     return '</sub>'
 

funnel/utils/markdown/mdit_plugins/sup_tag.py

@@ -8,13 +8,13 @@
 from __future__ import annotations
 
 import re
-from collections.abc import MutableMapping, Sequence
+from collections.abc import Sequence
 
 from markdown_it import MarkdownIt
 from markdown_it.renderer import RendererHTML
 from markdown_it.rules_inline import StateInline
 from markdown_it.token import Token
-from markdown_it.utils import OptionsDict
+from markdown_it.utils import EnvType, OptionsDict
 
 __all__ = ['sup_plugin']
 
@@ -82,7 +82,7 @@ def sup_open(
     tokens: Sequence[Token],
     idx: int,
     options: OptionsDict,
-    env: MutableMapping,
+    env: EnvType,
 ) -> str:
     return '<sup>'
 
@@ -92,7 +92,7 @@ def sup_close(
     tokens: Sequence[Token],
     idx: int,
     options: OptionsDict,
-    env: MutableMapping,
+    env: EnvType,
 ) -> str:
     return '</sup>'
 

funnel/utils/markdown/mdit_plugins/toc.py

@@ -13,7 +13,7 @@
 from __future__ import annotations
 
 import re
-from collections.abc import MutableMapping, Sequence
+from collections.abc import Sequence
 from functools import reduce
 from typing import Any, TypedDict
 
@@ -22,7 +22,7 @@
 from markdown_it.rules_core import StateCore
 from markdown_it.rules_inline import StateInline
 from markdown_it.token import Token
-from markdown_it.utils import OptionsDict
+from markdown_it.utils import EnvType, OptionsDict
 
 from coaster.utils import make_name
 
@@ -229,8 +229,8 @@ def toc_open(
         tokens: Sequence[Token],
         idx: int,
         options: OptionsDict,
-        env: MutableMapping,
-    ):
+        env: EnvType,
+    ) -> str:
         open_html = f'<div class="{opts["container_class"]}">'
         if opts['container_header_html'] is not None:
             open_html = open_html + opts['container_header_html']
@@ -241,8 +241,8 @@ def toc_close(
         tokens: Sequence[Token],
         idx: int,
         options: OptionsDict,
-        env: MutableMapping,
-    ):
+        env: EnvType,
+    ) -> str:
         footer = ''
         if opts['container_footer_html']:
             footer = opts['container_footer_html']
@@ -253,14 +253,14 @@ def toc_body(
         tokens: Sequence[Token],
         idx: int,
         options: OptionsDict,
-        env: MutableMapping,
-    ):
+        env: EnvType,
+    ) -> str:
         items = find_elements(opts['include_level'], env['gstate'].tokens, opts)
         toc = items_to_tree(items)
         html = toc_item_to_html(toc, opts, md)
         return html
 
-    def grab_state(state: StateCore):
+    def grab_state(state: StateCore) -> None:
         state.env['gstate'] = state
 
     md.core.ruler.push('grab_state', grab_state)