atlasdocs-theme 0.2.2__tar.gz → 0.3.1__tar.gz

{atlasdocs_theme-0.2.2 → atlasdocs_theme-0.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: atlasdocs-theme
-Version: 0.2.2
+Version: 0.3.1
 Summary: ATLASDocs hub theme for Zensical/MkDocs
 Author-email: Jason Oliver <jason.oliver@cern.ch>
 License-Expression: Apache-2.0

{atlasdocs_theme-0.2.2 → atlasdocs_theme-0.3.1}/atlasdocs_theme/assets/javascripts/indico_category_loader.js

@@ -131,11 +131,13 @@
     }
 
     function renderAll(container, events) {
-        const filtered = events.filter(ev => ev._type !== 'category_metadata' && ev.date);
+        if (!events.length) {
+            container.innerHTML = '<p><em>No meetings found.</em></p>';
+            return;
+        }
 
-        // Group by month, newest first
         const byMonth = new Map();
-        filtered
+        events
             .sort((a, b) => b.date.localeCompare(a.date))
             .forEach(ev => {
                 const [y, m] = ev.date.split('-').map(Number);
@@ -145,14 +147,93 @@
                 byMonth.get(key).events.push(ev);
             });
 
-        const html = [...byMonth.entries()]
+        container.innerHTML = [...byMonth.entries()]
             .sort(([a], [b]) => b.localeCompare(a))
             .map(([, { label, events: evs }]) =>
                 `<h2>${label}</h2>\n` + evs.map(renderMeeting).join('\n')
             )
             .join('\n');
+    }
+
+    // ---------------------------------------------------------------------------
+    // Fuse.js search workers
+    // Workers are built from the pre-built _search.json index, not the full
+    // category JSON.  Each returns a Set<event_url> for the matched events.
+    // ---------------------------------------------------------------------------
+
+    class FuseWorker {
+        constructor(items, keys, options = {}) {
+            this._items = items;
+            this._keys = keys;
+            this._options = { threshold: 0.35, ignoreLocation: true, ...options };
+            this._fuse = null;
+        }
+
+        init(FuseClass) {
+            this._fuse = new FuseClass(this._items, { keys: this._keys, ...this._options });
+        }
+
+        _matchingUrls(query) {
+            const hits = (query && this._fuse) ? this._fuse.search(query).map(r => r.item) : this._items;
+            return new Set(hits.map(item => item.event_url || item.url));
+        }
+    }
 
-        container.innerHTML = html || '<p><em>No meetings found.</em></p>';
+    class MeetingWorker extends FuseWorker {
+        constructor(index) {
+            super(
+                index.filter(r => r.type === 'event'),
+                [{ name: 'title', weight: 1 }]
+            );
+        }
+        matchingUrls(query) { return this._matchingUrls(query); }
+    }
+
+    class ContributionWorker extends FuseWorker {
+        constructor(index) {
+            super(
+                index.filter(r => r.type === 'contribution'),
+                [{ name: 'title', weight: 1 }]
+            );
+        }
+        matchingUrls(query) { return this._matchingUrls(query); }
+    }
+
+    class SpeakerWorker extends FuseWorker {
+        constructor(index) {
+            super(
+                index.filter(r => r.type === 'speaker'),
+                [{ name: 'name', weight: 2 }, { name: 'variants', weight: 1 }]
+            );
+        }
+        matchingUrls(query) { return this._matchingUrls(query); }
+    }
+
+    // ---------------------------------------------------------------------------
+    // Search UI
+    // ---------------------------------------------------------------------------
+
+    function buildSearchBar() {
+        const wrap = document.createElement('div');
+        wrap.className = 'indico-search-bar';
+        wrap.innerHTML =
+            `<input type="search" placeholder="Search meetings, talks, speakers…" aria-label="Search meetings">` +
+            `<span class="indico-search-count"></span>`;
+        return wrap;
+    }
+
+    // ---------------------------------------------------------------------------
+    // Fuse.js loader — ESM import avoids polluting window.Fuse and
+    // conflicting with MkDocs Material's own bundled Fuse instance.
+    // ---------------------------------------------------------------------------
+
+    let _fusePromise = null;
+    function loadFuse() {
+        if (_fusePromise) return _fusePromise;
+        _fusePromise = import('https://cdn.jsdelivr.net/npm/fuse.js@7/dist/fuse.esm.js')
+            .then(m => m.default)
+            .catch(() => null);
+        return _fusePromise;
     }
 
     // ---------------------------------------------------------------------------
@@ -162,13 +243,62 @@
     function load(container) {
         const src = container.dataset.json;
         if (!src) return;
+
+        // Derive search index path: category_492.json → category_492_search.json
+        const searchSrc = container.dataset.search
+            || src.replace(/\.json$/, '_search.json');
+
         container.innerHTML = '<p><em>Loading…</em></p>';
-        fetch(src)
-            .then(r => { if (!r.ok) throw new Error(`HTTP ${r.status}`); return r.json(); })
-            .then(data => renderAll(container, Array.isArray(data) ? data : (data.events || [])))
-            .catch(err => {
-                container.innerHTML = `<p><em>Could not load meetings: ${err.message}</em></p>`;
+
+        Promise.all([
+            fetch(src).then(r => { if (!r.ok) throw new Error(`HTTP ${r.status}`); return r.json(); }),
+            fetch(searchSrc).then(r => r.ok ? r.json() : []).catch(() => []),
+            loadFuse(),
+        ]).then(([data, index, FuseClass]) => {
+            const events = (Array.isArray(data) ? data : (data.events || []))
+                .filter(ev => ev._type !== 'category_metadata' && ev.date);
+
+            const meetingWorker      = new MeetingWorker(index);
+            const contributionWorker = new ContributionWorker(index);
+            const speakerWorker      = new SpeakerWorker(index);
+
+            if (FuseClass) {
+                [meetingWorker, contributionWorker, speakerWorker]
+                    .forEach(w => w.init(FuseClass));
+            }
+
+            const bar     = buildSearchBar();
+            container.parentNode.insertBefore(bar, container);
+            const input   = bar.querySelector('input');
+            const countEl = bar.querySelector('.indico-search-count');
+
+            function applySearch(query) {
+                let results;
+                if (!query) {
+                    results = events;
+                    countEl.textContent = '';
+                } else {
+                    const urls = new Set([
+                        ...meetingWorker.matchingUrls(query),
+                        ...contributionWorker.matchingUrls(query),
+                        ...speakerWorker.matchingUrls(query),
+                    ]);
+                    results = events.filter(ev => urls.has(ev.url));
+                    countEl.textContent = `${results.length} result${results.length !== 1 ? 's' : ''}`;
+                }
+                renderAll(container, results);
+            }
+
+            let timer;
+            input.addEventListener('input', e => {
+                clearTimeout(timer);
+                timer = setTimeout(() => applySearch(e.target.value.trim()), 200);
             });
+
+            renderAll(container, events);
+        }).catch(err => {
+            container.innerHTML = `<p><em>Could not load meetings: ${err.message}</em></p>`;
+        });
     }
 
     const container = document.getElementById('indico-meetings');

{atlasdocs_theme-0.2.2 → atlasdocs_theme-0.3.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "atlasdocs-theme"
-version = "0.2.2"
+version = "0.3.1"
 description = "ATLASDocs hub theme for Zensical/MkDocs"
 authors = [
   { name = "Jason Oliver", email = "jason.oliver@cern.ch" }