pyodide-mkdocs-theme 5.4.0__py3-none-any.whl → 5.4.1__py3-none-any.whl

pyodide_mkdocs_theme/__version__.py

@@ -1 +1 @@
-__version__ = "5.4.0"
+__version__ = "5.4.1"

pyodide_mkdocs_theme/pyodide_macros/macros/ide_manager.py

@@ -528,6 +528,12 @@ class IdeManagerMdHtmlGenerator(IdeSectionsManager):
     Generic html handling (ids, buttons, ...)
     """
 
+    FORCE_PROJECT_ID_IN_HASH: ClassVar[bool] = False
+    """
+    Some kind of IDEs (generated ones: IDE_tester, IDE_playground) have to use the project id,
+    otherwise their html id _will_ always collide between different projects.
+    """
+
     editor_name: str = ''
     """ tail part of most html elements' ids, in the shape of 'editor_{32 bits hexadecimal}' """
 
@@ -546,7 +552,7 @@ class IdeManagerMdHtmlGenerator(IdeSectionsManager):
 
 
 
-    def generate_id(self):
+    def _build_string_to_be_hashed(self):
         """
         Generate hash part of the html id for the current element, in the form:
 
@@ -612,9 +618,9 @@ class IdeManagerMdHtmlGenerator(IdeSectionsManager):
         page are more than enough.
         - Consistency of the generated ids through time is more important than anything else.
         - The ids are built using:
-            * the page url (relative to site_dir)
+            * the page url (relative to the docs_dir).
             * the macro name (so that the counts for IDEs is not affected by adding other
-            elements earlier in the page).
+            elements earlier in the page -> stability guarantee).
             * a counter specific to the macro name and the page
 
 
@@ -627,7 +633,7 @@ class IdeManagerMdHtmlGenerator(IdeSectionsManager):
         For IDE elements without associated python file:
 
         - These are more often subject to side effects across different projects, because the
-        html ids are generated using the PAGE URL (relative to the site_dir), concatenated with
+        html ids are generated using the PAGE URL (relative to the docs_dir), concatenated with
         various things that are specific to the page or the macro. So different website with the
         same relative URL _will_ clash in the localStorage. These require the use of a project_id
         value.
@@ -696,7 +702,7 @@ class IdeManagerMdHtmlGenerator(IdeSectionsManager):
 
         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
@@ -721,7 +727,12 @@ class IdeManagerMdHtmlGenerator(IdeSectionsManager):
             # DO NOT lstrip `to_hash`, to keep implementation consistent for users, even if it
             # looks ugly on the home page (url is ""). Nobody but me can see it anyway... :rolleyes:
 
-        hashed = self.id_to_hash(to_hash)
+        return to_hash
+
+
+    def generate_id(self):
+        to_hash = self._build_string_to_be_hashed()
+        hashed  = self.id_to_hash(to_hash)
         return hashed
 
 

pyodide_mkdocs_theme/pyodide_macros/macros/ide_term_ide.py

@@ -19,7 +19,7 @@ If not, see <https://www.gnu.org/licenses/>.
 
 
 from abc import ABCMeta
-from typing import Optional
+from typing import ClassVar, Optional
 
 
 from .. import html_builder as Html
@@ -67,6 +67,8 @@ _BTN_MATERIAL_OVERFLOW = admonition_safe_html('''
 
 class CommonGeneratedIde(IdeManager, metaclass=ABCMeta):
 
+    FORCE_PROJECT_ID_IN_HASH: ClassVar[bool] = True
+
     @classmethod
     def get_markdown(cls, use_mermaid:bool):
         raise NotImplementedError()

pyodide_mkdocs_theme/pyodide_macros/macros/ide_tester.py

@@ -20,17 +20,15 @@ If not, see <https://www.gnu.org/licenses/>.
 
 import json
 from dataclasses import dataclass, field
-import re
 from textwrap import dedent
-from typing import Any, Callable, ClassVar, Dict, Iterator, List, TYPE_CHECKING, NewType, Optional, Tuple, Type
+from typing import Any, ClassVar, Dict, List, TYPE_CHECKING, NewType, Optional, Tuple, Type
 
 
 
 
 
-from ..exceptions import PmtMacrosInvalidArgumentError
 from .. import html_builder as Html
-from ..tools_and_constants import HtmlClass, PageUrl, PmtPyMacrosName, PageInclusion, Prefix, Qcm, ScriptSection, ScriptData
+from ..tools_and_constants import HtmlClass, PageUrl, PmtPyMacrosName, PageInclusion, Prefix, Qcm, ScriptData
 from ..parsing import compress_LZW
 from ..html_dependencies.deps_class import DepKind
 from ..plugin_tools.test_cases import Case
@@ -121,12 +119,12 @@ class IdeTester(CommonGeneratedIde, Ide):
         Build the code generating the IdeTester object. Insert the MERMAID logistic only if
         the `mkdocs.yml` holds the custom fences code configuration.
         """
-        return dedent(f"""
-            # Testing all IDEs in the documentation {'{'} data-search-exclude {'}'}
+        return dedent(f"""\
+        # Testing all IDEs in the documentation {'{'} data-search-exclude {'}'}
 
-            <br>
+        <br>
 
-            {'{{'} IDE_tester(MAX='+', MERMAID={ use_mermaid }, TERM_H=15) {'}}'}
+        {'{{'} IDE_tester(MAX='+', MERMAID={ use_mermaid }, TERM_H=15) {'}}'}
 
         """)
 

pyodide_mkdocs_theme/pyodide_macros/plugin_config/definitions/sub_configs.py

@@ -877,7 +877,7 @@ TESTING_CONFIG = SubConfigSrc(
         extra_docs = f"""
             Définit si la page de tests des IDEs doit être générée et de quelle façon.
             {'{{'}ul_li([
-                "`#!py '{PageInclusion.none}'` (_défaut_) : la page de tests n'est pas générée.",
+                "`#!py '{PageInclusion.none}'` : la page de tests n'est pas générée.",
                 "`#!py '{PageInclusion.serve}'` : la page de tests est générée pendant `mkdocs serve`,
                 et est ajoutée automatiquement à la navigation.",
                 "`#!py '{PageInclusion.site}'` : La page de tests est ajoutée au site construit,

pyodide_mkdocs_theme/templates/js-libs/functools.js

@@ -1086,18 +1086,24 @@ export function getIdeDataFromStorage(editorId, ide=null){
       code = obj.code ?? ""
     }catch(_){}
 
-    const upToDate = PMT_LOCAL_STORAGE_KEYS_WRITE.every(k=> k in obj)
-    const storage  = upToDate ? obj : freshStore(code, obj, ide)
+    // If the update to 5.4.0 has occured before the `project.id` was filled by the author,
+    // users might have the localStorage updated with a `project: null` entry. This is not to
+    // be considered "up to date", to avoid basillions of warning for the users (1 per IDE!).
+    const pmt_540_ok = (obj.project??null)!==null
+    const upToDate   = PMT_LOCAL_STORAGE_KEYS_WRITE.every(k=> k in obj) && pmt_540_ok
+    const storage    = upToDate ? obj : freshStore(code, obj, ide)
 
     if(ide && !CONFIG.projectNoJsWarning && storage.project !== CONFIG.projectId){
         const msg = [
             CONFIG.lang.storageIdCollision.msg,
             '',
+            `Project id: "${ CONFIG.projectId }"`,
             `Page: ${ document.location }`,
             `py_name: ${ ide.pyName }`,
-            `Project id: "${ CONFIG.projectId }"`,
-            `Collision id: "${ storage.project }"`,
             `(id: ${ editorId })`,
+            '------------------------\nCollision source:',
+            `Project id: "${ storage.project }"`,
+            `py_name: ${ storage.name }`,
         ]
         window.alert(msg.join('\n'))
     }

pyodide_mkdocs_theme/templates/js-per-pages/qcms-qcm.js

@@ -151,7 +151,7 @@ class QCM {
             perennialMathJaxUpdate()
             renderMermaidGraphs()
         }
-        const [good,all] = this.questions.reduce( (track,quest)=>quest._validate(...track), [0,0])
+        const [good,all] = this.questions.reduce( (track,quest)=>quest._validate(this.reveal, ...track), [0,0])
         this.updateCounter(`${good}/${all}`)
         this.locked = true
     }
@@ -266,21 +266,25 @@ class Question {
         }
     }
 
-    _validate(goods, all){
+    _validate(revealed, goods, all){
         const values = Object.values(this.byId)
 
         /*
         // Count per item:
-        goods += values.reduce( (s,o)=>s+(o.checked === o.correct), 0)
-        all += values.length
+        const localGood = values.reduce( (s,o)=>s+(o.checked === o.correct), 0)
+        const localAll  = values.length
 
         /*/
         // Count per question:
-        goods += values.every( o => o.checked === o.correct )
-        all++
+        const localGood = values.every( o => o.checked === o.correct )
+        const localAll  = true
         //*/
 
-        return [goods, all]
+        if(revealed && this.comment && localGood===localAll){
+            this.comment.prop('open', true)
+        }
+
+        return [goods+localGood, all+localAll]
     }
 
     _reveal(){
@@ -312,7 +316,7 @@ class Question {
 
 
     resetAllItems(always=false){
-        if(this.comment) this.comment.detach()
+        if(this.comment) this.comment.detach().prop('open', false)
         Object.entries(this.byId).forEach(([itemId,it])=>{
             if(always || it.checked) this.updateItem(itemId, false)
         })

{pyodide_mkdocs_theme-5.4.0.dist-info → pyodide_mkdocs_theme-5.4.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pyodide-mkdocs-theme
-Version: 5.4.0
+Version: 5.4.1
 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.4.0.dist-info → pyodide_mkdocs_theme-5.4.1.dist-info}/RECORD

@@ -3,7 +3,7 @@ pyodide_mkdocs_theme/PMT_tools/vis/__init__.py,sha256=yz4vn9sdJbov4nnSY3qW2i2KBx
 pyodide_mkdocs_theme/PMT_tools/vis_network/__init__.py,sha256=xIHPG_LGtVNuWn31ES2cHBGMTPszW103xSL-X9rvass,19176
 pyodide_mkdocs_theme/__init__.py,sha256=eF71r5abmOC1RxEUnT2trZxTQWNmW69wUFWcBIEyxeI,2767
 pyodide_mkdocs_theme/__main__.py,sha256=AM77xwc-6A0UlQKDk5lQE2ZmQwFdB4SvipsB2-6ieCQ,10321
-pyodide_mkdocs_theme/__version__.py,sha256=xjYaBGUFGg0kGZj_WhuoFyPD8NILPsr79SaMwmYQGSg,22
+pyodide_mkdocs_theme/__version__.py,sha256=txavOIJExVzJ_65e_CmTvmPvUuIxtGnR5XsQU0qPD7Q,22
 pyodide_mkdocs_theme/basthon_p5_to_pmt.py,sha256=C0qeMygadJjAo4ERzWLqptyo0KPEvEwZ7DWC1Io0SqM,17446
 pyodide_mkdocs_theme/pyodide_macros/__init__.py,sha256=QsJobE1N4BzEm-ucPawBCcdXyCV_-40jGa3WlaQQGpo,1392
 pyodide_mkdocs_theme/pyodide_macros/exceptions.py,sha256=TPCoT52wD_huHT0BbWf17ESe90IeG4TrkM_yxUyvnQI,5699
@@ -24,13 +24,13 @@ pyodide_mkdocs_theme/pyodide_macros/macros/IDEs.py,sha256=IHY6EqZOyN95x-rgxLwr91
 pyodide_mkdocs_theme/pyodide_macros/macros/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyodide_mkdocs_theme/pyodide_macros/macros/figure.py,sha256=0VRjFixZb19yDnjXCGyJJHnkRuLyuRvzIfdtmfsBxJw,2668
 pyodide_mkdocs_theme/pyodide_macros/macros/ide_ide.py,sha256=_q22rP7LvJFro5ume1bIMgxXaef4TttVsQZiykBbrcw,23507
-pyodide_mkdocs_theme/pyodide_macros/macros/ide_manager.py,sha256=3JB6A06aROk7T4SjqlDjBw3B7aGlDLj10IByNe2bPb8,41326
+pyodide_mkdocs_theme/pyodide_macros/macros/ide_manager.py,sha256=6GEXkeaXyrE9qhYZrR4ok5MdnOxmGgxlZPhYhYdzYH0,41750
 pyodide_mkdocs_theme/pyodide_macros/macros/ide_playground.py,sha256=PNrVG1zwGDPlgMNRyXsog5jKhYBx2AGpyJn0egm1SSg,4484
 pyodide_mkdocs_theme/pyodide_macros/macros/ide_py_btn.py,sha256=bgwUtQiUsSJMAEHONj_YMZ3AKsNCKCfeYlRmLg2NbBc,4507
 pyodide_mkdocs_theme/pyodide_macros/macros/ide_run_macro.py,sha256=WnabtSWGc8Gn_TZdc-QRest9jjbZmfgvfXOFFHcNaXA,1718
-pyodide_mkdocs_theme/pyodide_macros/macros/ide_term_ide.py,sha256=Qv48NyAjeXY48pXgd8PWKN6fVfIzVfvQpKO-XTeJtSo,4777
+pyodide_mkdocs_theme/pyodide_macros/macros/ide_term_ide.py,sha256=D89KAddfJb3bF5nTNigF8VdOYe4hMwac0do_Zo61wUE,4840
 pyodide_mkdocs_theme/pyodide_macros/macros/ide_terminal.py,sha256=elsJVbMsrUFhWwXZLgOZ04apQz9A8h-Hef5x2NiYjUM,2485
-pyodide_mkdocs_theme/pyodide_macros/macros/ide_tester.py,sha256=SS9iiXH8bj_fdKEsWlWciM0hDRpwc_nWLdaEMP2lbSw,16173
+pyodide_mkdocs_theme/pyodide_macros/macros/ide_tester.py,sha256=UYrRZqANb1is7Yg6ohZ4JMlQZUEoACfZOn7AtHvykRA,16062
 pyodide_mkdocs_theme/pyodide_macros/macros/py_script.py,sha256=FAQlI8UNyjkPR2DKTQJ10SiKkeuV8yXrLeEWa2Mfm20,7417
 pyodide_mkdocs_theme/pyodide_macros/macros/qcm.py,sha256=HZC8PVdtZK_3Ilp6qxCQofFuvCNbOMP8O3m-ARDztIY,12567
 pyodide_mkdocs_theme/pyodide_macros/messages/__init__.py,sha256=DSWDp2ph8H6gFaT7-3KhdE7zoo9CfdkIi4bAdZcBYIw,975
@@ -59,7 +59,7 @@ pyodide_mkdocs_theme/pyodide_macros/plugin_config/definitions/__init__.py,sha256
 pyodide_mkdocs_theme/pyodide_macros/plugin_config/definitions/docs_dirs_config.py,sha256=W1q6V6GA6UUtFrEiRuXtwpLy4RO78m_bZfoWQpeWUas,1961
 pyodide_mkdocs_theme/pyodide_macros/plugin_config/definitions/macros_configs.py,sha256=94t5vjcskFLj7BBpqWVqSTCaVquwR-fWXTpYzpuGdE8,59382
 pyodide_mkdocs_theme/pyodide_macros/plugin_config/definitions/plugin_config.py,sha256=ig7CKqLRt4om7FVnYuSImGIOZ4k5dp4YVAIfxQlOfKI,11102
-pyodide_mkdocs_theme/pyodide_macros/plugin_config/definitions/sub_configs.py,sha256=TA7x1-OK14-Ucns9_KcCG2lj2V6kEPW36lDEp_AgFqM,49637
+pyodide_mkdocs_theme/pyodide_macros/plugin_config/definitions/sub_configs.py,sha256=jqiwCnetgnVQkWxfdTvz6u6j3Lvudr3rXWDqXSRnlZs,49625
 pyodide_mkdocs_theme/pyodide_macros/plugin_config/dumpers.py,sha256=37HyTzgkNMUhstOR3xSRAXN2e1HlAMzWajBNXEK8svI,5486
 pyodide_mkdocs_theme/pyodide_macros/plugin_config/lang_src.py,sha256=VA_2dc0JYw_AeX0fWS3kwfM6AL1XhKMBX0ESJJZjcqY,5734
 pyodide_mkdocs_theme/pyodide_macros/plugin_config/macro_config_src.py,sha256=W0gSWmLDXpnyKGDS7rSAxIGLnO2VVRsYvaaebMWte3M,10555
@@ -103,7 +103,7 @@ pyodide_mkdocs_theme/templates/assets/images/icons8-zip-64.png,sha256=hakeODow5W
 pyodide_mkdocs_theme/templates/base_pmt.html,sha256=2R_5T5j9QT2Ptit-CvzV6k1khbqrXolGBPvztj4zRWc,1318
 pyodide_mkdocs_theme/templates/js-libs/0-config.js,sha256=eNRpmoiWfrZuOKXlkvYF8YDG0tzb4-UiXP-3Xf5Vsoc,10206
 pyodide_mkdocs_theme/templates/js-libs/0-legacy-subscriber.js,sha256=kSQ1Nv8KOcYMde9fqO-Kw1rNh26hPB3AG8lonlovTdo,2126
-pyodide_mkdocs_theme/templates/js-libs/functools.js,sha256=-AQRHopSfZmeRRMxHNAjgdDqOL8js50SIYsStpMjY2U,39496
+pyodide_mkdocs_theme/templates/js-libs/functools.js,sha256=FnKIwUm-InFtfwe21K_lEVaUNcz8lzR9kvs3y_XSbfs,39943
 pyodide_mkdocs_theme/templates/js-libs/jsLogger.js,sha256=vk69c8fdawIuxsMfRJv1sImoCNt5WD2oFfy5kYJcj4U,2336
 pyodide_mkdocs_theme/templates/js-libs/mathjax-libs.js,sha256=gJEOIGRzxAm5WK8wxdzN36TUy66STBu2JRcy7OGSiMc,1478
 pyodide_mkdocs_theme/templates/js-libs/process_and_gui.js,sha256=9WumINb2wspfAeI8h7_UaKdmx_8LKPqYZfSzuWzxvR0,7124
@@ -121,7 +121,7 @@ pyodide_mkdocs_theme/templates/js-per-pages/4-ideRunner-ide.js,sha256=g65x5aCh58
 pyodide_mkdocs_theme/templates/js-per-pages/5-ideTester-ides_test.js,sha256=8kWT02wifIqg6O8o0R3S9mcPX88dLPb780BfGjxoI6E,28359
 pyodide_mkdocs_theme/templates/js-per-pages/6-2-init-playground.js,sha256=cOBcjttNrMfKwTVv49_JYUlO90vwGtkRc9RdatVBVzE,1318
 pyodide_mkdocs_theme/templates/js-per-pages/6-idePlayground-playground.js,sha256=gUPxC7PWF_C1pYcYBsL2TTQgHX7e6TbXjXu0ilFwXIM,4189
-pyodide_mkdocs_theme/templates/js-per-pages/qcms-qcm.js,sha256=_HCjXlctetIpNS91R0y1ahxtO_tIMnLVPJaFfaYp3dM,13380
+pyodide_mkdocs_theme/templates/js-per-pages/qcms-qcm.js,sha256=6uL25L5x9z8ghEF4ISPdfZX9LhBAhcSO8yC9cDi3sB4,13605
 pyodide_mkdocs_theme/templates/js-per-pages/start-pyodide.js,sha256=zsSoDpE-xCbVSWe-Fna8iOh9qV_f9ak8gDOkjAgixY8,6905
 pyodide_mkdocs_theme/templates/js-scripts/overlord.js,sha256=1ePebj8t8rwxvNtMxtfDLu04aah3rXFIOQ_mPWQFiFA,1628
 pyodide_mkdocs_theme/templates/js-scripts/subscriptions.js,sha256=I-m_KbYFxyDibGeKwJpjYXwk06HDcJlSxsvbWL7gy9g,12432
@@ -140,8 +140,8 @@ pyodide_mkdocs_theme/templates/pyodide-css/ide.css,sha256=UX_qKVgckw-TUVmZRvlu-M
 pyodide_mkdocs_theme/templates/pyodide-css/qcm.css,sha256=Mh2lg1WFgmHYuI69cxwUtfXuNl97XJkiOzN5jodww_o,4491
 pyodide_mkdocs_theme/templates/pyodide-css/terminal.css,sha256=emPONURSk0VaNXWPSz7Yj6LaoV8kzRhL0y2D9Q_wybQ,1688
 pyodide_mkdocs_theme/templates/pyodide-css/testing.css,sha256=V1BZ7UV6mOWd087VtARX0IWOiONQw3OmD-eCGmCggVQ,3293
-pyodide_mkdocs_theme-5.4.0.dist-info/LICENSE,sha256=KSvfLkVBOr2TwehfMhrI9Od3dHoyYFpxZH5GQCSflRE,35118
-pyodide_mkdocs_theme-5.4.0.dist-info/METADATA,sha256=7Ynb08jBtJeZXLxofnOBU_qavGDxZawqavsv44DrTA8,4471
-pyodide_mkdocs_theme-5.4.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-pyodide_mkdocs_theme-5.4.0.dist-info/entry_points.txt,sha256=S7DNQF6CBMaqSasP1CZ_T5elFKAzwwldYuhVZmAUFu0,719
-pyodide_mkdocs_theme-5.4.0.dist-info/RECORD,,
+pyodide_mkdocs_theme-5.4.1.dist-info/LICENSE,sha256=KSvfLkVBOr2TwehfMhrI9Od3dHoyYFpxZH5GQCSflRE,35118
+pyodide_mkdocs_theme-5.4.1.dist-info/METADATA,sha256=cHTGD-HEZKw3Az5XQPmNwdM1MmZ26van6nRSO3v9GOk,4471
+pyodide_mkdocs_theme-5.4.1.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+pyodide_mkdocs_theme-5.4.1.dist-info/entry_points.txt,sha256=S7DNQF6CBMaqSasP1CZ_T5elFKAzwwldYuhVZmAUFu0,719
+pyodide_mkdocs_theme-5.4.1.dist-info/RECORD,,