@j0hanz/filesystem-context-mcp 1.2.5 → 1.2.7
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 +19 -16
- package/dist/__tests__/lib/errors-classify.test.d.ts +2 -0
- package/dist/__tests__/lib/errors-classify.test.d.ts.map +1 -0
- package/dist/__tests__/lib/errors-classify.test.js +53 -0
- package/dist/__tests__/lib/errors-classify.test.js.map +1 -0
- package/dist/__tests__/lib/errors-detailed.test.d.ts +2 -0
- package/dist/__tests__/lib/errors-detailed.test.d.ts.map +1 -0
- package/dist/__tests__/lib/errors-detailed.test.js +38 -0
- package/dist/__tests__/lib/errors-detailed.test.js.map +1 -0
- package/dist/__tests__/lib/errors-is-node-error.test.d.ts +2 -0
- package/dist/__tests__/lib/errors-is-node-error.test.d.ts.map +1 -0
- package/dist/__tests__/lib/errors-is-node-error.test.js +21 -0
- package/dist/__tests__/lib/errors-is-node-error.test.js.map +1 -0
- package/dist/__tests__/lib/errors-mcp-error.test.d.ts +2 -0
- package/dist/__tests__/lib/errors-mcp-error.test.d.ts.map +1 -0
- package/dist/__tests__/lib/errors-mcp-error.test.js +29 -0
- package/dist/__tests__/lib/errors-mcp-error.test.js.map +1 -0
- package/dist/__tests__/lib/errors-node-map.test.d.ts +2 -0
- package/dist/__tests__/lib/errors-node-map.test.d.ts.map +1 -0
- package/dist/__tests__/lib/errors-node-map.test.js +16 -0
- package/dist/__tests__/lib/errors-node-map.test.js.map +1 -0
- package/dist/__tests__/lib/errors-suggestion.test.d.ts +2 -0
- package/dist/__tests__/lib/errors-suggestion.test.d.ts.map +1 -0
- package/dist/__tests__/lib/errors-suggestion.test.js +11 -0
- package/dist/__tests__/lib/errors-suggestion.test.js.map +1 -0
- package/dist/__tests__/lib/file-operations/analyze-directory-edge-cases.test.d.ts +2 -0
- package/dist/__tests__/lib/file-operations/analyze-directory-edge-cases.test.d.ts.map +1 -0
- package/dist/__tests__/lib/file-operations/analyze-directory-edge-cases.test.js +15 -0
- package/dist/__tests__/lib/file-operations/analyze-directory-edge-cases.test.js.map +1 -0
- package/dist/__tests__/lib/file-operations/analyze-directory.test.d.ts +2 -0
- package/dist/__tests__/lib/file-operations/analyze-directory.test.d.ts.map +1 -0
- package/dist/__tests__/lib/file-operations/analyze-directory.test.js +28 -0
- package/dist/__tests__/lib/file-operations/analyze-directory.test.js.map +1 -0
- package/dist/__tests__/lib/file-operations/directory-tree-edge-cases.test.d.ts +2 -0
- package/dist/__tests__/lib/file-operations/directory-tree-edge-cases.test.d.ts.map +1 -0
- package/dist/__tests__/lib/file-operations/directory-tree-edge-cases.test.js +29 -0
- package/dist/__tests__/lib/file-operations/directory-tree-edge-cases.test.js.map +1 -0
- package/dist/__tests__/lib/file-operations/directory-tree.test.d.ts +2 -0
- package/dist/__tests__/lib/file-operations/directory-tree.test.d.ts.map +1 -0
- package/dist/__tests__/lib/file-operations/directory-tree.test.js +75 -0
- package/dist/__tests__/lib/file-operations/directory-tree.test.js.map +1 -0
- package/dist/__tests__/lib/file-operations/get-file-info.test.d.ts +2 -0
- package/dist/__tests__/lib/file-operations/get-file-info.test.d.ts.map +1 -0
- package/dist/__tests__/lib/file-operations/get-file-info.test.js +17 -0
- package/dist/__tests__/lib/file-operations/get-file-info.test.js.map +1 -0
- package/dist/__tests__/lib/file-operations/list-directory-edge-cases.test.d.ts +2 -0
- package/dist/__tests__/lib/file-operations/list-directory-edge-cases.test.d.ts.map +1 -0
- package/dist/__tests__/lib/file-operations/list-directory-edge-cases.test.js +21 -0
- package/dist/__tests__/lib/file-operations/list-directory-edge-cases.test.js.map +1 -0
- package/dist/__tests__/lib/file-operations/list-directory.test.d.ts +2 -0
- package/dist/__tests__/lib/file-operations/list-directory.test.d.ts.map +1 -0
- package/dist/__tests__/lib/file-operations/list-directory.test.js +31 -0
- package/dist/__tests__/lib/file-operations/list-directory.test.js.map +1 -0
- package/dist/__tests__/lib/file-operations/read-media-file.test.d.ts +2 -0
- package/dist/__tests__/lib/file-operations/read-media-file.test.d.ts.map +1 -0
- package/dist/__tests__/lib/file-operations/read-media-file.test.js +21 -0
- package/dist/__tests__/lib/file-operations/read-media-file.test.js.map +1 -0
- package/dist/__tests__/lib/file-operations/read-multiple-files-edge-cases.test.d.ts +2 -0
- package/dist/__tests__/lib/file-operations/read-multiple-files-edge-cases.test.d.ts.map +1 -0
- package/dist/__tests__/lib/file-operations/read-multiple-files-edge-cases.test.js +19 -0
- package/dist/__tests__/lib/file-operations/read-multiple-files-edge-cases.test.js.map +1 -0
- package/dist/__tests__/lib/file-operations/read-multiple-files.test.d.ts +2 -0
- package/dist/__tests__/lib/file-operations/read-multiple-files.test.d.ts.map +1 -0
- package/dist/__tests__/lib/file-operations/read-multiple-files.test.js +39 -0
- package/dist/__tests__/lib/file-operations/read-multiple-files.test.js.map +1 -0
- package/dist/__tests__/lib/file-operations/search-content-edge-cases.test.d.ts +2 -0
- package/dist/__tests__/lib/file-operations/search-content-edge-cases.test.d.ts.map +1 -0
- package/dist/__tests__/lib/file-operations/search-content-edge-cases.test.js +57 -0
- package/dist/__tests__/lib/file-operations/search-content-edge-cases.test.js.map +1 -0
- package/dist/__tests__/lib/file-operations/search-content.test.d.ts +2 -0
- package/dist/__tests__/lib/file-operations/search-content.test.d.ts.map +1 -0
- package/dist/__tests__/lib/file-operations/search-content.test.js +73 -0
- package/dist/__tests__/lib/file-operations/search-content.test.js.map +1 -0
- package/dist/__tests__/lib/file-operations/search-files-edge-cases.test.d.ts +2 -0
- package/dist/__tests__/lib/file-operations/search-files-edge-cases.test.d.ts.map +1 -0
- package/dist/__tests__/lib/file-operations/search-files-edge-cases.test.js +13 -0
- package/dist/__tests__/lib/file-operations/search-files-edge-cases.test.js.map +1 -0
- package/dist/__tests__/lib/file-operations/search-files.test.d.ts +2 -0
- package/dist/__tests__/lib/file-operations/search-files.test.d.ts.map +1 -0
- package/dist/__tests__/lib/file-operations/search-files.test.js +31 -0
- package/dist/__tests__/lib/file-operations/search-files.test.js.map +1 -0
- package/dist/__tests__/lib/file-operations.test.js +11 -0
- package/dist/__tests__/lib/file-operations.test.js.map +1 -1
- package/dist/__tests__/lib/fixtures/file-ops-fixture.d.ts +7 -0
- package/dist/__tests__/lib/fixtures/file-ops-fixture.d.ts.map +1 -0
- package/dist/__tests__/lib/fixtures/file-ops-fixture.js +87 -0
- package/dist/__tests__/lib/fixtures/file-ops-fixture.js.map +1 -0
- package/dist/__tests__/lib/fixtures/file-ops-hooks.d.ts +2 -0
- package/dist/__tests__/lib/fixtures/file-ops-hooks.d.ts.map +1 -0
- package/dist/__tests__/lib/fixtures/file-ops-hooks.js +13 -0
- package/dist/__tests__/lib/fixtures/file-ops-hooks.js.map +1 -0
- package/dist/__tests__/lib/fs-helpers/file-type.test.d.ts +2 -0
- package/dist/__tests__/lib/fs-helpers/file-type.test.d.ts.map +1 -0
- package/dist/__tests__/lib/fs-helpers/file-type.test.js +15 -0
- package/dist/__tests__/lib/fs-helpers/file-type.test.js.map +1 -0
- package/dist/__tests__/lib/fs-helpers/head-file-edge-cases.test.d.ts +2 -0
- package/dist/__tests__/lib/fs-helpers/head-file-edge-cases.test.d.ts.map +1 -0
- package/dist/__tests__/lib/fs-helpers/head-file-edge-cases.test.js +19 -0
- package/dist/__tests__/lib/fs-helpers/head-file-edge-cases.test.js.map +1 -0
- package/dist/__tests__/lib/fs-helpers/head-file.test.d.ts +2 -0
- package/dist/__tests__/lib/fs-helpers/head-file.test.d.ts.map +1 -0
- package/dist/__tests__/lib/fs-helpers/head-file.test.js +12 -0
- package/dist/__tests__/lib/fs-helpers/head-file.test.js.map +1 -0
- package/dist/__tests__/lib/fs-helpers/is-hidden.test.d.ts +2 -0
- package/dist/__tests__/lib/fs-helpers/is-hidden.test.d.ts.map +1 -0
- package/dist/__tests__/lib/fs-helpers/is-hidden.test.js +7 -0
- package/dist/__tests__/lib/fs-helpers/is-hidden.test.js.map +1 -0
- package/dist/__tests__/lib/fs-helpers/is-probably-binary.test.d.ts +2 -0
- package/dist/__tests__/lib/fs-helpers/is-probably-binary.test.d.ts.map +1 -0
- package/dist/__tests__/lib/fs-helpers/is-probably-binary.test.js +33 -0
- package/dist/__tests__/lib/fs-helpers/is-probably-binary.test.js.map +1 -0
- package/dist/__tests__/lib/fs-helpers/read-file-edge-cases.test.d.ts +2 -0
- package/dist/__tests__/lib/fs-helpers/read-file-edge-cases.test.d.ts.map +1 -0
- package/dist/__tests__/lib/fs-helpers/read-file-edge-cases.test.js +41 -0
- package/dist/__tests__/lib/fs-helpers/read-file-edge-cases.test.js.map +1 -0
- package/dist/__tests__/lib/fs-helpers/read-file.test.d.ts +2 -0
- package/dist/__tests__/lib/fs-helpers/read-file.test.d.ts.map +1 -0
- package/dist/__tests__/lib/fs-helpers/read-file.test.js +21 -0
- package/dist/__tests__/lib/fs-helpers/read-file.test.js.map +1 -0
- package/dist/__tests__/lib/fs-helpers/tail-file-edge-cases.test.d.ts +2 -0
- package/dist/__tests__/lib/fs-helpers/tail-file-edge-cases.test.d.ts.map +1 -0
- package/dist/__tests__/lib/fs-helpers/tail-file-edge-cases.test.js +26 -0
- package/dist/__tests__/lib/fs-helpers/tail-file-edge-cases.test.js.map +1 -0
- package/dist/__tests__/lib/fs-helpers/tail-file.test.d.ts +2 -0
- package/dist/__tests__/lib/fs-helpers/tail-file.test.d.ts.map +1 -0
- package/dist/__tests__/lib/fs-helpers/tail-file.test.js +11 -0
- package/dist/__tests__/lib/fs-helpers/tail-file.test.js.map +1 -0
- package/dist/__tests__/lib/path-validation.test.js +93 -104
- package/dist/__tests__/lib/path-validation.test.js.map +1 -1
- package/dist/__tests__/schemas/validators.test.js +111 -115
- package/dist/__tests__/schemas/validators.test.js.map +1 -1
- package/dist/__tests__/security/filesystem-boundary.test.js +41 -36
- package/dist/__tests__/security/filesystem-boundary.test.js.map +1 -1
- package/dist/instructions.md +20 -19
- package/dist/lib/constants.d.ts +2 -0
- package/dist/lib/constants.d.ts.map +1 -1
- package/dist/lib/constants.js +2 -0
- package/dist/lib/constants.js.map +1 -1
- package/dist/lib/errors.d.ts +2 -18
- package/dist/lib/errors.d.ts.map +1 -1
- package/dist/lib/errors.js +57 -29
- package/dist/lib/errors.js.map +1 -1
- 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 +91 -40
- package/dist/lib/file-operations/analyze-directory.js.map +1 -1
- package/dist/lib/file-operations/directory-helpers.d.ts +2 -19
- package/dist/lib/file-operations/directory-helpers.d.ts.map +1 -1
- package/dist/lib/file-operations/directory-helpers.js +26 -90
- package/dist/lib/file-operations/directory-helpers.js.map +1 -1
- package/dist/lib/file-operations/directory-tree-helpers.d.ts +38 -0
- package/dist/lib/file-operations/directory-tree-helpers.d.ts.map +1 -0
- package/dist/lib/file-operations/directory-tree-helpers.js +167 -0
- package/dist/lib/file-operations/directory-tree-helpers.js.map +1 -0
- package/dist/lib/file-operations/directory-tree.d.ts.map +1 -1
- package/dist/lib/file-operations/directory-tree.js +44 -154
- package/dist/lib/file-operations/directory-tree.js.map +1 -1
- package/dist/lib/file-operations/list-directory-helpers.d.ts +2 -1
- package/dist/lib/file-operations/list-directory-helpers.d.ts.map +1 -1
- package/dist/lib/file-operations/list-directory-helpers.js +16 -4
- package/dist/lib/file-operations/list-directory-helpers.js.map +1 -1
- package/dist/lib/file-operations/list-directory.d.ts +4 -2
- package/dist/lib/file-operations/list-directory.d.ts.map +1 -1
- package/dist/lib/file-operations/list-directory.js +42 -20
- package/dist/lib/file-operations/list-directory.js.map +1 -1
- package/dist/lib/file-operations/pattern-validator.d.ts +0 -10
- package/dist/lib/file-operations/pattern-validator.d.ts.map +1 -1
- package/dist/lib/file-operations/pattern-validator.js +44 -43
- package/dist/lib/file-operations/pattern-validator.js.map +1 -1
- package/dist/lib/file-operations/read-multiple-files.d.ts +3 -2
- package/dist/lib/file-operations/read-multiple-files.d.ts.map +1 -1
- package/dist/lib/file-operations/read-multiple-files.js +46 -29
- package/dist/lib/file-operations/read-multiple-files.js.map +1 -1
- package/dist/lib/file-operations/search/context-manager.d.ts +2 -0
- package/dist/lib/file-operations/search/context-manager.d.ts.map +1 -1
- package/dist/lib/file-operations/search/context-manager.js +11 -6
- package/dist/lib/file-operations/search/context-manager.js.map +1 -1
- package/dist/lib/file-operations/search/engine-options.d.ts +19 -0
- package/dist/lib/file-operations/search/engine-options.d.ts.map +1 -0
- package/dist/lib/file-operations/search/engine-options.js +32 -0
- package/dist/lib/file-operations/search/engine-options.js.map +1 -0
- package/dist/lib/file-operations/search/engine-stream.d.ts +6 -0
- package/dist/lib/file-operations/search/engine-stream.d.ts.map +1 -0
- package/dist/lib/file-operations/search/engine-stream.js +130 -0
- package/dist/lib/file-operations/search/engine-stream.js.map +1 -0
- package/dist/lib/file-operations/search/engine.d.ts +1 -17
- package/dist/lib/file-operations/search/engine.d.ts.map +1 -1
- package/dist/lib/file-operations/search/engine.js +7 -117
- package/dist/lib/file-operations/search/engine.js.map +1 -1
- package/dist/lib/file-operations/search/file-processor.d.ts.map +1 -1
- package/dist/lib/file-operations/search/file-processor.js +33 -25
- package/dist/lib/file-operations/search/file-processor.js.map +1 -1
- package/dist/lib/file-operations/search/match-strategy.d.ts.map +1 -1
- package/dist/lib/file-operations/search/match-strategy.js +49 -54
- package/dist/lib/file-operations/search/match-strategy.js.map +1 -1
- package/dist/lib/file-operations/search-files-helpers.d.ts +42 -0
- package/dist/lib/file-operations/search-files-helpers.d.ts.map +1 -0
- package/dist/lib/file-operations/search-files-helpers.js +180 -0
- package/dist/lib/file-operations/search-files-helpers.js.map +1 -0
- package/dist/lib/file-operations/search-files.d.ts +2 -9
- package/dist/lib/file-operations/search-files.d.ts.map +1 -1
- package/dist/lib/file-operations/search-files.js +8 -129
- package/dist/lib/file-operations/search-files.js.map +1 -1
- package/dist/lib/file-operations/sorting.d.ts +3 -2
- package/dist/lib/file-operations/sorting.d.ts.map +1 -1
- package/dist/lib/fs-helpers/binary-detect.d.ts.map +1 -1
- package/dist/lib/fs-helpers/binary-detect.js +16 -10
- package/dist/lib/fs-helpers/binary-detect.js.map +1 -1
- package/dist/lib/fs-helpers/fs-utils.d.ts.map +1 -1
- package/dist/lib/fs-helpers/fs-utils.js +16 -10
- package/dist/lib/fs-helpers/fs-utils.js.map +1 -1
- package/dist/lib/fs-helpers/readers/line-range.d.ts +4 -2
- package/dist/lib/fs-helpers/readers/line-range.d.ts.map +1 -1
- package/dist/lib/fs-helpers/readers/line-range.js +21 -15
- package/dist/lib/fs-helpers/readers/line-range.js.map +1 -1
- package/dist/lib/fs-helpers/readers/read-file.d.ts +6 -3
- package/dist/lib/fs-helpers/readers/read-file.d.ts.map +1 -1
- package/dist/lib/fs-helpers/readers/read-file.js +58 -19
- package/dist/lib/fs-helpers/readers/read-file.js.map +1 -1
- package/dist/lib/fs-helpers/readers/tail-file.d.ts.map +1 -1
- package/dist/lib/fs-helpers/readers/tail-file.js +27 -10
- package/dist/lib/fs-helpers/readers/tail-file.js.map +1 -1
- package/dist/lib/fs-helpers/readers/utf8.d.ts.map +1 -1
- package/dist/lib/fs-helpers/readers/utf8.js +20 -10
- package/dist/lib/fs-helpers/readers/utf8.js.map +1 -1
- package/dist/lib/path-validation/allowed-directories.d.ts +1 -2
- package/dist/lib/path-validation/allowed-directories.d.ts.map +1 -1
- package/dist/lib/path-validation/allowed-directories.js +25 -15
- package/dist/lib/path-validation/allowed-directories.js.map +1 -1
- package/dist/lib/path-validation/errors.d.ts +0 -1
- package/dist/lib/path-validation/errors.d.ts.map +1 -1
- package/dist/lib/path-validation/errors.js +26 -12
- package/dist/lib/path-validation/errors.js.map +1 -1
- package/dist/lib/path-validation/validators.d.ts +1 -0
- package/dist/lib/path-validation/validators.d.ts.map +1 -1
- package/dist/lib/path-validation/validators.js +26 -3
- package/dist/lib/path-validation/validators.js.map +1 -1
- package/dist/lib/path-validation.d.ts +2 -2
- package/dist/lib/path-validation.d.ts.map +1 -1
- package/dist/lib/path-validation.js +2 -2
- package/dist/lib/path-validation.js.map +1 -1
- package/dist/schemas/input-helpers.d.ts +2 -1
- package/dist/schemas/input-helpers.d.ts.map +1 -1
- package/dist/schemas/input-helpers.js +10 -1
- package/dist/schemas/input-helpers.js.map +1 -1
- package/dist/schemas/inputs.d.ts +2 -1
- package/dist/schemas/inputs.d.ts.map +1 -1
- package/dist/schemas/inputs.js +2 -1
- package/dist/schemas/inputs.js.map +1 -1
- package/dist/schemas/outputs.d.ts +12 -12
- package/dist/server.d.ts.map +1 -1
- package/dist/server.js +79 -35
- package/dist/server.js.map +1 -1
- package/dist/tools/analyze-directory.d.ts.map +1 -1
- package/dist/tools/analyze-directory.js +8 -34
- package/dist/tools/analyze-directory.js.map +1 -1
- package/dist/tools/directory-tree.d.ts.map +1 -1
- package/dist/tools/directory-tree.js +14 -35
- package/dist/tools/directory-tree.js.map +1 -1
- package/dist/tools/get-file-info.d.ts.map +1 -1
- package/dist/tools/get-file-info.js +4 -15
- package/dist/tools/get-file-info.js.map +1 -1
- package/dist/tools/list-allowed-dirs.d.ts.map +1 -1
- package/dist/tools/list-allowed-dirs.js +10 -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 +30 -53
- 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 +31 -23
- package/dist/tools/read-file.js.map +1 -1
- package/dist/tools/read-media-file.d.ts.map +1 -1
- package/dist/tools/read-media-file.js +3 -3
- package/dist/tools/read-media-file.js.map +1 -1
- package/dist/tools/read-multiple-files.d.ts.map +1 -1
- package/dist/tools/read-multiple-files.js +19 -18
- package/dist/tools/read-multiple-files.js.map +1 -1
- package/dist/tools/search-content.d.ts.map +1 -1
- package/dist/tools/search-content.js +23 -20
- package/dist/tools/search-content.js.map +1 -1
- package/dist/tools/search-files.d.ts.map +1 -1
- package/dist/tools/search-files.js +4 -30
- package/dist/tools/search-files.js.map +1 -1
- package/dist/tools/shared/formatting.d.ts +13 -0
- package/dist/tools/shared/formatting.d.ts.map +1 -0
- package/dist/tools/shared/formatting.js +31 -0
- package/dist/tools/shared/formatting.js.map +1 -0
- package/dist/tools/shared/search-formatting.d.ts.map +1 -1
- package/dist/tools/shared/search-formatting.js +32 -33
- package/dist/tools/shared/search-formatting.js.map +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"engine-stream.d.ts","sourceRoot":"","sources":["../../../../src/lib/file-operations/search/engine-stream.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEzD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,KAAK,EAAc,WAAW,EAAE,MAAM,YAAY,CAAC;AAoB1D,wBAAgB,YAAY,CAC1B,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,aAAa,GACrB,aAAa,CAAC,MAAM,GAAG,MAAM,CAAC,CAYhC;AA4JD,wBAAsB,aAAa,CACjC,MAAM,EAAE,aAAa,CAAC,MAAM,GAAG,MAAM,CAAC,EACtC,WAAW,EAAE,WAAW,EACxB,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,aAAa,EACtB,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC,IAAI,CAAC,CAgBf"}
|
|
@@ -0,0 +1,130 @@
|
|
|
1
|
+
import fg from 'fast-glob';
|
|
2
|
+
import { PARALLEL_CONCURRENCY } from '../../constants.js';
|
|
3
|
+
import { processFile } from './file-processor.js';
|
|
4
|
+
export function createStream(basePath, options) {
|
|
5
|
+
return fg.stream(options.filePattern, {
|
|
6
|
+
cwd: basePath,
|
|
7
|
+
absolute: true,
|
|
8
|
+
onlyFiles: true,
|
|
9
|
+
dot: options.includeHidden,
|
|
10
|
+
ignore: options.excludePatterns,
|
|
11
|
+
suppressErrors: true,
|
|
12
|
+
followSymbolicLinks: false,
|
|
13
|
+
baseNameMatch: options.baseNameMatch,
|
|
14
|
+
caseSensitiveMatch: options.caseSensitiveFileMatch,
|
|
15
|
+
});
|
|
16
|
+
}
|
|
17
|
+
function shouldStop(state, options, deadlineMs) {
|
|
18
|
+
if (deadlineMs && Date.now() > deadlineMs) {
|
|
19
|
+
state.truncated = true;
|
|
20
|
+
state.stoppedReason = 'timeout';
|
|
21
|
+
return true;
|
|
22
|
+
}
|
|
23
|
+
if (state.filesScanned >= options.maxFilesScanned) {
|
|
24
|
+
state.truncated = true;
|
|
25
|
+
state.stoppedReason = 'maxFiles';
|
|
26
|
+
return true;
|
|
27
|
+
}
|
|
28
|
+
if (state.matches.length >= options.maxResults) {
|
|
29
|
+
state.truncated = true;
|
|
30
|
+
state.stoppedReason = 'maxResults';
|
|
31
|
+
return true;
|
|
32
|
+
}
|
|
33
|
+
return false;
|
|
34
|
+
}
|
|
35
|
+
function updateState(state, result) {
|
|
36
|
+
state.filesScanned++;
|
|
37
|
+
if (!result.scanned) {
|
|
38
|
+
state.skippedInaccessible++;
|
|
39
|
+
return;
|
|
40
|
+
}
|
|
41
|
+
if (result.skippedTooLarge)
|
|
42
|
+
state.skippedTooLarge++;
|
|
43
|
+
if (result.skippedBinary)
|
|
44
|
+
state.skippedBinary++;
|
|
45
|
+
if (result.matches.length > 0) {
|
|
46
|
+
state.matches.push(...result.matches);
|
|
47
|
+
state.filesMatched++;
|
|
48
|
+
}
|
|
49
|
+
state.linesSkippedDueToRegexTimeout += result.linesSkippedDueToRegexTimeout;
|
|
50
|
+
}
|
|
51
|
+
function buildProcessorBaseOptions(options, deadlineMs, searchPattern) {
|
|
52
|
+
return {
|
|
53
|
+
maxResults: options.maxResults,
|
|
54
|
+
contextLines: options.contextLines,
|
|
55
|
+
deadlineMs,
|
|
56
|
+
isLiteral: options.isLiteral,
|
|
57
|
+
wholeWord: options.wholeWord,
|
|
58
|
+
caseSensitive: options.caseSensitive,
|
|
59
|
+
maxFileSize: options.maxFileSize,
|
|
60
|
+
skipBinary: options.skipBinary,
|
|
61
|
+
searchPattern,
|
|
62
|
+
};
|
|
63
|
+
}
|
|
64
|
+
async function enforceMaxFilesScanned(state, options, inFlight, active) {
|
|
65
|
+
if (state.filesScanned + inFlight < options.maxFilesScanned) {
|
|
66
|
+
return 'ok';
|
|
67
|
+
}
|
|
68
|
+
if (active.size === 0) {
|
|
69
|
+
return 'stop';
|
|
70
|
+
}
|
|
71
|
+
await Promise.race(active);
|
|
72
|
+
return 'skip';
|
|
73
|
+
}
|
|
74
|
+
async function waitForConcurrency(active) {
|
|
75
|
+
while (active.size >= PARALLEL_CONCURRENCY) {
|
|
76
|
+
await Promise.race(active);
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
function createProcessingState(options, deadlineMs, searchPattern) {
|
|
80
|
+
return {
|
|
81
|
+
active: new Set(),
|
|
82
|
+
inFlight: 0,
|
|
83
|
+
processorBaseOptions: buildProcessorBaseOptions(options, deadlineMs, searchPattern),
|
|
84
|
+
};
|
|
85
|
+
}
|
|
86
|
+
async function handleStreamEntry(entry, searchState, processing, matcher, options, deadlineMs) {
|
|
87
|
+
if (shouldStop(searchState, options, deadlineMs))
|
|
88
|
+
return 'stop';
|
|
89
|
+
const maxFilesAction = await enforceMaxFilesScanned(searchState, options, processing.inFlight, processing.active);
|
|
90
|
+
if (maxFilesAction === 'stop')
|
|
91
|
+
return 'stop';
|
|
92
|
+
if (maxFilesAction === 'skip')
|
|
93
|
+
return 'continue';
|
|
94
|
+
await waitForConcurrency(processing.active);
|
|
95
|
+
const rawPath = String(entry);
|
|
96
|
+
const task = createProcessingTask(rawPath, searchState, matcher, processing.processorBaseOptions, options, deadlineMs);
|
|
97
|
+
processing.inFlight++;
|
|
98
|
+
processing.active.add(task);
|
|
99
|
+
void task.finally(() => {
|
|
100
|
+
processing.active.delete(task);
|
|
101
|
+
processing.inFlight--;
|
|
102
|
+
});
|
|
103
|
+
return 'continue';
|
|
104
|
+
}
|
|
105
|
+
function createProcessingTask(rawPath, state, matcher, processorBaseOptions, options, deadlineMs) {
|
|
106
|
+
return (async () => {
|
|
107
|
+
try {
|
|
108
|
+
if (shouldStop(state, options, deadlineMs))
|
|
109
|
+
return;
|
|
110
|
+
const result = await processFile(rawPath, matcher, {
|
|
111
|
+
...processorBaseOptions,
|
|
112
|
+
currentMatchCount: state.matches.length,
|
|
113
|
+
});
|
|
114
|
+
updateState(state, result);
|
|
115
|
+
}
|
|
116
|
+
catch {
|
|
117
|
+
state.skippedInaccessible++;
|
|
118
|
+
}
|
|
119
|
+
})();
|
|
120
|
+
}
|
|
121
|
+
export async function processStream(stream, searchState, matcher, options, deadlineMs, searchPattern) {
|
|
122
|
+
const processing = createProcessingState(options, deadlineMs, searchPattern);
|
|
123
|
+
for await (const entry of stream) {
|
|
124
|
+
const action = await handleStreamEntry(entry, searchState, processing, matcher, options, deadlineMs);
|
|
125
|
+
if (action === 'stop')
|
|
126
|
+
break;
|
|
127
|
+
}
|
|
128
|
+
await Promise.all(processing.active);
|
|
129
|
+
}
|
|
130
|
+
//# sourceMappingURL=engine-stream.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"engine-stream.js","sourceRoot":"","sources":["../../../../src/lib/file-operations/search/engine-stream.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,20 +1,4 @@
|
|
|
1
1
|
import type { SearchContentResult } from '../../../config/types.js';
|
|
2
|
-
|
|
3
|
-
filePattern: string;
|
|
4
|
-
excludePatterns: string[];
|
|
5
|
-
caseSensitive: boolean;
|
|
6
|
-
maxResults: number;
|
|
7
|
-
maxFileSize: number;
|
|
8
|
-
maxFilesScanned: number;
|
|
9
|
-
timeoutMs: number;
|
|
10
|
-
skipBinary: boolean;
|
|
11
|
-
contextLines: number;
|
|
12
|
-
wholeWord: boolean;
|
|
13
|
-
isLiteral: boolean;
|
|
14
|
-
includeHidden: boolean;
|
|
15
|
-
baseNameMatch: boolean;
|
|
16
|
-
caseSensitiveFileMatch: boolean;
|
|
17
|
-
}
|
|
2
|
+
import type { SearchOptions } from './engine-options.js';
|
|
18
3
|
export declare function executeSearch(basePath: string, searchPattern: string, partialOptions: Partial<SearchOptions>): Promise<SearchContentResult>;
|
|
19
|
-
export {};
|
|
20
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":"
|
|
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,GACrC,OAAO,CAAC,mBAAmB,CAAC,CA+B9B"}
|
|
@@ -1,9 +1,8 @@
|
|
|
1
|
-
import fg from 'fast-glob';
|
|
2
|
-
import { DEFAULT_MAX_RESULTS, DEFAULT_SEARCH_MAX_FILES, DEFAULT_SEARCH_TIMEOUT_MS, MAX_SEARCHABLE_FILE_SIZE, PARALLEL_CONCURRENCY, } from '../../constants.js';
|
|
3
1
|
import { safeDestroy } from '../../fs-helpers.js';
|
|
4
|
-
import {
|
|
2
|
+
import { validateExistingDirectory } from '../../path-validation.js';
|
|
5
3
|
import { validateGlobPatternOrThrow } from '../pattern-validator.js';
|
|
6
|
-
import {
|
|
4
|
+
import { buildSearchOptions, getDeadlineMs } from './engine-options.js';
|
|
5
|
+
import { createStream, processStream } from './engine-stream.js';
|
|
7
6
|
import { createMatcher } from './match-strategy.js';
|
|
8
7
|
function createInitialState() {
|
|
9
8
|
return {
|
|
@@ -18,53 +17,6 @@ function createInitialState() {
|
|
|
18
17
|
stoppedReason: undefined,
|
|
19
18
|
};
|
|
20
19
|
}
|
|
21
|
-
function createStream(basePath, options) {
|
|
22
|
-
return fg.stream(options.filePattern, {
|
|
23
|
-
cwd: basePath,
|
|
24
|
-
absolute: true,
|
|
25
|
-
onlyFiles: true,
|
|
26
|
-
dot: options.includeHidden,
|
|
27
|
-
ignore: options.excludePatterns,
|
|
28
|
-
suppressErrors: true,
|
|
29
|
-
followSymbolicLinks: false,
|
|
30
|
-
baseNameMatch: options.baseNameMatch,
|
|
31
|
-
caseSensitiveMatch: options.caseSensitiveFileMatch,
|
|
32
|
-
});
|
|
33
|
-
}
|
|
34
|
-
function shouldStop(state, options, deadlineMs) {
|
|
35
|
-
if (deadlineMs && Date.now() > deadlineMs) {
|
|
36
|
-
state.truncated = true;
|
|
37
|
-
state.stoppedReason = 'timeout';
|
|
38
|
-
return true;
|
|
39
|
-
}
|
|
40
|
-
if (state.filesScanned >= options.maxFilesScanned) {
|
|
41
|
-
state.truncated = true;
|
|
42
|
-
state.stoppedReason = 'maxFiles';
|
|
43
|
-
return true;
|
|
44
|
-
}
|
|
45
|
-
if (state.matches.length >= options.maxResults) {
|
|
46
|
-
state.truncated = true;
|
|
47
|
-
state.stoppedReason = 'maxResults';
|
|
48
|
-
return true;
|
|
49
|
-
}
|
|
50
|
-
return false;
|
|
51
|
-
}
|
|
52
|
-
function updateState(state, result) {
|
|
53
|
-
if (!result.scanned) {
|
|
54
|
-
state.skippedInaccessible++;
|
|
55
|
-
return;
|
|
56
|
-
}
|
|
57
|
-
state.filesScanned++;
|
|
58
|
-
if (result.skippedTooLarge)
|
|
59
|
-
state.skippedTooLarge++;
|
|
60
|
-
if (result.skippedBinary)
|
|
61
|
-
state.skippedBinary++;
|
|
62
|
-
if (result.matches.length > 0) {
|
|
63
|
-
state.matches.push(...result.matches);
|
|
64
|
-
state.filesMatched++;
|
|
65
|
-
}
|
|
66
|
-
state.linesSkippedDueToRegexTimeout += result.linesSkippedDueToRegexTimeout;
|
|
67
|
-
}
|
|
68
20
|
function buildResult(basePath, pattern, state, options) {
|
|
69
21
|
let { matches } = state;
|
|
70
22
|
if (matches.length > options.maxResults) {
|
|
@@ -91,23 +43,8 @@ function buildResult(basePath, pattern, state, options) {
|
|
|
91
43
|
};
|
|
92
44
|
}
|
|
93
45
|
export async function executeSearch(basePath, searchPattern, partialOptions) {
|
|
94
|
-
const options =
|
|
95
|
-
|
|
96
|
-
excludePatterns: partialOptions.excludePatterns ?? [],
|
|
97
|
-
caseSensitive: partialOptions.caseSensitive ?? false,
|
|
98
|
-
maxResults: partialOptions.maxResults ?? DEFAULT_MAX_RESULTS,
|
|
99
|
-
maxFileSize: partialOptions.maxFileSize ?? MAX_SEARCHABLE_FILE_SIZE,
|
|
100
|
-
maxFilesScanned: partialOptions.maxFilesScanned ?? DEFAULT_SEARCH_MAX_FILES,
|
|
101
|
-
timeoutMs: partialOptions.timeoutMs ?? DEFAULT_SEARCH_TIMEOUT_MS,
|
|
102
|
-
skipBinary: partialOptions.skipBinary ?? true,
|
|
103
|
-
contextLines: partialOptions.contextLines ?? 0,
|
|
104
|
-
wholeWord: partialOptions.wholeWord ?? false,
|
|
105
|
-
isLiteral: partialOptions.isLiteral ?? false,
|
|
106
|
-
includeHidden: partialOptions.includeHidden ?? false,
|
|
107
|
-
baseNameMatch: partialOptions.baseNameMatch ?? false,
|
|
108
|
-
caseSensitiveFileMatch: partialOptions.caseSensitiveFileMatch ?? true,
|
|
109
|
-
};
|
|
110
|
-
const validPath = await validateExistingPath(basePath);
|
|
46
|
+
const options = buildSearchOptions(partialOptions);
|
|
47
|
+
const validPath = await validateExistingDirectory(basePath);
|
|
111
48
|
validateGlobPatternOrThrow(options.filePattern, validPath);
|
|
112
49
|
const matcher = createMatcher(searchPattern, {
|
|
113
50
|
isLiteral: options.isLiteral,
|
|
@@ -116,57 +53,10 @@ export async function executeSearch(basePath, searchPattern, partialOptions) {
|
|
|
116
53
|
basePath: validPath,
|
|
117
54
|
});
|
|
118
55
|
const state = createInitialState();
|
|
119
|
-
const deadlineMs = options
|
|
120
|
-
? Date.now() + options.timeoutMs
|
|
121
|
-
: undefined;
|
|
122
|
-
const processorBaseOptions = {
|
|
123
|
-
...options,
|
|
124
|
-
deadlineMs,
|
|
125
|
-
searchPattern,
|
|
126
|
-
};
|
|
56
|
+
const deadlineMs = getDeadlineMs(options);
|
|
127
57
|
const stream = createStream(validPath, options);
|
|
128
|
-
const active = new Set();
|
|
129
|
-
let inFlight = 0;
|
|
130
58
|
try {
|
|
131
|
-
|
|
132
|
-
if (shouldStop(state, options, deadlineMs))
|
|
133
|
-
break;
|
|
134
|
-
if (state.filesScanned + inFlight >= options.maxFilesScanned) {
|
|
135
|
-
if (active.size > 0) {
|
|
136
|
-
await Promise.race(active);
|
|
137
|
-
continue;
|
|
138
|
-
}
|
|
139
|
-
else {
|
|
140
|
-
break;
|
|
141
|
-
}
|
|
142
|
-
}
|
|
143
|
-
while (active.size >= PARALLEL_CONCURRENCY) {
|
|
144
|
-
await Promise.race(active);
|
|
145
|
-
}
|
|
146
|
-
const rawPath = String(entry);
|
|
147
|
-
inFlight++;
|
|
148
|
-
const p = (async () => {
|
|
149
|
-
try {
|
|
150
|
-
if (shouldStop(state, options, deadlineMs))
|
|
151
|
-
return;
|
|
152
|
-
const processorOptions = {
|
|
153
|
-
...processorBaseOptions,
|
|
154
|
-
currentMatchCount: state.matches.length,
|
|
155
|
-
};
|
|
156
|
-
const result = await processFile(rawPath, matcher, processorOptions);
|
|
157
|
-
updateState(state, result);
|
|
158
|
-
}
|
|
159
|
-
catch {
|
|
160
|
-
state.skippedInaccessible++;
|
|
161
|
-
}
|
|
162
|
-
finally {
|
|
163
|
-
inFlight--;
|
|
164
|
-
}
|
|
165
|
-
})();
|
|
166
|
-
active.add(p);
|
|
167
|
-
void p.finally(() => active.delete(p));
|
|
168
|
-
}
|
|
169
|
-
await Promise.all(active);
|
|
59
|
+
await processStream(stream, state, matcher, options, deadlineMs, searchPattern);
|
|
170
60
|
}
|
|
171
61
|
finally {
|
|
172
62
|
safeDestroy(stream);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"engine.js","sourceRoot":"","sources":["../../../../src/lib/file-operations/search/engine.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"engine.js","sourceRoot":"","sources":["../../../../src/lib/file-operations/search/engine.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-processor.d.ts","sourceRoot":"","sources":["../../../../src/lib/file-operations/search/file-processor.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,KAAK,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"file-processor.d.ts","sourceRoot":"","sources":["../../../../src/lib/file-operations/search/file-processor.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,KAAK,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAwJ5D,wBAAsB,WAAW,CAC/B,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,UAAU,CAAC,CAkBrB"}
|
|
@@ -41,6 +41,16 @@ function createReadInterface(handle) {
|
|
|
41
41
|
function trimLine(line) {
|
|
42
42
|
return line.trimEnd().substring(0, MAX_LINE_CONTENT_LENGTH);
|
|
43
43
|
}
|
|
44
|
+
function createScanResult(matches, linesSkipped) {
|
|
45
|
+
return {
|
|
46
|
+
matches,
|
|
47
|
+
linesSkippedDueToRegexTimeout: linesSkipped,
|
|
48
|
+
fileHadMatches: matches.length > 0,
|
|
49
|
+
skippedTooLarge: false,
|
|
50
|
+
skippedBinary: false,
|
|
51
|
+
scanned: true,
|
|
52
|
+
};
|
|
53
|
+
}
|
|
44
54
|
function shouldStop(currentFileMatches, options) {
|
|
45
55
|
if (options.deadlineMs && Date.now() > options.deadlineMs) {
|
|
46
56
|
return true;
|
|
@@ -50,41 +60,39 @@ function shouldStop(currentFileMatches, options) {
|
|
|
50
60
|
}
|
|
51
61
|
return false;
|
|
52
62
|
}
|
|
53
|
-
async function
|
|
54
|
-
const contextManager = new ContextManager(options.contextLines);
|
|
63
|
+
async function scanLines(rl, displayPath, matcher, options, contextManager) {
|
|
55
64
|
const matches = [];
|
|
56
65
|
let linesSkipped = 0;
|
|
57
66
|
let lineNumber = 0;
|
|
67
|
+
for await (const line of rl) {
|
|
68
|
+
lineNumber++;
|
|
69
|
+
if (shouldStop(matches.length, options))
|
|
70
|
+
break;
|
|
71
|
+
const trimmed = trimLine(line);
|
|
72
|
+
contextManager.pushLine(trimmed);
|
|
73
|
+
const matchCount = matcher(line);
|
|
74
|
+
if (matchCount < 0) {
|
|
75
|
+
linesSkipped++;
|
|
76
|
+
continue;
|
|
77
|
+
}
|
|
78
|
+
if (matchCount === 0) {
|
|
79
|
+
continue;
|
|
80
|
+
}
|
|
81
|
+
matches.push(contextManager.createMatch(displayPath, lineNumber, trimmed, matchCount));
|
|
82
|
+
}
|
|
83
|
+
return { matches, linesSkipped };
|
|
84
|
+
}
|
|
85
|
+
async function scanContent(handle, displayPath, matcher, options) {
|
|
86
|
+
const contextManager = new ContextManager(options.contextLines);
|
|
58
87
|
const { rl, stream } = createReadInterface(handle);
|
|
59
88
|
try {
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
if (shouldStop(matches.length, options))
|
|
63
|
-
break;
|
|
64
|
-
const trimmed = trimLine(line);
|
|
65
|
-
contextManager.pushLine(trimmed);
|
|
66
|
-
const matchCount = matcher(line);
|
|
67
|
-
if (matchCount < 0) {
|
|
68
|
-
linesSkipped++;
|
|
69
|
-
continue;
|
|
70
|
-
}
|
|
71
|
-
if (matchCount > 0) {
|
|
72
|
-
matches.push(contextManager.createMatch(displayPath, lineNumber, trimmed, matchCount));
|
|
73
|
-
}
|
|
74
|
-
}
|
|
89
|
+
const { matches, linesSkipped } = await scanLines(rl, displayPath, matcher, options, contextManager);
|
|
90
|
+
return createScanResult(matches, linesSkipped);
|
|
75
91
|
}
|
|
76
92
|
finally {
|
|
77
93
|
rl.close();
|
|
78
94
|
stream.destroy();
|
|
79
95
|
}
|
|
80
|
-
return {
|
|
81
|
-
matches,
|
|
82
|
-
linesSkippedDueToRegexTimeout: linesSkipped,
|
|
83
|
-
fileHadMatches: matches.length > 0,
|
|
84
|
-
skippedTooLarge: false,
|
|
85
|
-
skippedBinary: false,
|
|
86
|
-
scanned: true,
|
|
87
|
-
};
|
|
88
96
|
}
|
|
89
97
|
async function scanWithHandle(handle, openPath, displayPath, matcher, options) {
|
|
90
98
|
const stats = await handle.stat();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-processor.js","sourceRoot":"","sources":["../../../../src/lib/file-operations/search/file-processor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,UAAU,MAAM,kBAAkB,CAAC;AAC/C,OAAO,KAAK,QAAQ,MAAM,eAAe,CAAC;AAI1C,OAAO,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAC7D,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,4BAA4B,EAAE,MAAM,0BAA0B,CAAC;AACxE,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAItD,SAAS,iBAAiB,CAAC,SAA8B;IACvD,OAAO;QACL,OAAO,EAAE,EAAE;QACX,6BAA6B,EAAE,CAAC;QAChC,cAAc,EAAE,KAAK;QACrB,eAAe,EAAE,KAAK;QACtB,aAAa,EAAE,KAAK;QACpB,OAAO,EAAE,KAAK;QACd,GAAG,SAAS;KACb,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,WAAW,CACxB,OAAe;IAEf,IAAI,CAAC;QACH,MAAM,SAAS,GAAG,MAAM,4BAA4B,CAAC,OAAO,CAAC,CAAC;QAC9D,OAAO;YACL,QAAQ,EAAE,SAAS,CAAC,YAAY;YAChC,WAAW,EAAE,SAAS,CAAC,aAAa;SACrC,CAAC;IACJ,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED,SAAS,mBAAmB,CAAC,MAA6B;IAIxD,MAAM,MAAM,GAAG,MAAM,CAAC,gBAAgB,CAAC;QACrC,QAAQ,EAAE,OAAO;QACjB,SAAS,EAAE,KAAK;KACjB,CAAC,CAAC;IACH,MAAM,EAAE,GAAG,QAAQ,CAAC,eAAe,CAAC;QAClC,KAAK,EAAE,MAAM;QACb,SAAS,EAAE,QAAQ;KACpB,CAAC,CAAC;IACH,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC;AACxB,CAAC;AAED,SAAS,QAAQ,CAAC,IAAY;IAC5B,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC,SAAS,CAAC,CAAC,EAAE,uBAAuB,CAAC,CAAC;AAC9D,CAAC;AAED,SAAS,UAAU,CACjB,kBAA0B,EAC1B,OAAsB;IAEtB,IAAI,OAAO,CAAC,UAAU,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;QAC1D,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,OAAO,CAAC,iBAAiB,GAAG,kBAAkB,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;QACzE,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,KAAK,UAAU,
|
|
1
|
+
{"version":3,"file":"file-processor.js","sourceRoot":"","sources":["../../../../src/lib/file-operations/search/file-processor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,UAAU,MAAM,kBAAkB,CAAC;AAC/C,OAAO,KAAK,QAAQ,MAAM,eAAe,CAAC;AAI1C,OAAO,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAC7D,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,4BAA4B,EAAE,MAAM,0BAA0B,CAAC;AACxE,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAItD,SAAS,iBAAiB,CAAC,SAA8B;IACvD,OAAO;QACL,OAAO,EAAE,EAAE;QACX,6BAA6B,EAAE,CAAC;QAChC,cAAc,EAAE,KAAK;QACrB,eAAe,EAAE,KAAK;QACtB,aAAa,EAAE,KAAK;QACpB,OAAO,EAAE,KAAK;QACd,GAAG,SAAS;KACb,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,WAAW,CACxB,OAAe;IAEf,IAAI,CAAC;QACH,MAAM,SAAS,GAAG,MAAM,4BAA4B,CAAC,OAAO,CAAC,CAAC;QAC9D,OAAO;YACL,QAAQ,EAAE,SAAS,CAAC,YAAY;YAChC,WAAW,EAAE,SAAS,CAAC,aAAa;SACrC,CAAC;IACJ,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED,SAAS,mBAAmB,CAAC,MAA6B;IAIxD,MAAM,MAAM,GAAG,MAAM,CAAC,gBAAgB,CAAC;QACrC,QAAQ,EAAE,OAAO;QACjB,SAAS,EAAE,KAAK;KACjB,CAAC,CAAC;IACH,MAAM,EAAE,GAAG,QAAQ,CAAC,eAAe,CAAC;QAClC,KAAK,EAAE,MAAM;QACb,SAAS,EAAE,QAAQ;KACpB,CAAC,CAAC;IACH,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC;AACxB,CAAC;AAED,SAAS,QAAQ,CAAC,IAAY;IAC5B,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC,SAAS,CAAC,CAAC,EAAE,uBAAuB,CAAC,CAAC;AAC9D,CAAC;AAED,SAAS,gBAAgB,CACvB,OAAuB,EACvB,YAAoB;IAEpB,OAAO;QACL,OAAO;QACP,6BAA6B,EAAE,YAAY;QAC3C,cAAc,EAAE,OAAO,CAAC,MAAM,GAAG,CAAC;QAClC,eAAe,EAAE,KAAK;QACtB,aAAa,EAAE,KAAK;QACpB,OAAO,EAAE,IAAI;KACd,CAAC;AACJ,CAAC;AAED,SAAS,UAAU,CACjB,kBAA0B,EAC1B,OAAsB;IAEtB,IAAI,OAAO,CAAC,UAAU,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;QAC1D,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,OAAO,CAAC,iBAAiB,GAAG,kBAAkB,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;QACzE,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,KAAK,UAAU,SAAS,CACtB,EAAsB,EACtB,WAAmB,EACnB,OAAgB,EAChB,OAAsB,EACtB,cAA8B;IAE9B,MAAM,OAAO,GAAmB,EAAE,CAAC;IACnC,IAAI,YAAY,GAAG,CAAC,CAAC;IACrB,IAAI,UAAU,GAAG,CAAC,CAAC;IAEnB,IAAI,KAAK,EAAE,MAAM,IAAI,IAAI,EAAE,EAAE,CAAC;QAC5B,UAAU,EAAE,CAAC;QACb,IAAI,UAAU,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC;YAAE,MAAM;QAE/C,MAAM,OAAO,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;QAC/B,cAAc,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QAEjC,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;QACjC,IAAI,UAAU,GAAG,CAAC,EAAE,CAAC;YACnB,YAAY,EAAE,CAAC;YACf,SAAS;QACX,CAAC;QACD,IAAI,UAAU,KAAK,CAAC,EAAE,CAAC;YACrB,SAAS;QACX,CAAC;QAED,OAAO,CAAC,IAAI,CACV,cAAc,CAAC,WAAW,CAAC,WAAW,EAAE,UAAU,EAAE,OAAO,EAAE,UAAU,CAAC,CACzE,CAAC;IACJ,CAAC;IAED,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,CAAC;AACnC,CAAC;AAED,KAAK,UAAU,WAAW,CACxB,MAA6B,EAC7B,WAAmB,EACnB,OAAgB,EAChB,OAAsB;IAEtB,MAAM,cAAc,GAAG,IAAI,cAAc,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IAChE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,mBAAmB,CAAC,MAAM,CAAC,CAAC;IAEnD,IAAI,CAAC;QACH,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,GAAG,MAAM,SAAS,CAC/C,EAAE,EACF,WAAW,EACX,OAAO,EACP,OAAO,EACP,cAAc,CACf,CAAC;QACF,OAAO,gBAAgB,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;IACjD,CAAC;YAAS,CAAC;QACT,EAAE,CAAC,KAAK,EAAE,CAAC;QACX,MAAM,CAAC,OAAO,EAAE,CAAC;IACnB,CAAC;AACH,CAAC;AAED,KAAK,UAAU,cAAc,CAC3B,MAA6B,EAC7B,QAAgB,EAChB,WAAmB,EACnB,OAAgB,EAChB,OAAsB;IAEtB,MAAM,KAAK,GAAG,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;IAClC,IAAI,KAAK,CAAC,IAAI,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;QACrC,OAAO,iBAAiB,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,CAAC,CAAC;IACrE,CAAC;IAED,IAAI,OAAO,CAAC,UAAU,IAAI,CAAC,MAAM,gBAAgB,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC;QACrE,OAAO,iBAAiB,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;IACnE,CAAC;IAED,OAAO,MAAM,WAAW,CAAC,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;AAClE,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,OAAe,EACf,OAAgB,EAChB,OAAsB;IAEtB,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,OAAO,CAAC,CAAC;IAC5C,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,OAAO,iBAAiB,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,eAAe;IAC/D,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;IAC7D,IAAI,CAAC;QACH,OAAO,MAAM,cAAc,CACzB,MAAM,EACN,QAAQ,CAAC,QAAQ,EACjB,QAAQ,CAAC,WAAW,EACpB,OAAO,EACP,OAAO,CACR,CAAC;IACJ,CAAC;YAAS,CAAC;QACT,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;IACvC,CAAC;AACH,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"match-strategy.d.ts","sourceRoot":"","sources":["../../../../src/lib/file-operations/search/match-strategy.ts"],"names":[],"mappings":"AAKA,MAAM,MAAM,OAAO,GAAG,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC;AAE/C,wBAAgB,aAAa,CAC3B,OAAO,EAAE,MAAM,EACf,OAAO,EAAE;IACP,SAAS,EAAE,OAAO,CAAC;IACnB,SAAS,EAAE,OAAO,CAAC;IACnB,aAAa,EAAE,OAAO,CAAC;IACvB,QAAQ,EAAE,MAAM,CAAC;CAClB,GACA,OAAO,
|
|
1
|
+
{"version":3,"file":"match-strategy.d.ts","sourceRoot":"","sources":["../../../../src/lib/file-operations/search/match-strategy.ts"],"names":[],"mappings":"AAKA,MAAM,MAAM,OAAO,GAAG,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC;AAE/C,wBAAgB,aAAa,CAC3B,OAAO,EAAE,MAAM,EACf,OAAO,EAAE;IACP,SAAS,EAAE,OAAO,CAAC;IACnB,SAAS,EAAE,OAAO,CAAC;IACnB,aAAa,EAAE,OAAO,CAAC;IACvB,QAAQ,EAAE,MAAM,CAAC;CAClB,GACA,OAAO,CAcT"}
|
|
@@ -8,8 +8,7 @@ export function createMatcher(pattern, options) {
|
|
|
8
8
|
}
|
|
9
9
|
// Regex matcher
|
|
10
10
|
const finalPattern = preparePattern(pattern, isLiteral, wholeWord);
|
|
11
|
-
|
|
12
|
-
ensureSafePattern(finalPattern, pattern, basePath, needsReDoSCheck);
|
|
11
|
+
ensureSafePattern(finalPattern, pattern, basePath);
|
|
13
12
|
const regex = compileRegex(finalPattern, caseSensitive, basePath);
|
|
14
13
|
return createRegexMatcher(regex);
|
|
15
14
|
}
|
|
@@ -32,38 +31,55 @@ function createLiteralMatcher(pattern, caseSensitive) {
|
|
|
32
31
|
};
|
|
33
32
|
}
|
|
34
33
|
function createRegexMatcher(regex, timeoutMs = REGEX_MATCH_TIMEOUT_MS) {
|
|
35
|
-
return (line) =>
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
34
|
+
return (line) => countRegexMatches(line, regex, timeoutMs);
|
|
35
|
+
}
|
|
36
|
+
function countRegexMatches(line, regex, timeoutMs) {
|
|
37
|
+
if (line.length === 0)
|
|
38
|
+
return 0;
|
|
39
|
+
regex.lastIndex = 0;
|
|
40
|
+
const deadline = Date.now() + timeoutMs;
|
|
41
|
+
const maxIterations = Math.min(line.length * 2, 10000);
|
|
42
|
+
return runRegexMatchLoop(line, regex, deadline, maxIterations);
|
|
43
|
+
}
|
|
44
|
+
function runRegexMatchLoop(line, regex, deadline, maxIterations) {
|
|
45
|
+
let count = 0;
|
|
46
|
+
let iterations = 0;
|
|
47
|
+
let lastIndex = 0;
|
|
48
|
+
let match;
|
|
49
|
+
while ((match = regex.exec(line)) !== null) {
|
|
50
|
+
count++;
|
|
51
|
+
iterations++;
|
|
52
|
+
const advance = advanceRegexIndex(match, regex, lastIndex);
|
|
53
|
+
if (advance.shouldAbort)
|
|
54
|
+
return -1;
|
|
55
|
+
lastIndex = advance.nextLastIndex;
|
|
56
|
+
if (shouldCheckTimeout(count, iterations, deadline, maxIterations)) {
|
|
57
|
+
return -1;
|
|
59
58
|
}
|
|
60
|
-
|
|
61
|
-
|
|
59
|
+
}
|
|
60
|
+
return count;
|
|
61
|
+
}
|
|
62
|
+
function advanceRegexIndex(match, regex, lastIndex) {
|
|
63
|
+
const currentIndex = regex.lastIndex;
|
|
64
|
+
if (match[0] === '') {
|
|
65
|
+
regex.lastIndex++;
|
|
66
|
+
}
|
|
67
|
+
if (currentIndex === lastIndex) {
|
|
68
|
+
return { nextLastIndex: lastIndex, shouldAbort: true };
|
|
69
|
+
}
|
|
70
|
+
return { nextLastIndex: regex.lastIndex, shouldAbort: false };
|
|
62
71
|
}
|
|
63
72
|
function shouldCheckTimeout(count, iterations, deadline, maxIterations) {
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
73
|
+
if (iterations > maxIterations)
|
|
74
|
+
return true;
|
|
75
|
+
if (!isCheckInterval(count, iterations))
|
|
76
|
+
return false;
|
|
77
|
+
return Date.now() > deadline;
|
|
78
|
+
}
|
|
79
|
+
function isCheckInterval(count, iterations) {
|
|
80
|
+
const countInterval = count > 0 && count % 10 === 0;
|
|
81
|
+
const iterationInterval = iterations > 0 && iterations % 50 === 0;
|
|
82
|
+
return countInterval || iterationInterval;
|
|
67
83
|
}
|
|
68
84
|
function preparePattern(pattern, isLiteral, wholeWord) {
|
|
69
85
|
let finalPattern = pattern;
|
|
@@ -75,29 +91,8 @@ function preparePattern(pattern, isLiteral, wholeWord) {
|
|
|
75
91
|
}
|
|
76
92
|
return finalPattern;
|
|
77
93
|
}
|
|
78
|
-
function
|
|
79
|
-
if (
|
|
80
|
-
return false;
|
|
81
|
-
}
|
|
82
|
-
const nestedQuantifierPattern = /[+*?}]\s*\)\s*[+*?{]/;
|
|
83
|
-
if (nestedQuantifierPattern.test(pattern)) {
|
|
84
|
-
return false;
|
|
85
|
-
}
|
|
86
|
-
const highRepetitionPattern = /\{(\d+)(?:,\d*)?\}/g;
|
|
87
|
-
let match;
|
|
88
|
-
while ((match = highRepetitionPattern.exec(pattern)) !== null) {
|
|
89
|
-
const countStr = match[1];
|
|
90
|
-
if (countStr === undefined)
|
|
91
|
-
continue;
|
|
92
|
-
const count = parseInt(countStr, 10);
|
|
93
|
-
if (Number.isNaN(count) || count >= 25) {
|
|
94
|
-
return false;
|
|
95
|
-
}
|
|
96
|
-
}
|
|
97
|
-
return true;
|
|
98
|
-
}
|
|
99
|
-
function ensureSafePattern(finalPattern, originalPattern, basePath, needsReDoSCheck) {
|
|
100
|
-
if (!needsReDoSCheck || safeRegex(finalPattern))
|
|
94
|
+
function ensureSafePattern(finalPattern, originalPattern, basePath) {
|
|
95
|
+
if (safeRegex(finalPattern))
|
|
101
96
|
return;
|
|
102
97
|
throw new McpError(ErrorCode.E_INVALID_PATTERN, `Potentially unsafe regular expression (ReDoS risk): ${originalPattern}. ` +
|
|
103
98
|
'Avoid patterns with nested quantifiers, overlapping alternations, or exponential backtracking.', basePath, { reason: 'ReDoS risk detected' });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"match-strategy.js","sourceRoot":"","sources":["../../../../src/lib/file-operations/search/match-strategy.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,aAAa,CAAC;AAEpC,OAAO,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAC5D,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAItD,MAAM,UAAU,aAAa,CAC3B,OAAe,EACf,OAKC;IAED,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,aAAa,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IAElE,IAAI,SAAS,IAAI,CAAC,SAAS,EAAE,CAAC;QAC5B,OAAO,oBAAoB,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;IACtD,CAAC;IAED,gBAAgB;IAChB,MAAM,YAAY,GAAG,cAAc,CAAC,OAAO,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"match-strategy.js","sourceRoot":"","sources":["../../../../src/lib/file-operations/search/match-strategy.ts"],"names":[],"mappings":"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"}
|