Add s to importsNotUsedAsValue (microsoft#36037)

* Pluralize end of 'importsNotUsedAsValue'.

* Updated baselines.

Author: DanielRosenwasser

src/compiler/checker.ts

@@ -33134,12 +33134,12 @@ namespace ts {
                     importClauseContainsReferencedImport(statement.importClause) &&
                     !isReferencedAliasDeclaration(statement.importClause, /*checkChildren*/ true)
                 ) {
-                    const isError = compilerOptions.importsNotUsedAsValue === ImportsNotUsedAsValue.Error;
+                    const isError = compilerOptions.importsNotUsedAsValues === importsNotUsedAsValues.Error;
                     errorOrSuggestion(
                         isError,
                         statement,
                         isError
-                            ? Diagnostics.This_import_is_never_used_as_a_value_and_must_use_import_type_because_the_importsNotUsedAsValue_is_set_to_error
+                            ? Diagnostics.This_import_is_never_used_as_a_value_and_must_use_import_type_because_the_importsNotUsedAsValues_is_set_to_error
                             : Diagnostics.This_import_may_be_converted_to_a_type_only_import);
                 }
             }

src/compiler/commandLineParser.ts

@@ -473,11 +473,11 @@ namespace ts {
             description: Diagnostics.Import_emit_helpers_from_tslib
         },
         {
-            name: "importsNotUsedAsValue",
+            name: "importsNotUsedAsValues",
             type: createMapFromTemplate({
-                remove: ImportsNotUsedAsValue.Remove,
-                preserve: ImportsNotUsedAsValue.Preserve,
-                error: ImportsNotUsedAsValue.Error
+                remove: importsNotUsedAsValues.Remove,
+                preserve: importsNotUsedAsValues.Preserve,
+                error: importsNotUsedAsValues.Error
             }),
             affectsEmit: true,
             category: Diagnostics.Advanced_Options,

src/compiler/diagnosticMessages.json

@@ -1099,7 +1099,7 @@
         "category": "Error",
         "code": 1370
     },
-    "This import is never used as a value and must use 'import type' because the 'importsNotUsedAsValue' is set to 'error'.": {
+    "This import is never used as a value and must use 'import type' because the 'importsNotUsedAsValues' is set to 'error'.": {
         "category": "Error",
         "code": 1371
     },

src/compiler/transformers/ts.ts

@@ -2760,7 +2760,7 @@ namespace ts {
         }
 
         /**
-         * Visits an import declaration, eliding it if it is not referenced and `importsNotUsedAsValue` is not 'preserve'.
+         * Visits an import declaration, eliding it if it is not referenced and `importsNotUsedAsValues` is not 'preserve'.
          *
          * @param node The import declaration node.
          */
@@ -2778,8 +2778,8 @@ namespace ts {
             // Elide the declaration if the import clause was elided.
             const importClause = visitNode(node.importClause, visitImportClause, isImportClause);
             return importClause ||
-                compilerOptions.importsNotUsedAsValue === ImportsNotUsedAsValue.Preserve ||
-                compilerOptions.importsNotUsedAsValue === ImportsNotUsedAsValue.Error
+                compilerOptions.importsNotUsedAsValues === importsNotUsedAsValues.Preserve ||
+                compilerOptions.importsNotUsedAsValues === importsNotUsedAsValues.Error
                 ? updateImportDeclaration(
                     node,
                     /*decorators*/ undefined,
@@ -2931,7 +2931,7 @@ namespace ts {
             if (isExternalModuleImportEqualsDeclaration(node)) {
                 const isReferenced = resolver.isReferencedAliasDeclaration(node);
                 // If the alias is unreferenced but we want to keep the import, replace with 'import "mod"'.
-                if (!isReferenced && compilerOptions.importsNotUsedAsValue === ImportsNotUsedAsValue.Preserve) {
+                if (!isReferenced && compilerOptions.importsNotUsedAsValues === importsNotUsedAsValues.Preserve) {
                     return setOriginalNode(
                         setTextRange(
                             createImportDeclaration(

src/compiler/types.ts

@@ -5043,7 +5043,7 @@ namespace ts {
         /*@internal*/generateCpuProfile?: string;
         /*@internal*/help?: boolean;
         importHelpers?: boolean;
-        importsNotUsedAsValue?: ImportsNotUsedAsValue;
+        importsNotUsedAsValues?: importsNotUsedAsValues;
         /*@internal*/init?: boolean;
         inlineSourceMap?: boolean;
         inlineSources?: boolean;
@@ -5165,7 +5165,7 @@ namespace ts {
         ReactNative = 3
     }
 
-    export const enum ImportsNotUsedAsValue {
+    export const enum importsNotUsedAsValues {
         Remove,
         Preserve,
         Error

tests/baselines/reference/api/tsserverlibrary.d.ts

@@ -2651,7 +2651,7 @@ declare namespace ts {
         experimentalDecorators?: boolean;
         forceConsistentCasingInFileNames?: boolean;
         importHelpers?: boolean;
-        importsNotUsedAsValue?: ImportsNotUsedAsValue;
+        importsNotUsedAsValues?: importsNotUsedAsValues;
         inlineSourceMap?: boolean;
         inlineSources?: boolean;
         isolatedModules?: boolean;
@@ -2750,7 +2750,7 @@ declare namespace ts {
         React = 2,
         ReactNative = 3
     }
-    export enum ImportsNotUsedAsValue {
+    export enum importsNotUsedAsValues {
         Remove = 0,
         Preserve = 1,
         Error = 2

tests/baselines/reference/api/typescript.d.ts

@@ -2651,7 +2651,7 @@ declare namespace ts {
         experimentalDecorators?: boolean;
         forceConsistentCasingInFileNames?: boolean;
         importHelpers?: boolean;
-        importsNotUsedAsValue?: ImportsNotUsedAsValue;
+        importsNotUsedAsValues?: importsNotUsedAsValues;
         inlineSourceMap?: boolean;
         inlineSources?: boolean;
         isolatedModules?: boolean;
@@ -2750,7 +2750,7 @@ declare namespace ts {
         React = 2,
         ReactNative = 3
     }
-    export enum ImportsNotUsedAsValue {
+    export enum importsNotUsedAsValues {
         Remove = 0,
         Preserve = 1,
         Error = 2

tests/baselines/reference/importsNotUsedAsValue_error.errors.txt renamed to tests/baselines/reference/importsNotUsedAsValues_error.errors.txt

@@ -1,5 +1,5 @@
-/b.ts(1,1): error TS1371: This import is never used as a value and must use 'import type' because the 'importsNotUsedAsValue' is set to 'error'.
-/c.ts(1,1): error TS1371: This import is never used as a value and must use 'import type' because the 'importsNotUsedAsValue' is set to 'error'.
+/b.ts(1,1): error TS1371: This import is never used as a value and must use 'import type' because the 'importsNotUsedAsValues' is set to 'error'.
+/c.ts(1,1): error TS1371: This import is never used as a value and must use 'import type' because the 'importsNotUsedAsValues' is set to 'error'.
 /e.ts(1,1): error TS6192: All imports in import declaration are unused.
 
 
@@ -11,15 +11,15 @@
 ==== /b.ts (1 errors) ====
     import { A, B } from './a'; // Error
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS1371: This import is never used as a value and must use 'import type' because the 'importsNotUsedAsValue' is set to 'error'.
+!!! error TS1371: This import is never used as a value and must use 'import type' because the 'importsNotUsedAsValues' is set to 'error'.
     let a: A;
     let b: B;
     console.log(a, b);
 
 ==== /c.ts (1 errors) ====
     import Default, * as named from './a'; // Error
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS1371: This import is never used as a value and must use 'import type' because the 'importsNotUsedAsValue' is set to 'error'.
+!!! error TS1371: This import is never used as a value and must use 'import type' because the 'importsNotUsedAsValues' is set to 'error'.
     let a: Default;
     let b: named.B;
     console.log(a, b);

tests/baselines/reference/importsNotUsedAsValue_error.js renamed to tests/baselines/reference/importsNotUsedAsValues_error.js

@@ -1,4 +1,4 @@
-//// [tests/cases/conformance/externalModules/typeOnly/importsNotUsedAsValue_error.ts] ////
+//// [tests/cases/conformance/externalModules/typeOnly/importsNotUsedAsValues_error.ts] ////
 
 //// [a.ts]
 export default class {}