@objectivex666/dsh-settings-search 1.2.0 → 1.3.0

package/lib/client.js

@@ -135,26 +135,50 @@ window.__ModuleLoader__.load({
       }
 
       /**
-       * Read visible titles for self-drawing occupants out of the live DOM:
-       * the shell marks every rendered inner-slot occupant with
-       * `[data-slot="<name>"]`; when DOM order matches entry order we can
-       * pair each rendered card with its registration id.
+       * Read visible titles for self-drawing occupants out of the live DOM.
+       * Two shell shapes exist for `[data-slot="<name>"]`:
+       * - per-occupant anchors: one element each, count === regs → pair ids;
+       * - a single WRAPPER around all rows (e.g. settings.general.item's
+       *   stacked section): harvest each direct child as one row, keyed by
+       *   render order ("#i") since id pairing is impossible.
        */
       const runHarvest = () => {
         let grew = false
         if (typeof document === 'undefined') return false
+        let map
         for (const cfg of DEEP_SLOTS) {
-          let nodes = []
-          try { nodes = [...document.querySelectorAll(`[data-slot="${cfg.slot}"]`)] } catch { continue }
+          let containers = []
+          try { containers = [...document.querySelectorAll(`[data-slot="${cfg.slot}"]`)] } catch { continue }
           const regs = sortEntries(entriesOf(cfg.slot))
-          if (nodes.length === 0 || nodes.length !== regs.length) continue
-          let map = harvest.get(cfg.slot)
+          if (regs.length === 0) continue
+          let nodes = []
+          if (containers.length === 1 && containers[0].childElementCount > 0) {
+            nodes = [...containers[0].children]
+          } else {
+            nodes = containers.filter((n) => n.childElementCount >= 0)
+          }
+          if (nodes.length === 0) continue
+          map = harvest.get(cfg.slot)
           if (map === undefined) { map = new Map(); harvest.set(cfg.slot, map) }
+          if (nodes.length !== regs.length) {
+            // wrapper shape: index-keyed loose harvest of every rendered row
+            nodes.forEach((node, i) => {
+              const key = '#' + i
+              if (map.has(key)) return
+              const title = titleFromNode(node)
+              if (title === '') return
+              const text = (node.textContent ?? '').replace(/\s+/g, ' ').trim().slice(0, 160)
+              map.set(key, { title, idx: i, text }); grew = true
+            })
+            continue
+          }
           regs.forEach((entry, i) => {
             const id = String(entry.options?.id ?? i)
             if (map.has(id)) return
             const title = titleFromNode(nodes[i])
-            if (title !== '') { map.set(id, title); grew = true }
+            if (title === '') return
+            const text = (nodes[i].textContent ?? '').replace(/\s+/g, ' ').trim().slice(0, 160)
+            map.set(id, { title, idx: i, text }); grew = true
           })
         }
         if (grew) harvestSeq += 1
@@ -194,24 +218,30 @@ window.__ModuleLoader__.load({
         const out = []
         for (const cfg of DEEP_SLOTS) {
           const mapped = harvest.get(cfg.slot)
-          for (const entry of sortEntries(entriesOf(cfg.slot))) {
+          sortEntries(entriesOf(cfg.slot)).forEach((entry, i) => {
             const id = String(entry.options?.id ?? '')
-            if (id === '') continue
-            const label = staticLabel(entry, cfg)
-              || (mapped ? mapped.get(id) ?? '' : '')
-            if (label === '') continue // unmapped, unharvested — invisible until it renders once
-            if (out.some((e) => e.key === cfg.slot + '#' + id)) continue
+            if (id === '') return
+            // static label first, then id-paired harvest, then loose index-keyed harvest
+            const hitId = mapped?.get(id)
+            const hitIdx = mapped?.get('#' + i)
+            const hitObj = typeof hitId === 'object' ? hitId : (typeof hitIdx === 'object' ? hitIdx : undefined)
+            const label = staticLabel(entry, cfg) || hitObj?.title || ''
+            if (label === '') return // unmapped, unharvested — invisible until it renders once
+            const key = cfg.slot + '#' + id
+            if (out.some((e) => e.key === key)) return
             out.push({
               kind: 'option',
-              key: cfg.slot + '#' + id,
+              key,
               slot: cfg.slot,
               id,
               order: entry.options?.order ?? 0,
               label,
+              hay: label + ' ' + (hitObj?.text ?? ''),
+              rowIndex: hitObj?.idx ?? i,
               parentId: cfg.parent,
               parentLabel: parentLabel(cfg.parent),
             })
-          }
+          })
         }
         return out.sort((a, b) => a.parentLabel !== b.parentLabel
           ? a.parentLabel.localeCompare(b.parentLabel)
@@ -232,8 +262,10 @@ window.__ModuleLoader__.load({
       const want = String(wantText ?? '').trim()
       if (want === '') return false
       const buttons = panelButtons()
-      const hit = buttons.find((b) => (b.textContent ?? '').trim() === want)
-        ?? buttons.find((b) => (b.textContent ?? '').trim().startsWith(want))
+      const textOf = (b) => (b.textContent ?? '').trim()
+      const hit = buttons.find((b) => textOf(b) === want)
+        ?? buttons.find((b) => textOf(b).startsWith(want))
+        ?? buttons.find((b) => want.length >= 2 && textOf(b) !== '' && (textOf(b).includes(want) || want.includes(textOf(b))))
       if (!hit) return false
       hit.click()
       return true
@@ -261,8 +293,23 @@ window.__ModuleLoader__.load({
       /** Highlight the rendered row card for one indexed option. */
       const flashOptionRow = (item) => {
         try {
-          const nodes = [...document.querySelectorAll(`[data-slot="${item.slot}"]`)]
-          const target = nodes.find((n) => (n.textContent ?? '').includes(item.label)) ?? nodes[0]
+          let target = null
+          if (typeof item.rowIndex === 'number') {
+            // wrapper shape: pick the exact rendered row by index
+            const container = document.querySelector(`[data-slot="${item.slot}"]`)
+            target = container?.children?.[item.rowIndex] ?? null
+            if (target && !(target.textContent ?? '').includes(item.label)) {
+              // index drift — fall through to textual match below
+              target = null
+            }
+          }
+          if (!target) {
+            const nodes = [...document.querySelectorAll(`[data-slot="${item.slot}"]`)]
+            const rows = nodes.length === 1 && nodes[0].childElementCount > 0
+              ? [...nodes[0].children]
+              : nodes
+            target = rows.find((n) => (n.textContent ?? '').includes(item.label)) ?? null
+          }
           if (!target) return
           target.scrollIntoView({ block: 'nearest' })
           target.classList.remove('sss-flash')
@@ -342,7 +389,7 @@ window.__ModuleLoader__.load({
           ? sections.filter((s) => matches(`${s.label} ${s.id}`.toLowerCase()))
           : []
         const shownOptions = q !== ''
-          ? deeps.filter((o) => matches(`${o.label} ${o.parentLabel} ${o.id} ${o.slot}`.toLowerCase()))
+          ? deeps.filter((o) => matches(`${o.hay} ${o.parentLabel} ${o.id} ${o.slot}`.toLowerCase()))
           : []
         const none = q !== '' && shownPages.length === 0 && shownOptions.length === 0
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@objectivex666/dsh-settings-search",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "description": "DSH settings panel search plugin – instantly filter setting sections and general items with navigation guidance. Installable via `dsh plugin add`.",
   "keywords": [
     "dsh",