pyodide-mkdocs-theme 5.6.0__tar.gz → 5.6.2__tar.gz

{pyodide_mkdocs_theme-5.6.0 → pyodide_mkdocs_theme-5.6.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pyodide-mkdocs-theme
-Version: 5.6.0
+Version: 5.6.2
 Summary: Package embedding the necessary tools to host pyodide, ACE editors, jQuery terminals in mkdocs documentations
 License: GPL-3.0-or-later
 Keywords: mkdocs,mkdocs-plugin,pyodide,IDE,terminal

{pyodide_mkdocs_theme-5.6.0 → pyodide_mkdocs_theme-5.6.2}/pyodide_mkdocs_theme/__main__.py

@@ -50,7 +50,7 @@ parser = ArgumentParser(
              "This program comes with ABSOLUTELY NO WARRANTY."
 )
 parser.add_argument(
-    '-v', '--version', action='version', version=f'pyodide-mkdocs-theme {__version__}'
+    '-v', '--version', action='version', version=f'v{__version__}'
 )
 parser.add_argument(
     '-n', '--new', default="",

pyodide_mkdocs_theme-5.6.2/pyodide_mkdocs_theme/__version__.py

@@ -0,0 +1 @@
+__version__ = "5.6.2"

{pyodide_mkdocs_theme-5.6.0 → pyodide_mkdocs_theme-5.6.2}/pyodide_mkdocs_theme/pyodide_macros/files_extractors/base0_extractors.py

@@ -130,11 +130,6 @@ class BaseFilesExtractor:
     also used to identify an inclusion location, when resolving them).
     """
 
-    in_pages: Set[str] = field(default_factory=set)
-    """
-    Set of pages uri (relative to the docs_dir) that use the current extractor.
-    """
-
     # ---------------------------------------------------------------------------------
 
     ARG_NAME: ClassVar[str] = None
@@ -145,13 +140,9 @@ class BaseFilesExtractor:
 
 
     def __post_init__(self):
-
         if self.runner_file:
             self.exo_file  = Path(self.runner_file).resolve()
             self.docs_file = Path(self.exo_file).relative_to(CWD)
-            md_uri = self.env.page.file.src_uri
-            self.in_pages.add(md_uri)
-
 
     def __hash__(self):
         return hash(self.exo_file)
@@ -258,6 +249,12 @@ class BaseExtractorWithCache(BaseFilesExtractor):
     _mtime_infos: Dict[Path, Optional[int]] = None
 
 
+    in_pages: Set[str] = field(default_factory=set)
+    """
+    Set of pages uri (relative to the docs_dir) that use the current extractor (used for external
+    purposes only, aka, mkdocs-addresses)
+    """
+
 
     @classmethod
     def _get_file_extractor_for(
@@ -287,6 +284,8 @@ class BaseExtractorWithCache(BaseFilesExtractor):
         elif not extractor.is_up_to_date():
             extractor.extract_contents()
 
+        md_uri = env.page.file.src_uri
+        extractor.in_pages.add(md_uri)
         return runner_file, extractor
 
 

{pyodide_mkdocs_theme-5.6.0 → pyodide_mkdocs_theme-5.6.2}/pyodide_mkdocs_theme/pyodide_macros/html_dependencies/deps.py

@@ -58,8 +58,27 @@ class HtmlDependencies:
         Build all the templates needed for any page of the documentation, caching the different
         versions of them.
         """
-        needs_to_templates: Dict[FrozenSet[DepKind], BlocksTemplatesData] = {}
-        base_needs_to_all_needs: Dict[FrozenSet[DepKind], Set[DepKind]] = {}
+        def build_and_store_blocks_dict(base_needs):
+            # Build the complete set of dependencies:
+            all_needs = set(base_needs)
+            all_needs.add(DepKind.always)
+
+            # Separate the wheat from the chaff... :p
+            blocks_dct: Dict[Block,List[Dep]] = {b:[] for b in Block.VALUES}
+            for dep in cls.__DEPS_IN_ORDER:
+                if dep.kind in all_needs:
+                    blocks_dct[dep.block].append(dep)
+
+            # Mutate the wheat to templates and extra method calls needed:
+            for block, lst_deps in blocks_dct.items():
+                extras_dump_calls = []
+                template = '\n'.join( dep.to_template(extras_dump_calls) for dep in lst_deps )
+                blocks_dct[block] = (template, tuple(extras_dump_calls))
+
+            needs_to_blocks_dicts[base_needs] = blocks_dct
+
+
+        needs_to_blocks_dicts: Dict[FrozenSet[DepKind], BlocksTemplatesData] = {}
 
         # (covers the weird case where page is None... Might also become useful one day, if ever
         # pages_configs do not reference anymore all the possible pages of the documentation.
@@ -71,38 +90,10 @@ class HtmlDependencies:
         all_kinds_of_pages = {None: default, **pages_configs}
 
         for url, page_config in all_kinds_of_pages.items():
-
             base_needs = frozenset(page_config.needs)
-            if base_needs not in needs_to_templates:
-
-                # Build the complete set of dependencies:
-                all_needs = set(base_needs)
-                all_needs.add(DepKind.always)
-                for need in base_needs:
-                    DepKind.resolve_deps_needs(need, all_needs)
-                base_needs_to_all_needs[base_needs] = all_needs
-
-                # Separate the wheat from the chaff... :p
-                blocks_dct: Dict[Block,List[Dep]] = {b:[] for b in Block.get_blocks()}
-                for dep in cls.__DEPS_IN_ORDER:
-                    if dep.kind in all_needs:
-                        blocks_dct[dep.block].append(dep)
-
-                # Mutate the wheat to templates and extra method calls needed:
-                for block, lst_deps in blocks_dct.items():
-                    extras_dump_calls = []
-                    template = '\n'.join( dep.to_template(extras_dump_calls) for dep in lst_deps )
-                    blocks_dct[block] = template, tuple(extras_dump_calls)
-
-
-                # Register templates and cbks
-                needs_to_templates[base_needs] = blocks_dct
-
-            cls.__URL_TO_TEMPLATE_CACHE[url] = needs_to_templates[base_needs]
-
-            # Reassign the page needs with the complete set so that the proper info is
-            # available "later" if needed.
-            page_config.needs = base_needs_to_all_needs[base_needs]
+            if base_needs not in needs_to_blocks_dicts:
+                build_and_store_blocks_dict(base_needs)
+            cls.__URL_TO_TEMPLATE_CACHE[url] = needs_to_blocks_dicts[base_needs]
 
 
     @classmethod
@@ -121,18 +112,17 @@ class HtmlDependencies:
         return html
 
 
-
     @classmethod
     def build_import_map_template(cls):
         """ Build the importmap script template (done in on_env hook). """
         imports = {
             name: target
-                for dep in cls.__DEPS_IN_ORDER
-                for name,target in dep.gen_import_map()
+            for dep in cls.__DEPS_IN_ORDER
+            for name,target in dep.gen_import_map()
         }
-        cls.__IMPORT_MAP = f'''
-<script type="importmap">{'{'}"imports": { json.dumps(imports) }{'}'}</script>
-'''
+        data = json.dumps(imports)
+        cls.__IMPORT_MAP = f'<script type="importmap">{{"imports":{ data }}}</script>'
+
 
     @classmethod
     def render_import_map(cls, env:'PyodideMacrosPlugin', page:Optional[Page]):
@@ -143,13 +133,11 @@ class HtmlDependencies:
         return cls.__IMPORT_MAP.replace("{base_url}", env.base_url if page else '.')
 
 
-
-
     @classmethod
     def build_overlord_data(cls):
         cls.__DEP_KINDS_TO_POOL_NAME = {
             dep.kind: dep.pool_requirement
-                for dep in cls.__DEPS_IN_ORDER if dep.pool_requirement
+            for dep in cls.__DEPS_IN_ORDER if dep.pool_requirement
         }
 
 
@@ -157,8 +145,8 @@ class HtmlDependencies:
     def get_overlord_classes(cls, page_configs: PageConfiguration):
         overlord_classes = [
             cls.__DEP_KINDS_TO_POOL_NAME[dep_kind]
-                for dep_kind in page_configs.needs
-                if dep_kind in cls.__DEP_KINDS_TO_POOL_NAME
+            for dep_kind in page_configs.needs
+            if dep_kind in cls.__DEP_KINDS_TO_POOL_NAME
         ]
         return overlord_classes
 
@@ -171,38 +159,26 @@ class HtmlDependencies:
     #   3) Easier to transmit data from mkdocs through inlined scripts if the CONFIG parts are
     #      actually loaded sync (this avoids the need for yet another global async flag...)
 
-
+    # Those are inserted directly in the page, full sync way (because they might be needed
+    # in the html code of the page, especially jQuery):
     lodash = Cdn(Block.libs, DepKind.always, "https://cdn.jsdelivr.net/npm/lodash@4.17.20/lodash.min.js")
     jQuery = Cdn(Block.libs, DepKind.always, "https://cdn.jsdelivr.net/npm/jquery@3.7.1")
 
-    jQuery_css   = Css(Block.libs, DepKind.always, "https://cdn.jsdelivr.net/npm/jquery.terminal@2.43.1/css/jquery.terminal.min.css")
-    awesome_font = Css(Block.libs, DepKind.always, {
-        "href": "https://cdn.jsdelivr.net/npm/font-awesome@4.7.0/css/font-awesome.min.css",
-        "integrity": "sha256-eZrrJcwDc/3uDhsdt61sL2oOBY362qM3lon1gyExkL0=",
-    })
-    jQterm = Cdn(Block.libs, DepKind.term,   "https://cdn.jsdelivr.net/npm/jquery.terminal@2.43.1/js/jquery.terminal.min.js")
-    ace    = Cdn(Block.libs, DepKind.ide, {
-        'src': "https://cdn.jsdelivr.net/npm/ace-builds@1.44.0/src-min-noconflict/ace.js",
-        'integrity': "sha256-By0T5T0R4s7M//4aD6fxXPacVDXYl99T2YxxvhxKLn8=",
-    })
-    ace_tools = Cdn(Block.libs, DepKind.ide, {
-        'src': "https://cdn.jsdelivr.net/npm/ace-builds@1.44.0/src-min-noconflict/ext-language_tools.js",
-        'integrity': "sha256-eZ46N0b3QkDX+7GjjlJfoBuXGKIH86UKJVARHhGzpWA=",
-    })
-    pyodide = Cdn(Block.libs, DepKind.pyodide, "https://cdn.jsdelivr.net/pyodide/v0.25.0/full/pyodide.js")
-
-    #vvvvvvvvvvvvvvv
+    # Css must be always loaded, even if no terminal in the page, to avoid messing the
+    # layout differently depending on the page... :rolleyes:
+    jQTerm_css = Css(Block.libs, DepKind.always, "https://cdn.jsdelivr.net/npm/jquery.terminal@2.43.1/css/jquery.terminal.min.css")
+
     # GENERATED-libs
     config             = Cdn(Block.libs, DepKind.always, "{base_url}/js-libs/0-config.js", type="text/javascript", extra_dump="dump_to_js_config")
     subscriber         = Cdn(Block.libs, DepKind.always, "{base_url}/js-libs/0-legacy-subscriber.js", type="text/javascript")
-    functools          = Cdn(Block.libs, DepKind.always, "{base_url}/js-libs/functools.js", type="module")
-    functoolsStorage   = Cdn(Block.libs, DepKind.always, "{base_url}/js-libs/functoolsStorage.js", type="module")
-    functoolsTxt       = Cdn(Block.libs, DepKind.always, "{base_url}/js-libs/functoolsTxt.js", type="module")
-    functoolsUi        = Cdn(Block.libs, DepKind.always, "{base_url}/js-libs/functoolsUi.js", type="module")
-    functoolsUiBuilder = Cdn(Block.libs, DepKind.always, "{base_url}/js-libs/functoolsUiBuilder.js", type="module")
-    jsLogger           = Cdn(Block.libs, DepKind.always, "{base_url}/js-libs/jsLogger.js", type="module")
+    functools          = Cdn(Block.libs, DepKind.never,  "{base_url}/js-libs/functools.js", type="module")
+    functoolsStorage   = Cdn(Block.libs, DepKind.never,  "{base_url}/js-libs/functoolsStorage.js", type="module")
+    functoolsTxt       = Cdn(Block.libs, DepKind.never,  "{base_url}/js-libs/functoolsTxt.js", type="module")
+    functoolsUi        = Cdn(Block.libs, DepKind.never,  "{base_url}/js-libs/functoolsUi.js", type="module")
+    functoolsUiBuilder = Cdn(Block.libs, DepKind.never,  "{base_url}/js-libs/functoolsUiBuilder.js", type="module")
+    jsLogger           = Cdn(Block.libs, DepKind.never,  "{base_url}/js-libs/jsLogger.js", type="module")
     mathjax            = Cdn(Block.libs, DepKind.always, "{base_url}/js-libs/mathjax-libs.js", type="text/javascript")
-    process_and_gui    = Cdn(Block.libs, DepKind.always, "{base_url}/js-libs/process_and_gui.js", type="module")
+    process_and_gui    = Cdn(Block.libs, DepKind.never,  "{base_url}/js-libs/process_and_gui.js", type="module")
     css_generic        = Css(Block.libs, DepKind.always, "{base_url}/pyodide-css/0-generic.css")
     css_header         = Css(Block.libs, DepKind.always, "{base_url}/pyodide-css/btns-header.css")
     css_history        = Css(Block.libs, DepKind.always, "{base_url}/pyodide-css/history.css")
@@ -212,45 +188,31 @@ class HtmlDependencies:
     css_terminal       = Css(Block.libs, DepKind.always, "{base_url}/pyodide-css/terminal.css")
     css_testing        = Css(Block.libs, DepKind.always, "{base_url}/pyodide-css/testing.css")
     # GENERATED-libs
-    #^^^^^^^^^^^^^^^
 
     # Always _after_ the js mathjax-libs.js file (SYNC!)
     mathjax_tex = Cdn(Block.libs, DepKind.always, "https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-mml-chtml.js")
 
-
-    #---------------------------------------------------
-
-
-    #vvvvvvvvvvvvvvvv
     # GENERATED-pages
-    snippets        = Cdn(Block.content, DepKind.pyodide,   "{base_url}/js-per-pages/0-generic-python-snippets-pyodide.js", type="module")
-    error_logs      = Cdn(Block.content, DepKind.pyodide,   "{base_url}/js-per-pages/1-error_logs-pyodide.js", type="module")
-    install         = Cdn(Block.content, DepKind.pyodide,   "{base_url}/js-per-pages/1-packagesInstaller-install-pyodide.js", type="module")
-    runtime         = Cdn(Block.content, DepKind.pyodide,   "{base_url}/js-per-pages/1-runtimeManager-runtime-pyodide.js", type="module")
-    runnersManager  = Cdn(Block.content, DepKind.runners,   "{base_url}/js-per-pages/2-0-runnersManager-runners.js", type="module", pool="GlobalRunnersManager")
-    runner          = Cdn(Block.content, DepKind.pyodide,   "{base_url}/js-per-pages/2-pyodideSectionsRunner-runner-pyodide.js", type="module")
-    btnRunner       = Cdn(Block.content, DepKind.py_btn,    "{base_url}/js-per-pages/3-btnRunner-py_btn.js", type="module", pool="PyBtn")
-    terminalRunner  = Cdn(Block.content, DepKind.term,      "{base_url}/js-per-pages/3-terminalRunner-term.js", type="module", pool="Terminal")
-    idesManager     = Cdn(Block.content, DepKind.ide,       "{base_url}/js-per-pages/4-0-idesManager-ide.js", type="module")
-    ideLogistic     = Cdn(Block.content, DepKind.ide,       "{base_url}/js-per-pages/4-ideLogistic-ide.js", type="module")
-    ideRunner       = Cdn(Block.content, DepKind.ide,       "{base_url}/js-per-pages/4-ideRunner-ide.js", type="module", pool="Ide")
-    virtualizer     = Cdn(Block.content, DepKind.ides_test, "{base_url}/js-per-pages/5-2-virtualizer-ides_test.js", type="module")
-    avl             = Cdn(Block.content, DepKind.ides_test, "{base_url}/js-per-pages/5-3-avl-ides_test.mjs", type="module")
-    ideTester       = Cdn(Block.content, DepKind.ides_test, "{base_url}/js-per-pages/5-ideTester-ides_test.js", type="module", pool="IdeTester")
-    init            = Cdn(Block.content, DepKind.playground, "{base_url}/js-per-pages/6-2-init-playground.js", type="module")
+    snippets        = Cdn(Block.content, DepKind.pyodide,    "{base_url}/js-per-pages/0-generic-python-snippets-pyodide.js", type="module")
+    error_logs      = Cdn(Block.content, DepKind.pyodide,    "{base_url}/js-per-pages/1-error_logs-pyodide.js", type="module")
+    install         = Cdn(Block.content, DepKind.pyodide,    "{base_url}/js-per-pages/1-packagesInstaller-install-pyodide.js", type="module")
+    runtime         = Cdn(Block.content, DepKind.pyodide,    "{base_url}/js-per-pages/1-runtimeManager-runtime-pyodide.js", type="module")
+    runnersManager  = Cdn(Block.content, DepKind.runners,    "{base_url}/js-per-pages/2-0-runnersManager-runners.js", type="module", pool="GlobalRunnersManager")
+    runner          = Cdn(Block.content, DepKind.pyodide,    "{base_url}/js-per-pages/2-pyodideSectionsRunner-runner-pyodide.js", type="module")
+    btnRunner       = Cdn(Block.content, DepKind.py_btn,     "{base_url}/js-per-pages/3-btnRunner-py_btn.js", type="module", pool="PyBtn")
+    terminalRunner  = Cdn(Block.content, DepKind.term,       "{base_url}/js-per-pages/3-terminalRunner-term.js", type="module", pool="Terminal")
+    idesManager     = Cdn(Block.content, DepKind.ide,        "{base_url}/js-per-pages/4-0-idesManager-ide.js", type="module")
+    ideLogistic     = Cdn(Block.content, DepKind.ide,        "{base_url}/js-per-pages/4-ideLogistic-ide.js", type="module")
+    ideRunner       = Cdn(Block.content, DepKind.ide,        "{base_url}/js-per-pages/4-ideRunner-ide.js", type="module", pool="Ide")
+    virtualizer     = Cdn(Block.content, DepKind.ides_test,  "{base_url}/js-per-pages/5-2-virtualizer-ides_test.js", type="module")
+    avl             = Cdn(Block.content, DepKind.ides_test,  "{base_url}/js-per-pages/5-3-avl-ides_test.mjs", type="module")
+    ideTester       = Cdn(Block.content, DepKind.ides_test,  "{base_url}/js-per-pages/5-ideTester-ides_test.js", type="module", pool="IdeTester")
     idePlayground   = Cdn(Block.content, DepKind.playground, "{base_url}/js-per-pages/6-idePlayground-playground.js", type="module", pool="IdePlayground")
-    qcms            = Cdn(Block.content, DepKind.qcm,       "{base_url}/js-per-pages/qcms-qcm.js", type="module", pool="Qcm")
-    start           = Cdn(Block.content, DepKind.pyodide,   "{base_url}/js-per-pages/start-pyodide.js", type="module")
+    qcms            = Cdn(Block.content, DepKind.qcm,        "{base_url}/js-per-pages/qcms-qcm.js", type="module", pool="Qcm")
+    start           = Cdn(Block.content, DepKind.pyodide,    "{base_url}/js-per-pages/start-pyodide.js", type="module")
     # GENERATED-pages
-    #^^^^^^^^^^^^^^^^
-
-
-    #---------------------------------------------------
-
 
-    #vvvvvvvvvvvvvvvvvv
     # GENERATED-scripts
     overlord        = Cdn(Block.scripts, DepKind.always, "{base_url}/js-scripts/overlord.js", type="module")
     subscriptions   = Cdn(Block.scripts, DepKind.always, "{base_url}/js-scripts/subscriptions.js", type="module")
     # GENERATED-scripts
-    #^^^^^^^^^^^^^^^^^^

{pyodide_mkdocs_theme-5.6.0 → pyodide_mkdocs_theme-5.6.2}/pyodide_mkdocs_theme/pyodide_macros/html_dependencies/deps_class.py

@@ -22,7 +22,7 @@ from pathlib import Path
 from typing import ClassVar, Dict, List, Optional, Set, Union, TYPE_CHECKING
 
 
-from ..tools_and_constants import AutoDescriptor
+from ..tools_and_constants import AutoDescriptor, MyEnum, dataclass_with_VALUES
 
 if TYPE_CHECKING:
     from ..plugin.pyodide_macros_plugin import PyodideMacrosPlugin
@@ -32,72 +32,39 @@ if TYPE_CHECKING:
 
 
 
-
-class Block:
+@dataclass_with_VALUES
+class Block(MyEnum):
     """
     StrEnum-like object, giving all the jinja blocks usable in the main.html file.
     """
-    libs    = AutoDescriptor()
-    content = AutoDescriptor()
-    scripts = AutoDescriptor()
-
-    @classmethod
-    def get_blocks(cls):
-        return (cls.libs, cls.content, cls.scripts)
+    libs:    'Block' = AutoDescriptor()
+    content: 'Block' = AutoDescriptor()
+    scripts: 'Block' = AutoDescriptor()
 
 
 
 
 
-class DepKind:
+@dataclass_with_VALUES
+class DepKind(MyEnum):
     """
     StrEnum-like object, identifying the key components to build the "dependencies graph"
     of scripts and css injections in main.html.
     """
-    always      = AutoDescriptor()
-
-    pyodide     = AutoDescriptor()
-    py_btn      = AutoDescriptor()
-    run_macro   = AutoDescriptor()
-    term        = AutoDescriptor()
-    runners     = AutoDescriptor()
-    ide         = AutoDescriptor()
-    ides_test   = AutoDescriptor()
-    playground  = AutoDescriptor()
-    qcm         = AutoDescriptor()
-    qcm_encrypt = AutoDescriptor()
-    mermaid     = AutoDescriptor()
-
-
-    @classmethod
-    def resolve_deps_needs(cls, kind:'DepKind', needs:Set['DepKind']):
-        """
-        Gather the whole "chain" of dependencies according to the dependencies graph,
-        sorting from the given @kind, which is already present in @needs.
-        Keep adding kinds as long as they are not present in @needs.
-        """
-        # NOTE: this is almost useless, for PMT 4^ because of automatic resolution of imported
-        # modules, BUT there are still some needs for non modules, so keep everything as is...
-
-        # Keep in mind DepKind _values_ are actually SIMPLE STRINGS!
-        if kind in _DEP_KINDS_GRAPH:
-            next_kind = _DEP_KINDS_GRAPH[kind]
-            if next_kind not in needs:
-                needs.add(next_kind)
-                cls.resolve_deps_needs(next_kind, needs)
-
-
-
-# Ignoring the systematic DepKind.always final dependency.
-_DEP_KINDS_GRAPH = {
-    DepKind.playground: DepKind.ide,
-    DepKind.ides_test:  DepKind.ide,
-    DepKind.ide:        DepKind.term,
-    DepKind.term:       DepKind.pyodide,
-    DepKind.run_macro:  DepKind.py_btn,
-    DepKind.py_btn:     DepKind.pyodide,
-    DepKind.pyodide:    DepKind.runners,
-}
+    always:      'DepKind' = AutoDescriptor()
+    never:       'DepKind' = AutoDescriptor()   # Registered, sent to the importmap, but never directly
+                                                # inserted in the html
+    pyodide:     'DepKind' = AutoDescriptor()
+    py_btn:      'DepKind' = AutoDescriptor()
+    run_macro:   'DepKind' = AutoDescriptor('py_btn')   # For now the JS requirements are identical...
+    term:        'DepKind' = AutoDescriptor()
+    runners:     'DepKind' = AutoDescriptor()
+    ide:         'DepKind' = AutoDescriptor()
+    ides_test:   'DepKind' = AutoDescriptor()
+    playground:  'DepKind' = AutoDescriptor()
+    qcm:         'DepKind' = AutoDescriptor()
+    qcm_encrypt: 'DepKind' = AutoDescriptor()
+    mermaid:     'DepKind' = AutoDescriptor()
 
 
 
@@ -159,10 +126,10 @@ class Dep:
     """ Static property: Store HtmlDependencies property names, to make sure they are unique. """
 
 
-
     def __init_subclass__(cls):
         Dep.EXTENSION_TO_CLASS[cls.EXTENSION] = cls
 
+    #-------------------------------------------------------------------------
 
     @staticmethod
     def auto_ordering():
@@ -218,11 +185,18 @@ class Dep:
 
 
     def get_html_tag(self):
+        """
+        Convert tu current dependency to the corresponding html tag to insert in the page.
+        """
         return self.DUMP_TEMPLATE.format(
             data=' '.join(f'{k}="{v}"' for k,v in self.data.items())
         )
 
     def gen_import_map(self):
+        """
+        Return an iterator of items to add the current dependency to the importmap tag.
+        Reminder: only js modules have to be referenced.
+        """
         return ()
 
 

{pyodide_mkdocs_theme-5.6.0 → pyodide_mkdocs_theme-5.6.2}/pyodide_mkdocs_theme/pyodide_macros/macros/ide_manager.py

@@ -21,6 +21,7 @@ If not, see <https://www.gnu.org/licenses/>.
 
 
 from abc import ABCMeta
+import os
 import re
 import hashlib
 from typing import Any, ClassVar, Dict, List, Literal, Optional, Tuple, Union, TYPE_CHECKING
@@ -706,31 +707,35 @@ class IdeManagerMdHtmlGenerator(IdeSectionsManager):
             local machine.
         """
         is_ide      = PmtPyMacrosName.is_ide(self.MACRO_NAME)
-        is_relative = not self.env.is_legacy
+        not_legacy  = not self.env.is_legacy
         runner_path = self.exo_py
         has_py_file = bool(runner_path)
-        project_id  = self.env.project_id or ""
 
-        need_project_id = is_ide and self.env.project_disambiguate_local_storage and project_id and (
-            not has_py_file or is_relative
-        ) or self.FORCE_PROJECT_ID_IN_HASH
-        # The project_id is needed to disambiguate the html ids in the localStorage only if:
-        #   1. The element is an IDE
-        #   2. The user actually gave a value for env.project_id
-        #   3. The user _wants_ the project_id added to compute the html ids
-        #   4. Either...:
-        #       - the ides_id_hash_mode is set to relative
-        #       - Or there is no python file for the IDE
-
-        project_id = f':_{ project_id }' * bool(need_project_id)
+        need_project_id = bool(self.FORCE_PROJECT_ID_IN_HASH or (
+            is_ide
+            and self.env.project_disambiguate_local_storage
+            and self.env.project_id
+            and (not_legacy or not has_py_file )
+        ))
+        project_id = f':_{ self.env.project_id or "" }' * need_project_id
 
         if has_py_file and (is_ide or self.env.ACTIVATE_CACHE):
 
             less_ID_needs = "" if is_ide else ':'+self.MACRO_NAME
-            if is_ide and is_relative:
+            if is_ide and not_legacy:
                 runner_path = Path(self.exo_py).relative_to(self.env.docs_dir_path)
 
+            if os.getenv("IDE_ID_WITH_POSIX"):
+                runner_path = runner_path.as_posix()
+                # This is used in CodEx's tests, to make sure the ids do not depend on the OS.
+                # Without that, the IDE ids do not match the ones registered in Capytale.
+
             to_hash = f"{ runner_path }{ self.IDE_VERT }{ less_ID_needs }{ project_id }"
+            # WARNING: there is still a problem here depending on the OS: people working
+            # on win/something else will get different html ids because of `\` vs `/` in
+            # `runner_path`... This is not a problem, from the end users PoV. This is only
+            # a problem (so far) for CodEx tests on Capytale, because the server stores the
+            # html ids of the DIE, to know where to put what.
 
         else:
             count   = self.env.macros_counters[ self.MACRO_NAME ].inc()

{pyodide_mkdocs_theme-5.6.0 → pyodide_mkdocs_theme-5.6.2}/pyodide_mkdocs_theme/pyodide_macros/macros/py_script.py

@@ -46,7 +46,7 @@ def _more_code_fence(
     title: str,
     attrs: str,
     no_block: bool,
-    lang: str='python',
+    lang: str=None,
 ):
     """
     Extra function to centralize some of the formatting logic.
@@ -61,7 +61,7 @@ def _more_code_fence(
         indent,
         title=(title or ""),
         attrs=(attrs or ""),
-        lang=lang,
+        lang=lang or 'python',
     )
     return out
 

{pyodide_mkdocs_theme-5.6.0 → pyodide_mkdocs_theme-5.6.2}/pyodide_mkdocs_theme/pyodide_macros/messages/de_lang.py

@@ -208,7 +208,10 @@ class LangDe(LangFr):
     """
     Tooltip for the button resetting the content of a code editor.
     """
-    restart_confirm: Tr = Tip(0, "ACHTUNG: Durch das Zurücksetzen des Editors gehen alle bisherigen Codes, Validierungsstatus und Verlauf verloren.")
+    restart_confirm: Tr = MsgPlural(
+        "ACHTUNG: Durch das Zurücksetzen des Editors gehen alle bisherigen Codes, Validierungsstatus und Verlauf verloren.",
+        "Beim Zurücksetzen der Editoren gehen der bisherige Code, die Validierungsstatus und die Verläufe aller Editoren auf der Seite verloren.",
+    )
     """
     Confirmation question before resetting an IDE.
     """
@@ -261,7 +264,11 @@ class LangDe(LangFr):
     """
 
 
-    # Trashcan button related
+    # Trashcan or resetAll button related
+    tip_reset_all: Tr = Tip(12, "Alle Editoren auf der Seite zurücksetze.")
+    """
+    Tooltip for the button to reset all the IDEs on the page.
+    """
     tip_trash: Tr = Tip(15, "Lösche die gespeicherten Codes im Webbrowser für {site_name}")
     """
     Tooltip for the button to delete the data stored in the browser's localStorage

{pyodide_mkdocs_theme-5.6.0 → pyodide_mkdocs_theme-5.6.2}/pyodide_mkdocs_theme/pyodide_macros/messages/en_lang.py

@@ -207,7 +207,10 @@ class LangEn(LangFr):
     """
     Tooltip for the button resetting the content of a code editor.
     """
-    restart_confirm: Tr = Tip(0, "WARNING: resetting the editor, you will lose previous codes, validation status and histories.")
+    restart_confirm: Tr = MsgPlural(
+        "WARNING: resetting the editor, you will lose previous codes, validation status and histories.",
+        "WARNING: resetting the editors will erase the previous code, validation statuses, and histories for all the editors on the page.",
+    )
     """
     Confirmation question before resetting an IDE.
     """
@@ -260,7 +263,11 @@ class LangEn(LangFr):
     """
 
 
-    # Trashcan button related
+    # Trashcan or resetAll button related
+    tip_reset_all: Tr = Tip(12, "Reset all the editors on the page.")
+    """
+    Tooltip for the button to reset all the IDEs on the page.
+    """
     tip_trash: Tr = Tip(15, "Remove the saved codes for {site_name} from the browser")
     """
     Tooltip for the button to delete the data stored in the browser's localStorage

{pyodide_mkdocs_theme-5.6.0 → pyodide_mkdocs_theme-5.6.2}/pyodide_mkdocs_theme/pyodide_macros/messages/fr_lang.py

@@ -213,7 +213,10 @@ class LangFr(LangBase):
     """
     Info-bulle du bouton réinitialisant le contenu d'un éditeur.
     """
-    restart_confirm: Tr = Tip(0, "ATTENTION: réinitialiser l'éditeur fera perdre les anciens codes, status de validation et historiques.")
+    restart_confirm: Tr = MsgPlural(
+        "ATTENTION: réinitialiser l'éditeur fera perdre les anciens codes, status de validation et historiques.",
+        "ATTENTION: réinitialiser les éditeurs fera perdre les anciens codes, status de validation et historiques pour tous les éditeurs de la page.",
+    )
     """
     Demande de confirmation à l'utilisateur avec de faire un restart de l'IDE.
     """
@@ -268,7 +271,11 @@ class LangFr(LangBase):
     """
 
 
-    # Trashcan button related
+    # Trashcan or resetAll button related
+    tip_reset_all: Tr = Tip(12, "Réinitialiser tous les éditeurs de la page.")
+    """
+    Info-bulle du bouton de pour réinitialiser tous les IDEs de la page.
+    """
     tip_trash: Tr = Tip(15, "Supprimer du navigateur les codes enregistrés pour {site_name}")
     """
     Info-bulle du bouton de pour supprimer les données stockées dans le navigateur

{pyodide_mkdocs_theme-5.6.0 → pyodide_mkdocs_theme-5.6.2}/pyodide_mkdocs_theme/pyodide_macros/plugin_tools/pages_and_macros_py_configs.py

@@ -207,7 +207,12 @@ class PageConfiguration(Dict[EditorName,MacroPyConfig]):
     def build_page_script_tag_with_ides_configs_mermaid_and_pool_data(
         self, overlord_classes:List[str]
     ):
-
+        """
+        Build a synch script tag, that his adding to the page the global data structures so that
+        the various elements needed in the page can be built:
+        - Update CONFIG mermaid and classes pool infos
+        - build the PAGE_IDES_CONFIGS compressed string
+        """
         json_ide_configs = '{' + ', '.join(
             f'"{ editor_name }": { ide_conf.dump_to_js_code() }'
             for editor_name, ide_conf in self.items()