ESMInterop -> ESModuleInterop, make default for tsc --init

weswigham · weswigham · commit bcafdba5bc9b · 2017-11-10T14:20:32.000-08:00
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -1889,7 +1889,7 @@ namespace ts {
                     error(moduleReferenceExpression, Diagnostics.Module_0_resolves_to_a_non_module_entity_and_cannot_be_imported_using_this_construct, symbolToString(moduleSymbol));
                     return symbol;
                 }
-                if (compilerOptions.ESMInterop) {
+                if (compilerOptions.ESModuleInterop) {
                     const referenceParent = moduleReferenceExpression.parent;
                     if (
                         (referenceParent.kind === SyntaxKind.ImportDeclaration && getNamespaceDeclarationNode(referenceParent as ImportDeclaration)) ||
diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts
@@ -392,7 +392,7 @@ namespace ts {
             description: Diagnostics.Allow_default_imports_from_modules_with_no_default_export_This_does_not_affect_code_emit_just_typechecking
         },
         {
-            name: "ESMInterop",
+            name: "ESModuleInterop",
             type: "boolean",
             category: Diagnostics.Module_Resolution_Options,
             description: Diagnostics.Create_namespace_objects_for_ECMAScript_imports_which_are_neither_callable_nor_constructable_implies_allowSyntheticDefaultImports
@@ -699,7 +699,8 @@ namespace ts {
     export const defaultInitCompilerOptions: CompilerOptions = {
         module: ModuleKind.CommonJS,
         target: ScriptTarget.ES5,
-        strict: true
+        strict: true,
+        ESModuleInterop: true
     };
 
     let optionNameMapCache: OptionNameMap;
diff --git a/src/compiler/core.ts b/src/compiler/core.ts
@@ -1920,7 +1920,7 @@ namespace ts {
         const moduleKind = getEmitModuleKind(compilerOptions);
         return compilerOptions.allowSyntheticDefaultImports !== undefined
             ? compilerOptions.allowSyntheticDefaultImports
-            : compilerOptions.ESMInterop
+            : compilerOptions.ESModuleInterop
                 ? !!moduleKind && moduleKind < ModuleKind.ES2015
                 : moduleKind === ModuleKind.System;
     }
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
@@ -3820,7 +3820,7 @@ namespace ts {
         typeRoots?: string[];
         /*@internal*/ version?: boolean;
         /*@internal*/ watch?: boolean;
-        ESMInterop?: boolean;
+        ESModuleInterop?: boolean;
 
         [option: string]: CompilerOptionsValue | JsonSourceFile | undefined;
     }
diff --git a/tests/baselines/reference/api/tsserverlibrary.d.ts b/tests/baselines/reference/api/tsserverlibrary.d.ts
@@ -2286,7 +2286,7 @@ declare namespace ts {
         types?: string[];
         /** Paths used to compute primary types search locations */
         typeRoots?: string[];
-        ESMInterop?: boolean;
+        ESModuleInterop?: boolean;
         [option: string]: CompilerOptionsValue | JsonSourceFile | undefined;
     }
     interface TypeAcquisition {
diff --git a/tests/baselines/reference/api/typescript.d.ts b/tests/baselines/reference/api/typescript.d.ts
@@ -2286,7 +2286,7 @@ declare namespace ts {
         types?: string[];
         /** Paths used to compute primary types search locations */
         typeRoots?: string[];
-        ESMInterop?: boolean;
+        ESModuleInterop?: boolean;
         [option: string]: CompilerOptionsValue | JsonSourceFile | undefined;
     }
     interface TypeAcquisition {
diff --git a/tests/baselines/reference/tsConfig/Default initialized TSConfig/tsconfig.json b/tests/baselines/reference/tsConfig/Default initialized TSConfig/tsconfig.json
@@ -19,7 +19,7 @@
     // "isolatedModules": true,               /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */
 
     /* Strict Type-Checking Options */
-    "strict": true                            /* Enable all strict type-checking options. */
+    "strict": true,                           /* Enable all strict type-checking options. */
     // "noImplicitAny": true,                 /* Raise error on expressions and declarations with an implied 'any' type. */
     // "strictNullChecks": true,              /* Enable strict null checks. */
     // "strictFunctionTypes": true,           /* Enable strict checking of function types. */
@@ -40,7 +40,7 @@
     // "typeRoots": [],                       /* List of folders to include type definitions from. */
     // "types": [],                           /* Type declaration files to be included in compilation. */
     // "allowSyntheticDefaultImports": true,  /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
-    // "ESMInterop": true,                    /* Create namespace objects for ECMAScript imports which are neither callable nor constructable, implies `allowSyntheticDefaultImports`. */
+    "ESModuleInterop": true                   /* Create namespace objects for ECMAScript imports which are neither callable nor constructable, implies `allowSyntheticDefaultImports`. */
     // "preserveSymlinks": true,              /* Do not resolve the real path of symlinks. */
 
     /* Source Map Options */
diff --git a/tests/baselines/reference/tsConfig/Initialized TSConfig with boolean value compiler options/tsconfig.json b/tests/baselines/reference/tsConfig/Initialized TSConfig with boolean value compiler options/tsconfig.json
@@ -27,7 +27,7 @@
     // "alwaysStrict": true,                  /* Parse in strict mode and emit "use strict" for each source file. */
 
     /* Additional Checks */
-    "noUnusedLocals": true                    /* Report errors on unused locals. */
+    "noUnusedLocals": true,                   /* Report errors on unused locals. */
     // "noUnusedParameters": true,            /* Report errors on unused parameters. */
     // "noImplicitReturns": true,             /* Report error when not all code paths in function return a value. */
     // "noFallthroughCasesInSwitch": true,    /* Report errors for fallthrough cases in switch statement. */
@@ -40,7 +40,7 @@
     // "typeRoots": [],                       /* List of folders to include type definitions from. */
     // "types": [],                           /* Type declaration files to be included in compilation. */
     // "allowSyntheticDefaultImports": true,  /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
-    // "ESMInterop": true,                    /* Create namespace objects for ECMAScript imports which are neither callable nor constructable, implies `allowSyntheticDefaultImports`. */
+    "ESModuleInterop": true                   /* Create namespace objects for ECMAScript imports which are neither callable nor constructable, implies `allowSyntheticDefaultImports`. */
     // "preserveSymlinks": true,              /* Do not resolve the real path of symlinks. */
 
     /* Source Map Options */
diff --git a/tests/baselines/reference/tsConfig/Initialized TSConfig with enum value compiler options/tsconfig.json b/tests/baselines/reference/tsConfig/Initialized TSConfig with enum value compiler options/tsconfig.json
@@ -19,7 +19,7 @@
     // "isolatedModules": true,               /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */
 
     /* Strict Type-Checking Options */
-    "strict": true                            /* Enable all strict type-checking options. */
+    "strict": true,                           /* Enable all strict type-checking options. */
     // "noImplicitAny": true,                 /* Raise error on expressions and declarations with an implied 'any' type. */
     // "strictNullChecks": true,              /* Enable strict null checks. */
     // "strictFunctionTypes": true,           /* Enable strict checking of function types. */
@@ -40,7 +40,7 @@
     // "typeRoots": [],                       /* List of folders to include type definitions from. */
     // "types": [],                           /* Type declaration files to be included in compilation. */
     // "allowSyntheticDefaultImports": true,  /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
-    // "ESMInterop": true,                    /* Create namespace objects for ECMAScript imports which are neither callable nor constructable, implies `allowSyntheticDefaultImports`. */
+    "ESModuleInterop": true                   /* Create namespace objects for ECMAScript imports which are neither callable nor constructable, implies `allowSyntheticDefaultImports`. */
     // "preserveSymlinks": true,              /* Do not resolve the real path of symlinks. */
 
     /* Source Map Options */
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
@@ -19,7 +19,7 @@
     // "isolatedModules": true,               /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */
 
     /* Strict Type-Checking Options */
-    "strict": true                            /* Enable all strict type-checking options. */
+    "strict": true,                           /* Enable all strict type-checking options. */
     // "noImplicitAny": true,                 /* Raise error on expressions and declarations with an implied 'any' type. */
     // "strictNullChecks": true,              /* Enable strict null checks. */
     // "strictFunctionTypes": true,           /* Enable strict checking of function types. */
@@ -40,7 +40,7 @@
     // "typeRoots": [],                       /* List of folders to include type definitions from. */
     // "types": [],                           /* Type declaration files to be included in compilation. */
     // "allowSyntheticDefaultImports": true,  /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
-    // "ESMInterop": true,                    /* Create namespace objects for ECMAScript imports which are neither callable nor constructable, implies `allowSyntheticDefaultImports`. */
+    "ESModuleInterop": true                   /* Create namespace objects for ECMAScript imports which are neither callable nor constructable, implies `allowSyntheticDefaultImports`. */
     // "preserveSymlinks": true,              /* Do not resolve the real path of symlinks. */
 
     /* Source Map Options */
diff --git a/tests/baselines/reference/tsConfig/Initialized TSConfig with incorrect compiler option value/tsconfig.json b/tests/baselines/reference/tsConfig/Initialized TSConfig with incorrect compiler option value/tsconfig.json
@@ -19,7 +19,7 @@
     // "isolatedModules": true,               /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */
 
     /* Strict Type-Checking Options */
-    "strict": true                            /* Enable all strict type-checking options. */
+    "strict": true,                           /* Enable all strict type-checking options. */
     // "noImplicitAny": true,                 /* Raise error on expressions and declarations with an implied 'any' type. */
     // "strictNullChecks": true,              /* Enable strict null checks. */
     // "strictFunctionTypes": true,           /* Enable strict checking of function types. */
@@ -40,7 +40,7 @@
     // "typeRoots": [],                       /* List of folders to include type definitions from. */
     // "types": [],                           /* Type declaration files to be included in compilation. */
     // "allowSyntheticDefaultImports": true,  /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
-    // "ESMInterop": true,                    /* Create namespace objects for ECMAScript imports which are neither callable nor constructable, implies `allowSyntheticDefaultImports`. */
+    "ESModuleInterop": true                   /* Create namespace objects for ECMAScript imports which are neither callable nor constructable, implies `allowSyntheticDefaultImports`. */
     // "preserveSymlinks": true,              /* Do not resolve the real path of symlinks. */
 
     /* Source Map Options */
diff --git a/tests/baselines/reference/tsConfig/Initialized TSConfig with incorrect compiler option/tsconfig.json b/tests/baselines/reference/tsConfig/Initialized TSConfig with incorrect compiler option/tsconfig.json
@@ -19,7 +19,7 @@
     // "isolatedModules": true,               /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */
 
     /* Strict Type-Checking Options */
-    "strict": true                            /* Enable all strict type-checking options. */
+    "strict": true,                           /* Enable all strict type-checking options. */
     // "noImplicitAny": true,                 /* Raise error on expressions and declarations with an implied 'any' type. */
     // "strictNullChecks": true,              /* Enable strict null checks. */
     // "strictFunctionTypes": true,           /* Enable strict checking of function types. */
@@ -40,7 +40,7 @@
     // "typeRoots": [],                       /* List of folders to include type definitions from. */
     // "types": [],                           /* Type declaration files to be included in compilation. */
     // "allowSyntheticDefaultImports": true,  /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
-    // "ESMInterop": true,                    /* Create namespace objects for ECMAScript imports which are neither callable nor constructable, implies `allowSyntheticDefaultImports`. */
+    "ESModuleInterop": true                   /* Create namespace objects for ECMAScript imports which are neither callable nor constructable, implies `allowSyntheticDefaultImports`. */
     // "preserveSymlinks": true,              /* Do not resolve the real path of symlinks. */
 
     /* Source Map Options */
diff --git a/tests/baselines/reference/tsConfig/Initialized TSConfig with list compiler options with enum value/tsconfig.json b/tests/baselines/reference/tsConfig/Initialized TSConfig with list compiler options with enum value/tsconfig.json
@@ -19,7 +19,7 @@
     // "isolatedModules": true,               /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */
 
     /* Strict Type-Checking Options */
-    "strict": true                            /* Enable all strict type-checking options. */
+    "strict": true,                           /* Enable all strict type-checking options. */
     // "noImplicitAny": true,                 /* Raise error on expressions and declarations with an implied 'any' type. */
     // "strictNullChecks": true,              /* Enable strict null checks. */
     // "strictFunctionTypes": true,           /* Enable strict checking of function types. */
@@ -40,7 +40,7 @@
     // "typeRoots": [],                       /* List of folders to include type definitions from. */
     // "types": [],                           /* Type declaration files to be included in compilation. */
     // "allowSyntheticDefaultImports": true,  /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
-    // "ESMInterop": true,                    /* Create namespace objects for ECMAScript imports which are neither callable nor constructable, implies `allowSyntheticDefaultImports`. */
+    "ESModuleInterop": true                   /* Create namespace objects for ECMAScript imports which are neither callable nor constructable, implies `allowSyntheticDefaultImports`. */
     // "preserveSymlinks": true,              /* Do not resolve the real path of symlinks. */
 
     /* Source Map Options */
diff --git a/tests/baselines/reference/tsConfig/Initialized TSConfig with list compiler options/tsconfig.json b/tests/baselines/reference/tsConfig/Initialized TSConfig with list compiler options/tsconfig.json
@@ -38,9 +38,9 @@
     // "paths": {},                           /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
     // "rootDirs": [],                        /* List of root folders whose combined content represents the structure of the project at runtime. */
     // "typeRoots": [],                       /* List of folders to include type definitions from. */
-    "types": ["jquery","mocha"]               /* Type declaration files to be included in compilation. */
+    "types": ["jquery","mocha"],              /* Type declaration files to be included in compilation. */
     // "allowSyntheticDefaultImports": true,  /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
-    // "ESMInterop": true,                    /* Create namespace objects for ECMAScript imports which are neither callable nor constructable, implies `allowSyntheticDefaultImports`. */
+    "ESModuleInterop": true                   /* Create namespace objects for ECMAScript imports which are neither callable nor constructable, implies `allowSyntheticDefaultImports`. */
     // "preserveSymlinks": true,              /* Do not resolve the real path of symlinks. */
 
     /* Source Map Options */
diff --git a/tests/cases/fourslash/codeFixCalledES2015Import1.ts b/tests/cases/fourslash/codeFixCalledES2015Import1.ts
@@ -1,5 +1,5 @@
 /// <reference path='fourslash.ts' />
-// @ESMInterop: true
+// @ESModuleInterop: true
 // @Filename: foo.d.ts
 ////declare function foo(): void;
 ////declare namespace foo {}
diff --git a/tests/cases/fourslash/codeFixCalledES2015Import2.ts b/tests/cases/fourslash/codeFixCalledES2015Import2.ts
@@ -1,5 +1,5 @@
 /// <reference path='fourslash.ts' />
-// @ESMInterop: true
+// @ESModuleInterop: true
 // @Filename: foo.d.ts
 ////declare function foo(): void;
 ////declare namespace foo {}
diff --git a/tests/cases/fourslash/codeFixCalledES2015Import3.ts b/tests/cases/fourslash/codeFixCalledES2015Import3.ts
@@ -1,5 +1,5 @@
 /// <reference path='fourslash.ts' />
-// @ESMInterop: true
+// @ESModuleInterop: true
 // @module: amd
 // @Filename: foo.d.ts
 ////declare function foo(): void;
diff --git a/tests/cases/fourslash/codeFixCalledES2015Import4.ts b/tests/cases/fourslash/codeFixCalledES2015Import4.ts
@@ -1,5 +1,5 @@
 /// <reference path='fourslash.ts' />
-// @ESMInterop: true
+// @ESModuleInterop: true
 // @Filename: foo.d.ts
 ////declare function foo(): void;
 ////declare namespace foo {}
diff --git a/tests/cases/fourslash/codeFixCalledES2015Import5.ts b/tests/cases/fourslash/codeFixCalledES2015Import5.ts
@@ -1,5 +1,5 @@
 /// <reference path='fourslash.ts' />
-// @ESMInterop: true
+// @ESModuleInterop: true
 // @Filename: foo.d.ts
 ////declare function foo(): void;
 ////declare namespace foo {}
diff --git a/tests/cases/fourslash/codeFixCalledES2015Import6.ts b/tests/cases/fourslash/codeFixCalledES2015Import6.ts
@@ -1,5 +1,5 @@
 /// <reference path='fourslash.ts' />
-// @ESMInterop: true
+// @ESModuleInterop: true
 // @module: amd
 // @Filename: foo.d.ts
 ////declare function foo(): void;
diff --git a/tests/cases/fourslash/codeFixCalledES2015Import7.ts b/tests/cases/fourslash/codeFixCalledES2015Import7.ts
@@ -1,5 +1,5 @@
 /// <reference path='fourslash.ts' />
-// @ESMInterop: true
+// @ESModuleInterop: true
 // @Filename: foo.d.ts
 ////declare class foo(): void;
 ////declare namespace foo {}
diff --git a/tests/cases/fourslash/codeFixCalledES2015Import8.ts b/tests/cases/fourslash/codeFixCalledES2015Import8.ts
@@ -1,5 +1,5 @@
 /// <reference path='fourslash.ts' />
-// @ESMInterop: true
+// @ESModuleInterop: true
 // @Filename: foo.d.ts
 ////declare class foo(): void;
 ////declare namespace foo {}
diff --git a/tests/cases/fourslash/codeFixCalledES2015Import9.ts b/tests/cases/fourslash/codeFixCalledES2015Import9.ts
@@ -1,5 +1,5 @@
 /// <reference path='fourslash.ts' />
-// @ESMInterop: true
+// @ESModuleInterop: true
 // @module: amd
 // @Filename: foo.d.ts
 ////declare class foo(): void;

Original file line number	Diff line number	Diff line change
`@@ -1889,7 +1889,7 @@ namespace ts {`
`1889`	`1889`	`error(moduleReferenceExpression, Diagnostics.Module_0_resolves_to_a_non_module_entity_and_cannot_be_imported_using_this_construct, symbolToString(moduleSymbol));`
`1890`	`1890`	`return symbol;`
`1891`	`1891`	`}`
`1892`		`- if (compilerOptions.ESMInterop) {`
	`1892`	`+ if (compilerOptions.ESModuleInterop) {`
`1893`	`1893`	`const referenceParent = moduleReferenceExpression.parent;`
`1894`	`1894`	`if (`
`1895`	`1895`	`(referenceParent.kind === SyntaxKind.ImportDeclaration && getNamespaceDeclarationNode(referenceParent as ImportDeclaration)) \|\|`
Original file line number	Diff line number	Diff line change
`@@ -1920,7 +1920,7 @@ namespace ts {`
`1920`	`1920`	`const moduleKind = getEmitModuleKind(compilerOptions);`
`1921`	`1921`	`return compilerOptions.allowSyntheticDefaultImports !== undefined`
`1922`	`1922`	`? compilerOptions.allowSyntheticDefaultImports`
`1923`		`- : compilerOptions.ESMInterop`
	`1923`	`+ : compilerOptions.ESModuleInterop`
`1924`	`1924`	`? !!moduleKind && moduleKind < ModuleKind.ES2015`
`1925`	`1925`	`: moduleKind === ModuleKind.System;`
`1926`	`1926`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3820,7 +3820,7 @@ namespace ts {`
`3820`	`3820`	`typeRoots?: string[];`
`3821`	`3821`	`/@internal/ version?: boolean;`
`3822`	`3822`	`/@internal/ watch?: boolean;`
`3823`		`- ESMInterop?: boolean;`
	`3823`	`+ ESModuleInterop?: boolean;`
`3824`	`3824`
`3825`	`3825`	`[option: string]: CompilerOptionsValue \| JsonSourceFile \| undefined;`
`3826`	`3826`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2286,7 +2286,7 @@ declare namespace ts {`
`2286`	`2286`	`types?: string[];`
`2287`	`2287`	`/** Paths used to compute primary types search locations */`
`2288`	`2288`	`typeRoots?: string[];`
`2289`		`- ESMInterop?: boolean;`
	`2289`	`+ ESModuleInterop?: boolean;`
`2290`	`2290`	`[option: string]: CompilerOptionsValue \| JsonSourceFile \| undefined;`
`2291`	`2291`	`}`
`2292`	`2292`	`interface TypeAcquisition {`