Removed string | list type implementation

Author: navya9singh

src/compiler/commandLineParser.ts

@@ -1664,7 +1664,7 @@ export function parseListTypeOption(opt: CommandLineOptionOfListType, value = ""
     if (startsWith(value, "-")) {
         return undefined;
     }
-    if (opt.type === "string | list" && !stringContains(value, ",")) {
+    if (opt.type === "listOrElement" && !stringContains(value, ",")) {
         return validateJsonOptionValue(opt, value, errors);
     }
     if (value === "") {
@@ -1678,7 +1678,7 @@ export function parseListTypeOption(opt: CommandLineOptionOfListType, value = ""
             return mapDefined(values, v => validateJsonOptionValue(opt.element, v || "", errors));
         case "boolean":
         case "object":
-        case "string | list":
+        case "listOrElement":
             return Debug.fail(`List of ${opt.element.type} is not yet supported.`);
         default:
             return mapDefined(values, v => parseCustomTypeOption(opt.element as CommandLineOptionOfCustomType, v, errors));
@@ -1851,7 +1851,6 @@ function parseOptionValue(
                     options[opt.name] = validateJsonOptionValue(opt, args[i] || "", errors);
                     i++;
                     break;
-                case "string | list":
                 case "list":
                     const result = parseListTypeOption(opt, args[i], errors);
                     options[opt.name] = result || [];
@@ -2371,7 +2370,7 @@ export function convertToObjectWorker(
                 if (!isDoubleQuotedString(valueExpression)) {
                     errors.push(createDiagnosticForNodeInSourceFile(sourceFile, valueExpression, Diagnostics.String_literal_with_double_quotes_expected));
                 }
-                reportInvalidOptionValue(option && isString(option.type) && option.type !== "string" && (option.type !== "listOrElement" || (isString(option.element.type) && option.element.type !== "string")) && option.type !== "string | list");
+                reportInvalidOptionValue(option && isString(option.type) && option.type !== "string" && (option.type !== "listOrElement" || (isString(option.element.type) && option.element.type !== "string")));
                 const text = (valueExpression as StringLiteral).text;
                     if (option) {
                         Debug.assert(option.type !== "listOrElement" || option.element.type === "string", "Only string or array of string is handled for now");
@@ -2403,7 +2402,7 @@ export function convertToObjectWorker(
                 return validateValue(-Number(((valueExpression as PrefixUnaryExpression).operand as NumericLiteral).text));
 
             case SyntaxKind.ObjectLiteralExpression:
-                reportInvalidOptionValue(option && option.type !== "object" && (option.type !== "listOrElement" || option.element.type !== "object") && option.type !== "string | list");
+                reportInvalidOptionValue(option && option.type !== "object" && (option.type !== "listOrElement" || option.element.type !== "object"));
                 const objectLiteralExpression = valueExpression as ObjectLiteralExpression;
 
                 // Currently having element option declaration in the tsconfig with type "object"
@@ -2481,9 +2480,6 @@ function isCompilerOptionsValue(option: CommandLineOption | undefined, value: an
         if (option.type === "listOrElement") {
             return isArray(value) || isCompilerOptionsValue(option.element, value);
         }
-        if (option.type === "string | list") {
-            return typeof value === "string" || isArray(value);
-        }
         const expectedType = isString(option.type) ? option.type : "string";
         return typeof value === expectedType;
     }
@@ -2603,7 +2599,6 @@ function getCustomTypeMapOfCommandLineOption(optionDefinition: CommandLineOption
         case "number":
         case "boolean":
         case "object":
-        case "string | list":
             // this is of a type CommandLineOptionOfPrimitiveType
             return undefined;
         case "list":
@@ -3521,7 +3516,7 @@ function convertOptionsFromJson(optionsNameMap: Map<string, CommandLineOption>,
 export function convertJsonOption(opt: CommandLineOption, value: any, basePath: string, errors: Push<Diagnostic>): CompilerOptionsValue {
     if (isCompilerOptionsValue(opt, value)) {
         const optType = opt.type;
-        if ((optType === "list" || opt.type === "string | list") && isArray(value)) {
+        if ((optType === "list") && isArray(value)) {
             return convertJsonOptionOfListType(opt, value, basePath, errors);
         }
         else if (optType === "listOrElement") {
@@ -3975,7 +3970,6 @@ function getOptionValueWithEmptyStrings(value: any, option: CommandLineOption):
             if (!isArray(value)) return getOptionValueWithEmptyStrings(value, option.element);
             // fall through to list
         case "list":
-        case "string | list":
             const elementType = option.element;
             return isArray(value) ? value.map(v => getOptionValueWithEmptyStrings(v, elementType)) : "";
         default:
@@ -3995,7 +3989,6 @@ function getDefaultValueForOption(option: CommandLineOption): {} {
         case "boolean":
             return true;
         case "string":
-        case "string | list":
             const defaultValue = option.defaultValueDescription;
             return option.isFilePath ? `./${defaultValue && typeof defaultValue === "string" ? defaultValue : ""}` : "";
         case "list":

src/compiler/types.ts

@@ -6960,7 +6960,7 @@ export interface CreateProgramOptions {
 /** @internal */
 export interface CommandLineOptionBase {
     name: string;
-    type: "string" | "number" | "boolean" | "object" | "list" | "listOrElement" | "string | list" | Map<string, number | string> ;    // a value of a primitive type, or an object literal mapping named values to actual values
+    type: "string" | "number" | "boolean" | "object" | "list" | "listOrElement" | Map<string, number | string> ;    // a value of a primitive type, or an object literal mapping named values to actual values
     isFilePath?: boolean;                                   // True if option value is a path or fileName
     shortName?: string;                                     // A short mnemonic for convenience - for instance, 'h' can be used in place of 'help'
     description?: DiagnosticMessage;                        // The message describing what the command line switch does.
@@ -7030,7 +7030,7 @@ export interface TsConfigOnlyOption extends CommandLineOptionBase {
 
 /** @internal */
 export interface CommandLineOptionOfListType extends CommandLineOptionBase {
-    type: "list" | "listOrElement" | "string | list";
+    type: "list" | "listOrElement";
     element: CommandLineOptionOfCustomType | CommandLineOptionOfStringType | CommandLineOptionOfNumberType | CommandLineOptionOfBooleanType | TsConfigOnlyOption;
     listPreserveFalsyValues?: boolean;
 }

src/executeCommandLine/executeCommandLine.ts

@@ -372,7 +372,6 @@ function generateOptionOutput(sys: System, option: CommandLineOption, rightAlign
                 case "boolean":
                     return getDiagnosticText(Diagnostics.type_Colon);
                 case "list":
-                case "string | list":
                     return getDiagnosticText(Diagnostics.one_or_more_Colon);
                 default:
                     return getDiagnosticText(Diagnostics.one_of_Colon);
@@ -391,9 +390,6 @@ function generateOptionOutput(sys: System, option: CommandLineOption, rightAlign
                 case "listOrElement":
                     possibleValues = getPossibleValues(option.element);
                     break;
-                case "string | list":
-                    possibleValues = "string";
-                    break;
                 case "object":
                     possibleValues = "";
                     break;

src/harness/harnessIO.ts

@@ -380,7 +380,7 @@ export namespace Compiler {
             }
             // If not a primitive, the possible types are specified in what is effectively a map of options.
             case "list":
-            case "string | list":
+            case "listOrElement":
                 return ts.parseListTypeOption(option, value, errors);
             default:
                 return ts.parseCustomTypeOption(option as ts.CommandLineOptionOfCustomType, value, errors);

src/testRunner/unittests/config/showConfig.ts

@@ -126,24 +126,6 @@ describe("unittests:: config:: showConfig", () => {
         if (option.name === "project") return;
         let args: string[];
         let optionValue: object | undefined;
-        if (option.type === "string | list") {
-            if (option.isTSConfigOnly) {
-                showTSConfigCorrectly(
-                    `Shows tsconfig for single option/${option.name}WithStringValue`,
-                    ["-p", "tsconfig.json"],
-                    isCompilerOptions ?
-                        { compilerOptions: { [option.name]: "someString" } } :
-                        { watchOptions: { [option.name]: "someString" } }
-                );
-            }
-            else {
-                showTSConfigCorrectly(
-                    `Shows tsconfig for single option/${option.name}WithStringValue`,
-                    [`--${option.name}`, "someString"],
-                        /*configJson*/ undefined,
-                );
-            }
-        }
         switch (option.type) {
             case "boolean": {
                 if (option.isTSConfigOnly) {
@@ -155,7 +137,6 @@ describe("unittests:: config:: showConfig", () => {
                 }
                 break;
             }
-            case "string | list":
             case "list": {
                 if (option.isTSConfigOnly) {
                     args = ["-p", "tsconfig.json"];