Skip to content

Commit 324073a

Browse files
committed
Remove dead code and rearrange code to handle resolveProjectNames always returns array of resolved config file name
1 parent a172751 commit 324073a

File tree

1 file changed

+5
-25
lines changed

1 file changed

+5
-25
lines changed

src/compiler/tsbuild.ts

Lines changed: 5 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -607,10 +607,7 @@ namespace ts {
607607
}
608608

609609
function getBuildGraph(configFileNames: ReadonlyArray<string>) {
610-
const resolvedNames: ResolvedConfigFileName[] | undefined = resolveProjectNames(configFileNames);
611-
if (resolvedNames === undefined) return undefined;
612-
613-
return createDependencyGraph(resolvedNames);
610+
return createDependencyGraph(resolveProjectNames(configFileNames));
614611
}
615612

616613
function getGlobalDependencyGraph() {
@@ -1114,12 +1111,9 @@ namespace ts {
11141111
projectStatus.setValue(proj.options.configFilePath as ResolvedConfigFilePath, { type: UpToDateStatusType.UpToDate, newestDeclarationFileContentChangedTime: priorNewestUpdateTime } as UpToDateStatus);
11151112
}
11161113

1117-
function getFilesToClean(configFileNames: ReadonlyArray<ResolvedConfigFileName>): string[] | undefined {
1118-
const resolvedNames: ResolvedConfigFileName[] | undefined = resolveProjectNames(configFileNames);
1119-
if (resolvedNames === undefined) return undefined;
1120-
1114+
function getFilesToClean(configFileNames: ReadonlyArray<string>): string[] | undefined {
11211115
// Get the same graph for cleaning we'd use for building
1122-
const graph = createDependencyGraph(resolvedNames);
1116+
const graph = getBuildGraph(configFileNames);
11231117
if (graph === undefined) return undefined;
11241118

11251119
const filesToDelete: string[] = [];
@@ -1139,22 +1133,8 @@ namespace ts {
11391133
return filesToDelete;
11401134
}
11411135

1142-
function getAllProjectsInScope(): ReadonlyArray<ResolvedConfigFileName> | undefined {
1143-
const resolvedNames = resolveProjectNames(rootNames);
1144-
if (resolvedNames === undefined) return undefined;
1145-
const graph = createDependencyGraph(resolvedNames);
1146-
if (graph === undefined) return undefined;
1147-
return graph.buildQueue;
1148-
}
1149-
11501136
function cleanAllProjects() {
1151-
const resolvedNames: ReadonlyArray<ResolvedConfigFileName> | undefined = getAllProjectsInScope();
1152-
if (resolvedNames === undefined) {
1153-
reportStatus(Diagnostics.Skipping_clean_because_not_all_projects_could_be_located);
1154-
return ExitStatus.DiagnosticsPresent_OutputsSkipped;
1155-
}
1156-
1157-
const filesToDelete = getFilesToClean(resolvedNames);
1137+
const filesToDelete = getFilesToClean(rootNames);
11581138
if (filesToDelete === undefined) {
11591139
reportStatus(Diagnostics.Skipping_clean_because_not_all_projects_could_be_located);
11601140
return ExitStatus.DiagnosticsPresent_OutputsSkipped;
@@ -1176,7 +1156,7 @@ namespace ts {
11761156
return resolveConfigFileProjectName(resolvePath(host.getCurrentDirectory(), name));
11771157
}
11781158

1179-
function resolveProjectNames(configFileNames: ReadonlyArray<string>): ResolvedConfigFileName[] | undefined {
1159+
function resolveProjectNames(configFileNames: ReadonlyArray<string>): ResolvedConfigFileName[] {
11801160
return configFileNames.map(resolveProjectName);
11811161
}
11821162

0 commit comments

Comments
 (0)