Skip to content

Commit ada48e5

Browse files
jramsayjramsay
committed
Rename typingOptions.enableAutoDiscovery to typeAcquisition.enable
1 parent 432f7a9 commit ada48e5

19 files changed

+159
-159
lines changed

‎Jakefile.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ var harnessSources = harnessCoreSources.concat([
256256
"commandLineParsing.ts",
257257
"configurationExtension.ts",
258258
"convertCompilerOptionsFromJson.ts",
259-
"convertTypingOptionsFromJson.ts",
259+
"convertTypeAcquisitionFromJson.ts",
260260
"tsserverProjectSystem.ts",
261261
"compileOnSave.ts",
262262
"typingsInstaller.ts",

‎src/compiler/commandLineParser.ts

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -462,9 +462,9 @@ namespace ts {
462462
];
463463

464464
/* @internal */
465-
export let typingOptionDeclarations: CommandLineOption[] = [
465+
export let typeAcquisitionDeclarations: CommandLineOption[] = [
466466
{
467-
name: "enableAutoDiscovery",
467+
name: "enable",
468468
type: "boolean",
469469
},
470470
{
@@ -835,15 +835,15 @@ namespace ts {
835835
return {
836836
options: {},
837837
fileNames: [],
838-
typingOptions: {},
838+
typeAcquisition: {},
839839
raw: json,
840840
errors: [createCompilerDiagnostic(Diagnostics.Circularity_detected_while_resolving_configuration_Colon_0, [...resolutionStack, resolvedPath].join(" -> "))],
841841
wildcardDirectories: {}
842842
};
843843
}
844844

845845
let options: CompilerOptions = convertCompilerOptionsFromJsonWorker(json["compilerOptions"], basePath, errors, configFileName);
846-
const typingOptions: TypingOptions = convertTypingOptionsFromJsonWorker(json["typingOptions"], basePath, errors, configFileName);
846+
const typeAcquisition: TypeAcquisition = convertTypeAcquisitionFromJsonWorker(json["typeAcquisition"], basePath, errors, configFileName);
847847

848848
if (json["extends"]) {
849849
let [include, exclude, files, baseOptions]: [string[], string[], string[], CompilerOptions] = [undefined, undefined, undefined, {}];
@@ -874,7 +874,7 @@ namespace ts {
874874
return {
875875
options,
876876
fileNames,
877-
typingOptions,
877+
typeAcquisition,
878878
raw: json,
879879
errors,
880880
wildcardDirectories,
@@ -996,9 +996,9 @@ namespace ts {
996996
return { options, errors };
997997
}
998998

999-
export function convertTypingOptionsFromJson(jsonOptions: any, basePath: string, configFileName?: string): { options: TypingOptions, errors: Diagnostic[] } {
999+
export function convertTypeAcquisitionFromJson(jsonOptions: any, basePath: string, configFileName?: string): { options: TypeAcquisition, errors: Diagnostic[] } {
10001000
const errors: Diagnostic[] = [];
1001-
const options = convertTypingOptionsFromJsonWorker(jsonOptions, basePath, errors, configFileName);
1001+
const options = convertTypeAcquisitionFromJsonWorker(jsonOptions, basePath, errors, configFileName);
10021002
return { options, errors };
10031003
}
10041004

@@ -1012,16 +1012,16 @@ namespace ts {
10121012
return options;
10131013
}
10141014

1015-
function convertTypingOptionsFromJsonWorker(jsonOptions: any,
1016-
basePath: string, errors: Diagnostic[], configFileName?: string): TypingOptions {
1015+
function convertTypeAcquisitionFromJsonWorker(jsonOptions: any,
1016+
basePath: string, errors: Diagnostic[], configFileName?: string): TypeAcquisition {
10171017

1018-
const options: TypingOptions = { enableAutoDiscovery: getBaseFileName(configFileName) === "jsconfig.json", include: [], exclude: [] };
1019-
convertOptionsFromJson(typingOptionDeclarations, jsonOptions, basePath, options, Diagnostics.Unknown_typing_option_0, errors);
1018+
const options: TypeAcquisition = { enable: getBaseFileName(configFileName) === "jsconfig.json", include: [], exclude: [] };
1019+
convertOptionsFromJson(typeAcquisitionDeclarations, jsonOptions, basePath, options, Diagnostics.Unknown_type_acquisition_option_0, errors);
10201020
return options;
10211021
}
10221022

10231023
function convertOptionsFromJson(optionDeclarations: CommandLineOption[], jsonOptions: any, basePath: string,
1024-
defaultOptions: CompilerOptions | TypingOptions, diagnosticMessage: DiagnosticMessage, errors: Diagnostic[]) {
1024+
defaultOptions: CompilerOptions | TypeAcquisition, diagnosticMessage: DiagnosticMessage, errors: Diagnostic[]) {
10251025

10261026
if (!jsonOptions) {
10271027
return;

‎src/compiler/diagnosticMessages.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3137,7 +3137,7 @@
31373137
"category": "Error",
31383138
"code": 17009
31393139
},
3140-
"Unknown typing option '{0}'.": {
3140+
"Unknown type acquisition option '{0}'.": {
31413141
"category": "Error",
31423142
"code": 17010
31433143
},

‎src/compiler/types.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3205,8 +3205,8 @@ namespace ts {
32053205
[option: string]: CompilerOptionsValue | undefined;
32063206
}
32073207

3208-
export interface TypingOptions {
3209-
enableAutoDiscovery?: boolean;
3208+
export interface TypeAcquisition {
3209+
enable?: boolean;
32103210
include?: string[];
32113211
exclude?: string[];
32123212
[option: string]: string[] | boolean | undefined;
@@ -3217,7 +3217,7 @@ namespace ts {
32173217
projectRootPath: string; // The path to the project root directory
32183218
safeListPath: string; // The path used to retrieve the safe list
32193219
packageNameToTypingLocation: Map<string>; // The map of package names to their cached typing locations
3220-
typingOptions: TypingOptions; // Used to customize the typing inference process
3220+
typeAcquisition: TypeAcquisition; // Used to customize the type acquisition process
32213221
compilerOptions: CompilerOptions; // Used as a source for typing inference
32223222
unresolvedImports: ReadonlyArray<string>; // List of unresolved module ids from imports
32233223
}
@@ -3282,7 +3282,7 @@ namespace ts {
32823282
/** Either a parsed command line or a parsed tsconfig.json */
32833283
export interface ParsedCommandLine {
32843284
options: CompilerOptions;
3285-
typingOptions?: TypingOptions;
3285+
typeAcquisition?: TypeAcquisition;
32863286
fileNames: string[];
32873287
raw?: any;
32883288
errors: Diagnostic[];

‎src/harness/tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@
108108
"./unittests/commandLineParsing.ts",
109109
"./unittests/configurationExtension.ts",
110110
"./unittests/convertCompilerOptionsFromJson.ts",
111-
"./unittests/convertTypingOptionsFromJson.ts",
111+
"./unittests/convertTypeAcquisitionFromJson.ts",
112112
"./unittests/tsserverProjectSystem.ts",
113113
"./unittests/matchFiles.ts",
114114
"./unittests/initializeTSConfig.ts",

‎src/harness/unittests/convertTypingOptionsFromJson.ts renamed to ‎src/harness/unittests/convertTypeAcquisitionFromJson.ts

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
/// <reference path="..\..\compiler\commandLineParser.ts" />
33

44
namespace ts {
5-
describe("convertTypingOptionsFromJson", () => {
6-
function assertTypingOptions(json: any, configFileName: string, expectedResult: { typingOptions: TypingOptions, errors: Diagnostic[] }) {
7-
const { options: actualTypingOptions, errors: actualErrors } = convertTypingOptionsFromJson(json["typingOptions"], "/apath/", configFileName);
8-
const parsedTypingOptions = JSON.stringify(actualTypingOptions);
9-
const expectedTypingOptions = JSON.stringify(expectedResult.typingOptions);
10-
assert.equal(parsedTypingOptions, expectedTypingOptions);
5+
describe("convertTypeAcquisitionFromJson", () => {
6+
function assertTypeAcquisition(json: any, configFileName: string, expectedResult: { typeAcquisition: TypeAcquisition, errors: Diagnostic[] }) {
7+
const { options: actualTypeAcquisition, errors: actualErrors } = convertTypeAcquisitionFromJson(json["typeAcquisition"], "/apath/", configFileName);
8+
const parsedTypeAcquisition = JSON.stringify(actualTypeAcquisition);
9+
const expectedTypeAcquisition = JSON.stringify(expectedResult.typeAcquisition);
10+
assert.equal(parsedTypeAcquisition, expectedTypeAcquisition);
1111

1212
const expectedErrors = expectedResult.errors;
1313
assert.isTrue(expectedResult.errors.length === actualErrors.length, `Expected error: ${JSON.stringify(expectedResult.errors)}. Actual error: ${JSON.stringify(actualErrors)}.`);
@@ -21,20 +21,20 @@ namespace ts {
2121

2222
// tsconfig.json
2323
it("Convert correctly format tsconfig.json to typing-options ", () => {
24-
assertTypingOptions(
24+
assertTypeAcquisition(
2525
{
26-
"typingOptions":
26+
"typeAcquisition":
2727
{
28-
"enableAutoDiscovery": true,
28+
"enable": true,
2929
"include": ["0.d.ts", "1.d.ts"],
3030
"exclude": ["0.js", "1.js"]
3131
}
3232
},
3333
"tsconfig.json",
3434
{
35-
typingOptions:
35+
typeAcquisition:
3636
{
37-
enableAutoDiscovery: true,
37+
enable: true,
3838
include: ["0.d.ts", "1.d.ts"],
3939
exclude: ["0.js", "1.js"]
4040
},
@@ -43,24 +43,24 @@ namespace ts {
4343
});
4444

4545
it("Convert incorrect format tsconfig.json to typing-options ", () => {
46-
assertTypingOptions(
46+
assertTypeAcquisition(
4747
{
48-
"typingOptions":
48+
"typeAcquisition":
4949
{
5050
"enableAutoDiscovy": true,
5151
}
5252
}, "tsconfig.json",
5353
{
54-
typingOptions:
54+
typeAcquisition:
5555
{
56-
enableAutoDiscovery: false,
56+
enable: false,
5757
include: [],
5858
exclude: []
5959
},
6060
errors: [
6161
{
62-
category: Diagnostics.Unknown_typing_option_0.category,
63-
code: Diagnostics.Unknown_typing_option_0.code,
62+
category: Diagnostics.Unknown_type_acquisition_option_0.category,
63+
code: Diagnostics.Unknown_type_acquisition_option_0.code,
6464
file: undefined,
6565
start: 0,
6666
length: 0,
@@ -71,30 +71,30 @@ namespace ts {
7171
});
7272

7373
it("Convert default tsconfig.json to typing-options ", () => {
74-
assertTypingOptions({}, "tsconfig.json",
74+
assertTypeAcquisition({}, "tsconfig.json",
7575
{
76-
typingOptions:
76+
typeAcquisition:
7777
{
78-
enableAutoDiscovery: false,
78+
enable: false,
7979
include: [],
8080
exclude: []
8181
},
8282
errors: <Diagnostic[]>[]
8383
});
8484
});
8585

86-
it("Convert tsconfig.json with only enableAutoDiscovery property to typing-options ", () => {
87-
assertTypingOptions(
86+
it("Convert tsconfig.json with only enable property to typing-options ", () => {
87+
assertTypeAcquisition(
8888
{
89-
"typingOptions":
89+
"typeAcquisition":
9090
{
91-
"enableAutoDiscovery": true
91+
"enable": true
9292
}
9393
}, "tsconfig.json",
9494
{
95-
typingOptions:
95+
typeAcquisition:
9696
{
97-
enableAutoDiscovery: true,
97+
enable: true,
9898
include: [],
9999
exclude: []
100100
},
@@ -104,19 +104,19 @@ namespace ts {
104104

105105
// jsconfig.json
106106
it("Convert jsconfig.json to typing-options ", () => {
107-
assertTypingOptions(
107+
assertTypeAcquisition(
108108
{
109-
"typingOptions":
109+
"typeAcquisition":
110110
{
111-
"enableAutoDiscovery": false,
111+
"enable": false,
112112
"include": ["0.d.ts"],
113113
"exclude": ["0.js"]
114114
}
115115
}, "jsconfig.json",
116116
{
117-
typingOptions:
117+
typeAcquisition:
118118
{
119-
enableAutoDiscovery: false,
119+
enable: false,
120120
include: ["0.d.ts"],
121121
exclude: ["0.js"]
122122
},
@@ -125,11 +125,11 @@ namespace ts {
125125
});
126126

127127
it("Convert default jsconfig.json to typing-options ", () => {
128-
assertTypingOptions({ }, "jsconfig.json",
128+
assertTypeAcquisition({ }, "jsconfig.json",
129129
{
130-
typingOptions:
130+
typeAcquisition:
131131
{
132-
enableAutoDiscovery: true,
132+
enable: true,
133133
include: [],
134134
exclude: []
135135
},
@@ -138,24 +138,24 @@ namespace ts {
138138
});
139139

140140
it("Convert incorrect format jsconfig.json to typing-options ", () => {
141-
assertTypingOptions(
141+
assertTypeAcquisition(
142142
{
143-
"typingOptions":
143+
"typeAcquisition":
144144
{
145145
"enableAutoDiscovy": true,
146146
}
147147
}, "jsconfig.json",
148148
{
149-
typingOptions:
149+
typeAcquisition:
150150
{
151-
enableAutoDiscovery: true,
151+
enable: true,
152152
include: [],
153153
exclude: []
154154
},
155155
errors: [
156156
{
157157
category: Diagnostics.Unknown_compiler_option_0.category,
158-
code: Diagnostics.Unknown_typing_option_0.code,
158+
code: Diagnostics.Unknown_type_acquisition_option_0.code,
159159
file: undefined,
160160
start: 0,
161161
length: 0,
@@ -165,18 +165,18 @@ namespace ts {
165165
});
166166
});
167167

168-
it("Convert jsconfig.json with only enableAutoDiscovery property to typing-options ", () => {
169-
assertTypingOptions(
168+
it("Convert jsconfig.json with only enable property to typing-options ", () => {
169+
assertTypeAcquisition(
170170
{
171-
"typingOptions":
171+
"typeAcquisition":
172172
{
173-
"enableAutoDiscovery": false
173+
"enable": false
174174
}
175175
}, "jsconfig.json",
176176
{
177-
typingOptions:
177+
typeAcquisition:
178178
{
179-
enableAutoDiscovery: false,
179+
enable: false,
180180
include: [],
181181
exclude: []
182182
},

‎src/harness/unittests/tsserverProjectSystem.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ namespace ts.projectSystem {
9090
this.projectService.updateTypingsForProject(response);
9191
}
9292

93-
enqueueInstallTypingsRequest(project: server.Project, typingOptions: TypingOptions, unresolvedImports: server.SortedReadonlyArray<string>) {
94-
const request = server.createInstallTypingsRequest(project, typingOptions, unresolvedImports, this.globalTypingsCacheLocation);
93+
enqueueInstallTypingsRequest(project: server.Project, typeAcquisition: TypeAcquisition, unresolvedImports: server.SortedReadonlyArray<string>) {
94+
const request = server.createInstallTypingsRequest(project, typeAcquisition, unresolvedImports, this.globalTypingsCacheLocation);
9595
this.install(request);
9696
}
9797

@@ -1726,8 +1726,8 @@ namespace ts.projectSystem {
17261726
options: {}
17271727
});
17281728
projectService.checkNumberOfProjects({ externalProjects: 1 });
1729-
const typingOptions = projectService.externalProjects[0].getTypingOptions();
1730-
assert.isTrue(typingOptions.enableAutoDiscovery, "Typing autodiscovery should be enabled");
1729+
const typeAcquisition = projectService.externalProjects[0].getTypeAcquisition();
1730+
assert.isTrue(typeAcquisition.enable, "Typine acquisition should be enabled");
17311731
});
17321732
});
17331733

0 commit comments

Comments
 (0)