Skip to content

Commit 03cdf79

Browse files
committed
refactor: Move fulltext to explain/index
1 parent 8e3be79 commit 03cdf79

File tree

12 files changed

+18
-18
lines changed

12 files changed

+18
-18
lines changed

packages/cli/src/cmds/search/search.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ import { FileIndex } from '@appland/search';
99
import { handleWorkingDirectory } from '../../lib/handleWorkingDirectory';
1010
import { verbose } from '../../utils';
1111
import searchSingleAppMap, { SearchOptions as SingleSearchOptions } from './searchSingleAppMap';
12-
import { SearchResponse as DiagramsSearchResponse } from '../../fulltext/appmap-match';
12+
import { SearchResponse as DiagramsSearchResponse } from '../../rpc/explain/index/appmap-match';
1313
import {
1414
SearchResult as EventSearchResult,
1515
SearchResponse as EventSearchResponse,
1616
} from '../../fulltext/FindEvents';
1717
import { openInBrowser } from '../open/openers';
18-
import { buildAppMapIndex, search } from '../../fulltext/appmap-index';
18+
import { buildAppMapIndex, search } from '../../rpc/explain/index/appmap-index';
1919
import buildIndexInTempDir from '../../rpc/explain/build-index-in-temp-dir';
2020

2121
export const command = 'search <query>';

packages/cli/src/fulltext/FindEvents.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import assert from 'assert';
77

88
import { verbose } from '../utils';
99
import { collectParameters } from './collectParameters';
10-
import { fileNameMatchesFilterPatterns } from './filter-patterns';
10+
import { fileNameMatchesFilterPatterns } from '../rpc/explain/index/filter-patterns';
1111

1212
type IndexItem = {
1313
fqid: string;

packages/cli/src/rpc/explain/EventCollector.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { isAbsolute, join } from 'path';
22
import { ContextV2 } from '@appland/navie';
33
import { SearchRpc } from '@appland/rpc';
4-
import { SearchResponse as AppMapSearchResponse } from '../../fulltext/appmap-match';
4+
import { SearchResponse as AppMapSearchResponse } from './index/appmap-match';
55
import FindEvents, {
66
SearchResponse as EventSearchResponse,
77
SearchOptions as EventsSearchOptions,

packages/cli/src/rpc/explain/SearchContextCollector.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ import { ContextV2, applyContext } from '@appland/navie';
55
import { SearchRpc } from '@appland/rpc';
66
import { FileIndex, FileSearchResult } from '@appland/search';
77

8-
import { SearchResponse as AppMapSearchResponse } from '../../fulltext/appmap-match';
8+
import { SearchResponse as AppMapSearchResponse } from './index/appmap-match';
99
import { DEFAULT_MAX_DIAGRAMS } from '../search/search';
1010
import EventCollector from './EventCollector';
1111
import indexFiles from './index-files';
1212
import indexSnippets from './index-snippets';
1313
import collectSnippets from './collect-snippets';
1414
import buildIndexInTempDir from './build-index-in-temp-dir';
15-
import { buildAppMapIndex, search } from '../../fulltext/appmap-index';
15+
import { buildAppMapIndex, search } from './index/appmap-index';
1616

1717
export default class SearchContextCollector {
1818
public excludePatterns: RegExp[] | undefined;

packages/cli/src/rpc/explain/fileFilter.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { FilterFn, isBinaryFile, isDataFile, isLargeFile } from '@appland/search';
22
import makeDebug from 'debug';
3-
import { fileNameMatchesFilterPatterns } from '../../fulltext/filter-patterns';
3+
import { fileNameMatchesFilterPatterns } from './index/filter-patterns';
44

55
const debug = makeDebug('appmap:rpc:explain:file-filter');
66

packages/cli/src/fulltext/appmap-index.ts renamed to packages/cli/src/rpc/explain/index/appmap-index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { readFile } from 'fs/promises';
55
import { Metadata } from '@appland/models';
66
import { buildFileIndex, FileIndex, fileTokens } from '@appland/search';
77

8-
import { findFiles, isNodeError, verbose } from '../utils';
8+
import { findFiles, isNodeError, verbose } from '../../../utils';
99
import {
1010
downscoreOutOfDateMatches,
1111
Match,
@@ -14,7 +14,7 @@ import {
1414
scoreMatches,
1515
SearchResponse,
1616
} from './appmap-match';
17-
import loadAppMapConfig from '../lib/loadAppMapConfig';
17+
import loadAppMapConfig from '../../../lib/loadAppMapConfig';
1818

1919
type ClassMapEntry = {
2020
name: string;

packages/cli/src/fulltext/appmap-match.ts renamed to packages/cli/src/rpc/explain/index/appmap-match.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import UpToDate from '../lib/UpToDate';
2-
import { exists } from '../utils';
1+
import UpToDate from '../../../lib/UpToDate';
2+
import { exists } from '../../../utils';
33

44
import makeDebug from 'debug';
55

packages/cli/src/rpc/search/search.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ import { FileIndex } from '@appland/search';
44
import { SearchRpc } from '@appland/rpc';
55

66
import { RpcHandler } from '../rpc';
7-
import { SearchResponse } from '../../fulltext/appmap-match';
8-
import { search as searchAppMaps } from '../../fulltext/appmap-index';
7+
import { SearchResponse } from '../explain/index/appmap-match';
8+
import { search as searchAppMaps } from '../explain/index/appmap-index';
99
import searchSingleAppMap from '../../cmds/search/searchSingleAppMap';
1010
import configuration, { AppMapDirectory } from '../configuration';
1111
import buildIndexInTempDir from '../explain/build-index-in-temp-dir';
12-
import { buildAppMapIndex } from '../../fulltext/appmap-index';
12+
import { buildAppMapIndex } from '../explain/index/appmap-index';
1313

1414
export const DEFAULT_MAX_DIAGRAMS = 10;
1515
export const DEFAULT_MAX_EVENTS_PER_DIAGRAM = 100;

packages/cli/tests/unit/fulltext/appmap-index.readAppMapContent.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { vol } from 'memfs';
2-
import { readAppMapContent } from '../../../src/fulltext/appmap-index';
2+
import { readAppMapContent } from '../../../src/rpc/explain/index/appmap-index';
33
import { Metadata } from '@appland/models';
44

55
jest.mock('fs/promises', () => require('memfs').promises);

0 commit comments

Comments
 (0)