declarationMaps -> declarationMap

microsoft · weswigham · Mar 26, 2018 · Feb 15, 2018 · Feb 17, 2018 · Mar 16, 2018
commit c7a52967e887e9a882c48bcc075d2f3fbb32f164
diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts
@@ -195,7 +195,7 @@ namespace ts {
             description: Diagnostics.Generates_corresponding_d_ts_file,
         },
         {
-            name: "declarationMaps",
+            name: "declarationMap",
             type: "boolean",
             showInSimplifiedHelpView: true,
             category: Diagnostics.Basic_Options,

diff --git a/src/compiler/core.ts b/src/compiler/core.ts
@@ -2066,7 +2066,7 @@ namespace ts {
     }
 
     export function getAreDeclarationMapsEnabled(options: CompilerOptions) {
-        return !!(options.declaration && options.declarationMaps);
+        return !!(options.declaration && options.declarationMap);
     }
 
     export function getAllowSyntheticDefaultImports(compilerOptions: CompilerOptions) {

diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
@@ -97,7 +97,7 @@ namespace ts {
         const writer = createTextWriter(newLine);
         const sourceMap = createSourceMapWriter(host, writer);
         const declarationSourceMap = createSourceMapWriter(host, writer, {
-            sourceMap: compilerOptions.declarationMaps,
+            sourceMap: compilerOptions.declarationMap,
             sourceRoot: compilerOptions.sourceRoot,
             mapRoot: compilerOptions.mapRoot,
             extendedDiagnostics: compilerOptions.extendedDiagnostics,

diff --git a/src/compiler/program.ts b/src/compiler/program.ts
@@ -2111,9 +2111,9 @@ namespace ts {
                 createDiagnosticForOptionName(Diagnostics.Option_0_cannot_be_specified_with_option_1, "out", "outFile");
             }
 
-            if (options.mapRoot && !(options.sourceMap || options.declarationMaps)) {
+            if (options.mapRoot && !(options.sourceMap || options.declarationMap)) {
                 // Error to specify --mapRoot without --sourcemap
-                createDiagnosticForOptionName(Diagnostics.Option_0_cannot_be_specified_without_specifying_option_1_or_option_2, "mapRoot", "sourceMap", "declarationMaps");
+                createDiagnosticForOptionName(Diagnostics.Option_0_cannot_be_specified_without_specifying_option_1_or_option_2, "mapRoot", "sourceMap", "declarationMap");
             }
 
             if (options.declarationDir) {
@@ -2125,8 +2125,8 @@ namespace ts {
                 }
             }
 
-            if (options.declarationMaps && !options.declaration) {
-                createDiagnosticForOptionName(Diagnostics.Option_0_cannot_be_specified_without_specifying_option_1, "declarationMaps", "declaration");
+            if (options.declarationMap && !options.declaration) {
+                createDiagnosticForOptionName(Diagnostics.Option_0_cannot_be_specified_without_specifying_option_1, "declarationMap", "declaration");
             }
 
             if (options.lib && options.noLib) {

diff --git a/src/compiler/types.ts b/src/compiler/types.ts
@@ -4097,7 +4097,7 @@ namespace ts {
         /** configFile is set as non enumerable property so as to avoid checking of json source files */
         /* @internal */ readonly configFile?: JsonSourceFile;
         declaration?: boolean;
-        declarationMaps?: boolean;
+        declarationMap?: boolean;
         emitDeclarationOnly?: boolean;
         declarationDir?: string;
         /* @internal */ diagnostics?: boolean;

diff --git a/src/harness/compilerRunner.ts b/src/harness/compilerRunner.ts
@@ -148,7 +148,7 @@ class CompilerBaselineRunner extends RunnerBase {
 
             // Source maps?
             it("Correct sourcemap content for " + fileName, () => {
-                if (options.sourceMap || options.inlineSourceMap || options.declarationMaps) {
+                if (options.sourceMap || options.inlineSourceMap || options.declarationMap) {
                     Harness.Baseline.runBaseline(justName.replace(/\.tsx?$/, ".sourcemap.txt"), () => {
                         const record = result.getSourceMapRecord();
                         if ((options.noEmitOnError && result.errors.length !== 0) || record === undefined) {

diff --git a/tests/baselines/reference/api/tsserverlibrary.d.ts b/tests/baselines/reference/api/tsserverlibrary.d.ts
@@ -2302,7 +2302,7 @@ declare namespace ts {
         charset?: string;
         checkJs?: boolean;
         declaration?: boolean;
-        declarationMaps?: boolean;
+        declarationMap?: boolean;
         emitDeclarationOnly?: boolean;
         declarationDir?: string;
         disableSizeLimit?: boolean;

diff --git a/tests/baselines/reference/api/typescript.d.ts b/tests/baselines/reference/api/typescript.d.ts
@@ -2302,7 +2302,7 @@ declare namespace ts {
         charset?: string;
         checkJs?: boolean;
         declaration?: boolean;
-        declarationMaps?: boolean;
+        declarationMap?: boolean;
         emitDeclarationOnly?: boolean;
         declarationDir?: string;
         disableSizeLimit?: boolean;

diff --git a/tests/baselines/reference/declarationMapsWithoutDeclaration.errors.txt b/tests/baselines/reference/declarationMapsWithoutDeclaration.errors.txt
@@ -1,7 +1,7 @@
-error TS5052: Option 'declarationMaps' cannot be specified without specifying option 'declaration'.
+error TS5052: Option 'declarationMap' cannot be specified without specifying option 'declaration'.
 
 
-!!! error TS5052: Option 'declarationMaps' cannot be specified without specifying option 'declaration'.
+!!! error TS5052: Option 'declarationMap' cannot be specified without specifying option 'declaration'.
 ==== tests/cases/compiler/declarationMapsWithoutDeclaration.ts (0 errors) ====
     module m2 {
         export interface connectModule {

diff --git a/tests/baselines/reference/optionsInlineSourceMapMapRoot.errors.txt b/tests/baselines/reference/optionsInlineSourceMapMapRoot.errors.txt
@@ -1,8 +1,8 @@
 error TS5053: Option 'mapRoot' cannot be specified with option 'inlineSourceMap'.
-error TS5069: Option 'mapRoot' cannot be specified without specifying option 'sourceMap' or option 'declarationMaps'.
+error TS5069: Option 'mapRoot' cannot be specified without specifying option 'sourceMap' or option 'declarationMap'.
 
 
 !!! error TS5053: Option 'mapRoot' cannot be specified with option 'inlineSourceMap'.
-!!! error TS5069: Option 'mapRoot' cannot be specified without specifying option 'sourceMap' or option 'declarationMaps'.
+!!! error TS5069: Option 'mapRoot' cannot be specified without specifying option 'sourceMap' or option 'declarationMap'.
 ==== tests/cases/compiler/optionsInlineSourceMapMapRoot.ts (0 errors) ====
     var a = 10;
diff --git a/...RootSourceRootWithNoSourceMapOption/amd/mapRootSourceRootWithNoSourceMapOption.errors.txt b/...RootSourceRootWithNoSourceMapOption/amd/mapRootSourceRootWithNoSourceMapOption.errors.txt
@@ -1,9 +1,9 @@
 error TS5051: Option 'sourceRoot can only be used when either option '--inlineSourceMap' or option '--sourceMap' is provided.
-error TS5069: Option 'mapRoot' cannot be specified without specifying option 'sourceMap' or option 'declarationMaps'.
+error TS5069: Option 'mapRoot' cannot be specified without specifying option 'sourceMap' or option 'declarationMap'.
 
 
 !!! error TS5051: Option 'sourceRoot can only be used when either option '--inlineSourceMap' or option '--sourceMap' is provided.
-!!! error TS5069: Option 'mapRoot' cannot be specified without specifying option 'sourceMap' or option 'declarationMaps'.
+!!! error TS5069: Option 'mapRoot' cannot be specified without specifying option 'sourceMap' or option 'declarationMap'.
 ==== m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {

diff --git a/...ootSourceRootWithNoSourceMapOption/node/mapRootSourceRootWithNoSourceMapOption.errors.txt b/...ootSourceRootWithNoSourceMapOption/node/mapRootSourceRootWithNoSourceMapOption.errors.txt
@@ -1,9 +1,9 @@
 error TS5051: Option 'sourceRoot can only be used when either option '--inlineSourceMap' or option '--sourceMap' is provided.
-error TS5069: Option 'mapRoot' cannot be specified without specifying option 'sourceMap' or option 'declarationMaps'.
+error TS5069: Option 'mapRoot' cannot be specified without specifying option 'sourceMap' or option 'declarationMap'.
 
 
 !!! error TS5051: Option 'sourceRoot can only be used when either option '--inlineSourceMap' or option '--sourceMap' is provided.
-!!! error TS5069: Option 'mapRoot' cannot be specified without specifying option 'sourceMap' or option 'declarationMaps'.
+!!! error TS5069: Option 'mapRoot' cannot be specified without specifying option 'sourceMap' or option 'declarationMap'.
 ==== m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {

diff --git a/...eference/project/mapRootWithNoSourceMapOption/amd/mapRootWithNoSourceMapOption.errors.txt b/...eference/project/mapRootWithNoSourceMapOption/amd/mapRootWithNoSourceMapOption.errors.txt
@@ -1,7 +1,7 @@
-error TS5069: Option 'mapRoot' cannot be specified without specifying option 'sourceMap' or option 'declarationMaps'.
+error TS5069: Option 'mapRoot' cannot be specified without specifying option 'sourceMap' or option 'declarationMap'.
 
 
-!!! error TS5069: Option 'mapRoot' cannot be specified without specifying option 'sourceMap' or option 'declarationMaps'.
+!!! error TS5069: Option 'mapRoot' cannot be specified without specifying option 'sourceMap' or option 'declarationMap'.
 ==== m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {

diff --git a/...ference/project/mapRootWithNoSourceMapOption/node/mapRootWithNoSourceMapOption.errors.txt b/...ference/project/mapRootWithNoSourceMapOption/node/mapRootWithNoSourceMapOption.errors.txt
@@ -1,7 +1,7 @@
-error TS5069: Option 'mapRoot' cannot be specified without specifying option 'sourceMap' or option 'declarationMaps'.
+error TS5069: Option 'mapRoot' cannot be specified without specifying option 'sourceMap' or option 'declarationMap'.
 
 
-!!! error TS5069: Option 'mapRoot' cannot be specified without specifying option 'sourceMap' or option 'declarationMaps'.
+!!! error TS5069: Option 'mapRoot' cannot be specified without specifying option 'sourceMap' or option 'declarationMap'.
 ==== m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {

diff --git a/tests/baselines/reference/tsConfig/Default initialized TSConfig/tsconfig.json b/tests/baselines/reference/tsConfig/Default initialized TSConfig/tsconfig.json
@@ -8,7 +8,7 @@
     // "checkJs": true,                       /* Report errors in .js files. */
     // "jsx": "preserve",                     /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */
     // "declaration": true,                   /* Generates corresponding '.d.ts' file. */
-    // "declarationMaps": true,               /* Generates a sourcemap for each corresponding '.d.ts' file. */
+    // "declarationMap": true,                /* Generates a sourcemap for each corresponding '.d.ts' file. */
     // "sourceMap": true,                     /* Generates corresponding '.map' file. */
     // "outFile": "./",                       /* Concatenate and emit output to single file. */
     // "outDir": "./",                        /* Redirect output structure to the directory. */

diff --git a/...reference/tsConfig/Initialized TSConfig with boolean value compiler options/tsconfig.json b/...reference/tsConfig/Initialized TSConfig with boolean value compiler options/tsconfig.json
@@ -8,7 +8,7 @@
     // "checkJs": true,                       /* Report errors in .js files. */
     // "jsx": "preserve",                     /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */
     // "declaration": true,                   /* Generates corresponding '.d.ts' file. */
-    // "declarationMaps": true,               /* Generates a sourcemap for each corresponding '.d.ts' file. */
+    // "declarationMap": true,                /* Generates a sourcemap for each corresponding '.d.ts' file. */
     // "sourceMap": true,                     /* Generates corresponding '.map' file. */
     // "outFile": "./",                       /* Concatenate and emit output to single file. */
     // "outDir": "./",                        /* Redirect output structure to the directory. */

diff --git a/...es/reference/tsConfig/Initialized TSConfig with enum value compiler options/tsconfig.json b/...es/reference/tsConfig/Initialized TSConfig with enum value compiler options/tsconfig.json
@@ -8,7 +8,7 @@
     // "checkJs": true,                       /* Report errors in .js files. */
     "jsx": "react",                           /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */
     // "declaration": true,                   /* Generates corresponding '.d.ts' file. */
-    // "declarationMaps": true,               /* Generates a sourcemap for each corresponding '.d.ts' file. */
+    // "declarationMap": true,                /* Generates a sourcemap for each corresponding '.d.ts' file. */
     // "sourceMap": true,                     /* Generates corresponding '.map' file. */
     // "outFile": "./",                       /* Concatenate and emit output to single file. */
     // "outDir": "./",                        /* Redirect output structure to the directory. */

diff --git a/tests/baselines/reference/tsConfig/Initialized TSConfig with files options/tsconfig.json b/tests/baselines/reference/tsConfig/Initialized TSConfig with files options/tsconfig.json
@@ -8,7 +8,7 @@
     // "checkJs": true,                       /* Report errors in .js files. */
     // "jsx": "preserve",                     /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */
     // "declaration": true,                   /* Generates corresponding '.d.ts' file. */
-    // "declarationMaps": true,               /* Generates a sourcemap for each corresponding '.d.ts' file. */
+    // "declarationMap": true,                /* Generates a sourcemap for each corresponding '.d.ts' file. */
     // "sourceMap": true,                     /* Generates corresponding '.map' file. */
     // "outFile": "./",                       /* Concatenate and emit output to single file. */
     // "outDir": "./",                        /* Redirect output structure to the directory. */

diff --git a/...eference/tsConfig/Initialized TSConfig with incorrect compiler option value/tsconfig.json b/...eference/tsConfig/Initialized TSConfig with incorrect compiler option value/tsconfig.json
@@ -8,7 +8,7 @@
     // "checkJs": true,                       /* Report errors in .js files. */
     // "jsx": "preserve",                     /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */
     // "declaration": true,                   /* Generates corresponding '.d.ts' file. */
-    // "declarationMaps": true,               /* Generates a sourcemap for each corresponding '.d.ts' file. */
+    // "declarationMap": true,                /* Generates a sourcemap for each corresponding '.d.ts' file. */
     // "sourceMap": true,                     /* Generates corresponding '.map' file. */
     // "outFile": "./",                       /* Concatenate and emit output to single file. */
     // "outDir": "./",                        /* Redirect output structure to the directory. */

diff --git a/...ines/reference/tsConfig/Initialized TSConfig with incorrect compiler option/tsconfig.json b/...ines/reference/tsConfig/Initialized TSConfig with incorrect compiler option/tsconfig.json
@@ -8,7 +8,7 @@
     // "checkJs": true,                       /* Report errors in .js files. */
     // "jsx": "preserve",                     /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */
     // "declaration": true,                   /* Generates corresponding '.d.ts' file. */
-    // "declarationMaps": true,               /* Generates a sourcemap for each corresponding '.d.ts' file. */
+    // "declarationMap": true,                /* Generates a sourcemap for each corresponding '.d.ts' file. */
     // "sourceMap": true,                     /* Generates corresponding '.map' file. */
     // "outFile": "./",                       /* Concatenate and emit output to single file. */
     // "outDir": "./",                        /* Redirect output structure to the directory. */

diff --git a/...ce/tsConfig/Initialized TSConfig with list compiler options with enum value/tsconfig.json b/...ce/tsConfig/Initialized TSConfig with list compiler options with enum value/tsconfig.json
@@ -8,7 +8,7 @@
     // "checkJs": true,                       /* Report errors in .js files. */
     // "jsx": "preserve",                     /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */
     // "declaration": true,                   /* Generates corresponding '.d.ts' file. */
-    // "declarationMaps": true,               /* Generates a sourcemap for each corresponding '.d.ts' file. */
+    // "declarationMap": true,                /* Generates a sourcemap for each corresponding '.d.ts' file. */
     // "sourceMap": true,                     /* Generates corresponding '.map' file. */
     // "outFile": "./",                       /* Concatenate and emit output to single file. */
     // "outDir": "./",                        /* Redirect output structure to the directory. */

diff --git a/...aselines/reference/tsConfig/Initialized TSConfig with list compiler options/tsconfig.json b/...aselines/reference/tsConfig/Initialized TSConfig with list compiler options/tsconfig.json
@@ -8,7 +8,7 @@
     // "checkJs": true,                       /* Report errors in .js files. */
     // "jsx": "preserve",                     /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */
     // "declaration": true,                   /* Generates corresponding '.d.ts' file. */
-    // "declarationMaps": true,               /* Generates a sourcemap for each corresponding '.d.ts' file. */
+    // "declarationMap": true,                /* Generates a sourcemap for each corresponding '.d.ts' file. */
     // "sourceMap": true,                     /* Generates corresponding '.map' file. */
     // "outFile": "./",                       /* Concatenate and emit output to single file. */
     // "outDir": "./",                        /* Redirect output structure to the directory. */

diff --git a/tests/cases/compiler/declarationMaps.ts b/tests/cases/compiler/declarationMaps.ts
@@ -1,5 +1,5 @@
 // @declaration: true
-// @declarationMaps: true
+// @declarationMap: true
 module m2 {
     export interface connectModule {
         (res, req, next): void;

diff --git a/tests/cases/compiler/declarationMapsMultifile.ts b/tests/cases/compiler/declarationMapsMultifile.ts
@@ -1,5 +1,5 @@
 // @declaration: true
-// @declarationMaps: true
+// @declarationMap: true
 // @filename: a.ts
 export class Foo {
     doThing(x: {a: number}) {

diff --git a/tests/cases/compiler/declarationMapsOutFile.ts b/tests/cases/compiler/declarationMapsOutFile.ts
@@ -1,5 +1,5 @@
 // @declaration: true
-// @declarationMaps: true
+// @declarationMap: true
 // @module: amd
 // @outFile: bundle.js
 // @filename: a.ts

diff --git a/tests/cases/compiler/declarationMapsOutFile2.ts b/tests/cases/compiler/declarationMapsOutFile2.ts
@@ -1,5 +1,5 @@
 // @declaration: true
-// @declarationMaps: true
+// @declarationMap: true
 // @outFile: bundle.js
 // @filename: a.ts
 class Foo {

diff --git a/tests/cases/compiler/declarationMapsWithSourceMap.ts b/tests/cases/compiler/declarationMapsWithSourceMap.ts
@@ -1,5 +1,5 @@
 // @declaration: true
-// @declarationMaps: true
+// @declarationMap: true
 // @outFile: bundle.js
 // @sourceMap: true
 // @filename: a.ts

diff --git a/tests/cases/compiler/declarationMapsWithoutDeclaration.ts b/tests/cases/compiler/declarationMapsWithoutDeclaration.ts
@@ -1,4 +1,4 @@
-// @declarationMaps: true
+// @declarationMap: true
 module m2 {
     export interface connectModule {
         (res, req, next): void;

diff --git a/tests/cases/fourslash/declarationMapsEnableMapping_NoInline.ts b/tests/cases/fourslash/declarationMapsEnableMapping_NoInline.ts
@@ -3,7 +3,7 @@
 // @outDir: ./dist
 // @inlineSourceMap: true
 // @declaration: true
-// @declarationMaps: true
+// @declarationMap: true
 // @Filename: index.ts
 // @emitThisFile: true
 ////export class Foo {

diff --git a/tests/cases/fourslash/declarationMapsEnableMapping_NoInlineSources.ts b/tests/cases/fourslash/declarationMapsEnableMapping_NoInlineSources.ts
@@ -4,7 +4,7 @@
 // @inlineSourceMap: true
 // @inlineSources: true
 // @declaration: true
-// @declarationMaps: true
+// @declarationMap: true
 // @Filename: index.ts
 // @emitThisFile: true
 ////export class Foo {

diff --git a/tests/cases/fourslash/declarationMapsGeneratedMapsEnableMapping.ts b/tests/cases/fourslash/declarationMapsGeneratedMapsEnableMapping.ts
@@ -2,7 +2,7 @@
 // @BaselineFile: declarationMapsGeneratedMapsEnableMapping.baseline
 // @outDir: ./dist
 // @declaration: true
-// @declarationMaps: true
+// @declarationMap: true
 // @Filename: index.ts
 // @emitThisFile: true
 ////export class Foo {

diff --git a/tests/cases/fourslash/declarationMapsGeneratedMapsEnableMapping2.ts b/tests/cases/fourslash/declarationMapsGeneratedMapsEnableMapping2.ts
@@ -4,7 +4,7 @@
 // @sourceMap: true
 // @sourceRoot: /tests/cases/fourslash/
 // @declaration: true
-// @declarationMaps: true
+// @declarationMap: true
 // @Filename: index.ts
 // @emitThisFile: true
 ////export class Foo {

diff --git a/tests/cases/fourslash/declarationMapsGeneratedMapsEnableMapping3.ts b/tests/cases/fourslash/declarationMapsGeneratedMapsEnableMapping3.ts
@@ -3,7 +3,7 @@
 // @outDir: ./dist
 // @sourceRoot: /tests/cases/fourslash/
 // @declaration: true
-// @declarationMaps: true
+// @declarationMap: true
 // @Filename: index.ts
 // @emitThisFile: true
 ////export class Foo {