pyodide-mkdocs-theme 5.6.4__tar.gz → 5.6.7__tar.gz

{pyodide_mkdocs_theme-5.6.4 → pyodide_mkdocs_theme-5.6.7}/PKG-INFO

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

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

{pyodide_mkdocs_theme-5.6.4 → pyodide_mkdocs_theme-5.6.7}/pyodide_mkdocs_theme/pyodide_macros/files_extractors/base0_extractors.py

@@ -62,7 +62,7 @@ from pathlib import Path
 from dataclasses import dataclass, field
 from typing import ClassVar, Dict, Iterable, Optional, Set, Tuple, TYPE_CHECKING, Type
 
-
+from mkdocs.structure.pages import Page
 
 from ..exceptions import PmtMacrosInvalidPmtFileError
 
@@ -241,21 +241,31 @@ class BaseExtractorWithCache(BaseFilesExtractor):
 
     _CACHED_EXTRACTORS: ClassVar[Dict[Path, 'GenericExtractor']] = {}
     """
-    Class level cache of instances. This HAS to be overridden in one of the children classes
-    in the hierarchy, allowing different caches in different branches, all using the same
-    implementation.
+    Class level cache of instances.
     """
 
     _mtime_infos: Dict[Path, Optional[int]] = None
 
 
-    in_pages: Set[str] = field(default_factory=set)
+    in_pages: Dict[str,Page] = field(default_factory=dict)
     """
-    Set of pages uri (relative to the docs_dir) that use the current extractor (used for external
-    purposes only, aka, mkdocs-addresses)
+    Dict of page.file.src_uri -> Page of all the pages using the current Extractor.
     """
 
 
+    @classmethod
+    def get_dirty_pages(cls, *, all=False):
+        """
+        Yields all registered Extractor instances that aren't considered up to date at the moment.
+        """
+        unique = {
+            uri: page
+            for ext in cls._CACHED_EXTRACTORS.values() if all or not ext.is_up_to_date()
+            for uri,page in ext.in_pages.items()
+        }
+        return list(unique.values())
+
+
     @classmethod
     def _get_file_extractor_for(
         cls,
@@ -284,8 +294,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)
+        uri = env.page.file.src_uri
+        extractor.in_pages[uri] = env.page
         return runner_file, extractor
 
 

{pyodide_mkdocs_theme-5.6.4 → pyodide_mkdocs_theme-5.6.7}/pyodide_mkdocs_theme/pyodide_macros/html_dependencies/deps.py

@@ -20,7 +20,7 @@ If not, see <https://www.gnu.org/licenses/>.
 
 
 import json
-from typing import Dict, FrozenSet, List, TYPE_CHECKING, Optional, Set, Tuple
+from typing import Dict, FrozenSet, List, TYPE_CHECKING, Optional, Tuple
 
 from mkdocs.structure.pages import Page
 

{pyodide_mkdocs_theme-5.6.4 → pyodide_mkdocs_theme-5.6.7}/pyodide_mkdocs_theme/pyodide_macros/html_dependencies/deps_class.py

@@ -66,8 +66,9 @@ class DepKind(MyEnum):
     qcm_encrypt: 'DepKind' = AutoDescriptor()
     mermaid:     'DepKind' = AutoDescriptor()
 
-
-
+    @classmethod
+    def has_needs_for_ide(cls, needs: Set['DepKind']):
+        return bool( needs & {cls.ide, cls.playground, cls.ides_test} )
 
 
 

{pyodide_mkdocs_theme-5.6.4 → pyodide_mkdocs_theme-5.6.7}/pyodide_mkdocs_theme/pyodide_macros/plugin/maestro_files.py

@@ -36,6 +36,7 @@ import pyodide_mkdocs_theme.PMT_tools as PMT_tools
 from ..exceptions import PmtIdesTestingError, PmtMacrosPyLibsError
 from ..pyodide_logger import logger
 from ..tools_and_constants import PmtCte, PageInclusion
+from ..files_extractors.concrete_extractors import FileExtractor
 from ..macros.ide_term_ide import CommonGeneratedIde
 from ..macros.ide_tester import IdeTester
 from ..macros.ide_playground import IdePlayground
@@ -202,10 +203,20 @@ class MaestroGeneratedPages(BaseMaestro):
 
 
     def on_files(self, files: Files, /, *, config: MkDocsConfig):
+        # Add all generated files
         for generator in self._generated_pages:
             if generator.is_built:
                 file = generator.generate_file(config)
                 files.append(file)
+
+        # "Make dirty" all pages with file extractors that aren't up to date at the moment:
+        # (handle only sources)
+        for page in FileExtractor.get_dirty_pages():
+            src_path = Path(page.file.abs_src_path)
+            target_path = Path(page.file.abs_dest_path)
+            if (src_path.is_file() or page.file.generated_by) and target_path.is_file():
+                target_path.unlink()
+
         return files
 
 

{pyodide_mkdocs_theme-5.6.4 → pyodide_mkdocs_theme-5.6.7}/pyodide_mkdocs_theme/pyodide_macros/plugin_tools/pages_and_macros_py_configs.py

@@ -234,8 +234,9 @@ class PageConfiguration(Dict[EditorName,MacroPyConfig]):
         need_mermaid = self.has_need(DepKind.mermaid)
         script_tag = Html.script(
             dedent(f"""
-                CONFIG.needMermaid = { json.dumps(need_mermaid) };
-                CONFIG.overlordClasses = { json.dumps(overlord_classes) };
+                CONFIG.needMermaid = { json.dumps( need_mermaid ) };
+                CONFIG.overlordClasses = { json.dumps( overlord_classes ) };
+                CONFIG.hasIdes = { json.dumps( DepKind.has_needs_for_ide(self.needs) ) };
                 globalThis.PAGE_IDES_CONFIG = { js_data }
                 """),
             type="text/javascript"

{pyodide_mkdocs_theme-5.6.4 → pyodide_mkdocs_theme-5.6.7}/pyodide_mkdocs_theme/pyodide_macros/tools_and_constants.py

@@ -1161,7 +1161,10 @@ class Dumping(MyEnum):
 
 @dataclass_with_VALUES(is_sorted=True)
 class GlobalJsConfigExport(MyEnum):
-    """ All PyodideMacrosPlugin properties to export to the JS CONFIG object. """
+    """
+    All PyodideMacrosPlugin properties to export to the JS CONFIG object.
+    All these are only pages independent data.
+    """
 
     args_figure_div_id:       'GlobalJsConfigExport' = AutoDescriptor()
     export_zip_with_names:    'GlobalJsConfigExport' = AutoDescriptor()

{pyodide_mkdocs_theme-5.6.4 → pyodide_mkdocs_theme-5.6.7}/pyodide_mkdocs_theme/templates/js-libs/0-config.js

@@ -182,6 +182,7 @@ const CONFIG = {
     overlordIsReady: false,
     overlordClasses: [],
 
+    hasIdes: false,
     needMermaid: false,
     calledMermaid: false,
 

{pyodide_mkdocs_theme-5.6.4 → pyodide_mkdocs_theme-5.6.7}/pyodide_mkdocs_theme/templates/js-libs/functoolsUi.js

@@ -20,8 +20,9 @@ If not, see <https://www.gnu.org/licenses/>.
 
 
 
-
-const getTheme=()=>{
+/**Returns "ace/theme/{ace-(color-theme-name}", depending on the current config of the palette.
+ * */
+export const getTheme=()=>{
   // automatically load current palette
   const palette = __md_get("__palette")
   let curPalette = palette === null
@@ -223,26 +224,6 @@ export const setupChromeFixAceGutterInDetailsElements=()=>{
 
 
 
-/**Setup reactivity for the day/night button, repainting ACE editors.
- * */
-export const aceEditorsDayNightReactivity=()=>{
-  // NOTE: yet again, jQuery didn't work on a "change" event...(?)
-  document.querySelector("[data-md-color-scheme]").addEventListener("change", _=>{
-    LOGGER_CONFIG.ACTIVATE && jsLogger("[Paint_ACEs]")
-
-    const theme = getTheme();
-    for(const id of CONFIG.element.allEditors){
-      for (let theEditor of document.querySelectorAll(`div[id^="${ id }"]`)) {
-        let editor = ace.edit(theEditor.id);
-        editor.setTheme(theme);
-        editor.getSession().setMode("ace/mode/python");
-      }
-    }
-  });
-}
-
-
-
 
 
 

{pyodide_mkdocs_theme-5.6.4 → pyodide_mkdocs_theme-5.6.7}/pyodide_mkdocs_theme/templates/js-libs/process_and_gui.js

@@ -22,7 +22,6 @@ import { subscribeWhenReady } from 'functools'
 import { moveLocalStorageEntriesFromOlderProjectId, trashLocalStorage } from 'functoolsStorage'
 import { applyLangMessagesFormatting } from 'functoolsTxt'
 import {
-  aceEditorsDayNightReactivity,
   createFiguresHeightMutationObserver,
   defineAceColorPaletteThemeData,
   defineCssMainColor,
@@ -64,8 +63,6 @@ if((CONFIG.projectMoveFromOldId??null) !== null){
 
 
 
-aceEditorsDayNightReactivity()
-
 createFiguresHeightMutationObserver()
 
 defineCssMainColor()
@@ -149,8 +146,7 @@ subscribeWhenReady(
   "TrashCan",
   ()=>{
     LOGGER_CONFIG.ACTIVATE && jsLogger('[TrashCan]')
-    const withIdes = CONFIG.CLASSES_POOL.GlobalRunnersManager && CONFIG.CLASSES_POOL.GlobalRunnersManager.WITH_IDES
-    if(withIdes) resetAllButton()
+    if(CONFIG.hasIdes) resetAllButton()
     if(CONFIG.element.trashCan) trashCanButton()
   },
   {waitFor: CONFIG.element.searchBtnsRight, runOnly:true},

{pyodide_mkdocs_theme-5.6.4 → pyodide_mkdocs_theme-5.6.7}/pyodide_mkdocs_theme/templates/js-per-pages/2-0-runnersManager-runners.js

@@ -44,14 +44,9 @@ const SEQ_MODES = Object.freeze({
  * */
 class GlobalRunnersManagerBase {
 
-  /**If true, the 4-0-... class is used, meaning there are some Ides in the current page.
-   * */
-  static WITH_IDES = false
-
-
   constructor(){
 
-    /**Holds all the Runner instances in the page, as `{runnerId: object}`
+    /**Holds ALL the Runner instances in the page (skipped or not), as `{runnerId: object}`.
      * */
     this.allRunners = {}
 

{pyodide_mkdocs_theme-5.6.4 → pyodide_mkdocs_theme-5.6.7}/pyodide_mkdocs_theme/templates/js-per-pages/3-terminalRunner-term.js

@@ -538,7 +538,7 @@ class _TerminalHandler extends PyodideSectionsRunner {
           e.preventDefault()
           e.stopPropagation()
           await navigator.clipboard.writeText(txt)
-          return
+          return false
         }
 
         let currentCmd = this.terminal.get_command();

{pyodide_mkdocs_theme-5.6.4 → pyodide_mkdocs_theme-5.6.7}/pyodide_mkdocs_theme/templates/js-per-pages/4-0-idesManager-ide.js

@@ -19,6 +19,7 @@ If not, see <https://www.gnu.org/licenses/>.
 
 
 import { escapePyodideCodeForJsTemplates } from 'functoolsTxt'
+import { getTheme } from "functoolsUi"
 
 
 /** Import then reexport, so that Ide modules can import this version: this will enforce proper
@@ -227,7 +228,31 @@ def _hack_zip_loading():
  * */
 class GlobalRunnersManager extends GlobalZipImportIdesManager {
 
-  static WITH_IDES = true
+  constructor(){
+    super()
+    this.allIdes = []
+    this._setupAceAutoPaintOnThemeChange()
+  }
+
+
+  _setupAceAutoPaintOnThemeChange(){
+    document.querySelector("[data-md-color-scheme]").addEventListener("change", _=>{
+      LOGGER_CONFIG.ACTIVATE && jsLogger("[Paint_ACEs]")
+      const theme = getTheme();
+      for(const ide of this.allIdes){
+        let editor = ace.edit(ide.id);
+        editor.setTheme(theme);
+        editor.getSession().setMode("ace/mode/python");
+      }
+    })
+  }
+
+  registerRunner(runner){
+    super.registerRunner(runner)
+    if(runner.isIde){
+      this.allIdes.push(runner)
+    }
+  }
 
   resetAllIdes(){
     Object.values(this.allRunners).forEach(runner=>{
@@ -241,4 +266,4 @@ class GlobalRunnersManager extends GlobalZipImportIdesManager {
 CONFIG.CLASSES_POOL.GlobalRunnersManager = GlobalRunnersManager
 
 // Forbid a new CLASSES_POOL registration with this comment/character: }
-// (see python_devops/py_codes_updates/html_deps_and_import_map.py:gather_all_scripts_and_css_kinds_and_rebuild_Deps)
+// (see python_devops/py_codes_updates/html_deps_and_import_map.py:gather_all_scripts_and_css_kinds_and_rebuild_Deps)

{pyodide_mkdocs_theme-5.6.4 → pyodide_mkdocs_theme-5.6.7}/pyodide_mkdocs_theme/templates/js-per-pages/4-ideLogistic-ide.js

@@ -241,7 +241,7 @@ class IdeZipManager extends IdeStorageManager {
   /**Build and return the callback to export IDEs contents as zip, and also put in place the zip
    * importation elements.
    * */
-  buildZipExportsToolsAndCbk(jBtn){
+  buildZipExportsToolsAndCbk(jBtn){   // CodCap
     // https://developer.mozilla.org/en-US/docs/Web/API/HTML_Drag_and_Drop_API/File_drag_and_drop
     // https://stackoverflow.com/questions/43180248/firefox-ondrop-event-datatransfer-is-null-after-update-to-version-52
 

{pyodide_mkdocs_theme-5.6.4 → pyodide_mkdocs_theme-5.6.7}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pyodide-mkdocs-theme"
-version = "5.6.4"
+version = "5.6.7"
 requires-python = ">=3.9, <4.0"
 license = { text = "GPL-3.0-or-later" }
 description = "Package embedding the necessary tools to host pyodide, ACE editors, jQuery terminals in mkdocs documentations"

pyodide_mkdocs_theme-5.6.4/pyodide_mkdocs_theme/__version__.py

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