Rename strictESM to ESMInterop

weswigham · weswigham · commit 3b33df03d944 · 2017-11-06T16:43:58.000-08:00
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -66,7 +66,7 @@ namespace ts {
         const languageVersion = getEmitScriptTarget(compilerOptions);
         const modulekind = getEmitModuleKind(compilerOptions);
         const noUnusedIdentifiers = !!compilerOptions.noUnusedLocals || !!compilerOptions.noUnusedParameters;
-        const allowSyntheticDefaultImports = typeof compilerOptions.allowSyntheticDefaultImports !== "undefined" ? compilerOptions.allowSyntheticDefaultImports : compilerOptions.strictESM ? (modulekind && modulekind < ModuleKind.ES2015) : modulekind === ModuleKind.System;
+        const allowSyntheticDefaultImports = typeof compilerOptions.allowSyntheticDefaultImports !== "undefined" ? compilerOptions.allowSyntheticDefaultImports : compilerOptions.ESMInterop ? (modulekind && modulekind < ModuleKind.ES2015) : modulekind === ModuleKind.System;
         const strictNullChecks = getStrictOptionValue(compilerOptions, "strictNullChecks");
         const strictFunctionTypes = getStrictOptionValue(compilerOptions, "strictFunctionTypes");
         const noImplicitAny = getStrictOptionValue(compilerOptions, "noImplicitAny");
@@ -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.strictESM) {
+                if (compilerOptions.ESMInterop) {
                     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: "strictESM",
+            name: "ESMInterop",
             type: "boolean",
             category: Diagnostics.Module_Resolution_Options,
             description: Diagnostics.Create_namespace_objects_for_ECMAScript_imports_which_are_neither_callable_nor_constructable_implies_allowSyntheticDefaultImports
diff --git a/src/compiler/transformers/module/module.ts b/src/compiler/transformers/module/module.ts
@@ -639,7 +639,7 @@ namespace ts {
             }
 
             const promise = createNew(createIdentifier("Promise"), /*typeArguments*/ undefined, [func]);
-            if (compilerOptions.strictESM) {
+            if (compilerOptions.ESMInterop) {
                 context.requestEmitHelper(importStarHelper);
                 return createCall(createPropertyAccess(promise, createIdentifier("then")), /*typeArguments*/ undefined, [getHelperName("__importStar")]);
             }
@@ -654,7 +654,7 @@ namespace ts {
             // if we simply do require in resolve callback in Promise constructor. We will execute the loading immediately
             const promiseResolveCall = createCall(createPropertyAccess(createIdentifier("Promise"), "resolve"), /*typeArguments*/ undefined, /*argumentsArray*/ []);
             let requireCall = createCall(createIdentifier("require"), /*typeArguments*/ undefined, arg ? [arg] : []);
-            if (compilerOptions.strictESM) {
+            if (compilerOptions.ESMInterop) {
                 context.requestEmitHelper(importStarHelper);
                 requireCall = createCall(getHelperName("__importStar"), /*typeArguments*/ undefined, [requireCall]);
             }
@@ -692,7 +692,7 @@ namespace ts {
 
 
         function getHelperExpressionForImport(node: ImportDeclaration, innerExpr: Expression) {
-            if (!compilerOptions.strictESM || node.transformFlags & TransformFlags.NeverApplyImportHelper) {
+            if (!compilerOptions.ESMInterop || node.transformFlags & TransformFlags.NeverApplyImportHelper) {
                 return innerExpr;
             }
             if (getNamespaceDeclarationNode(node)) {
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
@@ -3800,7 +3800,7 @@ namespace ts {
         typeRoots?: string[];
         /*@internal*/ version?: boolean;
         /*@internal*/ watch?: boolean;
-        strictESM?: boolean;
+        ESMInterop?: boolean;
 
         [option: string]: CompilerOptionsValue | JsonSourceFile | undefined;
     }
diff --git a/tests/baselines/reference/api/tsserverlibrary.d.ts b/tests/baselines/reference/api/tsserverlibrary.d.ts
@@ -2285,7 +2285,7 @@ declare namespace ts {
         types?: string[];
         /** Paths used to compute primary types search locations */
         typeRoots?: string[];
-        strictESM?: boolean;
+        ESMInterop?: 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
@@ -2285,7 +2285,7 @@ declare namespace ts {
         types?: string[];
         /** Paths used to compute primary types search locations */
         typeRoots?: string[];
-        strictESM?: boolean;
+        ESMInterop?: 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
@@ -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. */
-    // "strictESM": true,                     /* Create namespace objects for ECMAScript imports which are neither callable nor constructable, implies `allowSyntheticDefaultImports`. */
+    // "ESMInterop": 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
@@ -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. */
-    // "strictESM": true,                     /* Create namespace objects for ECMAScript imports which are neither callable nor constructable, implies `allowSyntheticDefaultImports`. */
+    // "ESMInterop": 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
@@ -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. */
-    // "strictESM": true,                     /* Create namespace objects for ECMAScript imports which are neither callable nor constructable, implies `allowSyntheticDefaultImports`. */
+    // "ESMInterop": 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
@@ -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. */
-    // "strictESM": true,                     /* Create namespace objects for ECMAScript imports which are neither callable nor constructable, implies `allowSyntheticDefaultImports`. */
+    // "ESMInterop": 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
@@ -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. */
-    // "strictESM": true,                     /* Create namespace objects for ECMAScript imports which are neither callable nor constructable, implies `allowSyntheticDefaultImports`. */
+    // "ESMInterop": 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
@@ -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. */
-    // "strictESM": true,                     /* Create namespace objects for ECMAScript imports which are neither callable nor constructable, implies `allowSyntheticDefaultImports`. */
+    // "ESMInterop": 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
@@ -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. */
-    // "strictESM": true,                     /* Create namespace objects for ECMAScript imports which are neither callable nor constructable, implies `allowSyntheticDefaultImports`. */
+    // "ESMInterop": 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
@@ -40,7 +40,7 @@
     // "typeRoots": [],                       /* List of folders to include type definitions from. */
     "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. */
-    // "strictESM": true,                     /* Create namespace objects for ECMAScript imports which are neither callable nor constructable, implies `allowSyntheticDefaultImports`. */
+    // "ESMInterop": 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' />
-// @strictESM: true
+// @ESMInterop: 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' />
-// @strictESM: true
+// @ESMInterop: 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' />
-// @strictESM: true
+// @ESMInterop: 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' />
-// @strictESM: true
+// @ESMInterop: 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' />
-// @strictESM: true
+// @ESMInterop: 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' />
-// @strictESM: true
+// @ESMInterop: 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' />
-// @strictESM: true
+// @ESMInterop: 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' />
-// @strictESM: true
+// @ESMInterop: 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' />
-// @strictESM: true
+// @ESMInterop: true
 // @module: amd
 // @Filename: foo.d.ts
 ////declare class foo(): void;

Original file line number	Diff line number	Diff line change
`@@ -392,7 +392,7 @@ namespace ts {`
`392`	`392`	`description: Diagnostics.Allow_default_imports_from_modules_with_no_default_export_This_does_not_affect_code_emit_just_typechecking`
`393`	`393`	`},`
`394`	`394`	`{`
`395`		`- name: "strictESM",`
	`395`	`+ name: "ESMInterop",`
`396`	`396`	`type: "boolean",`
`397`	`397`	`category: Diagnostics.Module_Resolution_Options,`
`398`	`398`	`description: Diagnostics.Create_namespace_objects_for_ECMAScript_imports_which_are_neither_callable_nor_constructable_implies_allowSyntheticDefaultImports`
Original file line number	Diff line number	Diff line change
`@@ -639,7 +639,7 @@ namespace ts {`
`639`	`639`	`}`
`640`	`640`
`641`	`641`	`const promise = createNew(createIdentifier("Promise"), /typeArguments/ undefined, [func]);`
`642`		`- if (compilerOptions.strictESM) {`
	`642`	`+ if (compilerOptions.ESMInterop) {`
`643`	`643`	`context.requestEmitHelper(importStarHelper);`
`644`	`644`	`return createCall(createPropertyAccess(promise, createIdentifier("then")), /typeArguments/ undefined, [getHelperName("__importStar")]);`
`645`	`645`	`}`
`@@ -654,7 +654,7 @@ namespace ts {`
`654`	`654`	`// if we simply do require in resolve callback in Promise constructor. We will execute the loading immediately`
`655`	`655`	`const promiseResolveCall = createCall(createPropertyAccess(createIdentifier("Promise"), "resolve"), /typeArguments/ undefined, /argumentsArray/ []);`
`656`	`656`	`let requireCall = createCall(createIdentifier("require"), /typeArguments/ undefined, arg ? [arg] : []);`
`657`		`- if (compilerOptions.strictESM) {`
	`657`	`+ if (compilerOptions.ESMInterop) {`
`658`	`658`	`context.requestEmitHelper(importStarHelper);`
`659`	`659`	`requireCall = createCall(getHelperName("__importStar"), /typeArguments/ undefined, [requireCall]);`
`660`	`660`	`}`
`@@ -692,7 +692,7 @@ namespace ts {`
`692`	`692`
`693`	`693`
`694`	`694`	`function getHelperExpressionForImport(node: ImportDeclaration, innerExpr: Expression) {`
`695`		`- if (!compilerOptions.strictESM \|\| node.transformFlags & TransformFlags.NeverApplyImportHelper) {`
	`695`	`+ if (!compilerOptions.ESMInterop \|\| node.transformFlags & TransformFlags.NeverApplyImportHelper) {`
`696`	`696`	`return innerExpr;`
`697`	`697`	`}`
`698`	`698`	`if (getNamespaceDeclarationNode(node)) {`
Original file line number	Diff line number	Diff line change
`@@ -3800,7 +3800,7 @@ namespace ts {`
`3800`	`3800`	`typeRoots?: string[];`
`3801`	`3801`	`/@internal/ version?: boolean;`
`3802`	`3802`	`/@internal/ watch?: boolean;`
`3803`		`- strictESM?: boolean;`
	`3803`	`+ ESMInterop?: boolean;`
`3804`	`3804`
`3805`	`3805`	`[option: string]: CompilerOptionsValue \| JsonSourceFile \| undefined;`
`3806`	`3806`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2285,7 +2285,7 @@ declare namespace ts {`
`2285`	`2285`	`types?: string[];`
`2286`	`2286`	`/** Paths used to compute primary types search locations */`
`2287`	`2287`	`typeRoots?: string[];`
`2288`		`- strictESM?: boolean;`
	`2288`	`+ ESMInterop?: boolean;`
`2289`	`2289`	`[option: string]: CompilerOptionsValue \| JsonSourceFile \| undefined;`
`2290`	`2290`	`}`
`2291`	`2291`	`interface TypeAcquisition {`