dsh-file-activity 0.5.1 → 0.5.2

package/lib/parts/rows.part.js

@@ -1,149 +1,170 @@
-    // ── row rendering helpers (recent list & stats tree) ──────────────────
-    const opClass = (op) => (op === 'create' ? 'dfa-op-create' : op === 'modify' ? 'dfa-op-modify' : op === 'delete' ? 'dfa-op-delete' : 'dfa-op-read')
-    const opLabel = (op) => (op === 'create' ? strings.create() : op === 'modify' ? strings.modify() : op === 'delete' ? strings.delete() : strings.read())
+// ── row rendering helpers (recent list & stats tree) ──────────────────
+const opClass = (op) =>
+  op === 'create'
+    ? 'dfa-op-create'
+    : op === 'modify'
+      ? 'dfa-op-modify'
+      : op === 'delete'
+        ? 'dfa-op-delete'
+        : 'dfa-op-read'
+const opLabel = (op) =>
+  op === 'create'
+    ? strings.create()
+    : op === 'modify'
+      ? strings.modify()
+      : op === 'delete'
+        ? strings.delete()
+        : strings.read()
 
-    /** Tooltip for a stats file row: absolute path + created / last-seen times. */
-    const fileTitle = (abs, firstSeen, lastSeen) => {
-      const times = []
-      if (typeof firstSeen === 'number') times.push(`${strings.created()} ${formatTime(firstSeen)}`)
-      if (typeof lastSeen === 'number') times.push(`${strings.lastSeen()} ${formatTime(lastSeen)}`)
-      return times.length > 0 ? `${abs}\n${times.join(' · ')}` : abs
-    }
+/** Tooltip for a stats file row: absolute path + created / last-seen times. */
+const fileTitle = (abs, firstSeen, lastSeen) => {
+  const times = []
+  if (typeof firstSeen === 'number') times.push(`${strings.created()} ${formatTime(firstSeen)}`)
+  if (typeof lastSeen === 'number') times.push(`${strings.lastSeen()} ${formatTime(lastSeen)}`)
+  return times.length > 0 ? `${abs}\n${times.join(' · ')}` : abs
+}
 
-    /** Count pills for a file/dir node — only actions that actually happened are
-     *  shown (a zero count renders no pill; all-zero nodes render no pill group,
-     *  keeping untouched files visually quiet). */
-    const countPills = (node) => {
-      const pills = []
-      if (node.read > 0) pills.push(createElement('span', { className: 'dfa-count dfa-count-read' }, `${strings.readShort()} ${node.read}`))
-      if (node.create > 0) pills.push(createElement('span', { className: 'dfa-count dfa-count-create' }, `${strings.createShort()} ${node.create}`))
-      if (node.modify > 0) pills.push(createElement('span', { className: 'dfa-count dfa-count-modify' }, `${strings.modifyShort()} ${node.modify}`))
-      if (pills.length === 0) return null
-      return createElement('span', { className: 'dfa-counts', style: { paddingLeft: '6px' } }, ...pills)
-    }
+/** Count pills for a file/dir node — only actions that actually happened are
+ *  shown (a zero count renders no pill; all-zero nodes render no pill group,
+ *  keeping untouched files visually quiet). */
+const countPills = (node) => {
+  const pills = []
+  if (node.read > 0)
+    pills.push(createElement('span', { className: 'dfa-count dfa-count-read' }, `${strings.readShort()} ${node.read}`))
+  if (node.create > 0)
+    pills.push(
+      createElement('span', { className: 'dfa-count dfa-count-create' }, `${strings.createShort()} ${node.create}`),
+    )
+  if (node.modify > 0)
+    pills.push(
+      createElement('span', { className: 'dfa-count dfa-count-modify' }, `${strings.modifyShort()} ${node.modify}`),
+    )
+  if (pills.length === 0) return null
+  return createElement('span', { className: 'dfa-counts', style: { paddingLeft: '6px' } }, ...pills)
+}
 
-    /** Extension of a file name (lowercase, no leading dot); '' when none.
-     *  Dotfiles map to their whole name ('.gitignore' → 'gitignore') so the
-     *  badge table can cover them; 'notes.' still yields ''. */
-    const extOf = (name) => {
-      const dot = name.lastIndexOf('.')
-      if (dot > 0) return name.slice(dot + 1).toLowerCase()
-      if (dot === 0) return name.slice(1).toLowerCase()
-      return ''
-    }
+/** Extension of a file name (lowercase, no leading dot); '' when none.
+ *  Dotfiles map to their whole name ('.gitignore' → 'gitignore') so the
+ *  badge table can cover them; 'notes.' still yields ''. */
+const extOf = (name) => {
+  const dot = name.lastIndexOf('.')
+  if (dot > 0) return name.slice(dot + 1).toLowerCase()
+  if (dot === 0) return name.slice(1).toLowerCase()
+  return ''
+}
 
-    /** Extension-less but common build files → their badge key. */
-    const NAME_BADGES = {
-      makefile: 'makefile', dockerfile: 'dockerfile', 'cmakelists.txt': 'cmake',
-    }
+/** Extension-less but common build files → their badge key. */
+const NAME_BADGES = {
+  makefile: 'makefile',
+  dockerfile: 'dockerfile',
+  'cmakelists.txt': 'cmake',
+}
 
-    /** Badge key for a file name: basename match first, then extension. */
-    const badgeKeyOf = (name) => {
-      const base = name.toLowerCase()
-      const named = NAME_BADGES[base]
-      if (named !== undefined) return named
-      return extOf(name)
-    }
+/** Badge key for a file name: basename match first, then extension. */
+const badgeKeyOf = (name) => {
+  const base = name.toLowerCase()
+  const named = NAME_BADGES[base]
+  if (named !== undefined) return named
+  return extOf(name)
+}
 
-    /** A stats-tree file row: icon + name + count pills + relative time. */
-    const fileRow = (file, depth, onOpen) =>
-      createElement(
-        'div',
-        {
-          key: file.abs,
-          className: 'dfa-row',
-          onClick: () => onOpen(file.abs),
-          style: { paddingLeft: 8 + depth * 20 },
-          title: fileTitle(file.abs, file.firstSeen, file.lastSeen),
-        },
-        createElement('span', { className: 'dfa-row-icon dfa-icon-file' }, fileIconByExt(badgeKeyOf(file.name))),
-        createElement('span', { className: 'dfa-row-name dfa-name-file' }, file.name),
-        countPills(file),
-        file.lastSeen
-          ? createElement('span', { className: 'dfa-time' }, formatRelative(file.lastSeen))
-          : null,
-      )
+/** A stats-tree file row: icon + name + count pills + relative time. */
+const fileRow = (file, depth, onOpen) =>
+  createElement(
+    'div',
+    {
+      key: file.abs,
+      className: 'dfa-row',
+      onClick: () => onOpen(file.abs),
+      style: { paddingLeft: 8 + depth * 20 },
+      title: fileTitle(file.abs, file.firstSeen, file.lastSeen),
+    },
+    createElement('span', { className: 'dfa-row-icon dfa-icon-file' }, fileIconByExt(badgeKeyOf(file.name))),
+    createElement('span', { className: 'dfa-row-name dfa-name-file' }, file.name),
+    countPills(file),
+    file.lastSeen ? createElement('span', { className: 'dfa-time' }, formatRelative(file.lastSeen)) : null,
+  )
 
-    /** One stats-tree node: file rows render inline, dirs toggle collapse. */
-    function renderTreeNode(node, depth, collapsedDirs, onToggleDir, onOpen) {
-      if (node.type === 'file') return fileRow(node, depth, onOpen)
-      const collapsed = collapsedDirs.has(node.path)
-      return createElement(
-        'div',
-        { key: node.path },
-        createElement(
-          'div',
-          {
-            className: 'dfa-row dfa-row-dir',
-            onClick: () => onToggleDir(node.path),
-            style: { paddingLeft: 8 + depth * 20 },
-            title: `${node.path}/`,
-          },
-          createElement('span', { className: 'dfa-chevron' },
-            collapsed ? icon.chevronRight(13) : icon.chevronDown(13),
-          ),
-          createElement('span', { className: 'dfa-row-icon dfa-icon-folder' }, icon.folder(14)),
-          createElement('span', { className: 'dfa-row-name' },
-            node.compressed ? node.name : node.name + '/',
-          ),
-          countPills(node),
-        ),
-        collapsed ? null : node.children.map((child) => renderTreeNode(child, depth + 1, collapsedDirs, onToggleDir, onOpen)),
-      )
-    }
+/** One stats-tree node: file rows render inline, dirs toggle collapse. */
+function renderTreeNode(node, depth, collapsedDirs, onToggleDir, onOpen) {
+  if (node.type === 'file') return fileRow(node, depth, onOpen)
+  const collapsed = collapsedDirs.has(node.path)
+  return createElement(
+    'div',
+    { key: node.path },
+    createElement(
+      'div',
+      {
+        className: 'dfa-row dfa-row-dir',
+        onClick: () => onToggleDir(node.path),
+        style: { paddingLeft: 8 + depth * 20 },
+        title: `${node.path}/`,
+      },
+      createElement('span', { className: 'dfa-chevron' }, collapsed ? icon.chevronRight(13) : icon.chevronDown(13)),
+      createElement('span', { className: 'dfa-row-icon dfa-icon-folder' }, icon.folder(14)),
+      createElement('span', { className: 'dfa-row-name' }, node.compressed ? node.name : node.name + '/'),
+      countPills(node),
+    ),
+    collapsed
+      ? null
+      : node.children.map((child) => renderTreeNode(child, depth + 1, collapsedDirs, onToggleDir, onOpen)),
+  )
+}
 
-    /** A recent-list row: op badge + basename + relative time. */
-    const recentEntry = (entry, onOpen) =>
-      createElement(
-        'div',
-        {
-          key: `${entry.path}:${entry.time}:${entry.op}`,
-          className: 'dfa-row',
-          onClick: () => onOpen(entry.path),
-          title: entry.path,
-        },
-        createElement('span', { className: `dfa-op ${opClass(entry.op)}` }, opLabel(entry.op)),
-        createElement('span', { className: 'dfa-row-name' }, basenameOf(entry.path)),
-        createElement('span', { className: 'dfa-time' }, formatRelative(entry.time)),
-      )
+/** A recent-list row: op badge + basename + relative time. */
+const recentEntry = (entry, onOpen) =>
+  createElement(
+    'div',
+    {
+      key: `${entry.path}:${entry.time}:${entry.op}`,
+      className: 'dfa-row',
+      onClick: () => onOpen(entry.path),
+      title: entry.path,
+    },
+    createElement('span', { className: `dfa-op ${opClass(entry.op)}` }, opLabel(entry.op)),
+    createElement('span', { className: 'dfa-row-name' }, basenameOf(entry.path)),
+    createElement('span', { className: 'dfa-time' }, formatRelative(entry.time)),
+  )
+
+/** Toggle a key in a Set (directory collapse state). */
+function toggleInSet(set, key) {
+  const next = new Set(set)
+  if (next.has(key)) next.delete(key)
+  else next.add(key)
+  return next
+}
 
-    /** Toggle a key in a Set (directory collapse state). */
-    function toggleInSet(set, key) {
-      const next = new Set(set)
-      if (next.has(key)) next.delete(key)
-      else next.add(key)
-      return next
-    }
+/** Clear the current session's records host-side and reset its bucket. */
+function clearSessionData(dataStore, sessionId) {
+  if (!window.confirm(strings.clearConfirm())) return
+  postClear(sessionId)
+  const current = dataStore.getSnapshot()
+  dataStore.set({
+    bySession: {
+      ...(current.bySession ?? {}),
+      [sessionId]: { recent: [], counts: {}, loading: false },
+    },
+  })
+}
 
-    /** Clear the current session's records host-side and reset its bucket. */
-    function clearSessionData(dataStore, sessionId) {
-      if (!window.confirm(strings.clearConfirm())) return
-      postClear(sessionId)
+/** Manual refresh: fetch stats + the authoritative cwd for this session. */
+function refreshSessionData(dataStore, sessionId, setCwd, setError) {
+  if (sessionId === '') return
+  void fetchStats(sessionId)
+    .then((value) => {
+      if (value === null) return
+      setCwd((prev) => prev || value.cwd || '')
       const current = dataStore.getSnapshot()
       dataStore.set({
         bySession: {
           ...(current.bySession ?? {}),
-          [sessionId]: { recent: [], counts: {}, loading: false },
+          [sessionId]: { recent: value.recent ?? [], counts: value.counts ?? {}, loading: false },
         },
       })
-    }
-
-    /** Manual refresh: fetch stats + the authoritative cwd for this session. */
-    function refreshSessionData(dataStore, sessionId, setCwd, setError) {
-      if (sessionId === '') return
-      void fetchStats(sessionId).then((value) => {
-        if (value === null) return
-        setCwd((prev) => prev || value.cwd || '')
-        const current = dataStore.getSnapshot()
-        dataStore.set({
-          bySession: {
-            ...(current.bySession ?? {}),
-            [sessionId]: { recent: value.recent ?? [], counts: value.counts ?? {}, loading: false },
-          },
-        })
-        setError(false)
-      }).catch(() => setError(true))
-      void fetchSessionCwd(sessionId).then((cwd) => {
-        if (cwd !== '') setCwd(cwd)
-      })
-    }
+      setError(false)
+    })
+    .catch(() => setError(true))
+  void fetchSessionCwd(sessionId).then((cwd) => {
+    if (cwd !== '') setCwd(cwd)
+  })
+}

package/lib/parts/store.part.js

@@ -1,16 +1,16 @@
-    // ── tiny external store ───────────────────────────────────────────────
-    function createStore(initial) {
-      let state = initial
-      const listeners = new Set()
-      return {
-        getSnapshot: () => state,
-        set(patch) {
-          state = { ...state, ...patch }
-          for (const listener of [...listeners]) listener()
-        },
-        subscribe(listener) {
-          listeners.add(listener)
-          return () => listeners.delete(listener)
-        },
-      }
-    }
+// ── tiny external store ───────────────────────────────────────────────
+function createStore(initial) {
+  let state = initial
+  const listeners = new Set()
+  return {
+    getSnapshot: () => state,
+    set(patch) {
+      state = { ...state, ...patch }
+      for (const listener of [...listeners]) listener()
+    },
+    subscribe(listener) {
+      listeners.add(listener)
+      return () => listeners.delete(listener)
+    },
+  }
+}

package/lib/parts/styles.part.js

@@ -1,8 +1,8 @@
-    // ── themed stylesheet (injected once per activation) ──────────────────
-    // Mirrors the better-sidebar explorer surface: tight 2px 6px 8px body,
-    // 30px rows, box-sizing border-box indentation, folder rows use the
-    // strong type face to read as directories, files stay regular.
-    const STYLES = `
+// ── themed stylesheet (injected once per activation) ──────────────────
+// Mirrors the better-sidebar explorer surface: tight 2px 6px 8px body,
+// 30px rows, box-sizing border-box indentation, folder rows use the
+// strong type face to read as directories, files stay regular.
+const STYLES = `
 .dfa { display:flex; flex-direction:column; height:100%; overflow-y:auto; overflow-x:hidden;
   padding:2px 6px 8px; gap:2px; font:var(--dsw-font-s-14); color:var(--dsw-alias-label-primary); }
 .dfa-iconbtn { display:inline-flex; align-items:center; justify-content:center; width:24px; height:24px; padding:0;
@@ -74,20 +74,7 @@
 .dfa-pdf-download:hover { text-decoration:underline; }
 .dfa-pdf-frame { flex:1; min-height:0; width:100%; border:none; border-radius:6px; background:transparent; }
 @keyframes dfa-row-in { from { opacity:0; transform:translateY(1px); } to { opacity:1; transform:none; } }
-/* ── sidebar tab selected-state overrides (issue #25) ─────────────────────
-   The host (dsh-better-sidebar) renders tabs with CSS-modules hashed class
-   names (e.g. tabActive_xxxxx) and no data attributes, so the selected tab
-   is targeted via the [class*="tabActive"] substring selector — the fallback
-   contract that keeps these rules working if the host ever renames its
-   classes. The double attribute selector [class*="tab"][class*="tabActive"]
-   (0,2,0) beats the host .tabActive (0,1,0) by specificity alone: no
-   !important, no reliance on injection order. Selected = theme-aware brand
-   fill + contrast ink (light #4176e6/#fff, dark #679efe/#0f1115); the :hover
-   variant (0,3,0) beats the host .tab:hover (0,2,0) so the selected state
-   never collapses into the host's grey hover. Unselected tabs stay untouched
-   (transparent + secondary label ink, host grey hover). */
-[class*="tab"][class*="tabActive"] { background:var(--dsw-alias-state-business-primary); color:var(--dsw-alias-label-primary-foreground); }
-[class*="tab"][class*="tabActive"]:hover { background:var(--dsw-alias-state-business-primary); color:var(--dsw-alias-label-primary-foreground); }
-[class*="tab"][class*="tabActive"] [class*="tabClose"] { color:var(--dsw-alias-label-primary-foreground); }
-[class*="tab"][class*="tabActive"] [class*="tabClose"]:hover { background:color-mix(in srgb, var(--dsw-alias-label-primary-foreground) 18%, transparent); color:var(--dsw-alias-label-primary-foreground); }
+/* issue #60: 移除 #25 的侧边栏页签选中态品牌蓝覆盖（[class*="tab"][class*=
+   "tabActive"] 全局子串选择器误伤宿主对话/工作区 tab 选中态，出现用户不
+   想要的蓝色高亮）。页签选中态回归宿主（dsh-better-sidebar）默认样式。 */
 `

package/lib/parts/tree.part.js

@@ -1,71 +1,84 @@
-    // ── directory tree construction ───────────────────────────────────────
-    /**
-     * Collapse chain directories: a directory whose only child is another
-     * directory merges into it (a → a.b → a.b.c …). Deep single-child paths
-     * render as one dotted label with the file(s) directly beneath.
-     * `root` itself is never collapsed (its name is '' and would drop the
-     * top-level directory).
-     */
-    function compressChains(node, isRoot) {
-      for (const child of node.children) {
-        if (child.type === 'dir') compressChains(child, false)
-      }
-      if (isRoot) return
-      while (node.children.length === 1 && node.children[0].type === 'dir') {
-        const only = node.children[0]
-        node.name = `${node.name}.${only.name}`
-        node.children = only.children
-        node.compressed = true
-      }
-    }
+// ── directory tree construction ───────────────────────────────────────
+/**
+ * Collapse chain directories: a directory whose only child is another
+ * directory merges into it (a → a.b → a.b.c …). Deep single-child paths
+ * render as one dotted label with the file(s) directly beneath.
+ * `root` itself is never collapsed (its name is '' and would drop the
+ * top-level directory).
+ */
+function compressChains(node, isRoot) {
+  for (const child of node.children) {
+    if (child.type === 'dir') compressChains(child, false)
+  }
+  if (isRoot) return
+  while (node.children.length === 1 && node.children[0].type === 'dir') {
+    const only = node.children[0]
+    node.name = `${node.name}.${only.name}`
+    node.children = only.children
+    node.compressed = true
+  }
+}
 
-    /**
-     * Sort a directory node: directories first (alphabetically), then files
-     * (by total activity, then name); recurse into directories.
-     */
-    function sortNode(node) {
-      node.children.sort((a, b) => {
-        if (a.type !== b.type) return a.type === 'dir' ? -1 : 1
-        if (a.type === 'dir') return a.name < b.name ? -1 : a.name > b.name ? 1 : 0
-        const ta = a.read + a.create + a.modify
-        const tb = b.read + b.create + b.modify
-        return tb - ta || (a.name < b.name ? -1 : a.name > b.name ? 1 : 0)
-      })
-      for (const child of node.children) {
-        if (child.type === 'dir') sortNode(child)
-      }
-    }
+/**
+ * Sort a directory node: directories first (alphabetically), then files
+ * (by total activity, then name); recurse into directories.
+ */
+function sortNode(node) {
+  node.children.sort((a, b) => {
+    if (a.type !== b.type) return a.type === 'dir' ? -1 : 1
+    if (a.type === 'dir') return a.name < b.name ? -1 : a.name > b.name ? 1 : 0
+    const ta = a.read + a.create + a.modify
+    const tb = b.read + b.create + b.modify
+    return tb - ta || (a.name < b.name ? -1 : a.name > b.name ? 1 : 0)
+  })
+  for (const child of node.children) {
+    if (child.type === 'dir') sortNode(child)
+  }
+}
 
-    /**
-     * Build a nested directory tree from per-file counts, keyed by the file's
-     * absolute path. Every directory node aggregates its subtree counters and
-     * sorts directories first (alphabetically), then files (by activity).
-     */
-    function buildTree(counts) {
-      const root = { type: 'dir', name: '', path: '', children: [], read: 0, create: 0, modify: 0 }
-      for (const [abs, counter] of Object.entries(counts)) {
-        const parts = abs.split('/').filter((part) => part !== '')
-        if (parts.length === 0) continue
-        const name = parts[parts.length - 1]
-        let node = root
-        for (const dir of parts.slice(0, -1)) {
-          let child = node.children.find((c) => c.type === 'dir' && c.name === dir)
-          if (child === undefined) {
-            child = { type: 'dir', name: dir, path: `${node.path}/${dir}`, children: [], read: 0, create: 0, modify: 0 }
-            node.children.push(child)
-          }
-          node = child
-          node.read += counter.read
-          node.create += counter.create
-          node.modify += counter.modify
+/**
+ * Build a nested directory tree from per-file counts, keyed by the file's
+ * absolute path. Every directory node aggregates its subtree counters and
+ * sorts directories first (alphabetically), then files (by activity).
+ */
+function buildTree(counts) {
+  const root = { type: 'dir', name: '', path: '', children: [], read: 0, create: 0, modify: 0 }
+  for (const [abs, counter] of Object.entries(counts)) {
+    const parts = abs.split('/').filter((part) => part !== '')
+    if (parts.length === 0) continue
+    const name = parts[parts.length - 1]
+    let node = root
+    for (const dir of parts.slice(0, -1)) {
+      let child = node.children.find((c) => c.type === 'dir' && c.name === dir)
+      if (child === undefined) {
+        child = {
+          type: 'dir',
+          name: dir,
+          path: `${node.path}/${dir}`,
+          children: [],
+          read: 0,
+          create: 0,
+          modify: 0,
         }
-        node.children.push({
-          type: 'file', name, abs,
-          read: counter.read, create: counter.create, modify: counter.modify,
-          firstSeen: counter.firstSeen, lastSeen: counter.lastSeen,
-        })
+        node.children.push(child)
       }
-      sortNode(root)
-      compressChains(root, true)
-      return root
+      node = child
+      node.read += counter.read
+      node.create += counter.create
+      node.modify += counter.modify
     }
+    node.children.push({
+      type: 'file',
+      name,
+      abs,
+      read: counter.read,
+      create: counter.create,
+      modify: counter.modify,
+      firstSeen: counter.firstSeen,
+      lastSeen: counter.lastSeen,
+    })
+  }
+  sortNode(root)
+  compressChains(root, true)
+  return root
+}