Skip to content

Commit 2701fc3

Browse files
lpcoxCopilot
andauthored
refactor: remove dead re-exports from cli.ts and unexport ExecaMockResult (#2992)
- Remove all 38 dead barrel re-exports from src/cli.ts that were added during the cli.ts split but never consumed via the cli module (all consumers import directly from the source modules) - Remove deprecated DEFAULT_DNS_SERVERS re-export (all consumers import from dns-resolver.ts directly) - Remove export keyword from ExecaMockResult interface in host-iptables-test-setup.ts (never imported outside its file) - Update cli.test.ts to import copilot API functions from copilot-api-resolver.ts instead of the cli barrel Closes #2991 Closes #2990 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent ac10c67 commit 2701fc3

3 files changed

Lines changed: 2 additions & 71 deletions

File tree

src/cli.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import {
2323
deriveCopilotApiTargetFromProviderBaseUrl,
2424
deriveCopilotApiBasePathFromProviderBaseUrl,
2525
resolveCopilotApiRouting,
26-
} from './cli';
26+
} from './copilot-api-resolver';
2727
import { redactSecrets } from './redact-secrets';
2828

2929
type MockedCommanderModule = typeof import('commander') & {

src/cli.ts

Lines changed: 0 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -1,74 +1,5 @@
11
#!/usr/bin/env node
22

3-
// Re-export domain utilities (extracted to domain-utils.ts)
4-
export {
5-
parseDomains,
6-
parseDomainsFile,
7-
isValidIPv4,
8-
isValidIPv6,
9-
AGENT_IMAGE_PRESETS,
10-
isAgentImagePreset,
11-
validateAgentImage,
12-
processAgentImageOption,
13-
DEFAULT_OPENAI_API_TARGET,
14-
DEFAULT_ANTHROPIC_API_TARGET,
15-
DEFAULT_GEMINI_API_TARGET,
16-
DEFAULT_COPILOT_API_TARGET,
17-
} from './domain-utils';
18-
19-
// Re-export API proxy config (extracted to api-proxy-config.ts)
20-
export {
21-
validateApiProxyConfig,
22-
validateAnthropicCacheTailTtl,
23-
validateApiTargetInAllowedDomains,
24-
emitApiProxyTargetWarnings,
25-
emitCliProxyStatusLogs,
26-
warnClassicPATWithCopilotModel,
27-
extractGhecDomainsFromServerUrl,
28-
extractGhesDomainsFromEngineApiTarget,
29-
resolveApiTargetsToAllowedDomains,
30-
} from './api-proxy-config';
31-
32-
// Re-export option parsers (extracted to option-parsers.ts)
33-
export {
34-
buildRateLimitConfig,
35-
validateRateLimitFlags,
36-
validateEnableOpenCodeFlag,
37-
collectRulesetFile,
38-
hasRateLimitOptions,
39-
validateSkipPullWithBuildLocal,
40-
validateAllowHostPorts,
41-
validateAllowHostServicePorts,
42-
applyHostServicePortsConfig,
43-
parseMemoryLimit,
44-
parseAgentTimeout,
45-
applyAgentTimeout,
46-
checkDockerHost,
47-
resolveDockerHostPathPrefix,
48-
parseDnsServers,
49-
parseDnsOverHttps,
50-
processLocalhostKeyword,
51-
escapeShellArg,
52-
joinShellArgs,
53-
parseEnvironmentVariables,
54-
parseVolumeMounts,
55-
formatItem,
56-
} from './option-parsers';
57-
58-
/**
59-
* Default DNS servers (Google Public DNS)
60-
* @deprecated Import from dns-resolver.ts instead
61-
*/
62-
export { DEFAULT_DNS_SERVERS } from './dns-resolver';
63-
64-
// Re-export for backwards compatibility (used by cli.test.ts and other consumers)
65-
export {
66-
resolveCopilotApiKey,
67-
deriveCopilotApiTargetFromProviderBaseUrl,
68-
deriveCopilotApiBasePathFromProviderBaseUrl,
69-
resolveCopilotApiRouting,
70-
} from './copilot-api-resolver';
71-
723
import { program } from './cli-options';
734
import { createMainAction } from './commands/main-action';
745
import { registerSubcommands } from './commands/subcommands';

src/test-helpers/host-iptables-test-setup.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jest.mock('../logger', () => require('./mock-logger.test-utils').loggerMockFacto
1010
type ExecaMockError = Error & { stderr?: string };
1111
type MockedExecaFn = (file: string, args?: readonly string[], options?: unknown) => Promise<ExecaMockResult>;
1212

13-
export interface ExecaMockResult {
13+
interface ExecaMockResult {
1414
command: string;
1515
escapedCommand: string;
1616
exitCode: number;

0 commit comments

Comments
 (0)