lark-remote 0.5.19 → 0.5.21

package/dist/router/commands/ls.d.ts

@@ -6,4 +6,7 @@ export interface LsCommandOptions {
     rootDir?: string;
     q?: string;
 }
+/** `...(filter ? { q: filter } : {})` 单源：q 恒为最后一个字段。
+ *  ls / ws 两个命令共用（ws.ts 从本模块 import），避免同形实现两处维护。 */
+export declare function withQuery(value: Record<string, unknown>, filter: string | undefined): Record<string, unknown>;
 export declare function buildLsCommand(args: string[], _ctx: CommandContext, options: LsCommandOptions): CommandResult;

package/dist/router/commands/ls.js

@@ -52,189 +52,270 @@ function buildFileCard(filePath) {
         },
     };
 }
-export function buildLsCommand(args, _ctx, options) {
-    const { cwd, offset = 0, rootDir } = options;
-    if (!cwd)
-        return { text: '请先使用 /cd <path> 设置工作目录' };
-    const filter = options.q?.trim() || undefined;
-    let targetDir = cwd;
-    if (args[0]) {
-        const arg = args[0].startsWith('~') ? path.join(os.homedir(), args[0].slice(1)) : args[0];
-        const potentialDir = path.resolve(cwd, arg);
-        const kind = inspectPath(potentialDir);
-        if (kind === 'missing' || kind === 'unreadable') {
-            return { text: `ls: ${args[0]}: No such file or directory` };
-        }
-        if (kind === 'file')
-            return buildFileCard(potentialDir);
-        targetDir = potentialDir;
-    }
-    const browseRoot = rootDir ? path.resolve(cwd, rootDir) : targetDir;
-    try {
-        const entries = fs.readdirSync(targetDir, { withFileTypes: true });
-        const dirs = [];
-        const files = [];
-        for (const entry of entries) {
-            let isDir = entry.isDirectory();
-            let size;
-            if (!isDir) {
-                const resolution = statPath(path.join(targetDir, entry.name));
-                if (resolution.ok) {
-                    isDir = resolution.stat.isDirectory();
-                    if (!isDir)
-                        size = resolution.stat.size;
-                }
+/** `...(filter ? { q: filter } : {})` 单源：q 恒为最后一个字段。
+ *  ls / ws 两个命令共用（ws.ts 从本模块 import），避免同形实现两处维护。 */
+export function withQuery(value, filter) {
+    return filter ? { ...value, q: filter } : { ...value };
+}
+function lsCompareNames(a, b) {
+    return a.localeCompare(b);
+}
+function lsCompareItemNames(a, b) {
+    return a.name.localeCompare(b.name);
+}
+/** readdirSync + statPath 分类，返回已排序的 dirs / files。 */
+function lsReadEntries(targetDir) {
+    const entries = fs.readdirSync(targetDir, { withFileTypes: true });
+    const dirs = [];
+    const files = [];
+    for (const entry of entries) {
+        let isDir = entry.isDirectory();
+        let size;
+        if (!isDir) {
+            const resolution = statPath(path.join(targetDir, entry.name));
+            if (resolution.ok) {
+                isDir = resolution.stat.isDirectory();
+                if (!isDir)
+                    size = resolution.stat.size;
             }
-            if (isDir)
-                dirs.push(entry.name);
-            else
-                files.push({ name: entry.name, size });
         }
-        dirs.sort((a, b) => a.localeCompare(b));
-        files.sort((a, b) => a.name.localeCompare(b.name));
-        const allItems = [
-            ...dirs.map((name) => ({ name, isDir: true })),
-            ...files.map((file) => ({ name: file.name, isDir: false, size: file.size })),
-        ];
-        const ql = filter?.toLowerCase();
-        const visibleItems = ql
-            ? allItems.filter((item) => item.name.toLowerCase().includes(ql))
-            : allItems;
-        const visibleDirCount = visibleItems.reduce((count, item) => count + (item.isDir ? 1 : 0), 0);
-        const visibleFileCount = visibleItems.length - visibleDirCount;
-        const { totalCount, totalPages, safeOffset, currentPage, pageItems, hasPagination } = pageSlice(visibleItems, offset, LS_PAGE_SIZE);
-        const parentDir = path.dirname(targetDir);
-        const headerElements = [];
-        if (parentDir !== targetDir) {
-            headerElements.push(cardButton('上级', { cmd: 'ls.browse', path: parentDir, root: browseRoot }, { type: 'default', size: 'small' }));
-        }
-        if (targetDir !== browseRoot) {
-            headerElements.push(cardButton('返回', { cmd: 'ls.browse', path: browseRoot, root: browseRoot }, { type: 'default', size: 'small' }));
-        }
-        headerElements.push(cardButton('刷新', {
-            cmd: 'ls.refresh',
-            path: targetDir,
-            offset: safeOffset,
-            root: browseRoot,
-            ...(filter ? { q: filter } : {}),
-        }, { type: 'default', size: 'small' }));
-        if (targetDir !== cwd) {
-            headerElements.push(cardButton('切换', { cmd: 'ls.switch', path: targetDir, root: browseRoot }, { type: 'primary', size: 'small' }));
-        }
-        const dirButton = (name) => cardButton(`📁 ${name}`, { cmd: 'ls.browse', path: path.join(targetDir, name), root: browseRoot }, { type: 'default' });
-        const fileButton = (name, size) => cardButton(`📄 ${name}${size !== undefined ? ` (${formatBytes(size)})` : ''}`, { cmd: 'ls.file', path: path.join(targetDir, name) }, { type: 'default', size: 'small' });
-        const elements = [
-            {
-                tag: 'div',
-                text: {
-                    tag: 'lark_md',
-                    content: `\`${targetDir}\`\n共 ${visibleDirCount} 目录, ${visibleFileCount} 文件`,
-                },
-            },
-            {
+        if (isDir)
+            dirs.push(entry.name);
+        else
+            files.push({ name: entry.name, size });
+    }
+    dirs.sort(lsCompareNames);
+    files.sort(lsCompareItemNames);
+    return { dirs, files };
+}
+function lsBuildItems(dirs, files) {
+    const allItems = [];
+    for (const name of dirs)
+        allItems.push({ name, isDir: true });
+    for (const file of files)
+        allItems.push({ name: file.name, isDir: false, size: file.size });
+    return allItems;
+}
+function lsFilterItems(allItems, ql) {
+    if (!ql)
+        return allItems;
+    const visible = [];
+    for (const item of allItems) {
+        if (item.name.toLowerCase().includes(ql))
+            visible.push(item);
+    }
+    return visible;
+}
+function lsCountDirs(items) {
+    let count = 0;
+    for (const item of items) {
+        if (item.isDir)
+            count += 1;
+    }
+    return count;
+}
+function lsPartitionPage(pageItems) {
+    const pageDirs = [];
+    const pageFiles = [];
+    for (const item of pageItems) {
+        if (item.isDir)
+            pageDirs.push(item);
+        else
+            pageFiles.push(item);
+    }
+    return { pageDirs, pageFiles };
+}
+function lsColumns(elements) {
+    const columns = [];
+    for (const element of elements) {
+        columns.push({ tag: 'column', width: 'auto', elements: [element] });
+    }
+    return columns;
+}
+function lsDirButton(name, targetDir, browseRoot) {
+    return cardButton(`📁 ${name}`, { cmd: 'ls.browse', path: path.join(targetDir, name), root: browseRoot }, { type: 'default' });
+}
+function lsFileButton(name, size, targetDir) {
+    return cardButton(`📄 ${name}${size !== undefined ? ` (${formatBytes(size)})` : ''}`, { cmd: 'ls.file', path: path.join(targetDir, name) }, { type: 'default', size: 'small' });
+}
+function lsHeaderButtons(targetDir, cwd, browseRoot, safeOffset, filter) {
+    const headerElements = [];
+    const parentDir = path.dirname(targetDir);
+    if (parentDir !== targetDir) {
+        headerElements.push(cardButton('上级', { cmd: 'ls.browse', path: parentDir, root: browseRoot }, { type: 'default', size: 'small' }));
+    }
+    if (targetDir !== browseRoot) {
+        headerElements.push(cardButton('返回', { cmd: 'ls.browse', path: browseRoot, root: browseRoot }, { type: 'default', size: 'small' }));
+    }
+    headerElements.push(cardButton('刷新', withQuery({ cmd: 'ls.refresh', path: targetDir, offset: safeOffset, root: browseRoot }, filter), { type: 'default', size: 'small' }));
+    if (targetDir !== cwd) {
+        headerElements.push(cardButton('切换', { cmd: 'ls.switch', path: targetDir, root: browseRoot }, { type: 'primary', size: 'small' }));
+    }
+    return headerElements;
+}
+function lsDirSection(pageDirs, visibleDirCount, currentPage, targetDir, browseRoot) {
+    const section = [
+        { tag: 'div', text: { tag: 'lark_md', content: `**📂 目录 (${visibleDirCount})**` } },
+    ];
+    if (pageDirs.length > 0) {
+        for (const dir of pageDirs) {
+            section.push({
                 tag: 'column_set',
-                columns: headerElements.map((element) => ({
-                    tag: 'column',
-                    width: 'auto',
-                    elements: [element],
-                })),
-            },
-            { tag: 'hr' },
-            searchBar({
-                cmd: 'ls.filter',
-                placeholder: '搜索本层目录/文件名，输完回车',
-                currentQuery: filter,
-                extra: { path: targetDir, root: browseRoot },
-            }),
-        ];
-        if (filter) {
-            elements.push({
-                tag: 'div',
-                text: {
-                    tag: 'lark_md',
-                    content: `🔍 筛选："${filter}" · 命中 ${totalCount} 项（点「清除筛选」取消）`,
-                },
-            });
-        }
-        const pageDirs = pageItems.filter((item) => item.isDir);
-        const pageFiles = pageItems.filter((item) => !item.isDir);
-        if (filter && visibleItems.length === 0) {
-            elements.push({
-                tag: 'div',
-                text: { tag: 'lark_md', content: `🔍 无匹配条目（关键词："${filter}"）` },
+                flex_mode: 'none',
+                columns: [
+                    {
+                        tag: 'column',
+                        width: 'auto',
+                        elements: [lsDirButton(dir.name, targetDir, browseRoot)],
+                    },
+                ],
             });
         }
-        else {
-            elements.push({
-                tag: 'div',
-                text: { tag: 'lark_md', content: `**📂 目录 (${visibleDirCount})**` },
-            });
-            if (pageDirs.length > 0) {
-                for (const dir of pageDirs) {
-                    elements.push({
-                        tag: 'column_set',
-                        flex_mode: 'none',
-                        columns: [{ tag: 'column', width: 'auto', elements: [dirButton(dir.name)] }],
-                    });
-                }
-            }
-            else if (visibleDirCount === 0) {
-                elements.push({ tag: 'div', text: { tag: 'lark_md', content: '无子目录' } });
-            }
-            else {
-                elements.push({
-                    tag: 'div',
-                    text: { tag: 'lark_md', content: `（第 ${currentPage} 页无目录）` },
-                });
-            }
-            elements.push({ tag: 'hr' });
-            elements.push({
-                tag: 'div',
-                text: { tag: 'lark_md', content: `**📄 文件 (${visibleFileCount})**` },
+    }
+    else if (visibleDirCount === 0) {
+        section.push({ tag: 'div', text: { tag: 'lark_md', content: '无子目录' } });
+    }
+    else {
+        section.push({
+            tag: 'div',
+            text: { tag: 'lark_md', content: `（第 ${currentPage} 页无目录）` },
+        });
+    }
+    return section;
+}
+function lsFileSection(pageFiles, visibleFileCount, currentPage, targetDir) {
+    const section = [
+        { tag: 'div', text: { tag: 'lark_md', content: `**📄 文件 (${visibleFileCount})**` } },
+    ];
+    if (pageFiles.length > 0) {
+        for (const file of pageFiles) {
+            section.push({
+                tag: 'column_set',
+                flex_mode: 'none',
+                columns: [
+                    {
+                        tag: 'column',
+                        width: 'auto',
+                        elements: [lsFileButton(file.name, file.size, targetDir)],
+                    },
+                ],
             });
-            if (pageFiles.length > 0) {
-                for (const file of pageFiles) {
-                    elements.push({
-                        tag: 'column_set',
-                        flex_mode: 'none',
-                        columns: [
-                            { tag: 'column', width: 'auto', elements: [fileButton(file.name, file.size)] },
-                        ],
-                    });
-                }
-            }
-            else if (visibleFileCount === 0) {
-                elements.push({ tag: 'div', text: { tag: 'lark_md', content: '无文件' } });
-            }
-            else {
-                elements.push({
-                    tag: 'div',
-                    text: { tag: 'lark_md', content: `（第 ${currentPage} 页无文件）` },
-                });
-            }
         }
-        if (hasPagination) {
-            elements.push({ tag: 'hr' });
-            elements.push(...paginationBar({
-                cmd: 'ls.page',
-                offset: safeOffset,
-                pageSize: LS_PAGE_SIZE,
-                total: totalCount,
-                extra: { path: targetDir, root: browseRoot, ...(filter ? { q: filter } : {}) },
-                label: `**第 ${currentPage}/${totalPages} 页**（共 ${totalCount} 项）`,
-            }));
-        }
-        return {
-            card: {
-                schema: '2.0',
-                config: { wide_screen_mode: true, update_multi: true },
-                header: {
-                    title: { tag: 'plain_text', content: `📁 ${path.basename(targetDir)}` },
-                    template: 'blue',
-                },
-                body: { elements },
+    }
+    else if (visibleFileCount === 0) {
+        section.push({ tag: 'div', text: { tag: 'lark_md', content: '无文件' } });
+    }
+    else {
+        section.push({
+            tag: 'div',
+            text: { tag: 'lark_md', content: `（第 ${currentPage} 页无文件）` },
+        });
+    }
+    return section;
+}
+function lsPagination(totalCount, totalPages, safeOffset, currentPage, targetDir, browseRoot, filter) {
+    return [
+        { tag: 'hr' },
+        ...paginationBar({
+            cmd: 'ls.page',
+            offset: safeOffset,
+            pageSize: LS_PAGE_SIZE,
+            total: totalCount,
+            extra: withQuery({ path: targetDir, root: browseRoot }, filter),
+            label: `**第 ${currentPage}/${totalPages} 页**（共 ${totalCount} 项）`,
+        }),
+    ];
+}
+/** 目录卡片构造（原 buildLsCommand 的 try 块）。 */
+function lsCard(opts) {
+    const { targetDir, cwd, browseRoot, offset, filter } = opts;
+    const { dirs, files } = lsReadEntries(targetDir);
+    const allItems = lsBuildItems(dirs, files);
+    const ql = filter?.toLowerCase();
+    const visibleItems = lsFilterItems(allItems, ql);
+    const visibleDirCount = lsCountDirs(visibleItems);
+    const visibleFileCount = visibleItems.length - visibleDirCount;
+    const { totalCount, totalPages, safeOffset, currentPage, pageItems, hasPagination } = pageSlice(visibleItems, offset, LS_PAGE_SIZE);
+    const { pageDirs, pageFiles } = lsPartitionPage(pageItems);
+    const headerElements = lsHeaderButtons(targetDir, cwd, browseRoot, safeOffset, filter);
+    const elements = [
+        {
+            tag: 'div',
+            text: {
+                tag: 'lark_md',
+                content: `\`${targetDir}\`\n共 ${visibleDirCount} 目录, ${visibleFileCount} 文件`,
+            },
+        },
+        { tag: 'column_set', columns: lsColumns(headerElements) },
+        { tag: 'hr' },
+        searchBar({
+            cmd: 'ls.filter',
+            placeholder: '搜索本层目录/文件名，输完回车',
+            currentQuery: filter,
+            extra: { path: targetDir, root: browseRoot },
+        }),
+    ];
+    if (filter) {
+        elements.push({
+            tag: 'div',
+            text: {
+                tag: 'lark_md',
+                content: `🔍 筛选："${filter}" · 命中 ${totalCount} 项（点「清除筛选」取消）`,
             },
-        };
+        });
+    }
+    if (filter && visibleItems.length === 0) {
+        elements.push({
+            tag: 'div',
+            text: { tag: 'lark_md', content: `🔍 无匹配条目（关键词："${filter}"）` },
+        });
+    }
+    else {
+        elements.push(...lsDirSection(pageDirs, visibleDirCount, currentPage, targetDir, browseRoot));
+        elements.push({ tag: 'hr' });
+        elements.push(...lsFileSection(pageFiles, visibleFileCount, currentPage, targetDir));
+    }
+    if (hasPagination) {
+        elements.push(...lsPagination(totalCount, totalPages, safeOffset, currentPage, targetDir, browseRoot, filter));
+    }
+    return {
+        card: {
+            schema: '2.0',
+            config: { wide_screen_mode: true, update_multi: true },
+            header: {
+                title: { tag: 'plain_text', content: `📁 ${path.basename(targetDir)}` },
+                template: 'blue',
+            },
+            body: { elements },
+        },
+    };
+}
+/** 解析 /ls 的第一个参数（~ 展开、存在性、文件卡）。 */
+function lsResolveTarget(args, cwd) {
+    if (!args[0])
+        return { targetDir: cwd };
+    const arg = args[0].startsWith('~') ? path.join(os.homedir(), args[0].slice(1)) : args[0];
+    const potentialDir = path.resolve(cwd, arg);
+    const kind = inspectPath(potentialDir);
+    if (kind === 'missing' || kind === 'unreadable') {
+        return { result: { text: `ls: ${args[0]}: No such file or directory` } };
+    }
+    if (kind === 'file')
+        return { result: buildFileCard(potentialDir) };
+    return { targetDir: potentialDir };
+}
+export function buildLsCommand(args, _ctx, options) {
+    const { cwd, offset = 0, rootDir } = options;
+    if (!cwd)
+        return { text: '请先使用 /cd <path> 设置工作目录' };
+    const filter = options.q?.trim() || undefined;
+    const resolved = lsResolveTarget(args, cwd);
+    if ('result' in resolved)
+        return resolved.result;
+    const targetDir = resolved.targetDir;
+    const browseRoot = rootDir ? path.resolve(cwd, rootDir) : targetDir;
+    try {
+        return lsCard({ targetDir, cwd, browseRoot, offset, filter });
     }
     catch (err) {
         return { text: `读取目录失败: ${err.message}` };