Address PR

Author: Kanchalai Tanglertsampan

src/compiler/commandLineParser.ts

@@ -478,7 +478,7 @@ namespace ts {
  }
  }
 
- function parseListTypeOption(opt: CommandLineOptionOfListType, value: string): (number | string)[] {
+ function parseListTypeOption(opt: CommandLineOptionOfListType, value: string): (string | number)[] {
  const values = (value || "").trim().split(",");
  switch (opt.element.type) {
  case "number":
@@ -590,9 +590,9 @@ namespace ts {
  */
  export function parseJsonConfigFileContent(json: any, host: ParseConfigHost, basePath: string, existingOptions: CompilerOptions = {}, configFileName?: string): ParsedCommandLine {
  const errors: Diagnostic[] = [];
- const compilerOptions: CompilerOptions = convertCompilerOptionsFromJson(optionDeclarations, json["compilerOptions"], basePath, configFileName, errors);
+ const compilerOptions: CompilerOptions = convertCompilerOptionsFromJson(optionDeclarations, json["compilerOptions"], basePath, errors, configFileName);
  const options = extend(existingOptions, compilerOptions);
- const typingOptions: TypingOptions = convertTypingOptionsFromJson(typingOptionDeclarations, json["typingOptions"], basePath, configFileName, errors);
+ const typingOptions: TypingOptions = convertTypingOptionsFromJson(typingOptionDeclarations, json["typingOptions"], basePath, errors, configFileName);
 
  const fileNames = getFileNames(errors);
 
@@ -667,27 +667,27 @@ namespace ts {
  }
 
  /* @internal */
- export function convertCompilerOptionsFromJson(optionsDeclarations: CommandLineOption[], jsonOptions: any, basePath: string,
- configFileName: string, errors: Diagnostic[]): CompilerOptions {
+ export function convertCompilerOptionsFromJson(optionsDeclarations: CommandLineOption[], jsonOptions: any,
+ basePath: string, errors: Diagnostic[], configFileName?: string): CompilerOptions {
 
  const options: CompilerOptions = getBaseFileName(configFileName) === "jsconfig.json" ? { allowJs: true } : {};
- convertOptionsFromJson<CompilerOptions>(optionDeclarations, jsonOptions, basePath, configFileName, options, Diagnostics.Unknown_compiler_option_0, errors);
+ convertOptionsFromJson<CompilerOptions>(optionDeclarations, jsonOptions, basePath, options, Diagnostics.Unknown_compiler_option_0, errors);
  return options;
  }
 
  /* @internal */
- export function convertTypingOptionsFromJson(optionsDeclarations: CommandLineOption[], jsonOptions: any, basePath: string,
- configFileName: string, errors: Diagnostic[]): TypingOptions {
+ export function convertTypingOptionsFromJson(optionsDeclarations: CommandLineOption[], jsonOptions: any,
+ basePath: string, errors: Diagnostic[], configFileName?: string): TypingOptions {
 
  const options: TypingOptions = getBaseFileName(configFileName) === "jsconfig.json"
  ? { enableAutoDiscovery: true, include: [], exclude: [] }
  : { enableAutoDiscovery: false, include: [], exclude: [] };
- convertOptionsFromJson<TypingOptions>(typingOptionDeclarations, jsonOptions, basePath, configFileName, options, Diagnostics.Unknown_typing_option_0, errors);
+ convertOptionsFromJson<TypingOptions>(typingOptionDeclarations, jsonOptions, basePath, options, Diagnostics.Unknown_typing_option_0, errors);
  return options;
  }
 
  function convertOptionsFromJson<T extends CompilerOptions | TypingOptions>(optionDeclarations: CommandLineOption[], jsonOptions: any, basePath: string,
- configFileName: string, defaultOptions: T, diagnosticMessage: DiagnosticMessage, errors: Diagnostic[]) {
+ defaultOptions: T, diagnosticMessage: DiagnosticMessage, errors: Diagnostic[]) {
 
  if (!jsonOptions) {
  return ;
@@ -706,7 +706,7 @@ namespace ts {
  }
  }
 
- function convertJsonOption(opt: CommandLineOption, value: any, basePath: string, errors: Diagnostic[]): number | string | number[] | string[] {
+ function convertJsonOption(opt: CommandLineOption, value: any, basePath: string, errors: Diagnostic[]): CompilerOptionsValue {
  const optType = opt.type;
  const expectedType = typeof optType === "string" ? optType : "string";
  if (optType === "list" && isArray(value)) {

src/compiler/types.ts

@@ -2381,6 +2381,8 @@ namespace ts {
  export type PathSubstitutions = Map<string[]>;
  export type TsConfigOnlyOptions = RootPaths | PathSubstitutions;
 
+ export type CompilerOptionsValue = string | number | boolean | (string | number)[] | TsConfigOnlyOptions;
+
  export interface CompilerOptions {
  allowNonTsExtensions?: boolean;
  charset?: string;
@@ -2447,7 +2449,7 @@ namespace ts {
 
  list?: string[];
 
- [option: string]: string | number | boolean | TsConfigOnlyOptions | (string | number)[];
+ [option: string]: CompilerOptionsValue;
  }
 
  export interface TypingOptions {

tests/cases/unittests/convertCompilerOptionsFromJson.ts

@@ -5,7 +5,7 @@ namespace ts {
  describe('convertCompilerOptionsFromJson', () => {
  function assertCompilerOptions(json: any, configFileName: string, expectedResult: { compilerOptions: CompilerOptions, errors: Diagnostic[] }) {
  const actualErrors: Diagnostic[] = [];
- const actualCompilerOptions: CompilerOptions = convertCompilerOptionsFromJson(optionDeclarations, json["compilerOptions"], "/apath/", configFileName, actualErrors);
+ const actualCompilerOptions: CompilerOptions = convertCompilerOptionsFromJson(optionDeclarations, json["compilerOptions"], "/apath/", actualErrors, configFileName);
 
  const parsedCompilerOptions = JSON.stringify(actualCompilerOptions);
  const expectedCompilerOptions = JSON.stringify(expectedResult.compilerOptions);

tests/cases/unittests/convertTypingOptionsFromJson.ts

@@ -5,7 +5,7 @@ namespace ts {
  describe('convertTypingOptionsFromJson', () => {
  function assertTypingOptions(json: any, configFileName: string, expectedResult: { typingOptions: TypingOptions, errors: Diagnostic[] }) {
  const actualErrors: Diagnostic[] = [];
- const actualTypingOptions = convertTypingOptionsFromJson(typingOptionDeclarations, json["typingOptions"], "/apath/", configFileName, actualErrors);
+ const actualTypingOptions = convertTypingOptionsFromJson(typingOptionDeclarations, json["typingOptions"], "/apath/", actualErrors, configFileName);
  const parsedTypingOptions = JSON.stringify(actualTypingOptions);
  const expectedTypingOptions = JSON.stringify(expectedResult.typingOptions);
  assert.equal(parsedTypingOptions, expectedTypingOptions);