pyodide-mkdocs-theme 5.6.1__tar.gz → 5.6.3__tar.gz

{pyodide_mkdocs_theme-5.6.1 → pyodide_mkdocs_theme-5.6.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pyodide-mkdocs-theme
-Version: 5.6.1
+Version: 5.6.3
 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.3/pyodide_mkdocs_theme/__version__.py

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

{pyodide_mkdocs_theme-5.6.1 → pyodide_mkdocs_theme-5.6.3}/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.1 → pyodide_mkdocs_theme-5.6.3}/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()
 
 
 

{pyodide_mkdocs_theme-5.6.1 → pyodide_mkdocs_theme-5.6.3}/pyodide_mkdocs_theme/pyodide_macros/macros/runners_macros.py

@@ -17,7 +17,7 @@ along with this program.
 If not, see <https://www.gnu.org/licenses/>.
 """
 
-# pylint: disable=invalid-name, missing-module-docstring
+# pylint: disable=invalid-name
 
 
 from typing import Optional, Type

{pyodide_mkdocs_theme-5.6.1 → pyodide_mkdocs_theme-5.6.3}/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.1 → pyodide_mkdocs_theme-5.6.3}/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.1 → pyodide_mkdocs_theme-5.6.3}/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.1 → pyodide_mkdocs_theme-5.6.3}/pyodide_mkdocs_theme/pyodide_macros/plugin/pyodide_macros_plugin.py

@@ -154,6 +154,11 @@ class PyodideMacrosPlugin(
 
         self.macro(test_cases.Case)     # Not a macro, but needed in the jinja environment
 
+        @self.macro
+        def base_url():
+            return self.base_url
+
+
         # If mkdocs-sqlite-console is registered as plugin for the project, automatically add
         # the macro to the environment (requires sqlite-console > 1.0.7)
         if self.use_sqlite_console:

{pyodide_mkdocs_theme-5.6.1 → pyodide_mkdocs_theme-5.6.3}/pyodide_mkdocs_theme/pyodide_macros/plugin_tools/test_cases.py

@@ -145,6 +145,12 @@ class Case:
     Quick description of the test (optional).
     """
 
+    inputs: Optional[Sequence[str]] = None
+    """
+    Tuple or list of strings that will be returned during the test by any call to `input`.
+    """
+
+
     #-------------------------------------------------------------------------
     # Private interface:
 
@@ -258,21 +264,15 @@ class Case:
     - `hasCounter`
     - `hasRevealBtn`
     - `hasTerminal`
-    - `hasTerminal`
-    - `hasTerminal`
     - `isDelayedRevelation`
     - `isFullScreen`
     - `isIde`
-    - `isIde`
     - `isInSequentialRun`
     - `isInSplit`
     - `isPyBtn`
-    - `isPyBtn`
     - `isRunner`
     - `isStarredGroup`
     - `isTerminal`
-    - `isTerminal`
-    - `isTerminal`
     - `isVert`
     - `maxIdeLines`
     - `minIdeLines`
@@ -452,7 +452,7 @@ class Case:
         criteria: see below).
         """
         dumped = {
-            f.name: v
+            f.name: v if f.name != 'inputs' else list(v)
                 for f in fields(self)
                 if f.name not in skipped_props      # Useful in the JS layer of the tests...
                 and (                               # ...and:

{pyodide_mkdocs_theme-5.6.1 → pyodide_mkdocs_theme-5.6.3}/pyodide_mkdocs_theme/templates/js-libs/0-config.js

@@ -18,12 +18,6 @@ If not, see <https://www.gnu.org/licenses/>.
 */
 
 
-/*
-NOTE: Globals defined somewhere else:
-    * The "ace" variable is defined in the ace library. Everything using it must be called after
-      the libs insertion steps.
-*/
-
 
 const SqBs = {
     '[':'&lsqb;',
@@ -110,6 +104,7 @@ const CONFIG = {
         successTail: null,
         tests: null,
         testsDone: null,
+        tipResetAll: null,
         tipTrash: null,
         titleCorr: null,
         titleRem: null,
@@ -179,7 +174,9 @@ const CONFIG = {
     },
 
 
+    // Proxy-like object toward the GlobalRunnersManager. Holds only methods, no shared state:
     RUNNERS_MANAGER: null,
+
     pyodideIsReady: false,
     classesPoolIsReady: false,
     overlordIsReady: false,

{pyodide_mkdocs_theme-5.6.1 → pyodide_mkdocs_theme-5.6.3}/pyodide_mkdocs_theme/templates/js-libs/functools.js

@@ -63,7 +63,7 @@ export const cssPx =(jObj,prop='height')=> +jObj.css(prop).slice(0,-2)
  * is single threaded, and its value is protected be defining it within a scope where the
  * "locking" function is also defined (behaves like a python/TS decorator. Kinda... :p ).
  * */
-export const withPyodideAsyncLock = (_=>{
+export const withPyodideAsyncLock = (()=>{
 
   /**Everything is run async but single threaded, so a global lock can be added, using a simple
    * boolean flag, declared inside a closure to avoid a user messing with the variable...
@@ -327,7 +327,57 @@ export function waitForClassesPoolReady(applyWhenPoolReady=null){
 
 
 
+const LOADED = new Set()
 
+const _ressourceLoaderFactory = (tagName, attr, kind, baseOptions={}) => (options) => new Promise(
+  (resolve,reject)=>{
+    options = (typeof(options)=='string' ? {[attr]: options} : options)
+    options = {crossOrigin: "anonymous", referrerPolicy: "no-referrer", ...baseOptions, ...options}
+
+    if(LOADED.has(options[attr])) return resolve()
+
+    const tag = document.createElement(tagName)
+    tag.addEventListener("load", _=>{ LOADED.add(options[attr]); resolve() })
+    tag.addEventListener("error", _=>reject(console.error(`Could not load ${ options[attr] } ${kind}`)))
+    for(const k in options){
+      if(k==attr) continue      // Always set last...
+      tag[k] = options[k]
+    }
+    tag[attr] = options[attr]   // Always set LAST (something about the script loading triggered whe src is added...)
+    document.head.appendChild(tag)
+  }
+)
+
+
+export const cdnLoader = _ressourceLoaderFactory('script', 'src',  'script')
+export const cssLoader = _ressourceLoaderFactory('link',   'href', 'css', {rel:'stylesheet'})
+
+
+export const externalRessourcesLoaderFor = (name, ressourcesArr)=>{
+  if(name) console.log(`Loading ${ name } utilities...`)
+  const done = Promise.all(ressourcesArr.map(o=>typeof(o)!='string' && ('href' in o) ? cssLoader(o):cdnLoader(o)))
+  if(name) console.log(name, 'ready')
+  return done
+}
+
+
+export class RessourcesLoader {
+
+  static RESSOURCES = []
+  static POST_ACTIONS = []
+
+  static register(options, post=null){
+    RessourcesLoader.RESSOURCES.push(options)
+    if(post) RessourcesLoader.POST_ACTIONS.push(post)
+    return RessourcesLoader
+  }
+
+  static async loadAll(){
+    await externalRessourcesLoaderFor('', RessourcesLoader.RESSOURCES).then(async _=>{
+      await Promise.all(RessourcesLoader.POST_ACTIONS.map(p=>p()))
+    })
+  }
+}
 
 
 
@@ -613,9 +663,9 @@ export class RunningProfile {
    * (done this way to get autocompletion support when coding in js, without
    * breaking the current implementation logic).
    * */
-  static buildDefaultRunnersObject(asProperties=false){
+  static buildDefaultRunnersObject(withValues=false){
     const obj = {...RunningProfile.PROFILE}
-    for(const k in obj) obj[k] = asProperties ? k : undefined
+    for(const k in obj) obj[k] = withValues ? k : undefined
     obj.default = undefined
     return obj
   }
@@ -625,11 +675,11 @@ export class RunningProfile {
 
   static build(profile){
     return Object.freeze({
-      name: profile,
-      isTermCmd:  profile.includes(RunningProfile.PROFILE.cmd),
-      isPlaying:  profile.includes(RunningProfile.PROFILE.play),
+      name:         profile,
+      isTermCmd:    profile.includes(RunningProfile.PROFILE.cmd),
+      isPlaying:    profile.includes(RunningProfile.PROFILE.play),
       isValidating: profile.includes(RunningProfile.PROFILE.validate),
-      isTesting:  profile.includes(RunningProfile.PROFILE.testing),
+      isTesting:    profile.includes(RunningProfile.PROFILE.testing),
     })
   }
 }

{pyodide_mkdocs_theme-5.6.1 → pyodide_mkdocs_theme-5.6.3}/pyodide_mkdocs_theme/templates/js-libs/functoolsUiBuilder.js

@@ -38,7 +38,7 @@ const defaultOptions=(options, prop)=>({
     tagClass: "vertical",
     tagId: prop,
     fontSize: "",
-    extraStyles: "",    // For the outer element/tag, as "width:min-content;..."
+    extraStyle: "",    // For the outer element/tag, as "width:min-content;..."
 
     // If a label is used:
     label: prop,
@@ -174,7 +174,6 @@ export function buildJqTextArea(obj, prop, options={}){
  * */
 export function buildJqCheckBox(obj, prop, options={}){
     options.tagClass    = ("horizontal "+(options.tagClass??"")).trim()
-    options.extraStyles = "grid-template-columns: max-content max-content;grid-gap:5px;"
     options.labelFirst ??= false
     options = defaultOptions(options, prop)
     const kls = options.inputClass ? `class="${ options.inputClass }"`:""
@@ -192,7 +191,6 @@ export function buildJqCheckBox(obj, prop, options={}){
  * */
 export function buildJqNumber(obj, prop, options={}){
     options.tagClass    = ("horizontal "+(options.tagClass??"")).trim()
-    options.extraStyles = "grid-template-columns: max-content max-content;grid-gap:5px;"
     options.labelFirst ??= false
     options = defaultOptions(options, prop)
     const kls = options.inputClass ? `class="${ options.inputClass }"`:""