🤖 Pick PR microsoft#53240 (Allow 'verbatimModuleSyntax' with t...) in…

…to release-5.0 (microsoft#53253) Co-authored-by: Daniel Rosenwasser <DanielRosenwasser@users.noreply.github.com> Co-authored-by: typescript-bot <typescript@microsoft.com>
scenari · Sep 14, 2023 · 003cf69 · 003cf69
1 parent c5c40cb
commit 003cf69
Show file tree

Hide file tree

Showing 283 changed files with 1,463 additions and 75 deletions.
diff --git a/lib/tsserver.js b/lib/tsserver.js
@@ -133402,6 +133402,11 @@ function canBeConvertedToAsync(node) {
 }
 
 // src/services/transpile.ts
+var optionsRedundantWithVerbatimModuleSyntax = /* @__PURE__ */ new Set([
+  "isolatedModules",
+  "preserveValueImports",
+  "importsNotUsedAsValues"
+]);
 function transpileModule(input, transpileOptions) {
   const diagnostics = [];
   const options = transpileOptions.compilerOptions ? fixupCompilerOptions(transpileOptions.compilerOptions, diagnostics) : {};
@@ -133412,6 +133417,9 @@ function transpileModule(input, transpileOptions) {
     }
   }
   for (const option of transpileOptionValueCompilerOptions) {
+    if (options.verbatimModuleSyntax && optionsRedundantWithVerbatimModuleSyntax.has(option.name)) {
+      continue;
+    }
     options[option.name] = option.transpileOptionValue;
   }
   options.suppressOutputPathCheck = true;

diff --git a/lib/tsserverlibrary.js b/lib/tsserverlibrary.js
@@ -131819,6 +131819,9 @@ ${lanes.join("\n")}
       }
     }
     for (const option of transpileOptionValueCompilerOptions) {
+      if (options.verbatimModuleSyntax && optionsRedundantWithVerbatimModuleSyntax.has(option.name)) {
+        continue;
+      }
       options[option.name] = option.transpileOptionValue;
     }
     options.suppressOutputPathCheck = true;
@@ -131922,11 +131925,16 @@ ${lanes.join("\n")}
     }
     return options;
   }
-  var commandLineOptionsStringToEnum;
+  var optionsRedundantWithVerbatimModuleSyntax, commandLineOptionsStringToEnum;
   var init_transpile = __esm({
     "src/services/transpile.ts"() {
       "use strict";
       init_ts4();
+      optionsRedundantWithVerbatimModuleSyntax = /* @__PURE__ */ new Set([
+        "isolatedModules",
+        "preserveValueImports",
+        "importsNotUsedAsValues"
+      ]);
     }
   });
 

diff --git a/lib/typescript.js b/lib/typescript.js
@@ -131833,6 +131833,9 @@ ${lanes.join("\n")}
       }
     }
     for (const option of transpileOptionValueCompilerOptions) {
+      if (options.verbatimModuleSyntax && optionsRedundantWithVerbatimModuleSyntax.has(option.name)) {
+        continue;
+      }
       options[option.name] = option.transpileOptionValue;
     }
     options.suppressOutputPathCheck = true;
@@ -131936,11 +131939,16 @@ ${lanes.join("\n")}
     }
     return options;
   }
-  var commandLineOptionsStringToEnum;
+  var optionsRedundantWithVerbatimModuleSyntax, commandLineOptionsStringToEnum;
   var init_transpile = __esm({
     "src/services/transpile.ts"() {
       "use strict";
       init_ts4();
+      optionsRedundantWithVerbatimModuleSyntax = /* @__PURE__ */ new Set([
+        "isolatedModules",
+        "preserveValueImports",
+        "importsNotUsedAsValues"
+      ]);
     }
   });
 

diff --git a/src/services/transpile.ts b/src/services/transpile.ts
@@ -43,6 +43,12 @@ export interface TranspileOutput {
     sourceMapText?: string;
 }
 
+const optionsRedundantWithVerbatimModuleSyntax = new Set([
+    "isolatedModules",
+    "preserveValueImports",
+    "importsNotUsedAsValues"
+]);
+
 /*
  * This function will compile source text from 'input' argument using specified compiler options.
  * If not options are provided - it will use a set of default compiler options.
@@ -66,6 +72,11 @@ export function transpileModule(input: string, transpileOptions: TranspileOption
     }
 
     for (const option of transpileOptionValueCompilerOptions) {
+        // Do not set redundant config options if `verbatimModuleSyntax` was supplied.
+        if (options.verbatimModuleSyntax && optionsRedundantWithVerbatimModuleSyntax.has(option.name)) {
+            continue;
+        }
+
         options[option.name] = option.transpileOptionValue;
     }
 

diff --git a/src/testRunner/unittests/services/transpile.ts b/src/testRunner/unittests/services/transpile.ts
diff --git a/...tly serialize metadata when transpile with CommonJS option (verbatimModuleSyntax=true).js b/...tly serialize metadata when transpile with CommonJS option (verbatimModuleSyntax=true).js
diff --git a/... metadata when transpile with CommonJS option (verbatimModuleSyntax=true).oldTranspile.js b/... metadata when transpile with CommonJS option (verbatimModuleSyntax=true).oldTranspile.js
diff --git a/...elide import equals referenced only by export type (verbatimModuleSyntax=true).errors.txt b/...elide import equals referenced only by export type (verbatimModuleSyntax=true).errors.txt
@@ -0,0 +1,6 @@
+error TS5107: Option 'target=ES3' is deprecated and will stop functioning in TypeScript 5.5. Specify compilerOption '"ignoreDeprecations": "5.0"' to silence this error.
+
+
+!!! error TS5107: Option 'target=ES3' is deprecated and will stop functioning in TypeScript 5.5. Specify compilerOption '"ignoreDeprecations": "5.0"' to silence this error.
+==== file.ts (0 errors) ====
+    import IFoo = Namespace.IFoo;export type { IFoo };
diff --git a/...oes not elide import equals referenced only by export type (verbatimModuleSyntax=true).js b/...oes not elide import equals referenced only by export type (verbatimModuleSyntax=true).js
diff --git a/...equals referenced only by export type (verbatimModuleSyntax=true).oldTranspile.errors.txt b/...equals referenced only by export type (verbatimModuleSyntax=true).oldTranspile.errors.txt
@@ -0,0 +1,6 @@
+error TS5107: Option 'target=ES3' is deprecated and will stop functioning in TypeScript 5.5. Specify compilerOption '"ignoreDeprecations": "5.0"' to silence this error.
+
+
+!!! error TS5107: Option 'target=ES3' is deprecated and will stop functioning in TypeScript 5.5. Specify compilerOption '"ignoreDeprecations": "5.0"' to silence this error.
+==== file.ts (0 errors) ====
+    import IFoo = Namespace.IFoo;export type { IFoo };
diff --git a/... import equals referenced only by export type (verbatimModuleSyntax=true).oldTranspile.js b/... import equals referenced only by export type (verbatimModuleSyntax=true).oldTranspile.js
diff --git a/...uals referenced only by type only export specifier (verbatimModuleSyntax=true).errors.txt b/...uals referenced only by type only export specifier (verbatimModuleSyntax=true).errors.txt
@@ -0,0 +1,6 @@
+error TS5107: Option 'target=ES3' is deprecated and will stop functioning in TypeScript 5.5. Specify compilerOption '"ignoreDeprecations": "5.0"' to silence this error.
+
+
+!!! error TS5107: Option 'target=ES3' is deprecated and will stop functioning in TypeScript 5.5. Specify compilerOption '"ignoreDeprecations": "5.0"' to silence this error.
+==== file.ts (0 errors) ====
+    import IFoo = Namespace.IFoo;export { type IFoo };
diff --git a/...mport equals referenced only by type only export specifier (verbatimModuleSyntax=true).js b/...mport equals referenced only by type only export specifier (verbatimModuleSyntax=true).js
diff --git a/...ed only by type only export specifier (verbatimModuleSyntax=true).oldTranspile.errors.txt b/...ed only by type only export specifier (verbatimModuleSyntax=true).oldTranspile.errors.txt
@@ -0,0 +1,6 @@
+error TS5107: Option 'target=ES3' is deprecated and will stop functioning in TypeScript 5.5. Specify compilerOption '"ignoreDeprecations": "5.0"' to silence this error.
+
+
+!!! error TS5107: Option 'target=ES3' is deprecated and will stop functioning in TypeScript 5.5. Specify compilerOption '"ignoreDeprecations": "5.0"' to silence this error.
+==== file.ts (0 errors) ====
+    import IFoo = Namespace.IFoo;export { type IFoo };
diff --git a/...referenced only by type only export specifier (verbatimModuleSyntax=true).oldTranspile.js b/...referenced only by type only export specifier (verbatimModuleSyntax=true).oldTranspile.js
diff --git a/...e/transpile/Does not generate semantic diagnostics (verbatimModuleSyntax=true).errors.txt b/...e/transpile/Does not generate semantic diagnostics (verbatimModuleSyntax=true).errors.txt
@@ -0,0 +1,6 @@
+error TS5107: Option 'target=ES3' is deprecated and will stop functioning in TypeScript 5.5. Specify compilerOption '"ignoreDeprecations": "5.0"' to silence this error.
+
+
+!!! error TS5107: Option 'target=ES3' is deprecated and will stop functioning in TypeScript 5.5. Specify compilerOption '"ignoreDeprecations": "5.0"' to silence this error.
+==== file.ts (0 errors) ====
+    var x: string = 0;
diff --git a/...reference/transpile/Does not generate semantic diagnostics (verbatimModuleSyntax=true).js b/...reference/transpile/Does not generate semantic diagnostics (verbatimModuleSyntax=true).js
diff --git a/...oes not generate semantic diagnostics (verbatimModuleSyntax=true).oldTranspile.errors.txt b/...oes not generate semantic diagnostics (verbatimModuleSyntax=true).oldTranspile.errors.txt
@@ -0,0 +1,6 @@
+error TS5107: Option 'target=ES3' is deprecated and will stop functioning in TypeScript 5.5. Specify compilerOption '"ignoreDeprecations": "5.0"' to silence this error.
+
+
+!!! error TS5107: Option 'target=ES3' is deprecated and will stop functioning in TypeScript 5.5. Specify compilerOption '"ignoreDeprecations": "5.0"' to silence this error.
+==== file.ts (0 errors) ====
+    var x: string = 0;
diff --git a/...nspile/Does not generate semantic diagnostics (verbatimModuleSyntax=true).oldTranspile.js b/...nspile/Does not generate semantic diagnostics (verbatimModuleSyntax=true).oldTranspile.js
diff --git a/...transpile/Does not support setting isolatedModules (verbatimModuleSyntax=true).errors.txt b/...transpile/Does not support setting isolatedModules (verbatimModuleSyntax=true).errors.txt
@@ -0,0 +1,8 @@
+error TS5104: Option 'isolatedModules' is redundant and cannot be specified with option 'verbatimModuleSyntax'.
+error TS5107: Option 'target=ES3' is deprecated and will stop functioning in TypeScript 5.5. Specify compilerOption '"ignoreDeprecations": "5.0"' to silence this error.
+
+
+!!! error TS5104: Option 'isolatedModules' is redundant and cannot be specified with option 'verbatimModuleSyntax'.
+!!! error TS5107: Option 'target=ES3' is deprecated and will stop functioning in TypeScript 5.5. Specify compilerOption '"ignoreDeprecations": "5.0"' to silence this error.
+==== input.js (0 errors) ====
+    x;
diff --git a/...ference/transpile/Does not support setting isolatedModules (verbatimModuleSyntax=true).js b/...ference/transpile/Does not support setting isolatedModules (verbatimModuleSyntax=true).js
diff --git a/...s not support setting isolatedModules (verbatimModuleSyntax=true).oldTranspile.errors.txt b/...s not support setting isolatedModules (verbatimModuleSyntax=true).oldTranspile.errors.txt
@@ -0,0 +1,8 @@
+error TS5104: Option 'isolatedModules' is redundant and cannot be specified with option 'verbatimModuleSyntax'.
+error TS5107: Option 'target=ES3' is deprecated and will stop functioning in TypeScript 5.5. Specify compilerOption '"ignoreDeprecations": "5.0"' to silence this error.
+
+
+!!! error TS5104: Option 'isolatedModules' is redundant and cannot be specified with option 'verbatimModuleSyntax'.
+!!! error TS5107: Option 'target=ES3' is deprecated and will stop functioning in TypeScript 5.5. Specify compilerOption '"ignoreDeprecations": "5.0"' to silence this error.
+==== input.js (0 errors) ====
+    x;
diff --git a/...pile/Does not support setting isolatedModules (verbatimModuleSyntax=true).oldTranspile.js b/...pile/Does not support setting isolatedModules (verbatimModuleSyntax=true).oldTranspile.js
diff --git a/...ranspile/Export star as ns conflict does not crash (verbatimModuleSyntax=true).errors.txt b/...ranspile/Export star as ns conflict does not crash (verbatimModuleSyntax=true).errors.txt
@@ -0,0 +1,9 @@
+error TS5107: Option 'target=ES3' is deprecated and will stop functioning in TypeScript 5.5. Specify compilerOption '"ignoreDeprecations": "5.0"' to silence this error.
+
+
+!!! error TS5107: Option 'target=ES3' is deprecated and will stop functioning in TypeScript 5.5. Specify compilerOption '"ignoreDeprecations": "5.0"' to silence this error.
+==== file.ts (0 errors) ====
+
+    var a;
+    export { a as alias };
+    export * as alias from './file';
diff --git a/...erence/transpile/Export star as ns conflict does not crash (verbatimModuleSyntax=true).js b/...erence/transpile/Export star as ns conflict does not crash (verbatimModuleSyntax=true).js
diff --git a/...rt star as ns conflict does not crash (verbatimModuleSyntax=true).oldTranspile.errors.txt b/...rt star as ns conflict does not crash (verbatimModuleSyntax=true).oldTranspile.errors.txt
@@ -0,0 +1,9 @@
+error TS5107: Option 'target=ES3' is deprecated and will stop functioning in TypeScript 5.5. Specify compilerOption '"ignoreDeprecations": "5.0"' to silence this error.
+
+
+!!! error TS5107: Option 'target=ES3' is deprecated and will stop functioning in TypeScript 5.5. Specify compilerOption '"ignoreDeprecations": "5.0"' to silence this error.
+==== file.ts (0 errors) ====
+
+    var a;
+    export { a as alias };
+    export * as alias from './file';
diff --git a/...ile/Export star as ns conflict does not crash (verbatimModuleSyntax=true).oldTranspile.js b/...ile/Export star as ns conflict does not crash (verbatimModuleSyntax=true).oldTranspile.js
diff --git a/...transpile/Generates expected syntactic diagnostics (verbatimModuleSyntax=true).errors.txt b/...transpile/Generates expected syntactic diagnostics (verbatimModuleSyntax=true).errors.txt
@@ -0,0 +1,9 @@
+error TS5107: Option 'target=ES3' is deprecated and will stop functioning in TypeScript 5.5. Specify compilerOption '"ignoreDeprecations": "5.0"' to silence this error.
+file.ts(1,1): error TS1434: Unexpected keyword or identifier.
+
+
+!!! error TS5107: Option 'target=ES3' is deprecated and will stop functioning in TypeScript 5.5. Specify compilerOption '"ignoreDeprecations": "5.0"' to silence this error.
+==== file.ts (1 errors) ====
+    a b
+    ~
+!!! error TS1434: Unexpected keyword or identifier.
diff --git a/...ference/transpile/Generates expected syntactic diagnostics (verbatimModuleSyntax=true).js b/...ference/transpile/Generates expected syntactic diagnostics (verbatimModuleSyntax=true).js
diff --git a/...erates expected syntactic diagnostics (verbatimModuleSyntax=true).oldTranspile.errors.txt b/...erates expected syntactic diagnostics (verbatimModuleSyntax=true).oldTranspile.errors.txt
@@ -0,0 +1,9 @@
+error TS5107: Option 'target=ES3' is deprecated and will stop functioning in TypeScript 5.5. Specify compilerOption '"ignoreDeprecations": "5.0"' to silence this error.
+file.ts(1,1): error TS1434: Unexpected keyword or identifier.
+
+
+!!! error TS5107: Option 'target=ES3' is deprecated and will stop functioning in TypeScript 5.5. Specify compilerOption '"ignoreDeprecations": "5.0"' to silence this error.
+==== file.ts (1 errors) ====
+    a b
+    ~
+!!! error TS1434: Unexpected keyword or identifier.
diff --git a/...pile/Generates expected syntactic diagnostics (verbatimModuleSyntax=true).oldTranspile.js b/...pile/Generates expected syntactic diagnostics (verbatimModuleSyntax=true).oldTranspile.js
diff --git a/...nerates no diagnostics for missing file references (verbatimModuleSyntax=true).errors.txt b/...nerates no diagnostics for missing file references (verbatimModuleSyntax=true).errors.txt
@@ -0,0 +1,7 @@
+error TS5107: Option 'target=ES3' is deprecated and will stop functioning in TypeScript 5.5. Specify compilerOption '"ignoreDeprecations": "5.0"' to silence this error.
+
+
+!!! error TS5107: Option 'target=ES3' is deprecated and will stop functioning in TypeScript 5.5. Specify compilerOption '"ignoreDeprecations": "5.0"' to silence this error.
+==== file.ts (0 errors) ====
+    /// <reference path="file2.ts" />
+    var x = 0;
diff --git a/...spile/Generates no diagnostics for missing file references (verbatimModuleSyntax=true).js b/...spile/Generates no diagnostics for missing file references (verbatimModuleSyntax=true).js
diff --git a/...agnostics for missing file references (verbatimModuleSyntax=true).oldTranspile.errors.txt b/...agnostics for missing file references (verbatimModuleSyntax=true).oldTranspile.errors.txt
@@ -0,0 +1,7 @@
+error TS5107: Option 'target=ES3' is deprecated and will stop functioning in TypeScript 5.5. Specify compilerOption '"ignoreDeprecations": "5.0"' to silence this error.
+
+
+!!! error TS5107: Option 'target=ES3' is deprecated and will stop functioning in TypeScript 5.5. Specify compilerOption '"ignoreDeprecations": "5.0"' to silence this error.
+==== file.ts (0 errors) ====
+    /// <reference path="file2.ts" />
+    var x = 0;
diff --git a/...es no diagnostics for missing file references (verbatimModuleSyntax=true).oldTranspile.js b/...es no diagnostics for missing file references (verbatimModuleSyntax=true).oldTranspile.js
diff --git a/...enerates no diagnostics for missing module imports (verbatimModuleSyntax=true).errors.txt b/...enerates no diagnostics for missing module imports (verbatimModuleSyntax=true).errors.txt
@@ -0,0 +1,6 @@
+error TS5107: Option 'target=ES3' is deprecated and will stop functioning in TypeScript 5.5. Specify compilerOption '"ignoreDeprecations": "5.0"' to silence this error.
+
+
+!!! error TS5107: Option 'target=ES3' is deprecated and will stop functioning in TypeScript 5.5. Specify compilerOption '"ignoreDeprecations": "5.0"' to silence this error.
+==== file.ts (0 errors) ====
+    import {a} from "module2";
diff --git a/...nspile/Generates no diagnostics for missing module imports (verbatimModuleSyntax=true).js b/...nspile/Generates no diagnostics for missing module imports (verbatimModuleSyntax=true).js
diff --git a/...iagnostics for missing module imports (verbatimModuleSyntax=true).oldTranspile.errors.txt b/...iagnostics for missing module imports (verbatimModuleSyntax=true).oldTranspile.errors.txt
@@ -0,0 +1,6 @@
+error TS5107: Option 'target=ES3' is deprecated and will stop functioning in TypeScript 5.5. Specify compilerOption '"ignoreDeprecations": "5.0"' to silence this error.
+
+
+!!! error TS5107: Option 'target=ES3' is deprecated and will stop functioning in TypeScript 5.5. Specify compilerOption '"ignoreDeprecations": "5.0"' to silence this error.
+==== file.ts (0 errors) ====
+    import {a} from "module2";
diff --git a/...tes no diagnostics for missing module imports (verbatimModuleSyntax=true).oldTranspile.js b/...tes no diagnostics for missing module imports (verbatimModuleSyntax=true).oldTranspile.js
diff --git a/...anspile/Generates no diagnostics with valid inputs (verbatimModuleSyntax=true).errors.txt b/...anspile/Generates no diagnostics with valid inputs (verbatimModuleSyntax=true).errors.txt
@@ -0,0 +1,6 @@
+error TS5107: Option 'target=ES3' is deprecated and will stop functioning in TypeScript 5.5. Specify compilerOption '"ignoreDeprecations": "5.0"' to silence this error.
+
+
+!!! error TS5107: Option 'target=ES3' is deprecated and will stop functioning in TypeScript 5.5. Specify compilerOption '"ignoreDeprecations": "5.0"' to silence this error.
+==== file.ts (0 errors) ====
+    var x = 0;