@j0hanz/filesystem-context-mcp 1.2.9 → 1.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +73 -19
- package/dist/__tests__/lib/file-operations/compute-checksums.test.d.ts +2 -0
- package/dist/__tests__/lib/file-operations/compute-checksums.test.d.ts.map +1 -0
- package/dist/__tests__/lib/file-operations/compute-checksums.test.js +59 -0
- package/dist/__tests__/lib/file-operations/compute-checksums.test.js.map +1 -0
- package/dist/__tests__/lib/file-operations/get-multiple-file-info.test.d.ts +2 -0
- package/dist/__tests__/lib/file-operations/get-multiple-file-info.test.d.ts.map +1 -0
- package/dist/__tests__/lib/file-operations/get-multiple-file-info.test.js +46 -0
- package/dist/__tests__/lib/file-operations/get-multiple-file-info.test.js.map +1 -0
- package/dist/__tests__/lib/file-operations/search-definitions.test.js +179 -195
- package/dist/__tests__/lib/file-operations/search-definitions.test.js.map +1 -1
- package/dist/__tests__/lib/file-operations/sorting.test.d.ts +2 -0
- package/dist/__tests__/lib/file-operations/sorting.test.d.ts.map +1 -0
- package/dist/__tests__/lib/file-operations/sorting.test.js +47 -0
- package/dist/__tests__/lib/file-operations/sorting.test.js.map +1 -0
- package/dist/__tests__/lib/fs-helpers/utf8.test.d.ts +2 -0
- package/dist/__tests__/lib/fs-helpers/utf8.test.d.ts.map +1 -0
- package/dist/__tests__/lib/fs-helpers/utf8.test.js +43 -0
- package/dist/__tests__/lib/fs-helpers/utf8.test.js.map +1 -0
- package/dist/__tests__/lib/path-validation-errors.test.d.ts +2 -0
- package/dist/__tests__/lib/path-validation-errors.test.d.ts.map +1 -0
- package/dist/__tests__/lib/path-validation-errors.test.js +35 -0
- package/dist/__tests__/lib/path-validation-errors.test.js.map +1 -0
- package/dist/__tests__/lib/path-validation-roots.test.d.ts +2 -0
- package/dist/__tests__/lib/path-validation-roots.test.d.ts.map +1 -0
- package/dist/__tests__/lib/path-validation-roots.test.js +42 -0
- package/dist/__tests__/lib/path-validation-roots.test.js.map +1 -0
- package/dist/__tests__/lib/path-validation.test.js +5 -0
- package/dist/__tests__/lib/path-validation.test.js.map +1 -1
- package/dist/__tests__/security/filesystem-boundary.test.js +20 -12
- package/dist/__tests__/security/filesystem-boundary.test.js.map +1 -1
- package/dist/config/types.d.ts +31 -0
- package/dist/config/types.d.ts.map +1 -1
- package/dist/config/types.js.map +1 -1
- package/dist/instructions.md +46 -17
- package/dist/lib/constants.d.ts.map +1 -1
- package/dist/lib/constants.js +17 -1
- package/dist/lib/constants.js.map +1 -1
- package/dist/lib/file-operations/analyze-directory-helpers.d.ts +24 -0
- package/dist/lib/file-operations/analyze-directory-helpers.d.ts.map +1 -0
- package/dist/lib/file-operations/analyze-directory-helpers.js +50 -0
- package/dist/lib/file-operations/analyze-directory-helpers.js.map +1 -0
- package/dist/lib/file-operations/analyze-directory.d.ts +1 -0
- package/dist/lib/file-operations/analyze-directory.d.ts.map +1 -1
- package/dist/lib/file-operations/analyze-directory.js +3 -58
- package/dist/lib/file-operations/analyze-directory.js.map +1 -1
- package/dist/lib/file-operations/batch-results.d.ts +12 -0
- package/dist/lib/file-operations/batch-results.d.ts.map +1 -0
- package/dist/lib/file-operations/batch-results.js +23 -0
- package/dist/lib/file-operations/batch-results.js.map +1 -0
- package/dist/lib/file-operations/compute-checksums.d.ts +9 -0
- package/dist/lib/file-operations/compute-checksums.d.ts.map +1 -0
- package/dist/lib/file-operations/compute-checksums.js +121 -0
- package/dist/lib/file-operations/compute-checksums.js.map +1 -0
- package/dist/lib/file-operations/directory-helpers.d.ts.map +1 -1
- package/dist/lib/file-operations/directory-helpers.js +18 -10
- package/dist/lib/file-operations/directory-helpers.js.map +1 -1
- package/dist/lib/file-operations/directory-tree-helpers.d.ts.map +1 -1
- package/dist/lib/file-operations/directory-tree-helpers.js +8 -1
- package/dist/lib/file-operations/directory-tree-helpers.js.map +1 -1
- package/dist/lib/file-operations/directory-tree.d.ts +1 -0
- package/dist/lib/file-operations/directory-tree.d.ts.map +1 -1
- package/dist/lib/file-operations/directory-tree.js +3 -9
- package/dist/lib/file-operations/directory-tree.js.map +1 -1
- package/dist/lib/file-operations/get-multiple-file-info.d.ts +7 -0
- package/dist/lib/file-operations/get-multiple-file-info.d.ts.map +1 -0
- package/dist/lib/file-operations/get-multiple-file-info.js +59 -0
- package/dist/lib/file-operations/get-multiple-file-info.js.map +1 -0
- package/dist/lib/file-operations/list-directory-entry.d.ts +18 -0
- package/dist/lib/file-operations/list-directory-entry.d.ts.map +1 -0
- package/dist/lib/file-operations/list-directory-entry.js +90 -0
- package/dist/lib/file-operations/list-directory-entry.js.map +1 -0
- package/dist/lib/file-operations/list-directory-helpers.d.ts +1 -0
- package/dist/lib/file-operations/list-directory-helpers.d.ts.map +1 -1
- package/dist/lib/file-operations/list-directory-helpers.js +75 -97
- package/dist/lib/file-operations/list-directory-helpers.js.map +1 -1
- package/dist/lib/file-operations/list-directory.d.ts +1 -0
- package/dist/lib/file-operations/list-directory.d.ts.map +1 -1
- package/dist/lib/file-operations/list-directory.js +3 -8
- package/dist/lib/file-operations/list-directory.js.map +1 -1
- package/dist/lib/file-operations/search/engine-options.d.ts.map +1 -1
- package/dist/lib/file-operations/search/engine-options.js +1 -8
- package/dist/lib/file-operations/search/engine-options.js.map +1 -1
- package/dist/lib/file-operations/search/engine.d.ts +1 -1
- package/dist/lib/file-operations/search/engine.d.ts.map +1 -1
- package/dist/lib/file-operations/search/engine.js +4 -1
- package/dist/lib/file-operations/search/engine.js.map +1 -1
- package/dist/lib/file-operations/search-content.d.ts +1 -0
- package/dist/lib/file-operations/search-content.d.ts.map +1 -1
- package/dist/lib/file-operations/search-content.js +1 -1
- package/dist/lib/file-operations/search-content.js.map +1 -1
- package/dist/lib/file-operations/search-definitions.d.ts.map +1 -1
- package/dist/lib/file-operations/search-definitions.js +148 -117
- package/dist/lib/file-operations/search-definitions.js.map +1 -1
- package/dist/lib/file-operations/search-files-helpers.d.ts +1 -25
- package/dist/lib/file-operations/search-files-helpers.d.ts.map +1 -1
- package/dist/lib/file-operations/search-files-helpers.js +1 -39
- package/dist/lib/file-operations/search-files-helpers.js.map +1 -1
- package/dist/lib/file-operations/search-files-options.d.ts +31 -0
- package/dist/lib/file-operations/search-files-options.d.ts.map +1 -0
- package/dist/lib/file-operations/search-files-options.js +33 -0
- package/dist/lib/file-operations/search-files-options.js.map +1 -0
- package/dist/lib/file-operations/search-files.d.ts +1 -1
- package/dist/lib/file-operations/search-files.d.ts.map +1 -1
- package/dist/lib/file-operations/search-files.js +2 -1
- package/dist/lib/file-operations/search-files.js.map +1 -1
- package/dist/lib/file-operations.d.ts +2 -0
- package/dist/lib/file-operations.d.ts.map +1 -1
- package/dist/lib/file-operations.js +2 -0
- package/dist/lib/file-operations.js.map +1 -1
- package/dist/lib/fs-helpers/binary-detect.d.ts.map +1 -1
- package/dist/lib/fs-helpers/binary-detect.js +13 -16
- package/dist/lib/fs-helpers/binary-detect.js.map +1 -1
- package/dist/lib/fs-helpers/readers/read-file-content.d.ts +29 -0
- package/dist/lib/fs-helpers/readers/read-file-content.d.ts.map +1 -0
- package/dist/lib/fs-helpers/readers/read-file-content.js +25 -0
- package/dist/lib/fs-helpers/readers/read-file-content.js.map +1 -0
- package/dist/lib/fs-helpers/readers/read-file.d.ts +1 -0
- package/dist/lib/fs-helpers/readers/read-file.d.ts.map +1 -1
- package/dist/lib/fs-helpers/readers/read-file.js +29 -29
- package/dist/lib/fs-helpers/readers/read-file.js.map +1 -1
- package/dist/lib/merge-defined.d.ts +2 -0
- package/dist/lib/merge-defined.d.ts.map +1 -0
- package/dist/lib/merge-defined.js +8 -0
- package/dist/lib/merge-defined.js.map +1 -0
- package/dist/lib/path-validation/validators.d.ts.map +1 -1
- package/dist/lib/path-validation/validators.js +8 -0
- package/dist/lib/path-validation/validators.js.map +1 -1
- package/dist/schemas/index.d.ts +2 -2
- package/dist/schemas/index.d.ts.map +1 -1
- package/dist/schemas/index.js +2 -2
- package/dist/schemas/index.js.map +1 -1
- package/dist/schemas/inputs/checksums.d.ts +10 -0
- package/dist/schemas/inputs/checksums.d.ts.map +1 -0
- package/dist/schemas/inputs/checksums.js +30 -0
- package/dist/schemas/inputs/checksums.js.map +1 -0
- package/dist/schemas/inputs/directory.d.ts +29 -0
- package/dist/schemas/inputs/directory.d.ts.map +1 -0
- package/dist/schemas/inputs/directory.js +75 -0
- package/dist/schemas/inputs/directory.js.map +1 -0
- package/dist/schemas/inputs/file-info.d.ts +9 -0
- package/dist/schemas/inputs/file-info.d.ts.map +1 -0
- package/dist/schemas/inputs/file-info.js +20 -0
- package/dist/schemas/inputs/file-info.js.map +1 -0
- package/dist/schemas/inputs/read.d.ts +26 -0
- package/dist/schemas/inputs/read.d.ts.map +1 -0
- package/dist/schemas/inputs/read.js +54 -0
- package/dist/schemas/inputs/read.js.map +1 -0
- package/dist/schemas/inputs/search.d.ts +44 -0
- package/dist/schemas/inputs/search.d.ts.map +1 -0
- package/dist/schemas/inputs/search.js +115 -0
- package/dist/schemas/inputs/search.js.map +1 -0
- package/dist/schemas/inputs.d.ts +5 -94
- package/dist/schemas/inputs.d.ts.map +1 -1
- package/dist/schemas/inputs.js +5 -227
- package/dist/schemas/inputs.js.map +1 -1
- package/dist/schemas/outputs/checksums.d.ts +93 -0
- package/dist/schemas/outputs/checksums.d.ts.map +1 -0
- package/dist/schemas/outputs/checksums.js +23 -0
- package/dist/schemas/outputs/checksums.js.map +1 -0
- package/dist/schemas/outputs/directory.d.ts +419 -0
- package/dist/schemas/outputs/directory.d.ts.map +1 -0
- package/dist/schemas/outputs/directory.js +81 -0
- package/dist/schemas/outputs/directory.js.map +1 -0
- package/dist/schemas/outputs/file-info.d.ts +270 -0
- package/dist/schemas/outputs/file-info.d.ts.map +1 -0
- package/dist/schemas/outputs/file-info.js +57 -0
- package/dist/schemas/outputs/file-info.js.map +1 -0
- package/dist/schemas/outputs/read.d.ts +187 -0
- package/dist/schemas/outputs/read.d.ts.map +1 -0
- package/dist/schemas/outputs/read.js +39 -0
- package/dist/schemas/outputs/read.js.map +1 -0
- package/dist/schemas/outputs/search.d.ts +360 -0
- package/dist/schemas/outputs/search.d.ts.map +1 -0
- package/dist/schemas/outputs/search.js +98 -0
- package/dist/schemas/outputs/search.js.map +1 -0
- package/dist/schemas/outputs.d.ts +5 -1059
- package/dist/schemas/outputs.d.ts.map +1 -1
- package/dist/schemas/outputs.js +5 -229
- package/dist/schemas/outputs.js.map +1 -1
- package/dist/server.d.ts.map +1 -1
- package/dist/server.js +24 -14
- package/dist/server.js.map +1 -1
- package/dist/tools/analyze-directory.d.ts.map +1 -1
- package/dist/tools/analyze-directory.js +2 -2
- package/dist/tools/analyze-directory.js.map +1 -1
- package/dist/tools/compute-checksums.d.ts +3 -0
- package/dist/tools/compute-checksums.d.ts.map +1 -0
- package/dist/tools/compute-checksums.js +77 -0
- package/dist/tools/compute-checksums.js.map +1 -0
- package/dist/tools/directory-tree.d.ts.map +1 -1
- package/dist/tools/directory-tree.js +6 -2
- package/dist/tools/directory-tree.js.map +1 -1
- package/dist/tools/get-multiple-file-info.d.ts +3 -0
- package/dist/tools/get-multiple-file-info.d.ts.map +1 -0
- package/dist/tools/get-multiple-file-info.js +95 -0
- package/dist/tools/get-multiple-file-info.js.map +1 -0
- package/dist/tools/index.d.ts.map +1 -1
- package/dist/tools/index.js +4 -0
- package/dist/tools/index.js.map +1 -1
- package/dist/tools/list-allowed-dirs.d.ts.map +1 -1
- package/dist/tools/list-allowed-dirs.js +14 -3
- package/dist/tools/list-allowed-dirs.js.map +1 -1
- package/dist/tools/list-directory.d.ts.map +1 -1
- package/dist/tools/list-directory.js +7 -1
- package/dist/tools/list-directory.js.map +1 -1
- package/dist/tools/read-file.d.ts.map +1 -1
- package/dist/tools/read-file.js +8 -0
- package/dist/tools/read-file.js.map +1 -1
- package/dist/tools/read-multiple-files.d.ts.map +1 -1
- package/dist/tools/read-multiple-files.js +7 -1
- package/dist/tools/read-multiple-files.js.map +1 -1
- package/dist/tools/search-definitions.d.ts.map +1 -1
- package/dist/tools/search-definitions.js +48 -34
- package/dist/tools/search-definitions.js.map +1 -1
- package/dist/tools/search-files.d.ts.map +1 -1
- package/dist/tools/search-files.js +6 -2
- package/dist/tools/search-files.js.map +1 -1
- package/dist/tools/shared/search-formatting.d.ts.map +1 -1
- package/dist/tools/shared/search-formatting.js +4 -1
- package/dist/tools/shared/search-formatting.js.map +1 -1
- package/package.json +1 -1
|
@@ -3,7 +3,7 @@ import * as path from 'node:path';
|
|
|
3
3
|
import { minimatch } from 'minimatch';
|
|
4
4
|
import { PARALLEL_CONCURRENCY } from '../constants.js';
|
|
5
5
|
import { isHidden, processInParallel } from '../fs-helpers.js';
|
|
6
|
-
import {
|
|
6
|
+
import { buildDirectoryItemResult, } from './list-directory-entry.js';
|
|
7
7
|
export function initListState() {
|
|
8
8
|
return {
|
|
9
9
|
entries: [],
|
|
@@ -15,110 +15,72 @@ export function initListState() {
|
|
|
15
15
|
symlinksNotFollowed: 0,
|
|
16
16
|
};
|
|
17
17
|
}
|
|
18
|
-
function
|
|
19
|
-
return {
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
type,
|
|
24
|
-
};
|
|
25
|
-
}
|
|
26
|
-
function resolveEntryType(item, stats) {
|
|
27
|
-
if (item.isDirectory())
|
|
28
|
-
return 'directory';
|
|
29
|
-
if (item.isFile())
|
|
30
|
-
return 'file';
|
|
31
|
-
return stats.isSymbolicLink() ? 'symlink' : 'other';
|
|
32
|
-
}
|
|
33
|
-
async function buildSymlinkResult(item, fullPath, relativePath, includeSymlinkTargets) {
|
|
34
|
-
const stats = await fs.lstat(fullPath);
|
|
35
|
-
let symlinkTarget;
|
|
36
|
-
if (includeSymlinkTargets) {
|
|
37
|
-
try {
|
|
38
|
-
symlinkTarget = await fs.readlink(fullPath);
|
|
39
|
-
}
|
|
40
|
-
catch {
|
|
41
|
-
symlinkTarget = undefined;
|
|
18
|
+
export function createStopChecker(maxEntries, state) {
|
|
19
|
+
return () => {
|
|
20
|
+
if (maxEntries !== undefined && state.entries.length >= maxEntries) {
|
|
21
|
+
state.truncated = true;
|
|
22
|
+
return true;
|
|
42
23
|
}
|
|
43
|
-
|
|
44
|
-
const entry = {
|
|
45
|
-
name: item.name,
|
|
46
|
-
path: fullPath,
|
|
47
|
-
relativePath,
|
|
48
|
-
type: 'symlink',
|
|
49
|
-
size: stats.size,
|
|
50
|
-
modified: stats.mtime,
|
|
51
|
-
symlinkTarget,
|
|
52
|
-
};
|
|
53
|
-
return { entry, symlinkNotFollowed: true };
|
|
54
|
-
}
|
|
55
|
-
async function buildEnqueueDir(fullPath, depth, maxDepth, recursive) {
|
|
56
|
-
if (!recursive || depth + 1 > maxDepth)
|
|
57
|
-
return undefined;
|
|
58
|
-
return {
|
|
59
|
-
currentPath: await validateExistingPath(fullPath),
|
|
60
|
-
depth: depth + 1,
|
|
61
|
-
};
|
|
62
|
-
}
|
|
63
|
-
async function buildRegularResult(item, fullPath, relativePath, options) {
|
|
64
|
-
const stats = await fs.stat(fullPath);
|
|
65
|
-
const type = resolveEntryType(item, stats);
|
|
66
|
-
const entry = {
|
|
67
|
-
...buildEntryBase(item, fullPath, relativePath, type),
|
|
68
|
-
size: type === 'file' ? stats.size : undefined,
|
|
69
|
-
modified: stats.mtime,
|
|
70
|
-
};
|
|
71
|
-
const enqueueDir = await buildEnqueueDir(fullPath, options.depth, options.maxDepth, options.recursive);
|
|
72
|
-
return { entry, enqueueDir };
|
|
73
|
-
}
|
|
74
|
-
function buildFallbackEntry(item, fullPath, relativePath) {
|
|
75
|
-
const type = item.isDirectory()
|
|
76
|
-
? 'directory'
|
|
77
|
-
: item.isFile()
|
|
78
|
-
? 'file'
|
|
79
|
-
: 'other';
|
|
80
|
-
return {
|
|
81
|
-
entry: buildEntryBase(item, fullPath, relativePath, type),
|
|
82
|
-
skippedInaccessible: true,
|
|
24
|
+
return false;
|
|
83
25
|
};
|
|
84
26
|
}
|
|
85
|
-
async function
|
|
86
|
-
const fullPath = path.join(currentPath, item.name);
|
|
87
|
-
const relativePath = path.relative(basePath, fullPath) || item.name;
|
|
27
|
+
async function openDirectory(currentPath, onInaccessible) {
|
|
88
28
|
try {
|
|
89
|
-
return await
|
|
90
|
-
...options,
|
|
91
|
-
basePath,
|
|
92
|
-
});
|
|
29
|
+
return await fs.opendir(currentPath);
|
|
93
30
|
}
|
|
94
31
|
catch {
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
}
|
|
98
|
-
async function buildDirectoryItemResultCore(item, fullPath, relativePath, options) {
|
|
99
|
-
if (item.isSymbolicLink()) {
|
|
100
|
-
return await buildSymlinkResult(item, fullPath, relativePath, options.includeSymlinkTargets);
|
|
32
|
+
onInaccessible();
|
|
33
|
+
return null;
|
|
101
34
|
}
|
|
102
|
-
return await buildRegularResult(item, fullPath, relativePath, options);
|
|
103
35
|
}
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
if (maxEntries !== undefined && state.entries.length >= maxEntries) {
|
|
107
|
-
state.truncated = true;
|
|
108
|
-
return true;
|
|
109
|
-
}
|
|
36
|
+
function shouldExcludeEntry(item, currentPath, basePath, excludePatterns) {
|
|
37
|
+
if (excludePatterns.length === 0)
|
|
110
38
|
return false;
|
|
39
|
+
const relativePath = path.relative(basePath, path.join(currentPath, item.name)) || item.name;
|
|
40
|
+
const normalizedRelative = relativePath.replace(/\\/g, '/');
|
|
41
|
+
const options = {
|
|
42
|
+
dot: true,
|
|
43
|
+
nocase: process.platform === 'win32',
|
|
44
|
+
windowsPathsNoEscape: true,
|
|
111
45
|
};
|
|
46
|
+
return excludePatterns.some((pattern) => minimatch(item.name, pattern, options) ||
|
|
47
|
+
minimatch(normalizedRelative, pattern, options));
|
|
112
48
|
}
|
|
113
|
-
async function
|
|
49
|
+
async function* streamVisibleItems(currentPath, basePath, includeHidden, excludePatterns, onInaccessible) {
|
|
50
|
+
const dir = await openDirectory(currentPath, onInaccessible);
|
|
51
|
+
if (!dir)
|
|
52
|
+
return;
|
|
53
|
+
const filteredItems = filterVisibleItems(dir, currentPath, basePath, includeHidden, excludePatterns);
|
|
114
54
|
try {
|
|
115
|
-
|
|
116
|
-
|
|
55
|
+
for await (const item of filteredItems) {
|
|
56
|
+
yield item;
|
|
57
|
+
}
|
|
117
58
|
}
|
|
118
59
|
catch {
|
|
119
|
-
|
|
60
|
+
onInaccessible();
|
|
61
|
+
}
|
|
62
|
+
finally {
|
|
63
|
+
await dir.close().catch(() => { });
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
async function* filterVisibleItems(items, currentPath, basePath, includeHidden, excludePatterns) {
|
|
67
|
+
for await (const item of items) {
|
|
68
|
+
if (shouldIncludeEntry(item, currentPath, basePath, {
|
|
69
|
+
includeHidden,
|
|
70
|
+
excludePatterns,
|
|
71
|
+
})) {
|
|
72
|
+
yield item;
|
|
73
|
+
}
|
|
120
74
|
}
|
|
121
75
|
}
|
|
76
|
+
function shouldIncludeEntry(item, currentPath, basePath, options) {
|
|
77
|
+
if (!options.includeHidden && isHidden(item.name))
|
|
78
|
+
return false;
|
|
79
|
+
if (shouldExcludeEntry(item, currentPath, basePath, options.excludePatterns)) {
|
|
80
|
+
return false;
|
|
81
|
+
}
|
|
82
|
+
return true;
|
|
83
|
+
}
|
|
122
84
|
function applyDirectoryItemResult(result, state, enqueue, pattern) {
|
|
123
85
|
const { entry, enqueueDir, skippedInaccessible, symlinkNotFollowed } = result;
|
|
124
86
|
if (!pattern || minimatch(entry.relativePath, pattern, { dot: true })) {
|
|
@@ -151,17 +113,12 @@ function processResults(results, state, enqueue, shouldStop, pattern) {
|
|
|
151
113
|
applyDirectoryItemResult(result, state, enqueue, pattern);
|
|
152
114
|
}
|
|
153
115
|
}
|
|
154
|
-
|
|
155
|
-
if (
|
|
116
|
+
async function flushBatch(batch, params, config, state, enqueue, shouldStop) {
|
|
117
|
+
if (batch.length === 0)
|
|
156
118
|
return;
|
|
157
119
|
if (shouldStop())
|
|
158
120
|
return;
|
|
159
|
-
|
|
160
|
-
const items = await readVisibleItems(params.currentPath, config.includeHidden);
|
|
161
|
-
if (!items) {
|
|
162
|
-
state.skippedInaccessible++;
|
|
163
|
-
return;
|
|
164
|
-
}
|
|
121
|
+
const items = batch.splice(0, batch.length);
|
|
165
122
|
const { results, errors } = await processInParallel(items, async (item) => buildDirectoryItemResult(item, params.currentPath, config.basePath, {
|
|
166
123
|
includeSymlinkTargets: config.includeSymlinkTargets,
|
|
167
124
|
recursive: config.recursive,
|
|
@@ -171,4 +128,25 @@ export async function handleDirectory(params, enqueue, config, state, shouldStop
|
|
|
171
128
|
state.skippedInaccessible += errors.length;
|
|
172
129
|
processResults(results, state, enqueue, shouldStop, config.pattern);
|
|
173
130
|
}
|
|
131
|
+
async function processItemStream(itemStream, batch, params, config, state, enqueue, shouldStop) {
|
|
132
|
+
for await (const item of itemStream) {
|
|
133
|
+
if (shouldStop())
|
|
134
|
+
break;
|
|
135
|
+
batch.push(item);
|
|
136
|
+
if (batch.length >= PARALLEL_CONCURRENCY) {
|
|
137
|
+
await flushBatch(batch, params, config, state, enqueue, shouldStop);
|
|
138
|
+
}
|
|
139
|
+
}
|
|
140
|
+
}
|
|
141
|
+
export async function handleDirectory(params, enqueue, config, state, shouldStop) {
|
|
142
|
+
if (params.depth > config.maxDepth || shouldStop())
|
|
143
|
+
return;
|
|
144
|
+
state.maxDepthReached = Math.max(state.maxDepthReached, params.depth);
|
|
145
|
+
const itemStream = streamVisibleItems(params.currentPath, config.basePath, config.includeHidden, config.excludePatterns, () => {
|
|
146
|
+
state.skippedInaccessible++;
|
|
147
|
+
});
|
|
148
|
+
const batch = [];
|
|
149
|
+
await processItemStream(itemStream, batch, params, config, state, enqueue, shouldStop);
|
|
150
|
+
await flushBatch(batch, params, config, state, enqueue, shouldStop);
|
|
151
|
+
}
|
|
174
152
|
//# sourceMappingURL=list-directory-helpers.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"list-directory-helpers.js","sourceRoot":"","sources":["../../../src/lib/file-operations/list-directory-helpers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACvC,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAGlC,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAGtC,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,EAAE,QAAQ,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAC/D,OAAO,
|
|
1
|
+
{"version":3,"file":"list-directory-helpers.js","sourceRoot":"","sources":["../../../src/lib/file-operations/list-directory-helpers.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@ import type { ListDirectoryResult } from '../../config/types.js';
|
|
|
2
2
|
interface ListDirectoryOptions {
|
|
3
3
|
recursive?: boolean;
|
|
4
4
|
includeHidden?: boolean;
|
|
5
|
+
excludePatterns?: string[];
|
|
5
6
|
maxDepth?: number;
|
|
6
7
|
maxEntries?: number;
|
|
7
8
|
sortBy?: 'name' | 'size' | 'modified' | 'type';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"list-directory.d.ts","sourceRoot":"","sources":["../../../src/lib/file-operations/list-directory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"list-directory.d.ts","sourceRoot":"","sources":["../../../src/lib/file-operations/list-directory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAiBjE,UAAU,oBAAoB;IAC5B,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,UAAU,GAAG,MAAM,CAAC;IAC/C,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAgCD,wBAAsB,aAAa,CACjC,OAAO,EAAE,MAAM,EACf,OAAO,GAAE,oBAAyB,GACjC,OAAO,CAAC,mBAAmB,CAAC,CA+B9B"}
|
|
@@ -1,20 +1,14 @@
|
|
|
1
1
|
import { DEFAULT_LIST_MAX_ENTRIES, DEFAULT_MAX_DEPTH, DIR_TRAVERSAL_CONCURRENCY, } from '../constants.js';
|
|
2
2
|
import { runWorkQueue } from '../fs-helpers.js';
|
|
3
|
+
import { mergeDefined } from '../merge-defined.js';
|
|
3
4
|
import { validateExistingDirectory } from '../path-validation.js';
|
|
4
5
|
import { createStopChecker, handleDirectory, initListState, } from './list-directory-helpers.js';
|
|
5
6
|
import { sortByField } from './sorting.js';
|
|
6
|
-
function mergeDefined(defaults, overrides) {
|
|
7
|
-
const entries = Object.entries(overrides).filter(([, value]) => value !== undefined);
|
|
8
|
-
const merged = {
|
|
9
|
-
...defaults,
|
|
10
|
-
...Object.fromEntries(entries),
|
|
11
|
-
};
|
|
12
|
-
return merged;
|
|
13
|
-
}
|
|
14
7
|
function normalizeListDirectoryOptions(options) {
|
|
15
8
|
const defaults = {
|
|
16
9
|
recursive: false,
|
|
17
10
|
includeHidden: false,
|
|
11
|
+
excludePatterns: [],
|
|
18
12
|
maxDepth: DEFAULT_MAX_DEPTH,
|
|
19
13
|
maxEntries: DEFAULT_LIST_MAX_ENTRIES,
|
|
20
14
|
sortBy: 'name',
|
|
@@ -43,6 +37,7 @@ export async function listDirectory(dirPath, options = {}) {
|
|
|
43
37
|
basePath,
|
|
44
38
|
recursive: normalized.recursive,
|
|
45
39
|
includeHidden: normalized.includeHidden,
|
|
40
|
+
excludePatterns: normalized.excludePatterns,
|
|
46
41
|
maxDepth: normalized.maxDepth,
|
|
47
42
|
maxEntries: normalized.maxEntries,
|
|
48
43
|
includeSymlinkTargets: normalized.includeSymlinkTargets,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"list-directory.js","sourceRoot":"","sources":["../../../src/lib/file-operations/list-directory.ts"],"names":[],"mappings":"AACA,OAAO,EACL,wBAAwB,EACxB,iBAAiB,EACjB,yBAAyB,GAC1B,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,yBAAyB,EAAE,MAAM,uBAAuB,CAAC;AAClE,OAAO,EACL,iBAAiB,EACjB,eAAe,EACf,aAAa,GAEd,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"list-directory.js","sourceRoot":"","sources":["../../../src/lib/file-operations/list-directory.ts"],"names":[],"mappings":"AACA,OAAO,EACL,wBAAwB,EACxB,iBAAiB,EACjB,yBAAyB,GAC1B,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,yBAAyB,EAAE,MAAM,uBAAuB,CAAC;AAClE,OAAO,EACL,iBAAiB,EACjB,eAAe,EACf,aAAa,GAEd,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAa3C,SAAS,6BAA6B,CACpC,OAA6B;IAE7B,MAAM,QAAQ,GAAmC;QAC/C,SAAS,EAAE,KAAK;QAChB,aAAa,EAAE,KAAK;QACpB,eAAe,EAAE,EAAE;QACnB,QAAQ,EAAE,iBAAiB;QAC3B,UAAU,EAAE,wBAAwB;QACpC,MAAM,EAAE,MAAM;QACd,qBAAqB,EAAE,KAAK;QAC5B,OAAO,EAAE,EAAE;KACZ,CAAC;IACF,OAAO,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;AACzC,CAAC;AAED,SAAS,YAAY,CACnB,KAAuC;IAEvC,OAAO;QACL,YAAY,EAAE,KAAK,CAAC,OAAO,CAAC,MAAM;QAClC,UAAU,EAAE,KAAK,CAAC,UAAU;QAC5B,gBAAgB,EAAE,KAAK,CAAC,gBAAgB;QACxC,eAAe,EAAE,KAAK,CAAC,eAAe;QACtC,SAAS,EAAE,KAAK,CAAC,SAAS;QAC1B,mBAAmB,EAAE,KAAK,CAAC,mBAAmB;QAC9C,mBAAmB,EAAE,KAAK,CAAC,mBAAmB;KAC/C,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,OAAe,EACf,UAAgC,EAAE;IAElC,MAAM,UAAU,GAAG,6BAA6B,CAAC,OAAO,CAAC,CAAC;IAE1D,MAAM,QAAQ,GAAG,MAAM,yBAAyB,CAAC,OAAO,CAAC,CAAC;IAC1D,MAAM,KAAK,GAAG,aAAa,EAAE,CAAC;IAC9B,MAAM,UAAU,GAAG,iBAAiB,CAAC,UAAU,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;IACnE,MAAM,MAAM,GAAwB;QAClC,QAAQ;QACR,SAAS,EAAE,UAAU,CAAC,SAAS;QAC/B,aAAa,EAAE,UAAU,CAAC,aAAa;QACvC,eAAe,EAAE,UAAU,CAAC,eAAe;QAC3C,QAAQ,EAAE,UAAU,CAAC,QAAQ;QAC7B,UAAU,EAAE,UAAU,CAAC,UAAU;QACjC,qBAAqB,EAAE,UAAU,CAAC,qBAAqB;QACvD,OAAO,EAAE,UAAU,CAAC,OAAO;KAC5B,CAAC;IAEF,MAAM,YAAY,CAChB,CAAC,EAAE,WAAW,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,EACrC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,CACxB,eAAe,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,CAAC,EAC7D,yBAAyB,CAC1B,CAAC;IAEF,WAAW,CAAC,KAAK,CAAC,OAAO,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC;IAE9C,OAAO;QACL,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,KAAK,CAAC,OAAO;QACtB,OAAO,EAAE,YAAY,CAAC,KAAK,CAAC;KAC7B,CAAC;AACJ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"engine-options.d.ts","sourceRoot":"","sources":["../../../../src/lib/file-operations/search/engine-options.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"engine-options.d.ts","sourceRoot":"","sources":["../../../../src/lib/file-operations/search/engine-options.ts"],"names":[],"mappings":"AAQA,MAAM,WAAW,aAAa;IAC5B,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,aAAa,EAAE,OAAO,CAAC;IACvB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,OAAO,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,OAAO,CAAC;IACnB,SAAS,EAAE,OAAO,CAAC;IACnB,aAAa,EAAE,OAAO,CAAC;IACvB,aAAa,EAAE,OAAO,CAAC;IACvB,sBAAsB,EAAE,OAAO,CAAC;CACjC;AAED,wBAAgB,kBAAkB,CAChC,cAAc,EAAE,OAAO,CAAC,aAAa,CAAC,GACrC,aAAa,CAmBf;AAED,wBAAgB,aAAa,CAAC,OAAO,EAAE,aAAa,GAAG,MAAM,GAAG,SAAS,CAExE"}
|
|
@@ -1,12 +1,5 @@
|
|
|
1
1
|
import { DEFAULT_MAX_RESULTS, DEFAULT_SEARCH_MAX_FILES, DEFAULT_SEARCH_TIMEOUT_MS, MAX_SEARCHABLE_FILE_SIZE, } from '../../constants.js';
|
|
2
|
-
|
|
3
|
-
const entries = Object.entries(overrides).filter(([, value]) => value !== undefined);
|
|
4
|
-
const merged = {
|
|
5
|
-
...defaults,
|
|
6
|
-
...Object.fromEntries(entries),
|
|
7
|
-
};
|
|
8
|
-
return merged;
|
|
9
|
-
}
|
|
2
|
+
import { mergeDefined } from '../../merge-defined.js';
|
|
10
3
|
export function buildSearchOptions(partialOptions) {
|
|
11
4
|
const defaults = {
|
|
12
5
|
filePattern: '**/*',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"engine-options.js","sourceRoot":"","sources":["../../../../src/lib/file-operations/search/engine-options.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,mBAAmB,EACnB,wBAAwB,EACxB,yBAAyB,EACzB,wBAAwB,GACzB,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"engine-options.js","sourceRoot":"","sources":["../../../../src/lib/file-operations/search/engine-options.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,mBAAmB,EACnB,wBAAwB,EACxB,yBAAyB,EACzB,wBAAwB,GACzB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAmBtD,MAAM,UAAU,kBAAkB,CAChC,cAAsC;IAEtC,MAAM,QAAQ,GAAkB;QAC9B,WAAW,EAAE,MAAM;QACnB,eAAe,EAAE,EAAE;QACnB,aAAa,EAAE,KAAK;QACpB,UAAU,EAAE,mBAAmB;QAC/B,WAAW,EAAE,wBAAwB;QACrC,eAAe,EAAE,wBAAwB;QACzC,SAAS,EAAE,yBAAyB;QACpC,UAAU,EAAE,IAAI;QAChB,YAAY,EAAE,CAAC;QACf,SAAS,EAAE,KAAK;QAChB,SAAS,EAAE,KAAK;QAChB,aAAa,EAAE,KAAK;QACpB,aAAa,EAAE,KAAK;QACpB,sBAAsB,EAAE,IAAI;KAC7B,CAAC;IAEF,OAAO,YAAY,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;AAChD,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,OAAsB;IAClD,OAAO,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;AACxE,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import type { SearchContentResult } from '../../../config/types.js';
|
|
2
2
|
import type { SearchOptions } from './engine-options.js';
|
|
3
|
-
export declare function executeSearch(basePath: string, searchPattern: string, partialOptions: Partial<SearchOptions
|
|
3
|
+
export declare function executeSearch(basePath: string, searchPattern: string, partialOptions: Partial<SearchOptions>, signal?: AbortSignal): Promise<SearchContentResult>;
|
|
4
4
|
//# sourceMappingURL=engine.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"engine.d.ts","sourceRoot":"","sources":["../../../../src/lib/file-operations/search/engine.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAKpE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAmDzD,wBAAsB,aAAa,CACjC,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,cAAc,EAAE,OAAO,CAAC,aAAa,CAAC,
|
|
1
|
+
{"version":3,"file":"engine.d.ts","sourceRoot":"","sources":["../../../../src/lib/file-operations/search/engine.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAKpE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAmDzD,wBAAsB,aAAa,CACjC,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,cAAc,EAAE,OAAO,CAAC,aAAa,CAAC,EACtC,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,mBAAmB,CAAC,CAkC9B"}
|
|
@@ -42,7 +42,7 @@ function buildResult(basePath, pattern, state, options) {
|
|
|
42
42
|
},
|
|
43
43
|
};
|
|
44
44
|
}
|
|
45
|
-
export async function executeSearch(basePath, searchPattern, partialOptions) {
|
|
45
|
+
export async function executeSearch(basePath, searchPattern, partialOptions, signal) {
|
|
46
46
|
const options = buildSearchOptions(partialOptions);
|
|
47
47
|
const validPath = await validateExistingDirectory(basePath);
|
|
48
48
|
validateGlobPatternOrThrow(options.filePattern, validPath);
|
|
@@ -56,6 +56,9 @@ export async function executeSearch(basePath, searchPattern, partialOptions) {
|
|
|
56
56
|
const deadlineMs = getDeadlineMs(options);
|
|
57
57
|
const stream = createStream(validPath, options);
|
|
58
58
|
try {
|
|
59
|
+
if (signal?.aborted) {
|
|
60
|
+
throw new Error('Search aborted');
|
|
61
|
+
}
|
|
59
62
|
await processStream(stream, state, matcher, options, deadlineMs, searchPattern);
|
|
60
63
|
}
|
|
61
64
|
finally {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"engine.js","sourceRoot":"","sources":["../../../../src/lib/file-operations/search/engine.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,yBAAyB,EAAE,MAAM,0BAA0B,CAAC;AACrE,OAAO,EAAE,0BAA0B,EAAE,MAAM,yBAAyB,CAAC;AACrE,OAAO,EAAE,kBAAkB,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAExE,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACjE,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAGpD,SAAS,kBAAkB;IACzB,OAAO;QACL,OAAO,EAAE,EAAE;QACX,YAAY,EAAE,CAAC;QACf,YAAY,EAAE,CAAC;QACf,eAAe,EAAE,CAAC;QAClB,aAAa,EAAE,CAAC;QAChB,mBAAmB,EAAE,CAAC;QACtB,6BAA6B,EAAE,CAAC;QAChC,SAAS,EAAE,KAAK;QAChB,aAAa,EAAE,SAAS;KACzB,CAAC;AACJ,CAAC;AAED,SAAS,WAAW,CAClB,QAAgB,EAChB,OAAe,EACf,KAAkB,EAClB,OAAsB;IAEtB,IAAI,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;IACxB,IAAI,OAAO,CAAC,MAAM,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;QACxC,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;QAC/C,KAAK,CAAC,SAAS,GAAG,IAAI,CAAC;QACvB,KAAK,CAAC,aAAa,GAAG,YAAY,CAAC;IACrC,CAAC;IAED,OAAO;QACL,QAAQ;QACR,OAAO;QACP,WAAW,EAAE,OAAO,CAAC,WAAW;QAChC,OAAO;QACP,OAAO,EAAE;YACP,YAAY,EAAE,KAAK,CAAC,YAAY;YAChC,YAAY,EAAE,KAAK,CAAC,YAAY;YAChC,OAAO,EAAE,OAAO,CAAC,MAAM;YACvB,SAAS,EAAE,KAAK,CAAC,SAAS;YAC1B,eAAe,EAAE,KAAK,CAAC,eAAe;YACtC,aAAa,EAAE,KAAK,CAAC,aAAa;YAClC,mBAAmB,EAAE,KAAK,CAAC,mBAAmB;YAC9C,6BAA6B,EAAE,KAAK,CAAC,6BAA6B;YAClE,aAAa,EAAE,KAAK,CAAC,aAAa;SACnC;KACF,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,QAAgB,EAChB,aAAqB,EACrB,cAAsC;
|
|
1
|
+
{"version":3,"file":"engine.js","sourceRoot":"","sources":["../../../../src/lib/file-operations/search/engine.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,5 +14,6 @@ export declare function searchContent(basePath: string, searchPattern: string, o
|
|
|
14
14
|
includeHidden?: boolean;
|
|
15
15
|
baseNameMatch?: boolean;
|
|
16
16
|
caseSensitiveFileMatch?: boolean;
|
|
17
|
+
signal?: AbortSignal;
|
|
17
18
|
}): Promise<SearchContentResult>;
|
|
18
19
|
//# sourceMappingURL=search-content.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"search-content.d.ts","sourceRoot":"","sources":["../../../src/lib/file-operations/search-content.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAGjE,wBAAsB,aAAa,CACjC,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,OAAO,GAAE;IACP,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,sBAAsB,CAAC,EAAE,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"search-content.d.ts","sourceRoot":"","sources":["../../../src/lib/file-operations/search-content.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAGjE,wBAAsB,aAAa,CACjC,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,OAAO,GAAE;IACP,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,MAAM,CAAC,EAAE,WAAW,CAAC;CACjB,GACL,OAAO,CAAC,mBAAmB,CAAC,CAE9B"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { executeSearch } from './search/engine.js';
|
|
2
2
|
export async function searchContent(basePath, searchPattern, options = {}) {
|
|
3
|
-
return executeSearch(basePath, searchPattern, options);
|
|
3
|
+
return executeSearch(basePath, searchPattern, options, options.signal);
|
|
4
4
|
}
|
|
5
5
|
//# sourceMappingURL=search-content.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"search-content.js","sourceRoot":"","sources":["../../../src/lib/file-operations/search-content.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,QAAgB,EAChB,aAAqB,EACrB,
|
|
1
|
+
{"version":3,"file":"search-content.js","sourceRoot":"","sources":["../../../src/lib/file-operations/search-content.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,QAAgB,EAChB,aAAqB,EACrB,UAgBI,EAAE;IAEN,OAAO,aAAa,CAAC,QAAQ,EAAE,aAAa,EAAE,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;AACzE,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"search-definitions.d.ts","sourceRoot":"","sources":["../../../src/lib/file-operations/search-definitions.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAGV,wBAAwB,EACxB,uBAAuB,EACxB,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"search-definitions.d.ts","sourceRoot":"","sources":["../../../src/lib/file-operations/search-definitions.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAGV,wBAAwB,EACxB,uBAAuB,EACxB,MAAM,uBAAuB,CAAC;AA8T/B;;GAEG;AACH,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,wBAAwB,GAChC,OAAO,CAAC,uBAAuB,CAAC,CAwClC"}
|