🤖 Pick PR #53240 (Allow 'verbatimModuleSyntax' with t...) into release-5.0 (#53253)

Co-authored-by: Daniel Rosenwasser <DanielRosenwasser@users.noreply.github.com>
Co-authored-by: typescript-bot <typescript@microsoft.com>

Author: 3 people

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;

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"
+      ]);
     }
   });
 

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"
+      ]);
     }
   });
 

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;
     }
 

src/testRunner/unittests/services/transpile.ts

@@ -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 };

tests/baselines/reference/transpile/Correctly serialize metadata when transpile with CommonJS option (verbatimModuleSyntax=true).js

@@ -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 };