Remove long deprecated typingOptions and enableAutoDiscovery (#52339)

sheetalkamat · web-flow · commit a097d55f817b · 2023-01-20T15:39:57.000-08:00
diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts
@@ -1617,14 +1617,6 @@ export const buildOpts: CommandLineOption[] = [
 
 /** @internal */
 export const typeAcquisitionDeclarations: CommandLineOption[] = [
-    {
-        /* @deprecated typingOptions.enableAutoDiscovery
-         * Use typeAcquisition.enable instead.
-         */
-        name: "enableAutoDiscovery",
-        type: "boolean",
-        defaultValueDescription: false,
-    },
     {
         name: "enable",
         type: "boolean",
@@ -1695,19 +1687,6 @@ export const defaultInitCompilerOptions: CompilerOptions = {
     skipLibCheck: true
 };
 
-/** @internal */
-export function convertEnableAutoDiscoveryToEnable(typeAcquisition: TypeAcquisition): TypeAcquisition {
-    // Convert deprecated typingOptions.enableAutoDiscovery to typeAcquisition.enable
-    if (typeAcquisition && typeAcquisition.enableAutoDiscovery !== undefined && typeAcquisition.enable === undefined) {
-        return {
-            enable: typeAcquisition.enableAutoDiscovery,
-            include: typeAcquisition.include || [],
-            exclude: typeAcquisition.exclude || []
-        };
-    }
-    return typeAcquisition;
-}
-
 /** @internal */
 export function createCompilerDiagnosticForInvalidCustomType(opt: CommandLineOptionOfCustomType): Diagnostic {
     return createDiagnosticForInvalidCustomType(opt, createCompilerDiagnostic);
@@ -2194,12 +2173,6 @@ function getTsconfigRootOptionsMap() {
                     elementOptions: getCommandLineWatchOptionsMap(),
                     extraKeyDiagnostics: watchOptionsDidYouMeanDiagnostics,
                 },
-                {
-                    name: "typingOptions",
-                    type: "object",
-                    elementOptions: getCommandLineTypeAcquisitionMap(),
-                    extraKeyDiagnostics: typeAcquisitionDidYouMeanDiagnostics,
-                },
                 {
                     name: "typeAcquisition",
                     type: "object",
@@ -3282,9 +3255,7 @@ function parseOwnConfigOfJson(
     }
 
     const options = convertCompilerOptionsFromJsonWorker(json.compilerOptions, basePath, errors, configFileName);
-    // typingOptions has been deprecated and is only supported for backward compatibility purposes.
-    // It should be removed in future releases - use typeAcquisition instead.
-    const typeAcquisition = convertTypeAcquisitionFromJsonWorker(json.typeAcquisition || json.typingOptions, basePath, errors, configFileName);
+    const typeAcquisition = convertTypeAcquisitionFromJsonWorker(json.typeAcquisition, basePath, errors, configFileName);
     const watchOptions = convertWatchOptionsFromJsonWorker(json.watchOptions, basePath, errors);
     json.compileOnSave = convertCompileOnSaveOptionFromJson(json, basePath, errors);
     let extendedConfigPath: string | string[] | undefined;
@@ -3322,7 +3293,7 @@ function parseOwnConfigOfJsonSourceFile(
     errors: Push<Diagnostic>
 ): ParsedTsconfig {
     const options = getDefaultCompilerOptions(configFileName);
-    let typeAcquisition: TypeAcquisition | undefined, typingOptionstypeAcquisition: TypeAcquisition | undefined;
+    let typeAcquisition: TypeAcquisition | undefined;
     let watchOptions: WatchOptions | undefined;
     let extendedConfigPath: string | string[] | undefined;
     let rootCompilerOptions: PropertyName[] | undefined;
@@ -3340,9 +3311,6 @@ function parseOwnConfigOfJsonSourceFile(
                 case "typeAcquisition":
                     currentOption = (typeAcquisition || (typeAcquisition = getDefaultTypeAcquisition(configFileName)));
                     break;
-                case "typingOptions":
-                    currentOption = (typingOptionstypeAcquisition || (typingOptionstypeAcquisition = getDefaultTypeAcquisition(configFileName)));
-                    break;
                 default:
                     Debug.fail("Unknown option");
             }
@@ -3394,18 +3362,7 @@ function parseOwnConfigOfJsonSourceFile(
     const json = convertConfigFileToObject(sourceFile, errors, /*reportOptionsErrors*/ true, optionsIterator);
 
     if (!typeAcquisition) {
-        if (typingOptionstypeAcquisition) {
-            typeAcquisition = (typingOptionstypeAcquisition.enableAutoDiscovery !== undefined) ?
-                {
-                    enable: typingOptionstypeAcquisition.enableAutoDiscovery,
-                    include: typingOptionstypeAcquisition.include,
-                    exclude: typingOptionstypeAcquisition.exclude
-                } :
-                typingOptionstypeAcquisition;
-        }
-        else {
-            typeAcquisition = getDefaultTypeAcquisition(configFileName);
-        }
+        typeAcquisition = getDefaultTypeAcquisition(configFileName);
     }
 
     if (rootCompilerOptions && json && json.compilerOptions === undefined) {
@@ -3539,9 +3496,7 @@ function convertTypeAcquisitionFromJsonWorker(jsonOptions: any,
     basePath: string, errors: Push<Diagnostic>, configFileName?: string): TypeAcquisition {
 
     const options = getDefaultTypeAcquisition(configFileName);
-    const typeAcquisition = convertEnableAutoDiscoveryToEnable(jsonOptions);
-
-    convertOptionsFromJson(getCommandLineTypeAcquisitionMap(), typeAcquisition, basePath, options, typeAcquisitionDidYouMeanDiagnostics, errors);
+    convertOptionsFromJson(getCommandLineTypeAcquisitionMap(), jsonOptions, basePath, options, typeAcquisitionDidYouMeanDiagnostics, errors);
     return options;
 }
 
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
@@ -7125,11 +7125,6 @@ export interface WatchOptions {
 }
 
 export interface TypeAcquisition {
-    /**
-     * @deprecated typingOptions.enableAutoDiscovery
-     * Use typeAcquisition.enable instead.
-     */
-    enableAutoDiscovery?: boolean;
     enable?: boolean;
     include?: string[];
     exclude?: string[];
diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts
@@ -65,7 +65,6 @@ import {
     contains,
     containsPath,
     convertCompilerOptionsForTelemetry,
-    convertEnableAutoDiscoveryToEnable,
     convertJsonOption,
     createCachedDirectoryStructureHost,
     createDocumentRegistryInternal,
@@ -4084,7 +4083,7 @@ export class ProjectService {
             }
             else {
                 let exclude = false;
-                if (typeAcquisition.enable || typeAcquisition.enableAutoDiscovery) {
+                if (typeAcquisition.enable) {
                     const baseName = getBaseFileName(toFileNameLowerCase(normalizedNames[i]));
                     if (fileExtensionIs(baseName, "js")) {
                         const inferredTypingName = removeFileExtension(baseName);
@@ -4119,12 +4118,6 @@ export class ProjectService {
     }
 
     openExternalProject(proj: protocol.ExternalProject): void {
-        // typingOptions has been deprecated and is only supported for backward compatibility
-        // purposes. It should be removed in future releases - use typeAcquisition instead.
-        if (proj.typingOptions && !proj.typeAcquisition) {
-            const typeAcquisition = convertEnableAutoDiscoveryToEnable(proj.typingOptions);
-            proj.typeAcquisition = typeAcquisition;
-        }
         proj.typeAcquisition = proj.typeAcquisition || {};
         proj.typeAcquisition.include = proj.typeAcquisition.include || [];
         proj.typeAcquisition.exclude = proj.typeAcquisition.exclude || [];
diff --git a/src/server/protocol.ts b/src/server/protocol.ts
@@ -1414,10 +1414,6 @@ export interface ExternalProject {
      * Compiler options for the project
      */
     options: ExternalProjectCompilerOptions;
-    /**
-     * @deprecated typingOptions. Use typeAcquisition instead
-     */
-    typingOptions?: TypeAcquisition;
     /**
      * Explicitly specified type acquisition for the project
      */
diff --git a/src/testRunner/unittests/config/convertTypeAcquisitionFromJson.ts b/src/testRunner/unittests/config/convertTypeAcquisitionFromJson.ts
@@ -32,7 +32,7 @@ describe("unittests:: config:: convertTypeAcquisitionFromJson", () => {
     }
 
     function assertTypeAcquisitionWithJson(json: any, configFileName: string, expectedResult: ExpectedResult) {
-        const jsonOptions = json.typeAcquisition || json.typingOptions;
+        const jsonOptions = json.typeAcquisition;
         const { options: actualTypeAcquisition, errors: actualErrors } = ts.convertTypeAcquisitionFromJson(jsonOptions, "/apath/", configFileName);
         verifyAcquisition(actualTypeAcquisition, expectedResult);
         verifyErrors(actualErrors, expectedResult);
@@ -51,30 +51,6 @@ describe("unittests:: config:: convertTypeAcquisitionFromJson", () => {
         verifyErrors(actualErrors, expectedResult, /*hasLocation*/ true);
     }
 
-    // tsconfig.json
-    it("Convert deprecated typingOptions.enableAutoDiscovery format tsconfig.json to typeAcquisition ", () => {
-        assertTypeAcquisition(
-            {
-                typingOptions:
-                {
-                    enableAutoDiscovery: true,
-                    include: ["0.d.ts", "1.d.ts"],
-                    exclude: ["0.js", "1.js"]
-                }
-            },
-            "tsconfig.json",
-            {
-                typeAcquisition:
-                {
-                    enable: true,
-                    include: ["0.d.ts", "1.d.ts"],
-                    exclude: ["0.js", "1.js"]
-                },
-                errors: [] as ts.Diagnostic[]
-            }
-        );
-    });
-
     it("Convert correctly format tsconfig.json to typeAcquisition ", () => {
         assertTypeAcquisition(
             {
@@ -114,8 +90,8 @@ describe("unittests:: config:: convertTypeAcquisitionFromJson", () => {
                 },
                 errors: [
                     {
-                        category: ts.Diagnostics.Unknown_type_acquisition_option_0_Did_you_mean_1.category,
-                        code: ts.Diagnostics.Unknown_type_acquisition_option_0_Did_you_mean_1.code,
+                        category: ts.Diagnostics.Unknown_type_acquisition_option_0.category,
+                        code: ts.Diagnostics.Unknown_type_acquisition_option_0.code,
                         file: undefined,
                         start: 0,
                         length: 0,
@@ -209,8 +185,8 @@ describe("unittests:: config:: convertTypeAcquisitionFromJson", () => {
                 },
                 errors: [
                     {
-                        category: ts.Diagnostics.Unknown_type_acquisition_option_0_Did_you_mean_1.category,
-                        code: ts.Diagnostics.Unknown_type_acquisition_option_0_Did_you_mean_1.code,
+                        category: ts.Diagnostics.Unknown_type_acquisition_option_0.category,
+                        code: ts.Diagnostics.Unknown_type_acquisition_option_0.code,
                         file: undefined,
                         start: 0,
                         length: 0,
diff --git a/src/testRunner/unittests/tsserver/telemetry.ts b/src/testRunner/unittests/tsserver/telemetry.ts
@@ -200,7 +200,6 @@ describe("unittests:: tsserver:: project telemetry", () => {
             compilerOptions: {},
             typeAcquisition: {
                 enable: true,
-                enableAutoDiscovery: false,
                 include: ["hunter2", "hunter3"],
                 exclude: [],
             },
diff --git a/tests/baselines/reference/api/tsserverlibrary.d.ts b/tests/baselines/reference/api/tsserverlibrary.d.ts
@@ -1144,10 +1144,6 @@ declare namespace ts {
                  * Compiler options for the project
                  */
                 options: ExternalProjectCompilerOptions;
-                /**
-                 * @deprecated typingOptions. Use typeAcquisition instead
-                 */
-                typingOptions?: TypeAcquisition;
                 /**
                  * Explicitly specified type acquisition for the project
                  */
@@ -7145,11 +7141,6 @@ declare namespace ts {
         [option: string]: CompilerOptionsValue | undefined;
     }
     interface TypeAcquisition {
-        /**
-         * @deprecated typingOptions.enableAutoDiscovery
-         * Use typeAcquisition.enable instead.
-         */
-        enableAutoDiscovery?: boolean;
         enable?: boolean;
         include?: string[];
         exclude?: string[];
diff --git a/tests/baselines/reference/api/typescript.d.ts b/tests/baselines/reference/api/typescript.d.ts
@@ -3166,11 +3166,6 @@ declare namespace ts {
         [option: string]: CompilerOptionsValue | undefined;
     }
     interface TypeAcquisition {
-        /**
-         * @deprecated typingOptions.enableAutoDiscovery
-         * Use typeAcquisition.enable instead.
-         */
-        enableAutoDiscovery?: boolean;
         enable?: boolean;
         include?: string[];
         exclude?: string[];
