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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pyodide-mkdocs-theme
-Version: 5.6.5
+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.5 → 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.5 → 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.5 → 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.5 → 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.5 → pyodide_mkdocs_theme-5.6.7}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pyodide-mkdocs-theme"
-version = "5.6.5"
+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.5/pyodide_mkdocs_theme/__version__.py

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