lark-remote 0.5.20 → 0.5.21

package/dist/router/commands/ws.js

@@ -2,188 +2,233 @@ import { cardButton } from '../../card/card-shared.js';
 import { paginationBar, searchBar } from '../../card/card-helpers.js';
 import { pageSlice } from '../paging.js';
 import { resolveDirectory } from '../path-validation.js';
+import { withQuery } from './ls.js';
 export const WS_PAGE_SIZE = 5;
-export function buildWsCommand(args, ctx, offset, q, deps) {
-    const sub = args[0]?.toLowerCase();
-    switch (sub) {
-        case 'save': {
-            const name = args[1];
-            if (!name)
-                return { text: '用法: /ws save <name>' };
-            const cwd = deps.getCwd(ctx.userId);
-            if (!cwd)
-                return { text: '请先 /cd 设置工作目录' };
-            deps.saveWorkspace(name, cwd);
-            return { text: `已保存 workspace "${name}" -> ${cwd}` };
-        }
-        case 'use': {
-            const name = args[1];
-            if (!name)
-                return { text: '用法: /ws use <name>' };
-            const wsPath = deps.getWorkspace(name);
-            if (!wsPath)
-                return { text: `workspace "${name}" 不存在` };
-            const resolution = resolveDirectory(wsPath);
-            if (!resolution.ok) {
-                if (resolution.reason === 'missing')
-                    return { text: `路径不存在: ${wsPath}` };
-                if (resolution.reason === 'not_directory')
-                    return { text: `不是目录: ${wsPath}` };
-                return { text: `路径无效: ${wsPath}` };
-            }
-            deps.touchWorkspace(name);
-            return deps.switchCwd(ctx.userId, resolution.canonical, ctx);
-        }
-        case 'remove': {
-            const name = args[1];
-            if (!name)
-                return { text: '用法: /ws remove <name>' };
-            if (!deps.hasWorkspace(name))
-                return { text: `workspace "${name}" 不存在` };
-            deps.removeWorkspace(name);
-            return { text: `已删除 workspace "${name}"` };
-        }
-        case 'list':
-        default: {
-            const filter = q?.trim() || undefined;
-            const entries = deps.listWorkspaces();
-            const currentCwd = deps.getCwd(ctx.userId);
-            const sortMode = deps.getSortMode(ctx.userId);
-            if (sortMode === 'recent') {
-                entries.sort((a, b) => {
-                    if (b.lastUsedAt !== a.lastUsedAt)
-                        return b.lastUsedAt - a.lastUsedAt;
-                    return a.name.localeCompare(b.name);
-                });
-            }
-            else {
-                entries.sort((a, b) => a.name.localeCompare(b.name));
-            }
-            const ql = filter?.toLowerCase();
-            const visible = ql
-                ? entries.filter((entry) => entry.name.toLowerCase().includes(ql) || entry.path.toLowerCase().includes(ql))
-                : entries;
-            const { totalCount, totalPages, safeOffset, currentPage, pageItems: pageEntries, hasPagination, } = pageSlice(visible, offset, WS_PAGE_SIZE);
-            const bodyElements = [
+// ── 模块级命名原语 ─────────────────────────────────────────────────────────
+// crapper 把函数内部定义的箭头函数/闭包的决策点也算进外层函数：比较器、过滤
+// 谓词、payload 三元一律抽成模块顶层命名函数，显式传参（见 common/tool-summary.ts）。
+// `withQuery`（q 恒为最后一个字段，钉住卡片 payload 顺序）从 ls.ts 复用，
+// ls / ws 共用同一实现，避免跨文件同形函数。
+/** 筛选命中：名称或路径（大小写不敏感子串）。 */
+function wsMatchesQuery(entry, ql) {
+    return entry.name.toLowerCase().includes(ql) || entry.path.toLowerCase().includes(ql);
+}
+function wsFilterEntries(entries, ql) {
+    const visible = [];
+    for (const entry of entries) {
+        if (wsMatchesQuery(entry, ql))
+            visible.push(entry);
+    }
+    return visible;
+}
+function wsCompareRecent(a, b) {
+    if (b.lastUsedAt !== a.lastUsedAt)
+        return b.lastUsedAt - a.lastUsedAt;
+    return a.name.localeCompare(b.name);
+}
+function wsCompareName(a, b) {
+    return a.name.localeCompare(b.name);
+}
+function wsSortLabels(sortMode) {
+    return sortMode === 'recent'
+        ? { currentLabel: '🕐 最近使用', switchLabel: '🔤 字母顺序' }
+        : { currentLabel: '🔤 字母顺序', switchLabel: '🕐 最近使用' };
+}
+/** 单个 workspace 行的 3 个元素（div + column_set + hr）。 */
+function wsEntryElements(entry, safeOffset, filter) {
+    return [
+        {
+            tag: 'div',
+            text: { tag: 'lark_md', content: `**${entry.name}** → \`${entry.path}\`` },
+        },
+        {
+            tag: 'column_set',
+            columns: [
                 {
-                    tag: 'div',
-                    text: {
-                        tag: 'lark_md',
-                        content: `📂 当前工作目录：\`${currentCwd ?? '(未设置)'}\``,
-                    },
+                    tag: 'column',
+                    width: 'auto',
+                    elements: [
+                        cardButton('切换', withQuery({ cmd: 'ws.use', name: entry.name, offset: safeOffset }, filter), { type: 'primary', size: 'small' }),
+                    ],
                 },
-                { tag: 'hr' },
-                searchBar({
-                    cmd: 'ws.filter',
-                    placeholder: '搜索名称或路径，输完回车',
-                    currentQuery: filter,
-                }),
-            ];
-            if (filter) {
-                bodyElements.push({
-                    tag: 'div',
-                    text: {
-                        tag: 'lark_md',
-                        content: `🔍 筛选："${filter}" · 命中 ${totalCount} 个 workspace（点「清除筛选」取消）`,
-                    },
-                });
-            }
-            if (entries.length === 0 && !filter) {
-                bodyElements.push({
-                    tag: 'div',
-                    text: { tag: 'lark_md', content: '没有保存的 workspace' },
-                });
-            }
-            else if (filter && visible.length === 0) {
-                bodyElements.push({
-                    tag: 'div',
-                    text: { tag: 'lark_md', content: `🔍 无匹配条目（关键词："${filter}"）` },
-                });
-            }
-            else {
-                const currentLabel = sortMode === 'recent' ? '🕐 最近使用' : '🔤 字母顺序';
-                const switchLabel = sortMode === 'recent' ? '🔤 字母顺序' : '🕐 最近使用';
-                bodyElements.push({ tag: 'hr' }, {
-                    tag: 'column_set',
-                    columns: [
-                        {
-                            tag: 'column',
-                            width: 'weighted',
-                            weight: 1,
-                            vertical_align: 'center',
-                            elements: [
-                                {
-                                    tag: 'div',
-                                    text: { tag: 'lark_md', content: `排序：${currentLabel}` },
-                                },
-                            ],
-                        },
+                {
+                    tag: 'column',
+                    width: 'auto',
+                    elements: [
+                        cardButton('删除', withQuery({ cmd: 'ws.remove', name: entry.name, offset: safeOffset }, filter), { type: 'danger', size: 'small' }),
+                    ],
+                },
+            ],
+        },
+        { tag: 'hr' },
+    ];
+}
+/** 排序栏 + 所有行；末尾多余 hr 由调用方 pop（与原实现完全一致）。 */
+function wsListRows(pageEntries, sortMode, safeOffset, filter) {
+    const { currentLabel, switchLabel } = wsSortLabels(sortMode);
+    const rows = [
+        { tag: 'hr' },
+        {
+            tag: 'column_set',
+            columns: [
+                {
+                    tag: 'column',
+                    width: 'weighted',
+                    weight: 1,
+                    vertical_align: 'center',
+                    elements: [
                         {
-                            tag: 'column',
-                            width: 'auto',
-                            elements: [
-                                cardButton(`切换为 ${switchLabel}`, { cmd: 'ws.sort', ...(filter ? { q: filter } : {}) }, { type: 'default', size: 'small' }),
-                            ],
+                            tag: 'div',
+                            text: { tag: 'lark_md', content: `排序：${currentLabel}` },
                         },
                     ],
-                }, { tag: 'hr' });
-                for (const entry of pageEntries) {
-                    bodyElements.push({
-                        tag: 'div',
-                        text: { tag: 'lark_md', content: `**${entry.name}** → \`${entry.path}\`` },
-                    }, {
-                        tag: 'column_set',
-                        columns: [
-                            {
-                                tag: 'column',
-                                width: 'auto',
-                                elements: [
-                                    cardButton('切换', {
-                                        cmd: 'ws.use',
-                                        name: entry.name,
-                                        offset: safeOffset,
-                                        ...(filter ? { q: filter } : {}),
-                                    }, { type: 'primary', size: 'small' }),
-                                ],
-                            },
-                            {
-                                tag: 'column',
-                                width: 'auto',
-                                elements: [
-                                    cardButton('删除', {
-                                        cmd: 'ws.remove',
-                                        name: entry.name,
-                                        offset: safeOffset,
-                                        ...(filter ? { q: filter } : {}),
-                                    }, { type: 'danger', size: 'small' }),
-                                ],
-                            },
-                        ],
-                    }, { tag: 'hr' });
-                }
-                bodyElements.pop();
-                if (hasPagination) {
-                    bodyElements.push({ tag: 'hr' }, ...paginationBar({
-                        cmd: 'ws.page',
-                        offset: safeOffset,
-                        pageSize: WS_PAGE_SIZE,
-                        total: totalCount,
-                        extra: filter ? { q: filter } : {},
-                        label: `**${currentPage}/${totalPages}**（${totalCount}）`,
-                        prevText: '⬅',
-                        nextText: '➡',
-                    }));
-                }
-            }
-            return {
-                card: {
-                    schema: '2.0',
-                    config: { wide_screen_mode: true, update_multi: true },
-                    header: { title: { tag: 'plain_text', content: 'Workspaces' } },
-                    body: { elements: bodyElements },
                 },
-            };
+                {
+                    tag: 'column',
+                    width: 'auto',
+                    elements: [
+                        cardButton(`切换为 ${switchLabel}`, withQuery({ cmd: 'ws.sort' }, filter), {
+                            type: 'default',
+                            size: 'small',
+                        }),
+                    ],
+                },
+            ],
+        },
+        { tag: 'hr' },
+    ];
+    for (const entry of pageEntries)
+        rows.push(...wsEntryElements(entry, safeOffset, filter));
+    return rows;
+}
+function wsPagination(totalCount, totalPages, safeOffset, currentPage, filter) {
+    return [
+        { tag: 'hr' },
+        ...paginationBar({
+            cmd: 'ws.page',
+            offset: safeOffset,
+            pageSize: WS_PAGE_SIZE,
+            total: totalCount,
+            extra: withQuery({}, filter),
+            label: `**${currentPage}/${totalPages}**（${totalCount}）`,
+            prevText: '⬅',
+            nextText: '➡',
+        }),
+    ];
+}
+function wsSave(args, ctx, _offset, _q, deps) {
+    const name = args[1];
+    if (!name)
+        return { text: '用法: /ws save <name>' };
+    const cwd = deps.getCwd(ctx.userId);
+    if (!cwd)
+        return { text: '请先 /cd 设置工作目录' };
+    deps.saveWorkspace(name, cwd);
+    return { text: `已保存 workspace "${name}" -> ${cwd}` };
+}
+function wsUse(args, ctx, _offset, _q, deps) {
+    const name = args[1];
+    if (!name)
+        return { text: '用法: /ws use <name>' };
+    const wsPath = deps.getWorkspace(name);
+    if (!wsPath)
+        return { text: `workspace "${name}" 不存在` };
+    const resolution = resolveDirectory(wsPath);
+    if (!resolution.ok) {
+        if (resolution.reason === 'missing')
+            return { text: `路径不存在: ${wsPath}` };
+        if (resolution.reason === 'not_directory')
+            return { text: `不是目录: ${wsPath}` };
+        return { text: `路径无效: ${wsPath}` };
+    }
+    deps.touchWorkspace(name);
+    return deps.switchCwd(ctx.userId, resolution.canonical, ctx);
+}
+function wsRemove(args, _ctx, _offset, _q, deps) {
+    const name = args[1];
+    if (!name)
+        return { text: '用法: /ws remove <name>' };
+    if (!deps.hasWorkspace(name))
+        return { text: `workspace "${name}" 不存在` };
+    deps.removeWorkspace(name);
+    return { text: `已删除 workspace "${name}"` };
+}
+function wsList(_args, ctx, offset, q, deps) {
+    const filter = q?.trim() || undefined;
+    const entries = deps.listWorkspaces();
+    const currentCwd = deps.getCwd(ctx.userId);
+    const sortMode = deps.getSortMode(ctx.userId);
+    if (sortMode === 'recent') {
+        entries.sort(wsCompareRecent);
+    }
+    else {
+        entries.sort(wsCompareName);
+    }
+    const ql = filter?.toLowerCase();
+    const visible = ql ? wsFilterEntries(entries, ql) : entries;
+    const { totalCount, totalPages, safeOffset, currentPage, pageItems: pageEntries, hasPagination, } = pageSlice(visible, offset, WS_PAGE_SIZE);
+    const bodyElements = [
+        {
+            tag: 'div',
+            text: {
+                tag: 'lark_md',
+                content: `📂 当前工作目录：\`${currentCwd ?? '(未设置)'}\``,
+            },
+        },
+        { tag: 'hr' },
+        searchBar({
+            cmd: 'ws.filter',
+            placeholder: '搜索名称或路径，输完回车',
+            currentQuery: filter,
+        }),
+    ];
+    if (filter) {
+        bodyElements.push({
+            tag: 'div',
+            text: {
+                tag: 'lark_md',
+                content: `🔍 筛选："${filter}" · 命中 ${totalCount} 个 workspace（点「清除筛选」取消）`,
+            },
+        });
+    }
+    if (entries.length === 0 && !filter) {
+        bodyElements.push({
+            tag: 'div',
+            text: { tag: 'lark_md', content: '没有保存的 workspace' },
+        });
+    }
+    else if (filter && visible.length === 0) {
+        bodyElements.push({
+            tag: 'div',
+            text: { tag: 'lark_md', content: `🔍 无匹配条目（关键词："${filter}"）` },
+        });
+    }
+    else {
+        bodyElements.push(...wsListRows(pageEntries, sortMode, safeOffset, filter));
+        bodyElements.pop();
+        if (hasPagination) {
+            bodyElements.push(...wsPagination(totalCount, totalPages, safeOffset, currentPage, filter));
         }
     }
+    return {
+        card: {
+            schema: '2.0',
+            config: { wide_screen_mode: true, update_multi: true },
+            header: { title: { tag: 'plain_text', content: 'Workspaces' } },
+            body: { elements: bodyElements },
+        },
+    };
+}
+/** 子命令 → handler。用 Map 而非对象字面量：`constructor`/`toString` 这类键会命中 Object.prototype。 */
+const WS_SUB_HANDLERS = new Map([
+    ['save', wsSave],
+    ['use', wsUse],
+    ['remove', wsRemove],
+    ['list', wsList],
+]);
+export function buildWsCommand(args, ctx, offset, q, deps) {
+    const sub = args[0]?.toLowerCase();
+    const handler = sub === undefined ? undefined : WS_SUB_HANDLERS.get(sub);
+    return handler ? handler(args, ctx, offset, q, deps) : wsList(args, ctx, offset, q, deps);
 }
 //# sourceMappingURL=ws.js.map