From 96fe0396a48aa5ae0eed42c5c16b7b4d807acf9d Mon Sep 17 00:00:00 2001
From: TypeScript Bot <typescriptbot@microsoft.com>
Date: Sat, 6 Aug 2022 06:08:54 +0000
Subject: [PATCH 01/18] Update package-lock.json

---
 package-lock.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 1873c9e11ed38..4f540986ab50c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2847,9 +2847,9 @@
             }
         },
         "node_modules/ext/node_modules/type": {
-            "version": "2.7.1",
-            "resolved": "https://registry.npmjs.org/type/-/type-2.7.1.tgz",
-            "integrity": "sha512-rLp+w60+leZDK0J0r1Q+ZVAEoRjBs/qxEeHhfizjG9dHfv0cpfWDPI8U/qiNPQdEw5Tlb+yOo54jnFQw8yGOZA==",
+            "version": "2.7.2",
+            "resolved": "https://registry.npmjs.org/type/-/type-2.7.2.tgz",
+            "integrity": "sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==",
             "dev": true
         },
         "node_modules/extend": {
@@ -10870,9 +10870,9 @@
             },
             "dependencies": {
                 "type": {
-                    "version": "2.7.1",
-                    "resolved": "https://registry.npmjs.org/type/-/type-2.7.1.tgz",
-                    "integrity": "sha512-rLp+w60+leZDK0J0r1Q+ZVAEoRjBs/qxEeHhfizjG9dHfv0cpfWDPI8U/qiNPQdEw5Tlb+yOo54jnFQw8yGOZA==",
+                    "version": "2.7.2",
+                    "resolved": "https://registry.npmjs.org/type/-/type-2.7.2.tgz",
+                    "integrity": "sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==",
                     "dev": true
                 }
             }

From 7e4259121b8a65c67574f32224c29b199436f9fe Mon Sep 17 00:00:00 2001
From: TypeScript Bot <typescriptbot@microsoft.com>
Date: Sun, 7 Aug 2022 06:06:32 +0000
Subject: [PATCH 02/18] Update package-lock.json

---
 package-lock.json | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 4f540986ab50c..8470ca0b706f4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6132,14 +6132,14 @@
             }
         },
         "node_modules/object.assign": {
-            "version": "4.1.2",
-            "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
-            "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
+            "version": "4.1.3",
+            "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.3.tgz",
+            "integrity": "sha512-ZFJnX3zltyjcYJL0RoCJuzb+11zWGyaDbjgxZbdV7rFEcHQuYxrZqhow67aA7xpes6LhojyFDaBKAFfogQrikA==",
             "dev": true,
             "dependencies": {
-                "call-bind": "^1.0.0",
-                "define-properties": "^1.1.3",
-                "has-symbols": "^1.0.1",
+                "call-bind": "^1.0.2",
+                "define-properties": "^1.1.4",
+                "has-symbols": "^1.0.3",
                 "object-keys": "^1.1.1"
             },
             "engines": {
@@ -13432,14 +13432,14 @@
             }
         },
         "object.assign": {
-            "version": "4.1.2",
-            "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
-            "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
+            "version": "4.1.3",
+            "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.3.tgz",
+            "integrity": "sha512-ZFJnX3zltyjcYJL0RoCJuzb+11zWGyaDbjgxZbdV7rFEcHQuYxrZqhow67aA7xpes6LhojyFDaBKAFfogQrikA==",
             "dev": true,
             "requires": {
-                "call-bind": "^1.0.0",
-                "define-properties": "^1.1.3",
-                "has-symbols": "^1.0.1",
+                "call-bind": "^1.0.2",
+                "define-properties": "^1.1.4",
+                "has-symbols": "^1.0.3",
                 "object-keys": "^1.1.1"
             }
         },

From 363099482aa20673b9197aca275444696f87a6db Mon Sep 17 00:00:00 2001
From: Alex Hsu <csigs@users.noreply.github.com>
Date: Sun, 7 Aug 2022 04:59:36 -0700
Subject: [PATCH 03/18] LEGO: Merge pull request 50212

LEGO: Merge pull request 50212
---
 .../diagnosticMessages.generated.json.lcl     | 52 ++++++++++++++++++-
 .../diagnosticMessages.generated.json.lcl     | 52 ++++++++++++++++++-
 .../diagnosticMessages.generated.json.lcl     | 52 ++++++++++++++++++-
 .../diagnosticMessages.generated.json.lcl     | 52 ++++++++++++++++++-
 .../diagnosticMessages.generated.json.lcl     | 52 ++++++++++++++++++-
 .../diagnosticMessages.generated.json.lcl     | 52 ++++++++++++++++++-
 .../diagnosticMessages.generated.json.lcl     | 52 ++++++++++++++++++-
 .../diagnosticMessages.generated.json.lcl     | 52 ++++++++++++++++++-
 .../diagnosticMessages.generated.json.lcl     | 52 ++++++++++++++++++-
 .../diagnosticMessages.generated.json.lcl     | 52 ++++++++++++++++++-
 10 files changed, 500 insertions(+), 20 deletions(-)

diff --git a/src/loc/lcl/cht/diagnosticMessages/diagnosticMessages.generated.json.lcl b/src/loc/lcl/cht/diagnosticMessages/diagnosticMessages.generated.json.lcl
index abab165df1dbb..27b23260dc608 100644
--- a/src/loc/lcl/cht/diagnosticMessages/diagnosticMessages.generated.json.lcl
+++ b/src/loc/lcl/cht/diagnosticMessages/diagnosticMessages.generated.json.lcl
@@ -8561,10 +8561,13 @@
       </Item>
       <Item ItemId=";Module_0_cannot_be_imported_using_this_construct_The_specifier_only_resolves_to_an_ES_module_which_c_1471" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
-          <Val><![CDATA[Module '{0}' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported synchronously. Use dynamic import instead.]]></Val>
+          <Val><![CDATA[Module '{0}' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[無法使用此構造匯入模組 '{0}'。指定名稱只能解析成無法同步匯入的 ES 模組。請改為使用動態匯入。]]></Val>
+            <Val><![CDATA[無法使用此建構匯入模組 '{0}'。指定名稱只能解析成無法以 'require' 匯入的 ES 模組。請改為使用 ECMAScript 匯入。]]></Val>
           </Tgt>
+          <Prev Cat="Text">
+            <Val><![CDATA[Module '{0}' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported synchronously. Use dynamic import instead.]]></Val>
+          </Prev>
         </Str>
         <Disp Icon="Str" />
       </Item>
@@ -12840,6 +12843,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";The_current_file_is_a_CommonJS_module_whose_imports_will_produce_require_calls_however_the_reference_1479" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("{0}")' call instead.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[目前的檔案是 CommonJS 模組，其匯入將會產生 'require' 呼叫;不過，參考的檔案是 ECMAScript 模組，無法以 'require' 匯入。請考慮改為撰寫動態 'import("{0}")' 呼叫。]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";The_current_host_does_not_support_the_0_option_5001" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[The current host does not support the '{0}' option.]]></Val>
@@ -13929,6 +13941,42 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";To_convert_this_file_to_an_ECMAScript_module_add_the_field_type_Colon_module_to_0_1482" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[To convert this file to an ECMAScript module, add the field `"type": "module"` to '{0}'.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[若要將此檔案轉換為 ECMAScript 模組，請將欄位 `{ "type": "module" }` 新增至 '{0}'。]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
+      <Item ItemId=";To_convert_this_file_to_an_ECMAScript_module_change_its_file_extension_to_0_or_add_the_field_type_Co_1481" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[To convert this file to an ECMAScript module, change its file extension to '{0}', or add the field `"type": "module"` to '{1}'.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[若要將此檔案轉換為 ECMAScript 模組，請將其副檔名變更為 '{0}'，或將欄位 `"type": "module"` 新增至 '{1}'。]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
+      <Item ItemId=";To_convert_this_file_to_an_ECMAScript_module_change_its_file_extension_to_0_or_create_a_local_packag_1480" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[To convert this file to an ECMAScript module, change its file extension to '{0}' or create a local package.json file with `{ "type": "module" }`.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[若要將此檔案轉換為 ECMAScript 模組，請將其副檔名變更為 '{0}'，或使用 `{ "type": "module" }` 建立本機 package.json 檔案。]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
+      <Item ItemId=";To_convert_this_file_to_an_ECMAScript_module_create_a_local_package_json_file_with_type_Colon_module_1483" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[To convert this file to an ECMAScript module, create a local package.json file with `{ "type": "module" }`.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[若要將此檔案轉換為 ECMAScript 模組，請建立具有 `{ "type": "module" }` 的本機 package.json 檔案。]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";Top_level_await_expressions_are_only_allowed_when_the_module_option_is_set_to_es2022_esnext_system_n_1378" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Top-level 'await' expressions are only allowed when the 'module' option is set to 'es2022', 'esnext', 'system', 'node16', or 'nodenext', and the 'target' option is set to 'es2017' or higher.]]></Val>
diff --git a/src/loc/lcl/csy/diagnosticMessages/diagnosticMessages.generated.json.lcl b/src/loc/lcl/csy/diagnosticMessages/diagnosticMessages.generated.json.lcl
index a81200837764e..4446a4dff7012 100644
--- a/src/loc/lcl/csy/diagnosticMessages/diagnosticMessages.generated.json.lcl
+++ b/src/loc/lcl/csy/diagnosticMessages/diagnosticMessages.generated.json.lcl
@@ -8570,10 +8570,13 @@
       </Item>
       <Item ItemId=";Module_0_cannot_be_imported_using_this_construct_The_specifier_only_resolves_to_an_ES_module_which_c_1471" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
-          <Val><![CDATA[Module '{0}' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported synchronously. Use dynamic import instead.]]></Val>
+          <Val><![CDATA[Module '{0}' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Modul {0} nejde importovat pomocí této konstrukce. Specifikátor se převede jenom na modul ES, který se nedá importovat synchronně. Místo toho použijte dynamický import.]]></Val>
+            <Val><![CDATA[Modul {0} nejde importovat pomocí této konstrukce. Specifikátor se převede jenom na modul ES, který se nedá importovat s příkazem require. Místo toho použijte import ECMAScript.]]></Val>
           </Tgt>
+          <Prev Cat="Text">
+            <Val><![CDATA[Module '{0}' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported synchronously. Use dynamic import instead.]]></Val>
+          </Prev>
         </Str>
         <Disp Icon="Str" />
       </Item>
@@ -12849,6 +12852,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";The_current_file_is_a_CommonJS_module_whose_imports_will_produce_require_calls_however_the_reference_1479" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("{0}")' call instead.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Aktuální soubor je modul CommonJS, jehož importy vytvoří volání require. Odkazovaný soubor je však modul ECMAScript a nelze ho importovat pomocí příkazu require. Raději zvažte vytvoření dynamického volání import("{0}").]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";The_current_host_does_not_support_the_0_option_5001" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[The current host does not support the '{0}' option.]]></Val>
@@ -13938,6 +13950,42 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";To_convert_this_file_to_an_ECMAScript_module_add_the_field_type_Colon_module_to_0_1482" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[To convert this file to an ECMAScript module, add the field `"type": "module"` to '{0}'.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Pokud chcete tento soubor převést na modul ECMAScript, přidejte pole "type": "module" do {0}.]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
+      <Item ItemId=";To_convert_this_file_to_an_ECMAScript_module_change_its_file_extension_to_0_or_add_the_field_type_Co_1481" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[To convert this file to an ECMAScript module, change its file extension to '{0}', or add the field `"type": "module"` to '{1}'.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Pokud chcete tento soubor převést na modul ECMAScript, změňte jeho příponu na {0}" nebo přidejte pole "type": "module" do {1}.]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
+      <Item ItemId=";To_convert_this_file_to_an_ECMAScript_module_change_its_file_extension_to_0_or_create_a_local_packag_1480" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[To convert this file to an ECMAScript module, change its file extension to '{0}' or create a local package.json file with `{ "type": "module" }`.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Pokud chcete tento soubor převést na modul ECMAScript, změňte jeho příponu na {0} nebo vytvořte místní soubor package.json s {"type": "module"}.]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
+      <Item ItemId=";To_convert_this_file_to_an_ECMAScript_module_create_a_local_package_json_file_with_type_Colon_module_1483" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[To convert this file to an ECMAScript module, create a local package.json file with `{ "type": "module" }`.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Pokud chcete tento soubor převést na modul ECMAScript, vytvořte místní soubor package.json s { "type": "module" }.]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";Top_level_await_expressions_are_only_allowed_when_the_module_option_is_set_to_es2022_esnext_system_n_1378" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Top-level 'await' expressions are only allowed when the 'module' option is set to 'es2022', 'esnext', 'system', 'node16', or 'nodenext', and the 'target' option is set to 'es2017' or higher.]]></Val>
diff --git a/src/loc/lcl/deu/diagnosticMessages/diagnosticMessages.generated.json.lcl b/src/loc/lcl/deu/diagnosticMessages/diagnosticMessages.generated.json.lcl
index f5a0b3c3884ff..29250b5d8d90c 100644
--- a/src/loc/lcl/deu/diagnosticMessages/diagnosticMessages.generated.json.lcl
+++ b/src/loc/lcl/deu/diagnosticMessages/diagnosticMessages.generated.json.lcl
@@ -8558,10 +8558,13 @@
       </Item>
       <Item ItemId=";Module_0_cannot_be_imported_using_this_construct_The_specifier_only_resolves_to_an_ES_module_which_c_1471" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
-          <Val><![CDATA[Module '{0}' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported synchronously. Use dynamic import instead.]]></Val>
+          <Val><![CDATA[Module '{0}' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Das Modul "{0}" kann nicht mithilfe dieses Konstrukts importiert werden. Der Spezifizierer wird nur in ein ES-Modul aufgelöst, das nicht synchron importiert werden kann. Verwenden Sie stattdessen den dynamischen Import.]]></Val>
+            <Val><![CDATA[Das Modul "{0}" kann nicht mit diesem Konstrukt importiert werden. Der Spezifizierer wird nur in ein ES-Modul aufgelöst, das nicht mit "require" importiert werden kann. Verwenden Sie stattdessen einen ECMAScript-Import.]]></Val>
           </Tgt>
+          <Prev Cat="Text">
+            <Val><![CDATA[Module '{0}' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported synchronously. Use dynamic import instead.]]></Val>
+          </Prev>
         </Str>
         <Disp Icon="Str" />
       </Item>
@@ -12834,6 +12837,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";The_current_file_is_a_CommonJS_module_whose_imports_will_produce_require_calls_however_the_reference_1479" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("{0}")' call instead.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Die aktuelle Datei ist ein CommonJS-Modul, dessen Importe "require"-Aufrufe generieren. Die Datei, auf die verwiesen wird, ist jedoch ein ECMAScript-Modul und kann nicht mit "require" importiert werden. Erwägen Sie stattdessen, einen dynamischen 'import("{0}")'-Aufruf zu schreiben.]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";The_current_host_does_not_support_the_0_option_5001" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[The current host does not support the '{0}' option.]]></Val>
@@ -13923,6 +13935,42 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";To_convert_this_file_to_an_ECMAScript_module_add_the_field_type_Colon_module_to_0_1482" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[To convert this file to an ECMAScript module, add the field `"type": "module"` to '{0}'.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Um diese Datei in ein ECMAScript-Modul zu konvertieren, fügen Sie das Feld "type": "module" zu "{0}" hinzu.]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
+      <Item ItemId=";To_convert_this_file_to_an_ECMAScript_module_change_its_file_extension_to_0_or_add_the_field_type_Co_1481" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[To convert this file to an ECMAScript module, change its file extension to '{0}', or add the field `"type": "module"` to '{1}'.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Um diese Datei in ein ECMAScript-Modul zu konvertieren, ändern Sie die Dateierweiterung in "{0}", oder fügen Sie das Feld ''type': 'module'' zu "{1}" hinzu.]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
+      <Item ItemId=";To_convert_this_file_to_an_ECMAScript_module_change_its_file_extension_to_0_or_create_a_local_packag_1480" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[To convert this file to an ECMAScript module, change its file extension to '{0}' or create a local package.json file with `{ "type": "module" }`.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Um diese Datei in ein ECMAScript-Modul zu konvertieren, ändern Sie ihre Dateierweiterung in '{0}', oder erstellen Sie eine lokale package.json-Datei mit `{ "type": "module" }`.]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
+      <Item ItemId=";To_convert_this_file_to_an_ECMAScript_module_create_a_local_package_json_file_with_type_Colon_module_1483" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[To convert this file to an ECMAScript module, create a local package.json file with `{ "type": "module" }`.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Um diese Datei in ein ECMAScript-Modul zu konvertieren, erstellen Sie eine lokale package.json-Datei mit `{ "type": "module" }`.]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";Top_level_await_expressions_are_only_allowed_when_the_module_option_is_set_to_es2022_esnext_system_n_1378" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Top-level 'await' expressions are only allowed when the 'module' option is set to 'es2022', 'esnext', 'system', 'node16', or 'nodenext', and the 'target' option is set to 'es2017' or higher.]]></Val>
diff --git a/src/loc/lcl/esn/diagnosticMessages/diagnosticMessages.generated.json.lcl b/src/loc/lcl/esn/diagnosticMessages/diagnosticMessages.generated.json.lcl
index 0d170e46feeab..29168b58edd1b 100644
--- a/src/loc/lcl/esn/diagnosticMessages/diagnosticMessages.generated.json.lcl
+++ b/src/loc/lcl/esn/diagnosticMessages/diagnosticMessages.generated.json.lcl
@@ -8573,10 +8573,13 @@
       </Item>
       <Item ItemId=";Module_0_cannot_be_imported_using_this_construct_The_specifier_only_resolves_to_an_ES_module_which_c_1471" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
-          <Val><![CDATA[Module '{0}' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported synchronously. Use dynamic import instead.]]></Val>
+          <Val><![CDATA[Module '{0}' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[El módulo "{0}" no se puede importar usando esta construcción. El especificador solo se resuelve en un módulo ES, que no se puede importar de forma sincrónica. En su lugar, use la importación dinámica.]]></Val>
+            <Val><![CDATA[El módulo "{0}" no se puede importar con esta construcción. El especificador solo se resuelve en un módulo ES, que no se puede importar con "require". En su lugar, use una importación de ECMAScript.]]></Val>
           </Tgt>
+          <Prev Cat="Text">
+            <Val><![CDATA[Module '{0}' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported synchronously. Use dynamic import instead.]]></Val>
+          </Prev>
         </Str>
         <Disp Icon="Str" />
       </Item>
@@ -12852,6 +12855,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";The_current_file_is_a_CommonJS_module_whose_imports_will_produce_require_calls_however_the_reference_1479" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("{0}")' call instead.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[El archivo actual es un módulo CommonJS cuyas importaciones generarán llamadas "require"; sin embargo, el archivo al que se hace referencia es un módulo ECMAScript y no se puede importar con "require". Considere la posibilidad de escribir una llamada dinámica "import("{0}")" en su lugar.]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";The_current_host_does_not_support_the_0_option_5001" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[The current host does not support the '{0}' option.]]></Val>
@@ -13941,6 +13953,42 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";To_convert_this_file_to_an_ECMAScript_module_add_the_field_type_Colon_module_to_0_1482" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[To convert this file to an ECMAScript module, add the field `"type": "module"` to '{0}'.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Para convertir este archivo en un módulo ECMAScript, agregue el campo `"type": "module"` a "{0}"'.]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
+      <Item ItemId=";To_convert_this_file_to_an_ECMAScript_module_change_its_file_extension_to_0_or_add_the_field_type_Co_1481" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[To convert this file to an ECMAScript module, change its file extension to '{0}', or add the field `"type": "module"` to '{1}'.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Para convertir este archivo en un módulo ECMAScript, cambie su extensión de archivo a "{0}" o agregue el campo `"type": "module"` a "{1}".]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
+      <Item ItemId=";To_convert_this_file_to_an_ECMAScript_module_change_its_file_extension_to_0_or_create_a_local_packag_1480" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[To convert this file to an ECMAScript module, change its file extension to '{0}' or create a local package.json file with `{ "type": "module" }`.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Para convertir este archivo en un módulo ECMAScript, cambie su extensión de archivo a "{0}" o cree un archivo package.json local con '{ "type": "module" }'.]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
+      <Item ItemId=";To_convert_this_file_to_an_ECMAScript_module_create_a_local_package_json_file_with_type_Colon_module_1483" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[To convert this file to an ECMAScript module, create a local package.json file with `{ "type": "module" }`.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Para convertir este archivo en un módulo ECMAScript, cree un archivo package.json local con `{ "type": "module" }`.]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";Top_level_await_expressions_are_only_allowed_when_the_module_option_is_set_to_es2022_esnext_system_n_1378" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Top-level 'await' expressions are only allowed when the 'module' option is set to 'es2022', 'esnext', 'system', 'node16', or 'nodenext', and the 'target' option is set to 'es2017' or higher.]]></Val>
diff --git a/src/loc/lcl/fra/diagnosticMessages/diagnosticMessages.generated.json.lcl b/src/loc/lcl/fra/diagnosticMessages/diagnosticMessages.generated.json.lcl
index 45ce7281dd551..39ee5b91a8a22 100644
--- a/src/loc/lcl/fra/diagnosticMessages/diagnosticMessages.generated.json.lcl
+++ b/src/loc/lcl/fra/diagnosticMessages/diagnosticMessages.generated.json.lcl
@@ -8573,10 +8573,13 @@
       </Item>
       <Item ItemId=";Module_0_cannot_be_imported_using_this_construct_The_specifier_only_resolves_to_an_ES_module_which_c_1471" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
-          <Val><![CDATA[Module '{0}' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported synchronously. Use dynamic import instead.]]></Val>
+          <Val><![CDATA[Module '{0}' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Vous ne pouvez pas importer le module « {0} » à l’aide de cette construction. Le spécificateur se résout uniquement en module ES, que vous ne pouvez pas importer de manière synchrone. Utilisez l’importation dynamique à la place.]]></Val>
+            <Val><![CDATA[Le module '{0}' ne peut pas être importé à l'aide de cette construction. Le spécificateur se résout uniquement en un module ES, qui ne peut pas être importé avec 'require'. Utilisez plutôt une importation ECMAScript.]]></Val>
           </Tgt>
+          <Prev Cat="Text">
+            <Val><![CDATA[Module '{0}' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported synchronously. Use dynamic import instead.]]></Val>
+          </Prev>
         </Str>
         <Disp Icon="Str" />
       </Item>
@@ -12852,6 +12855,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";The_current_file_is_a_CommonJS_module_whose_imports_will_produce_require_calls_however_the_reference_1479" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("{0}")' call instead.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Le fichier actuel est un module CommonJS dont les importations produiront des appels 'require' ; cependant, le fichier référencé est un module ECMAScript et ne peut pas être importé avec 'require'. Envisagez d'écrire un appel dynamique 'import("{0}")' à la place.]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";The_current_host_does_not_support_the_0_option_5001" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[The current host does not support the '{0}' option.]]></Val>
@@ -13941,6 +13953,42 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";To_convert_this_file_to_an_ECMAScript_module_add_the_field_type_Colon_module_to_0_1482" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[To convert this file to an ECMAScript module, add the field `"type": "module"` to '{0}'.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Pour convertir ce fichier en module ECMAScript, ajoutez le champ `"type" : "module"` à '{0}'.]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
+      <Item ItemId=";To_convert_this_file_to_an_ECMAScript_module_change_its_file_extension_to_0_or_add_the_field_type_Co_1481" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[To convert this file to an ECMAScript module, change its file extension to '{0}', or add the field `"type": "module"` to '{1}'.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Pour convertir ce fichier en module ECMAScript, changez son extension de fichier en '{0}', ou ajoutez le champ `"type" : "module"` à '{1}'.]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
+      <Item ItemId=";To_convert_this_file_to_an_ECMAScript_module_change_its_file_extension_to_0_or_create_a_local_packag_1480" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[To convert this file to an ECMAScript module, change its file extension to '{0}' or create a local package.json file with `{ "type": "module" }`.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Pour convertir ce fichier en module ECMAScript, changez son extension de fichier en '{0}' ou créez un fichier package.json local avec `{ "type": "module" }`.]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
+      <Item ItemId=";To_convert_this_file_to_an_ECMAScript_module_create_a_local_package_json_file_with_type_Colon_module_1483" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[To convert this file to an ECMAScript module, create a local package.json file with `{ "type": "module" }`.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Pour convertir ce fichier en module ECMAScript, créez un fichier package.json local avec `{ "type": "module" }`.]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";Top_level_await_expressions_are_only_allowed_when_the_module_option_is_set_to_es2022_esnext_system_n_1378" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Top-level 'await' expressions are only allowed when the 'module' option is set to 'es2022', 'esnext', 'system', 'node16', or 'nodenext', and the 'target' option is set to 'es2017' or higher.]]></Val>
diff --git a/src/loc/lcl/ita/diagnosticMessages/diagnosticMessages.generated.json.lcl b/src/loc/lcl/ita/diagnosticMessages/diagnosticMessages.generated.json.lcl
index 0e7be0c7327f1..522c07c9c091a 100644
--- a/src/loc/lcl/ita/diagnosticMessages/diagnosticMessages.generated.json.lcl
+++ b/src/loc/lcl/ita/diagnosticMessages/diagnosticMessages.generated.json.lcl
@@ -8561,10 +8561,13 @@
       </Item>
       <Item ItemId=";Module_0_cannot_be_imported_using_this_construct_The_specifier_only_resolves_to_an_ES_module_which_c_1471" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
-          <Val><![CDATA[Module '{0}' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported synchronously. Use dynamic import instead.]]></Val>
+          <Val><![CDATA[Module '{0}' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Non è possibile importare il modulo ' {0}' utilizzando questo costrutto. L'identificatore può essere solo risolto in un modulo ES, che non può essere importato in modo sincrono. Utilizzare l'importazione dinamica.]]></Val>
+            <Val><![CDATA[Non è possibile importare il modulo '{0}' utilizzando questo costrutto. L'identificatore può essere solo risolto in un modulo ES, che non può essere importato con 'require'. Usare invece un'importazione ECMAScript.]]></Val>
           </Tgt>
+          <Prev Cat="Text">
+            <Val><![CDATA[Module '{0}' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported synchronously. Use dynamic import instead.]]></Val>
+          </Prev>
         </Str>
         <Disp Icon="Str" />
       </Item>
@@ -12840,6 +12843,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";The_current_file_is_a_CommonJS_module_whose_imports_will_produce_require_calls_however_the_reference_1479" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("{0}")' call instead.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Il file corrente è un modulo CommonJS le cui importazioni genereranno chiamate 'require'. Tuttavia, il file a cui si fa riferimento è un modulo ECMAScript e non può essere importato con 'require'. Provare a scrivere una chiamata 'import("{0}")' dinamica.]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";The_current_host_does_not_support_the_0_option_5001" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[The current host does not support the '{0}' option.]]></Val>
@@ -13929,6 +13941,42 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";To_convert_this_file_to_an_ECMAScript_module_add_the_field_type_Colon_module_to_0_1482" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[To convert this file to an ECMAScript module, add the field `"type": "module"` to '{0}'.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Per convertire questo file in un modulo ECMAScript, aggiungere il campo '"type": "module"' a '{0}'.]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
+      <Item ItemId=";To_convert_this_file_to_an_ECMAScript_module_change_its_file_extension_to_0_or_add_the_field_type_Co_1481" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[To convert this file to an ECMAScript module, change its file extension to '{0}', or add the field `"type": "module"` to '{1}'.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Per convertire il file in un modulo ECMAScript, modificarne l'estensione in '{0}' oppure aggiungere il campo '"type": "module"' a '{1}'.]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
+      <Item ItemId=";To_convert_this_file_to_an_ECMAScript_module_change_its_file_extension_to_0_or_create_a_local_packag_1480" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[To convert this file to an ECMAScript module, change its file extension to '{0}' or create a local package.json file with `{ "type": "module" }`.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Per convertire questo file in un modulo ECMAScript, modificarne l'estensione in '{0}' o creare un file package.json locale con '{ "type": "module" }'.]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
+      <Item ItemId=";To_convert_this_file_to_an_ECMAScript_module_create_a_local_package_json_file_with_type_Colon_module_1483" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[To convert this file to an ECMAScript module, create a local package.json file with `{ "type": "module" }`.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Per convertire questo file in un modulo ECMAScript, creare un file package.json locale con '{ "type": "module" }'.]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";Top_level_await_expressions_are_only_allowed_when_the_module_option_is_set_to_es2022_esnext_system_n_1378" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Top-level 'await' expressions are only allowed when the 'module' option is set to 'es2022', 'esnext', 'system', 'node16', or 'nodenext', and the 'target' option is set to 'es2017' or higher.]]></Val>
diff --git a/src/loc/lcl/jpn/diagnosticMessages/diagnosticMessages.generated.json.lcl b/src/loc/lcl/jpn/diagnosticMessages/diagnosticMessages.generated.json.lcl
index a5453e8390ea2..0ee2a5fcc30c6 100644
--- a/src/loc/lcl/jpn/diagnosticMessages/diagnosticMessages.generated.json.lcl
+++ b/src/loc/lcl/jpn/diagnosticMessages/diagnosticMessages.generated.json.lcl
@@ -8561,10 +8561,13 @@
       </Item>
       <Item ItemId=";Module_0_cannot_be_imported_using_this_construct_The_specifier_only_resolves_to_an_ES_module_which_c_1471" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
-          <Val><![CDATA[Module '{0}' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported synchronously. Use dynamic import instead.]]></Val>
+          <Val><![CDATA[Module '{0}' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[モジュール '{0}' はこのコンストラクトではインポートできません。指定子は ES モジュールに対してのみ解決されるため、同期的にインポートすることはできません。代わりに動的インポートを使用します。]]></Val>
+            <Val><![CDATA[モジュール '{0}' はこのコンストラクトではインポートできません。指定子は ES モジュールに解決されるだけであるため、'require' でインポートすることはできません。代わりに ECMAScript インポートを使用してください。]]></Val>
           </Tgt>
+          <Prev Cat="Text">
+            <Val><![CDATA[Module '{0}' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported synchronously. Use dynamic import instead.]]></Val>
+          </Prev>
         </Str>
         <Disp Icon="Str" />
       </Item>
@@ -12840,6 +12843,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";The_current_file_is_a_CommonJS_module_whose_imports_will_produce_require_calls_however_the_reference_1479" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("{0}")' call instead.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[現在のファイルは CommonJS モジュールであり、このインポートでは 'require' 呼び出しが生成されますが、参照ファイルは ECMAScript モジュールであるため、'require' ではインポートできません。代わりに動的な 'import("{0}")' 呼び出しを記述することを検討してください。]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";The_current_host_does_not_support_the_0_option_5001" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[The current host does not support the '{0}' option.]]></Val>
@@ -13929,6 +13941,42 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";To_convert_this_file_to_an_ECMAScript_module_add_the_field_type_Colon_module_to_0_1482" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[To convert this file to an ECMAScript module, add the field `"type": "module"` to '{0}'.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[このファイルを ECMAScript モジュールに変換するには、フィールド '"type": "module"' を '{0}' に追加します。]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
+      <Item ItemId=";To_convert_this_file_to_an_ECMAScript_module_change_its_file_extension_to_0_or_add_the_field_type_Co_1481" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[To convert this file to an ECMAScript module, change its file extension to '{0}', or add the field `"type": "module"` to '{1}'.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[このファイルを ECMAScript モジュールに変換するには、ファイル拡張子を '{0}' に変更するか、フィールド '"type": "module"' を '{1}' に追加します。]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
+      <Item ItemId=";To_convert_this_file_to_an_ECMAScript_module_change_its_file_extension_to_0_or_create_a_local_packag_1480" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[To convert this file to an ECMAScript module, change its file extension to '{0}' or create a local package.json file with `{ "type": "module" }`.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[このファイルを ECMAScript モジュールに変換するには、ファイル拡張子を '{0}' に変更するか、'{ "type": "module" }' を含むローカルの package.json ファイルを作成します。]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
+      <Item ItemId=";To_convert_this_file_to_an_ECMAScript_module_create_a_local_package_json_file_with_type_Colon_module_1483" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[To convert this file to an ECMAScript module, create a local package.json file with `{ "type": "module" }`.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[このファイルを ECMAScript モジュールに変換するには、'{ "type": "module" }' を含むローカルの package.json ファイルを作成します。]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";Top_level_await_expressions_are_only_allowed_when_the_module_option_is_set_to_es2022_esnext_system_n_1378" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Top-level 'await' expressions are only allowed when the 'module' option is set to 'es2022', 'esnext', 'system', 'node16', or 'nodenext', and the 'target' option is set to 'es2017' or higher.]]></Val>
diff --git a/src/loc/lcl/kor/diagnosticMessages/diagnosticMessages.generated.json.lcl b/src/loc/lcl/kor/diagnosticMessages/diagnosticMessages.generated.json.lcl
index 3ae246ec99a99..3060345c9fded 100644
--- a/src/loc/lcl/kor/diagnosticMessages/diagnosticMessages.generated.json.lcl
+++ b/src/loc/lcl/kor/diagnosticMessages/diagnosticMessages.generated.json.lcl
@@ -8561,10 +8561,13 @@
       </Item>
       <Item ItemId=";Module_0_cannot_be_imported_using_this_construct_The_specifier_only_resolves_to_an_ES_module_which_c_1471" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
-          <Val><![CDATA[Module '{0}' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported synchronously. Use dynamic import instead.]]></Val>
+          <Val><![CDATA[Module '{0}' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[이 구성을 사용하여 모듈 '{0}'을(를) 가져올 수 없습니다. 지정자는 동기적으로 가져올 수 없는 ES 모듈로만 확인됩니다. 대신 동적 가져오기를 사용하세요.]]></Val>
+            <Val><![CDATA[이 구문을 사용하여 '{0}' 모듈을 가져올 수 없습니다. 지정자는 'require'로 가져올 수 없는 ES 모듈로만 확인됩니다. ECMAScript 가져오기를 대신 사용하세요.]]></Val>
           </Tgt>
+          <Prev Cat="Text">
+            <Val><![CDATA[Module '{0}' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported synchronously. Use dynamic import instead.]]></Val>
+          </Prev>
         </Str>
         <Disp Icon="Str" />
       </Item>
@@ -12840,6 +12843,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";The_current_file_is_a_CommonJS_module_whose_imports_will_produce_require_calls_however_the_reference_1479" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("{0}")' call instead.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[현재 파일은 가져오기에서 'require' 호출을 생성하는 CommonJS 모듈입니다. 그러나 참조된 파일은 ECMAScript 모듈이며 'require'로 가져올 수 없습니다. 대신 동적 'import("{0}")' 호출을 작성하는 것이 좋습니다.]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";The_current_host_does_not_support_the_0_option_5001" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[The current host does not support the '{0}' option.]]></Val>
@@ -13929,6 +13941,42 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";To_convert_this_file_to_an_ECMAScript_module_add_the_field_type_Colon_module_to_0_1482" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[To convert this file to an ECMAScript module, add the field `"type": "module"` to '{0}'.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[이 파일을 ECMAScript 모듈로 변환하려면 `"type": "module"` 필드를 '{0}'에 추가하세요.]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
+      <Item ItemId=";To_convert_this_file_to_an_ECMAScript_module_change_its_file_extension_to_0_or_add_the_field_type_Co_1481" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[To convert this file to an ECMAScript module, change its file extension to '{0}', or add the field `"type": "module"` to '{1}'.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[이 파일을 ECMAScript 모듈로 변환하려면 파일 확장명을 '{0}'(으)로 변경하거나 `"type": "module"` 필드를 '{1}'에 추가하세요.]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
+      <Item ItemId=";To_convert_this_file_to_an_ECMAScript_module_change_its_file_extension_to_0_or_create_a_local_packag_1480" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[To convert this file to an ECMAScript module, change its file extension to '{0}' or create a local package.json file with `{ "type": "module" }`.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[이 파일을 ECMAScript 모듈로 변환하려면 파일 확장명을 '{0}'(으)로 변경하거나 `{ "type": "module" }`을 사용하여 로컬 package.json 파일을 만드세요.]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
+      <Item ItemId=";To_convert_this_file_to_an_ECMAScript_module_create_a_local_package_json_file_with_type_Colon_module_1483" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[To convert this file to an ECMAScript module, create a local package.json file with `{ "type": "module" }`.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[이 파일을 ECMAScript 모듈로 변환하려면 `{ "type": "module" }`을 사용하여 로컬 package.json 파일을 만드세요.]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";Top_level_await_expressions_are_only_allowed_when_the_module_option_is_set_to_es2022_esnext_system_n_1378" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Top-level 'await' expressions are only allowed when the 'module' option is set to 'es2022', 'esnext', 'system', 'node16', or 'nodenext', and the 'target' option is set to 'es2017' or higher.]]></Val>
diff --git a/src/loc/lcl/ptb/diagnosticMessages/diagnosticMessages.generated.json.lcl b/src/loc/lcl/ptb/diagnosticMessages/diagnosticMessages.generated.json.lcl
index c71fce78ac770..01e8df5197e78 100644
--- a/src/loc/lcl/ptb/diagnosticMessages/diagnosticMessages.generated.json.lcl
+++ b/src/loc/lcl/ptb/diagnosticMessages/diagnosticMessages.generated.json.lcl
@@ -8554,10 +8554,13 @@
       </Item>
       <Item ItemId=";Module_0_cannot_be_imported_using_this_construct_The_specifier_only_resolves_to_an_ES_module_which_c_1471" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
-          <Val><![CDATA[Module '{0}' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported synchronously. Use dynamic import instead.]]></Val>
+          <Val><![CDATA[Module '{0}' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Módulo '{0}' não pode ser importado usando esta constructo. O especificador só resolve para um módulo ES, que não pode ser importado de forma síncrona. Em vez disso, use a importação dinâmica.]]></Val>
+            <Val><![CDATA[O módulo '{0}' não pode ser importado usando esta construção. O especificador resolve apenas para um módulo ES, que não pode ser importado com 'require'. Em vez disso, use uma importação ECMAScript.]]></Val>
           </Tgt>
+          <Prev Cat="Text">
+            <Val><![CDATA[Module '{0}' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported synchronously. Use dynamic import instead.]]></Val>
+          </Prev>
         </Str>
         <Disp Icon="Str" />
       </Item>
@@ -12830,6 +12833,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";The_current_file_is_a_CommonJS_module_whose_imports_will_produce_require_calls_however_the_reference_1479" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("{0}")' call instead.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[O arquivo atual é um módulo CommonJS cujas importações produzirão chamadas 'require'; no entanto, o arquivo referenciado é um módulo ECMAScript e não pode ser importado com 'require'. Considere escrever uma chamada 'import("{0}")' dinâmica em vez disso.]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";The_current_host_does_not_support_the_0_option_5001" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[The current host does not support the '{0}' option.]]></Val>
@@ -13919,6 +13931,42 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";To_convert_this_file_to_an_ECMAScript_module_add_the_field_type_Colon_module_to_0_1482" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[To convert this file to an ECMAScript module, add the field `"type": "module"` to '{0}'.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Para converter este arquivo em um módulo ECMAScript, adicione o campo `"type": "module"` a '{0}'.]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
+      <Item ItemId=";To_convert_this_file_to_an_ECMAScript_module_change_its_file_extension_to_0_or_add_the_field_type_Co_1481" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[To convert this file to an ECMAScript module, change its file extension to '{0}', or add the field `"type": "module"` to '{1}'.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Para converter este arquivo em um módulo ECMAScript, altere sua extensão de arquivo para '{0}' ou adicione o campo `"type": "module"` para '{1}'.]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
+      <Item ItemId=";To_convert_this_file_to_an_ECMAScript_module_change_its_file_extension_to_0_or_create_a_local_packag_1480" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[To convert this file to an ECMAScript module, change its file extension to '{0}' or create a local package.json file with `{ "type": "module" }`.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Para converter este arquivo em um módulo ECMAScript, altere sua extensão de arquivo para '{0}' ou crie um arquivo package.json local com `{ "type": "module" }`.]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
+      <Item ItemId=";To_convert_this_file_to_an_ECMAScript_module_create_a_local_package_json_file_with_type_Colon_module_1483" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[To convert this file to an ECMAScript module, create a local package.json file with `{ "type": "module" }`.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Para converter este arquivo em um módulo ECMAScript, crie um arquivo package.json local com `{ "type": "module" }`.]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";Top_level_await_expressions_are_only_allowed_when_the_module_option_is_set_to_es2022_esnext_system_n_1378" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Top-level 'await' expressions are only allowed when the 'module' option is set to 'es2022', 'esnext', 'system', 'node16', or 'nodenext', and the 'target' option is set to 'es2017' or higher.]]></Val>
diff --git a/src/loc/lcl/rus/diagnosticMessages/diagnosticMessages.generated.json.lcl b/src/loc/lcl/rus/diagnosticMessages/diagnosticMessages.generated.json.lcl
index 60d1d7a7ff5db..7bc74da712d9c 100644
--- a/src/loc/lcl/rus/diagnosticMessages/diagnosticMessages.generated.json.lcl
+++ b/src/loc/lcl/rus/diagnosticMessages/diagnosticMessages.generated.json.lcl
@@ -8560,10 +8560,13 @@
       </Item>
       <Item ItemId=";Module_0_cannot_be_imported_using_this_construct_The_specifier_only_resolves_to_an_ES_module_which_c_1471" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
-          <Val><![CDATA[Module '{0}' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported synchronously. Use dynamic import instead.]]></Val>
+          <Val><![CDATA[Module '{0}' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Не удается импортировать модуль "{0}" с помощью этой конструкции. Описатель разрешается только в модуль ES, который не может быть импортирован синхронно. Вместо этого используйте динамический импорт.]]></Val>
+            <Val><![CDATA[Не удается импортировать модуль "{0}" с помощью этой конструкции. Описатель разрешается только в модуль ES, который нельзя импортировать с помощью "require". Вместо этого используйте импорт ECMAScript.]]></Val>
           </Tgt>
+          <Prev Cat="Text">
+            <Val><![CDATA[Module '{0}' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported synchronously. Use dynamic import instead.]]></Val>
+          </Prev>
         </Str>
         <Disp Icon="Str" />
       </Item>
@@ -12839,6 +12842,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";The_current_file_is_a_CommonJS_module_whose_imports_will_produce_require_calls_however_the_reference_1479" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("{0}")' call instead.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Текущий файл является модулем CommonJS, импорт которого приведет к вызовам "require"; однако файл, на который указывает ссылка, является модулем ECMAScript и не может быть импортирован с помощью "require". Вместо этого попробуйте написать динамический вызов "import("{0}")".]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";The_current_host_does_not_support_the_0_option_5001" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[The current host does not support the '{0}' option.]]></Val>
@@ -13928,6 +13940,42 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";To_convert_this_file_to_an_ECMAScript_module_add_the_field_type_Colon_module_to_0_1482" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[To convert this file to an ECMAScript module, add the field `"type": "module"` to '{0}'.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Чтобы преобразовать этот файл в модуль ECMAScript, добавьте поле "type": "module" в "{0}".]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
+      <Item ItemId=";To_convert_this_file_to_an_ECMAScript_module_change_its_file_extension_to_0_or_add_the_field_type_Co_1481" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[To convert this file to an ECMAScript module, change its file extension to '{0}', or add the field `"type": "module"` to '{1}'.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Чтобы преобразовать этот файл в модуль ECMAScript, измените его расширение на "{0}" или добавьте поле "type": "module" в "{1}".]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
+      <Item ItemId=";To_convert_this_file_to_an_ECMAScript_module_change_its_file_extension_to_0_or_create_a_local_packag_1480" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[To convert this file to an ECMAScript module, change its file extension to '{0}' or create a local package.json file with `{ "type": "module" }`.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Чтобы преобразовать этот файл в модуль ECMAScript, измените его расширение на "{0}" или создайте локальный файл package.json с "{ "type": "module" }".]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
+      <Item ItemId=";To_convert_this_file_to_an_ECMAScript_module_create_a_local_package_json_file_with_type_Colon_module_1483" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[To convert this file to an ECMAScript module, create a local package.json file with `{ "type": "module" }`.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Чтобы преобразовать этот файл в модуль ECMAScript, создайте локальный файл package.json с "{ "type": "module" }".]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";Top_level_await_expressions_are_only_allowed_when_the_module_option_is_set_to_es2022_esnext_system_n_1378" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Top-level 'await' expressions are only allowed when the 'module' option is set to 'es2022', 'esnext', 'system', 'node16', or 'nodenext', and the 'target' option is set to 'es2017' or higher.]]></Val>

From 4a98087e25595ebd5469278c76880a60a5c0302d Mon Sep 17 00:00:00 2001
From: TypeScript Bot <typescriptbot@microsoft.com>
Date: Mon, 8 Aug 2022 06:06:51 +0000
Subject: [PATCH 04/18] Update package-lock.json

---
 package-lock.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 8470ca0b706f4..f0c1027378299 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -435,9 +435,9 @@
             }
         },
         "node_modules/@types/chai": {
-            "version": "4.3.1",
-            "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.1.tgz",
-            "integrity": "sha512-/zPMqDkzSZ8t3VtxOa4KPq7uzzW978M9Tvh+j7GHKuo6k6GTLxPJ4J5gE5cjfJ26pnXst0N5Hax8Sr0T2Mi9zQ==",
+            "version": "4.3.3",
+            "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.3.tgz",
+            "integrity": "sha512-hC7OMnszpxhZPduX+m+nrx+uFoLkWOMiR4oa/AZF3MuSETYTZmFfJAHqZEM8MVlvfG7BEUcgvtwoCTxBp6hm3g==",
             "dev": true
         },
         "node_modules/@types/convert-source-map": {
@@ -8947,9 +8947,9 @@
             }
         },
         "@types/chai": {
-            "version": "4.3.1",
-            "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.1.tgz",
-            "integrity": "sha512-/zPMqDkzSZ8t3VtxOa4KPq7uzzW978M9Tvh+j7GHKuo6k6GTLxPJ4J5gE5cjfJ26pnXst0N5Hax8Sr0T2Mi9zQ==",
+            "version": "4.3.3",
+            "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.3.tgz",
+            "integrity": "sha512-hC7OMnszpxhZPduX+m+nrx+uFoLkWOMiR4oa/AZF3MuSETYTZmFfJAHqZEM8MVlvfG7BEUcgvtwoCTxBp6hm3g==",
             "dev": true
         },
         "@types/convert-source-map": {

From 71e852922888337ef51a0e48416034a94a6c34d9 Mon Sep 17 00:00:00 2001
From: Alex Hsu <csigs@users.noreply.github.com>
Date: Mon, 8 Aug 2022 03:00:51 -0700
Subject: [PATCH 05/18] LEGO: Merge pull request 50219

LEGO: Merge pull request 50219
---
 .../diagnosticMessages.generated.json.lcl     | 52 ++++++++++++++++++-
 .../diagnosticMessages.generated.json.lcl     | 52 ++++++++++++++++++-
 .../diagnosticMessages.generated.json.lcl     | 52 ++++++++++++++++++-
 3 files changed, 150 insertions(+), 6 deletions(-)

diff --git a/src/loc/lcl/chs/diagnosticMessages/diagnosticMessages.generated.json.lcl b/src/loc/lcl/chs/diagnosticMessages/diagnosticMessages.generated.json.lcl
index c15cbfc40d2c7..83a1f543755c4 100644
--- a/src/loc/lcl/chs/diagnosticMessages/diagnosticMessages.generated.json.lcl
+++ b/src/loc/lcl/chs/diagnosticMessages/diagnosticMessages.generated.json.lcl
@@ -8561,10 +8561,13 @@
       </Item>
       <Item ItemId=";Module_0_cannot_be_imported_using_this_construct_The_specifier_only_resolves_to_an_ES_module_which_c_1471" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
-          <Val><![CDATA[Module '{0}' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported synchronously. Use dynamic import instead.]]></Val>
+          <Val><![CDATA[Module '{0}' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[无法使用此构造导入模块 '{0}'。说明符仅解析为无法同步导入的 ES 模块。请改用动态导入。]]></Val>
+            <Val><![CDATA[无法使用此构造导入模块“{0}”。说明符仅解析为 ES 模块，后者不能使用“require”进行导入。请改用 ECMAScript 导入。]]></Val>
           </Tgt>
+          <Prev Cat="Text">
+            <Val><![CDATA[Module '{0}' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported synchronously. Use dynamic import instead.]]></Val>
+          </Prev>
         </Str>
         <Disp Icon="Str" />
       </Item>
@@ -12840,6 +12843,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";The_current_file_is_a_CommonJS_module_whose_imports_will_produce_require_calls_however_the_reference_1479" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("{0}")' call instead.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[当前文件是 CommonJS 模块，其导入将生成“require”调用；但是，引用的文件是 ECMAScript 模块，它不能使用“require”进行导入。请考虑改为编写动态“import("{0}")”调用。]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";The_current_host_does_not_support_the_0_option_5001" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[The current host does not support the '{0}' option.]]></Val>
@@ -13929,6 +13941,42 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";To_convert_this_file_to_an_ECMAScript_module_add_the_field_type_Colon_module_to_0_1482" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[To convert this file to an ECMAScript module, add the field `"type": "module"` to '{0}'.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[若要将此文件转换为 ECMAScript 模块，请将字段“"type": "module"”添加到“{0}”。]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
+      <Item ItemId=";To_convert_this_file_to_an_ECMAScript_module_change_its_file_extension_to_0_or_add_the_field_type_Co_1481" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[To convert this file to an ECMAScript module, change its file extension to '{0}', or add the field `"type": "module"` to '{1}'.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[若要将此文件转换为 ECMAScript 模块，请将其文件扩展名更改为“{0}”，或将字段“"type": "module"”添加到“{1}”。]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
+      <Item ItemId=";To_convert_this_file_to_an_ECMAScript_module_change_its_file_extension_to_0_or_create_a_local_packag_1480" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[To convert this file to an ECMAScript module, change its file extension to '{0}' or create a local package.json file with `{ "type": "module" }`.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[若要将此文件转换为 ECMAScript 模块，请将其文件扩展名更改为“{0}”，或者使用“{ "type": "module" }”创建本地 package.json 文件。]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
+      <Item ItemId=";To_convert_this_file_to_an_ECMAScript_module_create_a_local_package_json_file_with_type_Colon_module_1483" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[To convert this file to an ECMAScript module, create a local package.json file with `{ "type": "module" }`.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[若要将此文件转换为 ECMAScript 模块，请使用“{ "type": "module" }”创建本地 package.json 文件。]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";Top_level_await_expressions_are_only_allowed_when_the_module_option_is_set_to_es2022_esnext_system_n_1378" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Top-level 'await' expressions are only allowed when the 'module' option is set to 'es2022', 'esnext', 'system', 'node16', or 'nodenext', and the 'target' option is set to 'es2017' or higher.]]></Val>
diff --git a/src/loc/lcl/plk/diagnosticMessages/diagnosticMessages.generated.json.lcl b/src/loc/lcl/plk/diagnosticMessages/diagnosticMessages.generated.json.lcl
index 04e1809a941f4..ad8eb7f9901b8 100644
--- a/src/loc/lcl/plk/diagnosticMessages/diagnosticMessages.generated.json.lcl
+++ b/src/loc/lcl/plk/diagnosticMessages/diagnosticMessages.generated.json.lcl
@@ -8551,10 +8551,13 @@
       </Item>
       <Item ItemId=";Module_0_cannot_be_imported_using_this_construct_The_specifier_only_resolves_to_an_ES_module_which_c_1471" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
-          <Val><![CDATA[Module '{0}' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported synchronously. Use dynamic import instead.]]></Val>
+          <Val><![CDATA[Module '{0}' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nie można zaimportować modułu „{0}” przy użyciu tej konstrukcji. Specyfikator jest rozpoznawany tylko jako moduł ES, którego nie można zaimportować synchronicznie. Zamiast tego użyj importu dynamicznego.]]></Val>
+            <Val><![CDATA[Nie można zaimportować modułu „{0}” przy użyciu tej konstrukcji. Specyfikator jest rozpoznawany tylko jako moduł ES, którego nie można zaimportować za pomocą wywołania „require”. Zamiast tego użyj importu ECMAScript.]]></Val>
           </Tgt>
+          <Prev Cat="Text">
+            <Val><![CDATA[Module '{0}' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported synchronously. Use dynamic import instead.]]></Val>
+          </Prev>
         </Str>
         <Disp Icon="Str" />
       </Item>
@@ -12827,6 +12830,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";The_current_file_is_a_CommonJS_module_whose_imports_will_produce_require_calls_however_the_reference_1479" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("{0}")' call instead.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Bieżący plik jest modułem CommonJS, którego importy będą generować wywołania „require”; jednak przywoływany plik jest modułem ECMAScript i nie można go zaimportować za pomocą wywołania „require”. Zamiast tego rozważ zapisanie dynamicznego wywołania „import("{0}")”.]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";The_current_host_does_not_support_the_0_option_5001" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[The current host does not support the '{0}' option.]]></Val>
@@ -13916,6 +13928,42 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";To_convert_this_file_to_an_ECMAScript_module_add_the_field_type_Colon_module_to_0_1482" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[To convert this file to an ECMAScript module, add the field `"type": "module"` to '{0}'.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Aby przekonwertować ten plik na moduł ECMAScript, dodaj pole „"type": "module"” do „{0}”.]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
+      <Item ItemId=";To_convert_this_file_to_an_ECMAScript_module_change_its_file_extension_to_0_or_add_the_field_type_Co_1481" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[To convert this file to an ECMAScript module, change its file extension to '{0}', or add the field `"type": "module"` to '{1}'.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Aby przekonwertować ten plik na moduł ECMAScript, zmień rozszerzenie jego pliku na „{0}” lub dodaj pole „"type": "module"” do „{1}”.]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
+      <Item ItemId=";To_convert_this_file_to_an_ECMAScript_module_change_its_file_extension_to_0_or_create_a_local_packag_1480" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[To convert this file to an ECMAScript module, change its file extension to '{0}' or create a local package.json file with `{ "type": "module" }`.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Aby przekonwertować ten plik na moduł ECMAScript, zmień rozszerzenie jego pliku na „{0}” lub utwórz lokalny plik package.json z polem „{ "type": "module" }".]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
+      <Item ItemId=";To_convert_this_file_to_an_ECMAScript_module_create_a_local_package_json_file_with_type_Colon_module_1483" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[To convert this file to an ECMAScript module, create a local package.json file with `{ "type": "module" }`.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Aby przekonwertować ten plik na moduł ECMAScript, utwórz lokalny plik package.json z polem „{ "type": "module" }".]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";Top_level_await_expressions_are_only_allowed_when_the_module_option_is_set_to_es2022_esnext_system_n_1378" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Top-level 'await' expressions are only allowed when the 'module' option is set to 'es2022', 'esnext', 'system', 'node16', or 'nodenext', and the 'target' option is set to 'es2017' or higher.]]></Val>
diff --git a/src/loc/lcl/trk/diagnosticMessages/diagnosticMessages.generated.json.lcl b/src/loc/lcl/trk/diagnosticMessages/diagnosticMessages.generated.json.lcl
index b4fd56f9a24f3..b855d4525f73d 100644
--- a/src/loc/lcl/trk/diagnosticMessages/diagnosticMessages.generated.json.lcl
+++ b/src/loc/lcl/trk/diagnosticMessages/diagnosticMessages.generated.json.lcl
@@ -8554,10 +8554,13 @@
       </Item>
       <Item ItemId=";Module_0_cannot_be_imported_using_this_construct_The_specifier_only_resolves_to_an_ES_module_which_c_1471" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
-          <Val><![CDATA[Module '{0}' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported synchronously. Use dynamic import instead.]]></Val>
+          <Val><![CDATA[Module '{0}' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['{0}' modülü bu yapı kullanılarak içeri aktarılamaz. Tanımlayıcı yalnızca eşzamanlı olarak içeri aktarılamayan bir ES modülüne çözümleniyor. Bunun yerine dinamik içeri aktarma kullanın.]]></Val>
+            <Val><![CDATA['{0}' modülü bu yapı kullanılarak içe aktarılamaz. Belirtici yalnızca 'require' ile içe aktarılamayan bir ES modülüne çözümlenir. Bunun yerine bir ECMAScript içe aktarma kullanın.]]></Val>
           </Tgt>
+          <Prev Cat="Text">
+            <Val><![CDATA[Module '{0}' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported synchronously. Use dynamic import instead.]]></Val>
+          </Prev>
         </Str>
         <Disp Icon="Str" />
       </Item>
@@ -12833,6 +12836,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";The_current_file_is_a_CommonJS_module_whose_imports_will_produce_require_calls_however_the_reference_1479" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("{0}")' call instead.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Geçerli dosya, içe aktarma işlemlerinin 'require' çağrıları üreteceği bir CommonJS modülüdür; ancak başvurulan dosya bir ECMAScript modülüdür ve 'require' ile içe aktarılamaz. Bunun yerine dinamik bir 'import("{0}")' çağrısı yazmayı deneyin.]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";The_current_host_does_not_support_the_0_option_5001" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[The current host does not support the '{0}' option.]]></Val>
@@ -13922,6 +13934,42 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";To_convert_this_file_to_an_ECMAScript_module_add_the_field_type_Colon_module_to_0_1482" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[To convert this file to an ECMAScript module, add the field `"type": "module"` to '{0}'.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Bu dosyayı bir ECMAScript modülüne dönüştürmek için, '{0}' dizinine `"type": "module"` alanı ekleyin.]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
+      <Item ItemId=";To_convert_this_file_to_an_ECMAScript_module_change_its_file_extension_to_0_or_add_the_field_type_Co_1481" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[To convert this file to an ECMAScript module, change its file extension to '{0}', or add the field `"type": "module"` to '{1}'.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Bu dosyayı bir ECMAScript modülüne dönüştürmek için dosya uzantısını '{0}' olarak değiştirin veya '{1}' dizinine ''type': 'module'' alanı ekleyin.]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
+      <Item ItemId=";To_convert_this_file_to_an_ECMAScript_module_change_its_file_extension_to_0_or_create_a_local_packag_1480" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[To convert this file to an ECMAScript module, change its file extension to '{0}' or create a local package.json file with `{ "type": "module" }`.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Bu dosyayı bir ECMAScript modülüne dönüştürmek için dosya uzantısını '{0}' olarak değiştirin veya `{ "type": "module" }` ile yerel bir package.json dosyası oluşturun.]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
+      <Item ItemId=";To_convert_this_file_to_an_ECMAScript_module_create_a_local_package_json_file_with_type_Colon_module_1483" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[To convert this file to an ECMAScript module, create a local package.json file with `{ "type": "module" }`.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Bu dosyayı bir ECMAScript modülüne dönüştürmek için, `{ "type": "module" }` ile yerel bir package.json dosyası oluşturun.]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";Top_level_await_expressions_are_only_allowed_when_the_module_option_is_set_to_es2022_esnext_system_n_1378" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Top-level 'await' expressions are only allowed when the 'module' option is set to 'es2022', 'esnext', 'system', 'node16', or 'nodenext', and the 'target' option is set to 'es2017' or higher.]]></Val>

From 0e17dc7769f7380591bcc60dd6e116a22bf98c3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mateusz=20Burzy=C5=84ski?= <mateuszburzynski@gmail.com>
Date: Tue, 9 Aug 2022 02:01:50 +0200
Subject: [PATCH 06/18] Fixed a false positive related to binding patterns and
 spread expressions (#49684)

* Fixed a false positive related to binding patterns and spread expressions

* Improve ancestor lookup when checking if an expression is spread into an object

* Fixed ancestor lookup for more node types

* Remove equality check for contextual types

* Reformat code

* Use `isWithinSpreadAssignment` flag + `objectsWithinSpread` cache instead of ancestor traversal

* Revert "Use `isWithinSpreadAssignment` flag + `objectsWithinSpread` cache instead of ancestor traversal"

This reverts commit be387e3bbf8a5cce2bc4c31fd77b061ea6cf8e0b.

* Expand on the existing comment
---
 src/compiler/checker.ts                       | 35 ++++++++++-----
 ...ningObjectExpressionContextualType.symbols | 23 ++++++++++
 ...ainingObjectExpressionContextualType.types | 45 +++++++++++++++++++
 ...ontainingObjectExpressionContextualType.ts | 15 +++++++
 4 files changed, 108 insertions(+), 10 deletions(-)
 create mode 100644 tests/baselines/reference/spreadExpressionContainingObjectExpressionContextualType.symbols
 create mode 100644 tests/baselines/reference/spreadExpressionContainingObjectExpressionContextualType.types
 create mode 100644 tests/cases/compiler/spreadExpressionContainingObjectExpressionContextualType.ts

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 2b3cdcb736d1a..920dbb775d2a1 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -28163,16 +28163,31 @@ namespace ts {
             // If object literal is contextually typed by the implied type of a binding pattern, augment the result
             // type with those properties for which the binding pattern specifies a default value.
             // If the object literal is spread into another object literal, skip this step and let the top-level object
-            // literal handle it instead.
-            if (contextualTypeHasPattern && node.parent.kind !== SyntaxKind.SpreadAssignment) {
-                for (const prop of getPropertiesOfType(contextualType)) {
-                    if (!propertiesTable.get(prop.escapedName) && !getPropertyOfType(spread, prop.escapedName)) {
-                        if (!(prop.flags & SymbolFlags.Optional)) {
-                            error(prop.valueDeclaration || (prop as TransientSymbol).bindingElement,
-                                Diagnostics.Initializer_provides_no_value_for_this_binding_element_and_the_binding_element_has_no_default_value);
-                        }
-                        propertiesTable.set(prop.escapedName, prop);
-                        propertiesArray.push(prop);
+            // literal handle it instead. Note that this might require full traversal to the root pattern's parent
+            // as it's the guaranteed to be the common ancestor of the pattern node and the current object node.
+            // It's not possible to check if the immediate parent node is a spread assignment
+            // since the type flows in non-obvious ways through conditional expressions, IIFEs and more.
+            if (contextualTypeHasPattern) {
+                const rootPatternParent = findAncestor(contextualType.pattern!.parent, n =>
+                    n.kind === SyntaxKind.VariableDeclaration ||
+                    n.kind === SyntaxKind.BinaryExpression ||
+                    n.kind === SyntaxKind.Parameter
+                );
+                const spreadOrOutsideRootObject = findAncestor(node, n =>
+                    n === rootPatternParent ||
+                    n.kind === SyntaxKind.SpreadAssignment
+                )!;
+
+                if (spreadOrOutsideRootObject.kind !== SyntaxKind.SpreadAssignment) {
+                    for (const prop of getPropertiesOfType(contextualType)) {
+                        if (!propertiesTable.get(prop.escapedName) && !getPropertyOfType(spread, prop.escapedName)) {
+                            if (!(prop.flags & SymbolFlags.Optional)) {
+                                error(prop.valueDeclaration || (prop as TransientSymbol).bindingElement,
+                                    Diagnostics.Initializer_provides_no_value_for_this_binding_element_and_the_binding_element_has_no_default_value);
+                            }
+                            propertiesTable.set(prop.escapedName, prop);
+                            propertiesArray.push(prop);
+                        }
                     }
                 }
             }
diff --git a/tests/baselines/reference/spreadExpressionContainingObjectExpressionContextualType.symbols b/tests/baselines/reference/spreadExpressionContainingObjectExpressionContextualType.symbols
new file mode 100644
index 0000000000000..2b95e9c2fff1f
--- /dev/null
+++ b/tests/baselines/reference/spreadExpressionContainingObjectExpressionContextualType.symbols
@@ -0,0 +1,23 @@
+=== tests/cases/compiler/spreadExpressionContainingObjectExpressionContextualType.ts ===
+// repro #49585
+
+const { value } = (() => ({
+>value : Symbol(value, Decl(spreadExpressionContainingObjectExpressionContextualType.ts, 2, 7))
+
+  value: "",
+>value : Symbol(value, Decl(spreadExpressionContainingObjectExpressionContextualType.ts, 2, 27))
+
+  ...(true ? {} : {}),
+}))();
+
+// repro 49684#discussion_r920545763
+
+const { value2 } = {
+>value2 : Symbol(value2, Decl(spreadExpressionContainingObjectExpressionContextualType.ts, 9, 7))
+
+  value2: "",
+>value2 : Symbol(value2, Decl(spreadExpressionContainingObjectExpressionContextualType.ts, 9, 20))
+
+  ...(() => true ? {} : {})(),
+};
+
diff --git a/tests/baselines/reference/spreadExpressionContainingObjectExpressionContextualType.types b/tests/baselines/reference/spreadExpressionContainingObjectExpressionContextualType.types
new file mode 100644
index 0000000000000..2e3765e2f697e
--- /dev/null
+++ b/tests/baselines/reference/spreadExpressionContainingObjectExpressionContextualType.types
@@ -0,0 +1,45 @@
+=== tests/cases/compiler/spreadExpressionContainingObjectExpressionContextualType.ts ===
+// repro #49585
+
+const { value } = (() => ({
+>value : string
+>(() => ({  value: "",  ...(true ? {} : {}),}))() : { value: string; }
+>(() => ({  value: "",  ...(true ? {} : {}),})) : () => { value: string; }
+>() => ({  value: "",  ...(true ? {} : {}),}) : () => { value: string; }
+>({  value: "",  ...(true ? {} : {}),}) : { value: string; }
+>{  value: "",  ...(true ? {} : {}),} : { value: string; }
+
+  value: "",
+>value : string
+>"" : ""
+
+  ...(true ? {} : {}),
+>(true ? {} : {}) : {}
+>true ? {} : {} : {}
+>true : true
+>{} : {}
+>{} : {}
+
+}))();
+
+// repro 49684#discussion_r920545763
+
+const { value2 } = {
+>value2 : string
+>{  value2: "",  ...(() => true ? {} : {})(),} : { value2: string; }
+
+  value2: "",
+>value2 : string
+>"" : ""
+
+  ...(() => true ? {} : {})(),
+>(() => true ? {} : {})() : {}
+>(() => true ? {} : {}) : () => {}
+>() => true ? {} : {} : () => {}
+>true ? {} : {} : {}
+>true : true
+>{} : {}
+>{} : {}
+
+};
+
diff --git a/tests/cases/compiler/spreadExpressionContainingObjectExpressionContextualType.ts b/tests/cases/compiler/spreadExpressionContainingObjectExpressionContextualType.ts
new file mode 100644
index 0000000000000..56c334414d1dc
--- /dev/null
+++ b/tests/cases/compiler/spreadExpressionContainingObjectExpressionContextualType.ts
@@ -0,0 +1,15 @@
+// @noEmit: true
+
+// repro #49585
+
+const { value } = (() => ({
+  value: "",
+  ...(true ? {} : {}),
+}))();
+
+// repro 49684#discussion_r920545763
+
+const { value2 } = {
+  value2: "",
+  ...(() => true ? {} : {})(),
+};

From 6d163dc736f59aeacc94b21ec2e432a730396704 Mon Sep 17 00:00:00 2001
From: TypeScript Bot <typescriptbot@microsoft.com>
Date: Tue, 9 Aug 2022 06:06:46 +0000
Subject: [PATCH 07/18] Update package-lock.json

---
 package-lock.json | 168 +++++++++++++++++++++++-----------------------
 1 file changed, 84 insertions(+), 84 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f0c1027378299..993341e3ea74b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -591,9 +591,9 @@
             "dev": true
         },
         "node_modules/@types/node": {
-            "version": "18.6.4",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-18.6.4.tgz",
-            "integrity": "sha512-I4BD3L+6AWiUobfxZ49DlU43gtI+FTHSv9pE2Zekg6KjMpre4ByusaljW3vYSLJrvQ1ck1hUaeVu8HVlY3vzHg==",
+            "version": "18.6.5",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-18.6.5.tgz",
+            "integrity": "sha512-Xjt5ZGUa5WusGZJ4WJPbOT8QOqp6nDynVFRKcUt32bOgvXEoc6o085WNkYTMO7ifAj2isEfQQ2cseE+wT6jsRw==",
             "dev": true
         },
         "node_modules/@types/node-fetch": {
@@ -669,14 +669,14 @@
             }
         },
         "node_modules/@typescript-eslint/eslint-plugin": {
-            "version": "5.32.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.32.0.tgz",
-            "integrity": "sha512-CHLuz5Uz7bHP2WgVlvoZGhf0BvFakBJKAD/43Ty0emn4wXWv5k01ND0C0fHcl/Im8Td2y/7h44E9pca9qAu2ew==",
+            "version": "5.33.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.33.0.tgz",
+            "integrity": "sha512-jHvZNSW2WZ31OPJ3enhLrEKvAZNyAFWZ6rx9tUwaessTc4sx9KmgMNhVcqVAl1ETnT5rU5fpXTLmY9YvC1DCNg==",
             "dev": true,
             "dependencies": {
-                "@typescript-eslint/scope-manager": "5.32.0",
-                "@typescript-eslint/type-utils": "5.32.0",
-                "@typescript-eslint/utils": "5.32.0",
+                "@typescript-eslint/scope-manager": "5.33.0",
+                "@typescript-eslint/type-utils": "5.33.0",
+                "@typescript-eslint/utils": "5.33.0",
                 "debug": "^4.3.4",
                 "functional-red-black-tree": "^1.0.1",
                 "ignore": "^5.2.0",
@@ -702,14 +702,14 @@
             }
         },
         "node_modules/@typescript-eslint/parser": {
-            "version": "5.32.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.32.0.tgz",
-            "integrity": "sha512-IxRtsehdGV9GFQ35IGm5oKKR2OGcazUoiNBxhRV160iF9FoyuXxjY+rIqs1gfnd+4eL98OjeGnMpE7RF/NBb3A==",
+            "version": "5.33.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.33.0.tgz",
+            "integrity": "sha512-cgM5cJrWmrDV2KpvlcSkelTBASAs1mgqq+IUGKJvFxWrapHpaRy5EXPQz9YaKF3nZ8KY18ILTiVpUtbIac86/w==",
             "dev": true,
             "dependencies": {
-                "@typescript-eslint/scope-manager": "5.32.0",
-                "@typescript-eslint/types": "5.32.0",
-                "@typescript-eslint/typescript-estree": "5.32.0",
+                "@typescript-eslint/scope-manager": "5.33.0",
+                "@typescript-eslint/types": "5.33.0",
+                "@typescript-eslint/typescript-estree": "5.33.0",
                 "debug": "^4.3.4"
             },
             "engines": {
@@ -729,13 +729,13 @@
             }
         },
         "node_modules/@typescript-eslint/scope-manager": {
-            "version": "5.32.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.32.0.tgz",
-            "integrity": "sha512-KyAE+tUON0D7tNz92p1uetRqVJiiAkeluvwvZOqBmW9z2XApmk5WSMV9FrzOroAcVxJZB3GfUwVKr98Dr/OjOg==",
+            "version": "5.33.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.33.0.tgz",
+            "integrity": "sha512-/Jta8yMNpXYpRDl8EwF/M8It2A9sFJTubDo0ATZefGXmOqlaBffEw0ZbkbQ7TNDK6q55NPHFshGBPAZvZkE8Pw==",
             "dev": true,
             "dependencies": {
-                "@typescript-eslint/types": "5.32.0",
-                "@typescript-eslint/visitor-keys": "5.32.0"
+                "@typescript-eslint/types": "5.33.0",
+                "@typescript-eslint/visitor-keys": "5.33.0"
             },
             "engines": {
                 "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -746,12 +746,12 @@
             }
         },
         "node_modules/@typescript-eslint/type-utils": {
-            "version": "5.32.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.32.0.tgz",
-            "integrity": "sha512-0gSsIhFDduBz3QcHJIp3qRCvVYbqzHg8D6bHFsDMrm0rURYDj+skBK2zmYebdCp+4nrd9VWd13egvhYFJj/wZg==",
+            "version": "5.33.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.33.0.tgz",
+            "integrity": "sha512-2zB8uEn7hEH2pBeyk3NpzX1p3lF9dKrEbnXq1F7YkpZ6hlyqb2yZujqgRGqXgRBTHWIUG3NGx/WeZk224UKlIA==",
             "dev": true,
             "dependencies": {
-                "@typescript-eslint/utils": "5.32.0",
+                "@typescript-eslint/utils": "5.33.0",
                 "debug": "^4.3.4",
                 "tsutils": "^3.21.0"
             },
@@ -772,9 +772,9 @@
             }
         },
         "node_modules/@typescript-eslint/types": {
-            "version": "5.32.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.32.0.tgz",
-            "integrity": "sha512-EBUKs68DOcT/EjGfzywp+f8wG9Zw6gj6BjWu7KV/IYllqKJFPlZlLSYw/PTvVyiRw50t6wVbgv4p9uE2h6sZrQ==",
+            "version": "5.33.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.33.0.tgz",
+            "integrity": "sha512-nIMt96JngB4MYFYXpZ/3ZNU4GWPNdBbcB5w2rDOCpXOVUkhtNlG2mmm8uXhubhidRZdwMaMBap7Uk8SZMU/ppw==",
             "dev": true,
             "engines": {
                 "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -785,13 +785,13 @@
             }
         },
         "node_modules/@typescript-eslint/typescript-estree": {
-            "version": "5.32.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.32.0.tgz",
-            "integrity": "sha512-ZVAUkvPk3ITGtCLU5J4atCw9RTxK+SRc6hXqLtllC2sGSeMFWN+YwbiJR9CFrSFJ3w4SJfcWtDwNb/DmUIHdhg==",
+            "version": "5.33.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.33.0.tgz",
+            "integrity": "sha512-tqq3MRLlggkJKJUrzM6wltk8NckKyyorCSGMq4eVkyL5sDYzJJcMgZATqmF8fLdsWrW7OjjIZ1m9v81vKcaqwQ==",
             "dev": true,
             "dependencies": {
-                "@typescript-eslint/types": "5.32.0",
-                "@typescript-eslint/visitor-keys": "5.32.0",
+                "@typescript-eslint/types": "5.33.0",
+                "@typescript-eslint/visitor-keys": "5.33.0",
                 "debug": "^4.3.4",
                 "globby": "^11.1.0",
                 "is-glob": "^4.0.3",
@@ -812,15 +812,15 @@
             }
         },
         "node_modules/@typescript-eslint/utils": {
-            "version": "5.32.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.32.0.tgz",
-            "integrity": "sha512-W7lYIAI5Zlc5K082dGR27Fczjb3Q57ECcXefKU/f0ajM5ToM0P+N9NmJWip8GmGu/g6QISNT+K6KYB+iSHjXCQ==",
+            "version": "5.33.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.33.0.tgz",
+            "integrity": "sha512-JxOAnXt9oZjXLIiXb5ZIcZXiwVHCkqZgof0O8KPgz7C7y0HS42gi75PdPlqh1Tf109M0fyUw45Ao6JLo7S5AHw==",
             "dev": true,
             "dependencies": {
                 "@types/json-schema": "^7.0.9",
-                "@typescript-eslint/scope-manager": "5.32.0",
-                "@typescript-eslint/types": "5.32.0",
-                "@typescript-eslint/typescript-estree": "5.32.0",
+                "@typescript-eslint/scope-manager": "5.33.0",
+                "@typescript-eslint/types": "5.33.0",
+                "@typescript-eslint/typescript-estree": "5.33.0",
                 "eslint-scope": "^5.1.1",
                 "eslint-utils": "^3.0.0"
             },
@@ -836,12 +836,12 @@
             }
         },
         "node_modules/@typescript-eslint/visitor-keys": {
-            "version": "5.32.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.32.0.tgz",
-            "integrity": "sha512-S54xOHZgfThiZ38/ZGTgB2rqx51CMJ5MCfVT2IplK4Q7hgzGfe0nLzLCcenDnc/cSjP568hdeKfeDcBgqNHD/g==",
+            "version": "5.33.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.33.0.tgz",
+            "integrity": "sha512-/XsqCzD4t+Y9p5wd9HZiptuGKBlaZO5showwqODii5C0nZawxWLF+Q6k5wYHBrQv96h6GYKyqqMHCSTqta8Kiw==",
             "dev": true,
             "dependencies": {
-                "@typescript-eslint/types": "5.32.0",
+                "@typescript-eslint/types": "5.33.0",
                 "eslint-visitor-keys": "^3.3.0"
             },
             "engines": {
@@ -9103,9 +9103,9 @@
             "dev": true
         },
         "@types/node": {
-            "version": "18.6.4",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-18.6.4.tgz",
-            "integrity": "sha512-I4BD3L+6AWiUobfxZ49DlU43gtI+FTHSv9pE2Zekg6KjMpre4ByusaljW3vYSLJrvQ1ck1hUaeVu8HVlY3vzHg==",
+            "version": "18.6.5",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-18.6.5.tgz",
+            "integrity": "sha512-Xjt5ZGUa5WusGZJ4WJPbOT8QOqp6nDynVFRKcUt32bOgvXEoc6o085WNkYTMO7ifAj2isEfQQ2cseE+wT6jsRw==",
             "dev": true
         },
         "@types/node-fetch": {
@@ -9181,14 +9181,14 @@
             }
         },
         "@typescript-eslint/eslint-plugin": {
-            "version": "5.32.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.32.0.tgz",
-            "integrity": "sha512-CHLuz5Uz7bHP2WgVlvoZGhf0BvFakBJKAD/43Ty0emn4wXWv5k01ND0C0fHcl/Im8Td2y/7h44E9pca9qAu2ew==",
+            "version": "5.33.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.33.0.tgz",
+            "integrity": "sha512-jHvZNSW2WZ31OPJ3enhLrEKvAZNyAFWZ6rx9tUwaessTc4sx9KmgMNhVcqVAl1ETnT5rU5fpXTLmY9YvC1DCNg==",
             "dev": true,
             "requires": {
-                "@typescript-eslint/scope-manager": "5.32.0",
-                "@typescript-eslint/type-utils": "5.32.0",
-                "@typescript-eslint/utils": "5.32.0",
+                "@typescript-eslint/scope-manager": "5.33.0",
+                "@typescript-eslint/type-utils": "5.33.0",
+                "@typescript-eslint/utils": "5.33.0",
                 "debug": "^4.3.4",
                 "functional-red-black-tree": "^1.0.1",
                 "ignore": "^5.2.0",
@@ -9198,52 +9198,52 @@
             }
         },
         "@typescript-eslint/parser": {
-            "version": "5.32.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.32.0.tgz",
-            "integrity": "sha512-IxRtsehdGV9GFQ35IGm5oKKR2OGcazUoiNBxhRV160iF9FoyuXxjY+rIqs1gfnd+4eL98OjeGnMpE7RF/NBb3A==",
+            "version": "5.33.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.33.0.tgz",
+            "integrity": "sha512-cgM5cJrWmrDV2KpvlcSkelTBASAs1mgqq+IUGKJvFxWrapHpaRy5EXPQz9YaKF3nZ8KY18ILTiVpUtbIac86/w==",
             "dev": true,
             "requires": {
-                "@typescript-eslint/scope-manager": "5.32.0",
-                "@typescript-eslint/types": "5.32.0",
-                "@typescript-eslint/typescript-estree": "5.32.0",
+                "@typescript-eslint/scope-manager": "5.33.0",
+                "@typescript-eslint/types": "5.33.0",
+                "@typescript-eslint/typescript-estree": "5.33.0",
                 "debug": "^4.3.4"
             }
         },
         "@typescript-eslint/scope-manager": {
-            "version": "5.32.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.32.0.tgz",
-            "integrity": "sha512-KyAE+tUON0D7tNz92p1uetRqVJiiAkeluvwvZOqBmW9z2XApmk5WSMV9FrzOroAcVxJZB3GfUwVKr98Dr/OjOg==",
+            "version": "5.33.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.33.0.tgz",
+            "integrity": "sha512-/Jta8yMNpXYpRDl8EwF/M8It2A9sFJTubDo0ATZefGXmOqlaBffEw0ZbkbQ7TNDK6q55NPHFshGBPAZvZkE8Pw==",
             "dev": true,
             "requires": {
-                "@typescript-eslint/types": "5.32.0",
-                "@typescript-eslint/visitor-keys": "5.32.0"
+                "@typescript-eslint/types": "5.33.0",
+                "@typescript-eslint/visitor-keys": "5.33.0"
             }
         },
         "@typescript-eslint/type-utils": {
-            "version": "5.32.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.32.0.tgz",
-            "integrity": "sha512-0gSsIhFDduBz3QcHJIp3qRCvVYbqzHg8D6bHFsDMrm0rURYDj+skBK2zmYebdCp+4nrd9VWd13egvhYFJj/wZg==",
+            "version": "5.33.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.33.0.tgz",
+            "integrity": "sha512-2zB8uEn7hEH2pBeyk3NpzX1p3lF9dKrEbnXq1F7YkpZ6hlyqb2yZujqgRGqXgRBTHWIUG3NGx/WeZk224UKlIA==",
             "dev": true,
             "requires": {
-                "@typescript-eslint/utils": "5.32.0",
+                "@typescript-eslint/utils": "5.33.0",
                 "debug": "^4.3.4",
                 "tsutils": "^3.21.0"
             }
         },
         "@typescript-eslint/types": {
-            "version": "5.32.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.32.0.tgz",
-            "integrity": "sha512-EBUKs68DOcT/EjGfzywp+f8wG9Zw6gj6BjWu7KV/IYllqKJFPlZlLSYw/PTvVyiRw50t6wVbgv4p9uE2h6sZrQ==",
+            "version": "5.33.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.33.0.tgz",
+            "integrity": "sha512-nIMt96JngB4MYFYXpZ/3ZNU4GWPNdBbcB5w2rDOCpXOVUkhtNlG2mmm8uXhubhidRZdwMaMBap7Uk8SZMU/ppw==",
             "dev": true
         },
         "@typescript-eslint/typescript-estree": {
-            "version": "5.32.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.32.0.tgz",
-            "integrity": "sha512-ZVAUkvPk3ITGtCLU5J4atCw9RTxK+SRc6hXqLtllC2sGSeMFWN+YwbiJR9CFrSFJ3w4SJfcWtDwNb/DmUIHdhg==",
+            "version": "5.33.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.33.0.tgz",
+            "integrity": "sha512-tqq3MRLlggkJKJUrzM6wltk8NckKyyorCSGMq4eVkyL5sDYzJJcMgZATqmF8fLdsWrW7OjjIZ1m9v81vKcaqwQ==",
             "dev": true,
             "requires": {
-                "@typescript-eslint/types": "5.32.0",
-                "@typescript-eslint/visitor-keys": "5.32.0",
+                "@typescript-eslint/types": "5.33.0",
+                "@typescript-eslint/visitor-keys": "5.33.0",
                 "debug": "^4.3.4",
                 "globby": "^11.1.0",
                 "is-glob": "^4.0.3",
@@ -9252,26 +9252,26 @@
             }
         },
         "@typescript-eslint/utils": {
-            "version": "5.32.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.32.0.tgz",
-            "integrity": "sha512-W7lYIAI5Zlc5K082dGR27Fczjb3Q57ECcXefKU/f0ajM5ToM0P+N9NmJWip8GmGu/g6QISNT+K6KYB+iSHjXCQ==",
+            "version": "5.33.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.33.0.tgz",
+            "integrity": "sha512-JxOAnXt9oZjXLIiXb5ZIcZXiwVHCkqZgof0O8KPgz7C7y0HS42gi75PdPlqh1Tf109M0fyUw45Ao6JLo7S5AHw==",
             "dev": true,
             "requires": {
                 "@types/json-schema": "^7.0.9",
-                "@typescript-eslint/scope-manager": "5.32.0",
-                "@typescript-eslint/types": "5.32.0",
-                "@typescript-eslint/typescript-estree": "5.32.0",
+                "@typescript-eslint/scope-manager": "5.33.0",
+                "@typescript-eslint/types": "5.33.0",
+                "@typescript-eslint/typescript-estree": "5.33.0",
                 "eslint-scope": "^5.1.1",
                 "eslint-utils": "^3.0.0"
             }
         },
         "@typescript-eslint/visitor-keys": {
-            "version": "5.32.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.32.0.tgz",
-            "integrity": "sha512-S54xOHZgfThiZ38/ZGTgB2rqx51CMJ5MCfVT2IplK4Q7hgzGfe0nLzLCcenDnc/cSjP568hdeKfeDcBgqNHD/g==",
+            "version": "5.33.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.33.0.tgz",
+            "integrity": "sha512-/XsqCzD4t+Y9p5wd9HZiptuGKBlaZO5showwqODii5C0nZawxWLF+Q6k5wYHBrQv96h6GYKyqqMHCSTqta8Kiw==",
             "dev": true,
             "requires": {
-                "@typescript-eslint/types": "5.32.0",
+                "@typescript-eslint/types": "5.33.0",
                 "eslint-visitor-keys": "^3.3.0"
             }
         },

From 6aa9b87f54e5235914d389d1451e3bb03567b3d1 Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <DanielRosenwasser@users.noreply.github.com>
Date: Tue, 9 Aug 2022 13:33:52 -0700
Subject: [PATCH 08/18] Bump version to 4.9. (#50239)

---
 package.json                                       | 2 +-
 src/compiler/corePublic.ts                         | 2 +-
 tests/baselines/reference/api/tsserverlibrary.d.ts | 2 +-
 tests/baselines/reference/api/typescript.d.ts      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 0c19a98f9572f..37febe3da4b3a 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
     "name": "typescript",
     "author": "Microsoft Corp.",
     "homepage": "https://www.typescriptlang.org/",
-    "version": "4.8.0",
+    "version": "4.9.0",
     "license": "Apache-2.0",
     "description": "TypeScript is a language for application scale JavaScript development",
     "keywords": [
diff --git a/src/compiler/corePublic.ts b/src/compiler/corePublic.ts
index aabd9ac8333a5..4726bf090ba57 100644
--- a/src/compiler/corePublic.ts
+++ b/src/compiler/corePublic.ts
@@ -1,7 +1,7 @@
 namespace ts {
     // WARNING: The script `configurePrerelease.ts` uses a regexp to parse out these values.
     // If changing the text in this section, be sure to test `configurePrerelease` too.
-    export const versionMajorMinor = "4.8";
+    export const versionMajorMinor = "4.9";
     // The following is baselined as a literal template type without intervention
     /** The version of the TypeScript compiler release */
     // eslint-disable-next-line @typescript-eslint/no-inferrable-types
diff --git a/tests/baselines/reference/api/tsserverlibrary.d.ts b/tests/baselines/reference/api/tsserverlibrary.d.ts
index 103b3664e8b14..77ddcc8ffceed 100644
--- a/tests/baselines/reference/api/tsserverlibrary.d.ts
+++ b/tests/baselines/reference/api/tsserverlibrary.d.ts
@@ -14,7 +14,7 @@ and limitations under the License.
 ***************************************************************************** */
 
 declare namespace ts {
-    const versionMajorMinor = "4.8";
+    const versionMajorMinor = "4.9";
     /** The version of the TypeScript compiler release */
     const version: string;
     /**
diff --git a/tests/baselines/reference/api/typescript.d.ts b/tests/baselines/reference/api/typescript.d.ts
index 3ea4fe3130e4b..41938960fa8ac 100644
--- a/tests/baselines/reference/api/typescript.d.ts
+++ b/tests/baselines/reference/api/typescript.d.ts
@@ -14,7 +14,7 @@ and limitations under the License.
 ***************************************************************************** */
 
 declare namespace ts {
-    const versionMajorMinor = "4.8";
+    const versionMajorMinor = "4.9";
     /** The version of the TypeScript compiler release */
     const version: string;
     /**

From 19e2a310c0d2d528a28a43e54519a5bb3b6af9bf Mon Sep 17 00:00:00 2001
From: Oleksandr T <oleksandr.tarasiuk@outlook.com>
Date: Wed, 10 Aug 2022 01:02:45 +0300
Subject: [PATCH 09/18] feat(49834): Suggestion: filter enum member ids from
 their own jsdocs (#49843)

* feat(49834): omit self-referenced enum declaration in JsDoc

* change code style
---
 src/compiler/checker.ts                       |  6 ++
 ...rencesFromLinkTagReference1.baseline.jsonc | 85 ++++++++++++++++++
 ...rencesFromLinkTagReference2.baseline.jsonc | 64 ++++++++++++++
 ...rencesFromLinkTagReference3.baseline.jsonc | 66 ++++++++++++++
 ...rencesFromLinkTagReference4.baseline.jsonc | 86 +++++++++++++++++++
 ...rencesFromLinkTagReference5.baseline.jsonc | 85 ++++++++++++++++++
 .../renameReferenceFromLinkTag1.baseline      |  6 ++
 .../renameReferenceFromLinkTag2.baseline      |  9 ++
 .../renameReferenceFromLinkTag3.baseline      | 12 +++
 .../renameReferenceFromLinkTag4.baseline      |  7 ++
 .../renameReferenceFromLinkTag5.baseline      |  6 ++
 .../findAllReferencesFromLinkTagReference1.ts |  8 ++
 .../findAllReferencesFromLinkTagReference2.ts | 12 +++
 .../findAllReferencesFromLinkTagReference3.ts | 14 +++
 .../findAllReferencesFromLinkTagReference4.ts |  8 ++
 .../findAllReferencesFromLinkTagReference5.ts |  8 ++
 .../cases/fourslash/gotoDefinitionLinkTag2.ts |  9 ++
 .../cases/fourslash/gotoDefinitionLinkTag3.ts | 13 +++
 .../cases/fourslash/gotoDefinitionLinkTag4.ts | 15 ++++
 .../cases/fourslash/gotoDefinitionLinkTag5.ts |  9 ++
 .../cases/fourslash/gotoDefinitionLinkTag6.ts |  9 ++
 .../fourslash/renameReferenceFromLinkTag1.ts  |  8 ++
 .../fourslash/renameReferenceFromLinkTag2.ts  | 12 +++
 .../fourslash/renameReferenceFromLinkTag3.ts  | 14 +++
 .../fourslash/renameReferenceFromLinkTag4.ts  |  8 ++
 .../fourslash/renameReferenceFromLinkTag5.ts  |  8 ++
 26 files changed, 587 insertions(+)
 create mode 100644 tests/baselines/reference/findAllReferencesFromLinkTagReference1.baseline.jsonc
 create mode 100644 tests/baselines/reference/findAllReferencesFromLinkTagReference2.baseline.jsonc
 create mode 100644 tests/baselines/reference/findAllReferencesFromLinkTagReference3.baseline.jsonc
 create mode 100644 tests/baselines/reference/findAllReferencesFromLinkTagReference4.baseline.jsonc
 create mode 100644 tests/baselines/reference/findAllReferencesFromLinkTagReference5.baseline.jsonc
 create mode 100644 tests/baselines/reference/renameReferenceFromLinkTag1.baseline
 create mode 100644 tests/baselines/reference/renameReferenceFromLinkTag2.baseline
 create mode 100644 tests/baselines/reference/renameReferenceFromLinkTag3.baseline
 create mode 100644 tests/baselines/reference/renameReferenceFromLinkTag4.baseline
 create mode 100644 tests/baselines/reference/renameReferenceFromLinkTag5.baseline
 create mode 100644 tests/cases/fourslash/findAllReferencesFromLinkTagReference1.ts
 create mode 100644 tests/cases/fourslash/findAllReferencesFromLinkTagReference2.ts
 create mode 100644 tests/cases/fourslash/findAllReferencesFromLinkTagReference3.ts
 create mode 100644 tests/cases/fourslash/findAllReferencesFromLinkTagReference4.ts
 create mode 100644 tests/cases/fourslash/findAllReferencesFromLinkTagReference5.ts
 create mode 100644 tests/cases/fourslash/gotoDefinitionLinkTag2.ts
 create mode 100644 tests/cases/fourslash/gotoDefinitionLinkTag3.ts
 create mode 100644 tests/cases/fourslash/gotoDefinitionLinkTag4.ts
 create mode 100644 tests/cases/fourslash/gotoDefinitionLinkTag5.ts
 create mode 100644 tests/cases/fourslash/gotoDefinitionLinkTag6.ts
 create mode 100644 tests/cases/fourslash/renameReferenceFromLinkTag1.ts
 create mode 100644 tests/cases/fourslash/renameReferenceFromLinkTag2.ts
 create mode 100644 tests/cases/fourslash/renameReferenceFromLinkTag3.ts
 create mode 100644 tests/cases/fourslash/renameReferenceFromLinkTag4.ts
 create mode 100644 tests/cases/fourslash/renameReferenceFromLinkTag5.ts

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 920dbb775d2a1..0c36c132968b1 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -42548,6 +42548,12 @@ namespace ts {
                             return resolveJSDocMemberName(name, /*ignoreErrors*/ false, getSymbolOfNode(container));
                         }
                     }
+                    if (result && isJSDoc) {
+                        const container = getJSDocHost(name);
+                        if (container && isEnumMember(container) && container === result.valueDeclaration) {
+                            return resolveEntityName(name, meaning, /*ignoreErrors*/ true, /* dontResolveAlias */ true, getSourceFileOfNode(container)) || result;
+                        }
+                    }
                     return result;
                 }
                 else if (isPrivateIdentifier(name)) {
diff --git a/tests/baselines/reference/findAllReferencesFromLinkTagReference1.baseline.jsonc b/tests/baselines/reference/findAllReferencesFromLinkTagReference1.baseline.jsonc
new file mode 100644
index 0000000000000..9fc705112fb73
--- /dev/null
+++ b/tests/baselines/reference/findAllReferencesFromLinkTagReference1.baseline.jsonc
@@ -0,0 +1,85 @@
+// === /tests/cases/fourslash/findAllReferencesFromLinkTagReference1.ts ===
+// enum E {
+//     /** {@link /*FIND ALL REFS*/[|A|]} */
+//     [|A|]
+// }
+
+[
+  {
+    "definition": {
+      "containerKind": "",
+      "containerName": "",
+      "fileName": "/tests/cases/fourslash/findAllReferencesFromLinkTagReference1.ts",
+      "kind": "enum member",
+      "name": "(enum member) E.A = 0",
+      "textSpan": {
+        "start": 34,
+        "length": 1
+      },
+      "displayParts": [
+        {
+          "text": "(",
+          "kind": "punctuation"
+        },
+        {
+          "text": "enum member",
+          "kind": "text"
+        },
+        {
+          "text": ")",
+          "kind": "punctuation"
+        },
+        {
+          "text": " ",
+          "kind": "space"
+        },
+        {
+          "text": "E",
+          "kind": "enumName"
+        },
+        {
+          "text": ".",
+          "kind": "punctuation"
+        },
+        {
+          "text": "A",
+          "kind": "enumMemberName"
+        },
+        {
+          "text": " ",
+          "kind": "space"
+        },
+        {
+          "text": "=",
+          "kind": "operator"
+        },
+        {
+          "text": " ",
+          "kind": "space"
+        },
+        {
+          "text": "0",
+          "kind": "numericLiteral"
+        }
+      ]
+    },
+    "references": [
+      {
+        "textSpan": {
+          "start": 24,
+          "length": 1
+        },
+        "fileName": "/tests/cases/fourslash/findAllReferencesFromLinkTagReference1.ts",
+        "isWriteAccess": false
+      },
+      {
+        "textSpan": {
+          "start": 34,
+          "length": 1
+        },
+        "fileName": "/tests/cases/fourslash/findAllReferencesFromLinkTagReference1.ts",
+        "isWriteAccess": true
+      }
+    ]
+  }
+]
\ No newline at end of file
diff --git a/tests/baselines/reference/findAllReferencesFromLinkTagReference2.baseline.jsonc b/tests/baselines/reference/findAllReferencesFromLinkTagReference2.baseline.jsonc
new file mode 100644
index 0000000000000..f897a6e5d5769
--- /dev/null
+++ b/tests/baselines/reference/findAllReferencesFromLinkTagReference2.baseline.jsonc
@@ -0,0 +1,64 @@
+// === /a.ts ===
+// enum E {
+//     /** {@link /*FIND ALL REFS*/[|Foo|]} */
+//     Foo
+// }
+// interface [|Foo|] {
+//     foo: E.Foo;
+// }
+
+[
+  {
+    "definition": {
+      "containerKind": "",
+      "containerName": "",
+      "fileName": "/a.ts",
+      "kind": "interface",
+      "name": "interface Foo",
+      "textSpan": {
+        "start": 52,
+        "length": 3
+      },
+      "displayParts": [
+        {
+          "text": "interface",
+          "kind": "keyword"
+        },
+        {
+          "text": " ",
+          "kind": "space"
+        },
+        {
+          "text": "Foo",
+          "kind": "interfaceName"
+        }
+      ],
+      "contextSpan": {
+        "start": 42,
+        "length": 33
+      }
+    },
+    "references": [
+      {
+        "textSpan": {
+          "start": 24,
+          "length": 3
+        },
+        "fileName": "/a.ts",
+        "isWriteAccess": false
+      },
+      {
+        "textSpan": {
+          "start": 52,
+          "length": 3
+        },
+        "fileName": "/a.ts",
+        "contextSpan": {
+          "start": 42,
+          "length": 33
+        },
+        "isWriteAccess": true
+      }
+    ]
+  }
+]
\ No newline at end of file
diff --git a/tests/baselines/reference/findAllReferencesFromLinkTagReference3.baseline.jsonc b/tests/baselines/reference/findAllReferencesFromLinkTagReference3.baseline.jsonc
new file mode 100644
index 0000000000000..5c9eefb255da2
--- /dev/null
+++ b/tests/baselines/reference/findAllReferencesFromLinkTagReference3.baseline.jsonc
@@ -0,0 +1,66 @@
+// === /tests/cases/fourslash/a.ts ===
+// interface [|Foo|] {
+//     foo: E.Foo;
+// }
+
+// === /tests/cases/fourslash/b.ts ===
+// enum E {
+//     /** {@link /*FIND ALL REFS*/[|Foo|]} */
+//     Foo
+// }
+
+[
+  {
+    "definition": {
+      "containerKind": "",
+      "containerName": "",
+      "fileName": "/tests/cases/fourslash/a.ts",
+      "kind": "interface",
+      "name": "interface Foo",
+      "textSpan": {
+        "start": 10,
+        "length": 3
+      },
+      "displayParts": [
+        {
+          "text": "interface",
+          "kind": "keyword"
+        },
+        {
+          "text": " ",
+          "kind": "space"
+        },
+        {
+          "text": "Foo",
+          "kind": "interfaceName"
+        }
+      ],
+      "contextSpan": {
+        "start": 0,
+        "length": 33
+      }
+    },
+    "references": [
+      {
+        "textSpan": {
+          "start": 10,
+          "length": 3
+        },
+        "fileName": "/tests/cases/fourslash/a.ts",
+        "contextSpan": {
+          "start": 0,
+          "length": 33
+        },
+        "isWriteAccess": true
+      },
+      {
+        "textSpan": {
+          "start": 24,
+          "length": 3
+        },
+        "fileName": "/tests/cases/fourslash/b.ts",
+        "isWriteAccess": false
+      }
+    ]
+  }
+]
\ No newline at end of file
diff --git a/tests/baselines/reference/findAllReferencesFromLinkTagReference4.baseline.jsonc b/tests/baselines/reference/findAllReferencesFromLinkTagReference4.baseline.jsonc
new file mode 100644
index 0000000000000..b1dbc94dc7666
--- /dev/null
+++ b/tests/baselines/reference/findAllReferencesFromLinkTagReference4.baseline.jsonc
@@ -0,0 +1,86 @@
+// === /tests/cases/fourslash/findAllReferencesFromLinkTagReference4.ts ===
+// enum E {
+//     /** {@link /*FIND ALL REFS*/[|B|]} */
+//     A,
+//     [|B|]
+// }
+
+[
+  {
+    "definition": {
+      "containerKind": "",
+      "containerName": "",
+      "fileName": "/tests/cases/fourslash/findAllReferencesFromLinkTagReference4.ts",
+      "kind": "enum member",
+      "name": "(enum member) E.B = 1",
+      "textSpan": {
+        "start": 41,
+        "length": 1
+      },
+      "displayParts": [
+        {
+          "text": "(",
+          "kind": "punctuation"
+        },
+        {
+          "text": "enum member",
+          "kind": "text"
+        },
+        {
+          "text": ")",
+          "kind": "punctuation"
+        },
+        {
+          "text": " ",
+          "kind": "space"
+        },
+        {
+          "text": "E",
+          "kind": "enumName"
+        },
+        {
+          "text": ".",
+          "kind": "punctuation"
+        },
+        {
+          "text": "B",
+          "kind": "enumMemberName"
+        },
+        {
+          "text": " ",
+          "kind": "space"
+        },
+        {
+          "text": "=",
+          "kind": "operator"
+        },
+        {
+          "text": " ",
+          "kind": "space"
+        },
+        {
+          "text": "1",
+          "kind": "numericLiteral"
+        }
+      ]
+    },
+    "references": [
+      {
+        "textSpan": {
+          "start": 24,
+          "length": 1
+        },
+        "fileName": "/tests/cases/fourslash/findAllReferencesFromLinkTagReference4.ts",
+        "isWriteAccess": false
+      },
+      {
+        "textSpan": {
+          "start": 41,
+          "length": 1
+        },
+        "fileName": "/tests/cases/fourslash/findAllReferencesFromLinkTagReference4.ts",
+        "isWriteAccess": true
+      }
+    ]
+  }
+]
\ No newline at end of file
diff --git a/tests/baselines/reference/findAllReferencesFromLinkTagReference5.baseline.jsonc b/tests/baselines/reference/findAllReferencesFromLinkTagReference5.baseline.jsonc
new file mode 100644
index 0000000000000..c6f03b14a69d6
--- /dev/null
+++ b/tests/baselines/reference/findAllReferencesFromLinkTagReference5.baseline.jsonc
@@ -0,0 +1,85 @@
+// === /tests/cases/fourslash/findAllReferencesFromLinkTagReference5.ts ===
+// enum E {
+//     /** {@link E./*FIND ALL REFS*/[|A|]} */
+//     [|A|]
+// }
+
+[
+  {
+    "definition": {
+      "containerKind": "",
+      "containerName": "",
+      "fileName": "/tests/cases/fourslash/findAllReferencesFromLinkTagReference5.ts",
+      "kind": "enum member",
+      "name": "(enum member) E.A = 0",
+      "textSpan": {
+        "start": 36,
+        "length": 1
+      },
+      "displayParts": [
+        {
+          "text": "(",
+          "kind": "punctuation"
+        },
+        {
+          "text": "enum member",
+          "kind": "text"
+        },
+        {
+          "text": ")",
+          "kind": "punctuation"
+        },
+        {
+          "text": " ",
+          "kind": "space"
+        },
+        {
+          "text": "E",
+          "kind": "enumName"
+        },
+        {
+          "text": ".",
+          "kind": "punctuation"
+        },
+        {
+          "text": "A",
+          "kind": "enumMemberName"
+        },
+        {
+          "text": " ",
+          "kind": "space"
+        },
+        {
+          "text": "=",
+          "kind": "operator"
+        },
+        {
+          "text": " ",
+          "kind": "space"
+        },
+        {
+          "text": "0",
+          "kind": "numericLiteral"
+        }
+      ]
+    },
+    "references": [
+      {
+        "textSpan": {
+          "start": 26,
+          "length": 1
+        },
+        "fileName": "/tests/cases/fourslash/findAllReferencesFromLinkTagReference5.ts",
+        "isWriteAccess": false
+      },
+      {
+        "textSpan": {
+          "start": 36,
+          "length": 1
+        },
+        "fileName": "/tests/cases/fourslash/findAllReferencesFromLinkTagReference5.ts",
+        "isWriteAccess": true
+      }
+    ]
+  }
+]
\ No newline at end of file
diff --git a/tests/baselines/reference/renameReferenceFromLinkTag1.baseline b/tests/baselines/reference/renameReferenceFromLinkTag1.baseline
new file mode 100644
index 0000000000000..6a267b2d99745
--- /dev/null
+++ b/tests/baselines/reference/renameReferenceFromLinkTag1.baseline
@@ -0,0 +1,6 @@
+/*====== /tests/cases/fourslash/renameReferenceFromLinkTag1.ts ======*/
+
+enum E {
+    /** {@link [|RENAME|]} */
+    RENAME
+}
diff --git a/tests/baselines/reference/renameReferenceFromLinkTag2.baseline b/tests/baselines/reference/renameReferenceFromLinkTag2.baseline
new file mode 100644
index 0000000000000..3da46e2bfff7d
--- /dev/null
+++ b/tests/baselines/reference/renameReferenceFromLinkTag2.baseline
@@ -0,0 +1,9 @@
+/*====== /a.ts ======*/
+
+enum E {
+    /** {@link [|RENAME|]} */
+    Foo
+}
+interface RENAME {
+    foo: E.Foo;
+}
diff --git a/tests/baselines/reference/renameReferenceFromLinkTag3.baseline b/tests/baselines/reference/renameReferenceFromLinkTag3.baseline
new file mode 100644
index 0000000000000..19e3ec871e420
--- /dev/null
+++ b/tests/baselines/reference/renameReferenceFromLinkTag3.baseline
@@ -0,0 +1,12 @@
+/*====== /tests/cases/fourslash/a.ts ======*/
+
+interface RENAME {
+    foo: E.Foo;
+}
+
+/*====== /tests/cases/fourslash/b.ts ======*/
+
+enum E {
+    /** {@link RENAME} */
+    Foo
+}
diff --git a/tests/baselines/reference/renameReferenceFromLinkTag4.baseline b/tests/baselines/reference/renameReferenceFromLinkTag4.baseline
new file mode 100644
index 0000000000000..4020ebfd1dffa
--- /dev/null
+++ b/tests/baselines/reference/renameReferenceFromLinkTag4.baseline
@@ -0,0 +1,7 @@
+/*====== /tests/cases/fourslash/renameReferenceFromLinkTag4.ts ======*/
+
+enum E {
+    /** {@link [|RENAME|]} */
+    A,
+    RENAME
+}
diff --git a/tests/baselines/reference/renameReferenceFromLinkTag5.baseline b/tests/baselines/reference/renameReferenceFromLinkTag5.baseline
new file mode 100644
index 0000000000000..605869bd5e8cc
--- /dev/null
+++ b/tests/baselines/reference/renameReferenceFromLinkTag5.baseline
@@ -0,0 +1,6 @@
+/*====== /tests/cases/fourslash/renameReferenceFromLinkTag5.ts ======*/
+
+enum E {
+    /** {@link E.[|RENAME|]} */
+    RENAME
+}
diff --git a/tests/cases/fourslash/findAllReferencesFromLinkTagReference1.ts b/tests/cases/fourslash/findAllReferencesFromLinkTagReference1.ts
new file mode 100644
index 0000000000000..7265583f5ccce
--- /dev/null
+++ b/tests/cases/fourslash/findAllReferencesFromLinkTagReference1.ts
@@ -0,0 +1,8 @@
+/// <reference path="fourslash.ts" />
+
+////enum E {
+////    /** {@link /**/A} */
+////    A
+////}
+
+verify.baselineFindAllReferences("");
diff --git a/tests/cases/fourslash/findAllReferencesFromLinkTagReference2.ts b/tests/cases/fourslash/findAllReferencesFromLinkTagReference2.ts
new file mode 100644
index 0000000000000..eae6a3d09ceeb
--- /dev/null
+++ b/tests/cases/fourslash/findAllReferencesFromLinkTagReference2.ts
@@ -0,0 +1,12 @@
+/// <reference path="fourslash.ts" />
+
+// @Filename: /a.ts
+////enum E {
+////    /** {@link /**/Foo} */
+////    Foo
+////}
+////interface Foo {
+////    foo: E.Foo;
+////}
+
+verify.baselineFindAllReferences("");
diff --git a/tests/cases/fourslash/findAllReferencesFromLinkTagReference3.ts b/tests/cases/fourslash/findAllReferencesFromLinkTagReference3.ts
new file mode 100644
index 0000000000000..eb150a559647c
--- /dev/null
+++ b/tests/cases/fourslash/findAllReferencesFromLinkTagReference3.ts
@@ -0,0 +1,14 @@
+/// <reference path="fourslash.ts" />
+
+// @filename: a.ts
+////interface Foo {
+////    foo: E.Foo;
+////}
+
+// @Filename: b.ts
+////enum E {
+////    /** {@link /**/Foo} */
+////    Foo
+////}
+
+verify.baselineFindAllReferences("");
diff --git a/tests/cases/fourslash/findAllReferencesFromLinkTagReference4.ts b/tests/cases/fourslash/findAllReferencesFromLinkTagReference4.ts
new file mode 100644
index 0000000000000..869349e0b8b1e
--- /dev/null
+++ b/tests/cases/fourslash/findAllReferencesFromLinkTagReference4.ts
@@ -0,0 +1,8 @@
+/// <reference path="fourslash.ts" />
+////enum E {
+////    /** {@link /**/B} */
+////    A,
+////    B
+////}
+
+verify.baselineFindAllReferences("");
diff --git a/tests/cases/fourslash/findAllReferencesFromLinkTagReference5.ts b/tests/cases/fourslash/findAllReferencesFromLinkTagReference5.ts
new file mode 100644
index 0000000000000..8b9bee761743d
--- /dev/null
+++ b/tests/cases/fourslash/findAllReferencesFromLinkTagReference5.ts
@@ -0,0 +1,8 @@
+/// <reference path="fourslash.ts" />
+
+////enum E {
+////    /** {@link E./**/A} */
+////    A
+////}
+
+verify.baselineFindAllReferences("");
diff --git a/tests/cases/fourslash/gotoDefinitionLinkTag2.ts b/tests/cases/fourslash/gotoDefinitionLinkTag2.ts
new file mode 100644
index 0000000000000..ad463c51f791f
--- /dev/null
+++ b/tests/cases/fourslash/gotoDefinitionLinkTag2.ts
@@ -0,0 +1,9 @@
+/// <reference path="fourslash.ts" />
+
+////enum E {
+////    /** {@link /*1*/[|A|]} */
+////    [|/*2*/A|]
+////}
+
+goTo.marker("1");
+verify.goToDefinitionIs("2");
diff --git a/tests/cases/fourslash/gotoDefinitionLinkTag3.ts b/tests/cases/fourslash/gotoDefinitionLinkTag3.ts
new file mode 100644
index 0000000000000..8dc4105ae8cc2
--- /dev/null
+++ b/tests/cases/fourslash/gotoDefinitionLinkTag3.ts
@@ -0,0 +1,13 @@
+/// <reference path="fourslash.ts" />
+
+// @Filename: /a.ts
+////enum E {
+////    /** {@link /*1*/[|Foo|]} */
+////    Foo
+////}
+////interface [|/*2*/Foo|] {
+////    foo: E.Foo;
+////}
+
+goTo.marker("1");
+verify.goToDefinitionIs("2");
diff --git a/tests/cases/fourslash/gotoDefinitionLinkTag4.ts b/tests/cases/fourslash/gotoDefinitionLinkTag4.ts
new file mode 100644
index 0000000000000..6df523b058e66
--- /dev/null
+++ b/tests/cases/fourslash/gotoDefinitionLinkTag4.ts
@@ -0,0 +1,15 @@
+/// <reference path="fourslash.ts" />
+
+// @filename: a.ts
+////interface [|/*2*/Foo|] {
+////    foo: E.Foo;
+////}
+
+// @Filename: b.ts
+////enum E {
+////    /** {@link /*1*/[|Foo|]} */
+////    Foo
+////}
+
+goTo.marker("1");
+verify.goToDefinitionIs("2");
diff --git a/tests/cases/fourslash/gotoDefinitionLinkTag5.ts b/tests/cases/fourslash/gotoDefinitionLinkTag5.ts
new file mode 100644
index 0000000000000..8425653f41b91
--- /dev/null
+++ b/tests/cases/fourslash/gotoDefinitionLinkTag5.ts
@@ -0,0 +1,9 @@
+/// <reference path="fourslash.ts" />
+////enum E {
+////    /** {@link /*1*/[|B|]} */
+////    A,
+////    [|/*2*/B|]
+////}
+
+goTo.marker("1");
+verify.goToDefinitionIs("2");
diff --git a/tests/cases/fourslash/gotoDefinitionLinkTag6.ts b/tests/cases/fourslash/gotoDefinitionLinkTag6.ts
new file mode 100644
index 0000000000000..c76fcb08fd8e8
--- /dev/null
+++ b/tests/cases/fourslash/gotoDefinitionLinkTag6.ts
@@ -0,0 +1,9 @@
+/// <reference path="fourslash.ts" />
+
+////enum E {
+////    /** {@link E./*1*/[|A|]} */
+////    [|/*2*/A|]
+////}
+
+goTo.marker("1");
+verify.goToDefinitionIs("2");
diff --git a/tests/cases/fourslash/renameReferenceFromLinkTag1.ts b/tests/cases/fourslash/renameReferenceFromLinkTag1.ts
new file mode 100644
index 0000000000000..fe0e4c87b2073
--- /dev/null
+++ b/tests/cases/fourslash/renameReferenceFromLinkTag1.ts
@@ -0,0 +1,8 @@
+/// <reference path="fourslash.ts" />
+
+////enum E {
+////    /** {@link /**/A} */
+////    A
+////}
+
+verify.baselineRename("", {});
\ No newline at end of file
diff --git a/tests/cases/fourslash/renameReferenceFromLinkTag2.ts b/tests/cases/fourslash/renameReferenceFromLinkTag2.ts
new file mode 100644
index 0000000000000..330416ee17a66
--- /dev/null
+++ b/tests/cases/fourslash/renameReferenceFromLinkTag2.ts
@@ -0,0 +1,12 @@
+/// <reference path="fourslash.ts" />
+
+// @Filename: /a.ts
+////enum E {
+////    /** {@link /**/Foo} */
+////    Foo
+////}
+////interface Foo {
+////    foo: E.Foo;
+////}
+
+verify.baselineRename("", {});
diff --git a/tests/cases/fourslash/renameReferenceFromLinkTag3.ts b/tests/cases/fourslash/renameReferenceFromLinkTag3.ts
new file mode 100644
index 0000000000000..439b48f584146
--- /dev/null
+++ b/tests/cases/fourslash/renameReferenceFromLinkTag3.ts
@@ -0,0 +1,14 @@
+/// <reference path="fourslash.ts" />
+
+// @filename: a.ts
+////interface Foo {
+////    foo: E.Foo;
+////}
+
+// @Filename: b.ts
+////enum E {
+////    /** {@link /**/Foo} */
+////    Foo
+////}
+
+verify.baselineRename("", {});
diff --git a/tests/cases/fourslash/renameReferenceFromLinkTag4.ts b/tests/cases/fourslash/renameReferenceFromLinkTag4.ts
new file mode 100644
index 0000000000000..cda21943d6bce
--- /dev/null
+++ b/tests/cases/fourslash/renameReferenceFromLinkTag4.ts
@@ -0,0 +1,8 @@
+/// <reference path="fourslash.ts" />
+////enum E {
+////    /** {@link /**/B} */
+////    A,
+////    B
+////}
+
+verify.baselineRename("", {});
diff --git a/tests/cases/fourslash/renameReferenceFromLinkTag5.ts b/tests/cases/fourslash/renameReferenceFromLinkTag5.ts
new file mode 100644
index 0000000000000..bd80eb841eec3
--- /dev/null
+++ b/tests/cases/fourslash/renameReferenceFromLinkTag5.ts
@@ -0,0 +1,8 @@
+/// <reference path="fourslash.ts" />
+
+////enum E {
+////    /** {@link E./**/A} */
+////    A
+////}
+
+verify.baselineRename("", {});

From a123fc5ce478b6b314a10454e95e3bbf4a69171d Mon Sep 17 00:00:00 2001
From: ExE Boss <3889017+ExE-Boss@users.noreply.github.com>
Date: Wed, 10 Aug 2022 00:05:33 +0200
Subject: [PATCH 10/18] =?UTF-8?q?feat(lib/es2015):=20Add=C2=A0typed=C2=A0o?=
 =?UTF-8?q?verloads=20to=C2=A0`Reflect`=20(#35608)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Nathan Shively-Sanders <293473+sandersn@users.noreply.github.com>
---
 src/lib/es2015.reflect.d.ts | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/src/lib/es2015.reflect.d.ts b/src/lib/es2015.reflect.d.ts
index ed968dc0b1740..4f4ddc404f02f 100644
--- a/src/lib/es2015.reflect.d.ts
+++ b/src/lib/es2015.reflect.d.ts
@@ -6,6 +6,11 @@ declare namespace Reflect {
      * @param thisArgument The object to be used as the this object.
      * @param argumentsList An array of argument values to be passed to the function.
      */
+    function apply<T, A extends readonly any[], R>(
+        target: (this: T, ...args: A) => R,
+        thisArgument: T,
+        argumentsList: Readonly<A>,
+    ): R;
     function apply(target: Function, thisArgument: any, argumentsList: ArrayLike<any>): any;
 
     /**
@@ -15,6 +20,11 @@ declare namespace Reflect {
      * @param argumentsList An array of argument values to be passed to the constructor.
      * @param newTarget The constructor to be used as the `new.target` object.
      */
+    function construct<A extends readonly any[], R>(
+        target: new (...args: A) => R,
+        argumentsList: Readonly<A>,
+        newTarget?: new (...args: any) => any,
+    ): R;
     function construct(target: Function, argumentsList: ArrayLike<any>, newTarget?: Function): any;
 
     /**
@@ -41,7 +51,11 @@ declare namespace Reflect {
      * @param receiver The reference to use as the `this` value in the getter function,
      *        if `target[propertyKey]` is an accessor property.
      */
-    function get(target: object, propertyKey: PropertyKey, receiver?: any): any;
+    function get<T extends object, P extends PropertyKey>(
+        target: T,
+        propertyKey: P,
+        receiver?: unknown,
+    ): P extends keyof T ? T[P] : any;
 
     /**
      * Gets the own property descriptor of the specified object.
@@ -49,7 +63,10 @@ declare namespace Reflect {
      * @param target Object that contains the property.
      * @param propertyKey The property name.
      */
-    function getOwnPropertyDescriptor(target: object, propertyKey: PropertyKey): PropertyDescriptor | undefined;
+    function getOwnPropertyDescriptor<T extends object, P extends PropertyKey>(
+        target: T,
+        propertyKey: P,
+    ): TypedPropertyDescriptor<P extends keyof T ? T[P] : any> | undefined;
 
     /**
      * Returns the prototype of an object.
@@ -91,6 +108,12 @@ declare namespace Reflect {
      * @param receiver The reference to use as the `this` value in the setter function,
      *        if `target[propertyKey]` is an accessor property.
      */
+    function set<T extends object, P extends PropertyKey>(
+        target: T,
+        propertyKey: P,
+        value: P extends keyof T ? T[P] : any,
+        receiver?: any,
+    ): boolean;
     function set(target: object, propertyKey: PropertyKey, value: any, receiver?: any): boolean;
 
     /**

From f70cb769ef61f47d98f7542505b1e58694557868 Mon Sep 17 00:00:00 2001
From: Oleksandr T <oleksandr.tarasiuk@outlook.com>
Date: Wed, 10 Aug 2022 01:28:03 +0300
Subject: [PATCH 11/18] feat(49928): Provide quick fix for a missing callback
 function (#49930)

* feat(49928): provide quick fix for a missing callback function

* remove addFunctionDeclarationFromSignature. fix formatting

* add tests
---
 src/services/codefixes/fixAddMissingMember.ts | 62 +++++++++++++++----
 src/services/codefixes/helpers.ts             | 15 +++--
 .../codeFixAddMissingFunctionDeclaration21.ts | 39 ++++++++++++
 .../codeFixAddMissingFunctionDeclaration22.ts | 34 ++++++++++
 .../codeFixAddMissingFunctionDeclaration23.ts | 21 +++++++
 .../codeFixAddMissingFunctionDeclaration24.ts | 27 ++++++++
 .../codeFixAddMissingFunctionDeclaration25.ts | 23 +++++++
 ...odeFixAddMissingFunctionDeclaration_all.ts | 29 ++++++---
 ...ixAddMissingFunctionDeclaration_jsx_all.ts | 53 ++++++++++++++++
 9 files changed, 281 insertions(+), 22 deletions(-)
 create mode 100644 tests/cases/fourslash/codeFixAddMissingFunctionDeclaration21.ts
 create mode 100644 tests/cases/fourslash/codeFixAddMissingFunctionDeclaration22.ts
 create mode 100644 tests/cases/fourslash/codeFixAddMissingFunctionDeclaration23.ts
 create mode 100644 tests/cases/fourslash/codeFixAddMissingFunctionDeclaration24.ts
 create mode 100644 tests/cases/fourslash/codeFixAddMissingFunctionDeclaration25.ts
 create mode 100644 tests/cases/fourslash/codeFixAddMissingFunctionDeclaration_jsx_all.ts

diff --git a/src/services/codefixes/fixAddMissingMember.ts b/src/services/codefixes/fixAddMissingMember.ts
index 6cd6d0d7f18b3..f08e86983a8af 100644
--- a/src/services/codefixes/fixAddMissingMember.ts
+++ b/src/services/codefixes/fixAddMissingMember.ts
@@ -15,6 +15,15 @@ namespace ts.codefix {
         Diagnostics.Cannot_find_name_0.code
     ];
 
+    enum InfoKind {
+        TypeLikeDeclaration,
+        Enum,
+        Function,
+        ObjectLiteral,
+        JsxAttributes,
+        Signature,
+    }
+
     registerCodeFix({
         errorCodes,
         getCodeActions(context) {
@@ -31,7 +40,7 @@ namespace ts.codefix {
                 const changes = textChanges.ChangeTracker.with(context, t => addJsxAttributes(t, context, info));
                 return [createCodeFixAction(fixMissingAttributes, changes, Diagnostics.Add_missing_attributes, fixMissingAttributes, Diagnostics.Add_all_missing_attributes)];
             }
-            if (info.kind === InfoKind.Function) {
+            if (info.kind === InfoKind.Function || info.kind === InfoKind.Signature) {
                 const changes = textChanges.ChangeTracker.with(context, t => addFunctionDeclaration(t, context, info));
                 return [createCodeFixAction(fixMissingFunctionDeclaration, changes, [Diagnostics.Add_missing_function_declaration_0, info.token.text], fixMissingFunctionDeclaration, Diagnostics.Add_all_missing_function_declarations)];
             }
@@ -54,8 +63,7 @@ namespace ts.codefix {
                     if (!info || !addToSeen(seen, getNodeId(info.parentDeclaration) + "#" + info.token.text)) {
                         return;
                     }
-
-                    if (fixId === fixMissingFunctionDeclaration && info.kind === InfoKind.Function) {
+                    if (fixId === fixMissingFunctionDeclaration && (info.kind === InfoKind.Function || info.kind === InfoKind.Signature)) {
                         addFunctionDeclaration(changes, context, info);
                     }
                     else if (fixId === fixMissingProperties && info.kind === InfoKind.ObjectLiteral) {
@@ -107,8 +115,7 @@ namespace ts.codefix {
         },
     });
 
-    const enum InfoKind { TypeLikeDeclaration, Enum, Function, ObjectLiteral, JsxAttributes }
-    type Info = TypeLikeDeclarationInfo | EnumInfo | FunctionInfo | ObjectLiteralInfo | JsxAttributesInfo;
+    type Info = TypeLikeDeclarationInfo | EnumInfo | FunctionInfo | ObjectLiteralInfo | JsxAttributesInfo | SignatureInfo;
 
     interface EnumInfo {
         readonly kind: InfoKind.Enum;
@@ -132,7 +139,7 @@ namespace ts.codefix {
         readonly token: Identifier;
         readonly sourceFile: SourceFile;
         readonly modifierFlags: ModifierFlags;
-        readonly parentDeclaration: SourceFile | ModuleDeclaration;
+        readonly parentDeclaration: SourceFile | ModuleDeclaration | ReturnStatement;
     }
 
     interface ObjectLiteralInfo {
@@ -150,6 +157,14 @@ namespace ts.codefix {
         readonly parentDeclaration: JsxOpeningLikeElement;
     }
 
+    interface SignatureInfo {
+        readonly kind: InfoKind.Signature;
+        readonly token: Identifier;
+        readonly signature: Signature;
+        readonly sourceFile: SourceFile;
+        readonly parentDeclaration: Node;
+    }
+
     function getInfo(sourceFile: SourceFile, tokenPos: number, errorCode: number, checker: TypeChecker, program: Program): Info | undefined {
         // The identifier of the missing property. eg:
         // this.missing = 1;
@@ -190,8 +205,16 @@ namespace ts.codefix {
             return { kind: InfoKind.JsxAttributes, token, attributes, parentDeclaration: token.parent };
         }
 
-        if (isIdentifier(token) && isCallExpression(parent) && parent.expression === token) {
-            return { kind: InfoKind.Function, token, call: parent, sourceFile, modifierFlags: ModifierFlags.None, parentDeclaration: sourceFile };
+        if (isIdentifier(token)) {
+            const type = checker.getContextualType(token);
+            if (type && getObjectFlags(type) & ObjectFlags.Anonymous) {
+                const signature = firstOrUndefined(checker.getSignaturesOfType(type, SignatureKind.Call));
+                if (signature === undefined) return undefined;
+                return { kind: InfoKind.Signature, token, signature, sourceFile, parentDeclaration: findScope(token) };
+            }
+            if (isCallExpression(parent) && parent.expression === token) {
+                return { kind: InfoKind.Function, token, call: parent, sourceFile, modifierFlags: ModifierFlags.None, parentDeclaration: findScope(token) };
+            }
         }
 
         if (!isPropertyAccessExpression(parent)) return undefined;
@@ -451,10 +474,19 @@ namespace ts.codefix {
         });
     }
 
-    function addFunctionDeclaration(changes: textChanges.ChangeTracker, context: CodeFixContextBase, info: FunctionInfo) {
+    function addFunctionDeclaration(changes: textChanges.ChangeTracker, context: CodeFixContextBase, info: FunctionInfo | SignatureInfo) {
+        const quotePreference = getQuotePreference(context.sourceFile, context.preferences);
         const importAdder = createImportAdder(context.sourceFile, context.program, context.preferences, context.host);
-        const functionDeclaration = createSignatureDeclarationFromCallExpression(SyntaxKind.FunctionDeclaration, context, importAdder, info.call, idText(info.token), info.modifierFlags, info.parentDeclaration) as FunctionDeclaration;
-        changes.insertNodeAtEndOfScope(info.sourceFile, info.parentDeclaration, functionDeclaration);
+        const functionDeclaration = info.kind === InfoKind.Function
+            ? createSignatureDeclarationFromCallExpression(SyntaxKind.FunctionDeclaration, context, importAdder, info.call, idText(info.token), info.modifierFlags, info.parentDeclaration)
+            : createSignatureDeclarationFromSignature(SyntaxKind.FunctionDeclaration, context, quotePreference, info.signature, createStubbedBody(Diagnostics.Function_not_implemented.message, quotePreference), info.token, /*modifiers*/ undefined, /*optional*/ undefined, /*enclosingDeclaration*/ undefined, importAdder);
+        if (functionDeclaration === undefined) {
+            Debug.fail("fixMissingFunctionDeclaration codefix got unexpected error.");
+        }
+
+        isReturnStatement(info.parentDeclaration)
+            ? changes.insertNodeBefore(info.sourceFile, info.parentDeclaration, functionDeclaration, /*blankLineBetween*/ true)
+            : changes.insertNodeAtEndOfScope(info.sourceFile, info.parentDeclaration, functionDeclaration);
         importAdder.writeFixes(changes);
     }
 
@@ -618,4 +650,12 @@ namespace ts.codefix {
         }
         return createPropertyNameNodeForIdentifierOrLiteral(symbol.name, target, quotePreference === QuotePreference.Single);
     }
+
+    function findScope(node: Node) {
+        if (findAncestor(node, isJsxExpression)) {
+            const returnStatement = findAncestor(node.parent, isReturnStatement);
+            if (returnStatement) return returnStatement;
+        }
+        return getSourceFileOfNode(node);
+    }
 }
diff --git a/src/services/codefixes/helpers.ts b/src/services/codefixes/helpers.ts
index 7300ddf868ab9..7562e2320c2b7 100644
--- a/src/services/codefixes/helpers.ts
+++ b/src/services/codefixes/helpers.ts
@@ -169,13 +169,17 @@ namespace ts.codefix {
         }
 
         function outputMethod(quotePreference: QuotePreference, signature: Signature, modifiers: NodeArray<Modifier> | undefined, name: PropertyName, body?: Block): void {
-            const method = createSignatureDeclarationFromSignature(SyntaxKind.MethodDeclaration, context, quotePreference, signature, body, name, modifiers, optional && !!(preserveOptional & PreserveOptionalFlags.Method), enclosingDeclaration, importAdder);
+            const method = createSignatureDeclarationFromSignature(SyntaxKind.MethodDeclaration, context, quotePreference, signature, body, name, modifiers, optional && !!(preserveOptional & PreserveOptionalFlags.Method), enclosingDeclaration, importAdder) as MethodDeclaration;
             if (method) addClassElement(method);
         }
     }
 
     export function createSignatureDeclarationFromSignature(
-        kind: SyntaxKind.MethodDeclaration | SyntaxKind.FunctionExpression | SyntaxKind.ArrowFunction,
+        kind:
+            | SyntaxKind.MethodDeclaration
+            | SyntaxKind.FunctionExpression
+            | SyntaxKind.ArrowFunction
+            | SyntaxKind.FunctionDeclaration,
         context: TypeConstructionContext,
         quotePreference: QuotePreference,
         signature: Signature,
@@ -185,7 +189,7 @@ namespace ts.codefix {
         optional: boolean | undefined,
         enclosingDeclaration: Node | undefined,
         importAdder: ImportAdder | undefined
-     ) {
+    ) {
         const program = context.program;
         const checker = program.getTypeChecker();
         const scriptTarget = getEmitScriptTarget(program.getCompilerOptions());
@@ -194,7 +198,7 @@ namespace ts.codefix {
             | NodeBuilderFlags.SuppressAnyReturnType
             | NodeBuilderFlags.AllowEmptyTuple
             | (quotePreference === QuotePreference.Single ? NodeBuilderFlags.UseSingleQuotesForStringLiteralType : NodeBuilderFlags.None);
-        const signatureDeclaration = checker.signatureToSignatureDeclaration(signature, kind, enclosingDeclaration, flags, getNoopSymbolTrackerWithResolver(context)) as ArrowFunction | FunctionExpression | MethodDeclaration;
+        const signatureDeclaration = checker.signatureToSignatureDeclaration(signature, kind, enclosingDeclaration, flags, getNoopSymbolTrackerWithResolver(context)) as ArrowFunction | FunctionExpression | MethodDeclaration | FunctionDeclaration;
         if (!signatureDeclaration) {
             return undefined;
         }
@@ -273,6 +277,9 @@ namespace ts.codefix {
         if (isMethodDeclaration(signatureDeclaration)) {
             return factory.updateMethodDeclaration(signatureDeclaration, modifiers, asteriskToken, name ?? factory.createIdentifier(""), questionToken, typeParameters, parameters, type, body);
         }
+        if (isFunctionDeclaration(signatureDeclaration)) {
+            return factory.updateFunctionDeclaration(signatureDeclaration, modifiers, signatureDeclaration.asteriskToken, tryCast(name, isIdentifier), typeParameters, parameters, type, body ?? signatureDeclaration.body);
+        }
         return undefined;
     }
 
diff --git a/tests/cases/fourslash/codeFixAddMissingFunctionDeclaration21.ts b/tests/cases/fourslash/codeFixAddMissingFunctionDeclaration21.ts
new file mode 100644
index 0000000000000..a5689161936bb
--- /dev/null
+++ b/tests/cases/fourslash/codeFixAddMissingFunctionDeclaration21.ts
@@ -0,0 +1,39 @@
+/// <reference path="fourslash.ts" />
+
+// @jsx: preserve
+// @filename: foo.tsx
+
+////interface P {
+////    onClick: (a: number, b: string) => void;
+////}
+////
+////const A = ({ onClick }: P) =>
+////    <div onClick={onClick}></div>;
+////
+////const B = () => {
+////    return (
+////       <A onClick={handleClick}></A>
+////    );
+////}
+
+verify.codeFix({
+    index: 0,
+    description: [ts.Diagnostics.Add_missing_function_declaration_0.message, "handleClick"],
+    newFileContent:
+`interface P {
+    onClick: (a: number, b: string) => void;
+}
+
+const A = ({ onClick }: P) =>
+    <div onClick={onClick}></div>;
+
+const B = () => {
+    function handleClick(a: number, b: string): void {
+        throw new Error("Function not implemented.");
+    }
+
+    return (
+       <A onClick={handleClick}></A>
+    );
+}`
+});
diff --git a/tests/cases/fourslash/codeFixAddMissingFunctionDeclaration22.ts b/tests/cases/fourslash/codeFixAddMissingFunctionDeclaration22.ts
new file mode 100644
index 0000000000000..a20260a0072c0
--- /dev/null
+++ b/tests/cases/fourslash/codeFixAddMissingFunctionDeclaration22.ts
@@ -0,0 +1,34 @@
+/// <reference path="fourslash.ts" />
+
+// @jsx: preserve
+// @filename: foo.tsx
+
+////interface P {
+////    onClick: (a: number, b: string) => void;
+////}
+////
+////const A = ({ onClick }: P) =>
+////    <div onClick={onClick}></div>;
+////
+////const B = () =>
+////    <A onClick={handleClick}></A>
+
+verify.codeFix({
+    index: 0,
+    description: [ts.Diagnostics.Add_missing_function_declaration_0.message, "handleClick"],
+    newFileContent:
+`interface P {
+    onClick: (a: number, b: string) => void;
+}
+
+const A = ({ onClick }: P) =>
+    <div onClick={onClick}></div>;
+
+const B = () =>
+    <A onClick={handleClick}></A>
+
+function handleClick(a: number, b: string): void {
+    throw new Error("Function not implemented.");
+}
+`
+});
diff --git a/tests/cases/fourslash/codeFixAddMissingFunctionDeclaration23.ts b/tests/cases/fourslash/codeFixAddMissingFunctionDeclaration23.ts
new file mode 100644
index 0000000000000..612e226f4d8dc
--- /dev/null
+++ b/tests/cases/fourslash/codeFixAddMissingFunctionDeclaration23.ts
@@ -0,0 +1,21 @@
+/// <reference path="fourslash.ts" />
+
+// @jsx: preserve
+// @filename: foo.tsx
+
+////const A = () => {
+////    return (<div onClick={() => handleClick()}></div>);
+////}
+
+verify.codeFix({
+    index: 0,
+    description: [ts.Diagnostics.Add_missing_function_declaration_0.message, "handleClick"],
+    newFileContent:
+`const A = () => {
+    function handleClick() {
+        throw new Error("Function not implemented.");
+    }
+
+    return (<div onClick={() => handleClick()}></div>);
+}`
+});
diff --git a/tests/cases/fourslash/codeFixAddMissingFunctionDeclaration24.ts b/tests/cases/fourslash/codeFixAddMissingFunctionDeclaration24.ts
new file mode 100644
index 0000000000000..f14ed8cb950dc
--- /dev/null
+++ b/tests/cases/fourslash/codeFixAddMissingFunctionDeclaration24.ts
@@ -0,0 +1,27 @@
+/// <reference path="fourslash.ts" />
+
+////interface Foo {
+////    a: (e: any) => void;
+////}
+////
+////const foo: Foo = {
+////    a: fn
+////}
+
+verify.codeFix({
+    index: 0,
+    description: [ts.Diagnostics.Add_missing_function_declaration_0.message, "fn"],
+    newFileContent:
+`interface Foo {
+    a: (e: any) => void;
+}
+
+const foo: Foo = {
+    a: fn
+}
+
+function fn(e: any): void {
+    throw new Error("Function not implemented.");
+}
+`
+});
diff --git a/tests/cases/fourslash/codeFixAddMissingFunctionDeclaration25.ts b/tests/cases/fourslash/codeFixAddMissingFunctionDeclaration25.ts
new file mode 100644
index 0000000000000..c575e80159396
--- /dev/null
+++ b/tests/cases/fourslash/codeFixAddMissingFunctionDeclaration25.ts
@@ -0,0 +1,23 @@
+/// <reference path="fourslash.ts" />
+
+////interface Foo {
+////    f(type: string, listener: (this: object, type: string) => any): void;
+////}
+////declare let foo: Foo;
+////foo.f("test", fn);
+
+verify.codeFix({
+    index: 0,
+    description: [ts.Diagnostics.Add_missing_function_declaration_0.message, "fn"],
+    newFileContent:
+`interface Foo {
+    f(type: string, listener: (this: object, type: string) => any): void;
+}
+declare let foo: Foo;
+foo.f("test", fn);
+
+function fn(this: object, type: string) {
+    throw new Error("Function not implemented.");
+}
+`
+});
diff --git a/tests/cases/fourslash/codeFixAddMissingFunctionDeclaration_all.ts b/tests/cases/fourslash/codeFixAddMissingFunctionDeclaration_all.ts
index 7f7e338dab577..1736613e98f7c 100644
--- a/tests/cases/fourslash/codeFixAddMissingFunctionDeclaration_all.ts
+++ b/tests/cases/fourslash/codeFixAddMissingFunctionDeclaration_all.ts
@@ -1,33 +1,38 @@
 /// <reference path='fourslash.ts' />
 
-// @filename: /test.ts
+// @filename: /test1.ts
 ////export const x = 1;
 
-// @filename: /foo.ts
-////import * as test from "./test";
+// @filename: /test2.ts
+////import * as test from "./test1";
 ////
 ////namespace Foo {
 ////    export const x = 0;
 ////}
 ////
+////interface I {
+////    a: (e: any) => void;
+////}
+////
 ////test.f();
 ////Foo.f();
 ////f();
+////const t1: I = { a: fn }
 
-goTo.file("/foo.ts");
+goTo.file("/test2.ts");
 verify.codeFixAll({
     fixId: "fixMissingFunctionDeclaration",
     fixAllDescription: ts.Diagnostics.Add_all_missing_function_declarations.message,
     newFileContent: {
-        "/test.ts":
+        "/test1.ts":
 `export const x = 1;
 
 export function f() {
     throw new Error("Function not implemented.");
 }
 `,
-        "/foo.ts":
-`import * as test from "./test";
+        "/test2.ts":
+`import * as test from "./test1";
 
 namespace Foo {
     export const x = 0;
@@ -37,13 +42,23 @@ namespace Foo {
     }
 }
 
+interface I {
+    a: (e: any) => void;
+}
+
 test.f();
 Foo.f();
 f();
+const t1: I = { a: fn }
 
 function f() {
     throw new Error("Function not implemented.");
 }
+
+
+function fn(e: any): void {
+    throw new Error("Function not implemented.");
+}
 `
     }
 });
diff --git a/tests/cases/fourslash/codeFixAddMissingFunctionDeclaration_jsx_all.ts b/tests/cases/fourslash/codeFixAddMissingFunctionDeclaration_jsx_all.ts
new file mode 100644
index 0000000000000..3bbf54c66fb0b
--- /dev/null
+++ b/tests/cases/fourslash/codeFixAddMissingFunctionDeclaration_jsx_all.ts
@@ -0,0 +1,53 @@
+/// <reference path='fourslash.ts' />
+
+// @jsx: preserve
+// @filename: /foo.tsx
+
+////interface P {
+////    onClick: (a: number, b: string) => void;
+////}
+////
+////const A = ({ onClick }: P) =>
+////    <div onClick={onClick}></div>;
+////
+////const B = () =>
+////    <A onClick={handleClick}></A>
+////
+////const C = () => {
+////    return (
+////       <A onClick={handleClick}></A>
+////    );
+////}
+
+goTo.file("/foo.tsx");
+verify.codeFixAll({
+    fixId: "fixMissingFunctionDeclaration",
+    fixAllDescription: ts.Diagnostics.Add_all_missing_function_declarations.message,
+    newFileContent: {
+        "/foo.tsx":
+`interface P {
+    onClick: (a: number, b: string) => void;
+}
+
+const A = ({ onClick }: P) =>
+    <div onClick={onClick}></div>;
+
+const B = () =>
+    <A onClick={handleClick}></A>
+
+const C = () => {
+    function handleClick(a: number, b: string): void {
+        throw new Error("Function not implemented.");
+    }
+
+    return (
+       <A onClick={handleClick}></A>
+    );
+}
+
+function handleClick(a: number, b: string): void {
+    throw new Error("Function not implemented.");
+}
+`
+    }
+});

From e5b400c162339747d99606f0343455a7b37d954d Mon Sep 17 00:00:00 2001
From: Jack Morrison <32654372+jackmorrison12@users.noreply.github.com>
Date: Wed, 10 Aug 2022 00:21:56 +0100
Subject: [PATCH 12/18] Fix misleading Date constructor documentation
 (addresses #49350) (#49649)

* Update month parameter to monthIndex and add docs for Date constructor

Signed-off-by: jmorrison152 <jmorrison152@bloomberg.net>

* Add baseline changes

Signed-off-by: jmorrison152 <jmorrison152@bloomberg.net>

* Fix misleading Date constructor documentation (addresses #49350) (#73)

* Update month parameter to monthIndex and add docs for Date constructor

Signed-off-by: jmorrison152 <jmorrison152@bloomberg.net>

* Add baseline changes

Signed-off-by: jmorrison152 <jmorrison152@bloomberg.net>

* Update baselines
---
 src/lib/es5.d.ts                              | 16 ++++++++++++---
 ...tructuringParameterDeclaration4.errors.txt |  2 +-
 .../reference/destructuringTuple.errors.txt   |  4 ++--
 .../duplicateNumericIndexers.errors.txt       |  2 +-
 .../reference/externModule.errors.txt         |  8 ++++----
 ...ithAsClauseAndLateBoundProperty.errors.txt |  2 +-
 ...wExceptionVariableInCatchClause.errors.txt |  2 +-
 .../narrowFromAnyWithInstanceof.errors.txt    |  2 +-
 .../narrowFromAnyWithTypePredicate.errors.txt |  2 +-
 ...gularExpressionDivideAmbiguity1.errors.txt |  2 +-
 ...gularExpressionDivideAmbiguity2.errors.txt |  2 +-
 .../reference/parserS7.2_A1.5_T2.errors.txt   |  4 ++--
 .../reference/parserS7.3_A1.1_T2.errors.txt   |  2 +-
 .../reference/parserS7.6_A4.2_T1.errors.txt   | 20 +++++++++----------
 .../reference/parserUnicode1.errors.txt       |  4 ++--
 .../reference/promisePermutations.errors.txt  |  2 +-
 .../reference/promisePermutations2.errors.txt |  2 +-
 .../reference/promisePermutations3.errors.txt |  4 ++--
 .../reference/redefineArray.errors.txt        |  2 +-
 .../reference/scannerS7.2_A1.5_T2.errors.txt  |  4 ++--
 .../reference/scannerS7.3_A1.1_T2.errors.txt  |  2 +-
 .../reference/scannerS7.6_A4.2_T1.errors.txt  | 20 +++++++++----------
 22 files changed, 60 insertions(+), 50 deletions(-)

diff --git a/src/lib/es5.d.ts b/src/lib/es5.d.ts
index 934a5cdde69ee..27ce50bf583c1 100644
--- a/src/lib/es5.d.ts
+++ b/src/lib/es5.d.ts
@@ -888,7 +888,17 @@ interface Date {
 interface DateConstructor {
     new(): Date;
     new(value: number | string): Date;
-    new(year: number, month: number, date?: number, hours?: number, minutes?: number, seconds?: number, ms?: number): Date;
+    /**
+     * Creates a new Date.
+     * @param year The full year designation is required for cross-century date accuracy. If year is between 0 and 99 is used, then year is assumed to be 1900 + year.
+     * @param monthIndex The month as a number between 0 and 11 (January to December).
+     * @param date The date as a number between 1 and 31.
+     * @param hours Must be supplied if minutes is supplied. A number from 0 to 23 (midnight to 11pm) that specifies the hour.
+     * @param minutes Must be supplied if seconds is supplied. A number from 0 to 59 that specifies the minutes.
+     * @param seconds Must be supplied if milliseconds is supplied. A number from 0 to 59 that specifies the seconds.
+     * @param ms A number from 0 to 999 that specifies the milliseconds.
+     */
+    new(year: number, monthIndex: number, date?: number, hours?: number, minutes?: number, seconds?: number, ms?: number): Date;
     (): string;
     readonly prototype: Date;
     /**
@@ -899,14 +909,14 @@ interface DateConstructor {
     /**
      * Returns the number of milliseconds between midnight, January 1, 1970 Universal Coordinated Time (UTC) (or GMT) and the specified date.
      * @param year The full year designation is required for cross-century date accuracy. If year is between 0 and 99 is used, then year is assumed to be 1900 + year.
-     * @param month The month as a number between 0 and 11 (January to December).
+     * @param monthIndex The month as a number between 0 and 11 (January to December).
      * @param date The date as a number between 1 and 31.
      * @param hours Must be supplied if minutes is supplied. A number from 0 to 23 (midnight to 11pm) that specifies the hour.
      * @param minutes Must be supplied if seconds is supplied. A number from 0 to 59 that specifies the minutes.
      * @param seconds Must be supplied if milliseconds is supplied. A number from 0 to 59 that specifies the seconds.
      * @param ms A number from 0 to 999 that specifies the milliseconds.
      */
-    UTC(year: number, month: number, date?: number, hours?: number, minutes?: number, seconds?: number, ms?: number): number;
+    UTC(year: number, monthIndex: number, date?: number, hours?: number, minutes?: number, seconds?: number, ms?: number): number;
     now(): number;
 }
 
diff --git a/tests/baselines/reference/destructuringParameterDeclaration4.errors.txt b/tests/baselines/reference/destructuringParameterDeclaration4.errors.txt
index f14e058fd3620..dbc9dbd254ec2 100644
--- a/tests/baselines/reference/destructuringParameterDeclaration4.errors.txt
+++ b/tests/baselines/reference/destructuringParameterDeclaration4.errors.txt
@@ -41,7 +41,7 @@ tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration4.ts(
     a1(...array2);            // Error parameter type is (number|string)[]
           ~~~~~~
 !!! error TS2552: Cannot find name 'array2'. Did you mean 'Array'?
-!!! related TS2728 /.ts/lib.es5.d.ts:1482:13: 'Array' is declared here.
+!!! related TS2728 /.ts/lib.es5.d.ts:1492:13: 'Array' is declared here.
     a5([1, 2, "string", false, true]);       // Error, parameter type is [any, any, [[any]]]
               ~~~~~~~~
 !!! error TS2322: Type 'string' is not assignable to type '[[any]]'.
diff --git a/tests/baselines/reference/destructuringTuple.errors.txt b/tests/baselines/reference/destructuringTuple.errors.txt
index b68681eca59b1..820f82c9e5d57 100644
--- a/tests/baselines/reference/destructuringTuple.errors.txt
+++ b/tests/baselines/reference/destructuringTuple.errors.txt
@@ -33,8 +33,8 @@ tests/cases/compiler/destructuringTuple.ts(11,60): error TS2769: No overload mat
 !!! error TS2769:   Overload 2 of 3, '(callbackfn: (previousValue: [], currentValue: number, currentIndex: number, array: number[]) => [], initialValue: []): []', gave the following error.
 !!! error TS2769:     Type 'never[]' is not assignable to type '[]'.
 !!! error TS2769:       Target allows only 0 element(s) but source may have more.
-!!! related TS6502 /.ts/lib.es5.d.ts:1447:24: The expected type comes from the return type of this signature.
-!!! related TS6502 /.ts/lib.es5.d.ts:1453:27: The expected type comes from the return type of this signature.
+!!! related TS6502 /.ts/lib.es5.d.ts:1457:24: The expected type comes from the return type of this signature.
+!!! related TS6502 /.ts/lib.es5.d.ts:1463:27: The expected type comes from the return type of this signature.
                                                                ~~
 !!! error TS2769: No overload matches this call.
 !!! error TS2769:   Overload 1 of 2, '(...items: ConcatArray<never>[]): never[]', gave the following error.
diff --git a/tests/baselines/reference/duplicateNumericIndexers.errors.txt b/tests/baselines/reference/duplicateNumericIndexers.errors.txt
index 727e05c2639ef..ceaa728c3e78b 100644
--- a/tests/baselines/reference/duplicateNumericIndexers.errors.txt
+++ b/tests/baselines/reference/duplicateNumericIndexers.errors.txt
@@ -11,7 +11,7 @@ tests/cases/conformance/types/members/duplicateNumericIndexers.ts(25,5): error T
 tests/cases/conformance/types/members/duplicateNumericIndexers.ts(29,5): error TS2374: Duplicate index signature for type 'number'.
 tests/cases/conformance/types/members/duplicateNumericIndexers.ts(30,5): error TS2374: Duplicate index signature for type 'number'.
 lib.es5.d.ts(523,5): error TS2374: Duplicate index signature for type 'number'.
-lib.es5.d.ts(1468,5): error TS2374: Duplicate index signature for type 'number'.
+lib.es5.d.ts(1478,5): error TS2374: Duplicate index signature for type 'number'.
 
 
 ==== tests/cases/conformance/types/members/duplicateNumericIndexers.ts (12 errors) ====
diff --git a/tests/baselines/reference/externModule.errors.txt b/tests/baselines/reference/externModule.errors.txt
index db7d505bba102..4f753cb744b97 100644
--- a/tests/baselines/reference/externModule.errors.txt
+++ b/tests/baselines/reference/externModule.errors.txt
@@ -66,20 +66,20 @@ tests/cases/compiler/externModule.ts(37,3): error TS2552: Cannot find name 'XDat
     var d=new XDate();
               ~~~~~
 !!! error TS2552: Cannot find name 'XDate'. Did you mean 'Date'?
-!!! related TS2728 /.ts/lib.es5.d.ts:933:13: 'Date' is declared here.
+!!! related TS2728 /.ts/lib.es5.d.ts:943:13: 'Date' is declared here.
     d.getDay();
     d=new XDate(1978,2);
           ~~~~~
 !!! error TS2552: Cannot find name 'XDate'. Did you mean 'Date'?
-!!! related TS2728 /.ts/lib.es5.d.ts:933:13: 'Date' is declared here.
+!!! related TS2728 /.ts/lib.es5.d.ts:943:13: 'Date' is declared here.
     d.getXDate();
     var n=XDate.parse("3/2/2004");
           ~~~~~
 !!! error TS2552: Cannot find name 'XDate'. Did you mean 'Date'?
-!!! related TS2728 /.ts/lib.es5.d.ts:933:13: 'Date' is declared here.
+!!! related TS2728 /.ts/lib.es5.d.ts:943:13: 'Date' is declared here.
     n=XDate.UTC(1964,2,1);
       ~~~~~
 !!! error TS2552: Cannot find name 'XDate'. Did you mean 'Date'?
-!!! related TS2728 /.ts/lib.es5.d.ts:933:13: 'Date' is declared here.
+!!! related TS2728 /.ts/lib.es5.d.ts:943:13: 'Date' is declared here.
     
     
\ No newline at end of file
diff --git a/tests/baselines/reference/mappedTypeWithAsClauseAndLateBoundProperty.errors.txt b/tests/baselines/reference/mappedTypeWithAsClauseAndLateBoundProperty.errors.txt
index 39ef006ce8cc1..86748376e2341 100644
--- a/tests/baselines/reference/mappedTypeWithAsClauseAndLateBoundProperty.errors.txt
+++ b/tests/baselines/reference/mappedTypeWithAsClauseAndLateBoundProperty.errors.txt
@@ -7,5 +7,5 @@ tests/cases/compiler/mappedTypeWithAsClauseAndLateBoundProperty.ts(3,1): error T
     tgt2 = src2; // Should error
     ~~~~
 !!! error TS2741: Property 'length' is missing in type '{ [x: number]: number; toString: () => string; toLocaleString: () => string; pop: () => number; push: (...items: number[]) => number; concat: { (...items: ConcatArray<number>[]): number[]; (...items: (number | ConcatArray<number>)[]): number[]; }; join: (separator?: string) => string; reverse: () => number[]; shift: () => number; slice: (start?: number, end?: number) => number[]; sort: (compareFn?: (a: number, b: number) => number) => number[]; splice: { (start: number, deleteCount?: number): number[]; (start: number, deleteCount: number, ...items: number[]): number[]; }; unshift: (...items: number[]) => number; indexOf: (searchElement: number, fromIndex?: number) => number; lastIndexOf: (searchElement: number, fromIndex?: number) => number; every: { <S extends number>(predicate: (value: number, index: number, array: number[]) => value is S, thisArg?: any): this is S[]; (predicate: (value: number, index: number, array: number[]) => unknown, thisArg?: any): boolean; }; some: (predicate: (value: number, index: number, array: number[]) => unknown, thisArg?: any) => boolean; forEach: (callbackfn: (value: number, index: number, array: number[]) => void, thisArg?: any) => void; map: <U>(callbackfn: (value: number, index: number, array: number[]) => U, thisArg?: any) => U[]; filter: { <S extends number>(predicate: (value: number, index: number, array: number[]) => value is S, thisArg?: any): S[]; (predicate: (value: number, index: number, array: number[]) => unknown, thisArg?: any): number[]; }; reduce: { (callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: number[]) => number): number; (callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: number[]) => number, initialValue: number): number; <U>(callbackfn: (previousValue: U, currentValue: number, currentIndex: number, array: number[]) => U, initialValue: U): U; }; reduceRight: { (callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: number[]) => number): number; (callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: number[]) => number, initialValue: number): number; <U>(callbackfn: (previousValue: U, currentValue: number, currentIndex: number, array: number[]) => U, initialValue: U): U; }; find: { <S extends number>(predicate: (this: void, value: number, index: number, obj: number[]) => value is S, thisArg?: any): S; (predicate: (value: number, index: number, obj: number[]) => unknown, thisArg?: any): number; }; findIndex: (predicate: (value: number, index: number, obj: number[]) => unknown, thisArg?: any) => number; fill: (value: number, start?: number, end?: number) => number[]; copyWithin: (target: number, start: number, end?: number) => number[]; entries: () => IterableIterator<[number, number]>; keys: () => IterableIterator<number>; values: () => IterableIterator<number>; includes: (searchElement: number, fromIndex?: number) => boolean; flatMap: <U, This = undefined>(callback: (this: This, value: number, index: number, array: number[]) => U | readonly U[], thisArg?: This) => U[]; flat: <A, D extends number = 1>(this: A, depth?: D) => FlatArray<A, D>[]; [iterator]: () => IterableIterator<number>; [unscopables]: () => { copyWithin: boolean; entries: boolean; fill: boolean; find: boolean; findIndex: boolean; keys: boolean; values: boolean; }; }' but required in type 'number[]'.
-!!! related TS2728 /.ts/lib.es5.d.ts:1291:5: 'length' is declared here.
+!!! related TS2728 /.ts/lib.es5.d.ts:1301:5: 'length' is declared here.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/narrowExceptionVariableInCatchClause.errors.txt b/tests/baselines/reference/narrowExceptionVariableInCatchClause.errors.txt
index 6331c0fa8947b..5fce82757fe82 100644
--- a/tests/baselines/reference/narrowExceptionVariableInCatchClause.errors.txt
+++ b/tests/baselines/reference/narrowExceptionVariableInCatchClause.errors.txt
@@ -24,7 +24,7 @@ tests/cases/conformance/types/any/narrowExceptionVariableInCatchClause.ts(16,17)
                 err.massage; // ERROR: Property 'massage' does not exist on type 'Error'
                     ~~~~~~~
 !!! error TS2551: Property 'massage' does not exist on type 'Error'. Did you mean 'message'?
-!!! related TS2728 /.ts/lib.es5.d.ts:1041:5: 'message' is declared here.
+!!! related TS2728 /.ts/lib.es5.d.ts:1051:5: 'message' is declared here.
             }
     
             else {
diff --git a/tests/baselines/reference/narrowFromAnyWithInstanceof.errors.txt b/tests/baselines/reference/narrowFromAnyWithInstanceof.errors.txt
index 216c2a89380b3..32d46bd6c05fa 100644
--- a/tests/baselines/reference/narrowFromAnyWithInstanceof.errors.txt
+++ b/tests/baselines/reference/narrowFromAnyWithInstanceof.errors.txt
@@ -22,7 +22,7 @@ tests/cases/conformance/types/any/narrowFromAnyWithInstanceof.ts(22,7): error TS
         x.mesage;
           ~~~~~~
 !!! error TS2551: Property 'mesage' does not exist on type 'Error'. Did you mean 'message'?
-!!! related TS2728 /.ts/lib.es5.d.ts:1041:5: 'message' is declared here.
+!!! related TS2728 /.ts/lib.es5.d.ts:1051:5: 'message' is declared here.
     }
     
     if (x instanceof Date) {
diff --git a/tests/baselines/reference/narrowFromAnyWithTypePredicate.errors.txt b/tests/baselines/reference/narrowFromAnyWithTypePredicate.errors.txt
index 110cfc90aadb6..3d65465435a7c 100644
--- a/tests/baselines/reference/narrowFromAnyWithTypePredicate.errors.txt
+++ b/tests/baselines/reference/narrowFromAnyWithTypePredicate.errors.txt
@@ -41,7 +41,7 @@ tests/cases/conformance/types/any/narrowFromAnyWithTypePredicate.ts(33,7): error
         x.mesage;
           ~~~~~~
 !!! error TS2551: Property 'mesage' does not exist on type 'Error'. Did you mean 'message'?
-!!! related TS2728 /.ts/lib.es5.d.ts:1041:5: 'message' is declared here.
+!!! related TS2728 /.ts/lib.es5.d.ts:1051:5: 'message' is declared here.
     }
     
     if (isDate(x)) {
diff --git a/tests/baselines/reference/parserRegularExpressionDivideAmbiguity1.errors.txt b/tests/baselines/reference/parserRegularExpressionDivideAmbiguity1.errors.txt
index 8cd01e7ed9c07..428aff63fa3cd 100644
--- a/tests/baselines/reference/parserRegularExpressionDivideAmbiguity1.errors.txt
+++ b/tests/baselines/reference/parserRegularExpressionDivideAmbiguity1.errors.txt
@@ -7,6 +7,6 @@ tests/cases/conformance/parser/ecmascript5/RegularExpressions/parserRegularExpre
     /notregexp/a.foo();
      ~~~~~~~~~
 !!! error TS2552: Cannot find name 'notregexp'. Did you mean 'RegExp'?
-!!! related TS2728 /.ts/lib.es5.d.ts:1037:13: 'RegExp' is declared here.
+!!! related TS2728 /.ts/lib.es5.d.ts:1047:13: 'RegExp' is declared here.
                ~
 !!! error TS2304: Cannot find name 'a'.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserRegularExpressionDivideAmbiguity2.errors.txt b/tests/baselines/reference/parserRegularExpressionDivideAmbiguity2.errors.txt
index 96c5f51234250..9521afb38cbc0 100644
--- a/tests/baselines/reference/parserRegularExpressionDivideAmbiguity2.errors.txt
+++ b/tests/baselines/reference/parserRegularExpressionDivideAmbiguity2.errors.txt
@@ -6,6 +6,6 @@ tests/cases/conformance/parser/ecmascript5/RegularExpressions/parserRegularExpre
     (1) /notregexp/a.foo();
          ~~~~~~~~~
 !!! error TS2552: Cannot find name 'notregexp'. Did you mean 'RegExp'?
-!!! related TS2728 /.ts/lib.es5.d.ts:1037:13: 'RegExp' is declared here.
+!!! related TS2728 /.ts/lib.es5.d.ts:1047:13: 'RegExp' is declared here.
                    ~
 !!! error TS2304: Cannot find name 'a'.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserS7.2_A1.5_T2.errors.txt b/tests/baselines/reference/parserS7.2_A1.5_T2.errors.txt
index 862f176326ea6..db3d789fee9c3 100644
--- a/tests/baselines/reference/parserS7.2_A1.5_T2.errors.txt
+++ b/tests/baselines/reference/parserS7.2_A1.5_T2.errors.txt
@@ -19,7 +19,7 @@ tests/cases/conformance/parser/ecmascript5/parserS7.2_A1.5_T2.ts(20,3): error TS
       $ERROR('#1: eval("\\u00A0var x\\u00A0= 1\\u00A0"); x === 1. Actual: ' + (x));
       ~~~~~~
 !!! error TS2552: Cannot find name '$ERROR'. Did you mean 'Error'?
-!!! related TS2728 /.ts/lib.es5.d.ts:1051:13: 'Error' is declared here.
+!!! related TS2728 /.ts/lib.es5.d.ts:1061:13: 'Error' is declared here.
     }
     
     //CHECK#2
@@ -28,7 +28,7 @@ tests/cases/conformance/parser/ecmascript5/parserS7.2_A1.5_T2.ts(20,3): error TS
       $ERROR('#2:  var x = 1 ; x === 1. Actual: ' + (x));
       ~~~~~~
 !!! error TS2552: Cannot find name '$ERROR'. Did you mean 'Error'?
-!!! related TS2728 /.ts/lib.es5.d.ts:1051:13: 'Error' is declared here.
+!!! related TS2728 /.ts/lib.es5.d.ts:1061:13: 'Error' is declared here.
     }
     
     
diff --git a/tests/baselines/reference/parserS7.3_A1.1_T2.errors.txt b/tests/baselines/reference/parserS7.3_A1.1_T2.errors.txt
index b90ae737baed6..29645029d49bb 100644
--- a/tests/baselines/reference/parserS7.3_A1.1_T2.errors.txt
+++ b/tests/baselines/reference/parserS7.3_A1.1_T2.errors.txt
@@ -21,7 +21,7 @@ tests/cases/conformance/parser/ecmascript5/parserS7.3_A1.1_T2.ts(17,3): error TS
       $ERROR('#1: var\\nx\\n=\\n1\\n; x === 1. Actual: ' + (x));
       ~~~~~~
 !!! error TS2552: Cannot find name '$ERROR'. Did you mean 'Error'?
-!!! related TS2728 /.ts/lib.es5.d.ts:1051:13: 'Error' is declared here.
+!!! related TS2728 /.ts/lib.es5.d.ts:1061:13: 'Error' is declared here.
     }
     
     
\ No newline at end of file
diff --git a/tests/baselines/reference/parserS7.6_A4.2_T1.errors.txt b/tests/baselines/reference/parserS7.6_A4.2_T1.errors.txt
index b1992ccb2e780..455fd5dd6fc22 100644
--- a/tests/baselines/reference/parserS7.6_A4.2_T1.errors.txt
+++ b/tests/baselines/reference/parserS7.6_A4.2_T1.errors.txt
@@ -50,70 +50,70 @@ tests/cases/conformance/parser/ecmascript5/parserS7.6_A4.2_T1.ts(142,3): error T
       $ERROR('#А');
       ~~~~~~
 !!! error TS2552: Cannot find name '$ERROR'. Did you mean 'Error'?
-!!! related TS2728 /.ts/lib.es5.d.ts:1051:13: 'Error' is declared here.
+!!! related TS2728 /.ts/lib.es5.d.ts:1061:13: 'Error' is declared here.
     }
     var \u0411 = 1;
     if (Б !== 1) {
       $ERROR('#Б');
       ~~~~~~
 !!! error TS2552: Cannot find name '$ERROR'. Did you mean 'Error'?
-!!! related TS2728 /.ts/lib.es5.d.ts:1051:13: 'Error' is declared here.
+!!! related TS2728 /.ts/lib.es5.d.ts:1061:13: 'Error' is declared here.
     }
     var \u0412 = 1;
     if (В !== 1) {
       $ERROR('#В');
       ~~~~~~
 !!! error TS2552: Cannot find name '$ERROR'. Did you mean 'Error'?
-!!! related TS2728 /.ts/lib.es5.d.ts:1051:13: 'Error' is declared here.
+!!! related TS2728 /.ts/lib.es5.d.ts:1061:13: 'Error' is declared here.
     }
     var \u0413 = 1;
     if (Г !== 1) {
       $ERROR('#Г');
       ~~~~~~
 !!! error TS2552: Cannot find name '$ERROR'. Did you mean 'Error'?
-!!! related TS2728 /.ts/lib.es5.d.ts:1051:13: 'Error' is declared here.
+!!! related TS2728 /.ts/lib.es5.d.ts:1061:13: 'Error' is declared here.
     }
     var \u0414 = 1;
     if (Д !== 1) {
       $ERROR('#Д');
       ~~~~~~
 !!! error TS2552: Cannot find name '$ERROR'. Did you mean 'Error'?
-!!! related TS2728 /.ts/lib.es5.d.ts:1051:13: 'Error' is declared here.
+!!! related TS2728 /.ts/lib.es5.d.ts:1061:13: 'Error' is declared here.
     }
     var \u0415 = 1;
     if (Е !== 1) {
       $ERROR('#Е');
       ~~~~~~
 !!! error TS2552: Cannot find name '$ERROR'. Did you mean 'Error'?
-!!! related TS2728 /.ts/lib.es5.d.ts:1051:13: 'Error' is declared here.
+!!! related TS2728 /.ts/lib.es5.d.ts:1061:13: 'Error' is declared here.
     }
     var \u0416 = 1;
     if (Ж !== 1) {
       $ERROR('#Ж');
       ~~~~~~
 !!! error TS2552: Cannot find name '$ERROR'. Did you mean 'Error'?
-!!! related TS2728 /.ts/lib.es5.d.ts:1051:13: 'Error' is declared here.
+!!! related TS2728 /.ts/lib.es5.d.ts:1061:13: 'Error' is declared here.
     }
     var \u0417 = 1;
     if (З !== 1) {
       $ERROR('#З');
       ~~~~~~
 !!! error TS2552: Cannot find name '$ERROR'. Did you mean 'Error'?
-!!! related TS2728 /.ts/lib.es5.d.ts:1051:13: 'Error' is declared here.
+!!! related TS2728 /.ts/lib.es5.d.ts:1061:13: 'Error' is declared here.
     }
     var \u0418 = 1;
     if (И !== 1) {
       $ERROR('#И');
       ~~~~~~
 !!! error TS2552: Cannot find name '$ERROR'. Did you mean 'Error'?
-!!! related TS2728 /.ts/lib.es5.d.ts:1051:13: 'Error' is declared here.
+!!! related TS2728 /.ts/lib.es5.d.ts:1061:13: 'Error' is declared here.
     }
     var \u0419 = 1;
     if (Й !== 1) {
       $ERROR('#Й');
       ~~~~~~
 !!! error TS2552: Cannot find name '$ERROR'. Did you mean 'Error'?
-!!! related TS2728 /.ts/lib.es5.d.ts:1051:13: 'Error' is declared here.
+!!! related TS2728 /.ts/lib.es5.d.ts:1061:13: 'Error' is declared here.
     }
     var \u041A = 1;
     if (К !== 1) {
diff --git a/tests/baselines/reference/parserUnicode1.errors.txt b/tests/baselines/reference/parserUnicode1.errors.txt
index f6a04ed1e3267..4e172e5e198d9 100644
--- a/tests/baselines/reference/parserUnicode1.errors.txt
+++ b/tests/baselines/reference/parserUnicode1.errors.txt
@@ -11,13 +11,13 @@ tests/cases/conformance/parser/ecmascript5/parserUnicode1.ts(10,5): error TS2552
         $ERROR('#6.1: var \\u0078x = 1; xx === 6. Actual: ' + (xx));
         ~~~~~~
 !!! error TS2552: Cannot find name '$ERROR'. Did you mean 'Error'?
-!!! related TS2728 /.ts/lib.es5.d.ts:1051:13: 'Error' is declared here.
+!!! related TS2728 /.ts/lib.es5.d.ts:1061:13: 'Error' is declared here.
       }
     }
     catch (e) {
         $ERROR('#6.2: var \\u0078x = 1; xx === 6. Actual: ' + (xx));
         ~~~~~~
 !!! error TS2552: Cannot find name '$ERROR'. Did you mean 'Error'?
-!!! related TS2728 /.ts/lib.es5.d.ts:1051:13: 'Error' is declared here.
+!!! related TS2728 /.ts/lib.es5.d.ts:1061:13: 'Error' is declared here.
     
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/promisePermutations.errors.txt b/tests/baselines/reference/promisePermutations.errors.txt
index eb6adf95308dd..c990a1cc46e49 100644
--- a/tests/baselines/reference/promisePermutations.errors.txt
+++ b/tests/baselines/reference/promisePermutations.errors.txt
@@ -447,7 +447,7 @@ tests/cases/compiler/promisePermutations.ts(160,21): error TS2769: No overload m
 !!! error TS2769:   The last overload gave the following error.
 !!! error TS2769:     Argument of type '(x: any) => IPromise<string>' is not assignable to parameter of type '(error: any) => Promise<number>'.
 !!! error TS2769:       Property 'catch' is missing in type 'IPromise<string>' but required in type 'Promise<number>'.
-!!! related TS2728 /.ts/lib.es5.d.ts:1527:5: 'catch' is declared here.
+!!! related TS2728 /.ts/lib.es5.d.ts:1537:5: 'catch' is declared here.
 !!! related TS2771 tests/cases/compiler/promisePermutations.ts:5:5: The last overload is declared here.
     var s10g = s10.then(testFunctionP, nIPromise, sIPromise).then(sPromise, sIPromise, sIPromise); // ok
     
diff --git a/tests/baselines/reference/promisePermutations2.errors.txt b/tests/baselines/reference/promisePermutations2.errors.txt
index b2f45aaec25e6..6de7baf545159 100644
--- a/tests/baselines/reference/promisePermutations2.errors.txt
+++ b/tests/baselines/reference/promisePermutations2.errors.txt
@@ -351,7 +351,7 @@ tests/cases/compiler/promisePermutations2.ts(159,21): error TS2345: Argument of
                                        ~~~~~~~~~
 !!! error TS2345: Argument of type '(x: any) => IPromise<string>' is not assignable to parameter of type '(error: any) => Promise<number>'.
 !!! error TS2345:   Property 'catch' is missing in type 'IPromise<string>' but required in type 'Promise<number>'.
-!!! related TS2728 /.ts/lib.es5.d.ts:1527:5: 'catch' is declared here.
+!!! related TS2728 /.ts/lib.es5.d.ts:1537:5: 'catch' is declared here.
     var s10g = s10.then(testFunctionP, nIPromise, sIPromise).then(sPromise, sIPromise, sIPromise); // ok
     
     var r11: IPromise<number>;
diff --git a/tests/baselines/reference/promisePermutations3.errors.txt b/tests/baselines/reference/promisePermutations3.errors.txt
index 2a871d46ef8b6..6aefe929453d1 100644
--- a/tests/baselines/reference/promisePermutations3.errors.txt
+++ b/tests/baselines/reference/promisePermutations3.errors.txt
@@ -398,7 +398,7 @@ tests/cases/compiler/promisePermutations3.ts(165,21): error TS2345: Argument of
 !!! error TS2769:   The last overload gave the following error.
 !!! error TS2769:     Argument of type '(x: any) => IPromise<string>' is not assignable to parameter of type '(error: any) => Promise<number>'.
 !!! error TS2769:       Property 'catch' is missing in type 'IPromise<string>' but required in type 'Promise<number>'.
-!!! related TS2728 /.ts/lib.es5.d.ts:1527:5: 'catch' is declared here.
+!!! related TS2728 /.ts/lib.es5.d.ts:1537:5: 'catch' is declared here.
 !!! related TS2771 tests/cases/compiler/promisePermutations3.ts:7:5: The last overload is declared here.
     var s10g = s10.then(testFunctionP, nIPromise, sIPromise).then(sPromise, sIPromise, sIPromise); // ok
     
@@ -445,5 +445,5 @@ tests/cases/compiler/promisePermutations3.ts(165,21): error TS2345: Argument of
                         ~~~~~~~~~~~~~~~
 !!! error TS2345: Argument of type '{ <T>(x: T): IPromise<T>; <T>(x: T, y: T): Promise<T>; }' is not assignable to parameter of type '(value: (x: any) => any) => Promise<unknown>'.
 !!! error TS2345:   Property 'catch' is missing in type 'IPromise<any>' but required in type 'Promise<unknown>'.
-!!! related TS2728 /.ts/lib.es5.d.ts:1527:5: 'catch' is declared here.
+!!! related TS2728 /.ts/lib.es5.d.ts:1537:5: 'catch' is declared here.
     var s12c = s12.then(testFunction12P, testFunction12, testFunction12); // ok
\ No newline at end of file
diff --git a/tests/baselines/reference/redefineArray.errors.txt b/tests/baselines/reference/redefineArray.errors.txt
index be2be83fbe4a0..5b491bde16f3f 100644
--- a/tests/baselines/reference/redefineArray.errors.txt
+++ b/tests/baselines/reference/redefineArray.errors.txt
@@ -5,4 +5,4 @@ tests/cases/compiler/redefineArray.ts(1,1): error TS2741: Property 'isArray' is
     Array = function (n:number, s:string) {return n;};
     ~~~~~
 !!! error TS2741: Property 'isArray' is missing in type '<T>(n: number, s: string) => number' but required in type 'ArrayConstructor'.
-!!! related TS2728 /.ts/lib.es5.d.ts:1478:5: 'isArray' is declared here.
\ No newline at end of file
+!!! related TS2728 /.ts/lib.es5.d.ts:1488:5: 'isArray' is declared here.
\ No newline at end of file
diff --git a/tests/baselines/reference/scannerS7.2_A1.5_T2.errors.txt b/tests/baselines/reference/scannerS7.2_A1.5_T2.errors.txt
index 989584c31b9a3..922b4c1ccd218 100644
--- a/tests/baselines/reference/scannerS7.2_A1.5_T2.errors.txt
+++ b/tests/baselines/reference/scannerS7.2_A1.5_T2.errors.txt
@@ -19,7 +19,7 @@ tests/cases/conformance/scanner/ecmascript5/scannerS7.2_A1.5_T2.ts(20,3): error
       $ERROR('#1: eval("\\u00A0var x\\u00A0= 1\\u00A0"); x === 1. Actual: ' + (x));
       ~~~~~~
 !!! error TS2552: Cannot find name '$ERROR'. Did you mean 'Error'?
-!!! related TS2728 /.ts/lib.es5.d.ts:1051:13: 'Error' is declared here.
+!!! related TS2728 /.ts/lib.es5.d.ts:1061:13: 'Error' is declared here.
     }
     
     //CHECK#2
@@ -28,7 +28,7 @@ tests/cases/conformance/scanner/ecmascript5/scannerS7.2_A1.5_T2.ts(20,3): error
       $ERROR('#2:  var x = 1 ; x === 1. Actual: ' + (x));
       ~~~~~~
 !!! error TS2552: Cannot find name '$ERROR'. Did you mean 'Error'?
-!!! related TS2728 /.ts/lib.es5.d.ts:1051:13: 'Error' is declared here.
+!!! related TS2728 /.ts/lib.es5.d.ts:1061:13: 'Error' is declared here.
     }
     
     
diff --git a/tests/baselines/reference/scannerS7.3_A1.1_T2.errors.txt b/tests/baselines/reference/scannerS7.3_A1.1_T2.errors.txt
index 02bc647385ee3..0adb75c4f2e7d 100644
--- a/tests/baselines/reference/scannerS7.3_A1.1_T2.errors.txt
+++ b/tests/baselines/reference/scannerS7.3_A1.1_T2.errors.txt
@@ -21,7 +21,7 @@ tests/cases/conformance/scanner/ecmascript5/scannerS7.3_A1.1_T2.ts(17,3): error
       $ERROR('#1: var\\nx\\n=\\n1\\n; x === 1. Actual: ' + (x));
       ~~~~~~
 !!! error TS2552: Cannot find name '$ERROR'. Did you mean 'Error'?
-!!! related TS2728 /.ts/lib.es5.d.ts:1051:13: 'Error' is declared here.
+!!! related TS2728 /.ts/lib.es5.d.ts:1061:13: 'Error' is declared here.
     }
     
     
\ No newline at end of file
diff --git a/tests/baselines/reference/scannerS7.6_A4.2_T1.errors.txt b/tests/baselines/reference/scannerS7.6_A4.2_T1.errors.txt
index fb8bb58067511..938bb52ff2f24 100644
--- a/tests/baselines/reference/scannerS7.6_A4.2_T1.errors.txt
+++ b/tests/baselines/reference/scannerS7.6_A4.2_T1.errors.txt
@@ -50,70 +50,70 @@ tests/cases/conformance/scanner/ecmascript5/scannerS7.6_A4.2_T1.ts(142,3): error
       $ERROR('#А');
       ~~~~~~
 !!! error TS2552: Cannot find name '$ERROR'. Did you mean 'Error'?
-!!! related TS2728 /.ts/lib.es5.d.ts:1051:13: 'Error' is declared here.
+!!! related TS2728 /.ts/lib.es5.d.ts:1061:13: 'Error' is declared here.
     }
     var \u0411 = 1;
     if (Б !== 1) {
       $ERROR('#Б');
       ~~~~~~
 !!! error TS2552: Cannot find name '$ERROR'. Did you mean 'Error'?
-!!! related TS2728 /.ts/lib.es5.d.ts:1051:13: 'Error' is declared here.
+!!! related TS2728 /.ts/lib.es5.d.ts:1061:13: 'Error' is declared here.
     }
     var \u0412 = 1;
     if (В !== 1) {
       $ERROR('#В');
       ~~~~~~
 !!! error TS2552: Cannot find name '$ERROR'. Did you mean 'Error'?
-!!! related TS2728 /.ts/lib.es5.d.ts:1051:13: 'Error' is declared here.
+!!! related TS2728 /.ts/lib.es5.d.ts:1061:13: 'Error' is declared here.
     }
     var \u0413 = 1;
     if (Г !== 1) {
       $ERROR('#Г');
       ~~~~~~
 !!! error TS2552: Cannot find name '$ERROR'. Did you mean 'Error'?
-!!! related TS2728 /.ts/lib.es5.d.ts:1051:13: 'Error' is declared here.
+!!! related TS2728 /.ts/lib.es5.d.ts:1061:13: 'Error' is declared here.
     }
     var \u0414 = 1;
     if (Д !== 1) {
       $ERROR('#Д');
       ~~~~~~
 !!! error TS2552: Cannot find name '$ERROR'. Did you mean 'Error'?
-!!! related TS2728 /.ts/lib.es5.d.ts:1051:13: 'Error' is declared here.
+!!! related TS2728 /.ts/lib.es5.d.ts:1061:13: 'Error' is declared here.
     }
     var \u0415 = 1;
     if (Е !== 1) {
       $ERROR('#Е');
       ~~~~~~
 !!! error TS2552: Cannot find name '$ERROR'. Did you mean 'Error'?
-!!! related TS2728 /.ts/lib.es5.d.ts:1051:13: 'Error' is declared here.
+!!! related TS2728 /.ts/lib.es5.d.ts:1061:13: 'Error' is declared here.
     }
     var \u0416 = 1;
     if (Ж !== 1) {
       $ERROR('#Ж');
       ~~~~~~
 !!! error TS2552: Cannot find name '$ERROR'. Did you mean 'Error'?
-!!! related TS2728 /.ts/lib.es5.d.ts:1051:13: 'Error' is declared here.
+!!! related TS2728 /.ts/lib.es5.d.ts:1061:13: 'Error' is declared here.
     }
     var \u0417 = 1;
     if (З !== 1) {
       $ERROR('#З');
       ~~~~~~
 !!! error TS2552: Cannot find name '$ERROR'. Did you mean 'Error'?
-!!! related TS2728 /.ts/lib.es5.d.ts:1051:13: 'Error' is declared here.
+!!! related TS2728 /.ts/lib.es5.d.ts:1061:13: 'Error' is declared here.
     }
     var \u0418 = 1;
     if (И !== 1) {
       $ERROR('#И');
       ~~~~~~
 !!! error TS2552: Cannot find name '$ERROR'. Did you mean 'Error'?
-!!! related TS2728 /.ts/lib.es5.d.ts:1051:13: 'Error' is declared here.
+!!! related TS2728 /.ts/lib.es5.d.ts:1061:13: 'Error' is declared here.
     }
     var \u0419 = 1;
     if (Й !== 1) {
       $ERROR('#Й');
       ~~~~~~
 !!! error TS2552: Cannot find name '$ERROR'. Did you mean 'Error'?
-!!! related TS2728 /.ts/lib.es5.d.ts:1051:13: 'Error' is declared here.
+!!! related TS2728 /.ts/lib.es5.d.ts:1061:13: 'Error' is declared here.
     }
     var \u041A = 1;
     if (К !== 1) {

From abc2a350e63062b1c8a2acf1286d180c4b4595a2 Mon Sep 17 00:00:00 2001
From: magic-akari <akari.ccino@gmail.com>
Date: Wed, 10 Aug 2022 07:31:02 +0800
Subject: [PATCH 13/18] Fix System module `export import =` (#49788)

* Add more SystemJS test case

* Fix System module `export import =`

* Update test case
---
 src/compiler/transformers/module/system.ts    | 14 ++++++
 tests/baselines/reference/systemModule18.js   | 43 +++++++++++++++++++
 .../reference/systemModule18.symbols          | 14 ++++++
 .../baselines/reference/systemModule18.types  | 14 ++++++
 tests/cases/compiler/systemModule18.ts        |  9 ++++
 5 files changed, 94 insertions(+)
 create mode 100644 tests/baselines/reference/systemModule18.js
 create mode 100644 tests/baselines/reference/systemModule18.symbols
 create mode 100644 tests/baselines/reference/systemModule18.types
 create mode 100644 tests/cases/compiler/systemModule18.ts

diff --git a/src/compiler/transformers/module/system.ts b/src/compiler/transformers/module/system.ts
index 869c1c18d7245..d541c3d3ad26a 100644
--- a/src/compiler/transformers/module/system.ts
+++ b/src/compiler/transformers/module/system.ts
@@ -466,6 +466,20 @@ namespace ts {
                                     factory.createAssignment(importVariableName, parameterName)
                                 )
                             );
+                            if (hasSyntacticModifier(entry, ModifierFlags.Export)) {
+                                statements.push(
+                                    factory.createExpressionStatement(
+                                        factory.createCallExpression(
+                                            exportFunction,
+                                            /*typeArguments*/ undefined,
+                                            [
+                                                factory.createStringLiteral(idText(importVariableName)),
+                                                parameterName,
+                                            ]
+                                        )
+                                    )
+                                );
+                            }
                             break;
 
                         case SyntaxKind.ExportDeclaration:
diff --git a/tests/baselines/reference/systemModule18.js b/tests/baselines/reference/systemModule18.js
new file mode 100644
index 0000000000000..66f975a90a780
--- /dev/null
+++ b/tests/baselines/reference/systemModule18.js
@@ -0,0 +1,43 @@
+//// [tests/cases/compiler/systemModule18.ts] ////
+
+//// [react.ts]
+export function createElement() {}
+export function lazy() {}
+export function useState() {}
+
+//// [index.ts]
+export import React = require("./react.js");
+
+
+//// [react.js]
+System.register([], function (exports_1, context_1) {
+    "use strict";
+    var __moduleName = context_1 && context_1.id;
+    function createElement() { }
+    exports_1("createElement", createElement);
+    function lazy() { }
+    exports_1("lazy", lazy);
+    function useState() { }
+    exports_1("useState", useState);
+    return {
+        setters: [],
+        execute: function () {
+        }
+    };
+});
+//// [index.js]
+System.register(["./react.js"], function (exports_1, context_1) {
+    "use strict";
+    var React;
+    var __moduleName = context_1 && context_1.id;
+    return {
+        setters: [
+            function (React_1) {
+                React = React_1;
+                exports_1("React", React_1);
+            }
+        ],
+        execute: function () {
+        }
+    };
+});
diff --git a/tests/baselines/reference/systemModule18.symbols b/tests/baselines/reference/systemModule18.symbols
new file mode 100644
index 0000000000000..c7ff227787847
--- /dev/null
+++ b/tests/baselines/reference/systemModule18.symbols
@@ -0,0 +1,14 @@
+=== tests/cases/compiler/index.ts ===
+export import React = require("./react.js");
+>React : Symbol(React, Decl(index.ts, 0, 0))
+
+=== tests/cases/compiler/react.ts ===
+export function createElement() {}
+>createElement : Symbol(createElement, Decl(react.ts, 0, 0))
+
+export function lazy() {}
+>lazy : Symbol(lazy, Decl(react.ts, 0, 34))
+
+export function useState() {}
+>useState : Symbol(useState, Decl(react.ts, 1, 25))
+
diff --git a/tests/baselines/reference/systemModule18.types b/tests/baselines/reference/systemModule18.types
new file mode 100644
index 0000000000000..7da83c25e44c2
--- /dev/null
+++ b/tests/baselines/reference/systemModule18.types
@@ -0,0 +1,14 @@
+=== tests/cases/compiler/index.ts ===
+export import React = require("./react.js");
+>React : typeof React
+
+=== tests/cases/compiler/react.ts ===
+export function createElement() {}
+>createElement : () => void
+
+export function lazy() {}
+>lazy : () => void
+
+export function useState() {}
+>useState : () => void
+
diff --git a/tests/cases/compiler/systemModule18.ts b/tests/cases/compiler/systemModule18.ts
new file mode 100644
index 0000000000000..ec7206d706704
--- /dev/null
+++ b/tests/cases/compiler/systemModule18.ts
@@ -0,0 +1,9 @@
+// @module: system
+
+// @filename: react.ts
+export function createElement() {}
+export function lazy() {}
+export function useState() {}
+
+// @filename: index.ts
+export import React = require("./react.js");

From dd98c17b10b9fafc5bfbfc70f98ea7ba45dd2ab7 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <293473+sandersn@users.noreply.github.com>
Date: Tue, 9 Aug 2022 16:36:53 -0700
Subject: [PATCH 14/18] Merge multiple symbols even when re-exported (#49987)

* Merge multiple symbols even when re-exported

As far as I remember, the target of `mergeSymbol` needs to be a merged
symbol, not a symbol with a mergeId that points to mergedSymbol.
However, mergeSymbolTable didn't check for this.

I can't remember if symbol tables may contain
symbols-with-mergeId. If they can, then mergeSymbolTable needs to call
getMergedSymbol on the individual targets of the merge. That's what I
did in this PR.

* Call getMergeSymbol eagerly

On the source, not target, of mergeSymbolTable's contents
---
 src/compiler/checker.ts                       |  2 +-
 .../mergeMultipleInterfacesReexported.js      | 65 +++++++++++++++++++
 .../mergeMultipleInterfacesReexported.symbols | 50 ++++++++++++++
 .../mergeMultipleInterfacesReexported.types   | 43 ++++++++++++
 ...onDoesNamespaceEnumMergeOfReexport.symbols |  4 +-
 .../mergeMultipleInterfacesReexported.ts      | 30 +++++++++
 6 files changed, 191 insertions(+), 3 deletions(-)
 create mode 100644 tests/baselines/reference/mergeMultipleInterfacesReexported.js
 create mode 100644 tests/baselines/reference/mergeMultipleInterfacesReexported.symbols
 create mode 100644 tests/baselines/reference/mergeMultipleInterfacesReexported.types
 create mode 100644 tests/cases/compiler/mergeMultipleInterfacesReexported.ts

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 0c36c132968b1..701747ce8de2c 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -1426,7 +1426,7 @@ namespace ts {
         function mergeSymbolTable(target: SymbolTable, source: SymbolTable, unidirectional = false) {
             source.forEach((sourceSymbol, id) => {
                 const targetSymbol = target.get(id);
-                target.set(id, targetSymbol ? mergeSymbol(targetSymbol, sourceSymbol, unidirectional) : sourceSymbol);
+                target.set(id, targetSymbol ? mergeSymbol(targetSymbol, sourceSymbol, unidirectional) : getMergedSymbol(sourceSymbol));
             });
         }
 
diff --git a/tests/baselines/reference/mergeMultipleInterfacesReexported.js b/tests/baselines/reference/mergeMultipleInterfacesReexported.js
new file mode 100644
index 0000000000000..a6282d6844d98
--- /dev/null
+++ b/tests/baselines/reference/mergeMultipleInterfacesReexported.js
@@ -0,0 +1,65 @@
+//// [tests/cases/compiler/mergeMultipleInterfacesReexported.ts] ////
+
+//// [index.ts]
+export * from './eventList';
+
+//// [test.ts]
+import { EventList } from "./eventList";
+
+declare const p012: "p0" | "p1" | "p2"
+const t: keyof EventList = p012
+
+//// [eventList.ts]
+export interface EventList {
+    p0: [];
+}
+
+//// [foo.ts]
+declare module './index' {
+    interface EventList {
+        p1: []
+    }
+}
+export {};
+
+
+//// [bar.ts]
+declare module './index' {
+    interface EventList {
+        p2: []
+    }
+}
+export {};
+
+
+//// [eventList.js]
+"use strict";
+exports.__esModule = true;
+//// [index.js]
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+exports.__esModule = true;
+__exportStar(require("./eventList"), exports);
+//// [test.js]
+"use strict";
+exports.__esModule = true;
+var t = p012;
+//// [foo.js]
+"use strict";
+exports.__esModule = true;
+//// [bar.js]
+"use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/mergeMultipleInterfacesReexported.symbols b/tests/baselines/reference/mergeMultipleInterfacesReexported.symbols
new file mode 100644
index 0000000000000..c40babde0a3d9
--- /dev/null
+++ b/tests/baselines/reference/mergeMultipleInterfacesReexported.symbols
@@ -0,0 +1,50 @@
+=== tests/cases/compiler/index.ts ===
+export * from './eventList';
+No type information for this code.
+No type information for this code.=== tests/cases/compiler/test.ts ===
+import { EventList } from "./eventList";
+>EventList : Symbol(EventList, Decl(test.ts, 0, 8))
+
+declare const p012: "p0" | "p1" | "p2"
+>p012 : Symbol(p012, Decl(test.ts, 2, 13))
+
+const t: keyof EventList = p012
+>t : Symbol(t, Decl(test.ts, 3, 5))
+>EventList : Symbol(EventList, Decl(test.ts, 0, 8))
+>p012 : Symbol(p012, Decl(test.ts, 2, 13))
+
+=== tests/cases/compiler/eventList.ts ===
+export interface EventList {
+>EventList : Symbol(EventList, Decl(eventList.ts, 0, 0), Decl(foo.ts, 0, 26), Decl(bar.ts, 0, 26))
+
+    p0: [];
+>p0 : Symbol(EventList.p0, Decl(eventList.ts, 0, 28))
+}
+
+=== tests/cases/compiler/foo.ts ===
+declare module './index' {
+>'./index' : Symbol("tests/cases/compiler/index", Decl(index.ts, 0, 0), Decl(foo.ts, 0, 0), Decl(bar.ts, 0, 0))
+
+    interface EventList {
+>EventList : Symbol(EventList, Decl(eventList.ts, 0, 0), Decl(foo.ts, 0, 26), Decl(bar.ts, 0, 26))
+
+        p1: []
+>p1 : Symbol(EventList.p1, Decl(foo.ts, 1, 25))
+    }
+}
+export {};
+
+
+=== tests/cases/compiler/bar.ts ===
+declare module './index' {
+>'./index' : Symbol("tests/cases/compiler/index", Decl(index.ts, 0, 0), Decl(foo.ts, 0, 0), Decl(bar.ts, 0, 0))
+
+    interface EventList {
+>EventList : Symbol(EventList, Decl(eventList.ts, 0, 0), Decl(foo.ts, 0, 26), Decl(bar.ts, 0, 26))
+
+        p2: []
+>p2 : Symbol(EventList.p2, Decl(bar.ts, 1, 25))
+    }
+}
+export {};
+
diff --git a/tests/baselines/reference/mergeMultipleInterfacesReexported.types b/tests/baselines/reference/mergeMultipleInterfacesReexported.types
new file mode 100644
index 0000000000000..1096770ca61b5
--- /dev/null
+++ b/tests/baselines/reference/mergeMultipleInterfacesReexported.types
@@ -0,0 +1,43 @@
+=== tests/cases/compiler/index.ts ===
+export * from './eventList';
+No type information for this code.
+No type information for this code.=== tests/cases/compiler/test.ts ===
+import { EventList } from "./eventList";
+>EventList : any
+
+declare const p012: "p0" | "p1" | "p2"
+>p012 : "p0" | "p1" | "p2"
+
+const t: keyof EventList = p012
+>t : keyof EventList
+>p012 : "p0" | "p1" | "p2"
+
+=== tests/cases/compiler/eventList.ts ===
+export interface EventList {
+    p0: [];
+>p0 : []
+}
+
+=== tests/cases/compiler/foo.ts ===
+declare module './index' {
+>'./index' : typeof import("tests/cases/compiler/index")
+
+    interface EventList {
+        p1: []
+>p1 : []
+    }
+}
+export {};
+
+
+=== tests/cases/compiler/bar.ts ===
+declare module './index' {
+>'./index' : typeof import("tests/cases/compiler/index")
+
+    interface EventList {
+        p2: []
+>p2 : []
+    }
+}
+export {};
+
diff --git a/tests/baselines/reference/moduleAugmentationDoesNamespaceEnumMergeOfReexport.symbols b/tests/baselines/reference/moduleAugmentationDoesNamespaceEnumMergeOfReexport.symbols
index 0f6a0ad51e429..89c0878d8405c 100644
--- a/tests/baselines/reference/moduleAugmentationDoesNamespaceEnumMergeOfReexport.symbols
+++ b/tests/baselines/reference/moduleAugmentationDoesNamespaceEnumMergeOfReexport.symbols
@@ -45,9 +45,9 @@ const g: ns.Root = ns.Root.A;
 >ns : Symbol(ns, Decl(augment.ts, 0, 6))
 >Root : Symbol(ns.Root, Decl(file.ts, 0, 0), Decl(augment.ts, 2, 29))
 >ns.Root.A : Symbol(ns.Root.A, Decl(augment.ts, 4, 22))
->ns.Root : Symbol(ns.Root, Decl(augment.ts, 2, 29))
+>ns.Root : Symbol(ns.Root, Decl(file.ts, 0, 0), Decl(augment.ts, 2, 29))
 >ns : Symbol(ns, Decl(augment.ts, 0, 6))
->Root : Symbol(ns.Root, Decl(augment.ts, 2, 29))
+>Root : Symbol(ns.Root, Decl(file.ts, 0, 0), Decl(augment.ts, 2, 29))
 >A : Symbol(ns.Root.A, Decl(augment.ts, 4, 22))
 
 f.x;
diff --git a/tests/cases/compiler/mergeMultipleInterfacesReexported.ts b/tests/cases/compiler/mergeMultipleInterfacesReexported.ts
new file mode 100644
index 0000000000000..4f1164b7ab2e9
--- /dev/null
+++ b/tests/cases/compiler/mergeMultipleInterfacesReexported.ts
@@ -0,0 +1,30 @@
+// @filename: index.ts
+export * from './eventList';
+
+// @filename: test.ts
+import { EventList } from "./eventList";
+
+declare const p012: "p0" | "p1" | "p2"
+const t: keyof EventList = p012
+
+// @filename: eventList.ts
+export interface EventList {
+    p0: [];
+}
+
+// @filename: foo.ts
+declare module './index' {
+    interface EventList {
+        p1: []
+    }
+}
+export {};
+
+
+// @filename: bar.ts
+declare module './index' {
+    interface EventList {
+        p2: []
+    }
+}
+export {};

From b94b299a116ff525b29ff729b38892167ace2d1d Mon Sep 17 00:00:00 2001
From: Zzzen <callmetsing@gmail.com>
Date: Wed, 10 Aug 2022 07:37:39 +0800
Subject: [PATCH 15/18] fix CFA for BindingElement. #49759 (#49836)

* fix CFA for BindingElement. #49759

* fix Parameter

* fix controlFlowBindingPatternOrder

* fix bindParameterFlow

* add tests

* refactor

* refactor

* refactor
---
 src/compiler/binder.ts                        |  47 +++-
 .../reference/controlFlowBindingElement.js    | 136 ++++++++++
 .../controlFlowBindingElement.symbols         | 188 +++++++++++++
 .../reference/controlFlowBindingElement.types | 250 ++++++++++++++++++
 .../controlFlowBindingPatternOrder.errors.txt |  39 +++
 .../controlFlowBindingPatternOrder.symbols    |  26 +-
 .../controlFlowBindingPatternOrder.types      |  33 ++-
 .../reference/controlFlowParameter.js         |  60 +++++
 .../reference/controlFlowParameter.symbols    |  69 +++++
 .../reference/controlFlowParameter.types      |  93 +++++++
 .../controlFlow/controlFlowBindingElement.ts  |  90 +++++++
 .../controlFlowBindingPatternOrder.ts         |   5 +
 .../controlFlow/controlFlowParameter.ts       |  34 +++
 13 files changed, 1046 insertions(+), 24 deletions(-)
 create mode 100644 tests/baselines/reference/controlFlowBindingElement.js
 create mode 100644 tests/baselines/reference/controlFlowBindingElement.symbols
 create mode 100644 tests/baselines/reference/controlFlowBindingElement.types
 create mode 100644 tests/baselines/reference/controlFlowBindingPatternOrder.errors.txt
 create mode 100644 tests/baselines/reference/controlFlowParameter.js
 create mode 100644 tests/baselines/reference/controlFlowParameter.symbols
 create mode 100644 tests/baselines/reference/controlFlowParameter.types
 create mode 100644 tests/cases/conformance/controlFlow/controlFlowBindingElement.ts
 create mode 100644 tests/cases/conformance/controlFlow/controlFlowParameter.ts

diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts
index 52f99bcb8d74d..6ffe3a7ef526e 100644
--- a/src/compiler/binder.ts
+++ b/src/compiler/binder.ts
@@ -850,6 +850,9 @@ namespace ts {
                 case SyntaxKind.BindingElement:
                     bindBindingElementFlow(node as BindingElement);
                     break;
+                case SyntaxKind.Parameter:
+                    bindParameterFlow(node as ParameterDeclaration);
+                    break;
                 case SyntaxKind.ObjectLiteralExpression:
                 case SyntaxKind.ArrayLiteralExpression:
                 case SyntaxKind.PropertyAssignment:
@@ -1655,20 +1658,40 @@ namespace ts {
         }
 
         function bindBindingElementFlow(node: BindingElement) {
-            if (isBindingPattern(node.name)) {
-                // When evaluating a binding pattern, the initializer is evaluated before the binding pattern, per:
-                // - https://tc39.es/ecma262/#sec-destructuring-binding-patterns-runtime-semantics-iteratorbindinginitialization
-                //   - `BindingElement: BindingPattern Initializer?`
-                // - https://tc39.es/ecma262/#sec-runtime-semantics-keyedbindinginitialization
-                //   - `BindingElement: BindingPattern Initializer?`
-                bind(node.dotDotDotToken);
-                bind(node.propertyName);
-                bind(node.initializer);
-                bind(node.name);
+            // When evaluating a binding pattern, the initializer is evaluated before the binding pattern, per:
+            // - https://tc39.es/ecma262/#sec-destructuring-binding-patterns-runtime-semantics-iteratorbindinginitialization
+            //   - `BindingElement: BindingPattern Initializer?`
+            // - https://tc39.es/ecma262/#sec-runtime-semantics-keyedbindinginitialization
+            //   - `BindingElement: BindingPattern Initializer?`
+            bind(node.dotDotDotToken);
+            bind(node.propertyName);
+            bindInitializer(node.initializer);
+            bind(node.name);
+        }
+
+        function bindParameterFlow(node: ParameterDeclaration) {
+            bindEach(node.modifiers);
+            bind(node.dotDotDotToken);
+            bind(node.questionToken);
+            bind(node.type);
+            bindInitializer(node.initializer);
+            bind(node.name);
+        }
+
+        // a BindingElement/Parameter does not have side effects if initializers are not evaluated and used. (see GH#49759)
+        function bindInitializer(node: Expression | undefined) {
+            if (!node) {
+                return;
             }
-            else {
-                bindEachChild(node);
+            const entryFlow = currentFlow;
+            bind(node);
+            if (entryFlow === unreachableFlow || entryFlow === currentFlow) {
+                return;
             }
+            const exitFlow = createBranchLabel();
+            addAntecedent(exitFlow, entryFlow);
+            addAntecedent(exitFlow, currentFlow);
+            currentFlow = finishFlowLabel(exitFlow);
         }
 
         function bindJSDocTypeAlias(node: JSDocTypedefTag | JSDocCallbackTag | JSDocEnumTag) {
diff --git a/tests/baselines/reference/controlFlowBindingElement.js b/tests/baselines/reference/controlFlowBindingElement.js
new file mode 100644
index 0000000000000..e08cb83372ffe
--- /dev/null
+++ b/tests/baselines/reference/controlFlowBindingElement.js
@@ -0,0 +1,136 @@
+//// [controlFlowBindingElement.ts]
+{
+    const data =  { param: 'value' };
+
+    const {
+        param = (() => { throw new Error('param is not defined') })(),
+    } = data;
+    
+    console.log(param); // should not trigger 'Unreachable code detected.'    
+}
+
+
+{
+    const data =  { param: 'value' };
+
+    let foo: string | undefined = "";
+    const {
+        param = (() => { throw new Error('param is not defined') })(),
+    } = data;
+    
+    foo;  // should be string  
+}
+
+{
+    const data =  { param: 'value' };
+
+    let foo: string | undefined = "";
+    const {
+        param = (() => { foo = undefined })(),
+    } = data;
+    
+    foo;  // should be string | undefined
+}
+
+{
+    const data =  { param: 'value' };
+
+    let foo: string | undefined = "";
+    const {
+        param = (() => { return "" + 1 })(),
+    } = data;
+    
+    foo;  // should be string
+}
+
+{
+    interface Window {
+        window: Window;
+    }
+
+    let foo: string | undefined;
+    let window = {} as Window;
+    window.window = window;
+
+    const { [(() => { foo = ""; return 'window' as const })()]:
+        { [(() => { return 'window' as const })()]: bar } } = window;
+
+    foo;  // should be string
+}
+
+{
+    interface Window {
+        window: Window;
+    }
+
+    let foo: string | undefined;
+    let window = {} as Window;
+    window.window = window;
+
+    const { [(() => {  return 'window' as const })()]:
+        { [(() => { foo = ""; return 'window' as const })()]: bar } } = window;
+
+    foo;  // should be string
+}
+
+{
+    interface Window {
+        window: Window;
+    }
+
+    let foo: string | undefined;
+    let window = {} as Window;
+    window.window = window;
+
+    const { [(() => { return 'window' as const })()]:
+        { [(() => { return 'window' as const })()]: bar = (() => { foo = ""; return window; })() } } = window;
+
+    foo;  // should be string | undefined
+}
+
+
+//// [controlFlowBindingElement.js]
+{
+    var data = { param: 'value' };
+    var _a = data.param, param = _a === void 0 ? (function () { throw new Error('param is not defined'); })() : _a;
+    console.log(param); // should not trigger 'Unreachable code detected.'    
+}
+{
+    var data = { param: 'value' };
+    var foo = "";
+    var _b = data.param, param = _b === void 0 ? (function () { throw new Error('param is not defined'); })() : _b;
+    foo; // should be string  
+}
+{
+    var data = { param: 'value' };
+    var foo_1 = "";
+    var _c = data.param, param = _c === void 0 ? (function () { foo_1 = undefined; })() : _c;
+    foo_1; // should be string | undefined
+}
+{
+    var data = { param: 'value' };
+    var foo = "";
+    var _d = data.param, param = _d === void 0 ? (function () { return "" + 1; })() : _d;
+    foo; // should be string
+}
+{
+    var foo_2;
+    var window_1 = {};
+    window_1.window = window_1;
+    var _e = window_1, _f = (function () { foo_2 = ""; return 'window'; })(), _g = (function () { return 'window'; })(), bar = _e[_f][_g];
+    foo_2; // should be string
+}
+{
+    var foo_3;
+    var window_2 = {};
+    window_2.window = window_2;
+    var _h = window_2, _j = (function () { return 'window'; })(), _k = (function () { foo_3 = ""; return 'window'; })(), bar = _h[_j][_k];
+    foo_3; // should be string
+}
+{
+    var foo_4;
+    var window_3 = {};
+    window_3.window = window_3;
+    var _l = window_3, _m = (function () { return 'window'; })(), _o = (function () { return 'window'; })(), _p = _l[_m][_o], bar = _p === void 0 ? (function () { foo_4 = ""; return window_3; })() : _p;
+    foo_4; // should be string | undefined
+}
diff --git a/tests/baselines/reference/controlFlowBindingElement.symbols b/tests/baselines/reference/controlFlowBindingElement.symbols
new file mode 100644
index 0000000000000..683a8e2c7be29
--- /dev/null
+++ b/tests/baselines/reference/controlFlowBindingElement.symbols
@@ -0,0 +1,188 @@
+=== tests/cases/conformance/controlFlow/controlFlowBindingElement.ts ===
+{
+    const data =  { param: 'value' };
+>data : Symbol(data, Decl(controlFlowBindingElement.ts, 1, 9))
+>param : Symbol(param, Decl(controlFlowBindingElement.ts, 1, 19))
+
+    const {
+        param = (() => { throw new Error('param is not defined') })(),
+>param : Symbol(param, Decl(controlFlowBindingElement.ts, 3, 11))
+>Error : Symbol(Error, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
+
+    } = data;
+>data : Symbol(data, Decl(controlFlowBindingElement.ts, 1, 9))
+    
+    console.log(param); // should not trigger 'Unreachable code detected.'    
+>console.log : Symbol(Console.log, Decl(lib.dom.d.ts, --, --))
+>console : Symbol(console, Decl(lib.dom.d.ts, --, --))
+>log : Symbol(Console.log, Decl(lib.dom.d.ts, --, --))
+>param : Symbol(param, Decl(controlFlowBindingElement.ts, 3, 11))
+}
+
+
+{
+    const data =  { param: 'value' };
+>data : Symbol(data, Decl(controlFlowBindingElement.ts, 12, 9))
+>param : Symbol(param, Decl(controlFlowBindingElement.ts, 12, 19))
+
+    let foo: string | undefined = "";
+>foo : Symbol(foo, Decl(controlFlowBindingElement.ts, 14, 7))
+
+    const {
+        param = (() => { throw new Error('param is not defined') })(),
+>param : Symbol(param, Decl(controlFlowBindingElement.ts, 15, 11))
+>Error : Symbol(Error, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
+
+    } = data;
+>data : Symbol(data, Decl(controlFlowBindingElement.ts, 12, 9))
+    
+    foo;  // should be string  
+>foo : Symbol(foo, Decl(controlFlowBindingElement.ts, 14, 7))
+}
+
+{
+    const data =  { param: 'value' };
+>data : Symbol(data, Decl(controlFlowBindingElement.ts, 23, 9))
+>param : Symbol(param, Decl(controlFlowBindingElement.ts, 23, 19))
+
+    let foo: string | undefined = "";
+>foo : Symbol(foo, Decl(controlFlowBindingElement.ts, 25, 7))
+
+    const {
+        param = (() => { foo = undefined })(),
+>param : Symbol(param, Decl(controlFlowBindingElement.ts, 26, 11))
+>foo : Symbol(foo, Decl(controlFlowBindingElement.ts, 25, 7))
+>undefined : Symbol(undefined)
+
+    } = data;
+>data : Symbol(data, Decl(controlFlowBindingElement.ts, 23, 9))
+    
+    foo;  // should be string | undefined
+>foo : Symbol(foo, Decl(controlFlowBindingElement.ts, 25, 7))
+}
+
+{
+    const data =  { param: 'value' };
+>data : Symbol(data, Decl(controlFlowBindingElement.ts, 34, 9))
+>param : Symbol(param, Decl(controlFlowBindingElement.ts, 34, 19))
+
+    let foo: string | undefined = "";
+>foo : Symbol(foo, Decl(controlFlowBindingElement.ts, 36, 7))
+
+    const {
+        param = (() => { return "" + 1 })(),
+>param : Symbol(param, Decl(controlFlowBindingElement.ts, 37, 11))
+
+    } = data;
+>data : Symbol(data, Decl(controlFlowBindingElement.ts, 34, 9))
+    
+    foo;  // should be string
+>foo : Symbol(foo, Decl(controlFlowBindingElement.ts, 36, 7))
+}
+
+{
+    interface Window {
+>Window : Symbol(Window, Decl(controlFlowBindingElement.ts, 44, 1))
+
+        window: Window;
+>window : Symbol(Window.window, Decl(controlFlowBindingElement.ts, 45, 22))
+>Window : Symbol(Window, Decl(controlFlowBindingElement.ts, 44, 1))
+    }
+
+    let foo: string | undefined;
+>foo : Symbol(foo, Decl(controlFlowBindingElement.ts, 49, 7))
+
+    let window = {} as Window;
+>window : Symbol(window, Decl(controlFlowBindingElement.ts, 50, 7))
+>Window : Symbol(Window, Decl(controlFlowBindingElement.ts, 44, 1))
+
+    window.window = window;
+>window.window : Symbol(Window.window, Decl(controlFlowBindingElement.ts, 45, 22))
+>window : Symbol(window, Decl(controlFlowBindingElement.ts, 50, 7))
+>window : Symbol(Window.window, Decl(controlFlowBindingElement.ts, 45, 22))
+>window : Symbol(window, Decl(controlFlowBindingElement.ts, 50, 7))
+
+    const { [(() => { foo = ""; return 'window' as const })()]:
+>foo : Symbol(foo, Decl(controlFlowBindingElement.ts, 49, 7))
+>const : Symbol(const)
+
+        { [(() => { return 'window' as const })()]: bar } } = window;
+>const : Symbol(const)
+>bar : Symbol(bar, Decl(controlFlowBindingElement.ts, 54, 9))
+>window : Symbol(window, Decl(controlFlowBindingElement.ts, 50, 7))
+
+    foo;  // should be string
+>foo : Symbol(foo, Decl(controlFlowBindingElement.ts, 49, 7))
+}
+
+{
+    interface Window {
+>Window : Symbol(Window, Decl(controlFlowBindingElement.ts, 59, 1))
+
+        window: Window;
+>window : Symbol(Window.window, Decl(controlFlowBindingElement.ts, 60, 22))
+>Window : Symbol(Window, Decl(controlFlowBindingElement.ts, 59, 1))
+    }
+
+    let foo: string | undefined;
+>foo : Symbol(foo, Decl(controlFlowBindingElement.ts, 64, 7))
+
+    let window = {} as Window;
+>window : Symbol(window, Decl(controlFlowBindingElement.ts, 65, 7))
+>Window : Symbol(Window, Decl(controlFlowBindingElement.ts, 59, 1))
+
+    window.window = window;
+>window.window : Symbol(Window.window, Decl(controlFlowBindingElement.ts, 60, 22))
+>window : Symbol(window, Decl(controlFlowBindingElement.ts, 65, 7))
+>window : Symbol(Window.window, Decl(controlFlowBindingElement.ts, 60, 22))
+>window : Symbol(window, Decl(controlFlowBindingElement.ts, 65, 7))
+
+    const { [(() => {  return 'window' as const })()]:
+>const : Symbol(const)
+
+        { [(() => { foo = ""; return 'window' as const })()]: bar } } = window;
+>foo : Symbol(foo, Decl(controlFlowBindingElement.ts, 64, 7))
+>const : Symbol(const)
+>bar : Symbol(bar, Decl(controlFlowBindingElement.ts, 69, 9))
+>window : Symbol(window, Decl(controlFlowBindingElement.ts, 65, 7))
+
+    foo;  // should be string
+>foo : Symbol(foo, Decl(controlFlowBindingElement.ts, 64, 7))
+}
+
+{
+    interface Window {
+>Window : Symbol(Window, Decl(controlFlowBindingElement.ts, 74, 1))
+
+        window: Window;
+>window : Symbol(Window.window, Decl(controlFlowBindingElement.ts, 75, 22))
+>Window : Symbol(Window, Decl(controlFlowBindingElement.ts, 74, 1))
+    }
+
+    let foo: string | undefined;
+>foo : Symbol(foo, Decl(controlFlowBindingElement.ts, 79, 7))
+
+    let window = {} as Window;
+>window : Symbol(window, Decl(controlFlowBindingElement.ts, 80, 7))
+>Window : Symbol(Window, Decl(controlFlowBindingElement.ts, 74, 1))
+
+    window.window = window;
+>window.window : Symbol(Window.window, Decl(controlFlowBindingElement.ts, 75, 22))
+>window : Symbol(window, Decl(controlFlowBindingElement.ts, 80, 7))
+>window : Symbol(Window.window, Decl(controlFlowBindingElement.ts, 75, 22))
+>window : Symbol(window, Decl(controlFlowBindingElement.ts, 80, 7))
+
+    const { [(() => { return 'window' as const })()]:
+>const : Symbol(const)
+
+        { [(() => { return 'window' as const })()]: bar = (() => { foo = ""; return window; })() } } = window;
+>const : Symbol(const)
+>bar : Symbol(bar, Decl(controlFlowBindingElement.ts, 84, 9))
+>foo : Symbol(foo, Decl(controlFlowBindingElement.ts, 79, 7))
+>window : Symbol(window, Decl(controlFlowBindingElement.ts, 80, 7))
+>window : Symbol(window, Decl(controlFlowBindingElement.ts, 80, 7))
+
+    foo;  // should be string | undefined
+>foo : Symbol(foo, Decl(controlFlowBindingElement.ts, 79, 7))
+}
+
diff --git a/tests/baselines/reference/controlFlowBindingElement.types b/tests/baselines/reference/controlFlowBindingElement.types
new file mode 100644
index 0000000000000..8c9c6ac79a5a2
--- /dev/null
+++ b/tests/baselines/reference/controlFlowBindingElement.types
@@ -0,0 +1,250 @@
+=== tests/cases/conformance/controlFlow/controlFlowBindingElement.ts ===
+{
+    const data =  { param: 'value' };
+>data : { param: string; }
+>{ param: 'value' } : { param: string; }
+>param : string
+>'value' : "value"
+
+    const {
+        param = (() => { throw new Error('param is not defined') })(),
+>param : string
+>(() => { throw new Error('param is not defined') })() : never
+>(() => { throw new Error('param is not defined') }) : () => never
+>() => { throw new Error('param is not defined') } : () => never
+>new Error('param is not defined') : Error
+>Error : ErrorConstructor
+>'param is not defined' : "param is not defined"
+
+    } = data;
+>data : { param: string; }
+    
+    console.log(param); // should not trigger 'Unreachable code detected.'    
+>console.log(param) : void
+>console.log : (...data: any[]) => void
+>console : Console
+>log : (...data: any[]) => void
+>param : string
+}
+
+
+{
+    const data =  { param: 'value' };
+>data : { param: string; }
+>{ param: 'value' } : { param: string; }
+>param : string
+>'value' : "value"
+
+    let foo: string | undefined = "";
+>foo : string | undefined
+>"" : ""
+
+    const {
+        param = (() => { throw new Error('param is not defined') })(),
+>param : string
+>(() => { throw new Error('param is not defined') })() : never
+>(() => { throw new Error('param is not defined') }) : () => never
+>() => { throw new Error('param is not defined') } : () => never
+>new Error('param is not defined') : Error
+>Error : ErrorConstructor
+>'param is not defined' : "param is not defined"
+
+    } = data;
+>data : { param: string; }
+    
+    foo;  // should be string  
+>foo : string
+}
+
+{
+    const data =  { param: 'value' };
+>data : { param: string; }
+>{ param: 'value' } : { param: string; }
+>param : string
+>'value' : "value"
+
+    let foo: string | undefined = "";
+>foo : string | undefined
+>"" : ""
+
+    const {
+        param = (() => { foo = undefined })(),
+>param : string | void
+>(() => { foo = undefined })() : void
+>(() => { foo = undefined }) : () => void
+>() => { foo = undefined } : () => void
+>foo = undefined : undefined
+>foo : string | undefined
+>undefined : undefined
+
+    } = data;
+>data : { param: string; }
+    
+    foo;  // should be string | undefined
+>foo : string | undefined
+}
+
+{
+    const data =  { param: 'value' };
+>data : { param: string; }
+>{ param: 'value' } : { param: string; }
+>param : string
+>'value' : "value"
+
+    let foo: string | undefined = "";
+>foo : string | undefined
+>"" : ""
+
+    const {
+        param = (() => { return "" + 1 })(),
+>param : string
+>(() => { return "" + 1 })() : string
+>(() => { return "" + 1 }) : () => string
+>() => { return "" + 1 } : () => string
+>"" + 1 : string
+>"" : ""
+>1 : 1
+
+    } = data;
+>data : { param: string; }
+    
+    foo;  // should be string
+>foo : string
+}
+
+{
+    interface Window {
+        window: Window;
+>window : Window
+    }
+
+    let foo: string | undefined;
+>foo : string | undefined
+
+    let window = {} as Window;
+>window : Window
+>{} as Window : Window
+>{} : {}
+
+    window.window = window;
+>window.window = window : Window
+>window.window : Window
+>window : Window
+>window : Window
+>window : Window
+
+    const { [(() => { foo = ""; return 'window' as const })()]:
+>(() => { foo = ""; return 'window' as const })() : "window"
+>(() => { foo = ""; return 'window' as const }) : () => "window"
+>() => { foo = ""; return 'window' as const } : () => "window"
+>foo = "" : ""
+>foo : string | undefined
+>"" : ""
+>'window' as const : "window"
+>'window' : "window"
+
+        { [(() => { return 'window' as const })()]: bar } } = window;
+>(() => { return 'window' as const })() : "window"
+>(() => { return 'window' as const }) : () => "window"
+>() => { return 'window' as const } : () => "window"
+>'window' as const : "window"
+>'window' : "window"
+>bar : Window
+>window : Window
+
+    foo;  // should be string
+>foo : string
+}
+
+{
+    interface Window {
+        window: Window;
+>window : Window
+    }
+
+    let foo: string | undefined;
+>foo : string | undefined
+
+    let window = {} as Window;
+>window : Window
+>{} as Window : Window
+>{} : {}
+
+    window.window = window;
+>window.window = window : Window
+>window.window : Window
+>window : Window
+>window : Window
+>window : Window
+
+    const { [(() => {  return 'window' as const })()]:
+>(() => {  return 'window' as const })() : "window"
+>(() => {  return 'window' as const }) : () => "window"
+>() => {  return 'window' as const } : () => "window"
+>'window' as const : "window"
+>'window' : "window"
+
+        { [(() => { foo = ""; return 'window' as const })()]: bar } } = window;
+>(() => { foo = ""; return 'window' as const })() : "window"
+>(() => { foo = ""; return 'window' as const }) : () => "window"
+>() => { foo = ""; return 'window' as const } : () => "window"
+>foo = "" : ""
+>foo : string | undefined
+>"" : ""
+>'window' as const : "window"
+>'window' : "window"
+>bar : Window
+>window : Window
+
+    foo;  // should be string
+>foo : string
+}
+
+{
+    interface Window {
+        window: Window;
+>window : Window
+    }
+
+    let foo: string | undefined;
+>foo : string | undefined
+
+    let window = {} as Window;
+>window : Window
+>{} as Window : Window
+>{} : {}
+
+    window.window = window;
+>window.window = window : Window
+>window.window : Window
+>window : Window
+>window : Window
+>window : Window
+
+    const { [(() => { return 'window' as const })()]:
+>(() => { return 'window' as const })() : "window"
+>(() => { return 'window' as const }) : () => "window"
+>() => { return 'window' as const } : () => "window"
+>'window' as const : "window"
+>'window' : "window"
+
+        { [(() => { return 'window' as const })()]: bar = (() => { foo = ""; return window; })() } } = window;
+>(() => { return 'window' as const })() : "window"
+>(() => { return 'window' as const }) : () => "window"
+>() => { return 'window' as const } : () => "window"
+>'window' as const : "window"
+>'window' : "window"
+>bar : Window
+>(() => { foo = ""; return window; })() : Window
+>(() => { foo = ""; return window; }) : () => Window
+>() => { foo = ""; return window; } : () => Window
+>foo = "" : ""
+>foo : string | undefined
+>"" : ""
+>window : Window
+>window : Window
+
+    foo;  // should be string | undefined
+>foo : string | undefined
+}
+
diff --git a/tests/baselines/reference/controlFlowBindingPatternOrder.errors.txt b/tests/baselines/reference/controlFlowBindingPatternOrder.errors.txt
new file mode 100644
index 0000000000000..37b608c307155
--- /dev/null
+++ b/tests/baselines/reference/controlFlowBindingPatternOrder.errors.txt
@@ -0,0 +1,39 @@
+tests/cases/conformance/controlFlow/controlFlowBindingPatternOrder.ts(10,11): error TS2322: Type '0 | 9' is not assignable to type '9'.
+  Type '0' is not assignable to type '9'.
+tests/cases/conformance/controlFlow/controlFlowBindingPatternOrder.ts(25,11): error TS2322: Type '0 | 9 | 8' is not assignable to type '0 | 8'.
+  Type '9' is not assignable to type '0 | 8'.
+
+
+==== tests/cases/conformance/controlFlow/controlFlowBindingPatternOrder.ts (2 errors) ====
+    // https://github.com/microsoft/TypeScript/pull/41094#issuecomment-716044363
+    {
+        let a: 0 | 1 = 0;
+        const [{ [(a = 1)]: b } = [9, a] as const] = [];
+        const bb: 0 = b;
+    }
+    {
+        let a: 0 | 1 = 1;
+        const [{ [a]: b } = [9, a = 0] as const] = [];
+        const bb: 9 = b;
+              ~~
+!!! error TS2322: Type '0 | 9' is not assignable to type '9'.
+!!! error TS2322:   Type '0' is not assignable to type '9'.
+    }
+    {
+        let a: 0 | 1 | 2 = 1;
+        const [{ [a]: b } = [9, a = 0, 5] as const] = [];
+        const bb: 0 | 9 = b;
+    }
+    {
+        let a: 0 | 1 = 0;
+        const [{ [(a = 1)]: b } = [9, a] as const] = [[9, 8] as const];
+        const bb: 0 | 8 = b;
+    }
+    {
+        let a: 0 | 1 = 1;
+        const [{ [a]: b } = [a = 0, 9] as const] = [[8, 9] as const];
+        const bb: 0 | 8 = b;
+              ~~
+!!! error TS2322: Type '0 | 9 | 8' is not assignable to type '0 | 8'.
+!!! error TS2322:   Type '9' is not assignable to type '0 | 8'.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/controlFlowBindingPatternOrder.symbols b/tests/baselines/reference/controlFlowBindingPatternOrder.symbols
index fea01b4d125a2..7791d4540e076 100644
--- a/tests/baselines/reference/controlFlowBindingPatternOrder.symbols
+++ b/tests/baselines/reference/controlFlowBindingPatternOrder.symbols
@@ -29,25 +29,24 @@
 >b : Symbol(b, Decl(controlFlowBindingPatternOrder.ts, 8, 12))
 }
 {
-    let a: 0 | 1 = 0;
+    let a: 0 | 1 | 2 = 1;
 >a : Symbol(a, Decl(controlFlowBindingPatternOrder.ts, 12, 7))
 
-    const [{ [(a = 1)]: b } = [9, a] as const] = [[9, 8] as const];
+    const [{ [a]: b } = [9, a = 0, 5] as const] = [];
 >a : Symbol(a, Decl(controlFlowBindingPatternOrder.ts, 12, 7))
 >b : Symbol(b, Decl(controlFlowBindingPatternOrder.ts, 13, 12))
 >a : Symbol(a, Decl(controlFlowBindingPatternOrder.ts, 12, 7))
->const : Symbol(const)
 >const : Symbol(const)
 
-    const bb: 0 | 8 = b;
+    const bb: 0 | 9 = b;
 >bb : Symbol(bb, Decl(controlFlowBindingPatternOrder.ts, 14, 9))
 >b : Symbol(b, Decl(controlFlowBindingPatternOrder.ts, 13, 12))
 }
 {
-    let a: 0 | 1 = 1;
+    let a: 0 | 1 = 0;
 >a : Symbol(a, Decl(controlFlowBindingPatternOrder.ts, 17, 7))
 
-    const [{ [a]: b } = [a = 0, 9] as const] = [[8, 9] as const];
+    const [{ [(a = 1)]: b } = [9, a] as const] = [[9, 8] as const];
 >a : Symbol(a, Decl(controlFlowBindingPatternOrder.ts, 17, 7))
 >b : Symbol(b, Decl(controlFlowBindingPatternOrder.ts, 18, 12))
 >a : Symbol(a, Decl(controlFlowBindingPatternOrder.ts, 17, 7))
@@ -58,3 +57,18 @@
 >bb : Symbol(bb, Decl(controlFlowBindingPatternOrder.ts, 19, 9))
 >b : Symbol(b, Decl(controlFlowBindingPatternOrder.ts, 18, 12))
 }
+{
+    let a: 0 | 1 = 1;
+>a : Symbol(a, Decl(controlFlowBindingPatternOrder.ts, 22, 7))
+
+    const [{ [a]: b } = [a = 0, 9] as const] = [[8, 9] as const];
+>a : Symbol(a, Decl(controlFlowBindingPatternOrder.ts, 22, 7))
+>b : Symbol(b, Decl(controlFlowBindingPatternOrder.ts, 23, 12))
+>a : Symbol(a, Decl(controlFlowBindingPatternOrder.ts, 22, 7))
+>const : Symbol(const)
+>const : Symbol(const)
+
+    const bb: 0 | 8 = b;
+>bb : Symbol(bb, Decl(controlFlowBindingPatternOrder.ts, 24, 9))
+>b : Symbol(b, Decl(controlFlowBindingPatternOrder.ts, 23, 12))
+}
diff --git a/tests/baselines/reference/controlFlowBindingPatternOrder.types b/tests/baselines/reference/controlFlowBindingPatternOrder.types
index 5c9d426c23bd1..dd7e782885b1d 100644
--- a/tests/baselines/reference/controlFlowBindingPatternOrder.types
+++ b/tests/baselines/reference/controlFlowBindingPatternOrder.types
@@ -27,8 +27,8 @@
 >1 : 1
 
     const [{ [a]: b } = [9, a = 0] as const] = [];
->a : 0
->b : 9
+>a : 0 | 1
+>b : 0 | 9
 >[9, a = 0] as const : readonly [9, 0]
 >[9, a = 0] : readonly [9, 0]
 >9 : 9
@@ -39,7 +39,28 @@
 
     const bb: 9 = b;
 >bb : 9
->b : 9
+>b : 0 | 9
+}
+{
+    let a: 0 | 1 | 2 = 1;
+>a : 0 | 1 | 2
+>1 : 1
+
+    const [{ [a]: b } = [9, a = 0, 5] as const] = [];
+>a : 0 | 1
+>b : 0 | 9
+>[9, a = 0, 5] as const : readonly [9, 0, 5]
+>[9, a = 0, 5] : readonly [9, 0, 5]
+>9 : 9
+>a = 0 : 0
+>a : 0 | 1 | 2
+>0 : 0
+>5 : 5
+>[] : []
+
+    const bb: 0 | 9 = b;
+>bb : 0 | 9
+>b : 0 | 9
 }
 {
     let a: 0 | 1 = 0;
@@ -72,8 +93,8 @@
 >1 : 1
 
     const [{ [a]: b } = [a = 0, 9] as const] = [[8, 9] as const];
->a : 0
->b : 0 | 8
+>a : 0 | 1
+>b : 0 | 9 | 8
 >[a = 0, 9] as const : readonly [0, 9]
 >[a = 0, 9] : readonly [0, 9]
 >a = 0 : 0
@@ -88,5 +109,5 @@
 
     const bb: 0 | 8 = b;
 >bb : 0 | 8
->b : 0 | 8
+>b : 0 | 9 | 8
 }
diff --git a/tests/baselines/reference/controlFlowParameter.js b/tests/baselines/reference/controlFlowParameter.js
new file mode 100644
index 0000000000000..283061f665006
--- /dev/null
+++ b/tests/baselines/reference/controlFlowParameter.js
@@ -0,0 +1,60 @@
+//// [controlFlowParameter.ts]
+function f1(
+  required: unknown = (() => {
+    throw new Error("bad");
+  })()
+) {
+  console.log("ok"); // should not trigger 'Unreachable code detected.'
+}
+
+function f2(
+  a: number | string | undefined,
+  required: unknown = (() => {
+    a = 1;
+  })()
+) {
+  a; // should be number | string | undefined
+}
+
+function f3(
+  a: number | string | undefined = 1,
+  required: unknown = (() => {
+    a = "";
+  })()
+) {
+  a; // should be number | string
+}
+
+function f4(
+  a: number | string | undefined = 1,
+  { [(a = "")]: b } = {} as any
+) {
+  a; // should be string
+}
+
+
+//// [controlFlowParameter.js]
+function f1(required) {
+    if (required === void 0) { required = (function () {
+        throw new Error("bad");
+    })(); }
+    console.log("ok"); // should not trigger 'Unreachable code detected.'
+}
+function f2(a, required) {
+    if (required === void 0) { required = (function () {
+        a = 1;
+    })(); }
+    a; // should be number | string | undefined
+}
+function f3(a, required) {
+    if (a === void 0) { a = 1; }
+    if (required === void 0) { required = (function () {
+        a = "";
+    })(); }
+    a; // should be number | string
+}
+function f4(a, _a) {
+    if (a === void 0) { a = 1; }
+    var _b = _a === void 0 ? {} : _a, _c = (a = ""), b = _b[_c];
+    a; // should be string
+}
diff --git a/tests/baselines/reference/controlFlowParameter.symbols b/tests/baselines/reference/controlFlowParameter.symbols
new file mode 100644
index 0000000000000..b2f58685a0cd2
--- /dev/null
+++ b/tests/baselines/reference/controlFlowParameter.symbols
@@ -0,0 +1,69 @@
+=== tests/cases/conformance/controlFlow/controlFlowParameter.ts ===
+function f1(
+>f1 : Symbol(f1, Decl(controlFlowParameter.ts, 0, 0))
+
+  required: unknown = (() => {
+>required : Symbol(required, Decl(controlFlowParameter.ts, 0, 12))
+
+    throw new Error("bad");
+>Error : Symbol(Error, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
+
+  })()
+) {
+  console.log("ok"); // should not trigger 'Unreachable code detected.'
+>console.log : Symbol(Console.log, Decl(lib.dom.d.ts, --, --))
+>console : Symbol(console, Decl(lib.dom.d.ts, --, --))
+>log : Symbol(Console.log, Decl(lib.dom.d.ts, --, --))
+}
+
+function f2(
+>f2 : Symbol(f2, Decl(controlFlowParameter.ts, 6, 1))
+
+  a: number | string | undefined,
+>a : Symbol(a, Decl(controlFlowParameter.ts, 8, 12))
+
+  required: unknown = (() => {
+>required : Symbol(required, Decl(controlFlowParameter.ts, 9, 33))
+
+    a = 1;
+>a : Symbol(a, Decl(controlFlowParameter.ts, 8, 12))
+
+  })()
+) {
+  a; // should be number | string | undefined
+>a : Symbol(a, Decl(controlFlowParameter.ts, 8, 12))
+}
+
+function f3(
+>f3 : Symbol(f3, Decl(controlFlowParameter.ts, 15, 1))
+
+  a: number | string | undefined = 1,
+>a : Symbol(a, Decl(controlFlowParameter.ts, 17, 12))
+
+  required: unknown = (() => {
+>required : Symbol(required, Decl(controlFlowParameter.ts, 18, 37))
+
+    a = "";
+>a : Symbol(a, Decl(controlFlowParameter.ts, 17, 12))
+
+  })()
+) {
+  a; // should be number | string
+>a : Symbol(a, Decl(controlFlowParameter.ts, 17, 12))
+}
+
+function f4(
+>f4 : Symbol(f4, Decl(controlFlowParameter.ts, 24, 1))
+
+  a: number | string | undefined = 1,
+>a : Symbol(a, Decl(controlFlowParameter.ts, 26, 12))
+
+  { [(a = "")]: b } = {} as any
+>a : Symbol(a, Decl(controlFlowParameter.ts, 26, 12))
+>b : Symbol(b, Decl(controlFlowParameter.ts, 28, 3))
+
+) {
+  a; // should be string
+>a : Symbol(a, Decl(controlFlowParameter.ts, 26, 12))
+}
+
diff --git a/tests/baselines/reference/controlFlowParameter.types b/tests/baselines/reference/controlFlowParameter.types
new file mode 100644
index 0000000000000..0a77f532f1b53
--- /dev/null
+++ b/tests/baselines/reference/controlFlowParameter.types
@@ -0,0 +1,93 @@
+=== tests/cases/conformance/controlFlow/controlFlowParameter.ts ===
+function f1(
+>f1 : (required?: unknown) => void
+
+  required: unknown = (() => {
+>required : unknown
+>(() => {    throw new Error("bad");  })() : never
+>(() => {    throw new Error("bad");  }) : () => never
+>() => {    throw new Error("bad");  } : () => never
+
+    throw new Error("bad");
+>new Error("bad") : Error
+>Error : ErrorConstructor
+>"bad" : "bad"
+
+  })()
+) {
+  console.log("ok"); // should not trigger 'Unreachable code detected.'
+>console.log("ok") : void
+>console.log : (...data: any[]) => void
+>console : Console
+>log : (...data: any[]) => void
+>"ok" : "ok"
+}
+
+function f2(
+>f2 : (a: number | string | undefined, required?: unknown) => void
+
+  a: number | string | undefined,
+>a : string | number | undefined
+
+  required: unknown = (() => {
+>required : unknown
+>(() => {    a = 1;  })() : void
+>(() => {    a = 1;  }) : () => void
+>() => {    a = 1;  } : () => void
+
+    a = 1;
+>a = 1 : 1
+>a : string | number | undefined
+>1 : 1
+
+  })()
+) {
+  a; // should be number | string | undefined
+>a : string | number | undefined
+}
+
+function f3(
+>f3 : (a?: number | string | undefined, required?: unknown) => void
+
+  a: number | string | undefined = 1,
+>a : string | number | undefined
+>1 : 1
+
+  required: unknown = (() => {
+>required : unknown
+>(() => {    a = "";  })() : void
+>(() => {    a = "";  }) : () => void
+>() => {    a = "";  } : () => void
+
+    a = "";
+>a = "" : ""
+>a : string | number | undefined
+>"" : ""
+
+  })()
+) {
+  a; // should be number | string
+>a : string | number
+}
+
+function f4(
+>f4 : (a?: number | string | undefined, { [(a = "")]: b }?: any) => void
+
+  a: number | string | undefined = 1,
+>a : string | number | undefined
+>1 : 1
+
+  { [(a = "")]: b } = {} as any
+>(a = "") : ""
+>a = "" : ""
+>a : string | number | undefined
+>"" : ""
+>b : any
+>{} as any : any
+>{} : {}
+
+) {
+  a; // should be string
+>a : string
+}
+
diff --git a/tests/cases/conformance/controlFlow/controlFlowBindingElement.ts b/tests/cases/conformance/controlFlow/controlFlowBindingElement.ts
new file mode 100644
index 0000000000000..153666f943324
--- /dev/null
+++ b/tests/cases/conformance/controlFlow/controlFlowBindingElement.ts
@@ -0,0 +1,90 @@
+// @strictNullChecks: true
+// @allowUnreachableCode: false
+{
+    const data =  { param: 'value' };
+
+    const {
+        param = (() => { throw new Error('param is not defined') })(),
+    } = data;
+    
+    console.log(param); // should not trigger 'Unreachable code detected.'    
+}
+
+
+{
+    const data =  { param: 'value' };
+
+    let foo: string | undefined = "";
+    const {
+        param = (() => { throw new Error('param is not defined') })(),
+    } = data;
+    
+    foo;  // should be string  
+}
+
+{
+    const data =  { param: 'value' };
+
+    let foo: string | undefined = "";
+    const {
+        param = (() => { foo = undefined })(),
+    } = data;
+    
+    foo;  // should be string | undefined
+}
+
+{
+    const data =  { param: 'value' };
+
+    let foo: string | undefined = "";
+    const {
+        param = (() => { return "" + 1 })(),
+    } = data;
+    
+    foo;  // should be string
+}
+
+{
+    interface Window {
+        window: Window;
+    }
+
+    let foo: string | undefined;
+    let window = {} as Window;
+    window.window = window;
+
+    const { [(() => { foo = ""; return 'window' as const })()]:
+        { [(() => { return 'window' as const })()]: bar } } = window;
+
+    foo;  // should be string
+}
+
+{
+    interface Window {
+        window: Window;
+    }
+
+    let foo: string | undefined;
+    let window = {} as Window;
+    window.window = window;
+
+    const { [(() => {  return 'window' as const })()]:
+        { [(() => { foo = ""; return 'window' as const })()]: bar } } = window;
+
+    foo;  // should be string
+}
+
+{
+    interface Window {
+        window: Window;
+    }
+
+    let foo: string | undefined;
+    let window = {} as Window;
+    window.window = window;
+
+    const { [(() => { return 'window' as const })()]:
+        { [(() => { return 'window' as const })()]: bar = (() => { foo = ""; return window; })() } } = window;
+
+    foo;  // should be string | undefined
+}
diff --git a/tests/cases/conformance/controlFlow/controlFlowBindingPatternOrder.ts b/tests/cases/conformance/controlFlow/controlFlowBindingPatternOrder.ts
index 804947c9b705d..9bacc6b7eb487 100644
--- a/tests/cases/conformance/controlFlow/controlFlowBindingPatternOrder.ts
+++ b/tests/cases/conformance/controlFlow/controlFlowBindingPatternOrder.ts
@@ -12,6 +12,11 @@
     const [{ [a]: b } = [9, a = 0] as const] = [];
     const bb: 9 = b;
 }
+{
+    let a: 0 | 1 | 2 = 1;
+    const [{ [a]: b } = [9, a = 0, 5] as const] = [];
+    const bb: 0 | 9 = b;
+}
 {
     let a: 0 | 1 = 0;
     const [{ [(a = 1)]: b } = [9, a] as const] = [[9, 8] as const];
diff --git a/tests/cases/conformance/controlFlow/controlFlowParameter.ts b/tests/cases/conformance/controlFlow/controlFlowParameter.ts
new file mode 100644
index 0000000000000..09972b5f6e0a3
--- /dev/null
+++ b/tests/cases/conformance/controlFlow/controlFlowParameter.ts
@@ -0,0 +1,34 @@
+// @strictNullChecks: true
+// @allowUnreachableCode: false
+function f1(
+  required: unknown = (() => {
+    throw new Error("bad");
+  })()
+) {
+  console.log("ok"); // should not trigger 'Unreachable code detected.'
+}
+
+function f2(
+  a: number | string | undefined,
+  required: unknown = (() => {
+    a = 1;
+  })()
+) {
+  a; // should be number | string | undefined
+}
+
+function f3(
+  a: number | string | undefined = 1,
+  required: unknown = (() => {
+    a = "";
+  })()
+) {
+  a; // should be number | string
+}
+
+function f4(
+  a: number | string | undefined = 1,
+  { [(a = "")]: b } = {} as any
+) {
+  a; // should be string
+}

From af90e703ab0297e0c311e2cb60198e02f0de39f0 Mon Sep 17 00:00:00 2001
From: Oleksandr T <oleksandr.tarasiuk@outlook.com>
Date: Wed, 10 Aug 2022 02:38:42 +0300
Subject: [PATCH 16/18] feat(49903): omit declare on type declarations (#49925)

---
 src/compiler/transformers/declarations.ts     |   8 +-
 .../DeclarationErrorsNoEmitOnError.js         |   2 +-
 .../anonClassDeclarationEmitIsAnon.js         |   2 +-
 ...ileSystemWithCapsImportTypeDeclarations.js |   6 +-
 .../reference/circularAccessorAnnotations.js  |   6 +-
 .../baselines/reference/circularBaseTypes.js  |   4 +-
 .../reference/circularIndexedAccessErrors.js  |   4 +-
 .../reference/coAndContraVariantInferences.js |   4 +-
 .../baselines/reference/conditionalTypes1.js  | 230 +++++++++---------
 .../baselines/reference/conditionalTypes2.js  |  70 +++---
 tests/baselines/reference/constAssertions.js  |   6 +-
 .../contextuallyTypedBooleanLiterals.js       |   2 +-
 .../contextuallyTypedSymbolNamedProperties.js |   2 +-
 .../reference/controlFlowAliasing.js          |   2 +-
 tests/baselines/reference/correlatedUnions.js |  48 ++--
 ...tionEmitClassMixinLocalClassDeclaration.js |   6 +-
 ...ionEmitDestructuringParameterProperties.js |   4 +-
 ...rationEmitExportAliasVisibiilityMarking.js |   4 +-
 ...pressionWithNonlocalPrivateUniqueSymbol.js |   2 +-
 .../declarationEmitInferredTypeAlias5.js      |   2 +-
 .../declarationEmitInferredTypeAlias7.js      |   2 +-
 .../declarationEmitInferredTypeAlias8.js      |   2 +-
 .../declarationEmitInferredTypeAlias9.js      |   2 +-
 ...ationEmitInlinedDistributiveConditional.js |   4 +-
 ...ationEmitMappedPrivateTypeTypeParameter.js |   2 +-
 ...dTypeDistributivityPreservesConstraints.js |   6 +-
 .../declarationEmitNoNonRequiredParens.js     |   2 +-
 ...eclarationEmitNonExportedBindingPattern.js |   6 +-
 ...larationEmitPrivatePromiseLikeInterface.js |   2 +-
 ...declarationEmitShadowingInferNotRenamed.js |   4 +-
 .../reference/declarationEmitSymlinkPaths.js  |   4 +-
 ...arationEmitTypeAliasWithTypeParameters1.js |   4 +-
 ...arationEmitTypeAliasWithTypeParameters2.js |   6 +-
 ...arationEmitTypeAliasWithTypeParameters3.js |   2 +-
 ...arationEmitTypeAliasWithTypeParameters4.js |   4 +-
 ...arationEmitTypeAliasWithTypeParameters5.js |   4 +-
 ...arationEmitTypeAliasWithTypeParameters6.js |   4 +-
 ...eclarationEmitWithDefaultAsComputedName.js |   2 +-
 ...clarationEmitWithDefaultAsComputedName2.js |   2 +-
 ...clarationsForFileShadowingGlobalNoError.js |   6 +-
 ...clarationsForIndirectTypeAliasReference.js |   2 +-
 ...iveInternalTypesProduceUniqueTypeParams.js |   4 +-
 .../reference/deeplyNestedConditionalTypes.js |   6 +-
 .../reference/deeplyNestedConstraints.js      |   4 +-
 ...ameterAddsUndefinedWithStrictNullChecks.js |   2 +-
 .../reference/deferredLookupTypeResolution.js |  10 +-
 .../deferredLookupTypeResolution2.js          |  20 +-
 .../dependentDestructuredVariables.js         |  24 +-
 .../reference/destructuringInFunctionType.js  |  18 +-
 .../reference/discriminatedUnionJsxElement.js |   2 +-
 .../baselines/reference/dynamicNamesErrors.js |   2 +-
 .../emitClassExpressionInDeclarationFile.js   |   2 +-
 .../es6ImportNamedImportWithTypesAndValues.js |   2 +-
 .../reference/exhaustiveSwitchStatements1.js  |  10 +-
 .../exportClassExtendingIntersection.js       |   2 +-
 .../reference/genericContextualTypes1.js      |   4 +-
 tests/baselines/reference/genericDefaults.js  |  10 +-
 .../reference/genericRestParameters1.js       |  22 +-
 .../reference/genericRestParameters2.js       |  20 +-
 .../reference/genericRestParameters3.js       |   6 +-
 .../reference/identityRelationNeverTypes.js   |   2 +-
 ...importTypeGenericArrowTypeParenthesized.js |   2 +-
 .../reference/indexSignatureAndMappedType.js  |   2 +-
 tests/baselines/reference/indexSignatures1.js |  38 +--
 .../inferFromGenericFunctionReturnTypes3.js   |   2 +-
 tests/baselines/reference/inferTypes2.js      |   2 +-
 .../reference/inferTypesWithExtends1.js       | 128 +++++-----
 .../reference/instantiatedTypeAliasDisplay.js |   2 +-
 .../reference/instantiationExpressions.js     |  38 +--
 .../reference/intraExpressionInferences.js    |   8 +-
 tests/baselines/reference/intrinsicTypes.js   |  60 ++---
 .../isomorphicMappedTypeInference.js          |  10 +-
 .../reference/keyofAndIndexedAccess.js        | 124 +++++-----
 .../baselines/reference/keyofIntersection.js  |  36 +--
 .../leaveOptionalParameterAsWritten.js        |   2 +-
 .../baselines/reference/mapOnTupleTypes02.js  |   2 +-
 .../reference/mappedTypeAsClauses.js          |  94 +++----
 .../reference/mappedTypeConstraints2.js       |  10 +-
 tests/baselines/reference/mappedTypeErrors.js |  28 +--
 .../baselines/reference/mappedTypeErrors2.js  |  18 +-
 .../mappedTypeGenericIndexedAccess.js         |   8 +-
 ...nericInstantiationPreservesHomomorphism.js |   2 +-
 .../reference/mappedTypeProperties.js         |   2 +-
 .../reference/mappedTypeRelationships.js      |  14 +-
 .../baselines/reference/mappedTypeWithAny.js  |  18 +-
 tests/baselines/reference/mappedTypes1.js     |  48 ++--
 tests/baselines/reference/mappedTypes2.js     |   6 +-
 tests/baselines/reference/mappedTypes3.js     |   2 +-
 tests/baselines/reference/mappedTypes4.js     |  42 ++--
 tests/baselines/reference/mappedTypes6.js     |  40 +--
 .../reference/mappedTypesArraysTuples.js      |  78 +++---
 .../reference/mixinAccessModifiers.js         |   2 +-
 .../reference/mixinClassesAnnotated.js        |   2 +-
 .../baselines/reference/namedTupleMembers.js  |  18 +-
 .../reference/namedTupleMembersErrors.js      |  26 +-
 .../reference/neverReturningFunctions1.js     |   2 +-
 .../reference/noExcessiveStackDepthError.js   |   2 +-
 ...TypeModeDeclarationEmit1(module=node16).js |   2 +-
 ...peModeDeclarationEmit1(module=nodenext).js |   2 +-
 ...deDeclarationEmitErrors1(module=node16).js |  12 +-
 ...DeclarationEmitErrors1(module=nodenext).js |  12 +-
 .../reference/numericEnumMappedType.js        |   6 +-
 .../reference/numericStringLiteralTypes.js    |  22 +-
 .../reference/omitTypeTestErrors01.js         |   4 +-
 tests/baselines/reference/omitTypeTests01.js  |   4 +-
 .../reference/optionalTupleElements1.js       |  18 +-
 ...enthesisDoesNotBlockAliasSymbolCreation.js |   8 +-
 .../reference/primitiveUnionDetection.js      |   2 +-
 .../reference/readonlyArraysAndTuples.js      |  20 +-
 .../reference/readonlyArraysAndTuples2.js     |  12 +-
 .../reference/recursiveConditionalTypes.js    |  96 ++++----
 .../reference/recursiveMappedTypes.js         |  14 +-
 .../reference/recursiveTypeReferences1.js     |  40 +--
 ...amingDestructuredPropertyInFunctionType.js |  54 ++--
 .../baselines/reference/restTupleElements1.js |  46 ++--
 .../restTuplesFromContextualTypes.js          |   4 +-
 .../reverseMappedTypeDeepDeclarationEmit.js   |   6 +-
 .../reference/silentNeverPropagation.js       |   6 +-
 .../reference/strictOptionalProperties1.js    |  14 +-
 .../reference/strictOptionalProperties2.js    |   4 +-
 .../stringLiteralTypesAndTuples01.js          |   2 +-
 .../reference/stringLiteralTypesAsTags01.js   |   2 +-
 .../reference/stringLiteralTypesAsTags02.js   |   2 +-
 .../reference/stringLiteralTypesAsTags03.js   |   2 +-
 .../stringLiteralTypesInUnionTypes01.js       |   2 +-
 .../stringLiteralTypesInUnionTypes02.js       |   2 +-
 .../stringLiteralTypesInUnionTypes03.js       |   2 +-
 .../stringLiteralTypesInUnionTypes04.js       |   2 +-
 .../stringLiteralTypesOverloads01.js          |   2 +-
 .../stringLiteralTypesTypePredicates01.js     |   2 +-
 .../symbolLinkDeclarationEmitModuleNames.js   |   4 +-
 ...olLinkDeclarationEmitModuleNamesRootDir.js |   2 +-
 .../reference/taggedPrimitiveNarrowing.js     |   2 +-
 .../tailRecursiveConditionalTypes.js          |  28 +--
 .../reference/templateLiteralTypes1.js        |   4 +-
 .../reference/templateLiteralTypes2.js        |   4 +-
 .../reference/templateLiteralTypes3.js        |  72 +++---
 .../reference/templateLiteralTypes4.js        | 212 ++++++++--------
 .../reference/thisTypeInObjectLiterals2.js    |  18 +-
 ...ugh-triple-slash-but-uses-no-references.js |   8 +-
 ...file-is-referenced-through-triple-slash.js |  16 +-
 ...ng-setup-correctly-and-reports-no-error.js |  16 +-
 ...project-correctly-with-preserveSymlinks.js |   8 +-
 ...-file-from-referenced-project-correctly.js |   8 +-
 ...zed-module-specifiers-resolve-correctly.js |  16 +-
 ...en-one-two-three-are-prepended-in-order.js | 146 +++++------
 .../stripInternal-jsdoc-style-comment.js      |  63 ++---
 ...en-one-two-three-are-prepended-in-order.js |  85 +++----
 ...-jsdoc-style-with-comments-emit-enabled.js |  63 ++---
 ...en-one-two-three-are-prepended-in-order.js | 209 ++++++++--------
 ...en-one-two-three-are-prepended-in-order.js | 146 +++++------
 ...tripInternal-with-comments-emit-enabled.js |  63 ++---
 .../tsbuild/outfile-concat/stripInternal.js   |  63 ++---
 ...iles-belong-to-rootDir-and-is-composite.js |   8 +-
 .../demo/updates-with-circular-reference.js   |  16 +-
 ...for-changes-to-package-json-main-fields.js |  12 +-
 ...t-correctly-with-cts-and-mts-extensions.js |  14 +-
 ...ion-field-with-declaration-emit-enabled.js |  20 +-
 ...e-to-modifier-of-class-expression-field.js |  12 +-
 ...-project-when-solution-is-already-built.js |  14 +-
 .../with-simple-project.js                    |   8 +-
 .../reference/typeAliasDeclarationEmit.js     |   4 +-
 .../reference/typeAliasDeclarationEmit2.js    |   2 +-
 .../reference/unionTypeWithLeadingOperator.js |   2 +-
 .../reference/uniqueSymbolsDeclarations.js    |   2 +-
 .../uniqueSymbolsDeclarationsErrors.js        |   4 +-
 .../baselines/reference/unknownControlFlow.js |  34 +--
 tests/baselines/reference/variadicTuples1.js  | 184 +++++++-------
 tests/baselines/reference/variadicTuples2.js  |  48 ++--
 .../reference/varianceAnnotations.js          |  50 ++--
 ...nnotationsWithCircularlyReferencesError.js |   4 +-
 171 files changed, 1857 insertions(+), 1841 deletions(-)

diff --git a/src/compiler/transformers/declarations.ts b/src/compiler/transformers/declarations.ts
index 30596d5dae8f6..d64c14b2e0b2c 100644
--- a/src/compiler/transformers/declarations.ts
+++ b/src/compiler/transformers/declarations.ts
@@ -1217,14 +1217,18 @@ namespace ts {
 
             const previousNeedsDeclare = needsDeclare;
             switch (input.kind) {
-                case SyntaxKind.TypeAliasDeclaration: // Type aliases get `declare`d if need be (for legacy support), but that's all
-                    return cleanup(factory.updateTypeAliasDeclaration(
+                case SyntaxKind.TypeAliasDeclaration: {
+                    needsDeclare = false;
+                    const clean = cleanup(factory.updateTypeAliasDeclaration(
                         input,
                         ensureModifiers(input),
                         input.name,
                         visitNodes(input.typeParameters, visitDeclarationSubtree, isTypeParameterDeclaration),
                         visitNode(input.type, visitDeclarationSubtree, isTypeNode)
                     ));
+                    needsDeclare = previousNeedsDeclare;
+                    return clean;
+                }
                 case SyntaxKind.InterfaceDeclaration: {
                     return cleanup(factory.updateInterfaceDeclaration(
                         input,
diff --git a/tests/baselines/reference/DeclarationErrorsNoEmitOnError.js b/tests/baselines/reference/DeclarationErrorsNoEmitOnError.js
index 73c312a018b95..ff3ef183f79f9 100644
--- a/tests/baselines/reference/DeclarationErrorsNoEmitOnError.js
+++ b/tests/baselines/reference/DeclarationErrorsNoEmitOnError.js
@@ -10,7 +10,7 @@ exports.__esModule = true;
 
 
 //// [DeclarationErrorsNoEmitOnError.d.ts]
-declare type T = {
+type T = {
     x: number;
 };
 export interface I {
diff --git a/tests/baselines/reference/anonClassDeclarationEmitIsAnon.js b/tests/baselines/reference/anonClassDeclarationEmitIsAnon.js
index 2c7ccdcccb8e0..1f65a28304dea 100644
--- a/tests/baselines/reference/anonClassDeclarationEmitIsAnon.js
+++ b/tests/baselines/reference/anonClassDeclarationEmitIsAnon.js
@@ -122,7 +122,7 @@ export declare function wrapClass(param: any): {
         foo(): any;
     };
 };
-export declare type Constructor<T = {}> = new (...args: any[]) => T;
+export type Constructor<T = {}> = new (...args: any[]) => T;
 export declare function Timestamped<TBase extends Constructor>(Base: TBase): {
     new (...args: any[]): {
         timestamp: number;
diff --git a/tests/baselines/reference/caseInsensitiveFileSystemWithCapsImportTypeDeclarations.js b/tests/baselines/reference/caseInsensitiveFileSystemWithCapsImportTypeDeclarations.js
index 5222e06281722..55752266f168c 100644
--- a/tests/baselines/reference/caseInsensitiveFileSystemWithCapsImportTypeDeclarations.js
+++ b/tests/baselines/reference/caseInsensitiveFileSystemWithCapsImportTypeDeclarations.js
@@ -48,15 +48,15 @@ exports.Broken = Broken;
 
 
 //// [types.d.ts]
-export declare type Merge<T, U> = T & U;
+export type Merge<T, U> = T & U;
 //// [type-a.d.ts]
-export declare type TypeA = {
+export type TypeA = {
     a: string;
 };
 //// [type-b.d.ts]
 import { Merge } from './types';
 import { TypeA } from './type-a';
-export declare type TypeB = Merge<TypeA, {
+export type TypeB = Merge<TypeA, {
     b: string;
 }>;
 //// [index.d.ts]
diff --git a/tests/baselines/reference/circularAccessorAnnotations.js b/tests/baselines/reference/circularAccessorAnnotations.js
index 2cdb41d7fa2d5..c6309a60ecd94 100644
--- a/tests/baselines/reference/circularAccessorAnnotations.js
+++ b/tests/baselines/reference/circularAccessorAnnotations.js
@@ -41,13 +41,13 @@ declare const c3: {
     get foo(): string;
     set foo(value: typeof c3.foo);
 };
-declare type T1 = {
+type T1 = {
     get foo(): T1["foo"];
 };
-declare type T2 = {
+type T2 = {
     set foo(value: T2["foo"]);
 };
-declare type T3 = {
+type T3 = {
     get foo(): string;
     set foo(value: T3["foo"]);
 };
diff --git a/tests/baselines/reference/circularBaseTypes.js b/tests/baselines/reference/circularBaseTypes.js
index 1c5f77c1b2eed..e495dbdab9af7 100644
--- a/tests/baselines/reference/circularBaseTypes.js
+++ b/tests/baselines/reference/circularBaseTypes.js
@@ -20,10 +20,10 @@ function f(m) {
 
 
 //// [circularBaseTypes.d.ts]
-declare type M<T> = {
+type M<T> = {
     value: T;
 };
 interface M2 extends M<M3> {
 }
-declare type M3 = M2[keyof M2];
+type M3 = M2[keyof M2];
 declare function f(m: M3): any;
diff --git a/tests/baselines/reference/circularIndexedAccessErrors.js b/tests/baselines/reference/circularIndexedAccessErrors.js
index 499d5b483e47c..493ab4181f3a6 100644
--- a/tests/baselines/reference/circularIndexedAccessErrors.js
+++ b/tests/baselines/reference/circularIndexedAccessErrors.js
@@ -56,10 +56,10 @@ function foo() {
 
 
 //// [circularIndexedAccessErrors.d.ts]
-declare type T1 = {
+type T1 = {
     x: T1["x"];
 };
-declare type T2<K extends "x" | "y"> = {
+type T2<K extends "x" | "y"> = {
     x: T2<K>[K];
     y: number;
 };
diff --git a/tests/baselines/reference/coAndContraVariantInferences.js b/tests/baselines/reference/coAndContraVariantInferences.js
index e90343a44f290..a437d6de245c3 100644
--- a/tests/baselines/reference/coAndContraVariantInferences.js
+++ b/tests/baselines/reference/coAndContraVariantInferences.js
@@ -50,10 +50,10 @@ call(actionB, printFn);
 
 
 //// [coAndContraVariantInferences.d.ts]
-declare type A = {
+type A = {
     kind: 'a';
 };
-declare type B = {
+type B = {
     kind: 'b';
 };
 declare const a: A;
diff --git a/tests/baselines/reference/conditionalTypes1.js b/tests/baselines/reference/conditionalTypes1.js
index 7ce19ce17e70c..156568ac3d45a 100644
--- a/tests/baselines/reference/conditionalTypes1.js
+++ b/tests/baselines/reference/conditionalTypes1.js
@@ -460,19 +460,19 @@ assign(a, { o: 2, c: { 0: { a: 2, c: '213123' } } });
 
 
 //// [conditionalTypes1.d.ts]
-declare type T00 = Exclude<"a" | "b" | "c" | "d", "a" | "c" | "f">;
-declare type T01 = Extract<"a" | "b" | "c" | "d", "a" | "c" | "f">;
-declare type T02 = Exclude<string | number | (() => void), Function>;
-declare type T03 = Extract<string | number | (() => void), Function>;
-declare type T04 = NonNullable<string | number | undefined>;
-declare type T05 = NonNullable<(() => string) | string[] | null | undefined>;
+type T00 = Exclude<"a" | "b" | "c" | "d", "a" | "c" | "f">;
+type T01 = Extract<"a" | "b" | "c" | "d", "a" | "c" | "f">;
+type T02 = Exclude<string | number | (() => void), Function>;
+type T03 = Extract<string | number | (() => void), Function>;
+type T04 = NonNullable<string | number | undefined>;
+type T05 = NonNullable<(() => string) | string[] | null | undefined>;
 declare function f1<T>(x: T, y: NonNullable<T>): void;
 declare function f2<T extends string | undefined>(x: T, y: NonNullable<T>): void;
 declare function f3<T>(x: Partial<T>[keyof T], y: NonNullable<Partial<T>[keyof T]>): void;
 declare function f4<T extends {
     x: string | undefined;
 }>(x: T["x"], y: NonNullable<T["x"]>): void;
-declare type Options = {
+type Options = {
     k: "a";
     a: number;
 } | {
@@ -482,26 +482,26 @@ declare type Options = {
     k: "c";
     c: boolean;
 };
-declare type T10 = Exclude<Options, {
+type T10 = Exclude<Options, {
     k: "a" | "b";
 }>;
-declare type T11 = Extract<Options, {
+type T11 = Extract<Options, {
     k: "a" | "b";
 }>;
-declare type T12 = Exclude<Options, {
+type T12 = Exclude<Options, {
     k: "a";
 } | {
     k: "b";
 }>;
-declare type T13 = Extract<Options, {
+type T13 = Extract<Options, {
     k: "a";
 } | {
     k: "b";
 }>;
-declare type T14 = Exclude<Options, {
+type T14 = Exclude<Options, {
     q: "a";
 }>;
-declare type T15 = Extract<Options, {
+type T15 = Extract<Options, {
     q: "a";
 }>;
 declare function f5<T extends Options, K extends string>(p: K): Extract<T, {
@@ -511,27 +511,27 @@ declare let x0: {
     k: "a";
     a: number;
 };
-declare type OptionsOfKind<K extends Options["k"]> = Extract<Options, {
+type OptionsOfKind<K extends Options["k"]> = Extract<Options, {
     k: K;
 }>;
-declare type T16 = OptionsOfKind<"a" | "b">;
-declare type Select<T, K extends keyof T, V extends T[K]> = Extract<T, {
+type T16 = OptionsOfKind<"a" | "b">;
+type Select<T, K extends keyof T, V extends T[K]> = Extract<T, {
     [P in K]: V;
 }>;
-declare type T17 = Select<Options, "k", "a" | "b">;
-declare type TypeName<T> = T extends string ? "string" : T extends number ? "number" : T extends boolean ? "boolean" : T extends undefined ? "undefined" : T extends Function ? "function" : "object";
-declare type T20 = TypeName<string | (() => void)>;
-declare type T21 = TypeName<any>;
-declare type T22 = TypeName<never>;
-declare type T23 = TypeName<{}>;
-declare type KnockoutObservable<T> = {
+type T17 = Select<Options, "k", "a" | "b">;
+type TypeName<T> = T extends string ? "string" : T extends number ? "number" : T extends boolean ? "boolean" : T extends undefined ? "undefined" : T extends Function ? "function" : "object";
+type T20 = TypeName<string | (() => void)>;
+type T21 = TypeName<any>;
+type T22 = TypeName<never>;
+type T23 = TypeName<{}>;
+type KnockoutObservable<T> = {
     object: T;
 };
-declare type KnockoutObservableArray<T> = {
+type KnockoutObservableArray<T> = {
     array: T;
 };
-declare type KnockedOut<T> = T extends any[] ? KnockoutObservableArray<T[number]> : KnockoutObservable<T>;
-declare type KnockedOutObj<T> = {
+type KnockedOut<T> = T extends any[] ? KnockoutObservableArray<T[number]> : KnockoutObservable<T>;
+type KnockedOutObj<T> = {
     [P in keyof T]: KnockedOut<T[P]>;
 };
 interface Item {
@@ -539,139 +539,139 @@ interface Item {
     name: string;
     subitems: string[];
 }
-declare type KOItem = KnockedOutObj<Item>;
+type KOItem = KnockedOutObj<Item>;
 interface Part {
     id: number;
     name: string;
     subparts: Part[];
     updatePart(newName: string): void;
 }
-declare type FunctionPropertyNames<T> = {
+type FunctionPropertyNames<T> = {
     [K in keyof T]: T[K] extends Function ? K : never;
 }[keyof T];
-declare type FunctionProperties<T> = Pick<T, FunctionPropertyNames<T>>;
-declare type NonFunctionPropertyNames<T> = {
+type FunctionProperties<T> = Pick<T, FunctionPropertyNames<T>>;
+type NonFunctionPropertyNames<T> = {
     [K in keyof T]: T[K] extends Function ? never : K;
 }[keyof T];
-declare type NonFunctionProperties<T> = Pick<T, NonFunctionPropertyNames<T>>;
-declare type T30 = FunctionProperties<Part>;
-declare type T31 = NonFunctionProperties<Part>;
+type NonFunctionProperties<T> = Pick<T, NonFunctionPropertyNames<T>>;
+type T30 = FunctionProperties<Part>;
+type T31 = NonFunctionProperties<Part>;
 declare function f7<T>(x: T, y: FunctionProperties<T>, z: NonFunctionProperties<T>): void;
 declare function f8<T>(x: keyof T, y: FunctionPropertyNames<T>, z: NonFunctionPropertyNames<T>): void;
-declare type DeepReadonly<T> = T extends any[] ? DeepReadonlyArray<T[number]> : T extends object ? DeepReadonlyObject<T> : T;
+type DeepReadonly<T> = T extends any[] ? DeepReadonlyArray<T[number]> : T extends object ? DeepReadonlyObject<T> : T;
 interface DeepReadonlyArray<T> extends ReadonlyArray<DeepReadonly<T>> {
 }
-declare type DeepReadonlyObject<T> = {
+type DeepReadonlyObject<T> = {
     readonly [P in NonFunctionPropertyNames<T>]: DeepReadonly<T[P]>;
 };
 declare function f10(part: DeepReadonly<Part>): void;
-declare type ZeroOf<T extends number | string | boolean> = T extends number ? 0 : T extends string ? "" : false;
+type ZeroOf<T extends number | string | boolean> = T extends number ? 0 : T extends string ? "" : false;
 declare function zeroOf<T extends number | string | boolean>(value: T): ZeroOf<T>;
 declare function f20<T extends string>(n: number, b: boolean, x: number | boolean, y: T): void;
 declare function f21<T extends number | string>(x: T, y: ZeroOf<T>): void;
-declare type T35<T extends {
+type T35<T extends {
     a: string;
     b: number;
 }> = T[];
-declare type T36<T> = T extends {
+type T36<T> = T extends {
     a: string;
 } ? T extends {
     b: number;
 } ? T35<T> : never : never;
-declare type T37<T> = T extends {
+type T37<T> = T extends {
     b: number;
 } ? T extends {
     a: string;
 } ? T35<T> : never : never;
-declare type T38<T> = [T] extends [{
+type T38<T> = [T] extends [{
     a: string;
 }] ? [T] extends [{
     b: number;
 }] ? T35<T> : never : never;
-declare type Extends<T, U> = T extends U ? true : false;
-declare type If<C extends boolean, T, F> = C extends true ? T : F;
-declare type Not<C extends boolean> = If<C, false, true>;
-declare type And<A extends boolean, B extends boolean> = If<A, B, false>;
-declare type Or<A extends boolean, B extends boolean> = If<A, true, B>;
-declare type IsString<T> = Extends<T, string>;
-declare type Q1 = IsString<number>;
-declare type Q2 = IsString<"abc">;
-declare type Q3 = IsString<any>;
-declare type Q4 = IsString<never>;
-declare type N1 = Not<false>;
-declare type N2 = Not<true>;
-declare type N3 = Not<boolean>;
-declare type A1 = And<false, false>;
-declare type A2 = And<false, true>;
-declare type A3 = And<true, false>;
-declare type A4 = And<true, true>;
-declare type A5 = And<boolean, false>;
-declare type A6 = And<false, boolean>;
-declare type A7 = And<boolean, true>;
-declare type A8 = And<true, boolean>;
-declare type A9 = And<boolean, boolean>;
-declare type O1 = Or<false, false>;
-declare type O2 = Or<false, true>;
-declare type O3 = Or<true, false>;
-declare type O4 = Or<true, true>;
-declare type O5 = Or<boolean, false>;
-declare type O6 = Or<false, boolean>;
-declare type O7 = Or<boolean, true>;
-declare type O8 = Or<true, boolean>;
-declare type O9 = Or<boolean, boolean>;
-declare type T40 = never extends never ? true : false;
-declare type T41 = number extends never ? true : false;
-declare type T42 = never extends number ? true : false;
-declare type IsNever<T> = [T] extends [never] ? true : false;
-declare type T50 = IsNever<never>;
-declare type T51 = IsNever<number>;
-declare type T52 = IsNever<any>;
+type Extends<T, U> = T extends U ? true : false;
+type If<C extends boolean, T, F> = C extends true ? T : F;
+type Not<C extends boolean> = If<C, false, true>;
+type And<A extends boolean, B extends boolean> = If<A, B, false>;
+type Or<A extends boolean, B extends boolean> = If<A, true, B>;
+type IsString<T> = Extends<T, string>;
+type Q1 = IsString<number>;
+type Q2 = IsString<"abc">;
+type Q3 = IsString<any>;
+type Q4 = IsString<never>;
+type N1 = Not<false>;
+type N2 = Not<true>;
+type N3 = Not<boolean>;
+type A1 = And<false, false>;
+type A2 = And<false, true>;
+type A3 = And<true, false>;
+type A4 = And<true, true>;
+type A5 = And<boolean, false>;
+type A6 = And<false, boolean>;
+type A7 = And<boolean, true>;
+type A8 = And<true, boolean>;
+type A9 = And<boolean, boolean>;
+type O1 = Or<false, false>;
+type O2 = Or<false, true>;
+type O3 = Or<true, false>;
+type O4 = Or<true, true>;
+type O5 = Or<boolean, false>;
+type O6 = Or<false, boolean>;
+type O7 = Or<boolean, true>;
+type O8 = Or<true, boolean>;
+type O9 = Or<boolean, boolean>;
+type T40 = never extends never ? true : false;
+type T41 = number extends never ? true : false;
+type T42 = never extends number ? true : false;
+type IsNever<T> = [T] extends [never] ? true : false;
+type T50 = IsNever<never>;
+type T51 = IsNever<number>;
+type T52 = IsNever<any>;
 declare function f22<T>(x: T extends (infer U)[] ? U[] : never): void;
 declare function f23<T extends string[]>(x: T extends (infer U)[] ? U[] : never): void;
-declare type Eq<T, U> = T extends U ? U extends T ? true : false : false;
-declare type T60 = Eq<true, true>;
-declare type T61 = Eq<true, false>;
-declare type T62 = Eq<false, true>;
-declare type T63 = Eq<false, false>;
-declare type Eq1<T, U> = Eq<T, U> extends false ? false : true;
-declare type T70 = Eq1<true, true>;
-declare type T71 = Eq1<true, false>;
-declare type T72 = Eq1<false, true>;
-declare type T73 = Eq1<false, false>;
-declare type Eq2<T, U> = Eq<T, U> extends true ? true : false;
-declare type T80 = Eq2<true, true>;
-declare type T81 = Eq2<true, false>;
-declare type T82 = Eq2<false, true>;
-declare type T83 = Eq2<false, false>;
-declare type Foo<T> = T extends string ? boolean : number;
-declare type Bar<T> = T extends string ? boolean : number;
+type Eq<T, U> = T extends U ? U extends T ? true : false : false;
+type T60 = Eq<true, true>;
+type T61 = Eq<true, false>;
+type T62 = Eq<false, true>;
+type T63 = Eq<false, false>;
+type Eq1<T, U> = Eq<T, U> extends false ? false : true;
+type T70 = Eq1<true, true>;
+type T71 = Eq1<true, false>;
+type T72 = Eq1<false, true>;
+type T73 = Eq1<false, false>;
+type Eq2<T, U> = Eq<T, U> extends true ? true : false;
+type T80 = Eq2<true, true>;
+type T81 = Eq2<true, false>;
+type T82 = Eq2<false, true>;
+type T83 = Eq2<false, false>;
+type Foo<T> = T extends string ? boolean : number;
+type Bar<T> = T extends string ? boolean : number;
 declare const convert: <U>(value: Foo<U>) => Bar<U>;
-declare type Baz<T> = Foo<T>;
+type Baz<T> = Foo<T>;
 declare const convert2: <T>(value: Foo<T>) => Foo<T>;
 declare function f31<T>(): void;
 declare function f32<T, U>(): void;
 declare function f33<T, U>(): void;
-declare type T90<T> = T extends 0 ? 0 : () => 0;
-declare type T91<T> = T extends 0 ? 0 : () => 0;
+type T90<T> = T extends 0 ? 0 : () => 0;
+type T91<T> = T extends 0 ? 0 : () => 0;
 declare const f40: <U>(a: T90<U>) => T91<U>;
 declare const f41: <U>(a: T91<U>) => T90<U>;
-declare type T92<T> = T extends () => 0 ? () => 1 : () => 2;
-declare type T93<T> = T extends () => 0 ? () => 1 : () => 2;
+type T92<T> = T extends () => 0 ? () => 1 : () => 2;
+type T93<T> = T extends () => 0 ? () => 1 : () => 2;
 declare const f42: <U>(a: T92<U>) => T93<U>;
 declare const f43: <U>(a: T93<U>) => T92<U>;
-declare type T94<T> = T extends string ? true : 42;
-declare type T95<T> = T extends string ? boolean : number;
+type T94<T> = T extends string ? true : 42;
+type T95<T> = T extends string ? boolean : number;
 declare const f44: <U>(value: T94<U>) => T95<U>;
 declare const f45: <U>(value: T95<U>) => T94<U>;
 declare function f50(): void;
-declare type OldDiff<T extends keyof any, U extends keyof any> = ({
+type OldDiff<T extends keyof any, U extends keyof any> = ({
     [P in T]: P;
 } & {
     [P in U]: never;
 } & {
     [x: string]: never;
 })[T];
-declare type NewDiff<T, U> = T extends U ? never : T;
+type NewDiff<T, U> = T extends U ? never : T;
 interface A {
     a: 'a';
 }
@@ -683,16 +683,16 @@ interface B2 extends A {
     b: 'b';
     c: NewDiff<keyof this, keyof A>;
 }
-declare type c1 = B1['c'];
-declare type c2 = B2['c'];
-declare type NonFooKeys1<T extends object> = OldDiff<keyof T, 'foo'>;
-declare type NonFooKeys2<T extends object> = Exclude<keyof T, 'foo'>;
-declare type Test1 = NonFooKeys1<{
+type c1 = B1['c'];
+type c2 = B2['c'];
+type NonFooKeys1<T extends object> = OldDiff<keyof T, 'foo'>;
+type NonFooKeys2<T extends object> = Exclude<keyof T, 'foo'>;
+type Test1 = NonFooKeys1<{
     foo: 1;
     bar: 2;
     baz: 3;
 }>;
-declare type Test2 = NonFooKeys2<{
+type Test2 = NonFooKeys2<{
     foo: 1;
     bar: 2;
     baz: 3;
@@ -703,13 +703,13 @@ interface Foo2 {
 interface Bar2 {
     bar: string;
 }
-declare type FooBar = Foo2 | Bar2;
+type FooBar = Foo2 | Bar2;
 declare interface ExtractFooBar<FB extends FooBar> {
 }
-declare type Extracted<Struct> = {
+type Extracted<Struct> = {
     [K in keyof Struct]: Struct[K] extends FooBar ? ExtractFooBar<Struct[K]> : Struct[K];
 };
-declare type RecursivePartial<T> = {
+type RecursivePartial<T> = {
     [P in keyof T]?: T[P] extends Array<any> ? {
         [index: number]: RecursivePartial<T[P][0]>;
     } : T[P] extends object ? RecursivePartial<T[P]> : T[P];
@@ -723,5 +723,5 @@ declare var a: {
         c: string;
     }[];
 };
-declare type Weird1 = (<U extends boolean>(a: U) => never) extends (<U extends true>(a: U) => never) ? never : never;
-declare type Weird2 = (<U extends boolean>(a: U) => U) extends (<U extends true>(a: U) => infer T) ? T : never;
+type Weird1 = (<U extends boolean>(a: U) => never) extends (<U extends true>(a: U) => never) ? never : never;
+type Weird2 = (<U extends boolean>(a: U) => U) extends (<U extends true>(a: U) => infer T) ? T : never;
diff --git a/tests/baselines/reference/conditionalTypes2.js b/tests/baselines/reference/conditionalTypes2.js
index f775bf0564b03..beeb2958e428a 100644
--- a/tests/baselines/reference/conditionalTypes2.js
+++ b/tests/baselines/reference/conditionalTypes2.js
@@ -343,10 +343,10 @@ declare function getFunction<T>(item: T): Extract<T, Function>;
 declare function f10<T>(x: T): void;
 declare function f11(x: string | (() => string) | undefined): void;
 declare function f12(x: string | (() => string) | undefined): void;
-declare type Foo = {
+type Foo = {
     foo: string;
 };
-declare type Bar = {
+type Bar = {
     bar: string;
 };
 declare function fooBar(x: {
@@ -357,7 +357,7 @@ declare function fooBat(x: {
     foo: string;
     bat: string;
 }): void;
-declare type Extract2<T, U, V> = T extends U ? T extends V ? T : never : never;
+type Extract2<T, U, V> = T extends U ? T extends V ? T : never : never;
 declare function f20<T>(x: Extract<Extract<T, Foo>, Bar>, y: Extract<T, Foo & Bar>, z: Extract2<T, Foo, Bar>): void;
 declare function f21<T>(x: Extract<Extract<T, Foo>, Bar>, y: Extract<T, Foo & Bar>, z: Extract2<T, Foo, Bar>): void;
 declare class Opt<T> {
@@ -381,79 +381,79 @@ interface B1<T> extends A1<T> {
 declare function toString1(value: object | Function): string;
 declare function toString2(value: Function): string;
 declare function foo<T>(value: T): void;
-declare type A<T, V, E> = T extends object ? {
+type A<T, V, E> = T extends object ? {
     [Q in {
         [P in keyof T]: T[P] extends V ? P : P;
     }[keyof T]]: A<T[Q], V, E>;
 } : T extends V ? T : never;
-declare type B<T, V> = T extends object ? {
+type B<T, V> = T extends object ? {
     [Q in {
         [P in keyof T]: T[P] extends V ? P : P;
     }[keyof T]]: B<T[Q], V>;
 } : T extends V ? T : never;
-declare type C<T, V, E> = {
+type C<T, V, E> = {
     [Q in {
         [P in keyof T]: T[P] extends V ? P : P;
     }[keyof T]]: C<T[Q], V, E>;
 };
-declare type A2<T, V, E> = T extends object ? T extends any[] ? T : {
+type A2<T, V, E> = T extends object ? T extends any[] ? T : {
     [Q in keyof T]: A2<T[Q], V, E>;
 } : T;
-declare type B2<T, V> = T extends object ? T extends any[] ? T : {
+type B2<T, V> = T extends object ? T extends any[] ? T : {
     [Q in keyof T]: B2<T[Q], V>;
 } : T;
-declare type C2<T, V, E> = T extends object ? {
+type C2<T, V, E> = T extends object ? {
     [Q in keyof T]: C2<T[Q], V, E>;
 } : T;
-declare type MaybeTrue<T extends {
+type MaybeTrue<T extends {
     b: boolean;
 }> = true extends T["b"] ? "yes" : "no";
-declare type T0 = MaybeTrue<{
+type T0 = MaybeTrue<{
     b: never;
 }>;
-declare type T1 = MaybeTrue<{
+type T1 = MaybeTrue<{
     b: false;
 }>;
-declare type T2 = MaybeTrue<{
+type T2 = MaybeTrue<{
     b: true;
 }>;
-declare type T3 = MaybeTrue<{
+type T3 = MaybeTrue<{
     b: boolean;
 }>;
-declare type Union = 'a' | 'b';
-declare type Product<A extends Union, B> = {
+type Union = 'a' | 'b';
+type Product<A extends Union, B> = {
     f1: A;
     f2: B;
 };
-declare type ProductUnion = Product<'a', 0> | Product<'b', 1>;
-declare type UnionComplement = {
+type ProductUnion = Product<'a', 0> | Product<'b', 1>;
+type UnionComplement = {
     [K in Union]: Exclude<Union, K>;
 };
-declare type UCA = UnionComplement['a'];
-declare type UCB = UnionComplement['b'];
-declare type UnionComplementComplement = {
+type UCA = UnionComplement['a'];
+type UCB = UnionComplement['b'];
+type UnionComplementComplement = {
     [K in Union]: Exclude<Union, Exclude<Union, K>>;
 };
-declare type UCCA = UnionComplementComplement['a'];
-declare type UCCB = UnionComplementComplement['b'];
-declare type ProductComplement = {
+type UCCA = UnionComplementComplement['a'];
+type UCCB = UnionComplementComplement['b'];
+type ProductComplement = {
     [K in Union]: Exclude<ProductUnion, {
         f1: K;
     }>;
 };
-declare type PCA = ProductComplement['a'];
-declare type PCB = ProductComplement['b'];
-declare type ProductComplementComplement = {
+type PCA = ProductComplement['a'];
+type PCB = ProductComplement['b'];
+type ProductComplementComplement = {
     [K in Union]: Exclude<ProductUnion, Exclude<ProductUnion, {
         f1: K;
     }>>;
 };
-declare type PCCA = ProductComplementComplement['a'];
-declare type PCCB = ProductComplementComplement['b'];
-declare type Hmm<T, U extends T> = U extends T ? {
+type PCCA = ProductComplementComplement['a'];
+type PCCB = ProductComplementComplement['b'];
+type Hmm<T, U extends T> = U extends T ? {
     [K in keyof U]: number;
 } : never;
-declare type What = Hmm<{}, {
+type What = Hmm<{}, {
     a: string;
 }>;
 declare const w: What;
@@ -462,7 +462,7 @@ declare function exportCommand<TResponse>(functionToCall: IExportCallback<TRespo
 interface IExportCallback<TResponse> {
     (response: IRootResponse<TResponse>): void;
 }
-declare type IRootResponse<TResponse> = TResponse extends IRecord ? IRecordResponse<TResponse> : IResponse<TResponse>;
+type IRootResponse<TResponse> = TResponse extends IRecord ? IRecordResponse<TResponse> : IResponse<TResponse>;
 interface IRecord {
     readonly Id: string;
 }
@@ -478,12 +478,12 @@ declare type GetPropertyNamesOfType<T, RestrictToType> = {
 declare type GetAllPropertiesOfType<T, RestrictToType> = Pick<T, GetPropertyNamesOfType<Required<T>, RestrictToType>>;
 declare function ff(x: Foo3<string>): void;
 declare function gg<T>(f: (x: Foo3<T>) => void): void;
-declare type Foo3<T> = T extends number ? {
+type Foo3<T> = T extends number ? {
     n: T;
 } : {
     x: T;
 };
-declare type Wat<K extends string> = {
+type Wat<K extends string> = {
     x: {
         y: 0;
         z: 1;
@@ -493,4 +493,4 @@ declare type Wat<K extends string> = {
         [P in K]: 0;
     };
 } ? true : false;
-declare type Huh = Wat<"y">;
+type Huh = Wat<"y">;
diff --git a/tests/baselines/reference/constAssertions.js b/tests/baselines/reference/constAssertions.js
index 5e3b2b8b1875d..6b6fc108b0483 100644
--- a/tests/baselines/reference/constAssertions.js
+++ b/tests/baselines/reference/constAssertions.js
@@ -304,9 +304,9 @@ declare const ts1: "foo-bar";
 declare const ts2: "foo-1" | "foo-0";
 declare const ts3: "top-left" | "top-right" | "bottom-left" | "bottom-right";
 declare function ff3(x: 'foo' | 'bar', y: object): `foo${string}` | `bar${string}`;
-declare type Action = "verify" | "write";
-declare type ContentMatch = "match" | "nonMatch";
-declare type Outcome = `${Action}_${ContentMatch}`;
+type Action = "verify" | "write";
+type ContentMatch = "match" | "nonMatch";
+type Outcome = `${Action}_${ContentMatch}`;
 declare function ff4(verify: boolean, contentMatches: boolean): "verify_match" | "verify_nonMatch" | "write_match" | "write_nonMatch";
 declare function ff5(verify: boolean, contentMatches: boolean): "verify_match" | "verify_nonMatch" | "write_match" | "write_nonMatch";
 declare function accessorNames<S extends string>(propName: S): readonly [`get-${S}`, `set-${S}`];
diff --git a/tests/baselines/reference/contextuallyTypedBooleanLiterals.js b/tests/baselines/reference/contextuallyTypedBooleanLiterals.js
index 702a92440ad83..3dfbe4db42959 100644
--- a/tests/baselines/reference/contextuallyTypedBooleanLiterals.js
+++ b/tests/baselines/reference/contextuallyTypedBooleanLiterals.js
@@ -38,7 +38,7 @@ var x = observable(false);
 
 
 //// [contextuallyTypedBooleanLiterals.d.ts]
-declare type Box<T> = {
+type Box<T> = {
     get: () => T;
     set: (value: T) => void;
 };
diff --git a/tests/baselines/reference/contextuallyTypedSymbolNamedProperties.js b/tests/baselines/reference/contextuallyTypedSymbolNamedProperties.js
index fc949d87312ab..e12ec40edfc5b 100644
--- a/tests/baselines/reference/contextuallyTypedSymbolNamedProperties.js
+++ b/tests/baselines/reference/contextuallyTypedSymbolNamedProperties.js
@@ -35,7 +35,7 @@ const x = { [A]: s => s.length };
 //// [contextuallyTypedSymbolNamedProperties.d.ts]
 declare const A: unique symbol;
 declare const B: unique symbol;
-declare type Action = {
+type Action = {
     type: typeof A;
     data: string;
 } | {
diff --git a/tests/baselines/reference/controlFlowAliasing.js b/tests/baselines/reference/controlFlowAliasing.js
index 96d965a2d2bea..98d4238286237 100644
--- a/tests/baselines/reference/controlFlowAliasing.js
+++ b/tests/baselines/reference/controlFlowAliasing.js
@@ -664,7 +664,7 @@ declare function f40(obj: {
     kind: 'bar';
     bar?: number;
 }): void;
-declare type Data = {
+type Data = {
     kind: 'str';
     payload: string;
 } | {
diff --git a/tests/baselines/reference/correlatedUnions.js b/tests/baselines/reference/correlatedUnions.js
index 0d6698588d31c..53dae6d8ab2d0 100644
--- a/tests/baselines/reference/correlatedUnions.js
+++ b/tests/baselines/reference/correlatedUnions.js
@@ -358,12 +358,12 @@ var BAR_LOOKUP = makeCompleteLookupMapping(ALL_BARS, 'name');
 
 
 //// [correlatedUnions.d.ts]
-declare type RecordMap = {
+type RecordMap = {
     n: number;
     s: string;
     b: boolean;
 };
-declare type UnionRecord<K extends keyof RecordMap = keyof RecordMap> = {
+type UnionRecord<K extends keyof RecordMap = keyof RecordMap> = {
     [P in K]: {
         kind: P;
         v: RecordMap[P];
@@ -373,39 +373,39 @@ declare type UnionRecord<K extends keyof RecordMap = keyof RecordMap> = {
 declare function processRecord<K extends keyof RecordMap>(rec: UnionRecord<K>): void;
 declare const r1: UnionRecord<'n'>;
 declare const r2: UnionRecord;
-declare type TextFieldData = {
+type TextFieldData = {
     value: string;
 };
-declare type SelectFieldData = {
+type SelectFieldData = {
     options: string[];
     selectedValue: string;
 };
-declare type FieldMap = {
+type FieldMap = {
     text: TextFieldData;
     select: SelectFieldData;
 };
-declare type FormField<K extends keyof FieldMap> = {
+type FormField<K extends keyof FieldMap> = {
     type: K;
     data: FieldMap[K];
 };
-declare type RenderFunc<K extends keyof FieldMap> = (props: FieldMap[K]) => void;
-declare type RenderFuncMap = {
+type RenderFunc<K extends keyof FieldMap> = (props: FieldMap[K]) => void;
+type RenderFuncMap = {
     [K in keyof FieldMap]: RenderFunc<K>;
 };
 declare function renderTextField(props: TextFieldData): void;
 declare function renderSelectField(props: SelectFieldData): void;
 declare const renderFuncs: RenderFuncMap;
 declare function renderField<K extends keyof FieldMap>(field: FormField<K>): void;
-declare type TypeMap = {
+type TypeMap = {
     foo: string;
     bar: number;
 };
-declare type Keys = keyof TypeMap;
-declare type HandlerMap = {
+type Keys = keyof TypeMap;
+type HandlerMap = {
     [P in Keys]: (x: TypeMap[P]) => void;
 };
 declare const handlers: HandlerMap;
-declare type DataEntry<K extends Keys = Keys> = {
+type DataEntry<K extends Keys = Keys> = {
     [P in K]: {
         type: P;
         data: TypeMap[P];
@@ -413,25 +413,25 @@ declare type DataEntry<K extends Keys = Keys> = {
 }[K];
 declare const data: DataEntry[];
 declare function process<K extends Keys>(data: DataEntry<K>[]): void;
-declare type LetterMap = {
+type LetterMap = {
     A: string;
     B: number;
 };
-declare type LetterCaller<K extends keyof LetterMap> = {
+type LetterCaller<K extends keyof LetterMap> = {
     [P in K]: {
         letter: Record<P, LetterMap[P]>;
         caller: (x: Record<P, LetterMap[P]>) => void;
     };
 }[K];
 declare function call<K extends keyof LetterMap>({ letter, caller }: LetterCaller<K>): void;
-declare type A = {
+type A = {
     A: string;
 };
-declare type B = {
+type B = {
     B: number;
 };
-declare type ACaller = (a: A) => void;
-declare type BCaller = (b: B) => void;
+type ACaller = (a: A) => void;
+type BCaller = (b: B) => void;
 declare const xx: {
     letter: A;
     caller: ACaller;
@@ -439,7 +439,7 @@ declare const xx: {
     letter: B;
     caller: BCaller;
 };
-declare type Ev<K extends keyof DocumentEventMap> = {
+type Ev<K extends keyof DocumentEventMap> = {
     [P in K]: {
         readonly name: P;
         readonly once?: boolean;
@@ -459,12 +459,12 @@ declare const scrollEvent: {
     readonly callback: (ev: Event) => void;
 };
 declare function ff1(): void;
-declare type ArgMap = {
+type ArgMap = {
     a: number;
     b: string;
 };
-declare type Func<K extends keyof ArgMap> = (x: ArgMap[K]) => void;
-declare type Funcs = {
+type Func<K extends keyof ArgMap> = (x: ArgMap[K]) => void;
+type Funcs = {
     [K in keyof ArgMap]: Func<K>;
 };
 declare function f1<K extends keyof ArgMap>(funcs: Funcs, key: K, arg: ArgMap[K]): void;
@@ -502,7 +502,7 @@ declare const BAR_LOOKUP: {
         readonly name: "b";
     };
 };
-declare type BarLookup = typeof BAR_LOOKUP;
-declare type Baz = {
+type BarLookup = typeof BAR_LOOKUP;
+type Baz = {
     [K in keyof BarLookup]: BarLookup[K]['name'];
 };
diff --git a/tests/baselines/reference/declarationEmitClassMixinLocalClassDeclaration.js b/tests/baselines/reference/declarationEmitClassMixinLocalClassDeclaration.js
index 995985e1992a5..5a51cb5a9a4ff 100644
--- a/tests/baselines/reference/declarationEmitClassMixinLocalClassDeclaration.js
+++ b/tests/baselines/reference/declarationEmitClassMixinLocalClassDeclaration.js
@@ -72,9 +72,9 @@ exports.XmlElement2 = XmlElement2;
 
 
 //// [declarationEmitClassMixinLocalClassDeclaration.d.ts]
-export declare type AnyFunction<Result = any> = (...input: any[]) => Result;
-export declare type AnyConstructor<Instance extends object = object, Static extends object = object> = (new (...input: any[]) => Instance) & Static;
-declare type MixinHelperFunc = <A extends AnyConstructor, T>(required: [A], arg: T) => T extends AnyFunction<infer M> ? M : never;
+export type AnyFunction<Result = any> = (...input: any[]) => Result;
+export type AnyConstructor<Instance extends object = object, Static extends object = object> = (new (...input: any[]) => Instance) & Static;
+type MixinHelperFunc = <A extends AnyConstructor, T>(required: [A], arg: T) => T extends AnyFunction<infer M> ? M : never;
 export declare const Mixin: MixinHelperFunc;
 export declare class Base {
 }
diff --git a/tests/baselines/reference/declarationEmitDestructuringParameterProperties.js b/tests/baselines/reference/declarationEmitDestructuringParameterProperties.js
index 8f5650a296bc7..9678ca93cbe50 100644
--- a/tests/baselines/reference/declarationEmitDestructuringParameterProperties.js
+++ b/tests/baselines/reference/declarationEmitDestructuringParameterProperties.js
@@ -44,14 +44,14 @@ declare class C1 {
     z: string;
     constructor([x, y, z]: string[]);
 }
-declare type TupleType1 = [string, number, boolean];
+type TupleType1 = [string, number, boolean];
 declare class C2 {
     x: string;
     y: number;
     z: boolean;
     constructor([x, y, z]: TupleType1);
 }
-declare type ObjType1 = {
+type ObjType1 = {
     x: number;
     y: string;
     z: boolean;
diff --git a/tests/baselines/reference/declarationEmitExportAliasVisibiilityMarking.js b/tests/baselines/reference/declarationEmitExportAliasVisibiilityMarking.js
index 4f554c808cf66..1c9a4212abc8b 100644
--- a/tests/baselines/reference/declarationEmitExportAliasVisibiilityMarking.js
+++ b/tests/baselines/reference/declarationEmitExportAliasVisibiilityMarking.js
@@ -30,8 +30,8 @@ exports.lazyCard = lazyCard;
 
 
 //// [Types.d.ts]
-declare type Suit = 'Hearts' | 'Spades' | 'Clubs' | 'Diamonds';
-declare type Rank = 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 'Jack' | 'Queen' | 'King';
+type Suit = 'Hearts' | 'Spades' | 'Clubs' | 'Diamonds';
+type Rank = 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 'Jack' | 'Queen' | 'King';
 export { Suit, Rank };
 //// [Card.d.ts]
 import { Suit, Rank } from './Types';
diff --git a/tests/baselines/reference/declarationEmitExpressionWithNonlocalPrivateUniqueSymbol.js b/tests/baselines/reference/declarationEmitExpressionWithNonlocalPrivateUniqueSymbol.js
index b6cf51808c8cb..85dbd8939b06e 100644
--- a/tests/baselines/reference/declarationEmitExpressionWithNonlocalPrivateUniqueSymbol.js
+++ b/tests/baselines/reference/declarationEmitExpressionWithNonlocalPrivateUniqueSymbol.js
@@ -21,7 +21,7 @@ exports.A1 = a_1.A;
 
 
 //// [a.d.ts]
-declare type AX = {
+type AX = {
     readonly A: unique symbol;
 };
 export declare const A: AX;
diff --git a/tests/baselines/reference/declarationEmitInferredTypeAlias5.js b/tests/baselines/reference/declarationEmitInferredTypeAlias5.js
index 835b0e9572684..e3ea15d889e40 100644
--- a/tests/baselines/reference/declarationEmitInferredTypeAlias5.js
+++ b/tests/baselines/reference/declarationEmitInferredTypeAlias5.js
@@ -24,7 +24,7 @@ exports.v = v;
 
 
 //// [0.d.ts]
-export declare type Data = string | boolean;
+export type Data = string | boolean;
 //// [1.d.ts]
 declare let v: string | boolean;
 export { v };
diff --git a/tests/baselines/reference/declarationEmitInferredTypeAlias7.js b/tests/baselines/reference/declarationEmitInferredTypeAlias7.js
index 2eb3756bab8ef..fb6aa06d14b16 100644
--- a/tests/baselines/reference/declarationEmitInferredTypeAlias7.js
+++ b/tests/baselines/reference/declarationEmitInferredTypeAlias7.js
@@ -21,7 +21,7 @@ exports.v = v;
 
 
 //// [0.d.ts]
-export declare type Data = string | boolean;
+export type Data = string | boolean;
 //// [1.d.ts]
 declare let v: string | boolean;
 export { v };
diff --git a/tests/baselines/reference/declarationEmitInferredTypeAlias8.js b/tests/baselines/reference/declarationEmitInferredTypeAlias8.js
index 0919c9a2282c4..90761d123ade7 100644
--- a/tests/baselines/reference/declarationEmitInferredTypeAlias8.js
+++ b/tests/baselines/reference/declarationEmitInferredTypeAlias8.js
@@ -14,7 +14,7 @@ function returnSomeGlobalValue() {
 
 
 //// [declarationEmitInferredTypeAlias8.d.ts]
-declare type Foo<T> = T | {
+type Foo<T> = T | {
     x: Foo<T>;
 };
 declare var x: Foo<number[]>;
diff --git a/tests/baselines/reference/declarationEmitInferredTypeAlias9.js b/tests/baselines/reference/declarationEmitInferredTypeAlias9.js
index d00a56caa504a..39672035224fa 100644
--- a/tests/baselines/reference/declarationEmitInferredTypeAlias9.js
+++ b/tests/baselines/reference/declarationEmitInferredTypeAlias9.js
@@ -18,7 +18,7 @@ exports.returnSomeGlobalValue = returnSomeGlobalValue;
 
 
 //// [declarationEmitInferredTypeAlias9.d.ts]
-declare type Foo<T> = T | {
+type Foo<T> = T | {
     x: Foo<T>;
 };
 export declare function returnSomeGlobalValue(): Foo<number[]>;
diff --git a/tests/baselines/reference/declarationEmitInlinedDistributiveConditional.js b/tests/baselines/reference/declarationEmitInlinedDistributiveConditional.js
index fafb13d1d5c79..e15849d9ba101 100644
--- a/tests/baselines/reference/declarationEmitInlinedDistributiveConditional.js
+++ b/tests/baselines/reference/declarationEmitInlinedDistributiveConditional.js
@@ -47,8 +47,8 @@ export declare function excludePrivateKeys1<Obj>(obj: Obj): {
 export declare function excludePrivateKeys2<Obj>(obj: Obj): {
     [K in PublicKeys2<keyof Obj>]: Obj[K];
 };
-export declare type PublicKeys1<T> = T extends `_${string}` ? never : T;
-declare type PublicKeys2<T> = T extends `_${string}` ? never : T;
+export type PublicKeys1<T> = T extends `_${string}` ? never : T;
+type PublicKeys2<T> = T extends `_${string}` ? never : T;
 export {};
 //// [api.d.ts]
 export declare const dropPrivateProps1: <Obj>(obj: Obj) => { [K in import("./internal").PublicKeys1<keyof Obj>]: Obj[K]; };
diff --git a/tests/baselines/reference/declarationEmitMappedPrivateTypeTypeParameter.js b/tests/baselines/reference/declarationEmitMappedPrivateTypeTypeParameter.js
index 79debe1b4b8b5..cc255490f1589 100644
--- a/tests/baselines/reference/declarationEmitMappedPrivateTypeTypeParameter.js
+++ b/tests/baselines/reference/declarationEmitMappedPrivateTypeTypeParameter.js
@@ -17,4 +17,4 @@ exports.__esModule = true;
 
 
 //// [Helpers.d.ts]
-export declare type StringKeyOf<TObj> = Extract<string, keyof TObj>;
+export type StringKeyOf<TObj> = Extract<string, keyof TObj>;
diff --git a/tests/baselines/reference/declarationEmitMappedTypeDistributivityPreservesConstraints.js b/tests/baselines/reference/declarationEmitMappedTypeDistributivityPreservesConstraints.js
index c5b2e53abb3ba..bd8974d1ce328 100644
--- a/tests/baselines/reference/declarationEmitMappedTypeDistributivityPreservesConstraints.js
+++ b/tests/baselines/reference/declarationEmitMappedTypeDistributivityPreservesConstraints.js
@@ -32,11 +32,11 @@ exports["default"] = { test: types_1["default"] };
 
 
 //// [types.d.ts]
-declare type Fns = Record<string, (...params: unknown[]) => unknown>;
-declare type Map<T extends Fns> = {
+type Fns = Record<string, (...params: unknown[]) => unknown>;
+type Map<T extends Fns> = {
     [K in keyof T]: T[K];
 };
-declare type AllArg<T extends Fns> = {
+type AllArg<T extends Fns> = {
     [K in keyof T]: Parameters<T[K]>;
 };
 declare function fn<T extends {
diff --git a/tests/baselines/reference/declarationEmitNoNonRequiredParens.js b/tests/baselines/reference/declarationEmitNoNonRequiredParens.js
index d6d8a4751c413..ebc784f64b4df 100644
--- a/tests/baselines/reference/declarationEmitNoNonRequiredParens.js
+++ b/tests/baselines/reference/declarationEmitNoNonRequiredParens.js
@@ -26,5 +26,5 @@ export declare enum Test {
     B = 1,
     C = 2
 }
-export declare type TestType = typeof Test;
+export type TestType = typeof Test;
 export declare const bar: Test[];
diff --git a/tests/baselines/reference/declarationEmitNonExportedBindingPattern.js b/tests/baselines/reference/declarationEmitNonExportedBindingPattern.js
index 2bc10512f829e..4184178ceb6ca 100644
--- a/tests/baselines/reference/declarationEmitNonExportedBindingPattern.js
+++ b/tests/baselines/reference/declarationEmitNonExportedBindingPattern.js
@@ -38,11 +38,11 @@ var c = getNested().a.b.c;
 declare const foo: {
     test: number;
 };
-export declare type AliasType = typeof foo;
+export type AliasType = typeof foo;
 declare const renamed: {
     test: number;
 };
-export declare type AliasType2 = typeof renamed;
+export type AliasType2 = typeof renamed;
 declare const c: string;
-export declare type AliasType3 = typeof c;
+export type AliasType3 = typeof c;
 export {};
diff --git a/tests/baselines/reference/declarationEmitPrivatePromiseLikeInterface.js b/tests/baselines/reference/declarationEmitPrivatePromiseLikeInterface.js
index 1b5766d7fc022..ec9d5aefcf829 100644
--- a/tests/baselines/reference/declarationEmitPrivatePromiseLikeInterface.js
+++ b/tests/baselines/reference/declarationEmitPrivatePromiseLikeInterface.js
@@ -63,7 +63,7 @@ exports.Api = Api;
 
 
 //// [http-client.d.ts]
-declare type TPromise<ResolveType, RejectType = any> = Omit<Promise<ResolveType>, "then" | "catch"> & {
+type TPromise<ResolveType, RejectType = any> = Omit<Promise<ResolveType>, "then" | "catch"> & {
     then<TResult1 = ResolveType, TResult2 = never>(onfulfilled?: ((value: ResolveType) => TResult1 | PromiseLike<TResult1>) | undefined | null, onrejected?: ((reason: RejectType) => TResult2 | PromiseLike<TResult2>) | undefined | null): TPromise<TResult1 | TResult2, RejectType>;
     catch<TResult = never>(onrejected?: ((reason: RejectType) => TResult | PromiseLike<TResult>) | undefined | null): TPromise<ResolveType | TResult, RejectType>;
 };
diff --git a/tests/baselines/reference/declarationEmitShadowingInferNotRenamed.js b/tests/baselines/reference/declarationEmitShadowingInferNotRenamed.js
index d69903c0413c8..803a677f20666 100644
--- a/tests/baselines/reference/declarationEmitShadowingInferNotRenamed.js
+++ b/tests/baselines/reference/declarationEmitShadowingInferNotRenamed.js
@@ -32,8 +32,8 @@ exports.createClient = createClient;
 
 
 //// [declarationEmitShadowingInferNotRenamed.d.ts]
-declare type Client = string;
-declare type UpdatedClient<C> = C & {
+type Client = string;
+type UpdatedClient<C> = C & {
     foo: number;
 };
 export declare const createClient: <D extends Record<string, new (...args: any[]) => Client> | (new (...args: any[]) => Client)>(clientDef: D) => D extends new (...args: any[]) => infer C ? UpdatedClient<C> : { [K in keyof D]: D[K] extends new (...args: any[]) => infer C_1 ? UpdatedClient<C_1> : never; };
diff --git a/tests/baselines/reference/declarationEmitSymlinkPaths.js b/tests/baselines/reference/declarationEmitSymlinkPaths.js
index 41f9c4b583079..c7c8ec1f5e629 100644
--- a/tests/baselines/reference/declarationEmitSymlinkPaths.js
+++ b/tests/baselines/reference/declarationEmitSymlinkPaths.js
@@ -42,8 +42,8 @@ exports.NotificationScenario = (0, index_1.test)(NotificationAPIUtils_1.getNotif
 
 
 //// [NotificationAPIUtils.d.ts]
-export declare type NotificationRequest = {};
-export declare type NotificationResponse = {};
+export type NotificationRequest = {};
+export type NotificationResponse = {};
 export declare function getNotification(): NotificationResponse;
 //// [NotificationStore.d.ts]
 export declare const NotificationScenario: () => import("../API/NotificationAPIUtils").NotificationResponse;
diff --git a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters1.js b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters1.js
index d3dfb39d48d39..0c32429ded12b 100644
--- a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters1.js
+++ b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters1.js
@@ -12,6 +12,6 @@ exports.y = y;
 
 
 //// [declarationEmitTypeAliasWithTypeParameters1.d.ts]
-export declare type Bar<X, Y> = () => [X, Y];
-export declare type Foo<Y> = Bar<any, Y>;
+export type Bar<X, Y> = () => [X, Y];
+export type Foo<Y> = Bar<any, Y>;
 export declare const y: (x: Foo<string>) => number;
diff --git a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters2.js b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters2.js
index 750d2d68d0696..14ab0d9dea6cd 100644
--- a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters2.js
+++ b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters2.js
@@ -13,7 +13,7 @@ exports.y = y;
 
 
 //// [declarationEmitTypeAliasWithTypeParameters2.d.ts]
-export declare type Bar<X, Y, Z> = () => [X, Y, Z];
-export declare type Baz<M, N> = Bar<M, string, N>;
-export declare type Baa<Y> = Baz<boolean, Y>;
+export type Bar<X, Y, Z> = () => [X, Y, Z];
+export type Baz<M, N> = Bar<M, string, N>;
+export type Baa<Y> = Baz<boolean, Y>;
 export declare const y: (x: Baa<number>) => number;
diff --git a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters3.js b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters3.js
index 0cb7e23c4c54f..b1e36b6b0a8f9 100644
--- a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters3.js
+++ b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters3.js
@@ -14,7 +14,7 @@ function bar() {
 
 
 //// [declarationEmitTypeAliasWithTypeParameters3.d.ts]
-declare type Foo<T> = {
+type Foo<T> = {
     foo<U>(): Foo<U>;
 };
 declare function bar(): Foo<number>;
diff --git a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters4.js b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters4.js
index 9d2422ea7e263..845c7ebc5fab4 100644
--- a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters4.js
+++ b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters4.js
@@ -16,8 +16,8 @@ function foo() {
 
 
 //// [declarationEmitTypeAliasWithTypeParameters4.d.ts]
-declare type Foo<T, Y> = {
+type Foo<T, Y> = {
     foo<U, J>(): Foo<U, J>;
 };
-declare type SubFoo<R> = Foo<string, R>;
+type SubFoo<R> = Foo<string, R>;
 declare function foo(): SubFoo<number>;
diff --git a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters5.js b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters5.js
index 1b29acc164e70..e1104d4c46063 100644
--- a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters5.js
+++ b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters5.js
@@ -18,8 +18,8 @@ function foo() {
 
 
 //// [declarationEmitTypeAliasWithTypeParameters5.d.ts]
-declare type Foo<T, Y> = {
+type Foo<T, Y> = {
     foo<U, J>(): Foo<U, J>;
 };
-export declare type SubFoo<R> = Foo<string, R>;
+export type SubFoo<R> = Foo<string, R>;
 export {};
diff --git a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters6.js b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters6.js
index 53160a42d3e43..539123c5a0536 100644
--- a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters6.js
+++ b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters6.js
@@ -16,8 +16,8 @@ function foo() {
 
 
 //// [declarationEmitTypeAliasWithTypeParameters6.d.ts]
-declare type Foo<T, Y> = {
+type Foo<T, Y> = {
     foo<U, J>(): Foo<U, J>;
 };
-declare type SubFoo<R, S> = Foo<S, R>;
+type SubFoo<R, S> = Foo<S, R>;
 declare function foo(): SubFoo<number, string>;
diff --git a/tests/baselines/reference/declarationEmitWithDefaultAsComputedName.js b/tests/baselines/reference/declarationEmitWithDefaultAsComputedName.js
index b992e3d3fa834..705a55a488557 100644
--- a/tests/baselines/reference/declarationEmitWithDefaultAsComputedName.js
+++ b/tests/baselines/reference/declarationEmitWithDefaultAsComputedName.js
@@ -35,7 +35,7 @@ exports.obj = (_a = {},
 
 
 //// [other.d.ts]
-declare type Experiment<Name> = {
+type Experiment<Name> = {
     name: Name;
 };
 declare const _default: Experiment<"foo">;
diff --git a/tests/baselines/reference/declarationEmitWithDefaultAsComputedName2.js b/tests/baselines/reference/declarationEmitWithDefaultAsComputedName2.js
index afe89c50a48df..e2f1d4c613561 100644
--- a/tests/baselines/reference/declarationEmitWithDefaultAsComputedName2.js
+++ b/tests/baselines/reference/declarationEmitWithDefaultAsComputedName2.js
@@ -35,7 +35,7 @@ exports.obj = (_a = {},
 
 
 //// [other.d.ts]
-declare type Experiment<Name> = {
+type Experiment<Name> = {
     name: Name;
 };
 declare const _default: Experiment<"foo">;
diff --git a/tests/baselines/reference/declarationsForFileShadowingGlobalNoError.js b/tests/baselines/reference/declarationsForFileShadowingGlobalNoError.js
index 71e15057754b2..740bbacdf1435 100644
--- a/tests/baselines/reference/declarationsForFileShadowingGlobalNoError.js
+++ b/tests/baselines/reference/declarationsForFileShadowingGlobalNoError.js
@@ -55,12 +55,12 @@ exports.mixin = mixin;
 
 
 //// [dom.d.ts]
-export declare type DOMNode = Node;
+export type DOMNode = Node;
 //// [custom.d.ts]
-export declare type Node = {};
+export type Node = {};
 //// [index.d.ts]
 import { DOMNode } from './dom';
-declare type Constructor = new (...args: any[]) => any;
+type Constructor = new (...args: any[]) => any;
 export declare const mixin: (Base: Constructor) => {
     new (...args: any[]): {
         [x: string]: any;
diff --git a/tests/baselines/reference/declarationsForIndirectTypeAliasReference.js b/tests/baselines/reference/declarationsForIndirectTypeAliasReference.js
index 3918bf6e32e93..d73b45050ead5 100644
--- a/tests/baselines/reference/declarationsForIndirectTypeAliasReference.js
+++ b/tests/baselines/reference/declarationsForIndirectTypeAliasReference.js
@@ -58,7 +58,7 @@ export { Hash, StringHash, StringHash2 };
 interface Hash<T> {
     [key: string]: T;
 }
-declare type StringHash = Hash<string>;
+type StringHash = Hash<string>;
 interface StringHash2 extends Hash<string> {
 }
 //// [a.d.ts]
diff --git a/tests/baselines/reference/declarationsWithRecursiveInternalTypesProduceUniqueTypeParams.js b/tests/baselines/reference/declarationsWithRecursiveInternalTypesProduceUniqueTypeParams.js
index ddc78e9effe40..fe06d05e0d70f 100644
--- a/tests/baselines/reference/declarationsWithRecursiveInternalTypesProduceUniqueTypeParams.js
+++ b/tests/baselines/reference/declarationsWithRecursiveInternalTypesProduceUniqueTypeParams.js
@@ -92,8 +92,8 @@ void p3.result.three;
 
 
 //// [declarationsWithRecursiveInternalTypesProduceUniqueTypeParams.d.ts]
-export declare type Key<U> = keyof U;
-export declare type Value<K extends Key<U>, U> = U[K];
+export type Key<U> = keyof U;
+export type Value<K extends Key<U>, U> = U[K];
 export declare const updateIfChanged: <T>(t: T) => (<K extends keyof T>(key: K) => (<K_1 extends keyof Value<K, T>>(key: K_1) => (<K_2 extends keyof Value<K_1, Value<K, T>>>(key: K_2) => (<K_3 extends keyof Value<K_2, Value<K_1, Value<K, T>>>>(key: K_3) => (<K_4 extends keyof Value<K_3, Value<K_2, Value<K_1, Value<K, T>>>>>(key: K_4) => (<K_5 extends keyof Value<K_4, Value<K_3, Value<K_2, Value<K_1, Value<K, T>>>>>>(key: K_5) => (<K_6 extends keyof Value<K_5, Value<K_4, Value<K_3, Value<K_2, Value<K_1, Value<K, T>>>>>>>(key: K_6) => (<K_7 extends keyof Value<K_6, Value<K_5, Value<K_4, Value<K_3, Value<K_2, Value<K_1, Value<K, T>>>>>>>>(key: K_7) => (<K_8 extends keyof Value<K_7, Value<K_6, Value<K_5, Value<K_4, Value<K_3, Value<K_2, Value<K_1, Value<K, T>>>>>>>>>(key: K_8) => (<K_9 extends keyof Value<K_8, Value<K_7, Value<K_6, Value<K_5, Value<K_4, Value<K_3, Value<K_2, Value<K_1, Value<K, T>>>>>>>>>>(key: K_9) => (<K_10 extends keyof Value<K_9, Value<K_8, Value<K_7, Value<K_6, Value<K_5, Value<K_4, Value<K_3, Value<K_2, Value<K_1, Value<K, T>>>>>>>>>>>(key: K_10) => any & {
     map: (updater: (u: Value<K_10, Value<K_9, Value<K_8, Value<K_7, Value<K_6, Value<K_5, Value<K_4, Value<K_3, Value<K_2, Value<K_1, Value<K, T>>>>>>>>>>>) => Value<K_10, Value<K_9, Value<K_8, Value<K_7, Value<K_6, Value<K_5, Value<K_4, Value<K_3, Value<K_2, Value<K_1, Value<K, T>>>>>>>>>>>) => T;
     set: (newU: Value<K_10, Value<K_9, Value<K_8, Value<K_7, Value<K_6, Value<K_5, Value<K_4, Value<K_3, Value<K_2, Value<K_1, Value<K, T>>>>>>>>>>>) => T;
diff --git a/tests/baselines/reference/deeplyNestedConditionalTypes.js b/tests/baselines/reference/deeplyNestedConditionalTypes.js
index 20199c3a6b634..1ae2e6464363c 100644
--- a/tests/baselines/reference/deeplyNestedConditionalTypes.js
+++ b/tests/baselines/reference/deeplyNestedConditionalTypes.js
@@ -111,6 +111,6 @@ type T1 = Foo<any>;
 
 
 //// [deeplyNestedConditionalTypes.d.ts]
-declare type Foo<T> = T extends 0 ? '0' : T extends 1 ? '1' : T extends 2 ? '2' : T extends 3 ? '3' : T extends 4 ? '4' : T extends 5 ? '5' : T extends 6 ? '6' : T extends 7 ? '7' : T extends 8 ? '8' : T extends 9 ? '9' : T extends 10 ? '10' : T extends 11 ? '11' : T extends 12 ? '12' : T extends 13 ? '13' : T extends 14 ? '14' : T extends 15 ? '15' : T extends 16 ? '16' : T extends 17 ? '17' : T extends 18 ? '18' : T extends 19 ? '19' : T extends 20 ? '20' : T extends 21 ? '21' : T extends 22 ? '22' : T extends 23 ? '23' : T extends 24 ? '24' : T extends 25 ? '25' : T extends 26 ? '26' : T extends 27 ? '27' : T extends 28 ? '28' : T extends 29 ? '29' : T extends 30 ? '30' : T extends 31 ? '31' : T extends 32 ? '32' : T extends 33 ? '33' : T extends 34 ? '34' : T extends 35 ? '35' : T extends 36 ? '36' : T extends 37 ? '37' : T extends 38 ? '38' : T extends 39 ? '39' : T extends 40 ? '40' : T extends 41 ? '41' : T extends 42 ? '42' : T extends 43 ? '43' : T extends 44 ? '44' : T extends 45 ? '45' : T extends 46 ? '46' : T extends 47 ? '47' : T extends 48 ? '48' : T extends 49 ? '49' : T extends 50 ? '50' : T extends 51 ? '51' : T extends 52 ? '52' : T extends 53 ? '53' : T extends 54 ? '54' : T extends 55 ? '55' : T extends 56 ? '56' : T extends 57 ? '57' : T extends 58 ? '58' : T extends 59 ? '59' : T extends 60 ? '60' : T extends 61 ? '61' : T extends 62 ? '62' : T extends 63 ? '63' : T extends 64 ? '64' : T extends 65 ? '65' : T extends 66 ? '66' : T extends 67 ? '67' : T extends 68 ? '68' : T extends 69 ? '69' : T extends 70 ? '70' : T extends 71 ? '71' : T extends 72 ? '72' : T extends 73 ? '73' : T extends 74 ? '74' : T extends 75 ? '75' : T extends 76 ? '76' : T extends 77 ? '77' : T extends 78 ? '78' : T extends 79 ? '79' : T extends 80 ? '80' : T extends 81 ? '81' : T extends 82 ? '82' : T extends 83 ? '83' : T extends 84 ? '84' : T extends 85 ? '85' : T extends 86 ? '86' : T extends 87 ? '87' : T extends 88 ? '88' : T extends 89 ? '89' : T extends 90 ? '90' : T extends 91 ? '91' : T extends 92 ? '92' : T extends 93 ? '93' : T extends 94 ? '94' : T extends 95 ? '95' : T extends 96 ? '96' : T extends 97 ? '97' : T extends 98 ? '98' : T extends 99 ? '99' : never;
-declare type T0 = Foo<99>;
-declare type T1 = Foo<any>;
+type Foo<T> = T extends 0 ? '0' : T extends 1 ? '1' : T extends 2 ? '2' : T extends 3 ? '3' : T extends 4 ? '4' : T extends 5 ? '5' : T extends 6 ? '6' : T extends 7 ? '7' : T extends 8 ? '8' : T extends 9 ? '9' : T extends 10 ? '10' : T extends 11 ? '11' : T extends 12 ? '12' : T extends 13 ? '13' : T extends 14 ? '14' : T extends 15 ? '15' : T extends 16 ? '16' : T extends 17 ? '17' : T extends 18 ? '18' : T extends 19 ? '19' : T extends 20 ? '20' : T extends 21 ? '21' : T extends 22 ? '22' : T extends 23 ? '23' : T extends 24 ? '24' : T extends 25 ? '25' : T extends 26 ? '26' : T extends 27 ? '27' : T extends 28 ? '28' : T extends 29 ? '29' : T extends 30 ? '30' : T extends 31 ? '31' : T extends 32 ? '32' : T extends 33 ? '33' : T extends 34 ? '34' : T extends 35 ? '35' : T extends 36 ? '36' : T extends 37 ? '37' : T extends 38 ? '38' : T extends 39 ? '39' : T extends 40 ? '40' : T extends 41 ? '41' : T extends 42 ? '42' : T extends 43 ? '43' : T extends 44 ? '44' : T extends 45 ? '45' : T extends 46 ? '46' : T extends 47 ? '47' : T extends 48 ? '48' : T extends 49 ? '49' : T extends 50 ? '50' : T extends 51 ? '51' : T extends 52 ? '52' : T extends 53 ? '53' : T extends 54 ? '54' : T extends 55 ? '55' : T extends 56 ? '56' : T extends 57 ? '57' : T extends 58 ? '58' : T extends 59 ? '59' : T extends 60 ? '60' : T extends 61 ? '61' : T extends 62 ? '62' : T extends 63 ? '63' : T extends 64 ? '64' : T extends 65 ? '65' : T extends 66 ? '66' : T extends 67 ? '67' : T extends 68 ? '68' : T extends 69 ? '69' : T extends 70 ? '70' : T extends 71 ? '71' : T extends 72 ? '72' : T extends 73 ? '73' : T extends 74 ? '74' : T extends 75 ? '75' : T extends 76 ? '76' : T extends 77 ? '77' : T extends 78 ? '78' : T extends 79 ? '79' : T extends 80 ? '80' : T extends 81 ? '81' : T extends 82 ? '82' : T extends 83 ? '83' : T extends 84 ? '84' : T extends 85 ? '85' : T extends 86 ? '86' : T extends 87 ? '87' : T extends 88 ? '88' : T extends 89 ? '89' : T extends 90 ? '90' : T extends 91 ? '91' : T extends 92 ? '92' : T extends 93 ? '93' : T extends 94 ? '94' : T extends 95 ? '95' : T extends 96 ? '96' : T extends 97 ? '97' : T extends 98 ? '98' : T extends 99 ? '99' : never;
+type T0 = Foo<99>;
+type T1 = Foo<any>;
diff --git a/tests/baselines/reference/deeplyNestedConstraints.js b/tests/baselines/reference/deeplyNestedConstraints.js
index 99fcbf4391c65..8079e1cd48845 100644
--- a/tests/baselines/reference/deeplyNestedConstraints.js
+++ b/tests/baselines/reference/deeplyNestedConstraints.js
@@ -26,8 +26,8 @@ var BufferPool = /** @class */ (function () {
 
 
 //// [deeplyNestedConstraints.d.ts]
-declare type Enum = Record<string, string | number>;
-declare type TypeMap<E extends Enum> = {
+type Enum = Record<string, string | number>;
+type TypeMap<E extends Enum> = {
     [key in E[keyof E]]: number | boolean | string | number[];
 };
 declare class BufferPool<E extends Enum, M extends TypeMap<E>> {
diff --git a/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.js b/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.js
index 0477481c95cff..6ca036ace794e 100644
--- a/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.js
+++ b/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.js
@@ -124,7 +124,7 @@ declare function foo1(x: string | undefined, b: number): void;
 declare function foo2(x: string | undefined, b: number): void;
 declare function foo3(x: string | undefined, b: number): void;
 declare function foo4(x: string | undefined, b: number): void;
-declare type OptionalNullableString = string | null | undefined;
+type OptionalNullableString = string | null | undefined;
 declare function allowsNull(val?: OptionalNullableString): void;
 declare function removeUndefinedButNotFalse(x?: boolean): false | undefined;
 declare const cond: boolean;
diff --git a/tests/baselines/reference/deferredLookupTypeResolution.js b/tests/baselines/reference/deferredLookupTypeResolution.js
index 126f9d1345ad6..5baf26128b2f3 100644
--- a/tests/baselines/reference/deferredLookupTypeResolution.js
+++ b/tests/baselines/reference/deferredLookupTypeResolution.js
@@ -38,17 +38,17 @@ function f3(x) {
 
 
 //// [deferredLookupTypeResolution.d.ts]
-declare type StringContains<S extends string, L extends string> = ({
+type StringContains<S extends string, L extends string> = ({
     [K in S]: 'true';
 } & {
     [key: string]: 'false';
 })[L];
-declare type ObjectHasKey<O, L extends string> = StringContains<Extract<keyof O, string>, L>;
-declare type First<T> = ObjectHasKey<T, '0'>;
-declare type T1 = ObjectHasKey<{
+type ObjectHasKey<O, L extends string> = StringContains<Extract<keyof O, string>, L>;
+type First<T> = ObjectHasKey<T, '0'>;
+type T1 = ObjectHasKey<{
     a: string;
 }, 'a'>;
-declare type T2 = ObjectHasKey<{
+type T2 = ObjectHasKey<{
     a: string;
 }, 'b'>;
 declare function f1<A extends string, B extends string>(a: A, b: B): {
diff --git a/tests/baselines/reference/deferredLookupTypeResolution2.js b/tests/baselines/reference/deferredLookupTypeResolution2.js
index 3d40dcb4bbfa6..6702ef1d06b0e 100644
--- a/tests/baselines/reference/deferredLookupTypeResolution2.js
+++ b/tests/baselines/reference/deferredLookupTypeResolution2.js
@@ -28,28 +28,28 @@ type DeepOK<T> = { true: 'true', otherwise: 'false' }[Juxtapose<T>];
 
 
 //// [deferredLookupTypeResolution2.d.ts]
-declare type StringContains<S extends string, L extends string> = ({
+type StringContains<S extends string, L extends string> = ({
     [K in S]: 'true';
 } & {
     [key: string]: 'false';
 })[L];
-declare type ObjectHasKey<O, L extends string> = StringContains<Extract<keyof O, string>, L>;
-declare type A<T> = ObjectHasKey<T, '0'>;
-declare type B = ObjectHasKey<[string, number], '1'>;
-declare type C = ObjectHasKey<[string, number], '2'>;
-declare type D = A<[string]>;
-declare type E<T> = {
+type ObjectHasKey<O, L extends string> = StringContains<Extract<keyof O, string>, L>;
+type A<T> = ObjectHasKey<T, '0'>;
+type B = ObjectHasKey<[string, number], '1'>;
+type C = ObjectHasKey<[string, number], '2'>;
+type D = A<[string]>;
+type E<T> = {
     true: 'true';
 }[ObjectHasKey<T, '1'>];
-declare type Juxtapose<T> = ({
+type Juxtapose<T> = ({
     true: 'otherwise';
 } & {
     [k: string]: 'true';
 })[ObjectHasKey<T, '1'>];
-declare type DeepError<T> = {
+type DeepError<T> = {
     true: 'true';
 }[Juxtapose<T>];
-declare type DeepOK<T> = {
+type DeepOK<T> = {
     true: 'true';
     otherwise: 'false';
 }[Juxtapose<T>];
diff --git a/tests/baselines/reference/dependentDestructuredVariables.js b/tests/baselines/reference/dependentDestructuredVariables.js
index 6971c1ad1d255..dffb1c03d8dc6 100644
--- a/tests/baselines/reference/dependentDestructuredVariables.js
+++ b/tests/baselines/reference/dependentDestructuredVariables.js
@@ -652,7 +652,7 @@ const fa3 = (guard, value) => {
 
 
 //// [dependentDestructuredVariables.d.ts]
-declare type Action = {
+type Action = {
     kind: 'A';
     payload: number;
 } | {
@@ -662,7 +662,7 @@ declare type Action = {
 declare function f10({ kind, payload }: Action): void;
 declare function f11(action: Action): void;
 declare function f12({ kind, payload }: Action): void;
-declare type Action2 = {
+type Action2 = {
     kind: 'A';
     payload: number | undefined;
 } | {
@@ -673,7 +673,7 @@ declare function f20({ kind, payload }: Action2): void;
 declare function f21(action: Action2): void;
 declare function f22(action: Action2): void;
 declare function f23({ kind, payload }: Action2): void;
-declare type Foo = {
+type Foo = {
     kind: 'A';
     isA: true;
 } | {
@@ -684,7 +684,7 @@ declare type Foo = {
     isA: false;
 };
 declare function f30({ kind, isA }: Foo): void;
-declare type Args = ['A', number] | ['B', string];
+type Args = ['A', number] | ['B', string];
 declare function f40(...[kind, data]: Args): void;
 interface A<T> {
     variant: 'a';
@@ -694,11 +694,11 @@ interface B<T> {
     variant: 'b';
     value: Array<T>;
 }
-declare type AB<T> = A<T> | B<T>;
+type AB<T> = A<T> | B<T>;
 declare function printValue<T>(t: T): void;
 declare function printValueList<T>(t: Array<T>): void;
 declare function unrefined1<T>(ab: AB<T>): void;
-declare type Action3 = {
+type Action3 = {
     type: 'add';
     payload: {
         toAdd: number;
@@ -716,7 +716,7 @@ declare function f50(cb: (...args: Args) => void): void;
 declare const f51: (...args: ['A', number] | ['B', string]) => void;
 declare const f52: (...args: ['A', number] | ['B']) => void;
 declare function readFile(path: string, callback: (...args: [err: null, data: unknown[]] | [err: Error, data: undefined]) => void): void;
-declare type ReducerArgs = ["add", {
+type ReducerArgs = ["add", {
     a: number;
     b: number;
 }] | ["concat", {
@@ -724,7 +724,7 @@ declare type ReducerArgs = ["add", {
     secondArr: any[];
 }];
 declare const reducer: (...args: ReducerArgs) => void;
-declare type FooMethod = {
+type FooMethod = {
     method(...args: [
         type: "str",
         cb: (e: string) => void
@@ -734,7 +734,7 @@ declare type FooMethod = {
     ]): void;
 };
 declare let fooM: FooMethod;
-declare type FooAsyncMethod = {
+type FooAsyncMethod = {
     method(...args: [
         type: "str",
         cb: (e: string) => void
@@ -744,7 +744,7 @@ declare type FooAsyncMethod = {
     ]): Promise<any>;
 };
 declare let fooAsyncM: FooAsyncMethod;
-declare type FooGenMethod = {
+type FooGenMethod = {
     method(...args: [
         type: "str",
         cb: (e: string) => void
@@ -754,7 +754,7 @@ declare type FooGenMethod = {
     ]): Generator<any, any, any>;
 };
 declare let fooGenM: FooGenMethod;
-declare type FooAsyncGenMethod = {
+type FooAsyncGenMethod = {
     method(...args: [
         type: "str",
         cb: (e: string) => void
@@ -764,7 +764,7 @@ declare type FooAsyncGenMethod = {
     ]): AsyncGenerator<any, any, any>;
 };
 declare let fooAsyncGenM: FooAsyncGenMethod;
-declare type Func = <T extends ["a", number] | ["b", string]>(...args: T) => void;
+type Func = <T extends ["a", number] | ["b", string]>(...args: T) => void;
 declare const f60: Func;
 declare function foo({ value1, test1, test2, test3, test4, test5, test6, test7, test8, test9 }: {
     value1: any;
diff --git a/tests/baselines/reference/destructuringInFunctionType.js b/tests/baselines/reference/destructuringInFunctionType.js
index 1a38ef067acfc..e817bc16fd43e 100644
--- a/tests/baselines/reference/destructuringInFunctionType.js
+++ b/tests/baselines/reference/destructuringInFunctionType.js
@@ -39,31 +39,31 @@ interface b {
 interface c {
     c: any;
 }
-declare type T1 = ([a, b, c]);
-declare type F1 = ([a, b, c]: [any, any, any]) => void;
-declare type T2 = ({
+type T1 = ([a, b, c]);
+type F1 = ([a, b, c]: [any, any, any]) => void;
+type T2 = ({
     a: any;
 });
-declare type F2 = ({ a }: {
+type F2 = ({ a }: {
     a: any;
 }) => void;
-declare type T3 = ([{
+type T3 = ([{
     a: b;
 }, {
     b: a;
 }]);
-declare type F3 = ([{ a }, { b }]: [{
+type F3 = ([{ a }, { b }]: [{
     a: any;
 }, {
     b: any;
 }]) => void;
-declare type T4 = ([{
+type T4 = ([{
     a: [b, c];
 }]);
-declare type F4 = ([{ a: [b, c] }]: [{
+type F4 = ([{ a: [b, c] }]: [{
     a: [any, any];
 }]) => void;
-declare type C1 = new ([{ a: [b, c] }]: [{
+type C1 = new ([{ a: [b, c] }]: [{
     a: [any, any];
 }]) => void;
 declare var v1: ([a, b, c]: [any, any, any]) => string;
diff --git a/tests/baselines/reference/discriminatedUnionJsxElement.js b/tests/baselines/reference/discriminatedUnionJsxElement.js
index ca5b766aac92f..6760f576c024c 100644
--- a/tests/baselines/reference/discriminatedUnionJsxElement.js
+++ b/tests/baselines/reference/discriminatedUnionJsxElement.js
@@ -45,7 +45,7 @@ interface IData<MenuItemVariant extends ListItemVariant = ListItemVariant.OneLin
     menuItemsVariant?: MenuItemVariant;
 }
 declare function Menu<MenuItemVariant extends ListItemVariant = ListItemVariant.OneLine>(data: IData<MenuItemVariant>): any;
-declare type IListItemData = {
+type IListItemData = {
     variant: ListItemVariant.Avatar;
 } | {
     variant: ListItemVariant.OneLine;
diff --git a/tests/baselines/reference/dynamicNamesErrors.js b/tests/baselines/reference/dynamicNamesErrors.js
index 967e32cbb0ce5..f9028da74967f 100644
--- a/tests/baselines/reference/dynamicNamesErrors.js
+++ b/tests/baselines/reference/dynamicNamesErrors.js
@@ -109,7 +109,7 @@ export declare class ClassMemberVisibility {
     get [z](): number;
     set [w](value: number);
 }
-export declare type ObjectTypeVisibility = {
+export type ObjectTypeVisibility = {
     [x]: number;
     [y](): number;
 };
diff --git a/tests/baselines/reference/emitClassExpressionInDeclarationFile.js b/tests/baselines/reference/emitClassExpressionInDeclarationFile.js
index 7b5cfe4d2774a..d8b23a581138b 100644
--- a/tests/baselines/reference/emitClassExpressionInDeclarationFile.js
+++ b/tests/baselines/reference/emitClassExpressionInDeclarationFile.js
@@ -117,7 +117,7 @@ export declare class FooItem {
     foo(): void;
     name?: string;
 }
-export declare type Constructor<T> = new (...args: any[]) => T;
+export type Constructor<T> = new (...args: any[]) => T;
 export declare function WithTags<T extends Constructor<FooItem>>(Base: T): {
     new (...args: any[]): {
         tags(): void;
diff --git a/tests/baselines/reference/es6ImportNamedImportWithTypesAndValues.js b/tests/baselines/reference/es6ImportNamedImportWithTypesAndValues.js
index 940f7825cbc9d..cd5d55cbb8689 100644
--- a/tests/baselines/reference/es6ImportNamedImportWithTypesAndValues.js
+++ b/tests/baselines/reference/es6ImportNamedImportWithTypesAndValues.js
@@ -60,5 +60,5 @@ export declare class C2 implements I2 {
 }
 //// [client.d.ts]
 import { C, I } from "./server";
-export declare type cValInterface = I;
+export type cValInterface = I;
 export declare var cVal: C;
diff --git a/tests/baselines/reference/exhaustiveSwitchStatements1.js b/tests/baselines/reference/exhaustiveSwitchStatements1.js
index 625265466a4f1..1879724650bce 100644
--- a/tests/baselines/reference/exhaustiveSwitchStatements1.js
+++ b/tests/baselines/reference/exhaustiveSwitchStatements1.js
@@ -501,7 +501,7 @@ interface Triangle {
     kind: "triangle";
     side: number;
 }
-declare type Shape = Square | Rectangle | Circle | Triangle;
+type Shape = Square | Rectangle | Circle | Triangle;
 declare function area(s: Shape): number;
 declare function areaWrapped(s: Shape): number;
 declare enum MyEnum {
@@ -524,7 +524,7 @@ interface Circle2 {
     kind: "circle";
     radius: number;
 }
-declare type Shape2 = Square2 | Circle2;
+type Shape2 = Square2 | Circle2;
 declare function withDefault(s1: Shape2, s2: Shape2): string;
 declare function withoutDefault(s1: Shape2, s2: Shape2): string;
 declare function test4(value: 1 | 2): string;
@@ -537,13 +537,13 @@ declare const zoo: {
 } | undefined;
 declare function expression(): Animal;
 declare function foo(): void;
-declare type O = {
+type O = {
     a: number;
     b: number;
 };
-declare type K = keyof O | 'c';
+type K = keyof O | 'c';
 declare function ff(o: O, k: K): number;
-declare type A = {
+type A = {
     kind: "abc";
 } | {
     kind: "def";
diff --git a/tests/baselines/reference/exportClassExtendingIntersection.js b/tests/baselines/reference/exportClassExtendingIntersection.js
index 9327a315f3a48..98eed6dcc5d2d 100644
--- a/tests/baselines/reference/exportClassExtendingIntersection.js
+++ b/tests/baselines/reference/exportClassExtendingIntersection.js
@@ -113,7 +113,7 @@ var AnotherMixedClass = (0, MixinClass_1.MyMixin)(FinalClass_1.MyExtendedClass);
 
 
 //// [BaseClass.d.ts]
-export declare type Constructor<T> = new (...args: any[]) => T;
+export type Constructor<T> = new (...args: any[]) => T;
 export declare class MyBaseClass<T> {
     baseProperty: string;
     constructor(value: T);
diff --git a/tests/baselines/reference/genericContextualTypes1.js b/tests/baselines/reference/genericContextualTypes1.js
index 9472412333081..25e299cff1767 100644
--- a/tests/baselines/reference/genericContextualTypes1.js
+++ b/tests/baselines/reference/genericContextualTypes1.js
@@ -73,7 +73,7 @@ var fn = function (a) { return a; };
 
 
 //// [genericContextualTypes1.d.ts]
-declare type Box<T> = {
+type Box<T> = {
     value: T;
 };
 declare function wrap<A, B>(f: (a: A) => B): (a: A) => B;
@@ -103,5 +103,5 @@ declare const f23: <A>(a: A[]) => Box<A>[];
 declare const f30: (a: string[]) => string[];
 declare const f31: <T extends Box<number>>(a: T[]) => T[];
 declare const f40: <A, B>(b: B, a: A) => [A, B];
-declare type fn = <A>(a: A) => A;
+type fn = <A>(a: A) => A;
 declare const fn: fn;
diff --git a/tests/baselines/reference/genericDefaults.js b/tests/baselines/reference/genericDefaults.js
index 842abbde52fb4..8a9afe2a372fc 100644
--- a/tests/baselines/reference/genericDefaults.js
+++ b/tests/baselines/reference/genericDefaults.js
@@ -1000,18 +1000,18 @@ declare class Derived03 extends Base02 {
 }
 declare const Derived03c00: Derived03;
 declare const Derived03c01: number;
-declare type DerivedProps = keyof Derived03;
-declare type t00<T = number> = {
+type DerivedProps = keyof Derived03;
+type t00<T = number> = {
     a: T;
 };
 declare const t00c00: number;
 declare const t00c01: number;
-declare type t01<T, U = T> = {
+type t01<T, U = T> = {
     a: [T, U];
 };
 declare const t01c00: [number, number];
 declare const t01c01: [number, string];
-declare type t02<T extends number, U = T> = {
+type t02<T extends number, U = T> = {
     a: [T, U];
 };
 declare const t02c00: [number, number];
@@ -1019,7 +1019,7 @@ declare const t02c01: [1, 1];
 declare const t02c02: [number, number];
 declare const t02c03: [1, number];
 declare const t02c04: [number, 1];
-declare type t03<T extends number, U extends T = T> = {
+type t03<T extends number, U extends T = T> = {
     a: [T, U];
 };
 declare const t03c00: [number, number];
diff --git a/tests/baselines/reference/genericRestParameters1.js b/tests/baselines/reference/genericRestParameters1.js
index e753c526e5a09..00ffe4a66d9bd 100644
--- a/tests/baselines/reference/genericRestParameters1.js
+++ b/tests/baselines/reference/genericRestParameters1.js
@@ -334,22 +334,22 @@ declare const g22: (z?: boolean | undefined) => string[];
 declare const g23: () => string[];
 declare function f30<T, U extends ((x: T) => any)[]>(x: T, ...args: U): U;
 declare const c30: [(x: number) => string, (x: number) => number];
-declare type T01 = Parameters<(x: number, y: string, z: boolean) => void>;
-declare type T02 = Parameters<(...args: [number, string, boolean]) => void>;
-declare type T03 = ConstructorParameters<new (x: number, y: string, z: boolean) => void>;
-declare type T04 = ConstructorParameters<new (...args: [number, string, boolean]) => void>;
-declare type T05<T> = Parameters<(...args: T[]) => void>;
-declare type T06<T> = ConstructorParameters<new (...args: []) => void>;
-declare type T07<T extends any[]> = Parameters<(...args: T) => void>;
-declare type T08<T extends any[]> = ConstructorParameters<new (...args: T) => void>;
-declare type T09 = Parameters<Function>;
-declare type Record1 = {
+type T01 = Parameters<(x: number, y: string, z: boolean) => void>;
+type T02 = Parameters<(...args: [number, string, boolean]) => void>;
+type T03 = ConstructorParameters<new (x: number, y: string, z: boolean) => void>;
+type T04 = ConstructorParameters<new (...args: [number, string, boolean]) => void>;
+type T05<T> = Parameters<(...args: T[]) => void>;
+type T06<T> = ConstructorParameters<new (...args: []) => void>;
+type T07<T extends any[]> = Parameters<(...args: T) => void>;
+type T08<T extends any[]> = ConstructorParameters<new (...args: T) => void>;
+type T09 = Parameters<Function>;
+type Record1 = {
     move: [number, 'left' | 'right'];
     jump: [number, 'up' | 'down'];
     stop: string;
     done: [];
 };
-declare type EventType<T> = {
+type EventType<T> = {
     emit<K extends keyof T = keyof T>(e: K, ...payload: T[K] extends any[] ? T[K] : [T[K]]): void;
 };
 declare var events: EventType<Record1>;
diff --git a/tests/baselines/reference/genericRestParameters2.js b/tests/baselines/reference/genericRestParameters2.js
index dab676e330af3..47219f7ba0a12 100644
--- a/tests/baselines/reference/genericRestParameters2.js
+++ b/tests/baselines/reference/genericRestParameters2.js
@@ -149,16 +149,16 @@ declare let f13: (a: number, b: string, ...c: boolean[]) => void;
 declare const ns: [number, string];
 declare const sn: [string, number];
 declare const f20: <T extends unknown[]>(...args: T) => T;
-declare type T01 = Parameters<(x: number, y: string, ...z: boolean[]) => void>;
-declare type T02 = Parameters<(...args: [number, string, ...boolean[]]) => void>;
-declare type T03 = ConstructorParameters<new (x: number, y: string, ...z: boolean[]) => void>;
-declare type T04 = ConstructorParameters<new (...args: [number, string, ...boolean[]]) => void>;
-declare type T05<T extends any[]> = Parameters<(x: string, ...args: T) => void>;
-declare type T06 = T05<[number, ...boolean[]]>;
-declare type P1<T extends Function> = T extends (head: infer A, ...tail: infer B) => any ? {
+type T01 = Parameters<(x: number, y: string, ...z: boolean[]) => void>;
+type T02 = Parameters<(...args: [number, string, ...boolean[]]) => void>;
+type T03 = ConstructorParameters<new (x: number, y: string, ...z: boolean[]) => void>;
+type T04 = ConstructorParameters<new (...args: [number, string, ...boolean[]]) => void>;
+type T05<T extends any[]> = Parameters<(x: string, ...args: T) => void>;
+type T06 = T05<[number, ...boolean[]]>;
+type P1<T extends Function> = T extends (head: infer A, ...tail: infer B) => any ? {
     head: A;
     tail: B;
 } : any[];
-declare type T10 = P1<(x: number, y: string, ...z: boolean[]) => void>;
-declare type T11 = P1<(...z: number[]) => void>;
-declare type T12 = P1<(x: number, y: number) => void>;
+type T10 = P1<(x: number, y: string, ...z: boolean[]) => void>;
+type T11 = P1<(...z: number[]) => void>;
+type T12 = P1<(x: number, y: number) => void>;
diff --git a/tests/baselines/reference/genericRestParameters3.js b/tests/baselines/reference/genericRestParameters3.js
index 880ebf286a560..c446c6f72250b 100644
--- a/tests/baselines/reference/genericRestParameters3.js
+++ b/tests/baselines/reference/genericRestParameters3.js
@@ -160,9 +160,9 @@ declare const ca: CoolArray<number>;
 declare function hmm<A extends [] | [number, string]>(...args: A): void;
 declare function foo2(...args: string[] | number[]): void;
 declare let x2: ReadonlyArray<string>;
-declare type RestParams = [y: string] | [y: number];
-declare type Signature = (x: string, ...rest: RestParams) => void;
-declare type MergedParams = Parameters<Signature>;
+type RestParams = [y: string] | [y: number];
+type Signature = (x: string, ...rest: RestParams) => void;
+type MergedParams = Parameters<Signature>;
 declare let ff1: (...rest: [string, string] | [string, number]) => void;
 declare let ff2: (x: string, ...rest: [string] | [number]) => void;
 declare function ff3<A extends unknown[]>(s1: (...args: [x: string, ...rest: A | [number]]) => void, s2: (x: string, ...rest: A | [number]) => void): void;
diff --git a/tests/baselines/reference/identityRelationNeverTypes.js b/tests/baselines/reference/identityRelationNeverTypes.js
index efe85defc1bf8..06e59d6f5705c 100644
--- a/tests/baselines/reference/identityRelationNeverTypes.js
+++ b/tests/baselines/reference/identityRelationNeverTypes.js
@@ -29,7 +29,7 @@ function f1(state) {
 
 
 //// [identityRelationNeverTypes.d.ts]
-declare type Equals<A, B> = (<T>() => T extends B ? 1 : 0) extends (<T>() => T extends A ? 1 : 0) ? true : false;
+type Equals<A, B> = (<T>() => T extends B ? 1 : 0) extends (<T>() => T extends A ? 1 : 0) ? true : false;
 declare class State<TContext> {
     _context: TContext;
     _value: string;
diff --git a/tests/baselines/reference/importTypeGenericArrowTypeParenthesized.js b/tests/baselines/reference/importTypeGenericArrowTypeParenthesized.js
index 2de796f19baf1..85b2b7945b526 100644
--- a/tests/baselines/reference/importTypeGenericArrowTypeParenthesized.js
+++ b/tests/baselines/reference/importTypeGenericArrowTypeParenthesized.js
@@ -37,6 +37,6 @@ exports.works2 = (0, module_1.fn)(function (x) { return x; });
 export declare const fail1: import("module").Modifier<(<T>(x: T) => T)>;
 export declare const fail2: import("module").Modifier<(<T>(x: T) => T)>;
 export declare const works1: import("module").Modifier<(x: number) => number>;
-declare type MakeItWork = <T>(x: T) => T;
+type MakeItWork = <T>(x: T) => T;
 export declare const works2: import("module").Modifier<MakeItWork>;
 export {};
diff --git a/tests/baselines/reference/indexSignatureAndMappedType.js b/tests/baselines/reference/indexSignatureAndMappedType.js
index be58286fb46cc..ae8ea8edfb9ab 100644
--- a/tests/baselines/reference/indexSignatureAndMappedType.js
+++ b/tests/baselines/reference/indexSignatureAndMappedType.js
@@ -61,7 +61,7 @@ declare function f2<T>(x: {
 declare function f3<T, U, K extends string>(x: {
     [key: string]: T;
 }, y: Record<K, U>): void;
-declare type Dictionary = {
+type Dictionary = {
     [key: string]: string;
 };
 interface IBaseEntity {
diff --git a/tests/baselines/reference/indexSignatures1.js b/tests/baselines/reference/indexSignatures1.js
index b50705230a2ca..c2bc8e9d71075 100644
--- a/tests/baselines/reference/indexSignatures1.js
+++ b/tests/baselines/reference/indexSignatures1.js
@@ -532,36 +532,36 @@ declare let dom: {
 };
 declare const y1: string;
 declare const y2: string;
-declare type Funcs = {
+type Funcs = {
     [key: `s${string}`]: (x: string) => void;
     [key: `n${string}`]: (x: number) => void;
 };
 declare const funcs: Funcs;
-declare type Duplicates = {
+type Duplicates = {
     [key: string | number]: any;
     [key: number | symbol]: any;
     [key: symbol | `foo${string}`]: any;
     [key: `foo${string}`]: any;
 };
-declare type Conflicting = {
+type Conflicting = {
     [key: `a${string}`]: 'a';
     [key: `${string}a`]: 'b';
     [key: `a${string}a`]: 'c';
 };
-declare type Invalid<T extends string> = {
+type Invalid<T extends string> = {
     [key: 'a' | 'b' | 'c']: string;
     [key: T | number]: string;
     [key: Error]: string;
     [key: T & string]: string;
 };
-declare type Tag1 = {
+type Tag1 = {
     __tag1__: void;
 };
-declare type Tag2 = {
+type Tag2 = {
     __tag2__: void;
 };
-declare type TaggedString1 = string & Tag1;
-declare type TaggedString2 = string & Tag2;
+type TaggedString1 = string & Tag1;
+type TaggedString2 = string & Tag2;
 declare let s0: string;
 declare let s1: TaggedString1;
 declare let s2: TaggedString2;
@@ -635,23 +635,23 @@ declare function foo<TArg, TRet, TDir>(options: {
 declare let case1: void;
 declare let case2: void;
 declare let case3: void;
-declare type Pseudo = `&:${string}`;
+type Pseudo = `&:${string}`;
 declare const AmIPseudo1: Pseudo;
 declare const AmIPseudo: Pseudo;
-declare type PseudoDeclaration = {
+type PseudoDeclaration = {
     [key in Pseudo]: string;
 };
 declare const test: PseudoDeclaration;
-declare type FieldPattern = `/${string}`;
+type FieldPattern = `/${string}`;
 declare const path1: FieldPattern;
 declare const path2: FieldPattern;
-declare type PathsObject = {
+type PathsObject = {
     [P in FieldPattern]: object;
 };
 declare const pathObject: PathsObject;
-declare type IdType = `${number}-${number}-${number}-${number}`;
+type IdType = `${number}-${number}-${number}-${number}`;
 declare const id: IdType;
-declare type A = Record<IdType, string>;
+type A = Record<IdType, string>;
 declare const a: A;
 declare let aid: string;
 interface AA {
@@ -669,12 +669,12 @@ declare const obj2: {
 declare const obj3: {
     [key: number]: string;
 };
-declare type Id = string & {
+type Id = string & {
     __tag: 'id ';
 };
-declare type Rec1 = {
+type Rec1 = {
     [key: Id]: number;
 };
-declare type Rec2 = Record<Id, number>;
-declare type K1 = keyof Rec1;
-declare type K2 = keyof Rec2;
+type Rec2 = Record<Id, number>;
+type K1 = keyof Rec1;
+type K2 = keyof Rec2;
diff --git a/tests/baselines/reference/inferFromGenericFunctionReturnTypes3.js b/tests/baselines/reference/inferFromGenericFunctionReturnTypes3.js
index b6a2e890b1159..1b7bfa610aaab 100644
--- a/tests/baselines/reference/inferFromGenericFunctionReturnTypes3.js
+++ b/tests/baselines/reference/inferFromGenericFunctionReturnTypes3.js
@@ -319,7 +319,7 @@ export declare namespace DiagnosticSeverity {
     const Information = 3;
     const Hint = 4;
 }
-export declare type DiagnosticSeverity = 1 | 2 | 3 | 4;
+export type DiagnosticSeverity = 1 | 2 | 3 | 4;
 export interface Diagnostic {
     severity?: DiagnosticSeverity;
     code?: number | string;
diff --git a/tests/baselines/reference/inferTypes2.js b/tests/baselines/reference/inferTypes2.js
index dbfa84964df10..047526b43828f 100644
--- a/tests/baselines/reference/inferTypes2.js
+++ b/tests/baselines/reference/inferTypes2.js
@@ -42,7 +42,7 @@ var b = a;
 //// [inferTypes2.d.ts]
 export declare function foo<T>(obj: T): T extends () => infer P ? P : never;
 export declare function bar<T>(obj: T): T extends () => infer P ? P : never;
-export declare type BadNested<T> = {
+export type BadNested<T> = {
     x: T extends number ? T : string;
 };
 export declare function foo2<T>(obj: T): T extends {
diff --git a/tests/baselines/reference/inferTypesWithExtends1.js b/tests/baselines/reference/inferTypesWithExtends1.js
index 6ce0739872373..001229427eaeb 100644
--- a/tests/baselines/reference/inferTypesWithExtends1.js
+++ b/tests/baselines/reference/inferTypesWithExtends1.js
@@ -146,153 +146,153 @@ function f2() {
 
 
 //// [inferTypesWithExtends1.d.ts]
-declare type X1<T extends any[]> = T extends [infer U extends string] ? ["string", U] : T extends [infer U extends number] ? ["number", U] : never;
-declare type X1_T1 = X1<["a"]>;
-declare type X1_T2 = X1<[1]>;
-declare type X1_T3 = X1<[object]>;
-declare type X2<T extends (...args: any[]) => void> = T extends (a: infer U extends string) => void ? ["string", U] : T extends (a: infer U extends number) => void ? ["number", U] : never;
-declare type X2_T1 = X2<(a: "a") => void>;
-declare type X2_T2 = X2<(a: 1) => void>;
-declare type X2_T3 = X2<(a: object) => void>;
-declare type X3<T extends (...args: any[]) => any> = T extends (...args: any[]) => (infer U extends string) ? ["string", U] : T extends (...args: any[]) => (infer U extends number) ? ["number", U] : never;
-declare type X3_T1 = X3<() => "a">;
-declare type X3_T2 = X3<() => 1>;
-declare type X3_T3 = X3<() => object>;
-declare type X4<T extends new (...args: any[]) => any> = T extends new (...args: any[]) => (infer U extends {
+type X1<T extends any[]> = T extends [infer U extends string] ? ["string", U] : T extends [infer U extends number] ? ["number", U] : never;
+type X1_T1 = X1<["a"]>;
+type X1_T2 = X1<[1]>;
+type X1_T3 = X1<[object]>;
+type X2<T extends (...args: any[]) => void> = T extends (a: infer U extends string) => void ? ["string", U] : T extends (a: infer U extends number) => void ? ["number", U] : never;
+type X2_T1 = X2<(a: "a") => void>;
+type X2_T2 = X2<(a: 1) => void>;
+type X2_T3 = X2<(a: object) => void>;
+type X3<T extends (...args: any[]) => any> = T extends (...args: any[]) => (infer U extends string) ? ["string", U] : T extends (...args: any[]) => (infer U extends number) ? ["number", U] : never;
+type X3_T1 = X3<() => "a">;
+type X3_T2 = X3<() => 1>;
+type X3_T3 = X3<() => object>;
+type X4<T extends new (...args: any[]) => any> = T extends new (...args: any[]) => (infer U extends {
     a: string;
 }) ? ["string", U] : T extends new (...args: any[]) => (infer U extends {
     a: number;
 }) ? ["number", U] : never;
-declare type X4_T1 = X4<new () => {
+type X4_T1 = X4<new () => {
     a: "a";
 }>;
-declare type X4_T2 = X4<new () => {
+type X4_T2 = X4<new () => {
     a: 1;
 }>;
-declare type X4_T3 = X4<new () => {
+type X4_T3 = X4<new () => {
     a: object;
 }>;
-declare type X5<T> = T extends Promise<infer U extends string> ? ["string", U] : T extends Promise<infer U extends number> ? ["number", U] : never;
-declare type X5_T1 = X5<Promise<"a" | "b">>;
-declare type X5_T2 = X5<Promise<1 | 2>>;
-declare type X5_T3 = X5<Promise<1n | 2n>>;
-declare type X6<T> = T extends {
+type X5<T> = T extends Promise<infer U extends string> ? ["string", U] : T extends Promise<infer U extends number> ? ["number", U] : never;
+type X5_T1 = X5<Promise<"a" | "b">>;
+type X5_T2 = X5<Promise<1 | 2>>;
+type X5_T3 = X5<Promise<1n | 2n>>;
+type X6<T> = T extends {
     a: infer U extends string;
 } ? ["string", U] : T extends {
     a: infer U extends number;
 } ? ["number", U] : never;
-declare type X6_T1 = X6<{
+type X6_T1 = X6<{
     a: "a";
 }>;
-declare type X6_T2 = X6<{
+type X6_T2 = X6<{
     a: 1;
 }>;
-declare type X6_T3 = X6<{
+type X6_T3 = X6<{
     a: object;
 }>;
-declare type X7<T> = T extends {
+type X7<T> = T extends {
     a: infer U extends string;
     b: infer U extends string;
 } ? ["string", U] : T extends {
     a: infer U extends number;
     b: infer U extends number;
 } ? ["number", U] : never;
-declare type X7_T1 = X7<{
+type X7_T1 = X7<{
     a: "a";
     b: "b";
 }>;
-declare type X7_T2 = X7<{
+type X7_T2 = X7<{
     a: 1;
     b: 2;
 }>;
-declare type X7_T3 = X7<{
+type X7_T3 = X7<{
     a: object;
     b: object;
 }>;
-declare type X7_T4 = X7<{
+type X7_T4 = X7<{
     a: "a";
     b: 1;
 }>;
-declare type X8<T> = T extends {
+type X8<T> = T extends {
     a: infer U extends string;
     b: infer U;
 } ? ["string", U] : T extends {
     a: infer U extends number;
     b: infer U;
 } ? ["number", U] : never;
-declare type X8_T1 = X8<{
+type X8_T1 = X8<{
     a: "a";
     b: "b";
 }>;
-declare type X8_T2 = X8<{
+type X8_T2 = X8<{
     a: 1;
     b: 2;
 }>;
-declare type X8_T3 = X8<{
+type X8_T3 = X8<{
     a: object;
     b: object;
 }>;
-declare type X8_T4 = X8<{
+type X8_T4 = X8<{
     a: "a";
     b: 1;
 }>;
-declare type X9<T> = T extends {
+type X9<T> = T extends {
     a: infer U;
     b: infer U extends string;
 } ? ["string", U] : T extends {
     a: infer U;
     b: infer U extends number;
 } ? ["number", U] : never;
-declare type X9_T1 = X9<{
+type X9_T1 = X9<{
     a: "a";
     b: "b";
 }>;
-declare type X9_T2 = X9<{
+type X9_T2 = X9<{
     a: 1;
     b: 2;
 }>;
-declare type X9_T3 = X9<{
+type X9_T3 = X9<{
     a: object;
     b: object;
 }>;
-declare type X9_T4 = X9<{
+type X9_T4 = X9<{
     a: "a";
     b: 1;
 }>;
-declare type X10<T> = T extends (infer U extends number ? 1 : 0) ? 1 : 0;
-declare type X10_Y1<T> = X10<T extends number ? 1 : 0>;
-declare type X10_T1_T1 = X10_Y1<number>;
-declare type X11<T> = T extends ((infer U) extends number ? 1 : 0) ? 1 : 0;
-declare type X12<T> = T extends (infer U extends number) ? 1 : 0;
-declare type X13<T> = T extends infer U extends number ? 1 : 0;
-declare type X14<T> = T extends keyof infer U extends number ? 1 : 0;
-declare type X15<T> = T extends {
+type X10<T> = T extends (infer U extends number ? 1 : 0) ? 1 : 0;
+type X10_Y1<T> = X10<T extends number ? 1 : 0>;
+type X10_T1_T1 = X10_Y1<number>;
+type X11<T> = T extends ((infer U) extends number ? 1 : 0) ? 1 : 0;
+type X12<T> = T extends (infer U extends number) ? 1 : 0;
+type X13<T> = T extends infer U extends number ? 1 : 0;
+type X14<T> = T extends keyof infer U extends number ? 1 : 0;
+type X15<T> = T extends {
     [P in infer U extends keyof T ? 1 : 0]: 1;
 } ? 1 : 0;
-declare type X16<T> = T extends {
+type X16<T> = T extends {
     [P in infer U extends keyof T]: 1;
 } ? 1 : 0;
-declare type X17<T> = T extends {
+type X17<T> = T extends {
     [P in keyof T as infer U extends P ? 1 : 0]: 1;
 } ? 1 : 0;
-declare type X18<T> = T extends {
+type X18<T> = T extends {
     [P in keyof T as infer U extends P]: 1;
 } ? 1 : 0;
-declare type X19<T extends string | number> = T extends (infer U extends number) ? [T, U] : never;
-declare type X19_T1 = X19<"a">;
-declare type X19_T2 = X19<1>;
-declare type X19_T3 = X19<1 | "a">;
-declare type X20<T> = T extends (infer U extends number) ? T extends (infer V extends U) ? [T, U, V] : never : never;
-declare type X20_T1 = X20<1 | "a">;
-declare type X21<T, N extends number> = T extends (infer U extends N) ? [T, U] : never;
-declare type X21_T1 = X21<1, 1>;
-declare type X21_T2 = X21<1 | "a", 1>;
-declare type X21_T3 = X21<1 | 2, 1>;
-declare type X21_T4 = X21<1 | 2, 2 | 3>;
-declare type X21_T5 = X21<1 | 2, 3>;
-declare type IfEquals<X, Y, A, B> = (<T>() => T extends X ? 1 : 2) extends <T>() => T extends Y ? 1 : 2 ? A : B;
+type X19<T extends string | number> = T extends (infer U extends number) ? [T, U] : never;
+type X19_T1 = X19<"a">;
+type X19_T2 = X19<1>;
+type X19_T3 = X19<1 | "a">;
+type X20<T> = T extends (infer U extends number) ? T extends (infer V extends U) ? [T, U, V] : never : never;
+type X20_T1 = X20<1 | "a">;
+type X21<T, N extends number> = T extends (infer U extends N) ? [T, U] : never;
+type X21_T1 = X21<1, 1>;
+type X21_T2 = X21<1 | "a", 1>;
+type X21_T3 = X21<1 | 2, 1>;
+type X21_T4 = X21<1 | 2, 2 | 3>;
+type X21_T5 = X21<1 | 2, 3>;
+type IfEquals<X, Y, A, B> = (<T>() => T extends X ? 1 : 2) extends <T>() => T extends Y ? 1 : 2 ? A : B;
 declare const x1: <T>() => (T extends infer U extends number ? 1 : 0);
 declare function f1(): <T>() => T extends infer U extends number ? 1 : 0;
-declare type ExpectNumber<T extends number> = T;
+type ExpectNumber<T extends number> = T;
 declare const x2: <T>() => (T extends ExpectNumber<infer U> ? 1 : 0);
 declare function f2(): <T>() => T extends infer U extends number ? 1 : 0;
diff --git a/tests/baselines/reference/instantiatedTypeAliasDisplay.js b/tests/baselines/reference/instantiatedTypeAliasDisplay.js
index 272266e0bea1a..376f2aeac95a4 100644
--- a/tests/baselines/reference/instantiatedTypeAliasDisplay.js
+++ b/tests/baselines/reference/instantiatedTypeAliasDisplay.js
@@ -28,7 +28,7 @@ interface X<A> {
 interface Y<B> {
     b: B;
 }
-declare type Z<A, B> = X<A> | Y<B>;
+type Z<A, B> = X<A> | Y<B>;
 declare function f1<A>(): Z<A, number>;
 declare function f2<A, B, C, D, E>(a: A, b: B, c: C, d: D): Z<A, string[]>;
 declare const x1: Z<string, number>;
diff --git a/tests/baselines/reference/instantiationExpressions.js b/tests/baselines/reference/instantiationExpressions.js
index 4d1ec7817d82a..d10ef4b73f3f0 100644
--- a/tests/baselines/reference/instantiationExpressions.js
+++ b/tests/baselines/reference/instantiationExpressions.js
@@ -275,14 +275,14 @@ declare function fx<T>(x: T): T;
 declare function fx<T>(x: T, n: number): T;
 declare function fx<T, U>(t: [T, U]): [T, U];
 declare function f1(): void;
-declare type T10 = typeof fx;
-declare type T11 = typeof fx<string>;
-declare type T12 = typeof fx<string, number>;
-declare type T13 = typeof fx<string, number, boolean>;
+type T10 = typeof fx;
+type T11 = typeof fx<string>;
+type T12 = typeof fx<string, number>;
+type T13 = typeof fx<string, number, boolean>;
 declare function f2(): void;
-declare type T20 = typeof Array;
-declare type T21 = typeof Array<string>;
-declare type T22 = typeof Array<string, number>;
+type T20 = typeof Array;
+type T21 = typeof Array<string>;
+type T22 = typeof Array<string, number>;
 declare class C<T> {
     constructor(x: T);
     static f<U>(x: U): U[];
@@ -352,11 +352,11 @@ declare function f38<T extends (<A>(x: A) => A) | (<B>(x: B) => B[]), U>(f: T |
 declare function makeBox<T>(value: T): {
     value: T;
 };
-declare type BoxFunc<T> = typeof makeBox<T>;
-declare type StringBoxFunc = BoxFunc<string>;
-declare type Box<T> = ReturnType<typeof makeBox<T>>;
-declare type StringBox = Box<string>;
-declare type A<U> = InstanceType<typeof Array<U>>;
+type BoxFunc<T> = typeof makeBox<T>;
+type StringBoxFunc = BoxFunc<string>;
+type Box<T> = ReturnType<typeof makeBox<T>>;
+type StringBox = Box<string>;
+type A<U> = InstanceType<typeof Array<U>>;
 declare const g1: {
     <T>(a: T): {
         a: T;
@@ -365,18 +365,18 @@ declare const g1: {
         b: U;
     };
 };
-declare type T30<V> = typeof g1<V>;
-declare type T31<A> = ReturnType<T30<A>>;
-declare type T32<B> = InstanceType<T30<B>>;
+type T30<V> = typeof g1<V>;
+type T31<A> = ReturnType<T30<A>>;
+type T32<B> = InstanceType<T30<B>>;
 declare const g2: {
     <T extends string>(a: T): T;
     new <T extends number>(b: T): T;
 };
-declare type T40<U extends string> = typeof g2<U>;
-declare type T41<U extends number> = typeof g2<U>;
+type T40<U extends string> = typeof g2<U>;
+type T41<U extends number> = typeof g2<U>;
 declare const g3: {
     <T extends string>(a: T): T;
     new <T extends number, Q>(b: T): T;
 };
-declare type T50<U extends string> = typeof g3<U>;
-declare type T51<U extends number> = typeof g3<U, any>;
+type T50<U extends string> = typeof g3<U>;
+type T51<U extends number> = typeof g3<U, any>;
diff --git a/tests/baselines/reference/intraExpressionInferences.js b/tests/baselines/reference/intraExpressionInferences.js
index b2ce11d0d9311..e1b3a992695e6 100644
--- a/tests/baselines/reference/intraExpressionInferences.js
+++ b/tests/baselines/reference/intraExpressionInferences.js
@@ -338,7 +338,7 @@ declare function foo<A>(options: {
     a: A;
     b: (a: A) => void;
 }): void;
-declare type Chain<R1, R2> = {
+type Chain<R1, R2> = {
     a(): R1;
     b(a: R1): R2;
     c(b: R2): void;
@@ -347,11 +347,11 @@ declare function test<R1, R2>(foo: Chain<R1, R2>): void;
 declare class Wrapper<T = any> {
     value?: T;
 }
-declare type WrappedMap = Record<string, Wrapper>;
-declare type Unwrap<D extends WrappedMap> = {
+type WrappedMap = Record<string, Wrapper>;
+type Unwrap<D extends WrappedMap> = {
     [K in keyof D]: D[K] extends Wrapper<infer T> ? T : never;
 };
-declare type MappingComponent<I extends WrappedMap, O extends WrappedMap> = {
+type MappingComponent<I extends WrappedMap, O extends WrappedMap> = {
     setup(): {
         inputs: I;
         outputs: O;
diff --git a/tests/baselines/reference/intrinsicTypes.js b/tests/baselines/reference/intrinsicTypes.js
index c8cb24fb9c5c3..4a5ee562df2be 100644
--- a/tests/baselines/reference/intrinsicTypes.js
+++ b/tests/baselines/reference/intrinsicTypes.js
@@ -74,36 +74,36 @@ function foo4(x) {
 
 
 //// [intrinsicTypes.d.ts]
-declare type TU1 = Uppercase<'hello'>;
-declare type TU2 = Uppercase<'foo' | 'bar'>;
-declare type TU3 = Uppercase<string>;
-declare type TU4 = Uppercase<any>;
-declare type TU5 = Uppercase<never>;
-declare type TU6 = Uppercase<42>;
-declare type TL1 = Lowercase<'HELLO'>;
-declare type TL2 = Lowercase<'FOO' | 'BAR'>;
-declare type TL3 = Lowercase<string>;
-declare type TL4 = Lowercase<any>;
-declare type TL5 = Lowercase<never>;
-declare type TL6 = Lowercase<42>;
-declare type TC1 = Capitalize<'hello'>;
-declare type TC2 = Capitalize<'foo' | 'bar'>;
-declare type TC3 = Capitalize<string>;
-declare type TC4 = Capitalize<any>;
-declare type TC5 = Capitalize<never>;
-declare type TC6 = Capitalize<42>;
-declare type TN1 = Uncapitalize<'Hello'>;
-declare type TN2 = Uncapitalize<'Foo' | 'Bar'>;
-declare type TN3 = Uncapitalize<string>;
-declare type TN4 = Uncapitalize<any>;
-declare type TN5 = Uncapitalize<never>;
-declare type TN6 = Uncapitalize<42>;
-declare type TX1<S extends string> = Uppercase<`aB${S}`>;
-declare type TX2 = TX1<'xYz'>;
-declare type TX3<S extends string> = Lowercase<`aB${S}`>;
-declare type TX4 = TX3<'xYz'>;
-declare type TX5 = `${Uppercase<'abc'>}${Lowercase<'XYZ'>}`;
-declare type MyUppercase<S extends string> = intrinsic;
+type TU1 = Uppercase<'hello'>;
+type TU2 = Uppercase<'foo' | 'bar'>;
+type TU3 = Uppercase<string>;
+type TU4 = Uppercase<any>;
+type TU5 = Uppercase<never>;
+type TU6 = Uppercase<42>;
+type TL1 = Lowercase<'HELLO'>;
+type TL2 = Lowercase<'FOO' | 'BAR'>;
+type TL3 = Lowercase<string>;
+type TL4 = Lowercase<any>;
+type TL5 = Lowercase<never>;
+type TL6 = Lowercase<42>;
+type TC1 = Capitalize<'hello'>;
+type TC2 = Capitalize<'foo' | 'bar'>;
+type TC3 = Capitalize<string>;
+type TC4 = Capitalize<any>;
+type TC5 = Capitalize<never>;
+type TC6 = Capitalize<42>;
+type TN1 = Uncapitalize<'Hello'>;
+type TN2 = Uncapitalize<'Foo' | 'Bar'>;
+type TN3 = Uncapitalize<string>;
+type TN4 = Uncapitalize<any>;
+type TN5 = Uncapitalize<never>;
+type TN6 = Uncapitalize<42>;
+type TX1<S extends string> = Uppercase<`aB${S}`>;
+type TX2 = TX1<'xYz'>;
+type TX3<S extends string> = Lowercase<`aB${S}`>;
+type TX4 = TX3<'xYz'>;
+type TX5 = `${Uppercase<'abc'>}${Lowercase<'XYZ'>}`;
+type MyUppercase<S extends string> = intrinsic;
 declare function foo1<T extends string, U extends T>(s: string, x: Uppercase<T>, y: Uppercase<U>): void;
 declare function foo2<T extends 'foo' | 'bar'>(x: Uppercase<T>): void;
 declare function foo3<T extends string>(x: Uppercase<T>): T;
diff --git a/tests/baselines/reference/isomorphicMappedTypeInference.js b/tests/baselines/reference/isomorphicMappedTypeInference.js
index 04f6bfbff1ea7..6e1c1b6dfd615 100644
--- a/tests/baselines/reference/isomorphicMappedTypeInference.js
+++ b/tests/baselines/reference/isomorphicMappedTypeInference.js
@@ -298,10 +298,10 @@ var o2 = getProps(myAny, ['foo', 'bar']);
 
 
 //// [isomorphicMappedTypeInference.d.ts]
-declare type Box<T> = {
+type Box<T> = {
     value: T;
 };
-declare type Boxified<T> = {
+type Boxified<T> = {
     [P in keyof T]: Box<T[P]>;
 };
 declare function box<T>(x: T): Box<T>;
@@ -332,13 +332,13 @@ declare function clone<T>(obj: {
 declare function validateAndClone<T>(obj: {
     readonly [P in keyof T]?: T[P];
 }): T;
-declare type Foo = {
+type Foo = {
     a?: number;
     readonly b: string;
 };
 declare function f10(foo: Foo): void;
-declare type Func<T> = (...args: any[]) => T;
-declare type Spec<T> = {
+type Func<T> = (...args: any[]) => T;
+type Spec<T> = {
     [P in keyof T]: Func<T[P]> | Spec<T[P]>;
 };
 /**
diff --git a/tests/baselines/reference/keyofAndIndexedAccess.js b/tests/baselines/reference/keyofAndIndexedAccess.js
index f7c34bdb3329f..5b4210c1f82eb 100644
--- a/tests/baselines/reference/keyofAndIndexedAccess.js
+++ b/tests/baselines/reference/keyofAndIndexedAccess.js
@@ -1115,10 +1115,10 @@ declare class Item {
 declare class Options {
     visible: "yes" | "no";
 }
-declare type Dictionary<T> = {
+type Dictionary<T> = {
     [x: string]: T;
 };
-declare type NumericallyIndexed<T> = {
+type NumericallyIndexed<T> = {
     [x: number]: T;
 };
 declare const enum E {
@@ -1126,47 +1126,47 @@ declare const enum E {
     B = 1,
     C = 2
 }
-declare type K00 = keyof any;
-declare type K01 = keyof string;
-declare type K02 = keyof number;
-declare type K03 = keyof boolean;
-declare type K04 = keyof void;
-declare type K05 = keyof undefined;
-declare type K06 = keyof null;
-declare type K07 = keyof never;
-declare type K08 = keyof unknown;
-declare type K10 = keyof Shape;
-declare type K11 = keyof Shape[];
-declare type K12 = keyof Dictionary<Shape>;
-declare type K13 = keyof {};
-declare type K14 = keyof Object;
-declare type K15 = keyof E;
-declare type K16 = keyof [string, number];
-declare type K17 = keyof (Shape | Item);
-declare type K18 = keyof (Shape & Item);
-declare type K19 = keyof NumericallyIndexed<Shape>;
-declare type KeyOf<T> = keyof T;
-declare type K20 = KeyOf<Shape>;
-declare type K21 = KeyOf<Dictionary<Shape>>;
-declare type NAME = "name";
-declare type WIDTH_OR_HEIGHT = "width" | "height";
-declare type Q10 = Shape["name"];
-declare type Q11 = Shape["width" | "height"];
-declare type Q12 = Shape["name" | "visible"];
-declare type Q20 = Shape[NAME];
-declare type Q21 = Shape[WIDTH_OR_HEIGHT];
-declare type Q30 = [string, number][0];
-declare type Q31 = [string, number][1];
-declare type Q32 = [string, number][number];
-declare type Q33 = [string, number][E.A];
-declare type Q34 = [string, number][E.B];
-declare type Q35 = [string, number]["0"];
-declare type Q36 = [string, number]["1"];
-declare type Q40 = (Shape | Options)["visible"];
-declare type Q41 = (Shape & Options)["visible"];
-declare type Q50 = Dictionary<Shape>["howdy"];
-declare type Q51 = Dictionary<Shape>[123];
-declare type Q52 = Dictionary<Shape>[E.B];
+type K00 = keyof any;
+type K01 = keyof string;
+type K02 = keyof number;
+type K03 = keyof boolean;
+type K04 = keyof void;
+type K05 = keyof undefined;
+type K06 = keyof null;
+type K07 = keyof never;
+type K08 = keyof unknown;
+type K10 = keyof Shape;
+type K11 = keyof Shape[];
+type K12 = keyof Dictionary<Shape>;
+type K13 = keyof {};
+type K14 = keyof Object;
+type K15 = keyof E;
+type K16 = keyof [string, number];
+type K17 = keyof (Shape | Item);
+type K18 = keyof (Shape & Item);
+type K19 = keyof NumericallyIndexed<Shape>;
+type KeyOf<T> = keyof T;
+type K20 = KeyOf<Shape>;
+type K21 = KeyOf<Dictionary<Shape>>;
+type NAME = "name";
+type WIDTH_OR_HEIGHT = "width" | "height";
+type Q10 = Shape["name"];
+type Q11 = Shape["width" | "height"];
+type Q12 = Shape["name" | "visible"];
+type Q20 = Shape[NAME];
+type Q21 = Shape[WIDTH_OR_HEIGHT];
+type Q30 = [string, number][0];
+type Q31 = [string, number][1];
+type Q32 = [string, number][number];
+type Q33 = [string, number][E.A];
+type Q34 = [string, number][E.B];
+type Q35 = [string, number]["0"];
+type Q36 = [string, number]["1"];
+type Q40 = (Shape | Options)["visible"];
+type Q41 = (Shape & Options)["visible"];
+type Q50 = Dictionary<Shape>["howdy"];
+type Q51 = Dictionary<Shape>[123];
+type Q52 = Dictionary<Shape>[E.B];
 declare let cond: boolean;
 declare function getProperty<T, K extends keyof T>(obj: T, key: K): T[K];
 declare function setProperty<T, K extends keyof T>(obj: T, key: K, value: T[K]): void;
@@ -1231,7 +1231,7 @@ declare class C1 {
     set<K extends keyof this>(key: K, value: this[K]): void;
     foo(): void;
 }
-declare type S2 = {
+type S2 = {
     a: string;
     b: string;
 };
@@ -1256,7 +1256,7 @@ declare function path<T, K1 extends keyof T>(obj: T, key1: K1): T[K1];
 declare function path<T, K1 extends keyof T, K2 extends keyof T[K1]>(obj: T, key1: K1, key2: K2): T[K1][K2];
 declare function path<T, K1 extends keyof T, K2 extends keyof T[K1], K3 extends keyof T[K1][K2]>(obj: T, key1: K1, key2: K2, key3: K3): T[K1][K2][K3];
 declare function path(obj: any, ...keys: (string | number)[]): any;
-declare type Thing = {
+type Thing = {
     a: {
         x: number;
         y: string;
@@ -1267,7 +1267,7 @@ declare function f1(thing: Thing): void;
 declare const assignTo2: <T, K1 extends keyof T, K2 extends keyof T[K1]>(object: T, key1: K1, key2: K2) => (value: T[K1][K2]) => T[K1][K2];
 declare function one<T>(handler: (t: T) => void): T;
 declare var empty: unknown;
-declare type Handlers<T> = {
+type Handlers<T> = {
     [K in keyof T]: (t: T[K]) => void;
 };
 declare function on<T>(handlerHash: Handlers<T>): T;
@@ -1300,24 +1300,24 @@ interface R {
     p: number;
 }
 declare function f<K extends keyof R>(p: K): void;
-declare type MethodDescriptor = {
+type MethodDescriptor = {
     name: string;
     args: any[];
     returnValue: any;
 };
 declare function dispatchMethod<M extends MethodDescriptor>(name: M['name'], args: M['args']): M['returnValue'];
-declare type SomeMethodDescriptor = {
+type SomeMethodDescriptor = {
     name: "someMethod";
     args: [string, number];
     returnValue: string[];
 };
 declare let result: string[];
-declare type KeyTypes = "a" | "b";
+type KeyTypes = "a" | "b";
 declare let MyThingy: {
     [key in KeyTypes]: string[];
 };
 declare function addToMyThingy<S extends KeyTypes>(key: S): void;
-declare type Handler<T> = {
+type Handler<T> = {
     onChange: (name: keyof T) => void;
 };
 declare function onChangeGenericFunction<T>(handler: Handler<T & {
@@ -1357,17 +1357,17 @@ declare class AnotherSampleClass<T> extends SampleClass<T & Foo> {
     brokenMethod(): void;
 }
 declare function f3<T, K extends Extract<keyof T, string>>(t: T, k: K, tk: T[K]): void;
-declare type Predicates<TaggedRecord> = {
+type Predicates<TaggedRecord> = {
     [T in keyof TaggedRecord]: (variant: TaggedRecord[keyof TaggedRecord]) => variant is TaggedRecord[T];
 };
-declare type Example<T extends {
+type Example<T extends {
     [K in keyof T]: {
         prop: any;
     };
 }> = {
     [K in keyof T]: T[K]["prop"];
 };
-declare type Result = Example<{
+type Result = Example<{
     a: {
         prop: string;
     };
@@ -1375,15 +1375,15 @@ declare type Result = Example<{
         prop: number;
     };
 }>;
-declare type Helper2<T> = {
+type Helper2<T> = {
     [K in keyof T]: Extract<T[K], {
         prop: any;
     }>;
 };
-declare type Example2<T> = {
+type Example2<T> = {
     [K in keyof Helper2<T>]: Helper2<T>[K]["prop"];
 };
-declare type Result2 = Example2<{
+type Result2 = Example2<{
     1: {
         prop: string;
     };
@@ -1391,18 +1391,18 @@ declare type Result2 = Example2<{
         prop: number;
     };
 }>;
-declare type DBBoolTable<K extends string> = {
+type DBBoolTable<K extends string> = {
     [k in K]: 0 | 1;
 };
 declare enum Flag {
     FLAG_1 = "flag_1",
     FLAG_2 = "flag_2"
 }
-declare type SimpleDBRecord<Flag extends string> = {
+type SimpleDBRecord<Flag extends string> = {
     staticField: number;
 } & DBBoolTable<Flag>;
 declare function getFlagsFromSimpleRecord<Flag extends string>(record: SimpleDBRecord<Flag>, flags: Flag[]): SimpleDBRecord<Flag>[Flag];
-declare type DynamicDBRecord<Flag extends string> = ({
+type DynamicDBRecord<Flag extends string> = ({
     dynamicField: number;
 } | {
     dynamicField: string;
@@ -1419,12 +1419,12 @@ declare class Unbounded<T> {
 interface I7 {
     x: any;
 }
-declare type Foo7<T extends number> = T;
+type Foo7<T extends number> = T;
 declare function f7<K extends keyof I7>(type: K): Foo7<I7[K]>;
-declare type Dict<T extends string> = {
+type Dict<T extends string> = {
     [key in T]: number;
 };
-declare type DictDict<V extends string, T extends string> = {
+type DictDict<V extends string, T extends string> = {
     [key in V]: Dict<T>;
 };
 declare function ff1<V extends string, T extends string>(dd: DictDict<V, T>, k1: V, k2: T): number;
diff --git a/tests/baselines/reference/keyofIntersection.js b/tests/baselines/reference/keyofIntersection.js
index 3b6fc7eea1b72..e4c2f3cdb7f1a 100644
--- a/tests/baselines/reference/keyofIntersection.js
+++ b/tests/baselines/reference/keyofIntersection.js
@@ -32,25 +32,25 @@ type Result5 = Example5<Record<'x', any>, Record<'y', any>>;  // "x" | "y"
 
 
 //// [keyofIntersection.d.ts]
-declare type A = {
+type A = {
     a: string;
 };
-declare type B = {
+type B = {
     b: string;
 };
-declare type T01 = keyof (A & B);
-declare type T02<T> = keyof (T & B);
-declare type T03<U> = keyof (A & U);
-declare type T04<T, U> = keyof (T & U);
-declare type T05 = T02<A>;
-declare type T06 = T03<B>;
-declare type T07 = T04<A, B>;
-declare type Example1<T extends string, U extends string> = keyof (Record<T, any> & Record<U, any>);
-declare type Result1 = Example1<'x', 'y'>;
-declare type Result2 = keyof (Record<'x', any> & Record<'y', any>);
-declare type Example3<T extends string> = keyof (Record<T, any>);
-declare type Result3 = Example3<'x' | 'y'>;
-declare type Example4<T extends string, U extends string> = (Record<T, any> & Record<U, any>);
-declare type Result4 = keyof Example4<'x', 'y'>;
-declare type Example5<T, U> = keyof (T & U);
-declare type Result5 = Example5<Record<'x', any>, Record<'y', any>>;
+type T01 = keyof (A & B);
+type T02<T> = keyof (T & B);
+type T03<U> = keyof (A & U);
+type T04<T, U> = keyof (T & U);
+type T05 = T02<A>;
+type T06 = T03<B>;
+type T07 = T04<A, B>;
+type Example1<T extends string, U extends string> = keyof (Record<T, any> & Record<U, any>);
+type Result1 = Example1<'x', 'y'>;
+type Result2 = keyof (Record<'x', any> & Record<'y', any>);
+type Example3<T extends string> = keyof (Record<T, any>);
+type Result3 = Example3<'x' | 'y'>;
+type Example4<T extends string, U extends string> = (Record<T, any> & Record<U, any>);
+type Result4 = keyof Example4<'x', 'y'>;
+type Example5<T, U> = keyof (T & U);
+type Result5 = Example5<Record<'x', any>, Record<'y', any>>;
diff --git a/tests/baselines/reference/leaveOptionalParameterAsWritten.js b/tests/baselines/reference/leaveOptionalParameterAsWritten.js
index d2a519390a716..884aa4674c094 100644
--- a/tests/baselines/reference/leaveOptionalParameterAsWritten.js
+++ b/tests/baselines/reference/leaveOptionalParameterAsWritten.js
@@ -32,6 +32,6 @@ declare global {
     }
 }
 //// [c.d.ts]
-declare type Foo = teams.calling.Foo;
+type Foo = teams.calling.Foo;
 export declare const bar: (p?: Foo) => void;
 export {};
diff --git a/tests/baselines/reference/mapOnTupleTypes02.js b/tests/baselines/reference/mapOnTupleTypes02.js
index 352abb24af5c5..a043c81d837f0 100644
--- a/tests/baselines/reference/mapOnTupleTypes02.js
+++ b/tests/baselines/reference/mapOnTupleTypes02.js
@@ -16,5 +16,5 @@ exports.increment = increment;
 
 
 //// [mapOnTupleTypes02.d.ts]
-export declare type Point = [number, number];
+export type Point = [number, number];
 export declare function increment(point: Point): number[];
diff --git a/tests/baselines/reference/mappedTypeAsClauses.js b/tests/baselines/reference/mappedTypeAsClauses.js
index 3bd629f494cfc..fbe28929d3fa9 100644
--- a/tests/baselines/reference/mappedTypeAsClauses.js
+++ b/tests/baselines/reference/mappedTypeAsClauses.js
@@ -169,24 +169,24 @@ f("a"); // Error, should allow only "b"
 
 
 //// [mappedTypeAsClauses.d.ts]
-declare type Getters<T> = {
+type Getters<T> = {
     [P in keyof T & string as `get${Capitalize<P>}`]: () => T[P];
 };
-declare type TG1 = Getters<{
+type TG1 = Getters<{
     foo: string;
     bar: number;
     baz: {
         z: boolean;
     };
 }>;
-declare type PropDef<K extends keyof any, T> = {
+type PropDef<K extends keyof any, T> = {
     name: K;
     type: T;
 };
-declare type TypeFromDefs<T extends PropDef<keyof any, any>> = {
+type TypeFromDefs<T extends PropDef<keyof any, any>> = {
     [P in T as P['name']]: P['type'];
 };
-declare type TP1 = TypeFromDefs<{
+type TP1 = TypeFromDefs<{
     name: 'a';
     type: string;
 } | {
@@ -196,26 +196,26 @@ declare type TP1 = TypeFromDefs<{
     name: 'a';
     type: boolean;
 }>;
-declare type TA1 = Getters<string[]>;
-declare type TA2 = Getters<[number, boolean]>;
-declare type Methods<T> = {
+type TA1 = Getters<string[]>;
+type TA2 = Getters<[number, boolean]>;
+type Methods<T> = {
     [P in keyof T as T[P] extends Function ? P : never]: T[P];
 };
-declare type TM1 = Methods<{
+type TM1 = Methods<{
     foo(): number;
     bar(x: string): boolean;
     baz: string | number;
 }>;
-declare type DoubleProp<T> = {
+type DoubleProp<T> = {
     [P in keyof T & string as `${P}1` | `${P}2`]: T[P];
 };
-declare type TD1 = DoubleProp<{
+type TD1 = DoubleProp<{
     a: string;
     b: number;
 }>;
-declare type TD2 = keyof TD1;
-declare type TD3<U> = keyof DoubleProp<U>;
-declare type Lazyify<T> = {
+type TD2 = keyof TD1;
+type TD3<U> = keyof DoubleProp<U>;
+type Lazyify<T> = {
     [K in keyof T as `get${Capitalize<K & string>}`]: () => T[K];
 };
 interface Person {
@@ -223,17 +223,17 @@ interface Person {
     age: number;
     location?: string;
 }
-declare type LazyPerson = Lazyify<Person>;
-declare type Example = {
+type LazyPerson = Lazyify<Person>;
+type Example = {
     foo: string;
     bar: number;
 };
-declare type PickByValueType<T, U> = {
+type PickByValueType<T, U> = {
     [K in keyof T as T[K] extends U ? K : never]: T[K];
 };
-declare type T1 = PickByValueType<Example, string>;
+type T1 = PickByValueType<Example, string>;
 declare const e1: T1;
-declare type T2 = keyof T1;
+type T2 = keyof T1;
 declare const e2: T2;
 interface Car {
     name: string;
@@ -249,39 +249,39 @@ interface Wheel {
     type: "summer" | "winter";
     radius: number;
 }
-declare type Primitive = string | number | boolean;
-declare type OnlyPrimitives<T> = {
+type Primitive = string | number | boolean;
+type OnlyPrimitives<T> = {
     [K in keyof T as T[K] extends Primitive ? K : never]: T[K];
 };
 declare let primitiveCar: OnlyPrimitives<Car>;
 declare let keys: keyof OnlyPrimitives<Car>;
-declare type KeysOfPrimitives<T> = keyof OnlyPrimitives<T>;
+type KeysOfPrimitives<T> = keyof OnlyPrimitives<T>;
 declare let carKeys: KeysOfPrimitives<Car>;
-declare type Equal<A, B> = (<T>() => T extends A ? 1 : 2) extends (<T>() => T extends B ? 1 : 2) ? true : false;
-declare type If<Cond extends boolean, Then, Else> = Cond extends true ? Then : Else;
-declare type GetKey<S, V> = keyof {
+type Equal<A, B> = (<T>() => T extends A ? 1 : 2) extends (<T>() => T extends B ? 1 : 2) ? true : false;
+type If<Cond extends boolean, Then, Else> = Cond extends true ? Then : Else;
+type GetKey<S, V> = keyof {
     [TP in keyof S as Equal<S[TP], V> extends true ? TP : never]: any;
 };
-declare type GetKeyWithIf<S, V> = keyof {
+type GetKeyWithIf<S, V> = keyof {
     [TP in keyof S as If<Equal<S[TP], V>, TP, never>]: any;
 };
-declare type GetObjWithIf<S, V> = {
+type GetObjWithIf<S, V> = {
     [TP in keyof S as If<Equal<S[TP], V>, TP, never>]: any;
 };
-declare type Task = {
+type Task = {
     isDone: boolean;
 };
-declare type Schema = {
+type Schema = {
     root: {
         title: string;
         task: Task;
     };
     Task: Task;
 };
-declare type Res1 = GetKey<Schema, Schema['root']['task']>;
-declare type Res2 = GetKeyWithIf<Schema, Schema['root']['task']>;
-declare type Res3 = keyof GetObjWithIf<Schema, Schema['root']['task']>;
-declare type KeysExtendedBy<T, U> = keyof {
+type Res1 = GetKey<Schema, Schema['root']['task']>;
+type Res2 = GetKeyWithIf<Schema, Schema['root']['task']>;
+type Res3 = keyof GetObjWithIf<Schema, Schema['root']['task']>;
+type KeysExtendedBy<T, U> = keyof {
     [K in keyof T as U extends T[K] ? K : never]: T[K];
 };
 interface M {
@@ -289,48 +289,48 @@ interface M {
     b: number;
 }
 declare function f(x: KeysExtendedBy<M, number>): "b";
-declare type NameMap = {
+type NameMap = {
     'a': 'x';
     'b': 'y';
     'c': 'z';
 };
-declare type TS0<T> = keyof {
+type TS0<T> = keyof {
     [P in keyof T as keyof Record<P, number>]: string;
 };
-declare type TS1<T> = keyof {
+type TS1<T> = keyof {
     [P in keyof T as Extract<P, 'a' | 'b' | 'c'>]: string;
 };
-declare type TS2<T> = keyof {
+type TS2<T> = keyof {
     [P in keyof T as P & ('a' | 'b' | 'c')]: string;
 };
-declare type TS3<T> = keyof {
+type TS3<T> = keyof {
     [P in keyof T as Exclude<P, 'a' | 'b' | 'c'>]: string;
 };
-declare type TS4<T> = keyof {
+type TS4<T> = keyof {
     [P in keyof T as NameMap[P & keyof NameMap]]: string;
 };
-declare type TS5<T> = keyof {
+type TS5<T> = keyof {
     [P in keyof T & keyof NameMap as NameMap[P]]: string;
 };
-declare type TS6<T, U, V> = keyof {
+type TS6<T, U, V> = keyof {
     [K in keyof T as V & (K extends U ? K : never)]: string;
 };
-declare type TN0<T> = keyof {
+type TN0<T> = keyof {
     [P in keyof T as T[P] extends number ? P : never]: string;
 };
-declare type TN1<T> = keyof {
+type TN1<T> = keyof {
     [P in keyof T as number extends T[P] ? P : never]: string;
 };
-declare type TN2<T> = keyof {
+type TN2<T> = keyof {
     [P in keyof T as 'a' extends P ? 'x' : 'y']: string;
 };
-declare type TN3<T> = keyof {
+type TN3<T> = keyof {
     [P in keyof T as Exclude<Exclude<Exclude<P, 'c'>, 'b'>, 'a'>]: string;
 };
-declare type TN4<T, U> = keyof {
+type TN4<T, U> = keyof {
     [K in keyof T as (K extends U ? T[K] : never) extends T[K] ? K : never]: string;
 };
-declare type TN5<T, U> = keyof {
+type TN5<T, U> = keyof {
     [K in keyof T as keyof {
         [P in K as T[P] extends U ? K : never]: true;
     }]: string;
diff --git a/tests/baselines/reference/mappedTypeConstraints2.js b/tests/baselines/reference/mappedTypeConstraints2.js
index 3237f1d8b8107..442865e273a50 100644
--- a/tests/baselines/reference/mappedTypeConstraints2.js
+++ b/tests/baselines/reference/mappedTypeConstraints2.js
@@ -74,25 +74,25 @@ function validate(obj, bounds) {
 
 
 //// [mappedTypeConstraints2.d.ts]
-declare type Mapped1<K extends string> = {
+type Mapped1<K extends string> = {
     [P in K]: {
         a: P;
     };
 };
 declare function f1<K extends string>(obj: Mapped1<K>, key: K): void;
-declare type Mapped2<K extends string> = {
+type Mapped2<K extends string> = {
     [P in K as `get${P}`]: {
         a: P;
     };
 };
 declare function f2<K extends string>(obj: Mapped2<K>, key: `get${K}`): void;
-declare type Mapped3<K extends string> = {
+type Mapped3<K extends string> = {
     [P in K as Uppercase<P>]: {
         a: P;
     };
 };
 declare function f3<K extends string>(obj: Mapped3<K>, key: Uppercase<K>): void;
-declare type Foo<T extends string> = {
+type Foo<T extends string> = {
     [RemappedT in T as `get${RemappedT}`]: RemappedT;
 };
 declare const get: <T extends string>(t: T, foo: Foo<T>) => T;
@@ -100,7 +100,7 @@ interface Bounds {
     min: number;
     max: number;
 }
-declare type NumericBoundsOf<T> = {
+type NumericBoundsOf<T> = {
     [K in keyof T as T[K] extends number | undefined ? K : never]: Bounds;
 };
 declare function validate<T extends object>(obj: T, bounds: NumericBoundsOf<T>): boolean;
diff --git a/tests/baselines/reference/mappedTypeErrors.js b/tests/baselines/reference/mappedTypeErrors.js
index 276aeb76a1d15..2b8b024abad4d 100644
--- a/tests/baselines/reference/mappedTypeErrors.js
+++ b/tests/baselines/reference/mappedTypeErrors.js
@@ -255,23 +255,23 @@ interface Point {
     x: number;
     y: number;
 }
-declare type T00 = {
+type T00 = {
     [P in P]: string;
 };
-declare type T01 = {
+type T01 = {
     [P in number]: string;
 };
-declare type T02 = {
+type T02 = {
     [P in Date]: number;
 };
-declare type T03 = Record<Date, number>;
-declare type T10 = Pick<Shape, "name">;
-declare type T11 = Pick<Shape, "foo">;
-declare type T12 = Pick<Shape, "name" | "foo">;
-declare type T13 = Pick<Shape, keyof Named>;
-declare type T14 = Pick<Shape, keyof Point>;
-declare type T15 = Pick<Shape, never>;
-declare type T16 = Pick<Shape, undefined>;
+type T03 = Record<Date, number>;
+type T10 = Pick<Shape, "name">;
+type T11 = Pick<Shape, "foo">;
+type T12 = Pick<Shape, "name" | "foo">;
+type T13 = Pick<Shape, keyof Named>;
+type T14 = Pick<Shape, keyof Point>;
+type T15 = Pick<Shape, never>;
+type T16 = Pick<Shape, undefined>;
 declare function f1<T>(x: T): void;
 declare function f2<T extends string | number>(x: T): void;
 declare function f3<T extends keyof Shape>(x: T): void;
@@ -294,7 +294,7 @@ declare class C<T> {
     setState<K extends keyof T>(props: Pick<T, K>): void;
 }
 declare let c: C<Foo>;
-declare type T2 = {
+type T2 = {
     a?: number;
     [key: string]: any;
 };
@@ -303,7 +303,7 @@ declare let x2: Partial<T2>;
 declare let x3: {
     [P in keyof T2]: T2[P];
 };
-declare type Foo2<T, F extends keyof T> = {
+type Foo2<T, F extends keyof T> = {
     pf: {
         [P in F]?: T[P];
     };
@@ -311,7 +311,7 @@ declare type Foo2<T, F extends keyof T> = {
         [P in T]?: T[P];
     };
 };
-declare type O = {
+type O = {
     x: number;
     y: boolean;
 };
diff --git a/tests/baselines/reference/mappedTypeErrors2.js b/tests/baselines/reference/mappedTypeErrors2.js
index d9fc6b0bc723a..d59d41db477ba 100644
--- a/tests/baselines/reference/mappedTypeErrors2.js
+++ b/tests/baselines/reference/mappedTypeErrors2.js
@@ -25,25 +25,25 @@ type T7<S extends 'a'|'b', L extends 'a'> = {[key in AB[S]]: true}[L];
 
 
 //// [mappedTypeErrors2.d.ts]
-declare type AB = {
+type AB = {
     a: 'a';
     b: 'a';
 };
-declare type T1<K extends keyof AB> = {
+type T1<K extends keyof AB> = {
     [key in AB[K]]: true;
 };
-declare type T2<K extends 'a' | 'b'> = T1<K>[K];
-declare type R = AB[keyof AB];
-declare type T3 = {
+type T2<K extends 'a' | 'b'> = T1<K>[K];
+type R = AB[keyof AB];
+type T3 = {
     [key in R]: true;
 };
-declare type T4<K extends 'a' | 'b'> = T3[K];
-declare type T5<S extends 'a' | 'b' | 'extra'> = {
+type T4<K extends 'a' | 'b'> = T3[K];
+type T5<S extends 'a' | 'b' | 'extra'> = {
     [key in AB[S]]: true;
 }[S];
-declare type T6<S extends 'a' | 'b', L extends 'a' | 'b'> = {
+type T6<S extends 'a' | 'b', L extends 'a' | 'b'> = {
     [key in AB[S]]: true;
 }[L];
-declare type T7<S extends 'a' | 'b', L extends 'a'> = {
+type T7<S extends 'a' | 'b', L extends 'a'> = {
     [key in AB[S]]: true;
 }[L];
diff --git a/tests/baselines/reference/mappedTypeGenericIndexedAccess.js b/tests/baselines/reference/mappedTypeGenericIndexedAccess.js
index a06d9b27218a6..17f0dfa393373 100644
--- a/tests/baselines/reference/mappedTypeGenericIndexedAccess.js
+++ b/tests/baselines/reference/mappedTypeGenericIndexedAccess.js
@@ -69,7 +69,7 @@ var onSomeEvent = function (p) { var _a; return (_a = typeHandlers[p.t]) === nul
 
 
 //// [mappedTypeGenericIndexedAccess.d.ts]
-declare type Types = {
+type Types = {
     first: {
         a1: true;
     };
@@ -87,7 +87,7 @@ declare class Test {
     constructor();
     addEntry<T extends keyof Types>(name: T, entry: Types[T]): void;
 }
-declare type TypesMap = {
+type TypesMap = {
     [0]: {
         foo: 'bar';
     };
@@ -95,10 +95,10 @@ declare type TypesMap = {
         a: 'b';
     };
 };
-declare type P<T extends keyof TypesMap> = {
+type P<T extends keyof TypesMap> = {
     t: T;
 } & TypesMap[T];
-declare type TypeHandlers = {
+type TypeHandlers = {
     [T in keyof TypesMap]?: (p: P<T>) => void;
 };
 declare const typeHandlers: TypeHandlers;
diff --git a/tests/baselines/reference/mappedTypeGenericInstantiationPreservesHomomorphism.js b/tests/baselines/reference/mappedTypeGenericInstantiationPreservesHomomorphism.js
index 2523efd3efe39..aa5afe7ff437e 100644
--- a/tests/baselines/reference/mappedTypeGenericInstantiationPreservesHomomorphism.js
+++ b/tests/baselines/reference/mappedTypeGenericInstantiationPreservesHomomorphism.js
@@ -30,7 +30,7 @@ exports.mappedUnionWithPrivateType = mappedUnionWithPrivateType;
 
 //// [internal.d.ts]
 export declare function usePrivateType<T extends unknown[]>(...args: T): PrivateMapped<T[any]>;
-declare type PrivateMapped<Obj> = {
+type PrivateMapped<Obj> = {
     [K in keyof Obj]: Obj[K];
 };
 export {};
diff --git a/tests/baselines/reference/mappedTypeProperties.js b/tests/baselines/reference/mappedTypeProperties.js
index fce8364b0cec9..6eb4f7411a2fd 100644
--- a/tests/baselines/reference/mappedTypeProperties.js
+++ b/tests/baselines/reference/mappedTypeProperties.js
@@ -69,4 +69,4 @@ var E = (_b = /** @class */ (function () {
 
 
 //// [mappedTypeProperties.d.ts]
-export declare type PlaceType = 'openSky' | 'roofed' | 'garage';
+export type PlaceType = 'openSky' | 'roofed' | 'garage';
diff --git a/tests/baselines/reference/mappedTypeRelationships.js b/tests/baselines/reference/mappedTypeRelationships.js
index deb240454c395..69b94ca81e541 100644
--- a/tests/baselines/reference/mappedTypeRelationships.js
+++ b/tests/baselines/reference/mappedTypeRelationships.js
@@ -343,7 +343,7 @@ declare function f20<T>(x: T, y: Readonly<T>, k: keyof T): void;
 declare function f21<T, K extends keyof T>(x: T, y: Readonly<T>, k: K): void;
 declare function f22<T, U extends T>(x: T, y: Readonly<U>, k: keyof T): void;
 declare function f23<T, U extends T, K extends keyof T>(x: T, y: Readonly<U>, k: K): void;
-declare type Thing = {
+type Thing = {
     a: string;
     b: string;
 };
@@ -351,22 +351,22 @@ declare function f30<T>(x: T, y: Partial<T>): void;
 declare function f31<T extends Thing>(x: Partial<Thing>, y: Partial<T>): void;
 declare function f40<T>(x: T, y: Readonly<T>): void;
 declare function f41<T extends Thing>(x: Readonly<Thing>, y: Readonly<T>): void;
-declare type Item = {
+type Item = {
     name: string;
 };
-declare type ItemMap = {
+type ItemMap = {
     [x: string]: Item;
 };
 declare function f50<T extends ItemMap>(obj: T, key: keyof T): string;
 declare function f51<T extends ItemMap, K extends keyof T>(obj: T, key: K): string;
-declare type T1<T> = {
+type T1<T> = {
     [P in keyof T]: T[P];
 };
-declare type T2<T> = {
+type T2<T> = {
     [P in keyof T]: T[P];
 };
 declare function f60<U>(x: T1<U>, y: T2<U>): void;
-declare type Identity<T> = {
+type Identity<T> = {
     [P in keyof T]: T[P];
 };
 declare function f61<U>(x: Identity<U>, y: Partial<U>): void;
@@ -409,7 +409,7 @@ declare function f76<T, U extends T, K extends keyof T>(x: {
 declare function f80<T>(t: T): Partial<T>;
 declare function f81<T, K extends keyof T>(t: T, k: K): Partial<T[K]>;
 declare function f82<T, K1 extends keyof T, K2 extends keyof T[K1]>(t: T, k1: K1, k2: K2): Partial<T[K1][K2]>;
-declare type Numeric<T> = {
+type Numeric<T> = {
     [K in keyof T]?: number;
 };
 declare function f90<T extends {
diff --git a/tests/baselines/reference/mappedTypeWithAny.js b/tests/baselines/reference/mappedTypeWithAny.js
index 9c402e5094493..955edbe544c1f 100644
--- a/tests/baselines/reference/mappedTypeWithAny.js
+++ b/tests/baselines/reference/mappedTypeWithAny.js
@@ -80,10 +80,10 @@ var def = stringifyPair(void 0);
 
 
 //// [mappedTypeWithAny.d.ts]
-declare type Item = {
+type Item = {
     value: string;
 };
-declare type ItemMap<T> = {
+type ItemMap<T> = {
     [P in keyof T]: Item;
 };
 declare let x0: keyof any;
@@ -97,20 +97,20 @@ declare let x3: {
     [P in keyof any]: Item;
 };
 declare let x4: ItemMap<any>;
-declare type Data = {
+type Data = {
     value: string;
 };
-declare type StrictDataMap<T> = {
+type StrictDataMap<T> = {
     [P in keyof T]: Data;
 };
 declare let z: StrictDataMap<any>;
-declare type Arrayish<T extends unknown[]> = {
+type Arrayish<T extends unknown[]> = {
     [K in keyof T]: T[K];
 };
-declare type Objectish<T extends unknown> = {
+type Objectish<T extends unknown> = {
     [K in keyof T]: T[K];
 };
-declare type IndirectArrayish<U extends unknown[]> = Objectish<U>;
+type IndirectArrayish<U extends unknown[]> = Objectish<U>;
 declare function bar(arrayish: Arrayish<any>, objectish: Objectish<any>, indirectArrayish: IndirectArrayish<any>): void;
 declare function stringifyArray<T extends readonly any[]>(arr: T): {
     -readonly [K in keyof T]: string;
@@ -120,9 +120,9 @@ declare function stringifyPair<T extends readonly [any, any]>(arr: T): {
     -readonly [K in keyof T]: string;
 };
 declare let def: [any, any];
-declare type Evolvable<E extends Evolver> = {
+type Evolvable<E extends Evolver> = {
     [P in keyof E]: never;
 };
-declare type Evolver<T extends Evolvable<any> = any> = {
+type Evolver<T extends Evolvable<any> = any> = {
     [key in keyof Partial<T>]: never;
 };
diff --git a/tests/baselines/reference/mappedTypes1.js b/tests/baselines/reference/mappedTypes1.js
index 67a7b8db9b261..dbdd537c17f2c 100644
--- a/tests/baselines/reference/mappedTypes1.js
+++ b/tests/baselines/reference/mappedTypes1.js
@@ -47,78 +47,78 @@ var x4 = f4();
 
 
 //// [mappedTypes1.d.ts]
-declare type Item = {
+type Item = {
     a: string;
     b: number;
     c: boolean;
 };
-declare type T00 = {
+type T00 = {
     [P in "x" | "y"]: number;
 };
-declare type T01 = {
+type T01 = {
     [P in "x" | "y"]: P;
 };
-declare type T02 = {
+type T02 = {
     [P in "a" | "b"]: Item[P];
 };
-declare type T03 = {
+type T03 = {
     [P in keyof Item]: Date;
 };
-declare type T10 = {
+type T10 = {
     [P in keyof Item]: Item[P];
 };
-declare type T11 = {
+type T11 = {
     [P in keyof Item]?: Item[P];
 };
-declare type T12 = {
+type T12 = {
     readonly [P in keyof Item]: Item[P];
 };
-declare type T13 = {
+type T13 = {
     readonly [P in keyof Item]?: Item[P];
 };
-declare type T20 = {
+type T20 = {
     [P in keyof Item]: Item[P] | null;
 };
-declare type T21 = {
+type T21 = {
     [P in keyof Item]: Array<Item[P]>;
 };
-declare type T30 = {
+type T30 = {
     [P in keyof any]: void;
 };
-declare type T31 = {
+type T31 = {
     [P in keyof string]: void;
 };
-declare type T32 = {
+type T32 = {
     [P in keyof number]: void;
 };
-declare type T33 = {
+type T33 = {
     [P in keyof boolean]: void;
 };
-declare type T34 = {
+type T34 = {
     [P in keyof undefined]: void;
 };
-declare type T35 = {
+type T35 = {
     [P in keyof null]: void;
 };
-declare type T36 = {
+type T36 = {
     [P in keyof void]: void;
 };
-declare type T37 = {
+type T37 = {
     [P in keyof symbol]: void;
 };
-declare type T38 = {
+type T38 = {
     [P in keyof never]: void;
 };
-declare type T40 = {
+type T40 = {
     [P in string]: void;
 };
-declare type T43 = {
+type T43 = {
     [P in "a" | "b"]: void;
 };
-declare type T44 = {
+type T44 = {
     [P in "a" | "b" | "0" | "1"]: void;
 };
-declare type T47 = {
+type T47 = {
     [P in string | "a" | "b" | "0" | "1"]: void;
 };
 declare function f1<T1>(): {
diff --git a/tests/baselines/reference/mappedTypes2.js b/tests/baselines/reference/mappedTypes2.js
index 4122cf575c600..708447e0b3e20 100644
--- a/tests/baselines/reference/mappedTypes2.js
+++ b/tests/baselines/reference/mappedTypes2.js
@@ -139,14 +139,14 @@ function f6(shape) {
 
 //// [mappedTypes2.d.ts]
 declare function verifyLibTypes<T, K extends keyof T, U>(): void;
-declare type Proxy<T> = {
+type Proxy<T> = {
     get(): T;
     set(value: T): void;
 };
-declare type Proxify<T> = {
+type Proxify<T> = {
     [P in keyof T]: Proxy<T[P]>;
 };
-declare type DeepReadonly<T> = {
+type DeepReadonly<T> = {
     readonly [P in keyof T]: DeepReadonly<T[P]>;
 };
 declare function assign<T>(obj: T, props: Partial<T>): void;
diff --git a/tests/baselines/reference/mappedTypes3.js b/tests/baselines/reference/mappedTypes3.js
index cac0e915b1bb5..8b5892f66a127 100644
--- a/tests/baselines/reference/mappedTypes3.js
+++ b/tests/baselines/reference/mappedTypes3.js
@@ -65,7 +65,7 @@ function f3(bb) {
 declare class Box<P> {
     value: P;
 }
-declare type Boxified<T> = {
+type Boxified<T> = {
     [K in keyof T]: Box<T[K]>;
 };
 declare function boxify<T>(obj: T): Boxified<T>;
diff --git a/tests/baselines/reference/mappedTypes4.js b/tests/baselines/reference/mappedTypes4.js
index f856fbcdf153c..86784695922df 100644
--- a/tests/baselines/reference/mappedTypes4.js
+++ b/tests/baselines/reference/mappedTypes4.js
@@ -92,37 +92,37 @@ var z1;
 
 
 //// [mappedTypes4.d.ts]
-declare type Box<T> = {};
-declare type Boxified<T> = {
+type Box<T> = {};
+type Boxified<T> = {
     [P in keyof T]: Box<T[P]>;
 };
 declare function boxify<T>(obj: T): Boxified<T>;
-declare type A = {
+type A = {
     a: string;
 };
-declare type B = {
+type B = {
     b: string;
 };
-declare type C = {
+type C = {
     c: string;
 };
 declare function f1(x: A | B | C | undefined): Boxified<A | B | C | undefined>;
-declare type T00 = Partial<A | B | C>;
-declare type T01 = Readonly<A | B | C | null | undefined>;
-declare type T02 = Boxified<A | B[] | C | string>;
-declare type T03 = Readonly<string | number | boolean | null | undefined | void>;
-declare type T04 = Boxified<string | number | boolean | null | undefined | void>;
-declare type T05 = Partial<"hello" | "world" | 42>;
-declare type BoxifiedWithSentinel<T, U> = {
+type T00 = Partial<A | B | C>;
+type T01 = Readonly<A | B | C | null | undefined>;
+type T02 = Boxified<A | B[] | C | string>;
+type T03 = Readonly<string | number | boolean | null | undefined | void>;
+type T04 = Boxified<string | number | boolean | null | undefined | void>;
+type T05 = Partial<"hello" | "world" | 42>;
+type BoxifiedWithSentinel<T, U> = {
     [P in keyof T]: Box<T[P]> | U;
 };
-declare type T10 = BoxifiedWithSentinel<A | B | C, null>;
-declare type T11 = BoxifiedWithSentinel<A | B | C, undefined>;
-declare type T12 = BoxifiedWithSentinel<string, undefined>;
-declare type DeepReadonly<T> = {
+type T10 = BoxifiedWithSentinel<A | B | C, null>;
+type T11 = BoxifiedWithSentinel<A | B | C, undefined>;
+type T12 = BoxifiedWithSentinel<string, undefined>;
+type DeepReadonly<T> = {
     readonly [P in keyof T]: DeepReadonly<T[P]>;
 };
-declare type Foo = {
+type Foo = {
     x: number;
     y: {
         a: string;
@@ -130,7 +130,7 @@ declare type Foo = {
     };
     z: boolean;
 };
-declare type DeepReadonlyFoo = {
+type DeepReadonlyFoo = {
     readonly x: number;
     readonly y: {
         readonly a: string;
@@ -140,12 +140,12 @@ declare type DeepReadonlyFoo = {
 };
 declare var x1: DeepReadonly<Foo>;
 declare var x1: DeepReadonlyFoo;
-declare type Z = {
+type Z = {
     a: number;
 };
-declare type Clone<T> = {
+type Clone<T> = {
     [P in keyof (T & {})]: (T & {})[P];
 };
-declare type M = Clone<Z>;
+type M = Clone<Z>;
 declare var z1: Z;
 declare var z1: Clone<Z>;
diff --git a/tests/baselines/reference/mappedTypes6.js b/tests/baselines/reference/mappedTypes6.js
index b24d210eb75be..e9b319ee8ad32 100644
--- a/tests/baselines/reference/mappedTypes6.js
+++ b/tests/baselines/reference/mappedTypes6.js
@@ -198,65 +198,65 @@ x5.b = 1;
 
 
 //// [mappedTypes6.d.ts]
-declare type T00<T> = {
+type T00<T> = {
     [P in keyof T]: T[P];
 };
-declare type T01<T> = {
+type T01<T> = {
     [P in keyof T]?: T[P];
 };
-declare type T02<T> = {
+type T02<T> = {
     [P in keyof T]+?: T[P];
 };
-declare type T03<T> = {
+type T03<T> = {
     [P in keyof T]-?: T[P];
 };
-declare type T04<T> = {
+type T04<T> = {
     readonly [P in keyof T]: T[P];
 };
-declare type T05<T> = {
+type T05<T> = {
     readonly [P in keyof T]?: T[P];
 };
-declare type T06<T> = {
+type T06<T> = {
     readonly [P in keyof T]+?: T[P];
 };
-declare type T07<T> = {
+type T07<T> = {
     readonly [P in keyof T]-?: T[P];
 };
-declare type T08<T> = {
+type T08<T> = {
     +readonly [P in keyof T]: T[P];
 };
-declare type T09<T> = {
+type T09<T> = {
     +readonly [P in keyof T]?: T[P];
 };
-declare type T10<T> = {
+type T10<T> = {
     +readonly [P in keyof T]+?: T[P];
 };
-declare type T11<T> = {
+type T11<T> = {
     +readonly [P in keyof T]-?: T[P];
 };
-declare type T12<T> = {
+type T12<T> = {
     -readonly [P in keyof T]: T[P];
 };
-declare type T13<T> = {
+type T13<T> = {
     -readonly [P in keyof T]?: T[P];
 };
-declare type T14<T> = {
+type T14<T> = {
     -readonly [P in keyof T]+?: T[P];
 };
-declare type T15<T> = {
+type T15<T> = {
     -readonly [P in keyof T]-?: T[P];
 };
 declare function f1<T>(x: Required<T>, y: T, z: Partial<T>): void;
-declare type Denullified<T> = {
+type Denullified<T> = {
     [P in keyof T]-?: NonNullable<T[P]>;
 };
 declare function f2<T>(w: Denullified<T>, x: Required<T>, y: T, z: Partial<T>): void;
 declare function f3<T>(w: Denullified<T>, x: Required<T>, y: T, z: Partial<T>): void;
-declare type Readwrite<T> = {
+type Readwrite<T> = {
     -readonly [P in keyof T]: T[P];
 };
 declare function f10<T>(x: Readonly<T>, y: T, z: Readwrite<T>): void;
-declare type Foo = {
+type Foo = {
     a: number;
     b: number | undefined;
     c?: number;
@@ -264,7 +264,7 @@ declare type Foo = {
 };
 declare let x1: Foo;
 declare let x2: Required<Foo>;
-declare type Bar = {
+type Bar = {
     a: number;
     readonly b: number;
 };
diff --git a/tests/baselines/reference/mappedTypesArraysTuples.js b/tests/baselines/reference/mappedTypesArraysTuples.js
index 16459b6d6c262..63f180a5f6ac3 100644
--- a/tests/baselines/reference/mappedTypesArraysTuples.js
+++ b/tests/baselines/reference/mappedTypesArraysTuples.js
@@ -125,44 +125,44 @@ function acceptMappedArray(arr) {
 
 
 //// [mappedTypesArraysTuples.d.ts]
-declare type Box<T> = {
+type Box<T> = {
     value: T;
 };
-declare type Boxified<T> = {
+type Boxified<T> = {
     [P in keyof T]: Box<T[P]>;
 };
-declare type T00 = Boxified<[number, string?, ...boolean[]]>;
-declare type T01 = Partial<[number, string?, ...boolean[]]>;
-declare type T02 = Required<[number, string?, ...boolean[]]>;
-declare type T10 = Boxified<string[]>;
-declare type T11 = Partial<string[]>;
-declare type T12 = Required<string[]>;
-declare type T13 = Boxified<ReadonlyArray<string>>;
-declare type T14 = Partial<ReadonlyArray<string>>;
-declare type T15 = Required<ReadonlyArray<string>>;
-declare type T20 = Boxified<(string | undefined)[]>;
-declare type T21 = Partial<(string | undefined)[]>;
-declare type T22 = Required<(string | undefined)[]>;
-declare type T23 = Boxified<ReadonlyArray<string | undefined>>;
-declare type T24 = Partial<ReadonlyArray<string | undefined>>;
-declare type T25 = Required<ReadonlyArray<string | undefined>>;
-declare type T30 = Boxified<Partial<string[]>>;
-declare type T31 = Partial<Boxified<string[]>>;
-declare type A = {
+type T00 = Boxified<[number, string?, ...boolean[]]>;
+type T01 = Partial<[number, string?, ...boolean[]]>;
+type T02 = Required<[number, string?, ...boolean[]]>;
+type T10 = Boxified<string[]>;
+type T11 = Partial<string[]>;
+type T12 = Required<string[]>;
+type T13 = Boxified<ReadonlyArray<string>>;
+type T14 = Partial<ReadonlyArray<string>>;
+type T15 = Required<ReadonlyArray<string>>;
+type T20 = Boxified<(string | undefined)[]>;
+type T21 = Partial<(string | undefined)[]>;
+type T22 = Required<(string | undefined)[]>;
+type T23 = Boxified<ReadonlyArray<string | undefined>>;
+type T24 = Partial<ReadonlyArray<string | undefined>>;
+type T25 = Required<ReadonlyArray<string | undefined>>;
+type T30 = Boxified<Partial<string[]>>;
+type T31 = Partial<Boxified<string[]>>;
+type A = {
     a: string;
 };
-declare type B = {
+type B = {
     b: string;
 };
-declare type T40 = Boxified<A | A[] | ReadonlyArray<A> | [A, B] | string | string[]>;
-declare type ReadWrite<T> = {
+type T40 = Boxified<A | A[] | ReadonlyArray<A> | [A, B] | string | string[]>;
+type ReadWrite<T> = {
     -readonly [P in keyof T]: T[P];
 };
-declare type T50 = Readonly<string[]>;
-declare type T51 = Readonly<[number, number]>;
-declare type T52 = Partial<Readonly<string[]>>;
-declare type T53 = Readonly<Partial<string[]>>;
-declare type T54 = ReadWrite<Required<T53>>;
+type T50 = Readonly<string[]>;
+type T51 = Readonly<[number, number]>;
+type T52 = Partial<Readonly<string[]>>;
+type T53 = Readonly<Partial<string[]>>;
+type T54 = ReadWrite<Required<T53>>;
 declare function unboxify<T>(x: Boxified<T>): T;
 declare let x10: [Box<number>, Box<string>, ...Box<boolean>[]];
 declare let y10: [number, string, ...boolean[]];
@@ -189,24 +189,24 @@ declare let y22: {
     a: number;
     b: string[];
 };
-declare type __Awaited<T> = T extends PromiseLike<infer U> ? U : T;
-declare type Awaitified<T> = {
+type __Awaited<T> = T extends PromiseLike<infer U> ? U : T;
+type Awaitified<T> = {
     [P in keyof T]: __Awaited<T[P]>;
 };
 declare function all<T extends any[]>(...values: T): Promise<Awaitified<T>>;
 declare function f1(a: number, b: Promise<number>, c: string[], d: Promise<string[]>): void;
 declare function f2<T extends any[]>(a: Boxified<T>): void;
-declare type ElementType<T> = T extends Array<infer U> ? U : never;
-declare type Mapped<T> = {
+type ElementType<T> = T extends Array<infer U> ? U : never;
+type Mapped<T> = {
     [K in keyof T]: T[K];
 };
-declare type F<T> = ElementType<Mapped<T>>;
-declare type R1 = F<[string, number, boolean]>;
-declare type R2 = ElementType<Mapped<[string, number, boolean]>>;
+type F<T> = ElementType<Mapped<T>>;
+type R1 = F<[string, number, boolean]>;
+type R2 = ElementType<Mapped<[string, number, boolean]>>;
 declare function acceptArray(arr: any[]): void;
 declare function mapArray<T extends any[]>(arr: T): Mapped<T>;
 declare function acceptMappedArray<T extends any[]>(arr: T): void;
-declare type Unconstrained<T> = ElementType<Mapped<T>>;
-declare type T1 = Unconstrained<[string, number, boolean]>;
-declare type Constrained<T extends any[]> = ElementType<Mapped<T>>;
-declare type T2 = Constrained<[string, number, boolean]>;
+type Unconstrained<T> = ElementType<Mapped<T>>;
+type T1 = Unconstrained<[string, number, boolean]>;
+type Constrained<T extends any[]> = ElementType<Mapped<T>>;
+type T2 = Constrained<[string, number, boolean]>;
diff --git a/tests/baselines/reference/mixinAccessModifiers.js b/tests/baselines/reference/mixinAccessModifiers.js
index 6590df868bdd2..45df535002593 100644
--- a/tests/baselines/reference/mixinAccessModifiers.js
+++ b/tests/baselines/reference/mixinAccessModifiers.js
@@ -322,7 +322,7 @@ function f9(x) {
 
 
 //// [mixinAccessModifiers.d.ts]
-declare type Constructable = new (...args: any[]) => object;
+type Constructable = new (...args: any[]) => object;
 declare class Private {
     constructor(...args: any[]);
     private p;
diff --git a/tests/baselines/reference/mixinClassesAnnotated.js b/tests/baselines/reference/mixinClassesAnnotated.js
index 7c35b18fec9ba..4cbe18fafebea 100644
--- a/tests/baselines/reference/mixinClassesAnnotated.js
+++ b/tests/baselines/reference/mixinClassesAnnotated.js
@@ -155,7 +155,7 @@ var Thing3 = /** @class */ (function (_super) {
 
 
 //// [mixinClassesAnnotated.d.ts]
-declare type Constructor<T> = new (...args: any[]) => T;
+type Constructor<T> = new (...args: any[]) => T;
 declare class Base {
     x: number;
     y: number;
diff --git a/tests/baselines/reference/namedTupleMembers.js b/tests/baselines/reference/namedTupleMembers.js
index 9095259eec95a..80d40f9c86f92 100644
--- a/tests/baselines/reference/namedTupleMembers.js
+++ b/tests/baselines/reference/namedTupleMembers.js
@@ -114,8 +114,8 @@ exports.argumentsOfG = f.apply(void 0, getArgsForInjection(g)); // captured argu
 
 
 //// [namedTupleMembers.d.ts]
-export declare type Segment = [length: number, count: number];
-export declare type SegmentAnnotated = [
+export type Segment = [length: number, count: number];
+export type SegmentAnnotated = [
     /**
      * Size of message buffer segment handles
      */
@@ -125,16 +125,16 @@ export declare type SegmentAnnotated = [
      */
     count: number
 ];
-export declare type WithOptAndRest = [first: number, second?: number, ...rest: string[]];
-export declare type Func<T extends any[]> = (...x: T) => void;
+export type WithOptAndRest = [first: number, second?: number, ...rest: string[]];
+export type Func<T extends any[]> = (...x: T) => void;
 export declare const func: Func<SegmentAnnotated>;
 export declare function useState<T>(initial: T): [value: T, setter: (T: any) => void];
-export declare type Iter = Func<[step: number, iterations: number]>;
+export type Iter = Func<[step: number, iterations: number]>;
 export declare function readSegment([length, count]: [number, number]): void;
 export declare const val: [number, number];
-export declare type RecursiveTupleA = [initial: string, next: RecursiveTupleA];
-export declare type RecursiveTupleB = [first: string, ptr: RecursiveTupleB];
-export declare type RecusiveRest = [first: string, ...rest: RecusiveRest[]];
-export declare type RecusiveRest2 = [string, ...RecusiveRest2[]];
+export type RecursiveTupleA = [initial: string, next: RecursiveTupleA];
+export type RecursiveTupleB = [first: string, ptr: RecursiveTupleB];
+export type RecusiveRest = [first: string, ...rest: RecusiveRest[]];
+export type RecusiveRest2 = [string, ...RecusiveRest2[]];
 export declare const argumentsOfGAsFirstArgument: [[elem: object, index: number]];
 export declare const argumentsOfG: [elem: object, index: number];
diff --git a/tests/baselines/reference/namedTupleMembersErrors.js b/tests/baselines/reference/namedTupleMembersErrors.js
index a436e61cd0ca1..62aa00af57620 100644
--- a/tests/baselines/reference/namedTupleMembersErrors.js
+++ b/tests/baselines/reference/namedTupleMembersErrors.js
@@ -28,16 +28,16 @@ exports.__esModule = true;
 
 
 //// [namedTupleMembersErrors.d.ts]
-export declare type Segment1 = [length: number, number];
-export declare type Segment2 = [number, size: number];
-export declare type List = [item: any, ...any];
-export declare type List2 = [any, ...remainder: any];
-export declare type Pair = [item: any, any?];
-export declare type Pair2 = [any, last?: any];
-export declare type Opt = [element: string?];
-export declare type Trailing = [first: string, rest: ...string[]];
-export declare type OptTrailing = [first: string, rest: ...?string[]];
-export declare type OptRest = [first: string, ...rest?: string[]];
-export declare type NonArrayRest = [first: string, ...rest: number];
-export declare type RecusiveRestUnlabeled = [string, ...RecusiveRestUnlabeled];
-export declare type RecusiveRest = [first: string, ...rest: RecusiveRest];
+export type Segment1 = [length: number, number];
+export type Segment2 = [number, size: number];
+export type List = [item: any, ...any];
+export type List2 = [any, ...remainder: any];
+export type Pair = [item: any, any?];
+export type Pair2 = [any, last?: any];
+export type Opt = [element: string?];
+export type Trailing = [first: string, rest: ...string[]];
+export type OptTrailing = [first: string, rest: ...?string[]];
+export type OptRest = [first: string, ...rest?: string[]];
+export type NonArrayRest = [first: string, ...rest: number];
+export type RecusiveRestUnlabeled = [string, ...RecusiveRestUnlabeled];
+export type RecusiveRest = [first: string, ...rest: RecusiveRest];
diff --git a/tests/baselines/reference/neverReturningFunctions1.js b/tests/baselines/reference/neverReturningFunctions1.js
index 7a9817644f2c7..d6b4fa7cacb09 100644
--- a/tests/baselines/reference/neverReturningFunctions1.js
+++ b/tests/baselines/reference/neverReturningFunctions1.js
@@ -523,4 +523,4 @@ export interface ComponentConstructor<T extends object> {
         pause(): void;
     };
 }
-export declare type ComponentDefinition<T extends object = object> = T & Partial<Component> & ThisType<T & Component>;
+export type ComponentDefinition<T extends object = object> = T & Partial<Component> & ThisType<T & Component>;
diff --git a/tests/baselines/reference/noExcessiveStackDepthError.js b/tests/baselines/reference/noExcessiveStackDepthError.js
index 97e9cb944648b..5f28f97cda7fc 100644
--- a/tests/baselines/reference/noExcessiveStackDepthError.js
+++ b/tests/baselines/reference/noExcessiveStackDepthError.js
@@ -28,7 +28,7 @@ function foo() {
 interface FindOperator<T> {
     foo: T;
 }
-declare type FindConditions<T> = {
+type FindConditions<T> = {
     [P in keyof T]?: FindConditions<T[P]> | FindOperator<FindConditions<T[P]>>;
 };
 declare function foo<Entity>(): void;
diff --git a/tests/baselines/reference/nodeModulesImportTypeModeDeclarationEmit1(module=node16).js b/tests/baselines/reference/nodeModulesImportTypeModeDeclarationEmit1(module=node16).js
index 4a65e05cdd90e..1b444aae0dfb3 100644
--- a/tests/baselines/reference/nodeModulesImportTypeModeDeclarationEmit1(module=node16).js
+++ b/tests/baselines/reference/nodeModulesImportTypeModeDeclarationEmit1(module=node16).js
@@ -31,6 +31,6 @@ exports.b = null;
 
 
 //// [index.d.ts]
-export declare type LocalInterface = import("pkg", { assert: { "resolution-mode": "require" } }).RequireInterface & import("pkg", { assert: { "resolution-mode": "import" } }).ImportInterface;
+export type LocalInterface = import("pkg", { assert: { "resolution-mode": "require" } }).RequireInterface & import("pkg", { assert: { "resolution-mode": "import" } }).ImportInterface;
 export declare const a: import("pkg").RequireInterface;
 export declare const b: import("pkg", { assert: { "resolution-mode": "import" } }).ImportInterface;
diff --git a/tests/baselines/reference/nodeModulesImportTypeModeDeclarationEmit1(module=nodenext).js b/tests/baselines/reference/nodeModulesImportTypeModeDeclarationEmit1(module=nodenext).js
index 4a65e05cdd90e..1b444aae0dfb3 100644
--- a/tests/baselines/reference/nodeModulesImportTypeModeDeclarationEmit1(module=nodenext).js
+++ b/tests/baselines/reference/nodeModulesImportTypeModeDeclarationEmit1(module=nodenext).js
@@ -31,6 +31,6 @@ exports.b = null;
 
 
 //// [index.d.ts]
-export declare type LocalInterface = import("pkg", { assert: { "resolution-mode": "require" } }).RequireInterface & import("pkg", { assert: { "resolution-mode": "import" } }).ImportInterface;
+export type LocalInterface = import("pkg", { assert: { "resolution-mode": "require" } }).RequireInterface & import("pkg", { assert: { "resolution-mode": "import" } }).ImportInterface;
 export declare const a: import("pkg").RequireInterface;
 export declare const b: import("pkg", { assert: { "resolution-mode": "import" } }).ImportInterface;
diff --git a/tests/baselines/reference/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).js b/tests/baselines/reference/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).js
index 7fd0aff8e8f6e..6b34fb98748ad 100644
--- a/tests/baselines/reference/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).js
+++ b/tests/baselines/reference/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).js
@@ -120,28 +120,28 @@ exports.b = null;
 
 
 //// [index.d.ts]
-export declare type LocalInterface = import("pkg", { assert: { "resolution-mode": "foobar" } }).RequireInterface & import("pkg", { assert: { "resolution-mode": "import" } }).ImportInterface;
+export type LocalInterface = import("pkg", { assert: { "resolution-mode": "foobar" } }).RequireInterface & import("pkg", { assert: { "resolution-mode": "import" } }).ImportInterface;
 export declare const a: import("pkg").RequireInterface;
 export declare const b: import("pkg", { assert: { "resolution-mode": "import" } }).ImportInterface;
 //// [other.d.ts]
-export declare type LocalInterface = import("pkg", { assert: {} });
+export type LocalInterface = import("pkg", { assert: {} });
 export declare const a: any;
 export declare const b: any;
 //// [other2.d.ts]
-export declare type LocalInterface = import("pkg", { assert: { "bad": "require" } }).RequireInterface & import("pkg", { assert: { "bad": "import" } }).ImportInterface;
+export type LocalInterface = import("pkg", { assert: { "bad": "require" } }).RequireInterface & import("pkg", { assert: { "bad": "import" } }).ImportInterface;
 export declare const a: import("pkg").RequireInterface;
 export declare const b: any;
 //// [other3.d.ts]
-export declare type LocalInterface = import("pkg", { assert: {} })[{
+export type LocalInterface = import("pkg", { assert: {} })[{
     "resolution-mode": "require";
 }];
 export declare const a: any;
 export declare const b: any;
 //// [other4.d.ts]
-export declare type LocalInterface = import("pkg", { assert: {} });
+export type LocalInterface = import("pkg", { assert: {} });
 export declare const a: any, Asserts1: any, RequireInterface: any;
 export declare const b: any, Asserts2: any, ImportInterface: any;
 //// [other5.d.ts]
-export declare type LocalInterface = import("pkg", { assert: {} }).RequireInterface & import("pkg", { assert: {} }).ImportInterface;
+export type LocalInterface = import("pkg", { assert: {} }).RequireInterface & import("pkg", { assert: {} }).ImportInterface;
 export declare const a: import("pkg").RequireInterface;
 export declare const b: any;
diff --git a/tests/baselines/reference/nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).js b/tests/baselines/reference/nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).js
index 7fd0aff8e8f6e..6b34fb98748ad 100644
--- a/tests/baselines/reference/nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).js
+++ b/tests/baselines/reference/nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).js
@@ -120,28 +120,28 @@ exports.b = null;
 
 
 //// [index.d.ts]
-export declare type LocalInterface = import("pkg", { assert: { "resolution-mode": "foobar" } }).RequireInterface & import("pkg", { assert: { "resolution-mode": "import" } }).ImportInterface;
+export type LocalInterface = import("pkg", { assert: { "resolution-mode": "foobar" } }).RequireInterface & import("pkg", { assert: { "resolution-mode": "import" } }).ImportInterface;
 export declare const a: import("pkg").RequireInterface;
 export declare const b: import("pkg", { assert: { "resolution-mode": "import" } }).ImportInterface;
 //// [other.d.ts]
-export declare type LocalInterface = import("pkg", { assert: {} });
+export type LocalInterface = import("pkg", { assert: {} });
 export declare const a: any;
 export declare const b: any;
 //// [other2.d.ts]
-export declare type LocalInterface = import("pkg", { assert: { "bad": "require" } }).RequireInterface & import("pkg", { assert: { "bad": "import" } }).ImportInterface;
+export type LocalInterface = import("pkg", { assert: { "bad": "require" } }).RequireInterface & import("pkg", { assert: { "bad": "import" } }).ImportInterface;
 export declare const a: import("pkg").RequireInterface;
 export declare const b: any;
 //// [other3.d.ts]
-export declare type LocalInterface = import("pkg", { assert: {} })[{
+export type LocalInterface = import("pkg", { assert: {} })[{
     "resolution-mode": "require";
 }];
 export declare const a: any;
 export declare const b: any;
 //// [other4.d.ts]
-export declare type LocalInterface = import("pkg", { assert: {} });
+export type LocalInterface = import("pkg", { assert: {} });
 export declare const a: any, Asserts1: any, RequireInterface: any;
 export declare const b: any, Asserts2: any, ImportInterface: any;
 //// [other5.d.ts]
-export declare type LocalInterface = import("pkg", { assert: {} }).RequireInterface & import("pkg", { assert: {} }).ImportInterface;
+export type LocalInterface = import("pkg", { assert: {} }).RequireInterface & import("pkg", { assert: {} }).ImportInterface;
 export declare const a: import("pkg").RequireInterface;
 export declare const b: any;
diff --git a/tests/baselines/reference/numericEnumMappedType.js b/tests/baselines/reference/numericEnumMappedType.js
index 78a13e443ff42..a4de91b99819b 100644
--- a/tests/baselines/reference/numericEnumMappedType.js
+++ b/tests/baselines/reference/numericEnumMappedType.js
@@ -79,10 +79,10 @@ declare enum E2 {
     TWO,
     THREE
 }
-declare type Bins1 = {
+type Bins1 = {
     [k in E1]?: string;
 };
-declare type Bins2 = {
+type Bins2 = {
     [k in E2]?: string;
 };
 declare const b1: Bins1;
@@ -98,7 +98,7 @@ declare enum N2 {
     C,
     D
 }
-declare type T1 = {
+type T1 = {
     [K in N1 | N2]: K;
 };
 declare enum E {
diff --git a/tests/baselines/reference/numericStringLiteralTypes.js b/tests/baselines/reference/numericStringLiteralTypes.js
index 975ca1d31799c..1b47eaf439585 100644
--- a/tests/baselines/reference/numericStringLiteralTypes.js
+++ b/tests/baselines/reference/numericStringLiteralTypes.js
@@ -55,23 +55,23 @@ f([container1, container2], function (value1, value2) {
 
 
 //// [numericStringLiteralTypes.d.ts]
-declare type T0 = string & `${string}`;
-declare type T1 = string & `${number}`;
-declare type T2 = string & `${bigint}`;
-declare type T3<T extends string> = string & `${T}`;
-declare type T4<T extends string> = string & `${Capitalize<`${T}`>}`;
+type T0 = string & `${string}`;
+type T1 = string & `${number}`;
+type T2 = string & `${bigint}`;
+type T3<T extends string> = string & `${T}`;
+type T4<T extends string> = string & `${Capitalize<`${T}`>}`;
 declare function f1(a: boolean[], x: `${number}`): void;
 declare function f2(a: boolean[], x: number | `${number}`): void;
-declare type T10 = boolean[][`${number}`];
-declare type T11 = boolean[][number | `${number}`];
-declare type T20<T extends number | `${number}`> = T;
-declare type T21<T extends unknown[]> = {
+type T10 = boolean[][`${number}`];
+type T11 = boolean[][number | `${number}`];
+type T20<T extends number | `${number}`> = T;
+type T21<T extends unknown[]> = {
     [K in keyof T]: T20<K>;
 };
-declare type Container<T> = {
+type Container<T> = {
     value: T;
 };
-declare type UnwrapContainers<T extends Container<unknown>[]> = {
+type UnwrapContainers<T extends Container<unknown>[]> = {
     [K in keyof T]: T[K]['value'];
 };
 declare function createContainer<T extends unknown>(value: T): Container<T>;
diff --git a/tests/baselines/reference/omitTypeTestErrors01.js b/tests/baselines/reference/omitTypeTestErrors01.js
index fd134c7f9773b..d4fbea6f63d20 100644
--- a/tests/baselines/reference/omitTypeTestErrors01.js
+++ b/tests/baselines/reference/omitTypeTestErrors01.js
@@ -38,8 +38,8 @@ interface Foo {
     b: number;
     c: boolean;
 }
-export declare type Bar = Omit<Foo, "c">;
-export declare type Baz = Omit<Foo, "b" | "c">;
+export type Bar = Omit<Foo, "c">;
+export type Baz = Omit<Foo, "b" | "c">;
 export declare function getBarC(bar: Bar): any;
 export declare function getBazB(baz: Baz): any;
 export {};
diff --git a/tests/baselines/reference/omitTypeTests01.js b/tests/baselines/reference/omitTypeTests01.js
index 866994eea1727..4d0b0e6badcc6 100644
--- a/tests/baselines/reference/omitTypeTests01.js
+++ b/tests/baselines/reference/omitTypeTests01.js
@@ -38,8 +38,8 @@ interface Foo {
     b: number;
     c: boolean;
 }
-export declare type Bar = Omit<Foo, "c">;
-export declare type Baz = Omit<Foo, "b" | "c">;
+export type Bar = Omit<Foo, "c">;
+export type Baz = Omit<Foo, "b" | "c">;
 export declare function getBarA(bar: Bar): string;
 export declare function getBazA(baz: Baz): string;
 export {};
diff --git a/tests/baselines/reference/optionalTupleElements1.js b/tests/baselines/reference/optionalTupleElements1.js
index 73d3f616aa7c4..255c4e8fc370c 100644
--- a/tests/baselines/reference/optionalTupleElements1.js
+++ b/tests/baselines/reference/optionalTupleElements1.js
@@ -80,15 +80,15 @@ t4 = [];
 
 
 //// [optionalTupleElements1.d.ts]
-declare type T1 = [number, string, boolean];
-declare type T2 = [number, string, boolean?];
-declare type T3 = [number, string?, boolean?];
-declare type T4 = [number?, string?, boolean?];
-declare type L1 = T1["length"];
-declare type L2 = T2["length"];
-declare type L3 = T3["length"];
-declare type L4 = T4["length"];
-declare type T5 = [number, string?, boolean];
+type T1 = [number, string, boolean];
+type T2 = [number, string, boolean?];
+type T3 = [number, string?, boolean?];
+type T4 = [number?, string?, boolean?];
+type L1 = T1["length"];
+type L2 = T2["length"];
+type L3 = T3["length"];
+type L4 = T4["length"];
+type T5 = [number, string?, boolean];
 declare function f1(t1: T1, t2: T2, t3: T3, t4: T4): void;
 declare let t2: T2;
 declare let t3: T3;
diff --git a/tests/baselines/reference/parenthesisDoesNotBlockAliasSymbolCreation.js b/tests/baselines/reference/parenthesisDoesNotBlockAliasSymbolCreation.js
index 3589950357443..7682fc58af0d7 100644
--- a/tests/baselines/reference/parenthesisDoesNotBlockAliasSymbolCreation.js
+++ b/tests/baselines/reference/parenthesisDoesNotBlockAliasSymbolCreation.js
@@ -28,14 +28,14 @@ exports.a4 = null;
 
 
 //// [parenthesisDoesNotBlockAliasSymbolCreation.d.ts]
-export declare type InvalidKeys<K extends string | number | symbol> = {
+export type InvalidKeys<K extends string | number | symbol> = {
     [P in K]?: never;
 };
-export declare type InvalidKeys2<K extends string | number | symbol> = ({
+export type InvalidKeys2<K extends string | number | symbol> = ({
     [P in K]?: never;
 });
-export declare type A<T> = (T & InvalidKeys<"a">);
-export declare type A2<T> = (T & InvalidKeys2<"a">);
+export type A<T> = (T & InvalidKeys<"a">);
+export type A2<T> = (T & InvalidKeys2<"a">);
 export declare const a: A<{
     x: number;
 }>;
diff --git a/tests/baselines/reference/primitiveUnionDetection.js b/tests/baselines/reference/primitiveUnionDetection.js
index 7d12cd85f9201..d302bd4e4d8f0 100644
--- a/tests/baselines/reference/primitiveUnionDetection.js
+++ b/tests/baselines/reference/primitiveUnionDetection.js
@@ -15,7 +15,7 @@ var result = getInterfaceFromString({ type: 'two' });
 
 
 //// [primitiveUnionDetection.d.ts]
-declare type Kind = "one" | "two" | "three";
+type Kind = "one" | "two" | "three";
 declare function getInterfaceFromString<T extends Kind>(options?: {
     type?: T;
 } & {
diff --git a/tests/baselines/reference/readonlyArraysAndTuples.js b/tests/baselines/reference/readonlyArraysAndTuples.js
index f293ad01b7bbe..26bbafe7ddf63 100644
--- a/tests/baselines/reference/readonlyArraysAndTuples.js
+++ b/tests/baselines/reference/readonlyArraysAndTuples.js
@@ -63,15 +63,15 @@ delete v[0 + 1]; // Error
 
 
 //// [readonlyArraysAndTuples.d.ts]
-declare type T10 = string[];
-declare type T11 = Array<string>;
-declare type T12 = readonly string[];
-declare type T13 = ReadonlyArray<string>;
-declare type T20 = [number, number];
-declare type T21 = readonly [number, number];
-declare type T30 = readonly string;
-declare type T31<T> = readonly T;
-declare type T32 = readonly readonly string[];
-declare type T33 = readonly Array<string>;
+type T10 = string[];
+type T11 = Array<string>;
+type T12 = readonly string[];
+type T13 = ReadonlyArray<string>;
+type T20 = [number, number];
+type T21 = readonly [number, number];
+type T30 = readonly string;
+type T31<T> = readonly T;
+type T32 = readonly readonly string[];
+type T33 = readonly Array<string>;
 declare function f1(ma: string[], ra: readonly string[], mt: [string, string], rt: readonly [string, string]): void;
 declare var v: readonly [number, number, ...number[]];
diff --git a/tests/baselines/reference/readonlyArraysAndTuples2.js b/tests/baselines/reference/readonlyArraysAndTuples2.js
index 77e0b1add49e1..c953406b863ba 100644
--- a/tests/baselines/reference/readonlyArraysAndTuples2.js
+++ b/tests/baselines/reference/readonlyArraysAndTuples2.js
@@ -48,12 +48,12 @@ var A = /** @class */ (function () {
 
 
 //// [readonlyArraysAndTuples2.d.ts]
-declare type T10 = string[];
-declare type T11 = Array<string>;
-declare type T12 = readonly string[];
-declare type T13 = ReadonlyArray<string>;
-declare type T20 = [number, number];
-declare type T21 = readonly [number, number];
+type T10 = string[];
+type T11 = Array<string>;
+type T12 = readonly string[];
+type T13 = ReadonlyArray<string>;
+type T20 = [number, number];
+type T21 = readonly [number, number];
 declare function f1(ma: string[], ra: readonly string[], mt: [string, string], rt: readonly [string, string]): readonly [string, string];
 declare const someDec: any;
 declare class A {
diff --git a/tests/baselines/reference/recursiveConditionalTypes.js b/tests/baselines/reference/recursiveConditionalTypes.js
index 0c59030955060..a978a0bfa2a9f 100644
--- a/tests/baselines/reference/recursiveConditionalTypes.js
+++ b/tests/baselines/reference/recursiveConditionalTypes.js
@@ -208,44 +208,44 @@ function foo2(value) {
 
 
 //// [recursiveConditionalTypes.d.ts]
-declare type __Awaited<T> = T extends null | undefined ? T : T extends PromiseLike<infer U> ? __Awaited<U> : T;
-declare type MyPromise<T> = {
+type __Awaited<T> = T extends null | undefined ? T : T extends PromiseLike<infer U> ? __Awaited<U> : T;
+type MyPromise<T> = {
     then<U>(f: ((value: T) => U | PromiseLike<U>) | null | undefined): MyPromise<U>;
 };
-declare type InfinitePromise<T> = Promise<InfinitePromise<T>>;
-declare type P0 = __Awaited<Promise<string | Promise<MyPromise<number> | null> | undefined>>;
-declare type P1 = __Awaited<any>;
-declare type P2 = __Awaited<InfinitePromise<number>>;
+type InfinitePromise<T> = Promise<InfinitePromise<T>>;
+type P0 = __Awaited<Promise<string | Promise<MyPromise<number> | null> | undefined>>;
+type P1 = __Awaited<any>;
+type P2 = __Awaited<InfinitePromise<number>>;
 declare function f11<T, U extends T>(tx: T, ta: __Awaited<T>, ux: U, ua: __Awaited<U>): void;
-declare type Flatten<T extends readonly unknown[]> = T extends unknown[] ? _Flatten<T>[] : readonly _Flatten<T>[];
-declare type _Flatten<T> = T extends readonly (infer U)[] ? _Flatten<U> : T;
-declare type InfiniteArray<T> = InfiniteArray<T>[];
-declare type B0 = Flatten<string[][][]>;
-declare type B1 = Flatten<string[][] | readonly (number[] | boolean[][])[]>;
-declare type B2 = Flatten<InfiniteArray<string>>;
-declare type B3 = B2[0];
-declare type TupleOf<T, N extends number> = N extends N ? number extends N ? T[] : _TupleOf<T, N, []> : never;
-declare type _TupleOf<T, N extends number, R extends unknown[]> = R['length'] extends N ? R : _TupleOf<T, N, [T, ...R]>;
-declare type TT0 = TupleOf<string, 4>;
-declare type TT1 = TupleOf<number, 0 | 2 | 4>;
-declare type TT2 = TupleOf<number, number>;
-declare type TT3 = TupleOf<number, any>;
-declare type TT4 = TupleOf<number, 100>;
-declare type TT5 = TupleOf<number, 1000>;
+type Flatten<T extends readonly unknown[]> = T extends unknown[] ? _Flatten<T>[] : readonly _Flatten<T>[];
+type _Flatten<T> = T extends readonly (infer U)[] ? _Flatten<U> : T;
+type InfiniteArray<T> = InfiniteArray<T>[];
+type B0 = Flatten<string[][][]>;
+type B1 = Flatten<string[][] | readonly (number[] | boolean[][])[]>;
+type B2 = Flatten<InfiniteArray<string>>;
+type B3 = B2[0];
+type TupleOf<T, N extends number> = N extends N ? number extends N ? T[] : _TupleOf<T, N, []> : never;
+type _TupleOf<T, N extends number, R extends unknown[]> = R['length'] extends N ? R : _TupleOf<T, N, [T, ...R]>;
+type TT0 = TupleOf<string, 4>;
+type TT1 = TupleOf<number, 0 | 2 | 4>;
+type TT2 = TupleOf<number, number>;
+type TT3 = TupleOf<number, any>;
+type TT4 = TupleOf<number, 100>;
+type TT5 = TupleOf<number, 1000>;
 declare function f22<N extends number, M extends N>(tn: TupleOf<number, N>, tm: TupleOf<number, M>): void;
 declare function f23<T>(t: TupleOf<T, 3>): T;
 interface Box<T> {
     value: T;
 }
-declare type RecBox<T> = T | Box<RecBox<T>>;
-declare type InfBox<T> = Box<InfBox<T>>;
+type RecBox<T> = T | Box<RecBox<T>>;
+type InfBox<T> = Box<InfBox<T>>;
 declare function unbox<T>(box: RecBox<T>): T;
-declare type T1 = Box<string>;
-declare type T2 = Box<T1>;
-declare type T3 = Box<T2>;
-declare type T4 = Box<T3>;
-declare type T5 = Box<T4>;
-declare type T6 = Box<T5>;
+type T1 = Box<string>;
+type T2 = Box<T1>;
+type T3 = Box<T2>;
+type T4 = Box<T3>;
+type T5 = Box<T4>;
+type T6 = Box<T5>;
 declare let b1: Box<Box<Box<Box<Box<Box<string>>>>>>;
 declare let b2: T6;
 declare let b3: InfBox<string>;
@@ -256,37 +256,37 @@ declare let b4: {
         };
     };
 };
-declare type Box1<T> = {
+type Box1<T> = {
     value: T;
 };
-declare type Box2<T> = {
+type Box2<T> = {
     value: T;
 };
 declare function foo<T>(x: Box1<Box1<T>>): T;
 declare let z: Box2<Box2<string>>;
-declare type Intersect<U extends any[], R = unknown> = U extends [infer H, ...infer T] ? Intersect<T, R & H> : R;
-declare type QQ = Intersect<[string[], number[], 7]>;
-declare type Unpack1<T> = T extends (infer U)[] ? Unpack1<U> : T;
-declare type Unpack2<T> = T extends (infer U)[] ? Unpack2<U> : T;
+type Intersect<U extends any[], R = unknown> = U extends [infer H, ...infer T] ? Intersect<T, R & H> : R;
+type QQ = Intersect<[string[], number[], 7]>;
+type Unpack1<T> = T extends (infer U)[] ? Unpack1<U> : T;
+type Unpack2<T> = T extends (infer U)[] ? Unpack2<U> : T;
 declare function f20<T, U extends T>(x: Unpack1<T>, y: Unpack2<T>): void;
-declare type Grow1<T extends unknown[], N extends number> = T['length'] extends N ? T : Grow1<[number, ...T], N>;
-declare type Grow2<T extends unknown[], N extends number> = T['length'] extends N ? T : Grow2<[string, ...T], N>;
+type Grow1<T extends unknown[], N extends number> = T['length'] extends N ? T : Grow1<[number, ...T], N>;
+type Grow2<T extends unknown[], N extends number> = T['length'] extends N ? T : Grow2<[string, ...T], N>;
 declare function f21<T extends number>(x: Grow1<[], T>, y: Grow2<[], T>): void;
-declare type ParseSuccess<R extends string> = {
+type ParseSuccess<R extends string> = {
     rest: R;
 };
-declare type ParseManyWhitespace<S extends string> = S extends ` ${infer R0}` ? ParseManyWhitespace<R0> extends ParseSuccess<infer R1> ? ParseSuccess<R1> : null : ParseSuccess<S>;
-declare type TP1 = ParseManyWhitespace<" foo">;
-declare type ParseManyWhitespace2<S extends string> = S extends ` ${infer R0}` ? Helper<ParseManyWhitespace2<R0>> : ParseSuccess<S>;
-declare type Helper<T> = T extends ParseSuccess<infer R> ? ParseSuccess<R> : null;
-declare type TP2 = ParseManyWhitespace2<" foo">;
-declare type NTuple<N extends number, Tup extends unknown[] = []> = Tup['length'] extends N ? Tup : NTuple<N, [...Tup, unknown]>;
-declare type Add<A extends number, B extends number> = [
+type ParseManyWhitespace<S extends string> = S extends ` ${infer R0}` ? ParseManyWhitespace<R0> extends ParseSuccess<infer R1> ? ParseSuccess<R1> : null : ParseSuccess<S>;
+type TP1 = ParseManyWhitespace<" foo">;
+type ParseManyWhitespace2<S extends string> = S extends ` ${infer R0}` ? Helper<ParseManyWhitespace2<R0>> : ParseSuccess<S>;
+type Helper<T> = T extends ParseSuccess<infer R> ? ParseSuccess<R> : null;
+type TP2 = ParseManyWhitespace2<" foo">;
+type NTuple<N extends number, Tup extends unknown[] = []> = Tup['length'] extends N ? Tup : NTuple<N, [...Tup, unknown]>;
+type Add<A extends number, B extends number> = [
     ...NTuple<A>,
     ...NTuple<B>
 ]['length'];
 declare let five: Add<2, 3>;
-declare type _PrependNextNum<A extends Array<unknown>> = A['length'] extends infer T ? [T, ...A] extends [...infer X] ? X : never : never;
-declare type _Enumerate<A extends Array<unknown>, N extends number> = N extends A['length'] ? A : _Enumerate<_PrependNextNum<A>, N> & number;
-declare type Enumerate<N extends number> = number extends N ? number : _Enumerate<[], N> extends (infer E)[] ? E : never;
+type _PrependNextNum<A extends Array<unknown>> = A['length'] extends infer T ? [T, ...A] extends [...infer X] ? X : never : never;
+type _Enumerate<A extends Array<unknown>, N extends number> = N extends A['length'] ? A : _Enumerate<_PrependNextNum<A>, N> & number;
+type Enumerate<N extends number> = number extends N ? number : _Enumerate<[], N> extends (infer E)[] ? E : never;
 declare function foo2<T extends unknown[]>(value: T): Enumerate<T['length']>;
diff --git a/tests/baselines/reference/recursiveMappedTypes.js b/tests/baselines/reference/recursiveMappedTypes.js
index 142ce6effb354..aaf9a23c5e855 100644
--- a/tests/baselines/reference/recursiveMappedTypes.js
+++ b/tests/baselines/reference/recursiveMappedTypes.js
@@ -104,13 +104,13 @@ x.type;
 
 
 //// [recursiveMappedTypes.d.ts]
-export declare type Circular<T> = {
+export type Circular<T> = {
     [P in keyof T]: Circular<T>;
 };
-declare type NonOptionalKeys<T> = {
+type NonOptionalKeys<T> = {
     [P in keyof T]: undefined extends T[P] ? never : P;
 }[keyof T];
-declare type Child<T> = {
+type Child<T> = {
     [P in NonOptionalKeys<T>]: T[P];
 };
 export interface ListWidget {
@@ -120,10 +120,10 @@ export interface ListWidget {
     "collapsable"?: boolean;
     "each": Child<ListWidget>;
 }
-export declare type TV<T, K extends keyof T> = T[K] extends Record<infer E, any> ? E : never;
-export declare type ObjectOrArray<T, K extends keyof any = keyof any> = T[] | Record<K, T | Record<K, T> | T[]>;
-export declare type ThemeValue<K extends keyof ThemeType, ThemeType, TVal = any> = ThemeType[K] extends TVal[] ? number : ThemeType[K] extends Record<infer E, TVal> ? E : ThemeType[K] extends ObjectOrArray<infer F> ? F : never;
-export declare type Foo<T> = T extends {
+export type TV<T, K extends keyof T> = T[K] extends Record<infer E, any> ? E : never;
+export type ObjectOrArray<T, K extends keyof any = keyof any> = T[] | Record<K, T | Record<K, T> | T[]>;
+export type ThemeValue<K extends keyof ThemeType, ThemeType, TVal = any> = ThemeType[K] extends TVal[] ? number : ThemeType[K] extends Record<infer E, TVal> ? E : ThemeType[K] extends ObjectOrArray<infer F> ? F : never;
+export type Foo<T> = T extends {
     [P in infer E]: any;
 } ? E : never;
 export {};
diff --git a/tests/baselines/reference/recursiveTypeReferences1.js b/tests/baselines/reference/recursiveTypeReferences1.js
index 744c9c57b5cd0..e3c5f3a848552 100644
--- a/tests/baselines/reference/recursiveTypeReferences1.js
+++ b/tests/baselines/reference/recursiveTypeReferences1.js
@@ -217,55 +217,55 @@ function level(h) {
 
 
 //// [recursiveTypeReferences1.d.ts]
-declare type ValueOrArray<T> = T | Array<ValueOrArray<T>>;
+type ValueOrArray<T> = T | Array<ValueOrArray<T>>;
 declare const a0: ValueOrArray<number>;
 declare const a1: ValueOrArray<number>;
-declare type HypertextNode = string | [string, {
+type HypertextNode = string | [string, {
     [key: string]: unknown;
 }, ...HypertextNode[]];
 declare const hypertextNode: HypertextNode;
-declare type Json = string | number | boolean | null | Json[] | {
+type Json = string | number | boolean | null | Json[] | {
     [key: string]: Json;
 };
 declare let data: Json;
 interface Box<T> {
     value: T;
 }
-declare type T1 = Box<T1>;
-declare type T2 = Box<Box<T2>>;
-declare type T3 = Box<Box<Box<T3>>>;
+type T1 = Box<T1>;
+type T2 = Box<Box<T2>>;
+type T3 = Box<Box<Box<T3>>>;
 declare function f1(t1: T1, t2: T2, t3: T3): void;
-declare type Box1 = Box<Box1> | number;
+type Box1 = Box<Box1> | number;
 declare const b10: Box1;
 declare const b11: Box1;
 declare const b12: Box1;
-declare type Box2 = Box<Box2 | number>;
+type Box2 = Box<Box2 | number>;
 declare const b20: Box2;
 declare const b21: Box2;
 declare const b22: Box2;
-declare type RecArray<T> = Array<T | RecArray<T>>;
+type RecArray<T> = Array<T | RecArray<T>>;
 declare function flat<T>(a: RecArray<T>): Array<T>;
 declare function flat1<T>(a: Array<T | Array<T>>): Array<T>;
 declare function flat2<T>(a: Array<T | Array<T | Array<T>>>): Array<T>;
-declare type T10 = T10[];
-declare type T11 = readonly T11[];
-declare type T12 = (T12)[];
-declare type T13 = T13[] | string;
-declare type T14 = T14[] & {
+type T10 = T10[];
+type T11 = readonly T11[];
+type T12 = (T12)[];
+type T13 = T13[] | string;
+type T14 = T14[] & {
     x: string;
 };
-declare type T15<X> = X extends string ? T15<X>[] : never;
-declare type ValueOrArray1<T> = T | ValueOrArray1<T>[];
-declare type ValueOrArray2<T> = T | ValueOrArray2<T>[];
+type T15<X> = X extends string ? T15<X>[] : never;
+type ValueOrArray1<T> = T | ValueOrArray1<T>[];
+type ValueOrArray2<T> = T | ValueOrArray2<T>[];
 declare function foo1<T>(a: ValueOrArray1<T>): T;
 declare let ra1: ValueOrArray2<string>;
 declare let x1: string;
-declare type NumberOrArray1<T> = T | ValueOrArray1<T>[];
-declare type NumberOrArray2<T> = T | ValueOrArray2<T>[];
+type NumberOrArray1<T> = T | ValueOrArray1<T>[];
+type NumberOrArray2<T> = T | ValueOrArray2<T>[];
 declare function foo2<T>(a: ValueOrArray1<T>): T;
 declare let ra2: ValueOrArray2<string>;
 declare let x2: string;
-declare type Tree = [HTMLHeadingElement, Tree][];
+type Tree = [HTMLHeadingElement, Tree][];
 declare function parse(node: Tree, index?: number[]): HTMLUListElement;
 declare function cons(hs: HTMLHeadingElement[]): Tree;
 declare function level(h: HTMLHeadingElement): number;
diff --git a/tests/baselines/reference/renamingDestructuredPropertyInFunctionType.js b/tests/baselines/reference/renamingDestructuredPropertyInFunctionType.js
index ac5fe3b3c35e0..1dd5c5145acab 100644
--- a/tests/baselines/reference/renamingDestructuredPropertyInFunctionType.js
+++ b/tests/baselines/reference/renamingDestructuredPropertyInFunctionType.js
@@ -93,63 +93,63 @@ function f12({ a: string = "" }) { return "a"; }
 
 
 //// [renamingDestructuredPropertyInFunctionType.d.ts]
-declare type O = {
+type O = {
     a?: string;
     b: number;
     c: number;
 };
-declare type F1 = (arg: number) => any;
-declare type F2 = ({ a }: O) => any;
-declare type F3 = ({ a, b, c }: O) => any;
-declare type F4 = ({ a }: O) => any;
-declare type F5 = ({ a, b, c }: O) => any;
-declare type F6 = ({ a: string }: {
+type F1 = (arg: number) => any;
+type F2 = ({ a }: O) => any;
+type F3 = ({ a, b, c }: O) => any;
+type F4 = ({ a }: O) => any;
+type F5 = ({ a, b, c }: O) => any;
+type F6 = ({ a: string }: {
     a: any;
 }) => typeof string;
-declare type F7 = ({ a, b: number }: {
+type F7 = ({ a, b: number }: {
     a: any;
     b: any;
 }) => typeof number;
-declare type F8 = ({ a, b: number }: {
+type F8 = ({ a, b: number }: {
     a: any;
     b: any;
 }) => typeof number;
-declare type F9 = ([a, b, c]: [any, any, any]) => void;
-declare type G1 = new (arg: number) => any;
-declare type G2 = new ({ a }: O) => any;
-declare type G3 = new ({ a, b, c }: O) => any;
-declare type G4 = new ({ a }: O) => any;
-declare type G5 = new ({ a, b, c }: O) => any;
-declare type G6 = new ({ a: string }: {
+type F9 = ([a, b, c]: [any, any, any]) => void;
+type G1 = new (arg: number) => any;
+type G2 = new ({ a }: O) => any;
+type G3 = new ({ a, b, c }: O) => any;
+type G4 = new ({ a }: O) => any;
+type G5 = new ({ a, b, c }: O) => any;
+type G6 = new ({ a: string }: {
     a: any;
 }) => typeof string;
-declare type G7 = new ({ a, b: number }: {
+type G7 = new ({ a, b: number }: {
     a: any;
     b: any;
 }) => typeof number;
-declare type G8 = new ({ a, b: number }: {
+type G8 = new ({ a, b: number }: {
     a: any;
     b: any;
 }) => typeof number;
-declare type G9 = new ([a, b, c]: [any, any, any]) => void;
-declare type F10 = ({ "a": string }: {
+type G9 = new ([a, b, c]: [any, any, any]) => void;
+type F10 = ({ "a": string }: {
     a: any;
 }) => void;
-declare type F11 = ({ 2: string }: {
+type F11 = ({ 2: string }: {
     2: any;
 }) => void;
-declare type F12 = ({ ["a"]: string }: O) => void;
-declare type F13 = ({ [2]: string }: {
+type F12 = ({ ["a"]: string }: O) => void;
+type F13 = ({ [2]: string }: {
     2: any;
 }) => void;
-declare type G10 = new ({ "a": string }: {
+type G10 = new ({ "a": string }: {
     a: any;
 }) => void;
-declare type G11 = new ({ 2: string }: {
+type G11 = new ({ 2: string }: {
     2: any;
 }) => void;
-declare type G12 = new ({ ["a"]: string }: O) => void;
-declare type G13 = new ({ [2]: string }: {
+type G12 = new ({ ["a"]: string }: O) => void;
+type G13 = new ({ [2]: string }: {
     2: any;
 }) => void;
 interface I {
diff --git a/tests/baselines/reference/restTupleElements1.js b/tests/baselines/reference/restTupleElements1.js
index a15c7fd4dd119..82b5ded6806f8 100644
--- a/tests/baselines/reference/restTupleElements1.js
+++ b/tests/baselines/reference/restTupleElements1.js
@@ -99,30 +99,30 @@ f2(function (x) { return x * 2; }, function (x) { return x.length; }, function (
 
 
 //// [restTupleElements1.d.ts]
-declare type T00 = [string?];
-declare type T01 = [string, string?];
-declare type T02 = [string?, string];
-declare type T03 = [...string[]];
-declare type T04 = [...[...string[]]];
-declare type T05 = [...[...[...string[]]]];
-declare type T06 = [string, ...string[]];
-declare type T07 = [...string[], string];
-declare type T08 = [...string];
-declare type T09 = [...?string];
-declare type T10 = [string, ...[...string[]]];
-declare type T11 = [string, ...[...[...string[]]]];
-declare type T15 = [boolean, number, ...string[]];
-declare type L15 = T15["length"];
+type T00 = [string?];
+type T01 = [string, string?];
+type T02 = [string?, string];
+type T03 = [...string[]];
+type T04 = [...[...string[]]];
+type T05 = [...[...[...string[]]]];
+type T06 = [string, ...string[]];
+type T07 = [...string[], string];
+type T08 = [...string];
+type T09 = [...?string];
+type T10 = [string, ...[...string[]]];
+type T11 = [string, ...[...[...string[]]]];
+type T15 = [boolean, number, ...string[]];
+type L15 = T15["length"];
 declare function assign<T, S extends T>(): void;
-declare type T20 = [number, string, ...boolean[]];
-declare type T21 = T20[0];
-declare type T22 = T20[0 | 1];
-declare type T23 = T20[0 | 1 | 2];
-declare type T24 = T20[0 | 1 | 2 | 3];
-declare type T25 = T20[1 | 2 | 3];
-declare type T26 = T20[2 | 3];
-declare type T27 = T20[3];
-declare type T28 = T20[number];
+type T20 = [number, string, ...boolean[]];
+type T21 = T20[0];
+type T22 = T20[0 | 1];
+type T23 = T20[0 | 1 | 2];
+type T24 = T20[0 | 1 | 2 | 3];
+type T25 = T20[1 | 2 | 3];
+type T26 = T20[2 | 3];
+type T27 = T20[3];
+type T28 = T20[number];
 declare const t: T20;
 declare const x: number;
 declare let e0: number;
diff --git a/tests/baselines/reference/restTuplesFromContextualTypes.js b/tests/baselines/reference/restTuplesFromContextualTypes.js
index f22bdba39b0cf..be3e73e55e285 100644
--- a/tests/baselines/reference/restTuplesFromContextualTypes.js
+++ b/tests/baselines/reference/restTuplesFromContextualTypes.js
@@ -361,7 +361,7 @@ declare let g7: (x: any, y: any) => string;
 declare let g8: (x: number, y: string) => string;
 declare var tuple: [number, string];
 declare function take(cb: (a: number, b: string) => void): void;
-declare type ArgsUnion = [number, string] | [number, Error];
-declare type TupleUnionFunc = (...params: ArgsUnion) => number;
+type ArgsUnion = [number, string] | [number, Error];
+type TupleUnionFunc = (...params: ArgsUnion) => number;
 declare const funcUnionTupleNoRest: TupleUnionFunc;
 declare const funcUnionTupleRest: TupleUnionFunc;
diff --git a/tests/baselines/reference/reverseMappedTypeDeepDeclarationEmit.js b/tests/baselines/reference/reverseMappedTypeDeepDeclarationEmit.js
index aee2773df36c5..74cabbe7de657 100644
--- a/tests/baselines/reference/reverseMappedTypeDeepDeclarationEmit.js
+++ b/tests/baselines/reference/reverseMappedTypeDeepDeclarationEmit.js
@@ -52,9 +52,9 @@ exports.outputExample = (0, exports.validatorFunc)({
 
 
 //// [reverseMappedTypeDeepDeclarationEmit.d.ts]
-export declare type Validator<T> = NativeTypeValidator<T> | ObjectValidator<T>;
-export declare type NativeTypeValidator<T> = (n: any) => T | undefined;
-export declare type ObjectValidator<O> = {
+export type Validator<T> = NativeTypeValidator<T> | ObjectValidator<T>;
+export type NativeTypeValidator<T> = (n: any) => T | undefined;
+export type ObjectValidator<O> = {
     [K in keyof O]: Validator<O[K]>;
 };
 export declare const SimpleStringValidator: NativeTypeValidator<string>;
diff --git a/tests/baselines/reference/silentNeverPropagation.js b/tests/baselines/reference/silentNeverPropagation.js
index cb6548632027f..200fea4f28cc3 100644
--- a/tests/baselines/reference/silentNeverPropagation.js
+++ b/tests/baselines/reference/silentNeverPropagation.js
@@ -36,13 +36,13 @@ breaks.foo();
 
 
 //// [silentNeverPropagation.d.ts]
-declare type ModuleWithState<TState> = {
+type ModuleWithState<TState> = {
     state: TState;
 };
-declare type State = {
+type State = {
     a: number;
 };
-declare type MoreState = {
+type MoreState = {
     z: string;
 };
 declare function createModule<TState, TActions>(state: TState, actions: TActions): ModuleWithState<TState> & TActions;
diff --git a/tests/baselines/reference/strictOptionalProperties1.js b/tests/baselines/reference/strictOptionalProperties1.js
index faef4708b0470..00b4ec7eb3c44 100644
--- a/tests/baselines/reference/strictOptionalProperties1.js
+++ b/tests/baselines/reference/strictOptionalProperties1.js
@@ -392,11 +392,11 @@ declare function f4(t: [string?]): void;
 declare function f4a(t1: [number, string?], t2: [number, string?, string?]): void;
 declare function f5(t: [number, string?, boolean?]): void;
 declare function f6(): void;
-declare type Props = {
+type Props = {
     foo: string;
     bar: string;
 };
-declare type InputProps = {
+type InputProps = {
     foo?: string;
     bar: string;
 };
@@ -439,7 +439,7 @@ declare function f11<T>(x: {
 }): T;
 declare function f12<T>(x: [T?]): T;
 declare function f13<T>(x: Partial<T>): T;
-declare type Undefinable<T> = T | undefined;
+type Undefinable<T> = T | undefined;
 declare function expectNotUndefined<T>(value: Undefinable<T>): T;
 interface Bar {
     bar?: number;
@@ -482,12 +482,12 @@ interface PropsFromReact {
 interface PropsFromMaterialUI {
     onClick?: (() => void) | undefined;
 }
-declare type TheTypeFromMaterialUI = PropsFromReact & PropsFromMaterialUI;
+type TheTypeFromMaterialUI = PropsFromReact & PropsFromMaterialUI;
 interface NavBottomListItem extends TheTypeFromMaterialUI {
     value: string;
 }
-declare type UA = undefined;
-declare type UB = {
+type UA = undefined;
+type UB = {
     x?: never;
 }['x'];
-declare type UC = UA & UB;
+type UC = UA & UB;
diff --git a/tests/baselines/reference/strictOptionalProperties2.js b/tests/baselines/reference/strictOptionalProperties2.js
index 63079175a668d..db38ed83bbd0a 100644
--- a/tests/baselines/reference/strictOptionalProperties2.js
+++ b/tests/baselines/reference/strictOptionalProperties2.js
@@ -11,9 +11,9 @@ type T2 = [(string | undefined)?] extends [string?] ? true : false;  // false
 
 
 //// [strictOptionalProperties2.d.ts]
-declare type T1 = {
+type T1 = {
     0?: string | undefined;
 } extends {
     0?: string;
 } ? true : false;
-declare type T2 = [(string | undefined)?] extends [string?] ? true : false;
+type T2 = [(string | undefined)?] extends [string?] ? true : false;
diff --git a/tests/baselines/reference/stringLiteralTypesAndTuples01.js b/tests/baselines/reference/stringLiteralTypesAndTuples01.js
index 11aebfc04043a..a304ebcf07e9d 100644
--- a/tests/baselines/reference/stringLiteralTypesAndTuples01.js
+++ b/tests/baselines/reference/stringLiteralTypesAndTuples01.js
@@ -36,6 +36,6 @@ function rawr(dino) {
 
 //// [stringLiteralTypesAndTuples01.d.ts]
 declare let hello: string, brave: string, newish: string, world: string;
-declare type RexOrRaptor = "t-rex" | "raptor";
+type RexOrRaptor = "t-rex" | "raptor";
 declare let im: "I'm", a: "a", dinosaur: RexOrRaptor;
 declare function rawr(dino: RexOrRaptor): "ROAAAAR!" | "yip yip!";
diff --git a/tests/baselines/reference/stringLiteralTypesAsTags01.js b/tests/baselines/reference/stringLiteralTypesAsTags01.js
index adecab0b1b8a9..61bca969f4f51 100644
--- a/tests/baselines/reference/stringLiteralTypesAsTags01.js
+++ b/tests/baselines/reference/stringLiteralTypesAsTags01.js
@@ -64,7 +64,7 @@ else {
 
 
 //// [stringLiteralTypesAsTags01.d.ts]
-declare type Kind = "A" | "B";
+type Kind = "A" | "B";
 interface Entity {
     kind: Kind;
 }
diff --git a/tests/baselines/reference/stringLiteralTypesAsTags02.js b/tests/baselines/reference/stringLiteralTypesAsTags02.js
index 299686b080221..dcbd374ed1abb 100644
--- a/tests/baselines/reference/stringLiteralTypesAsTags02.js
+++ b/tests/baselines/reference/stringLiteralTypesAsTags02.js
@@ -63,7 +63,7 @@ else {
 
 
 //// [stringLiteralTypesAsTags02.d.ts]
-declare type Kind = "A" | "B";
+type Kind = "A" | "B";
 interface Entity {
     kind: Kind;
 }
diff --git a/tests/baselines/reference/stringLiteralTypesAsTags03.js b/tests/baselines/reference/stringLiteralTypesAsTags03.js
index 761037dda2d2a..6329264d91f6d 100644
--- a/tests/baselines/reference/stringLiteralTypesAsTags03.js
+++ b/tests/baselines/reference/stringLiteralTypesAsTags03.js
@@ -67,7 +67,7 @@ else {
 
 
 //// [stringLiteralTypesAsTags03.d.ts]
-declare type Kind = "A" | "B";
+type Kind = "A" | "B";
 interface Entity {
     kind: Kind;
 }
diff --git a/tests/baselines/reference/stringLiteralTypesInUnionTypes01.js b/tests/baselines/reference/stringLiteralTypesInUnionTypes01.js
index b8e3f62069098..327840b708ea0 100644
--- a/tests/baselines/reference/stringLiteralTypesInUnionTypes01.js
+++ b/tests/baselines/reference/stringLiteralTypesInUnionTypes01.js
@@ -38,6 +38,6 @@ y = x;
 
 
 //// [stringLiteralTypesInUnionTypes01.d.ts]
-declare type T = "foo" | "bar" | "baz";
+type T = "foo" | "bar" | "baz";
 declare var x: "foo" | "bar" | "baz";
 declare var y: T;
diff --git a/tests/baselines/reference/stringLiteralTypesInUnionTypes02.js b/tests/baselines/reference/stringLiteralTypesInUnionTypes02.js
index 8c0d5bd6fe303..aea0874aed169 100644
--- a/tests/baselines/reference/stringLiteralTypesInUnionTypes02.js
+++ b/tests/baselines/reference/stringLiteralTypesInUnionTypes02.js
@@ -38,6 +38,6 @@ y = x;
 
 
 //// [stringLiteralTypesInUnionTypes02.d.ts]
-declare type T = string | "foo" | "bar" | "baz";
+type T = string | "foo" | "bar" | "baz";
 declare var x: "foo" | "bar" | "baz" | string;
 declare var y: T;
diff --git a/tests/baselines/reference/stringLiteralTypesInUnionTypes03.js b/tests/baselines/reference/stringLiteralTypesInUnionTypes03.js
index c635c2df53cf5..afb20587c62d4 100644
--- a/tests/baselines/reference/stringLiteralTypesInUnionTypes03.js
+++ b/tests/baselines/reference/stringLiteralTypesInUnionTypes03.js
@@ -38,6 +38,6 @@ y = x;
 
 
 //// [stringLiteralTypesInUnionTypes03.d.ts]
-declare type T = number | "foo" | "bar";
+type T = number | "foo" | "bar";
 declare var x: "foo" | "bar" | number;
 declare var y: T;
diff --git a/tests/baselines/reference/stringLiteralTypesInUnionTypes04.js b/tests/baselines/reference/stringLiteralTypesInUnionTypes04.js
index 967014d58a62f..f7332ffd761ef 100644
--- a/tests/baselines/reference/stringLiteralTypesInUnionTypes04.js
+++ b/tests/baselines/reference/stringLiteralTypesInUnionTypes04.js
@@ -66,6 +66,6 @@ if (!!!x) {
 
 
 //// [stringLiteralTypesInUnionTypes04.d.ts]
-declare type T = "" | "foo";
+type T = "" | "foo";
 declare let x: T;
 declare let y: T;
diff --git a/tests/baselines/reference/stringLiteralTypesOverloads01.js b/tests/baselines/reference/stringLiteralTypesOverloads01.js
index 039186e8c68af..1acbfbf384eaf 100644
--- a/tests/baselines/reference/stringLiteralTypesOverloads01.js
+++ b/tests/baselines/reference/stringLiteralTypesOverloads01.js
@@ -92,7 +92,7 @@ var Consts2;
 
 
 //// [stringLiteralTypesOverloads01.d.ts]
-declare type PrimitiveName = 'string' | 'number' | 'boolean';
+type PrimitiveName = 'string' | 'number' | 'boolean';
 declare function getFalsyPrimitive(x: "string"): string;
 declare function getFalsyPrimitive(x: "number"): number;
 declare function getFalsyPrimitive(x: "boolean"): boolean;
diff --git a/tests/baselines/reference/stringLiteralTypesTypePredicates01.js b/tests/baselines/reference/stringLiteralTypesTypePredicates01.js
index cf22198f48d35..6256ae60b502c 100644
--- a/tests/baselines/reference/stringLiteralTypesTypePredicates01.js
+++ b/tests/baselines/reference/stringLiteralTypesTypePredicates01.js
@@ -43,7 +43,7 @@ else {
 
 
 //// [stringLiteralTypesTypePredicates01.d.ts]
-declare type Kind = "A" | "B";
+type Kind = "A" | "B";
 declare function kindIs(kind: Kind, is: "A"): kind is "A";
 declare function kindIs(kind: Kind, is: "B"): kind is "B";
 declare var x: Kind;
diff --git a/tests/baselines/reference/symbolLinkDeclarationEmitModuleNames.js b/tests/baselines/reference/symbolLinkDeclarationEmitModuleNames.js
index be495125ee6e3..ed8d98507685e 100644
--- a/tests/baselines/reference/symbolLinkDeclarationEmitModuleNames.js
+++ b/tests/baselines/reference/symbolLinkDeclarationEmitModuleNames.js
@@ -71,7 +71,7 @@ exports.CONTROLLER_CLASS = context_1.BindingKey.create(null); // line in questio
 
 
 //// [value-promise.d.ts]
-export declare type Constructor<T> = (...args: any[]) => T;
+export type Constructor<T> = (...args: any[]) => T;
 //// [bindingkey.d.ts]
 import { Constructor } from "@loopback/context";
 export declare class BindingKey<T> {
@@ -83,7 +83,7 @@ export * from "./src/value-promise";
 export * from "./src/bindingkey";
 //// [application.d.ts]
 import { Constructor } from "@loopback/context";
-export declare type ControllerClass = Constructor<any>;
+export type ControllerClass = Constructor<any>;
 //// [usage.d.ts]
 import { ControllerClass } from './application';
 import { BindingKey } from '@loopback/context';
diff --git a/tests/baselines/reference/symbolLinkDeclarationEmitModuleNamesRootDir.js b/tests/baselines/reference/symbolLinkDeclarationEmitModuleNamesRootDir.js
index c51360496ab40..21a84291f197c 100644
--- a/tests/baselines/reference/symbolLinkDeclarationEmitModuleNamesRootDir.js
+++ b/tests/baselines/reference/symbolLinkDeclarationEmitModuleNamesRootDir.js
@@ -37,7 +37,7 @@ exports.CONTROLLER_CLASS = context_1.BindingKey.create(null); // line in questio
 
 //// [application.d.ts]
 import { Constructor } from "@loopback/context";
-export declare type ControllerClass = Constructor<any>;
+export type ControllerClass = Constructor<any>;
 //// [usage.d.ts]
 import { ControllerClass } from './application';
 import { BindingKey } from '@loopback/context';
diff --git a/tests/baselines/reference/taggedPrimitiveNarrowing.js b/tests/baselines/reference/taggedPrimitiveNarrowing.js
index a87ea61ddf32c..a2e7bdbb0c098 100644
--- a/tests/baselines/reference/taggedPrimitiveNarrowing.js
+++ b/tests/baselines/reference/taggedPrimitiveNarrowing.js
@@ -33,7 +33,7 @@ function getHashLength2(hash) {
 
 
 //// [taggedPrimitiveNarrowing.d.ts]
-declare type Hash = string & {
+type Hash = string & {
     __hash: true;
 };
 declare function getHashLength(hash: Hash): number;
diff --git a/tests/baselines/reference/tailRecursiveConditionalTypes.js b/tests/baselines/reference/tailRecursiveConditionalTypes.js
index 8ae35aad15147..fd4bb8617cbb8 100644
--- a/tests/baselines/reference/tailRecursiveConditionalTypes.js
+++ b/tests/baselines/reference/tailRecursiveConditionalTypes.js
@@ -33,17 +33,17 @@ type T41 = TupleOf<any, number>;
 
 
 //// [tailRecursiveConditionalTypes.d.ts]
-declare type Trim<S extends string> = S extends ` ${infer T}` ? Trim<T> : S extends `${infer T} ` ? Trim<T> : S;
-declare type T10 = Trim<'                                                                                                                                                hello '>;
-declare type T11 = Trim<' hello                                                                                                                                                '>;
-declare type GetChars<S> = GetCharsRec<S, never>;
-declare type GetCharsRec<S, Acc> = S extends `${infer Char}${infer Rest}` ? GetCharsRec<Rest, Char | Acc> : Acc;
-declare type T20 = GetChars<'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'>;
-declare type Reverse<T> = any[] extends T ? T : ReverseRec<T, []>;
-declare type ReverseRec<T, Acc extends unknown[]> = T extends [infer Head, ...infer Tail] ? ReverseRec<Tail, [Head, ...Acc]> : Acc;
-declare type T30 = Reverse<[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9]>;
-declare type T31 = Reverse<string[]>;
-declare type TupleOf<T, N extends number> = number extends N ? T[] : TupleOfRec<T, N, []>;
-declare type TupleOfRec<T, N extends number, Acc extends unknown[]> = Acc["length"] extends N ? Acc : TupleOfRec<T, N, [T, ...Acc]>;
-declare type T40 = TupleOf<any, 200>;
-declare type T41 = TupleOf<any, number>;
+type Trim<S extends string> = S extends ` ${infer T}` ? Trim<T> : S extends `${infer T} ` ? Trim<T> : S;
+type T10 = Trim<'                                                                                                                                                hello '>;
+type T11 = Trim<' hello                                                                                                                                                '>;
+type GetChars<S> = GetCharsRec<S, never>;
+type GetCharsRec<S, Acc> = S extends `${infer Char}${infer Rest}` ? GetCharsRec<Rest, Char | Acc> : Acc;
+type T20 = GetChars<'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'>;
+type Reverse<T> = any[] extends T ? T : ReverseRec<T, []>;
+type ReverseRec<T, Acc extends unknown[]> = T extends [infer Head, ...infer Tail] ? ReverseRec<Tail, [Head, ...Acc]> : Acc;
+type T30 = Reverse<[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9]>;
+type T31 = Reverse<string[]>;
+type TupleOf<T, N extends number> = number extends N ? T[] : TupleOfRec<T, N, []>;
+type TupleOfRec<T, N extends number, Acc extends unknown[]> = Acc["length"] extends N ? Acc : TupleOfRec<T, N, [T, ...Acc]>;
+type T40 = TupleOf<any, 200>;
+type T41 = TupleOf<any, number>;
diff --git a/tests/baselines/reference/templateLiteralTypes1.js b/tests/baselines/reference/templateLiteralTypes1.js
index afa410f6dc9de..a05790ecafc2e 100644
--- a/tests/baselines/reference/templateLiteralTypes1.js
+++ b/tests/baselines/reference/templateLiteralTypes1.js
@@ -298,5 +298,5 @@ var test1 = "0 0 0";
 
 
 //// [templateLiteralTypes1.d.ts]
-export declare type Spacing = `0` | `${number}px` | `${number}rem` | `s${1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18 | 19 | 20}`;
-export declare type SpacingShorthand = `${Spacing} ${Spacing}` | `${Spacing} ${Spacing} ${Spacing}` | `${Spacing} ${Spacing} ${Spacing} ${Spacing}`;
+export type Spacing = `0` | `${number}px` | `${number}rem` | `s${1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18 | 19 | 20}`;
+export type SpacingShorthand = `${Spacing} ${Spacing}` | `${Spacing} ${Spacing} ${Spacing}` | `${Spacing} ${Spacing} ${Spacing} ${Spacing}`;
diff --git a/tests/baselines/reference/templateLiteralTypes2.js b/tests/baselines/reference/templateLiteralTypes2.js
index 9f432cd21ef3d..ccf1fba66263e 100644
--- a/tests/baselines/reference/templateLiteralTypes2.js
+++ b/tests/baselines/reference/templateLiteralTypes2.js
@@ -215,7 +215,7 @@ declare function ft12(s: string): void;
 declare function widening<T>(x: T): T;
 declare function nonWidening<T extends string | number | symbol>(x: T): T;
 declare function ft13(s: string, cond: boolean): void;
-declare type T0 = string | `${number}px`;
+type T0 = string | `${number}px`;
 declare function ft14(t: `foo${number}`): void;
 declare function g1<T>(x: T): T;
 declare function g2<T extends string>(x: T): T;
@@ -231,7 +231,7 @@ declare const t4: unknown;
 declare const someUnion: 'abc' | 'def' | 'ghi';
 declare const t5: "abc" | "def" | "ghi";
 declare const pixelValue: number;
-declare type PixelValueType = `${number}px`;
+type PixelValueType = `${number}px`;
 declare const pixelString: PixelValueType;
 declare const pixelStringWithTemplate: PixelValueType;
 declare function getCardTitle(title: string): `test-${string}`;
diff --git a/tests/baselines/reference/templateLiteralTypes3.js b/tests/baselines/reference/templateLiteralTypes3.js
index 2a6056a2b3faa..f25296c0aef55 100644
--- a/tests/baselines/reference/templateLiteralTypes3.js
+++ b/tests/baselines/reference/templateLiteralTypes3.js
@@ -288,52 +288,52 @@ function ft1(t, u, u1, u2) {
 
 
 //// [templateLiteralTypes3.d.ts]
-declare type Foo1<T> = T extends `*${infer U}*` ? U : never;
-declare type T01 = Foo1<'hello'>;
-declare type T02 = Foo1<'*hello*'>;
-declare type T03 = Foo1<'**hello**'>;
-declare type T04 = Foo1<`*${string}*`>;
-declare type T05 = Foo1<`*${number}*`>;
-declare type T06 = Foo1<`*${bigint}*`>;
-declare type T07 = Foo1<`*${any}*`>;
-declare type T08 = Foo1<`**${string}**`>;
-declare type T09 = Foo1<`**${string}**${string}**`>;
-declare type T10 = Foo1<`**${'a' | 'b' | 'c'}**`>;
-declare type T11 = Foo1<`**${boolean}**${boolean}**`>;
+type Foo1<T> = T extends `*${infer U}*` ? U : never;
+type T01 = Foo1<'hello'>;
+type T02 = Foo1<'*hello*'>;
+type T03 = Foo1<'**hello**'>;
+type T04 = Foo1<`*${string}*`>;
+type T05 = Foo1<`*${number}*`>;
+type T06 = Foo1<`*${bigint}*`>;
+type T07 = Foo1<`*${any}*`>;
+type T08 = Foo1<`**${string}**`>;
+type T09 = Foo1<`**${string}**${string}**`>;
+type T10 = Foo1<`**${'a' | 'b' | 'c'}**`>;
+type T11 = Foo1<`**${boolean}**${boolean}**`>;
 declare function foo1<V extends string>(arg: `*${V}*`): V;
 declare function f1<T extends string>(s: string, n: number, b: boolean, t: T): void;
-declare type Parts<T> = T extends '' ? [] : T extends `${infer Head}${infer Tail}` ? [Head, ...Parts<Tail>] : never;
-declare type T20 = Parts<`abc`>;
-declare type T21 = Parts<`*${string}*`>;
-declare type T22 = Parts<`*${number}*`>;
-declare type T23 = Parts<`*${number}*${string}*${bigint}*`>;
+type Parts<T> = T extends '' ? [] : T extends `${infer Head}${infer Tail}` ? [Head, ...Parts<Tail>] : never;
+type T20 = Parts<`abc`>;
+type T21 = Parts<`*${string}*`>;
+type T22 = Parts<`*${number}*`>;
+type T23 = Parts<`*${number}*${string}*${bigint}*`>;
 declare function f2(): void;
 declare function f3<T extends string>(s: string, n: number, b: boolean, t: T): void;
 declare function f4<T extends number>(s: string, n: number, b: boolean, t: T): void;
-declare type A<T> = T extends `${infer U}.${infer V}` ? U | V : never;
-declare type B = A<`test.1024`>;
-declare type C = A<`test.${number}`>;
-declare type D<T> = T extends `${infer U}.${number}` ? U : never;
-declare type E = D<`test.1024`>;
-declare type F = D<`test.${number}`>;
-declare type G<T> = T extends `${infer U}.${infer V}` ? U | V : never;
-declare type H = G<`test.hoge`>;
-declare type I = G<`test.${string}`>;
-declare type J<T> = T extends `${infer U}.${string}` ? U : never;
-declare type K = J<`test.hoge`>;
-declare type L = J<`test.${string}`>;
-declare type Templated = `${string} ${string}`;
+type A<T> = T extends `${infer U}.${infer V}` ? U | V : never;
+type B = A<`test.1024`>;
+type C = A<`test.${number}`>;
+type D<T> = T extends `${infer U}.${number}` ? U : never;
+type E = D<`test.1024`>;
+type F = D<`test.${number}`>;
+type G<T> = T extends `${infer U}.${infer V}` ? U | V : never;
+type H = G<`test.hoge`>;
+type I = G<`test.${string}`>;
+type J<T> = T extends `${infer U}.${string}` ? U : never;
+type K = J<`test.hoge`>;
+type L = J<`test.${string}`>;
+type Templated = `${string} ${string}`;
 declare const value1: string;
 declare const templated1: Templated;
 declare const value2 = "abc";
 declare const templated2: Templated;
-declare type Prefixes = "foo" | "bar";
-declare type AllPrefixData = "foo:baz" | "bar:baz";
-declare type PrefixData<P extends Prefixes> = `${P}:baz`;
+type Prefixes = "foo" | "bar";
+type AllPrefixData = "foo:baz" | "bar:baz";
+type PrefixData<P extends Prefixes> = `${P}:baz`;
 interface ITest<P extends Prefixes, E extends AllPrefixData = PrefixData<P>> {
     blah: string;
 }
-declare type Schema = {
+type Schema = {
     a: {
         b: {
             c: number;
@@ -345,14 +345,14 @@ declare function ff1(x: `foo-${string}`, y: `${string}-bar`, z: `baz-${string}`)
 declare function ff2<T extends string>(x: `foo-${T}`, y: `${T}-bar`, z: `baz-${T}`): void;
 declare function ff3(x: string, y: `foo-${string}` | 'bar'): void;
 declare function ff4(x: string, y: `foo-${string}`): void;
-declare type Action = {
+type Action = {
     type: `${string}_REQUEST`;
 } | {
     type: `${string}_SUCCESS`;
     response: string;
 };
 declare function reducer(action: Action): void;
-declare type DotString = `${string}.${string}.${string}`;
+type DotString = `${string}.${string}.${string}`;
 declare function noSpread<P extends DotString>(args: P[]): P;
 declare function spread<P extends DotString>(...args: P[]): P;
 declare function ft1<T extends string>(t: T, u: Uppercase<T>, u1: Uppercase<`1.${T}.3`>, u2: Uppercase<`1.${T}.4`>): void;
diff --git a/tests/baselines/reference/templateLiteralTypes4.js b/tests/baselines/reference/templateLiteralTypes4.js
index 00ef80ae37977..b8ba7e6ba864e 100644
--- a/tests/baselines/reference/templateLiteralTypes4.js
+++ b/tests/baselines/reference/templateLiteralTypes4.js
@@ -320,30 +320,30 @@ f4("**false**"); // false | "false"
 
 
 //// [templateLiteralTypes4.d.ts]
-declare type TNumber0 = "100" extends `${infer N extends number}` ? N : never;
-declare type TNumber1 = "-100" extends `${infer N extends number}` ? N : never;
-declare type TNumber2 = "1.1" extends `${infer N extends number}` ? N : never;
-declare type TNumber3 = "8e-11" extends `${infer N extends number}` ? N : never;
-declare type TNumber4 = "0x10" extends `${infer N extends number}` ? N : never;
-declare type TNumber5 = "0o10" extends `${infer N extends number}` ? N : never;
-declare type TNumber6 = "0b10" extends `${infer N extends number}` ? N : never;
-declare type TNumber7 = "10e2" extends `${infer N extends number}` ? N : never;
-declare type TNumber8 = "abcd" extends `${infer N extends number}` ? N : never;
-declare type TBigInt0 = "100" extends `${infer N extends bigint}` ? N : never;
-declare type TBigInt1 = "-100" extends `${infer N extends bigint}` ? N : never;
-declare type TBigInt2 = "0x10" extends `${infer N extends bigint}` ? N : never;
-declare type TBigInt3 = "0o10" extends `${infer N extends bigint}` ? N : never;
-declare type TBigInt4 = "0b10" extends `${infer N extends bigint}` ? N : never;
-declare type TBigInt5 = "1.1" extends `${infer N extends bigint}` ? N : never;
-declare type TBigInt6 = "10e2" extends `${infer N extends bigint}` ? N : never;
-declare type TBigInt7 = "abcd" extends `${infer N extends bigint}` ? N : never;
-declare type TBoolean0 = "true" extends `${infer T extends boolean}` ? T : never;
-declare type TBoolean1 = "false" extends `${infer T extends boolean}` ? T : never;
-declare type TBoolean2 = "abcd" extends `${infer T extends boolean}` ? T : never;
-declare type TNull0 = "null" extends `${infer T extends null}` ? T : never;
-declare type TNull1 = "abcd" extends `${infer T extends null}` ? T : never;
-declare type TUndefined0 = "undefined" extends `${infer T extends undefined}` ? T : never;
-declare type TUndefined1 = "abcd" extends `${infer T extends undefined}` ? T : never;
+type TNumber0 = "100" extends `${infer N extends number}` ? N : never;
+type TNumber1 = "-100" extends `${infer N extends number}` ? N : never;
+type TNumber2 = "1.1" extends `${infer N extends number}` ? N : never;
+type TNumber3 = "8e-11" extends `${infer N extends number}` ? N : never;
+type TNumber4 = "0x10" extends `${infer N extends number}` ? N : never;
+type TNumber5 = "0o10" extends `${infer N extends number}` ? N : never;
+type TNumber6 = "0b10" extends `${infer N extends number}` ? N : never;
+type TNumber7 = "10e2" extends `${infer N extends number}` ? N : never;
+type TNumber8 = "abcd" extends `${infer N extends number}` ? N : never;
+type TBigInt0 = "100" extends `${infer N extends bigint}` ? N : never;
+type TBigInt1 = "-100" extends `${infer N extends bigint}` ? N : never;
+type TBigInt2 = "0x10" extends `${infer N extends bigint}` ? N : never;
+type TBigInt3 = "0o10" extends `${infer N extends bigint}` ? N : never;
+type TBigInt4 = "0b10" extends `${infer N extends bigint}` ? N : never;
+type TBigInt5 = "1.1" extends `${infer N extends bigint}` ? N : never;
+type TBigInt6 = "10e2" extends `${infer N extends bigint}` ? N : never;
+type TBigInt7 = "abcd" extends `${infer N extends bigint}` ? N : never;
+type TBoolean0 = "true" extends `${infer T extends boolean}` ? T : never;
+type TBoolean1 = "false" extends `${infer T extends boolean}` ? T : never;
+type TBoolean2 = "abcd" extends `${infer T extends boolean}` ? T : never;
+type TNull0 = "null" extends `${infer T extends null}` ? T : never;
+type TNull1 = "abcd" extends `${infer T extends null}` ? T : never;
+type TUndefined0 = "undefined" extends `${infer T extends undefined}` ? T : never;
+type TUndefined1 = "abcd" extends `${infer T extends undefined}` ? T : never;
 declare const enum StringLiteralEnum {
     Zero = "0",
     True = "true",
@@ -351,102 +351,102 @@ declare const enum StringLiteralEnum {
     Undefined = "undefined",
     Null = "null"
 }
-declare type TStringLiteralEnum0 = "0" extends `${infer T extends StringLiteralEnum}` ? T : never;
+type TStringLiteralEnum0 = "0" extends `${infer T extends StringLiteralEnum}` ? T : never;
 declare const enum NumberLiteralEnum {
     Zero = 0,
     One = 1
 }
-declare type TNumberLiteralEnum0 = "0" extends `${infer T extends NumberLiteralEnum}` ? T : never;
+type TNumberLiteralEnum0 = "0" extends `${infer T extends NumberLiteralEnum}` ? T : never;
 declare const enum NonLiteralEnum {
     Zero = 0,
     One = 1
 }
-declare type TNonLiteralEnum0 = "0" extends `${infer T extends NonLiteralEnum}` ? T : never;
-declare type PString00 = "0" extends `${infer T extends string | StringLiteralEnum}` ? T : never;
-declare type PString01 = "0" extends `${infer T extends string | number}` ? T : never;
-declare type PString02 = "0" extends `${infer T extends string | NonLiteralEnum}` ? T : never;
-declare type PString03 = "0" extends `${infer T extends string | 0}` ? T : never;
-declare type PString04 = "0" extends `${infer T extends string | NumberLiteralEnum}` ? T : never;
-declare type PString05 = "0" extends `${infer T extends string | bigint}` ? T : never;
-declare type PString06 = "0" extends `${infer T extends string | 0n}` ? T : never;
-declare type PString07 = "true" extends `${infer T extends string | boolean}` ? T : never;
-declare type PString08 = "false" extends `${infer T extends string | boolean}` ? T : never;
-declare type PString09 = "true" extends `${infer T extends string | true}` ? T : never;
-declare type PString10 = "false" extends `${infer T extends string | false}` ? T : never;
-declare type PString11 = "undefined" extends `${infer T extends string | undefined}` ? T : never;
-declare type PString12 = "null" extends `${infer T extends string | null}` ? T : never;
-declare type PTemplate00 = "10" extends `${infer T extends `1${string}` | number}` ? T : never;
-declare type PTemplate01 = "10" extends `${infer T extends `1${string}` | NonLiteralEnum}` ? T : never;
-declare type PTemplate02 = "10" extends `${infer T extends `1${string}` | 10}` ? T : never;
-declare type PTemplate03 = "10" extends `${infer T extends `1${string}` | NumberLiteralEnum}` ? T : never;
-declare type PTemplate04 = "10" extends `${infer T extends `1${string}` | bigint}` ? T : never;
-declare type PTemplate05 = "10" extends `${infer T extends `1${string}` | 10n}` ? T : never;
-declare type PTemplate06 = "true" extends `${infer T extends `${string}e` | boolean}` ? T : never;
-declare type PTemplate07 = "false" extends `${infer T extends `${string}e` | boolean}` ? T : never;
-declare type PTemplate08 = "true" extends `${infer T extends `${"t"}${string}` | true}` ? T : never;
-declare type PTemplate09 = "false" extends `${infer T extends `${"f"}${string}` | false}` ? T : never;
-declare type PTemplate10 = "undefined" extends `${infer T extends `${"u"}${string}` | undefined}` ? T : never;
-declare type PTemplate11 = "null" extends `${infer T extends `${"n"}${string}` | null}` ? T : never;
-declare type PStringLiteral00 = "0" extends `${infer T extends "0" | number}` ? T : never;
-declare type PStringLiteral01 = "0" extends `${infer T extends "0" | NonLiteralEnum}` ? T : never;
-declare type PStringLiteral02 = "0" extends `${infer T extends "0" | 0}` ? T : never;
-declare type PStringLiteral03 = "0" extends `${infer T extends "0" | NumberLiteralEnum}` ? T : never;
-declare type PStringLiteral04 = "0" extends `${infer T extends "0" | bigint}` ? T : never;
-declare type PStringLiteral05 = "0" extends `${infer T extends "0" | 0n}` ? T : never;
-declare type PStringLiteral06 = "true" extends `${infer T extends "true" | "false" | boolean}` ? T : never;
-declare type PStringLiteral07 = "false" extends `${infer T extends "true" | "false" | boolean}` ? T : never;
-declare type PStringLiteral08 = "true" extends `${infer T extends "true" | true}` ? T : never;
-declare type PStringLiteral09 = "false" extends `${infer T extends "false" | false}` ? T : never;
-declare type PStringLiteral10 = "undefined" extends `${infer T extends "undefined" | undefined}` ? T : never;
-declare type PStringLiteral11 = "null" extends `${infer T extends "null" | null}` ? T : never;
-declare type PStringLiteralEnum00 = "0" extends `${infer T extends StringLiteralEnum | number}` ? T : never;
-declare type PStringLiteralEnum01 = "0" extends `${infer T extends StringLiteralEnum | NonLiteralEnum}` ? T : never;
-declare type PStringLiteralEnum02 = "0" extends `${infer T extends StringLiteralEnum | 0}` ? T : never;
-declare type PStringLiteralEnum03 = "0" extends `${infer T extends StringLiteralEnum | NumberLiteralEnum}` ? T : never;
-declare type PStringLiteralEnum04 = "0" extends `${infer T extends StringLiteralEnum | bigint}` ? T : never;
-declare type PStringLiteralEnum05 = "0" extends `${infer T extends StringLiteralEnum | 0n}` ? T : never;
-declare type PStringLiteralEnum06 = "true" extends `${infer T extends StringLiteralEnum | boolean}` ? T : never;
-declare type PStringLiteralEnum07 = "false" extends `${infer T extends StringLiteralEnum | boolean}` ? T : never;
-declare type PStringLiteralEnum08 = "true" extends `${infer T extends StringLiteralEnum | true}` ? T : never;
-declare type PStringLiteralEnum09 = "false" extends `${infer T extends StringLiteralEnum | false}` ? T : never;
-declare type PStringLiteralEnum10 = "undefined" extends `${infer T extends StringLiteralEnum | undefined}` ? T : never;
-declare type PStringLiteralEnum11 = "null" extends `${infer T extends StringLiteralEnum | null}` ? T : never;
-declare type PNumber0 = "0" extends `${infer T extends number | NonLiteralEnum}` ? T : never;
-declare type PNumber1 = "0" extends `${infer T extends number | NumberLiteralEnum}` ? T : never;
-declare type PNumber2 = "0" extends `${infer T extends number | bigint}` ? T : never;
-declare type PNumber3 = "0" extends `${infer T extends number | 0n}` ? T : never;
-declare type PEnum0 = "0" extends `${infer T extends NonLiteralEnum | NumberLiteralEnum}` ? T : never;
-declare type PEnum1 = "0" extends `${infer T extends NonLiteralEnum | bigint}` ? T : never;
-declare type PEnum2 = "0" extends `${infer T extends NonLiteralEnum | 0n}` ? T : never;
-declare type PNumberLiteral0 = "0" extends `${infer T extends 0 | bigint}` ? T : never;
-declare type PNumberLiteral1 = "0" extends `${infer T extends 0 | 0n}` ? T : never;
-declare type PNumberLiteralEnum0 = "0" extends `${infer T extends NumberLiteralEnum | bigint}` ? T : never;
-declare type PNumberLiteralEnum1 = "0" extends `${infer T extends NumberLiteralEnum | 0n}` ? T : never;
-declare type PExclude0 = "0" extends `${infer T extends "1" | number}` ? T : never;
-declare type PExclude1 = "0" extends `${infer T extends `1${string}` | number}` ? T : never;
-declare type PExclude2 = "0" extends `${infer T extends 1 | bigint}` ? T : never;
-declare type PExclude3 = "0" extends `${infer T extends NumberLiteralEnum.One | bigint}` ? T : never;
-declare type PExclude4 = "100000000000000000000000" extends `${infer T extends number | bigint}` ? T : never;
-declare type TPrefix0 = "100" extends `${infer T extends number}${string}` ? T : never;
-declare type TPrefix1 = "trueabc" extends `${infer T extends boolean}${string}` ? T : never;
-declare type TPrefix2 = `100:${string}` extends `${infer T extends number}:${string}` ? T : never;
-declare type ExtractPrimitives<T extends string> = T | (T extends `${infer U extends number}` ? U : never) | (T extends `${infer U extends bigint}` ? U : never) | (T extends `${infer U extends boolean | null | undefined}` ? U : never);
-declare type TExtract0 = ExtractPrimitives<"100">;
-declare type TExtract1 = ExtractPrimitives<"1.1">;
-declare type TExtract2 = ExtractPrimitives<"true">;
-declare type IndexFor<S extends string> = S extends `${infer N extends number}` ? N : never;
-declare type IndicesOf<T> = IndexFor<Extract<keyof T, string>>;
+type TNonLiteralEnum0 = "0" extends `${infer T extends NonLiteralEnum}` ? T : never;
+type PString00 = "0" extends `${infer T extends string | StringLiteralEnum}` ? T : never;
+type PString01 = "0" extends `${infer T extends string | number}` ? T : never;
+type PString02 = "0" extends `${infer T extends string | NonLiteralEnum}` ? T : never;
+type PString03 = "0" extends `${infer T extends string | 0}` ? T : never;
+type PString04 = "0" extends `${infer T extends string | NumberLiteralEnum}` ? T : never;
+type PString05 = "0" extends `${infer T extends string | bigint}` ? T : never;
+type PString06 = "0" extends `${infer T extends string | 0n}` ? T : never;
+type PString07 = "true" extends `${infer T extends string | boolean}` ? T : never;
+type PString08 = "false" extends `${infer T extends string | boolean}` ? T : never;
+type PString09 = "true" extends `${infer T extends string | true}` ? T : never;
+type PString10 = "false" extends `${infer T extends string | false}` ? T : never;
+type PString11 = "undefined" extends `${infer T extends string | undefined}` ? T : never;
+type PString12 = "null" extends `${infer T extends string | null}` ? T : never;
+type PTemplate00 = "10" extends `${infer T extends `1${string}` | number}` ? T : never;
+type PTemplate01 = "10" extends `${infer T extends `1${string}` | NonLiteralEnum}` ? T : never;
+type PTemplate02 = "10" extends `${infer T extends `1${string}` | 10}` ? T : never;
+type PTemplate03 = "10" extends `${infer T extends `1${string}` | NumberLiteralEnum}` ? T : never;
+type PTemplate04 = "10" extends `${infer T extends `1${string}` | bigint}` ? T : never;
+type PTemplate05 = "10" extends `${infer T extends `1${string}` | 10n}` ? T : never;
+type PTemplate06 = "true" extends `${infer T extends `${string}e` | boolean}` ? T : never;
+type PTemplate07 = "false" extends `${infer T extends `${string}e` | boolean}` ? T : never;
+type PTemplate08 = "true" extends `${infer T extends `${"t"}${string}` | true}` ? T : never;
+type PTemplate09 = "false" extends `${infer T extends `${"f"}${string}` | false}` ? T : never;
+type PTemplate10 = "undefined" extends `${infer T extends `${"u"}${string}` | undefined}` ? T : never;
+type PTemplate11 = "null" extends `${infer T extends `${"n"}${string}` | null}` ? T : never;
+type PStringLiteral00 = "0" extends `${infer T extends "0" | number}` ? T : never;
+type PStringLiteral01 = "0" extends `${infer T extends "0" | NonLiteralEnum}` ? T : never;
+type PStringLiteral02 = "0" extends `${infer T extends "0" | 0}` ? T : never;
+type PStringLiteral03 = "0" extends `${infer T extends "0" | NumberLiteralEnum}` ? T : never;
+type PStringLiteral04 = "0" extends `${infer T extends "0" | bigint}` ? T : never;
+type PStringLiteral05 = "0" extends `${infer T extends "0" | 0n}` ? T : never;
+type PStringLiteral06 = "true" extends `${infer T extends "true" | "false" | boolean}` ? T : never;
+type PStringLiteral07 = "false" extends `${infer T extends "true" | "false" | boolean}` ? T : never;
+type PStringLiteral08 = "true" extends `${infer T extends "true" | true}` ? T : never;
+type PStringLiteral09 = "false" extends `${infer T extends "false" | false}` ? T : never;
+type PStringLiteral10 = "undefined" extends `${infer T extends "undefined" | undefined}` ? T : never;
+type PStringLiteral11 = "null" extends `${infer T extends "null" | null}` ? T : never;
+type PStringLiteralEnum00 = "0" extends `${infer T extends StringLiteralEnum | number}` ? T : never;
+type PStringLiteralEnum01 = "0" extends `${infer T extends StringLiteralEnum | NonLiteralEnum}` ? T : never;
+type PStringLiteralEnum02 = "0" extends `${infer T extends StringLiteralEnum | 0}` ? T : never;
+type PStringLiteralEnum03 = "0" extends `${infer T extends StringLiteralEnum | NumberLiteralEnum}` ? T : never;
+type PStringLiteralEnum04 = "0" extends `${infer T extends StringLiteralEnum | bigint}` ? T : never;
+type PStringLiteralEnum05 = "0" extends `${infer T extends StringLiteralEnum | 0n}` ? T : never;
+type PStringLiteralEnum06 = "true" extends `${infer T extends StringLiteralEnum | boolean}` ? T : never;
+type PStringLiteralEnum07 = "false" extends `${infer T extends StringLiteralEnum | boolean}` ? T : never;
+type PStringLiteralEnum08 = "true" extends `${infer T extends StringLiteralEnum | true}` ? T : never;
+type PStringLiteralEnum09 = "false" extends `${infer T extends StringLiteralEnum | false}` ? T : never;
+type PStringLiteralEnum10 = "undefined" extends `${infer T extends StringLiteralEnum | undefined}` ? T : never;
+type PStringLiteralEnum11 = "null" extends `${infer T extends StringLiteralEnum | null}` ? T : never;
+type PNumber0 = "0" extends `${infer T extends number | NonLiteralEnum}` ? T : never;
+type PNumber1 = "0" extends `${infer T extends number | NumberLiteralEnum}` ? T : never;
+type PNumber2 = "0" extends `${infer T extends number | bigint}` ? T : never;
+type PNumber3 = "0" extends `${infer T extends number | 0n}` ? T : never;
+type PEnum0 = "0" extends `${infer T extends NonLiteralEnum | NumberLiteralEnum}` ? T : never;
+type PEnum1 = "0" extends `${infer T extends NonLiteralEnum | bigint}` ? T : never;
+type PEnum2 = "0" extends `${infer T extends NonLiteralEnum | 0n}` ? T : never;
+type PNumberLiteral0 = "0" extends `${infer T extends 0 | bigint}` ? T : never;
+type PNumberLiteral1 = "0" extends `${infer T extends 0 | 0n}` ? T : never;
+type PNumberLiteralEnum0 = "0" extends `${infer T extends NumberLiteralEnum | bigint}` ? T : never;
+type PNumberLiteralEnum1 = "0" extends `${infer T extends NumberLiteralEnum | 0n}` ? T : never;
+type PExclude0 = "0" extends `${infer T extends "1" | number}` ? T : never;
+type PExclude1 = "0" extends `${infer T extends `1${string}` | number}` ? T : never;
+type PExclude2 = "0" extends `${infer T extends 1 | bigint}` ? T : never;
+type PExclude3 = "0" extends `${infer T extends NumberLiteralEnum.One | bigint}` ? T : never;
+type PExclude4 = "100000000000000000000000" extends `${infer T extends number | bigint}` ? T : never;
+type TPrefix0 = "100" extends `${infer T extends number}${string}` ? T : never;
+type TPrefix1 = "trueabc" extends `${infer T extends boolean}${string}` ? T : never;
+type TPrefix2 = `100:${string}` extends `${infer T extends number}:${string}` ? T : never;
+type ExtractPrimitives<T extends string> = T | (T extends `${infer U extends number}` ? U : never) | (T extends `${infer U extends bigint}` ? U : never) | (T extends `${infer U extends boolean | null | undefined}` ? U : never);
+type TExtract0 = ExtractPrimitives<"100">;
+type TExtract1 = ExtractPrimitives<"1.1">;
+type TExtract2 = ExtractPrimitives<"true">;
+type IndexFor<S extends string> = S extends `${infer N extends number}` ? N : never;
+type IndicesOf<T> = IndexFor<Extract<keyof T, string>>;
 interface FieldDefinition {
     readonly name: string;
     readonly type: "i8" | "i16" | "i32" | "i64" | "u8" | "u16" | "u32" | "u64" | "f32" | "f64";
 }
-declare type FieldType<T extends FieldDefinition["type"]> = T extends "i8" | "i16" | "i32" | "u8" | "u16" | "u32" | "f32" | "f64" ? number : T extends "f32" | "f64" ? bigint : never;
-declare type TypedObjectNamedMembers<TDef extends readonly FieldDefinition[]> = {
+type FieldType<T extends FieldDefinition["type"]> = T extends "i8" | "i16" | "i32" | "u8" | "u16" | "u32" | "f32" | "f64" ? number : T extends "f32" | "f64" ? bigint : never;
+type TypedObjectNamedMembers<TDef extends readonly FieldDefinition[]> = {
     [P in TDef[number]["name"]]: FieldType<Extract<TDef[number], {
         readonly name: P;
     }>["type"]>;
 };
-declare type TypedObjectOrdinalMembers<TDef extends readonly FieldDefinition[]> = {
+type TypedObjectOrdinalMembers<TDef extends readonly FieldDefinition[]> = {
     [I in Extract<keyof TDef, `${number}`>]: FieldType<Extract<TDef[I], FieldDefinition>["type"]>;
 };
 interface TypedObjectMembers<TDef extends readonly FieldDefinition[]> {
@@ -459,8 +459,8 @@ interface TypedObjectMembers<TDef extends readonly FieldDefinition[]> {
     getIndex<I extends IndicesOf<TDef>>(index: I): FieldType<Extract<TDef[I], FieldDefinition>["type"]>;
     setIndex<I extends IndicesOf<TDef>>(index: I, value: FieldType<Extract<TDef[I], FieldDefinition>["type"]>): void;
 }
-declare type TypedObject<TDef extends readonly FieldDefinition[]> = TypedObjectMembers<TDef> & TypedObjectNamedMembers<TDef> & TypedObjectOrdinalMembers<TDef>;
-declare type Point = TypedObject<[
+type TypedObject<TDef extends readonly FieldDefinition[]> = TypedObjectMembers<TDef> & TypedObjectNamedMembers<TDef> & TypedObjectOrdinalMembers<TDef>;
+type Point = TypedObject<[
     {
         name: "x";
         type: "f64";
diff --git a/tests/baselines/reference/thisTypeInObjectLiterals2.js b/tests/baselines/reference/thisTypeInObjectLiterals2.js
index ca62ee376655e..320edfc61c31f 100644
--- a/tests/baselines/reference/thisTypeInObjectLiterals2.js
+++ b/tests/baselines/reference/thisTypeInObjectLiterals2.js
@@ -415,7 +415,7 @@ declare let obj1: {
     readonly d: number;
     e: string;
 };
-declare type Point = {
+type Point = {
     x: number;
     y: number;
     z?: number;
@@ -427,7 +427,7 @@ declare let p3: Point | undefined;
 declare let p4: Point | null | undefined;
 declare function f1(p: Point): void;
 declare function f2(p: Point | null | undefined): void;
-declare type ObjectDescriptor<D, M> = {
+type ObjectDescriptor<D, M> = {
     data?: D;
     methods?: M & ThisType<D & M>;
 };
@@ -438,7 +438,7 @@ declare let x1: {
 } & {
     moveBy(dx: number, dy: number): void;
 };
-declare type ObjectDescriptor2<D, M> = ThisType<D & M> & {
+type ObjectDescriptor2<D, M> = ThisType<D & M> & {
     data?: D;
     methods?: M;
 };
@@ -449,12 +449,12 @@ declare let x2: {
 } & {
     moveBy(dx: number, dy: number): void;
 };
-declare type PropDesc<T> = {
+type PropDesc<T> = {
     value?: T;
     get?(): T;
     set?(value: T): void;
 };
-declare type PropDescMap<T> = {
+type PropDescMap<T> = {
     [K in keyof T]: PropDesc<T[K]>;
 };
 declare function defineProp<T, K extends string, U>(obj: T, name: K, desc: PropDesc<U> & ThisType<T>): T & Record<K, U>;
@@ -465,17 +465,17 @@ declare let p12: Point & {
     foo: number;
     bar: number;
 };
-declare type Accessors<T> = {
+type Accessors<T> = {
     [K in keyof T]: (() => T[K]) | Computed<T[K]>;
 };
-declare type Dictionary<T> = {
+type Dictionary<T> = {
     [x: string]: T;
 };
-declare type Computed<T> = {
+type Computed<T> = {
     get?(): T;
     set?(value: T): void;
 };
-declare type VueOptions<D, M, P> = ThisType<D & M & P> & {
+type VueOptions<D, M, P> = ThisType<D & M & P> & {
     data?: D | (() => D);
     methods?: M;
     computed?: Accessors<P>;
diff --git a/tests/baselines/reference/tsbuild/declarationEmit/when-declaration-file-is-referenced-through-triple-slash-but-uses-no-references.js b/tests/baselines/reference/tsbuild/declarationEmit/when-declaration-file-is-referenced-through-triple-slash-but-uses-no-references.js
index 76875a43dac68..87dbec1d83fe1 100644
--- a/tests/baselines/reference/tsbuild/declarationEmit/when-declaration-file-is-referenced-through-triple-slash-but-uses-no-references.js
+++ b/tests/baselines/reference/tsbuild/declarationEmit/when-declaration-file-is-referenced-through-triple-slash-but-uses-no-references.js
@@ -81,7 +81,7 @@ exports.__esModule = true;
 
 //// [/src/solution/lib/src/subProject/index.d.ts]
 import { Nominal } from '../common/nominal';
-export declare type MyNominal = Nominal<string, 'MyNominal'>;
+export type MyNominal = Nominal<string, 'MyNominal'>;
 
 
 //// [/src/solution/lib/src/subProject/index.js]
@@ -112,7 +112,7 @@ exports.getVar = getVar;
 
 
 //// [/src/solution/lib/tsconfig.tsbuildinfo]
-{"program":{"fileNames":["../../../lib/lib.d.ts","../src/common/types.d.ts","../src/common/nominal.ts","../src/subproject/index.ts","../src/subproject2/index.ts"],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true},{"version":"23815050294-declare type MyNominal<T, Name extends string> = T & {\n    specialKey: Name;\n};","affectsGlobalScope":true},{"version":"4107369137-/// <reference path=\"./types.d.ts\" />\nexport declare type Nominal<T, Name extends string> = MyNominal<T, Name>;","signature":"-18894149496-/// <reference path=\"../../../src/common/types.d.ts\" />\r\nexport declare type Nominal<T, Name extends string> = MyNominal<T, Name>;\r\n"},{"version":"-25117049605-import { Nominal } from '../common/nominal';\nexport type MyNominal = Nominal<string, 'MyNominal'>;","signature":"-21416888433-import { Nominal } from '../common/nominal';\r\nexport declare type MyNominal = Nominal<string, 'MyNominal'>;\r\n"},{"version":"2747033208-import { MyNominal } from '../subProject/index';\nconst variable = {\n    key: 'value' as MyNominal,\n};\nexport function getVar(): keyof typeof variable {\n    return 'key';\n}","signature":"-5370006151-import { MyNominal } from '../subProject/index';\r\ndeclare const variable: {\r\n    key: MyNominal;\r\n};\r\nexport declare function getVar(): keyof typeof variable;\r\nexport {};\r\n"}],"options":{"composite":true,"outDir":"./","rootDir":".."},"fileIdsList":[[2],[3],[4]],"referencedMap":[[3,1],[4,2],[5,3]],"exportedModulesMap":[[4,2],[5,3]],"semanticDiagnosticsPerFile":[1,3,2,4,5],"latestChangedDtsFile":"./src/subProject2/index.d.ts"},"version":"FakeTSVersion"}
+{"program":{"fileNames":["../../../lib/lib.d.ts","../src/common/types.d.ts","../src/common/nominal.ts","../src/subproject/index.ts","../src/subproject2/index.ts"],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true},{"version":"23815050294-declare type MyNominal<T, Name extends string> = T & {\n    specialKey: Name;\n};","affectsGlobalScope":true},{"version":"4107369137-/// <reference path=\"./types.d.ts\" />\nexport declare type Nominal<T, Name extends string> = MyNominal<T, Name>;","signature":"-18894149496-/// <reference path=\"../../../src/common/types.d.ts\" />\r\nexport declare type Nominal<T, Name extends string> = MyNominal<T, Name>;\r\n"},{"version":"-25117049605-import { Nominal } from '../common/nominal';\nexport type MyNominal = Nominal<string, 'MyNominal'>;","signature":"-27144836353-import { Nominal } from '../common/nominal';\r\nexport type MyNominal = Nominal<string, 'MyNominal'>;\r\n"},{"version":"2747033208-import { MyNominal } from '../subProject/index';\nconst variable = {\n    key: 'value' as MyNominal,\n};\nexport function getVar(): keyof typeof variable {\n    return 'key';\n}","signature":"-5370006151-import { MyNominal } from '../subProject/index';\r\ndeclare const variable: {\r\n    key: MyNominal;\r\n};\r\nexport declare function getVar(): keyof typeof variable;\r\nexport {};\r\n"}],"options":{"composite":true,"outDir":"./","rootDir":".."},"fileIdsList":[[2],[3],[4]],"referencedMap":[[3,1],[4,2],[5,3]],"exportedModulesMap":[[4,2],[5,3]],"semanticDiagnosticsPerFile":[1,3,2,4,5],"latestChangedDtsFile":"./src/subProject2/index.d.ts"},"version":"FakeTSVersion"}
 
 //// [/src/solution/lib/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -152,7 +152,7 @@ exports.getVar = getVar;
       },
       "../src/subproject/index.ts": {
         "version": "-25117049605-import { Nominal } from '../common/nominal';\nexport type MyNominal = Nominal<string, 'MyNominal'>;",
-        "signature": "-21416888433-import { Nominal } from '../common/nominal';\r\nexport declare type MyNominal = Nominal<string, 'MyNominal'>;\r\n"
+        "signature": "-27144836353-import { Nominal } from '../common/nominal';\r\nexport type MyNominal = Nominal<string, 'MyNominal'>;\r\n"
       },
       "../src/subproject2/index.ts": {
         "version": "2747033208-import { MyNominal } from '../subProject/index';\nconst variable = {\n    key: 'value' as MyNominal,\n};\nexport function getVar(): keyof typeof variable {\n    return 'key';\n}",
@@ -193,6 +193,6 @@ exports.getVar = getVar;
     "latestChangedDtsFile": "./src/subProject2/index.d.ts"
   },
   "version": "FakeTSVersion",
-  "size": 2057
+  "size": 2049
 }
 
diff --git a/tests/baselines/reference/tsbuild/declarationEmit/when-declaration-file-is-referenced-through-triple-slash.js b/tests/baselines/reference/tsbuild/declarationEmit/when-declaration-file-is-referenced-through-triple-slash.js
index 994a159849a8a..ea255b0b3768b 100644
--- a/tests/baselines/reference/tsbuild/declarationEmit/when-declaration-file-is-referenced-through-triple-slash.js
+++ b/tests/baselines/reference/tsbuild/declarationEmit/when-declaration-file-is-referenced-through-triple-slash.js
@@ -147,7 +147,7 @@ exports.__esModule = true;
 
 //// [/src/solution/lib/src/subProject/index.d.ts]
 import { Nominal } from '../common/nominal';
-export declare type MyNominal = Nominal<string, 'MyNominal'>;
+export type MyNominal = Nominal<string, 'MyNominal'>;
 
 
 //// [/src/solution/lib/src/subProject/index.js]
@@ -156,7 +156,7 @@ exports.__esModule = true;
 
 
 //// [/src/solution/lib/src/subProject/tsconfig.tsbuildinfo]
-{"program":{"fileNames":["../../../../../lib/lib.d.ts","../../../src/common/types.d.ts","../common/nominal.d.ts","../../../src/subproject/index.ts"],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true},{"version":"23815050294-declare type MyNominal<T, Name extends string> = T & {\n    specialKey: Name;\n};","affectsGlobalScope":true},"-18894149496-/// <reference path=\"../../../src/common/types.d.ts\" />\r\nexport declare type Nominal<T, Name extends string> = MyNominal<T, Name>;\r\n",{"version":"-25117049605-import { Nominal } from '../common/nominal';\nexport type MyNominal = Nominal<string, 'MyNominal'>;","signature":"-21416888433-import { Nominal } from '../common/nominal';\r\nexport declare type MyNominal = Nominal<string, 'MyNominal'>;\r\n"}],"options":{"composite":true,"outDir":"../..","rootDir":"../../.."},"fileIdsList":[[2],[3]],"referencedMap":[[3,1],[4,2]],"exportedModulesMap":[[3,1],[4,2]],"semanticDiagnosticsPerFile":[1,3,2,4],"latestChangedDtsFile":"./index.d.ts"},"version":"FakeTSVersion"}
+{"program":{"fileNames":["../../../../../lib/lib.d.ts","../../../src/common/types.d.ts","../common/nominal.d.ts","../../../src/subproject/index.ts"],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true},{"version":"23815050294-declare type MyNominal<T, Name extends string> = T & {\n    specialKey: Name;\n};","affectsGlobalScope":true},"-18894149496-/// <reference path=\"../../../src/common/types.d.ts\" />\r\nexport declare type Nominal<T, Name extends string> = MyNominal<T, Name>;\r\n",{"version":"-25117049605-import { Nominal } from '../common/nominal';\nexport type MyNominal = Nominal<string, 'MyNominal'>;","signature":"-27144836353-import { Nominal } from '../common/nominal';\r\nexport type MyNominal = Nominal<string, 'MyNominal'>;\r\n"}],"options":{"composite":true,"outDir":"../..","rootDir":"../../.."},"fileIdsList":[[2],[3]],"referencedMap":[[3,1],[4,2]],"exportedModulesMap":[[3,1],[4,2]],"semanticDiagnosticsPerFile":[1,3,2,4],"latestChangedDtsFile":"./index.d.ts"},"version":"FakeTSVersion"}
 
 //// [/src/solution/lib/src/subProject/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -192,7 +192,7 @@ exports.__esModule = true;
       },
       "../../../src/subproject/index.ts": {
         "version": "-25117049605-import { Nominal } from '../common/nominal';\nexport type MyNominal = Nominal<string, 'MyNominal'>;",
-        "signature": "-21416888433-import { Nominal } from '../common/nominal';\r\nexport declare type MyNominal = Nominal<string, 'MyNominal'>;\r\n"
+        "signature": "-27144836353-import { Nominal } from '../common/nominal';\r\nexport type MyNominal = Nominal<string, 'MyNominal'>;\r\n"
       }
     },
     "options": {
@@ -225,7 +225,7 @@ exports.__esModule = true;
     "latestChangedDtsFile": "./index.d.ts"
   },
   "version": "FakeTSVersion",
-  "size": 1458
+  "size": 1450
 }
 
 //// [/src/solution/lib/src/subProject2/index.d.ts]
@@ -251,7 +251,7 @@ exports.getVar = getVar;
 
 
 //// [/src/solution/lib/src/subProject2/tsconfig.tsbuildinfo]
-{"program":{"fileNames":["../../../../../lib/lib.d.ts","../../../src/common/types.d.ts","../common/nominal.d.ts","../subproject/index.d.ts","../../../src/subproject2/index.ts"],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true},{"version":"23815050294-declare type MyNominal<T, Name extends string> = T & {\n    specialKey: Name;\n};","affectsGlobalScope":true},"-18894149496-/// <reference path=\"../../../src/common/types.d.ts\" />\r\nexport declare type Nominal<T, Name extends string> = MyNominal<T, Name>;\r\n","-21416888433-import { Nominal } from '../common/nominal';\r\nexport declare type MyNominal = Nominal<string, 'MyNominal'>;\r\n",{"version":"2747033208-import { MyNominal } from '../subProject/index';\nconst variable = {\n    key: 'value' as MyNominal,\n};\nexport function getVar(): keyof typeof variable {\n    return 'key';\n}","signature":"-5370006151-import { MyNominal } from '../subProject/index';\r\ndeclare const variable: {\r\n    key: MyNominal;\r\n};\r\nexport declare function getVar(): keyof typeof variable;\r\nexport {};\r\n"}],"options":{"composite":true,"outDir":"../..","rootDir":"../../.."},"fileIdsList":[[2],[3],[4]],"referencedMap":[[3,1],[4,2],[5,3]],"exportedModulesMap":[[3,1],[4,2],[5,3]],"semanticDiagnosticsPerFile":[1,3,4,2,5],"latestChangedDtsFile":"./index.d.ts"},"version":"FakeTSVersion"}
+{"program":{"fileNames":["../../../../../lib/lib.d.ts","../../../src/common/types.d.ts","../common/nominal.d.ts","../subproject/index.d.ts","../../../src/subproject2/index.ts"],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true},{"version":"23815050294-declare type MyNominal<T, Name extends string> = T & {\n    specialKey: Name;\n};","affectsGlobalScope":true},"-18894149496-/// <reference path=\"../../../src/common/types.d.ts\" />\r\nexport declare type Nominal<T, Name extends string> = MyNominal<T, Name>;\r\n","-27144836353-import { Nominal } from '../common/nominal';\r\nexport type MyNominal = Nominal<string, 'MyNominal'>;\r\n",{"version":"2747033208-import { MyNominal } from '../subProject/index';\nconst variable = {\n    key: 'value' as MyNominal,\n};\nexport function getVar(): keyof typeof variable {\n    return 'key';\n}","signature":"-5370006151-import { MyNominal } from '../subProject/index';\r\ndeclare const variable: {\r\n    key: MyNominal;\r\n};\r\nexport declare function getVar(): keyof typeof variable;\r\nexport {};\r\n"}],"options":{"composite":true,"outDir":"../..","rootDir":"../../.."},"fileIdsList":[[2],[3],[4]],"referencedMap":[[3,1],[4,2],[5,3]],"exportedModulesMap":[[3,1],[4,2],[5,3]],"semanticDiagnosticsPerFile":[1,3,4,2,5],"latestChangedDtsFile":"./index.d.ts"},"version":"FakeTSVersion"}
 
 //// [/src/solution/lib/src/subProject2/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -290,8 +290,8 @@ exports.getVar = getVar;
         "signature": "-18894149496-/// <reference path=\"../../../src/common/types.d.ts\" />\r\nexport declare type Nominal<T, Name extends string> = MyNominal<T, Name>;\r\n"
       },
       "../subproject/index.d.ts": {
-        "version": "-21416888433-import { Nominal } from '../common/nominal';\r\nexport declare type MyNominal = Nominal<string, 'MyNominal'>;\r\n",
-        "signature": "-21416888433-import { Nominal } from '../common/nominal';\r\nexport declare type MyNominal = Nominal<string, 'MyNominal'>;\r\n"
+        "version": "-27144836353-import { Nominal } from '../common/nominal';\r\nexport type MyNominal = Nominal<string, 'MyNominal'>;\r\n",
+        "signature": "-27144836353-import { Nominal } from '../common/nominal';\r\nexport type MyNominal = Nominal<string, 'MyNominal'>;\r\n"
       },
       "../../../src/subproject2/index.ts": {
         "version": "2747033208-import { MyNominal } from '../subProject/index';\nconst variable = {\n    key: 'value' as MyNominal,\n};\nexport function getVar(): keyof typeof variable {\n    return 'key';\n}",
@@ -335,6 +335,6 @@ exports.getVar = getVar;
     "latestChangedDtsFile": "./index.d.ts"
   },
   "version": "FakeTSVersion",
-  "size": 1779
+  "size": 1771
 }
 
diff --git a/tests/baselines/reference/tsbuild/demo/in-master-branch-with-everything-setup-correctly-and-reports-no-error.js b/tests/baselines/reference/tsbuild/demo/in-master-branch-with-everything-setup-correctly-and-reports-no-error.js
index b646aeeb93dfc..a4c0ca38c4d0a 100644
--- a/tests/baselines/reference/tsbuild/demo/in-master-branch-with-everything-setup-correctly-and-reports-no-error.js
+++ b/tests/baselines/reference/tsbuild/demo/in-master-branch-with-everything-setup-correctly-and-reports-no-error.js
@@ -167,7 +167,7 @@ exitCode:: ExitStatus.Success
 
 
 //// [/src/lib/animals/animal.d.ts]
-export declare type Size = "small" | "medium" | "large";
+export type Size = "small" | "medium" | "large";
 export default interface Animal {
     size: Size;
 }
@@ -220,7 +220,7 @@ Object.defineProperty(exports, "createDog", { enumerable: true, get: function ()
 
 
 //// [/src/lib/animals/tsconfig.tsbuildinfo]
-{"program":{"fileNames":["../../../lib/lib.d.ts","../../animals/animal.ts","../../animals/index.ts","../core/utilities.d.ts","../../animals/dog.ts"],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true},{"version":"-14984181202-export type Size = \"small\" | \"medium\" | \"large\";\r\nexport default interface Animal {\r\n    size: Size;\r\n}\r\n","signature":"13427676350-export declare type Size = \"small\" | \"medium\" | \"large\";\r\nexport default interface Animal {\r\n    size: Size;\r\n}\r\n"},{"version":"-5382672599-import Animal from './animal';\r\n\r\nexport default Animal;\r\nimport { createDog, Dog } from './dog';\r\nexport { createDog, Dog };\r\n","signature":"4477582546-import Animal from './animal';\r\nexport default Animal;\r\nimport { createDog, Dog } from './dog';\r\nexport { createDog, Dog };\r\n"},"-8177343116-export declare function makeRandomName(): string;\r\nexport declare function lastElementOf<T>(arr: T[]): T | undefined;\r\n",{"version":"-10991948013-import Animal from '.';\r\nimport { makeRandomName } from '../core/utilities';\r\n\r\nexport interface Dog extends Animal {\r\n    woof(): void;\r\n    name: string;\r\n}\r\n\r\nexport function createDog(): Dog {\r\n    return ({\r\n        size: \"medium\",\r\n        woof: function(this: Dog) {\r\n            console.log(`${this.name} says \"Woof\"!`);\r\n        },\r\n        name: makeRandomName()\r\n    });\r\n}\r\n\r\n","signature":"10854678623-import Animal from '.';\r\nexport interface Dog extends Animal {\r\n    woof(): void;\r\n    name: string;\r\n}\r\nexport declare function createDog(): Dog;\r\n"}],"options":{"composite":true,"declaration":true,"module":1,"noFallthroughCasesInSwitch":true,"noImplicitReturns":true,"noUnusedLocals":true,"noUnusedParameters":true,"outDir":"./","rootDir":"../../animals","strict":true,"target":1},"fileIdsList":[[3,4],[2,5],[3]],"referencedMap":[[5,1],[3,2]],"exportedModulesMap":[[5,3],[3,2]],"semanticDiagnosticsPerFile":[1,2,5,3,4],"latestChangedDtsFile":"./dog.d.ts"},"version":"FakeTSVersion"}
+{"program":{"fileNames":["../../../lib/lib.d.ts","../../animals/animal.ts","../../animals/index.ts","../core/utilities.d.ts","../../animals/dog.ts"],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true},"-14984181202-export type Size = \"small\" | \"medium\" | \"large\";\r\nexport default interface Animal {\r\n    size: Size;\r\n}\r\n",{"version":"-5382672599-import Animal from './animal';\r\n\r\nexport default Animal;\r\nimport { createDog, Dog } from './dog';\r\nexport { createDog, Dog };\r\n","signature":"4477582546-import Animal from './animal';\r\nexport default Animal;\r\nimport { createDog, Dog } from './dog';\r\nexport { createDog, Dog };\r\n"},"-8177343116-export declare function makeRandomName(): string;\r\nexport declare function lastElementOf<T>(arr: T[]): T | undefined;\r\n",{"version":"-10991948013-import Animal from '.';\r\nimport { makeRandomName } from '../core/utilities';\r\n\r\nexport interface Dog extends Animal {\r\n    woof(): void;\r\n    name: string;\r\n}\r\n\r\nexport function createDog(): Dog {\r\n    return ({\r\n        size: \"medium\",\r\n        woof: function(this: Dog) {\r\n            console.log(`${this.name} says \"Woof\"!`);\r\n        },\r\n        name: makeRandomName()\r\n    });\r\n}\r\n\r\n","signature":"10854678623-import Animal from '.';\r\nexport interface Dog extends Animal {\r\n    woof(): void;\r\n    name: string;\r\n}\r\nexport declare function createDog(): Dog;\r\n"}],"options":{"composite":true,"declaration":true,"module":1,"noFallthroughCasesInSwitch":true,"noImplicitReturns":true,"noUnusedLocals":true,"noUnusedParameters":true,"outDir":"./","rootDir":"../../animals","strict":true,"target":1},"fileIdsList":[[3,4],[2,5],[3]],"referencedMap":[[5,1],[3,2]],"exportedModulesMap":[[5,3],[3,2]],"semanticDiagnosticsPerFile":[1,2,5,3,4],"latestChangedDtsFile":"./dog.d.ts"},"version":"FakeTSVersion"}
 
 //// [/src/lib/animals/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -253,7 +253,7 @@ Object.defineProperty(exports, "createDog", { enumerable: true, get: function ()
       },
       "../../animals/animal.ts": {
         "version": "-14984181202-export type Size = \"small\" | \"medium\" | \"large\";\r\nexport default interface Animal {\r\n    size: Size;\r\n}\r\n",
-        "signature": "13427676350-export declare type Size = \"small\" | \"medium\" | \"large\";\r\nexport default interface Animal {\r\n    size: Size;\r\n}\r\n"
+        "signature": "-14984181202-export type Size = \"small\" | \"medium\" | \"large\";\r\nexport default interface Animal {\r\n    size: Size;\r\n}\r\n"
       },
       "../../animals/index.ts": {
         "version": "-5382672599-import Animal from './animal';\r\n\r\nexport default Animal;\r\nimport { createDog, Dog } from './dog';\r\nexport { createDog, Dog };\r\n",
@@ -310,7 +310,7 @@ Object.defineProperty(exports, "createDog", { enumerable: true, get: function ()
     "latestChangedDtsFile": "./dog.d.ts"
   },
   "version": "FakeTSVersion",
-  "size": 2479
+  "size": 2313
 }
 
 //// [/src/lib/core/tsconfig.tsbuildinfo]
@@ -381,7 +381,7 @@ exports.lastElementOf = lastElementOf;
 
 
 //// [/src/lib/zoo/tsconfig.tsbuildinfo]
-{"program":{"fileNames":["../../../lib/lib.d.ts","../animals/animal.d.ts","../animals/dog.d.ts","../animals/index.d.ts","../../zoo/zoo.ts"],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true},"13427676350-export declare type Size = \"small\" | \"medium\" | \"large\";\r\nexport default interface Animal {\r\n    size: Size;\r\n}\r\n","10854678623-import Animal from '.';\r\nexport interface Dog extends Animal {\r\n    woof(): void;\r\n    name: string;\r\n}\r\nexport declare function createDog(): Dog;\r\n","4477582546-import Animal from './animal';\r\nexport default Animal;\r\nimport { createDog, Dog } from './dog';\r\nexport { createDog, Dog };\r\n",{"version":"8797123924-import { Dog, createDog } from '../animals/index';\r\n\r\nexport function createZoo(): Array<Dog> {\r\n    return [\r\n        createDog()\r\n    ];\r\n}\r\n\r\n","signature":"-17433436879-import { Dog } from '../animals/index';\r\nexport declare function createZoo(): Array<Dog>;\r\n"}],"options":{"composite":true,"declaration":true,"module":1,"noFallthroughCasesInSwitch":true,"noImplicitReturns":true,"noUnusedLocals":true,"noUnusedParameters":true,"outDir":"./","rootDir":"../../zoo","strict":true,"target":1},"fileIdsList":[[4],[2,3]],"referencedMap":[[3,1],[4,2],[5,1]],"exportedModulesMap":[[3,1],[4,2],[5,1]],"semanticDiagnosticsPerFile":[1,2,3,4,5],"latestChangedDtsFile":"./zoo.d.ts"},"version":"FakeTSVersion"}
+{"program":{"fileNames":["../../../lib/lib.d.ts","../animals/animal.d.ts","../animals/dog.d.ts","../animals/index.d.ts","../../zoo/zoo.ts"],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true},"-14984181202-export type Size = \"small\" | \"medium\" | \"large\";\r\nexport default interface Animal {\r\n    size: Size;\r\n}\r\n","10854678623-import Animal from '.';\r\nexport interface Dog extends Animal {\r\n    woof(): void;\r\n    name: string;\r\n}\r\nexport declare function createDog(): Dog;\r\n","4477582546-import Animal from './animal';\r\nexport default Animal;\r\nimport { createDog, Dog } from './dog';\r\nexport { createDog, Dog };\r\n",{"version":"8797123924-import { Dog, createDog } from '../animals/index';\r\n\r\nexport function createZoo(): Array<Dog> {\r\n    return [\r\n        createDog()\r\n    ];\r\n}\r\n\r\n","signature":"-17433436879-import { Dog } from '../animals/index';\r\nexport declare function createZoo(): Array<Dog>;\r\n"}],"options":{"composite":true,"declaration":true,"module":1,"noFallthroughCasesInSwitch":true,"noImplicitReturns":true,"noUnusedLocals":true,"noUnusedParameters":true,"outDir":"./","rootDir":"../../zoo","strict":true,"target":1},"fileIdsList":[[4],[2,3]],"referencedMap":[[3,1],[4,2],[5,1]],"exportedModulesMap":[[3,1],[4,2],[5,1]],"semanticDiagnosticsPerFile":[1,2,3,4,5],"latestChangedDtsFile":"./zoo.d.ts"},"version":"FakeTSVersion"}
 
 //// [/src/lib/zoo/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -409,8 +409,8 @@ exports.lastElementOf = lastElementOf;
         "affectsGlobalScope": true
       },
       "../animals/animal.d.ts": {
-        "version": "13427676350-export declare type Size = \"small\" | \"medium\" | \"large\";\r\nexport default interface Animal {\r\n    size: Size;\r\n}\r\n",
-        "signature": "13427676350-export declare type Size = \"small\" | \"medium\" | \"large\";\r\nexport default interface Animal {\r\n    size: Size;\r\n}\r\n"
+        "version": "-14984181202-export type Size = \"small\" | \"medium\" | \"large\";\r\nexport default interface Animal {\r\n    size: Size;\r\n}\r\n",
+        "signature": "-14984181202-export type Size = \"small\" | \"medium\" | \"large\";\r\nexport default interface Animal {\r\n    size: Size;\r\n}\r\n"
       },
       "../animals/dog.d.ts": {
         "version": "10854678623-import Animal from '.';\r\nexport interface Dog extends Animal {\r\n    woof(): void;\r\n    name: string;\r\n}\r\nexport declare function createDog(): Dog;\r\n",
@@ -472,7 +472,7 @@ exports.lastElementOf = lastElementOf;
     "latestChangedDtsFile": "./zoo.d.ts"
   },
   "version": "FakeTSVersion",
-  "size": 1841
+  "size": 1834
 }
 
 //// [/src/lib/zoo/zoo.d.ts]
diff --git a/tests/baselines/reference/tsbuild/moduleResolution/resolves-specifier-in-output-declaration-file-from-referenced-project-correctly-with-preserveSymlinks.js b/tests/baselines/reference/tsbuild/moduleResolution/resolves-specifier-in-output-declaration-file-from-referenced-project-correctly-with-preserveSymlinks.js
index 303d5b36e0079..cbb89a7116aa8 100644
--- a/tests/baselines/reference/tsbuild/moduleResolution/resolves-specifier-in-output-declaration-file-from-referenced-project-correctly-with-preserveSymlinks.js
+++ b/tests/baselines/reference/tsbuild/moduleResolution/resolves-specifier-in-output-declaration-file-from-referenced-project-correctly-with-preserveSymlinks.js
@@ -141,7 +141,7 @@ exports.__esModule = true;
 
 
 //// [/user/username/projects/myproject/packages/pkg2/build/const.d.ts]
-export declare type TheNum = 42;
+export type TheNum = 42;
 
 
 //// [/user/username/projects/myproject/packages/pkg2/build/index.js]
@@ -154,7 +154,7 @@ export type { TheNum } from 'const';
 
 
 //// [/user/username/projects/myproject/packages/pkg2/build/tsconfig.tsbuildinfo]
-{"program":{"fileNames":["../../../../../../../a/lib/lib.d.ts","../const.ts","../index.ts"],"fileInfos":[{"version":"-7698705165-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }","affectsGlobalScope":true},{"version":"-11202312776-export type TheNum = 42;","signature":"-9649133742-export declare type TheNum = 42;\n"},{"version":"-10837689162-export type { TheNum } from 'const';","signature":"-9751391360-export type { TheNum } from 'const';\n"}],"options":{"composite":true,"outDir":"./"},"fileIdsList":[[2]],"referencedMap":[[3,1]],"exportedModulesMap":[[3,1]],"semanticDiagnosticsPerFile":[1,2,3],"latestChangedDtsFile":"./index.d.ts"},"version":"FakeTSVersion"}
+{"program":{"fileNames":["../../../../../../../a/lib/lib.d.ts","../const.ts","../index.ts"],"fileInfos":[{"version":"-7698705165-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }","affectsGlobalScope":true},{"version":"-11202312776-export type TheNum = 42;","signature":"-13194036030-export type TheNum = 42;\n"},{"version":"-10837689162-export type { TheNum } from 'const';","signature":"-9751391360-export type { TheNum } from 'const';\n"}],"options":{"composite":true,"outDir":"./"},"fileIdsList":[[2]],"referencedMap":[[3,1]],"exportedModulesMap":[[3,1]],"semanticDiagnosticsPerFile":[1,2,3],"latestChangedDtsFile":"./index.d.ts"},"version":"FakeTSVersion"}
 
 //// [/user/username/projects/myproject/packages/pkg2/build/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -177,7 +177,7 @@ export type { TheNum } from 'const';
       },
       "../const.ts": {
         "version": "-11202312776-export type TheNum = 42;",
-        "signature": "-9649133742-export declare type TheNum = 42;\n"
+        "signature": "-13194036030-export type TheNum = 42;\n"
       },
       "../index.ts": {
         "version": "-10837689162-export type { TheNum } from 'const';",
@@ -206,7 +206,7 @@ export type { TheNum } from 'const';
     "latestChangedDtsFile": "./index.d.ts"
   },
   "version": "FakeTSVersion",
-  "size": 965
+  "size": 958
 }
 
 //// [/user/username/projects/myproject/packages/pkg1/build/index.js]
diff --git a/tests/baselines/reference/tsbuild/moduleResolution/resolves-specifier-in-output-declaration-file-from-referenced-project-correctly.js b/tests/baselines/reference/tsbuild/moduleResolution/resolves-specifier-in-output-declaration-file-from-referenced-project-correctly.js
index 3b588f293c5a0..0ba0d575b8c6f 100644
--- a/tests/baselines/reference/tsbuild/moduleResolution/resolves-specifier-in-output-declaration-file-from-referenced-project-correctly.js
+++ b/tests/baselines/reference/tsbuild/moduleResolution/resolves-specifier-in-output-declaration-file-from-referenced-project-correctly.js
@@ -142,7 +142,7 @@ exports.__esModule = true;
 
 
 //// [/user/username/projects/myproject/packages/pkg2/build/const.d.ts]
-export declare type TheNum = 42;
+export type TheNum = 42;
 
 
 //// [/user/username/projects/myproject/packages/pkg2/build/index.js]
@@ -155,7 +155,7 @@ export type { TheNum } from 'const';
 
 
 //// [/user/username/projects/myproject/packages/pkg2/build/tsconfig.tsbuildinfo]
-{"program":{"fileNames":["../../../../../../../a/lib/lib.d.ts","../const.ts","../index.ts"],"fileInfos":[{"version":"-7698705165-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }","affectsGlobalScope":true},{"version":"-11202312776-export type TheNum = 42;","signature":"-9649133742-export declare type TheNum = 42;\n"},{"version":"-10837689162-export type { TheNum } from 'const';","signature":"-9751391360-export type { TheNum } from 'const';\n"}],"options":{"composite":true,"outDir":"./"},"fileIdsList":[[2]],"referencedMap":[[3,1]],"exportedModulesMap":[[3,1]],"semanticDiagnosticsPerFile":[1,2,3],"latestChangedDtsFile":"./index.d.ts"},"version":"FakeTSVersion"}
+{"program":{"fileNames":["../../../../../../../a/lib/lib.d.ts","../const.ts","../index.ts"],"fileInfos":[{"version":"-7698705165-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }","affectsGlobalScope":true},{"version":"-11202312776-export type TheNum = 42;","signature":"-13194036030-export type TheNum = 42;\n"},{"version":"-10837689162-export type { TheNum } from 'const';","signature":"-9751391360-export type { TheNum } from 'const';\n"}],"options":{"composite":true,"outDir":"./"},"fileIdsList":[[2]],"referencedMap":[[3,1]],"exportedModulesMap":[[3,1]],"semanticDiagnosticsPerFile":[1,2,3],"latestChangedDtsFile":"./index.d.ts"},"version":"FakeTSVersion"}
 
 //// [/user/username/projects/myproject/packages/pkg2/build/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -178,7 +178,7 @@ export type { TheNum } from 'const';
       },
       "../const.ts": {
         "version": "-11202312776-export type TheNum = 42;",
-        "signature": "-9649133742-export declare type TheNum = 42;\n"
+        "signature": "-13194036030-export type TheNum = 42;\n"
       },
       "../index.ts": {
         "version": "-10837689162-export type { TheNum } from 'const';",
@@ -207,7 +207,7 @@ export type { TheNum } from 'const';
     "latestChangedDtsFile": "./index.d.ts"
   },
   "version": "FakeTSVersion",
-  "size": 965
+  "size": 958
 }
 
 //// [/user/username/projects/myproject/packages/pkg1/build/index.js]
diff --git a/tests/baselines/reference/tsbuild/moduleSpecifiers/synthesized-module-specifiers-resolve-correctly.js b/tests/baselines/reference/tsbuild/moduleSpecifiers/synthesized-module-specifiers-resolve-correctly.js
index c7895b1d86b66..4ecab4bc55800 100644
--- a/tests/baselines/reference/tsbuild/moduleSpecifiers/synthesized-module-specifiers-resolve-correctly.js
+++ b/tests/baselines/reference/tsbuild/moduleSpecifiers/synthesized-module-specifiers-resolve-correctly.js
@@ -190,7 +190,7 @@ exports.__esModule = true;
 
 //// [/src/lib/solution/sub-project/index.d.ts]
 import { Nominal } from '../common/nominal';
-export declare type MyNominal = Nominal<string, 'MyNominal'>;
+export type MyNominal = Nominal<string, 'MyNominal'>;
 
 
 //// [/src/lib/solution/sub-project/index.js]
@@ -199,7 +199,7 @@ exports.__esModule = true;
 
 
 //// [/src/lib/solution/sub-project/tsconfig.tsbuildinfo]
-{"program":{"fileNames":["../../../../lib/lib.d.ts","../common/nominal.d.ts","../../../solution/sub-project/index.ts"],"fileInfos":[{"version":"-32082413277-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };\ninterface SymbolConstructor {\n    readonly species: symbol;\n    readonly toStringTag: symbol;\n}\ndeclare var Symbol: SymbolConstructor;\ninterface Symbol {\n    readonly [Symbol.toStringTag]: string;\n}\n","affectsGlobalScope":true},"-9513375615-export declare type Nominal<T, Name extends string> = T & {\r\n    [Symbol.species]: Name;\r\n};\r\n",{"version":"-22894055505-import { Nominal } from '../common/nominal';\n\nexport type MyNominal = Nominal<string, 'MyNominal'>;\n","signature":"-21416888433-import { Nominal } from '../common/nominal';\r\nexport declare type MyNominal = Nominal<string, 'MyNominal'>;\r\n"}],"options":{"composite":true,"outDir":"../..","rootDir":"../../..","skipLibCheck":true},"fileIdsList":[[2]],"referencedMap":[[3,1]],"exportedModulesMap":[[3,1]],"semanticDiagnosticsPerFile":[1,2,3],"latestChangedDtsFile":"./index.d.ts"},"version":"FakeTSVersion"}
+{"program":{"fileNames":["../../../../lib/lib.d.ts","../common/nominal.d.ts","../../../solution/sub-project/index.ts"],"fileInfos":[{"version":"-32082413277-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };\ninterface SymbolConstructor {\n    readonly species: symbol;\n    readonly toStringTag: symbol;\n}\ndeclare var Symbol: SymbolConstructor;\ninterface Symbol {\n    readonly [Symbol.toStringTag]: string;\n}\n","affectsGlobalScope":true},"-9513375615-export declare type Nominal<T, Name extends string> = T & {\r\n    [Symbol.species]: Name;\r\n};\r\n",{"version":"-22894055505-import { Nominal } from '../common/nominal';\n\nexport type MyNominal = Nominal<string, 'MyNominal'>;\n","signature":"-27144836353-import { Nominal } from '../common/nominal';\r\nexport type MyNominal = Nominal<string, 'MyNominal'>;\r\n"}],"options":{"composite":true,"outDir":"../..","rootDir":"../../..","skipLibCheck":true},"fileIdsList":[[2]],"referencedMap":[[3,1]],"exportedModulesMap":[[3,1]],"semanticDiagnosticsPerFile":[1,2,3],"latestChangedDtsFile":"./index.d.ts"},"version":"FakeTSVersion"}
 
 //// [/src/lib/solution/sub-project/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -226,7 +226,7 @@ exports.__esModule = true;
       },
       "../../../solution/sub-project/index.ts": {
         "version": "-22894055505-import { Nominal } from '../common/nominal';\n\nexport type MyNominal = Nominal<string, 'MyNominal'>;\n",
-        "signature": "-21416888433-import { Nominal } from '../common/nominal';\r\nexport declare type MyNominal = Nominal<string, 'MyNominal'>;\r\n"
+        "signature": "-27144836353-import { Nominal } from '../common/nominal';\r\nexport type MyNominal = Nominal<string, 'MyNominal'>;\r\n"
       }
     },
     "options": {
@@ -253,7 +253,7 @@ exports.__esModule = true;
     "latestChangedDtsFile": "./index.d.ts"
   },
   "version": "FakeTSVersion",
-  "size": 1472
+  "size": 1464
 }
 
 //// [/src/lib/solution/sub-project-2/index.d.ts]
@@ -279,7 +279,7 @@ exports.getVar = getVar;
 
 
 //// [/src/lib/solution/sub-project-2/tsconfig.tsbuildinfo]
-{"program":{"fileNames":["../../../../lib/lib.d.ts","../common/nominal.d.ts","../sub-project/index.d.ts","../../../solution/sub-project-2/index.ts"],"fileInfos":[{"version":"-32082413277-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };\ninterface SymbolConstructor {\n    readonly species: symbol;\n    readonly toStringTag: symbol;\n}\ndeclare var Symbol: SymbolConstructor;\ninterface Symbol {\n    readonly [Symbol.toStringTag]: string;\n}\n","affectsGlobalScope":true},"-9513375615-export declare type Nominal<T, Name extends string> = T & {\r\n    [Symbol.species]: Name;\r\n};\r\n","-21416888433-import { Nominal } from '../common/nominal';\r\nexport declare type MyNominal = Nominal<string, 'MyNominal'>;\r\n",{"version":"-13939373533-import { MyNominal } from '../sub-project/index';\n\nconst variable = {\n    key: 'value' as MyNominal,\n};\n\nexport function getVar(): keyof typeof variable {\n    return 'key';\n}\n","signature":"881159974-import { MyNominal } from '../sub-project/index';\r\ndeclare const variable: {\r\n    key: MyNominal;\r\n};\r\nexport declare function getVar(): keyof typeof variable;\r\nexport {};\r\n"}],"options":{"composite":true,"outDir":"../..","rootDir":"../../..","skipLibCheck":true},"fileIdsList":[[2],[3]],"referencedMap":[[3,1],[4,2]],"exportedModulesMap":[[3,1],[4,2]],"semanticDiagnosticsPerFile":[1,2,3,4],"latestChangedDtsFile":"./index.d.ts"},"version":"FakeTSVersion"}
+{"program":{"fileNames":["../../../../lib/lib.d.ts","../common/nominal.d.ts","../sub-project/index.d.ts","../../../solution/sub-project-2/index.ts"],"fileInfos":[{"version":"-32082413277-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };\ninterface SymbolConstructor {\n    readonly species: symbol;\n    readonly toStringTag: symbol;\n}\ndeclare var Symbol: SymbolConstructor;\ninterface Symbol {\n    readonly [Symbol.toStringTag]: string;\n}\n","affectsGlobalScope":true},"-9513375615-export declare type Nominal<T, Name extends string> = T & {\r\n    [Symbol.species]: Name;\r\n};\r\n","-27144836353-import { Nominal } from '../common/nominal';\r\nexport type MyNominal = Nominal<string, 'MyNominal'>;\r\n",{"version":"-13939373533-import { MyNominal } from '../sub-project/index';\n\nconst variable = {\n    key: 'value' as MyNominal,\n};\n\nexport function getVar(): keyof typeof variable {\n    return 'key';\n}\n","signature":"881159974-import { MyNominal } from '../sub-project/index';\r\ndeclare const variable: {\r\n    key: MyNominal;\r\n};\r\nexport declare function getVar(): keyof typeof variable;\r\nexport {};\r\n"}],"options":{"composite":true,"outDir":"../..","rootDir":"../../..","skipLibCheck":true},"fileIdsList":[[2],[3]],"referencedMap":[[3,1],[4,2]],"exportedModulesMap":[[3,1],[4,2]],"semanticDiagnosticsPerFile":[1,2,3,4],"latestChangedDtsFile":"./index.d.ts"},"version":"FakeTSVersion"}
 
 //// [/src/lib/solution/sub-project-2/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -309,8 +309,8 @@ exports.getVar = getVar;
         "signature": "-9513375615-export declare type Nominal<T, Name extends string> = T & {\r\n    [Symbol.species]: Name;\r\n};\r\n"
       },
       "../sub-project/index.d.ts": {
-        "version": "-21416888433-import { Nominal } from '../common/nominal';\r\nexport declare type MyNominal = Nominal<string, 'MyNominal'>;\r\n",
-        "signature": "-21416888433-import { Nominal } from '../common/nominal';\r\nexport declare type MyNominal = Nominal<string, 'MyNominal'>;\r\n"
+        "version": "-27144836353-import { Nominal } from '../common/nominal';\r\nexport type MyNominal = Nominal<string, 'MyNominal'>;\r\n",
+        "signature": "-27144836353-import { Nominal } from '../common/nominal';\r\nexport type MyNominal = Nominal<string, 'MyNominal'>;\r\n"
       },
       "../../../solution/sub-project-2/index.ts": {
         "version": "-13939373533-import { MyNominal } from '../sub-project/index';\n\nconst variable = {\n    key: 'value' as MyNominal,\n};\n\nexport function getVar(): keyof typeof variable {\n    return 'key';\n}\n",
@@ -348,6 +348,6 @@ exports.getVar = getVar;
     "latestChangedDtsFile": "./index.d.ts"
   },
   "version": "FakeTSVersion",
-  "size": 1799
+  "size": 1791
 }
 
diff --git a/tests/baselines/reference/tsbuild/outfile-concat/stripInternal-jsdoc-style-comment-when-one-two-three-are-prepended-in-order.js b/tests/baselines/reference/tsbuild/outfile-concat/stripInternal-jsdoc-style-comment-when-one-two-three-are-prepended-in-order.js
index b73e825160835..3be640118d70a 100644
--- a/tests/baselines/reference/tsbuild/outfile-concat/stripInternal-jsdoc-style-comment-when-one-two-three-are-prepended-in-order.js
+++ b/tests/baselines/reference/tsbuild/outfile-concat/stripInternal-jsdoc-style-comment-when-one-two-three-are-prepended-in-order.js
@@ -231,7 +231,7 @@ declare namespace internalOther.something {
     }
 }
 import internalImport = internalNamespace.someClass;
-declare type internalType = internalC;
+type internalType = internalC;
 declare const internalConst = 10;
 declare enum internalEnum {
     a = 0,
@@ -244,7 +244,7 @@ declare class C {
 //# sourceMappingURL=second-output.d.ts.map
 
 //// [/src/2/second-output.d.ts.map]
-{"version":3,"file":"second-output.d.ts","sourceRoot":"","sources":["../first/first_PART1.ts","../first/first_part3.ts","../second/second_part1.ts","../second/second_part2.ts"],"names":[],"mappings":"AAAe,UAAU,QAAQ;IAC7B,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,iBAAiB,CAAC;AAEzB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEM,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;IACN,IAAI,CAAC,IACM,MAAM,CADK;IACtB,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACxC;AACD,kBAAU,OAAO,CAAC;IACC,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACtD;AACc,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,aAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC5C,cAAM,CAAC;IACH,WAAW;CAGd"}
+{"version":3,"file":"second-output.d.ts","sourceRoot":"","sources":["../first/first_PART1.ts","../first/first_part3.ts","../second/second_part1.ts","../second/second_part2.ts"],"names":[],"mappings":"AAAe,UAAU,QAAQ;IAC7B,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,iBAAiB,CAAC;AAEzB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEM,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;IACN,IAAI,CAAC,IACM,MAAM,CADK;IACtB,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACxC;AACD,kBAAU,OAAO,CAAC;IACC,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACtD;AACc,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,KAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC5C,cAAM,CAAC;IACH,WAAW;CAGd"}
 
 //// [/src/2/second-output.d.ts.map.baseline.txt]
 ===================================================================
@@ -923,42 +923,43 @@ sourceFile:../second/second_part1.ts
 7 >Emitted(52, 52) Source(34, 67) + SourceIndex(2)
 8 >Emitted(52, 53) Source(34, 68) + SourceIndex(2)
 ---
->>>declare type internalType = internalC;
+>>>type internalType = internalC;
 1 >
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^^^^^
-4 >                         ^^^
-5 >                            ^^^^^^^^^
-6 >                                     ^
+2 >^^^^^
+3 >     ^^^^^^^^^^^^
+4 >                 ^^^
+5 >                    ^^^^^^^^^
+6 >                             ^
+7 >                              ^^^^->
 1 >
   >/**@internal*/ 
 2 >type 
-3 >             internalType
-4 >                          = 
-5 >                            internalC
-6 >                                     ;
+3 >     internalType
+4 >                  = 
+5 >                    internalC
+6 >                             ;
 1 >Emitted(53, 1) Source(35, 16) + SourceIndex(2)
-2 >Emitted(53, 14) Source(35, 21) + SourceIndex(2)
-3 >Emitted(53, 26) Source(35, 33) + SourceIndex(2)
-4 >Emitted(53, 29) Source(35, 36) + SourceIndex(2)
-5 >Emitted(53, 38) Source(35, 45) + SourceIndex(2)
-6 >Emitted(53, 39) Source(35, 46) + SourceIndex(2)
+2 >Emitted(53, 6) Source(35, 21) + SourceIndex(2)
+3 >Emitted(53, 18) Source(35, 33) + SourceIndex(2)
+4 >Emitted(53, 21) Source(35, 36) + SourceIndex(2)
+5 >Emitted(53, 30) Source(35, 45) + SourceIndex(2)
+6 >Emitted(53, 31) Source(35, 46) + SourceIndex(2)
 ---
 >>>declare const internalConst = 10;
-1 >
+1->
 2 >^^^^^^^^
 3 >        ^^^^^^
 4 >              ^^^^^^^^^^^^^
 5 >                           ^^^^^
 6 >                                ^
-1 >
+1->
   >/**@internal*/ 
 2 >
 3 >        const 
 4 >              internalConst
 5 >                            = 10
 6 >                                ;
-1 >Emitted(54, 1) Source(36, 16) + SourceIndex(2)
+1->Emitted(54, 1) Source(36, 16) + SourceIndex(2)
 2 >Emitted(54, 9) Source(36, 16) + SourceIndex(2)
 3 >Emitted(54, 15) Source(36, 22) + SourceIndex(2)
 4 >Emitted(54, 28) Source(36, 35) + SourceIndex(2)
@@ -2750,7 +2751,7 @@ sourceFile:../second/second_part2.ts
 >>>//# sourceMappingURL=second-output.js.map
 
 //// [/src/2/second-output.tsbuildinfo]
-{"bundle":{"commonSourceDirectory":"../second","sourceFiles":["../second/second_part1.ts","../second/second_part2.ts"],"js":{"sections":[{"pos":0,"end":110,"kind":"prepend","data":"../first/bin/first-output.js","texts":[{"pos":0,"end":110,"kind":"text"}]},{"pos":110,"end":3163,"kind":"text"}],"mapHash":"-4451840947-{\"version\":3,\"file\":\"second-output.js\",\"sourceRoot\":\"\",\"sources\":[\"../first/first_PART1.ts\",\"../first/first_part2.ts\",\"../first/first_part3.ts\",\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"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\"}","hash":"144238636645-var s = \"Hello, world\";\r\nconsole.log(s);\r\nconsole.log(f());\r\nfunction f() {\r\n    return \"JS does hoists\";\r\n}\r\nvar N;\r\n(function (N) {\r\n    function f() {\r\n        console.log('testing');\r\n    }\r\n    f();\r\n})(N || (N = {}));\r\nvar normalC = (function () {\r\n    function normalC() {\r\n    }\r\n    normalC.prototype.method = function () { };\r\n    Object.defineProperty(normalC.prototype, \"c\", {\r\n        get: function () { return 10; },\r\n        set: function (val) { },\r\n        enumerable: false,\r\n        configurable: true\r\n    });\r\n    return normalC;\r\n}());\r\nvar normalN;\r\n(function (normalN) {\r\n    var C = (function () {\r\n        function C() {\r\n        }\r\n        return C;\r\n    }());\r\n    normalN.C = C;\r\n    function foo() { }\r\n    normalN.foo = foo;\r\n    var someNamespace;\r\n    (function (someNamespace) {\r\n        var C = (function () {\r\n            function C() {\r\n            }\r\n            return C;\r\n        }());\r\n        someNamespace.C = C;\r\n    })(someNamespace = normalN.someNamespace || (normalN.someNamespace = {}));\r\n    var someOther;\r\n    (function (someOther) {\r\n        var something;\r\n        (function (something) {\r\n            var someClass = (function () {\r\n                function someClass() {\r\n                }\r\n                return someClass;\r\n            }());\r\n            something.someClass = someClass;\r\n        })(something = someOther.something || (someOther.something = {}));\r\n    })(someOther = normalN.someOther || (normalN.someOther = {}));\r\n    normalN.someImport = someNamespace.C;\r\n    normalN.internalConst = 10;\r\n    var internalEnum;\r\n    (function (internalEnum) {\r\n        internalEnum[internalEnum[\"a\"] = 0] = \"a\";\r\n        internalEnum[internalEnum[\"b\"] = 1] = \"b\";\r\n        internalEnum[internalEnum[\"c\"] = 2] = \"c\";\r\n    })(internalEnum = normalN.internalEnum || (normalN.internalEnum = {}));\r\n})(normalN || (normalN = {}));\r\nvar internalC = (function () {\r\n    function internalC() {\r\n    }\r\n    return internalC;\r\n}());\r\nfunction internalfoo() { }\r\nvar internalNamespace;\r\n(function (internalNamespace) {\r\n    var someClass = (function () {\r\n        function someClass() {\r\n        }\r\n        return someClass;\r\n    }());\r\n    internalNamespace.someClass = someClass;\r\n})(internalNamespace || (internalNamespace = {}));\r\nvar internalOther;\r\n(function (internalOther) {\r\n    var something;\r\n    (function (something) {\r\n        var someClass = (function () {\r\n            function someClass() {\r\n            }\r\n            return someClass;\r\n        }());\r\n        something.someClass = someClass;\r\n    })(something = internalOther.something || (internalOther.something = {}));\r\n})(internalOther || (internalOther = {}));\r\nvar internalImport = internalNamespace.someClass;\r\nvar internalConst = 10;\r\nvar internalEnum;\r\n(function (internalEnum) {\r\n    internalEnum[internalEnum[\"a\"] = 0] = \"a\";\r\n    internalEnum[internalEnum[\"b\"] = 1] = \"b\";\r\n    internalEnum[internalEnum[\"c\"] = 2] = \"c\";\r\n})(internalEnum || (internalEnum = {}));\r\nvar C = (function () {\r\n    function C() {\r\n    }\r\n    C.prototype.doSomething = function () {\r\n        console.log(\"something got done\");\r\n    };\r\n    return C;\r\n}());\r\n//# sourceMappingURL=second-output.js.map"},"dts":{"sections":[{"pos":0,"end":157,"kind":"prepend","data":"../first/bin/first-output.d.ts","texts":[{"pos":0,"end":39,"kind":"internal"},{"pos":41,"end":157,"kind":"text"}]},{"pos":157,"end":234,"kind":"text"},{"pos":234,"end":339,"kind":"internal"},{"pos":341,"end":373,"kind":"text"},{"pos":373,"end":765,"kind":"internal"},{"pos":767,"end":770,"kind":"text"},{"pos":770,"end":1183,"kind":"internal"},{"pos":1185,"end":1233,"kind":"text"}],"mapHash":"47169317065-{\"version\":3,\"file\":\"second-output.d.ts\",\"sourceRoot\":\"\",\"sources\":[\"../first/first_PART1.ts\",\"../first/first_part3.ts\",\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"AAAe,UAAU,QAAQ;IAC7B,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,iBAAiB,CAAC;AAEzB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEM,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;IACN,IAAI,CAAC,IACM,MAAM,CADK;IACtB,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACxC;AACD,kBAAU,OAAO,CAAC;IACC,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACtD;AACc,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,aAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC5C,cAAM,CAAC;IACH,WAAW;CAGd\"}","hash":"-13432536459-interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hello, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ndeclare type internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n//# sourceMappingURL=second-output.d.ts.map"}},"program":{"fileNames":["../second/second_part1.ts","../second/second_part2.ts"],"fileInfos":["5541258877-namespace N {\r\n    // Comment text\r\n}\r\n\r\nnamespace N {\r\n    function f() {\r\n        console.log('testing');\r\n    }\r\n\r\n    f();\r\n}\r\n\nclass normalC {\n    /**@internal*/ constructor() { }\n    /**@internal*/ prop: string;\n    /**@internal*/ method() { }\n    /**@internal*/ get c() { return 10; }\n    /**@internal*/ set c(val: number) { }\n}\nnamespace normalN {\n    /**@internal*/ export class C { }\n    /**@internal*/ export function foo() {}\n    /**@internal*/ export namespace someNamespace { export class C {} }\n    /**@internal*/ export namespace someOther.something { export class someClass {} }\n    /**@internal*/ export import someImport = someNamespace.C;\n    /**@internal*/ export type internalType = internalC;\n    /**@internal*/ export const internalConst = 10;\n    /**@internal*/ export enum internalEnum { a, b, c }\n}\n/**@internal*/ class internalC {}\n/**@internal*/ function internalfoo() {}\n/**@internal*/ namespace internalNamespace { export class someClass {} }\n/**@internal*/ namespace internalOther.something { export class someClass {} }\n/**@internal*/ import internalImport = internalNamespace.someClass;\n/**@internal*/ type internalType = internalC;\n/**@internal*/ const internalConst = 10;\n/**@internal*/ enum internalEnum { a, b, c }","9339262372-class C {\r\n    doSomething() {\r\n        console.log(\"something got done\");\r\n    }\r\n}\r\n"],"options":{"composite":true,"outFile":"./second-output.js"},"outSignature":"-25454326822-interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hello, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ndeclare type internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n","latestChangedDtsFile":"./second-output.d.ts"},"version":"FakeTSVersion"}
+{"bundle":{"commonSourceDirectory":"../second","sourceFiles":["../second/second_part1.ts","../second/second_part2.ts"],"js":{"sections":[{"pos":0,"end":110,"kind":"prepend","data":"../first/bin/first-output.js","texts":[{"pos":0,"end":110,"kind":"text"}]},{"pos":110,"end":3163,"kind":"text"}],"mapHash":"-4451840947-{\"version\":3,\"file\":\"second-output.js\",\"sourceRoot\":\"\",\"sources\":[\"../first/first_PART1.ts\",\"../first/first_part2.ts\",\"../first/first_part3.ts\",\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"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\"}","hash":"144238636645-var s = \"Hello, world\";\r\nconsole.log(s);\r\nconsole.log(f());\r\nfunction f() {\r\n    return \"JS does hoists\";\r\n}\r\nvar N;\r\n(function (N) {\r\n    function f() {\r\n        console.log('testing');\r\n    }\r\n    f();\r\n})(N || (N = {}));\r\nvar normalC = (function () {\r\n    function normalC() {\r\n    }\r\n    normalC.prototype.method = function () { };\r\n    Object.defineProperty(normalC.prototype, \"c\", {\r\n        get: function () { return 10; },\r\n        set: function (val) { },\r\n        enumerable: false,\r\n        configurable: true\r\n    });\r\n    return normalC;\r\n}());\r\nvar normalN;\r\n(function (normalN) {\r\n    var C = (function () {\r\n        function C() {\r\n        }\r\n        return C;\r\n    }());\r\n    normalN.C = C;\r\n    function foo() { }\r\n    normalN.foo = foo;\r\n    var someNamespace;\r\n    (function (someNamespace) {\r\n        var C = (function () {\r\n            function C() {\r\n            }\r\n            return C;\r\n        }());\r\n        someNamespace.C = C;\r\n    })(someNamespace = normalN.someNamespace || (normalN.someNamespace = {}));\r\n    var someOther;\r\n    (function (someOther) {\r\n        var something;\r\n        (function (something) {\r\n            var someClass = (function () {\r\n                function someClass() {\r\n                }\r\n                return someClass;\r\n            }());\r\n            something.someClass = someClass;\r\n        })(something = someOther.something || (someOther.something = {}));\r\n    })(someOther = normalN.someOther || (normalN.someOther = {}));\r\n    normalN.someImport = someNamespace.C;\r\n    normalN.internalConst = 10;\r\n    var internalEnum;\r\n    (function (internalEnum) {\r\n        internalEnum[internalEnum[\"a\"] = 0] = \"a\";\r\n        internalEnum[internalEnum[\"b\"] = 1] = \"b\";\r\n        internalEnum[internalEnum[\"c\"] = 2] = \"c\";\r\n    })(internalEnum = normalN.internalEnum || (normalN.internalEnum = {}));\r\n})(normalN || (normalN = {}));\r\nvar internalC = (function () {\r\n    function internalC() {\r\n    }\r\n    return internalC;\r\n}());\r\nfunction internalfoo() { }\r\nvar internalNamespace;\r\n(function (internalNamespace) {\r\n    var someClass = (function () {\r\n        function someClass() {\r\n        }\r\n        return someClass;\r\n    }());\r\n    internalNamespace.someClass = someClass;\r\n})(internalNamespace || (internalNamespace = {}));\r\nvar internalOther;\r\n(function (internalOther) {\r\n    var something;\r\n    (function (something) {\r\n        var someClass = (function () {\r\n            function someClass() {\r\n            }\r\n            return someClass;\r\n        }());\r\n        something.someClass = someClass;\r\n    })(something = internalOther.something || (internalOther.something = {}));\r\n})(internalOther || (internalOther = {}));\r\nvar internalImport = internalNamespace.someClass;\r\nvar internalConst = 10;\r\nvar internalEnum;\r\n(function (internalEnum) {\r\n    internalEnum[internalEnum[\"a\"] = 0] = \"a\";\r\n    internalEnum[internalEnum[\"b\"] = 1] = \"b\";\r\n    internalEnum[internalEnum[\"c\"] = 2] = \"c\";\r\n})(internalEnum || (internalEnum = {}));\r\nvar C = (function () {\r\n    function C() {\r\n    }\r\n    C.prototype.doSomething = function () {\r\n        console.log(\"something got done\");\r\n    };\r\n    return C;\r\n}());\r\n//# sourceMappingURL=second-output.js.map"},"dts":{"sections":[{"pos":0,"end":157,"kind":"prepend","data":"../first/bin/first-output.d.ts","texts":[{"pos":0,"end":39,"kind":"internal"},{"pos":41,"end":157,"kind":"text"}]},{"pos":157,"end":234,"kind":"text"},{"pos":234,"end":339,"kind":"internal"},{"pos":341,"end":373,"kind":"text"},{"pos":373,"end":765,"kind":"internal"},{"pos":767,"end":770,"kind":"text"},{"pos":770,"end":1175,"kind":"internal"},{"pos":1177,"end":1225,"kind":"text"}],"mapHash":"35487435059-{\"version\":3,\"file\":\"second-output.d.ts\",\"sourceRoot\":\"\",\"sources\":[\"../first/first_PART1.ts\",\"../first/first_part3.ts\",\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"AAAe,UAAU,QAAQ;IAC7B,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,iBAAiB,CAAC;AAEzB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEM,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;IACN,IAAI,CAAC,IACM,MAAM,CADK;IACtB,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACxC;AACD,kBAAU,OAAO,CAAC;IACC,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACtD;AACc,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,KAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC5C,cAAM,CAAC;IACH,WAAW;CAGd\"}","hash":"-76652520731-interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hello, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ntype internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n//# sourceMappingURL=second-output.d.ts.map"}},"program":{"fileNames":["../second/second_part1.ts","../second/second_part2.ts"],"fileInfos":["5541258877-namespace N {\r\n    // Comment text\r\n}\r\n\r\nnamespace N {\r\n    function f() {\r\n        console.log('testing');\r\n    }\r\n\r\n    f();\r\n}\r\n\nclass normalC {\n    /**@internal*/ constructor() { }\n    /**@internal*/ prop: string;\n    /**@internal*/ method() { }\n    /**@internal*/ get c() { return 10; }\n    /**@internal*/ set c(val: number) { }\n}\nnamespace normalN {\n    /**@internal*/ export class C { }\n    /**@internal*/ export function foo() {}\n    /**@internal*/ export namespace someNamespace { export class C {} }\n    /**@internal*/ export namespace someOther.something { export class someClass {} }\n    /**@internal*/ export import someImport = someNamespace.C;\n    /**@internal*/ export type internalType = internalC;\n    /**@internal*/ export const internalConst = 10;\n    /**@internal*/ export enum internalEnum { a, b, c }\n}\n/**@internal*/ class internalC {}\n/**@internal*/ function internalfoo() {}\n/**@internal*/ namespace internalNamespace { export class someClass {} }\n/**@internal*/ namespace internalOther.something { export class someClass {} }\n/**@internal*/ import internalImport = internalNamespace.someClass;\n/**@internal*/ type internalType = internalC;\n/**@internal*/ const internalConst = 10;\n/**@internal*/ enum internalEnum { a, b, c }","9339262372-class C {\r\n    doSomething() {\r\n        console.log(\"something got done\");\r\n    }\r\n}\r\n"],"options":{"composite":true,"outFile":"./second-output.js"},"outSignature":"-68578080182-interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hello, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ntype internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n","latestChangedDtsFile":"./second-output.d.ts"},"version":"FakeTSVersion"}
 
 //// [/src/2/second-output.tsbuildinfo.baseline.txt]
 ======================================================================
@@ -2935,7 +2936,7 @@ text: (767-770)
 }
 
 ----------------------------------------------------------------------
-internal: (770-1183)
+internal: (770-1175)
 declare class internalC {
 }
 declare function internalfoo(): void;
@@ -2948,7 +2949,7 @@ declare namespace internalOther.something {
     }
 }
 import internalImport = internalNamespace.someClass;
-declare type internalType = internalC;
+type internalType = internalC;
 declare const internalConst = 10;
 declare enum internalEnum {
     a = 0,
@@ -2956,7 +2957,7 @@ declare enum internalEnum {
     c = 2
 }
 ----------------------------------------------------------------------
-text: (1185-1233)
+text: (1177-1225)
 declare class C {
     doSomething(): void;
 }
@@ -3042,17 +3043,17 @@ declare class C {
         },
         {
           "pos": 770,
-          "end": 1183,
+          "end": 1175,
           "kind": "internal"
         },
         {
-          "pos": 1185,
-          "end": 1233,
+          "pos": 1177,
+          "end": 1225,
           "kind": "text"
         }
       ],
-      "hash": "-13432536459-interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hello, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ndeclare type internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n//# sourceMappingURL=second-output.d.ts.map",
-      "mapHash": "47169317065-{\"version\":3,\"file\":\"second-output.d.ts\",\"sourceRoot\":\"\",\"sources\":[\"../first/first_PART1.ts\",\"../first/first_part3.ts\",\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"AAAe,UAAU,QAAQ;IAC7B,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,iBAAiB,CAAC;AAEzB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEM,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;IACN,IAAI,CAAC,IACM,MAAM,CADK;IACtB,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACxC;AACD,kBAAU,OAAO,CAAC;IACC,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACtD;AACc,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,aAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC5C,cAAM,CAAC;IACH,WAAW;CAGd\"}"
+      "hash": "-76652520731-interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hello, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ntype internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n//# sourceMappingURL=second-output.d.ts.map",
+      "mapHash": "35487435059-{\"version\":3,\"file\":\"second-output.d.ts\",\"sourceRoot\":\"\",\"sources\":[\"../first/first_PART1.ts\",\"../first/first_part3.ts\",\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"AAAe,UAAU,QAAQ;IAC7B,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,iBAAiB,CAAC;AAEzB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEM,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;IACN,IAAI,CAAC,IACM,MAAM,CADK;IACtB,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACxC;AACD,kBAAU,OAAO,CAAC;IACC,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACtD;AACc,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,KAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC5C,cAAM,CAAC;IACH,WAAW;CAGd\"}"
     }
   },
   "program": {
@@ -3068,11 +3069,11 @@ declare class C {
       "composite": true,
       "outFile": "./second-output.js"
     },
-    "outSignature": "-25454326822-interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hello, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ndeclare type internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n",
+    "outSignature": "-68578080182-interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hello, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ntype internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n",
     "latestChangedDtsFile": "./second-output.d.ts"
   },
   "version": "FakeTSVersion",
-  "size": 12306
+  "size": 12290
 }
 
 //// [/src/first/bin/first-output.d.ts]
@@ -7498,7 +7499,7 @@ sourceFile:../second/second_part2.ts
 >>>//# sourceMappingURL=second-output.js.map
 
 //// [/src/2/second-output.tsbuildinfo]
-{"bundle":{"commonSourceDirectory":"../second","sourceFiles":["../second/second_part1.ts","../second/second_part2.ts"],"js":{"sections":[{"pos":0,"end":127,"kind":"prepend","data":"../first/bin/first-output.js","texts":[{"pos":0,"end":127,"kind":"text"}]},{"pos":127,"end":3180,"kind":"text"}],"mapHash":"3227826561-{\"version\":3,\"file\":\"second-output.js\",\"sourceRoot\":\"\",\"sources\":[\"../first/first_PART1.ts\",\"../first/first_part2.ts\",\"../first/first_part3.ts\",\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"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\"}","hash":"-105939128098-var s = \"Hello, world\";\r\nconsole.log(s);\r\nconsole.log(s);\r\nconsole.log(f());\r\nfunction f() {\r\n    return \"JS does hoists\";\r\n}\r\nvar N;\r\n(function (N) {\r\n    function f() {\r\n        console.log('testing');\r\n    }\r\n    f();\r\n})(N || (N = {}));\r\nvar normalC = (function () {\r\n    function normalC() {\r\n    }\r\n    normalC.prototype.method = function () { };\r\n    Object.defineProperty(normalC.prototype, \"c\", {\r\n        get: function () { return 10; },\r\n        set: function (val) { },\r\n        enumerable: false,\r\n        configurable: true\r\n    });\r\n    return normalC;\r\n}());\r\nvar normalN;\r\n(function (normalN) {\r\n    var C = (function () {\r\n        function C() {\r\n        }\r\n        return C;\r\n    }());\r\n    normalN.C = C;\r\n    function foo() { }\r\n    normalN.foo = foo;\r\n    var someNamespace;\r\n    (function (someNamespace) {\r\n        var C = (function () {\r\n            function C() {\r\n            }\r\n            return C;\r\n        }());\r\n        someNamespace.C = C;\r\n    })(someNamespace = normalN.someNamespace || (normalN.someNamespace = {}));\r\n    var someOther;\r\n    (function (someOther) {\r\n        var something;\r\n        (function (something) {\r\n            var someClass = (function () {\r\n                function someClass() {\r\n                }\r\n                return someClass;\r\n            }());\r\n            something.someClass = someClass;\r\n        })(something = someOther.something || (someOther.something = {}));\r\n    })(someOther = normalN.someOther || (normalN.someOther = {}));\r\n    normalN.someImport = someNamespace.C;\r\n    normalN.internalConst = 10;\r\n    var internalEnum;\r\n    (function (internalEnum) {\r\n        internalEnum[internalEnum[\"a\"] = 0] = \"a\";\r\n        internalEnum[internalEnum[\"b\"] = 1] = \"b\";\r\n        internalEnum[internalEnum[\"c\"] = 2] = \"c\";\r\n    })(internalEnum = normalN.internalEnum || (normalN.internalEnum = {}));\r\n})(normalN || (normalN = {}));\r\nvar internalC = (function () {\r\n    function internalC() {\r\n    }\r\n    return internalC;\r\n}());\r\nfunction internalfoo() { }\r\nvar internalNamespace;\r\n(function (internalNamespace) {\r\n    var someClass = (function () {\r\n        function someClass() {\r\n        }\r\n        return someClass;\r\n    }());\r\n    internalNamespace.someClass = someClass;\r\n})(internalNamespace || (internalNamespace = {}));\r\nvar internalOther;\r\n(function (internalOther) {\r\n    var something;\r\n    (function (something) {\r\n        var someClass = (function () {\r\n            function someClass() {\r\n            }\r\n            return someClass;\r\n        }());\r\n        something.someClass = someClass;\r\n    })(something = internalOther.something || (internalOther.something = {}));\r\n})(internalOther || (internalOther = {}));\r\nvar internalImport = internalNamespace.someClass;\r\nvar internalConst = 10;\r\nvar internalEnum;\r\n(function (internalEnum) {\r\n    internalEnum[internalEnum[\"a\"] = 0] = \"a\";\r\n    internalEnum[internalEnum[\"b\"] = 1] = \"b\";\r\n    internalEnum[internalEnum[\"c\"] = 2] = \"c\";\r\n})(internalEnum || (internalEnum = {}));\r\nvar C = (function () {\r\n    function C() {\r\n    }\r\n    C.prototype.doSomething = function () {\r\n        console.log(\"something got done\");\r\n    };\r\n    return C;\r\n}());\r\n//# sourceMappingURL=second-output.js.map"},"dts":{"sections":[{"pos":0,"end":157,"kind":"prepend","data":"../first/bin/first-output.d.ts","texts":[{"pos":0,"end":39,"kind":"internal"},{"pos":41,"end":157,"kind":"text"}]},{"pos":157,"end":234,"kind":"text"},{"pos":234,"end":339,"kind":"internal"},{"pos":341,"end":373,"kind":"text"},{"pos":373,"end":765,"kind":"internal"},{"pos":767,"end":770,"kind":"text"},{"pos":770,"end":1183,"kind":"internal"},{"pos":1185,"end":1233,"kind":"text"}],"mapHash":"47169317065-{\"version\":3,\"file\":\"second-output.d.ts\",\"sourceRoot\":\"\",\"sources\":[\"../first/first_PART1.ts\",\"../first/first_part3.ts\",\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"AAAe,UAAU,QAAQ;IAC7B,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,iBAAiB,CAAC;AAEzB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEM,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;IACN,IAAI,CAAC,IACM,MAAM,CADK;IACtB,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACxC;AACD,kBAAU,OAAO,CAAC;IACC,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACtD;AACc,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,aAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC5C,cAAM,CAAC;IACH,WAAW;CAGd\"}","hash":"-13432536459-interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hello, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ndeclare type internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n//# sourceMappingURL=second-output.d.ts.map"}},"program":{"fileNames":["../second/second_part1.ts","../second/second_part2.ts"],"fileInfos":["5541258877-namespace N {\r\n    // Comment text\r\n}\r\n\r\nnamespace N {\r\n    function f() {\r\n        console.log('testing');\r\n    }\r\n\r\n    f();\r\n}\r\n\nclass normalC {\n    /**@internal*/ constructor() { }\n    /**@internal*/ prop: string;\n    /**@internal*/ method() { }\n    /**@internal*/ get c() { return 10; }\n    /**@internal*/ set c(val: number) { }\n}\nnamespace normalN {\n    /**@internal*/ export class C { }\n    /**@internal*/ export function foo() {}\n    /**@internal*/ export namespace someNamespace { export class C {} }\n    /**@internal*/ export namespace someOther.something { export class someClass {} }\n    /**@internal*/ export import someImport = someNamespace.C;\n    /**@internal*/ export type internalType = internalC;\n    /**@internal*/ export const internalConst = 10;\n    /**@internal*/ export enum internalEnum { a, b, c }\n}\n/**@internal*/ class internalC {}\n/**@internal*/ function internalfoo() {}\n/**@internal*/ namespace internalNamespace { export class someClass {} }\n/**@internal*/ namespace internalOther.something { export class someClass {} }\n/**@internal*/ import internalImport = internalNamespace.someClass;\n/**@internal*/ type internalType = internalC;\n/**@internal*/ const internalConst = 10;\n/**@internal*/ enum internalEnum { a, b, c }","9339262372-class C {\r\n    doSomething() {\r\n        console.log(\"something got done\");\r\n    }\r\n}\r\n"],"options":{"composite":true,"outFile":"./second-output.js"},"outSignature":"-25454326822-interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hello, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ndeclare type internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n","latestChangedDtsFile":"./second-output.d.ts"},"version":"FakeTSVersion"}
+{"bundle":{"commonSourceDirectory":"../second","sourceFiles":["../second/second_part1.ts","../second/second_part2.ts"],"js":{"sections":[{"pos":0,"end":127,"kind":"prepend","data":"../first/bin/first-output.js","texts":[{"pos":0,"end":127,"kind":"text"}]},{"pos":127,"end":3180,"kind":"text"}],"mapHash":"3227826561-{\"version\":3,\"file\":\"second-output.js\",\"sourceRoot\":\"\",\"sources\":[\"../first/first_PART1.ts\",\"../first/first_part2.ts\",\"../first/first_part3.ts\",\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"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\"}","hash":"-105939128098-var s = \"Hello, world\";\r\nconsole.log(s);\r\nconsole.log(s);\r\nconsole.log(f());\r\nfunction f() {\r\n    return \"JS does hoists\";\r\n}\r\nvar N;\r\n(function (N) {\r\n    function f() {\r\n        console.log('testing');\r\n    }\r\n    f();\r\n})(N || (N = {}));\r\nvar normalC = (function () {\r\n    function normalC() {\r\n    }\r\n    normalC.prototype.method = function () { };\r\n    Object.defineProperty(normalC.prototype, \"c\", {\r\n        get: function () { return 10; },\r\n        set: function (val) { },\r\n        enumerable: false,\r\n        configurable: true\r\n    });\r\n    return normalC;\r\n}());\r\nvar normalN;\r\n(function (normalN) {\r\n    var C = (function () {\r\n        function C() {\r\n        }\r\n        return C;\r\n    }());\r\n    normalN.C = C;\r\n    function foo() { }\r\n    normalN.foo = foo;\r\n    var someNamespace;\r\n    (function (someNamespace) {\r\n        var C = (function () {\r\n            function C() {\r\n            }\r\n            return C;\r\n        }());\r\n        someNamespace.C = C;\r\n    })(someNamespace = normalN.someNamespace || (normalN.someNamespace = {}));\r\n    var someOther;\r\n    (function (someOther) {\r\n        var something;\r\n        (function (something) {\r\n            var someClass = (function () {\r\n                function someClass() {\r\n                }\r\n                return someClass;\r\n            }());\r\n            something.someClass = someClass;\r\n        })(something = someOther.something || (someOther.something = {}));\r\n    })(someOther = normalN.someOther || (normalN.someOther = {}));\r\n    normalN.someImport = someNamespace.C;\r\n    normalN.internalConst = 10;\r\n    var internalEnum;\r\n    (function (internalEnum) {\r\n        internalEnum[internalEnum[\"a\"] = 0] = \"a\";\r\n        internalEnum[internalEnum[\"b\"] = 1] = \"b\";\r\n        internalEnum[internalEnum[\"c\"] = 2] = \"c\";\r\n    })(internalEnum = normalN.internalEnum || (normalN.internalEnum = {}));\r\n})(normalN || (normalN = {}));\r\nvar internalC = (function () {\r\n    function internalC() {\r\n    }\r\n    return internalC;\r\n}());\r\nfunction internalfoo() { }\r\nvar internalNamespace;\r\n(function (internalNamespace) {\r\n    var someClass = (function () {\r\n        function someClass() {\r\n        }\r\n        return someClass;\r\n    }());\r\n    internalNamespace.someClass = someClass;\r\n})(internalNamespace || (internalNamespace = {}));\r\nvar internalOther;\r\n(function (internalOther) {\r\n    var something;\r\n    (function (something) {\r\n        var someClass = (function () {\r\n            function someClass() {\r\n            }\r\n            return someClass;\r\n        }());\r\n        something.someClass = someClass;\r\n    })(something = internalOther.something || (internalOther.something = {}));\r\n})(internalOther || (internalOther = {}));\r\nvar internalImport = internalNamespace.someClass;\r\nvar internalConst = 10;\r\nvar internalEnum;\r\n(function (internalEnum) {\r\n    internalEnum[internalEnum[\"a\"] = 0] = \"a\";\r\n    internalEnum[internalEnum[\"b\"] = 1] = \"b\";\r\n    internalEnum[internalEnum[\"c\"] = 2] = \"c\";\r\n})(internalEnum || (internalEnum = {}));\r\nvar C = (function () {\r\n    function C() {\r\n    }\r\n    C.prototype.doSomething = function () {\r\n        console.log(\"something got done\");\r\n    };\r\n    return C;\r\n}());\r\n//# sourceMappingURL=second-output.js.map"},"dts":{"sections":[{"pos":0,"end":157,"kind":"prepend","data":"../first/bin/first-output.d.ts","texts":[{"pos":0,"end":39,"kind":"internal"},{"pos":41,"end":157,"kind":"text"}]},{"pos":157,"end":234,"kind":"text"},{"pos":234,"end":339,"kind":"internal"},{"pos":341,"end":373,"kind":"text"},{"pos":373,"end":765,"kind":"internal"},{"pos":767,"end":770,"kind":"text"},{"pos":770,"end":1175,"kind":"internal"},{"pos":1177,"end":1225,"kind":"text"}],"mapHash":"35487435059-{\"version\":3,\"file\":\"second-output.d.ts\",\"sourceRoot\":\"\",\"sources\":[\"../first/first_PART1.ts\",\"../first/first_part3.ts\",\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"AAAe,UAAU,QAAQ;IAC7B,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,iBAAiB,CAAC;AAEzB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEM,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;IACN,IAAI,CAAC,IACM,MAAM,CADK;IACtB,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACxC;AACD,kBAAU,OAAO,CAAC;IACC,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACtD;AACc,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,KAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC5C,cAAM,CAAC;IACH,WAAW;CAGd\"}","hash":"-76652520731-interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hello, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ntype internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n//# sourceMappingURL=second-output.d.ts.map"}},"program":{"fileNames":["../second/second_part1.ts","../second/second_part2.ts"],"fileInfos":["5541258877-namespace N {\r\n    // Comment text\r\n}\r\n\r\nnamespace N {\r\n    function f() {\r\n        console.log('testing');\r\n    }\r\n\r\n    f();\r\n}\r\n\nclass normalC {\n    /**@internal*/ constructor() { }\n    /**@internal*/ prop: string;\n    /**@internal*/ method() { }\n    /**@internal*/ get c() { return 10; }\n    /**@internal*/ set c(val: number) { }\n}\nnamespace normalN {\n    /**@internal*/ export class C { }\n    /**@internal*/ export function foo() {}\n    /**@internal*/ export namespace someNamespace { export class C {} }\n    /**@internal*/ export namespace someOther.something { export class someClass {} }\n    /**@internal*/ export import someImport = someNamespace.C;\n    /**@internal*/ export type internalType = internalC;\n    /**@internal*/ export const internalConst = 10;\n    /**@internal*/ export enum internalEnum { a, b, c }\n}\n/**@internal*/ class internalC {}\n/**@internal*/ function internalfoo() {}\n/**@internal*/ namespace internalNamespace { export class someClass {} }\n/**@internal*/ namespace internalOther.something { export class someClass {} }\n/**@internal*/ import internalImport = internalNamespace.someClass;\n/**@internal*/ type internalType = internalC;\n/**@internal*/ const internalConst = 10;\n/**@internal*/ enum internalEnum { a, b, c }","9339262372-class C {\r\n    doSomething() {\r\n        console.log(\"something got done\");\r\n    }\r\n}\r\n"],"options":{"composite":true,"outFile":"./second-output.js"},"outSignature":"-68578080182-interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hello, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ntype internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n","latestChangedDtsFile":"./second-output.d.ts"},"version":"FakeTSVersion"}
 
 //// [/src/2/second-output.tsbuildinfo.baseline.txt]
 ======================================================================
@@ -7684,7 +7685,7 @@ text: (767-770)
 }
 
 ----------------------------------------------------------------------
-internal: (770-1183)
+internal: (770-1175)
 declare class internalC {
 }
 declare function internalfoo(): void;
@@ -7697,7 +7698,7 @@ declare namespace internalOther.something {
     }
 }
 import internalImport = internalNamespace.someClass;
-declare type internalType = internalC;
+type internalType = internalC;
 declare const internalConst = 10;
 declare enum internalEnum {
     a = 0,
@@ -7705,7 +7706,7 @@ declare enum internalEnum {
     c = 2
 }
 ----------------------------------------------------------------------
-text: (1185-1233)
+text: (1177-1225)
 declare class C {
     doSomething(): void;
 }
@@ -7791,17 +7792,17 @@ declare class C {
         },
         {
           "pos": 770,
-          "end": 1183,
+          "end": 1175,
           "kind": "internal"
         },
         {
-          "pos": 1185,
-          "end": 1233,
+          "pos": 1177,
+          "end": 1225,
           "kind": "text"
         }
       ],
-      "hash": "-13432536459-interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hello, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ndeclare type internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n//# sourceMappingURL=second-output.d.ts.map",
-      "mapHash": "47169317065-{\"version\":3,\"file\":\"second-output.d.ts\",\"sourceRoot\":\"\",\"sources\":[\"../first/first_PART1.ts\",\"../first/first_part3.ts\",\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"AAAe,UAAU,QAAQ;IAC7B,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,iBAAiB,CAAC;AAEzB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEM,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;IACN,IAAI,CAAC,IACM,MAAM,CADK;IACtB,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACxC;AACD,kBAAU,OAAO,CAAC;IACC,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACtD;AACc,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,aAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC5C,cAAM,CAAC;IACH,WAAW;CAGd\"}"
+      "hash": "-76652520731-interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hello, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ntype internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n//# sourceMappingURL=second-output.d.ts.map",
+      "mapHash": "35487435059-{\"version\":3,\"file\":\"second-output.d.ts\",\"sourceRoot\":\"\",\"sources\":[\"../first/first_PART1.ts\",\"../first/first_part3.ts\",\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"AAAe,UAAU,QAAQ;IAC7B,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,iBAAiB,CAAC;AAEzB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEM,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;IACN,IAAI,CAAC,IACM,MAAM,CADK;IACtB,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACxC;AACD,kBAAU,OAAO,CAAC;IACC,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACtD;AACc,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,KAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC5C,cAAM,CAAC;IACH,WAAW;CAGd\"}"
     }
   },
   "program": {
@@ -7817,11 +7818,11 @@ declare class C {
       "composite": true,
       "outFile": "./second-output.js"
     },
-    "outSignature": "-25454326822-interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hello, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ndeclare type internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n",
+    "outSignature": "-68578080182-interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hello, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ntype internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n",
     "latestChangedDtsFile": "./second-output.d.ts"
   },
   "version": "FakeTSVersion",
-  "size": 12365
+  "size": 12349
 }
 
 //// [/src/first/bin/first-output.d.ts.map] file written with same contents
@@ -10155,7 +10156,7 @@ exitCode:: ExitStatus.Success
 
 
 //// [/src/2/second-output.d.ts.map]
-{"version":3,"file":"second-output.d.ts","sourceRoot":"","sources":["../first/first_PART1.ts","../first/first_part3.ts","../second/second_part1.ts","../second/second_part2.ts"],"names":[],"mappings":"AAAA,UAAU,QAAQ;IACd,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,iBAAiB,CAAC;AAEzB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEM,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;IACN,IAAI,CAAC,IACM,MAAM,CADK;IACtB,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACxC;AACD,kBAAU,OAAO,CAAC;IACC,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACtD;AACc,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,aAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC5C,cAAM,CAAC;IACH,WAAW;CAGd"}
+{"version":3,"file":"second-output.d.ts","sourceRoot":"","sources":["../first/first_PART1.ts","../first/first_part3.ts","../second/second_part1.ts","../second/second_part2.ts"],"names":[],"mappings":"AAAA,UAAU,QAAQ;IACd,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,iBAAiB,CAAC;AAEzB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEM,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;IACN,IAAI,CAAC,IACM,MAAM,CADK;IACtB,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACxC;AACD,kBAAU,OAAO,CAAC;IACC,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACtD;AACc,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,KAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC5C,cAAM,CAAC;IACH,WAAW;CAGd"}
 
 //// [/src/2/second-output.d.ts.map.baseline.txt]
 ===================================================================
@@ -10834,42 +10835,43 @@ sourceFile:../second/second_part1.ts
 7 >Emitted(52, 52) Source(34, 67) + SourceIndex(2)
 8 >Emitted(52, 53) Source(34, 68) + SourceIndex(2)
 ---
->>>declare type internalType = internalC;
+>>>type internalType = internalC;
 1 >
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^^^^^
-4 >                         ^^^
-5 >                            ^^^^^^^^^
-6 >                                     ^
+2 >^^^^^
+3 >     ^^^^^^^^^^^^
+4 >                 ^^^
+5 >                    ^^^^^^^^^
+6 >                             ^
+7 >                              ^^^^->
 1 >
   >/**@internal*/ 
 2 >type 
-3 >             internalType
-4 >                          = 
-5 >                            internalC
-6 >                                     ;
+3 >     internalType
+4 >                  = 
+5 >                    internalC
+6 >                             ;
 1 >Emitted(53, 1) Source(35, 16) + SourceIndex(2)
-2 >Emitted(53, 14) Source(35, 21) + SourceIndex(2)
-3 >Emitted(53, 26) Source(35, 33) + SourceIndex(2)
-4 >Emitted(53, 29) Source(35, 36) + SourceIndex(2)
-5 >Emitted(53, 38) Source(35, 45) + SourceIndex(2)
-6 >Emitted(53, 39) Source(35, 46) + SourceIndex(2)
+2 >Emitted(53, 6) Source(35, 21) + SourceIndex(2)
+3 >Emitted(53, 18) Source(35, 33) + SourceIndex(2)
+4 >Emitted(53, 21) Source(35, 36) + SourceIndex(2)
+5 >Emitted(53, 30) Source(35, 45) + SourceIndex(2)
+6 >Emitted(53, 31) Source(35, 46) + SourceIndex(2)
 ---
 >>>declare const internalConst = 10;
-1 >
+1->
 2 >^^^^^^^^
 3 >        ^^^^^^
 4 >              ^^^^^^^^^^^^^
 5 >                           ^^^^^
 6 >                                ^
-1 >
+1->
   >/**@internal*/ 
 2 >
 3 >        const 
 4 >              internalConst
 5 >                            = 10
 6 >                                ;
-1 >Emitted(54, 1) Source(36, 16) + SourceIndex(2)
+1->Emitted(54, 1) Source(36, 16) + SourceIndex(2)
 2 >Emitted(54, 9) Source(36, 16) + SourceIndex(2)
 3 >Emitted(54, 15) Source(36, 22) + SourceIndex(2)
 4 >Emitted(54, 28) Source(36, 35) + SourceIndex(2)
@@ -10966,7 +10968,7 @@ sourceFile:../second/second_part2.ts
 >>>//# sourceMappingURL=second-output.d.ts.map
 
 //// [/src/2/second-output.tsbuildinfo]
-{"bundle":{"commonSourceDirectory":"../second","sourceFiles":["../second/second_part1.ts","../second/second_part2.ts"],"js":{"sections":[{"pos":0,"end":127,"kind":"prepend","data":"../first/bin/first-output.js","texts":[{"pos":0,"end":127,"kind":"text"}]},{"pos":127,"end":3180,"kind":"text"}],"mapHash":"3227826561-{\"version\":3,\"file\":\"second-output.js\",\"sourceRoot\":\"\",\"sources\":[\"../first/first_PART1.ts\",\"../first/first_part2.ts\",\"../first/first_part3.ts\",\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"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\"}","hash":"-105939128098-var s = \"Hello, world\";\r\nconsole.log(s);\r\nconsole.log(s);\r\nconsole.log(f());\r\nfunction f() {\r\n    return \"JS does hoists\";\r\n}\r\nvar N;\r\n(function (N) {\r\n    function f() {\r\n        console.log('testing');\r\n    }\r\n    f();\r\n})(N || (N = {}));\r\nvar normalC = (function () {\r\n    function normalC() {\r\n    }\r\n    normalC.prototype.method = function () { };\r\n    Object.defineProperty(normalC.prototype, \"c\", {\r\n        get: function () { return 10; },\r\n        set: function (val) { },\r\n        enumerable: false,\r\n        configurable: true\r\n    });\r\n    return normalC;\r\n}());\r\nvar normalN;\r\n(function (normalN) {\r\n    var C = (function () {\r\n        function C() {\r\n        }\r\n        return C;\r\n    }());\r\n    normalN.C = C;\r\n    function foo() { }\r\n    normalN.foo = foo;\r\n    var someNamespace;\r\n    (function (someNamespace) {\r\n        var C = (function () {\r\n            function C() {\r\n            }\r\n            return C;\r\n        }());\r\n        someNamespace.C = C;\r\n    })(someNamespace = normalN.someNamespace || (normalN.someNamespace = {}));\r\n    var someOther;\r\n    (function (someOther) {\r\n        var something;\r\n        (function (something) {\r\n            var someClass = (function () {\r\n                function someClass() {\r\n                }\r\n                return someClass;\r\n            }());\r\n            something.someClass = someClass;\r\n        })(something = someOther.something || (someOther.something = {}));\r\n    })(someOther = normalN.someOther || (normalN.someOther = {}));\r\n    normalN.someImport = someNamespace.C;\r\n    normalN.internalConst = 10;\r\n    var internalEnum;\r\n    (function (internalEnum) {\r\n        internalEnum[internalEnum[\"a\"] = 0] = \"a\";\r\n        internalEnum[internalEnum[\"b\"] = 1] = \"b\";\r\n        internalEnum[internalEnum[\"c\"] = 2] = \"c\";\r\n    })(internalEnum = normalN.internalEnum || (normalN.internalEnum = {}));\r\n})(normalN || (normalN = {}));\r\nvar internalC = (function () {\r\n    function internalC() {\r\n    }\r\n    return internalC;\r\n}());\r\nfunction internalfoo() { }\r\nvar internalNamespace;\r\n(function (internalNamespace) {\r\n    var someClass = (function () {\r\n        function someClass() {\r\n        }\r\n        return someClass;\r\n    }());\r\n    internalNamespace.someClass = someClass;\r\n})(internalNamespace || (internalNamespace = {}));\r\nvar internalOther;\r\n(function (internalOther) {\r\n    var something;\r\n    (function (something) {\r\n        var someClass = (function () {\r\n            function someClass() {\r\n            }\r\n            return someClass;\r\n        }());\r\n        something.someClass = someClass;\r\n    })(something = internalOther.something || (internalOther.something = {}));\r\n})(internalOther || (internalOther = {}));\r\nvar internalImport = internalNamespace.someClass;\r\nvar internalConst = 10;\r\nvar internalEnum;\r\n(function (internalEnum) {\r\n    internalEnum[internalEnum[\"a\"] = 0] = \"a\";\r\n    internalEnum[internalEnum[\"b\"] = 1] = \"b\";\r\n    internalEnum[internalEnum[\"c\"] = 2] = \"c\";\r\n})(internalEnum || (internalEnum = {}));\r\nvar C = (function () {\r\n    function C() {\r\n    }\r\n    C.prototype.doSomething = function () {\r\n        console.log(\"something got done\");\r\n    };\r\n    return C;\r\n}());\r\n//# sourceMappingURL=second-output.js.map"},"dts":{"sections":[{"pos":0,"end":157,"kind":"prepend","data":"../first/bin/first-output.d.ts","texts":[{"pos":0,"end":157,"kind":"text"}]},{"pos":157,"end":234,"kind":"text"},{"pos":234,"end":339,"kind":"internal"},{"pos":341,"end":373,"kind":"text"},{"pos":373,"end":765,"kind":"internal"},{"pos":767,"end":770,"kind":"text"},{"pos":770,"end":1183,"kind":"internal"},{"pos":1185,"end":1233,"kind":"text"}],"mapHash":"68891964848-{\"version\":3,\"file\":\"second-output.d.ts\",\"sourceRoot\":\"\",\"sources\":[\"../first/first_PART1.ts\",\"../first/first_part3.ts\",\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"AAAA,UAAU,QAAQ;IACd,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,iBAAiB,CAAC;AAEzB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEM,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;IACN,IAAI,CAAC,IACM,MAAM,CADK;IACtB,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACxC;AACD,kBAAU,OAAO,CAAC;IACC,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACtD;AACc,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,aAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC5C,cAAM,CAAC;IACH,WAAW;CAGd\"}","hash":"-13432536459-interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hello, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ndeclare type internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n//# sourceMappingURL=second-output.d.ts.map"}},"program":{"fileNames":["../second/second_part1.ts","../second/second_part2.ts"],"fileInfos":["5541258877-namespace N {\r\n    // Comment text\r\n}\r\n\r\nnamespace N {\r\n    function f() {\r\n        console.log('testing');\r\n    }\r\n\r\n    f();\r\n}\r\n\nclass normalC {\n    /**@internal*/ constructor() { }\n    /**@internal*/ prop: string;\n    /**@internal*/ method() { }\n    /**@internal*/ get c() { return 10; }\n    /**@internal*/ set c(val: number) { }\n}\nnamespace normalN {\n    /**@internal*/ export class C { }\n    /**@internal*/ export function foo() {}\n    /**@internal*/ export namespace someNamespace { export class C {} }\n    /**@internal*/ export namespace someOther.something { export class someClass {} }\n    /**@internal*/ export import someImport = someNamespace.C;\n    /**@internal*/ export type internalType = internalC;\n    /**@internal*/ export const internalConst = 10;\n    /**@internal*/ export enum internalEnum { a, b, c }\n}\n/**@internal*/ class internalC {}\n/**@internal*/ function internalfoo() {}\n/**@internal*/ namespace internalNamespace { export class someClass {} }\n/**@internal*/ namespace internalOther.something { export class someClass {} }\n/**@internal*/ import internalImport = internalNamespace.someClass;\n/**@internal*/ type internalType = internalC;\n/**@internal*/ const internalConst = 10;\n/**@internal*/ enum internalEnum { a, b, c }","9339262372-class C {\r\n    doSomething() {\r\n        console.log(\"something got done\");\r\n    }\r\n}\r\n"],"options":{"composite":true,"outFile":"./second-output.js"},"outSignature":"-25454326822-interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hello, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ndeclare type internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n","latestChangedDtsFile":"./second-output.d.ts"},"version":"FakeTSVersion"}
+{"bundle":{"commonSourceDirectory":"../second","sourceFiles":["../second/second_part1.ts","../second/second_part2.ts"],"js":{"sections":[{"pos":0,"end":127,"kind":"prepend","data":"../first/bin/first-output.js","texts":[{"pos":0,"end":127,"kind":"text"}]},{"pos":127,"end":3180,"kind":"text"}],"mapHash":"3227826561-{\"version\":3,\"file\":\"second-output.js\",\"sourceRoot\":\"\",\"sources\":[\"../first/first_PART1.ts\",\"../first/first_part2.ts\",\"../first/first_part3.ts\",\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"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\"}","hash":"-105939128098-var s = \"Hello, world\";\r\nconsole.log(s);\r\nconsole.log(s);\r\nconsole.log(f());\r\nfunction f() {\r\n    return \"JS does hoists\";\r\n}\r\nvar N;\r\n(function (N) {\r\n    function f() {\r\n        console.log('testing');\r\n    }\r\n    f();\r\n})(N || (N = {}));\r\nvar normalC = (function () {\r\n    function normalC() {\r\n    }\r\n    normalC.prototype.method = function () { };\r\n    Object.defineProperty(normalC.prototype, \"c\", {\r\n        get: function () { return 10; },\r\n        set: function (val) { },\r\n        enumerable: false,\r\n        configurable: true\r\n    });\r\n    return normalC;\r\n}());\r\nvar normalN;\r\n(function (normalN) {\r\n    var C = (function () {\r\n        function C() {\r\n        }\r\n        return C;\r\n    }());\r\n    normalN.C = C;\r\n    function foo() { }\r\n    normalN.foo = foo;\r\n    var someNamespace;\r\n    (function (someNamespace) {\r\n        var C = (function () {\r\n            function C() {\r\n            }\r\n            return C;\r\n        }());\r\n        someNamespace.C = C;\r\n    })(someNamespace = normalN.someNamespace || (normalN.someNamespace = {}));\r\n    var someOther;\r\n    (function (someOther) {\r\n        var something;\r\n        (function (something) {\r\n            var someClass = (function () {\r\n                function someClass() {\r\n                }\r\n                return someClass;\r\n            }());\r\n            something.someClass = someClass;\r\n        })(something = someOther.something || (someOther.something = {}));\r\n    })(someOther = normalN.someOther || (normalN.someOther = {}));\r\n    normalN.someImport = someNamespace.C;\r\n    normalN.internalConst = 10;\r\n    var internalEnum;\r\n    (function (internalEnum) {\r\n        internalEnum[internalEnum[\"a\"] = 0] = \"a\";\r\n        internalEnum[internalEnum[\"b\"] = 1] = \"b\";\r\n        internalEnum[internalEnum[\"c\"] = 2] = \"c\";\r\n    })(internalEnum = normalN.internalEnum || (normalN.internalEnum = {}));\r\n})(normalN || (normalN = {}));\r\nvar internalC = (function () {\r\n    function internalC() {\r\n    }\r\n    return internalC;\r\n}());\r\nfunction internalfoo() { }\r\nvar internalNamespace;\r\n(function (internalNamespace) {\r\n    var someClass = (function () {\r\n        function someClass() {\r\n        }\r\n        return someClass;\r\n    }());\r\n    internalNamespace.someClass = someClass;\r\n})(internalNamespace || (internalNamespace = {}));\r\nvar internalOther;\r\n(function (internalOther) {\r\n    var something;\r\n    (function (something) {\r\n        var someClass = (function () {\r\n            function someClass() {\r\n            }\r\n            return someClass;\r\n        }());\r\n        something.someClass = someClass;\r\n    })(something = internalOther.something || (internalOther.something = {}));\r\n})(internalOther || (internalOther = {}));\r\nvar internalImport = internalNamespace.someClass;\r\nvar internalConst = 10;\r\nvar internalEnum;\r\n(function (internalEnum) {\r\n    internalEnum[internalEnum[\"a\"] = 0] = \"a\";\r\n    internalEnum[internalEnum[\"b\"] = 1] = \"b\";\r\n    internalEnum[internalEnum[\"c\"] = 2] = \"c\";\r\n})(internalEnum || (internalEnum = {}));\r\nvar C = (function () {\r\n    function C() {\r\n    }\r\n    C.prototype.doSomething = function () {\r\n        console.log(\"something got done\");\r\n    };\r\n    return C;\r\n}());\r\n//# sourceMappingURL=second-output.js.map"},"dts":{"sections":[{"pos":0,"end":157,"kind":"prepend","data":"../first/bin/first-output.d.ts","texts":[{"pos":0,"end":157,"kind":"text"}]},{"pos":157,"end":234,"kind":"text"},{"pos":234,"end":339,"kind":"internal"},{"pos":341,"end":373,"kind":"text"},{"pos":373,"end":765,"kind":"internal"},{"pos":767,"end":770,"kind":"text"},{"pos":770,"end":1175,"kind":"internal"},{"pos":1177,"end":1225,"kind":"text"}],"mapHash":"65800017434-{\"version\":3,\"file\":\"second-output.d.ts\",\"sourceRoot\":\"\",\"sources\":[\"../first/first_PART1.ts\",\"../first/first_part3.ts\",\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"AAAA,UAAU,QAAQ;IACd,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,iBAAiB,CAAC;AAEzB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEM,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;IACN,IAAI,CAAC,IACM,MAAM,CADK;IACtB,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACxC;AACD,kBAAU,OAAO,CAAC;IACC,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACtD;AACc,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,KAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC5C,cAAM,CAAC;IACH,WAAW;CAGd\"}","hash":"-76652520731-interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hello, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ntype internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n//# sourceMappingURL=second-output.d.ts.map"}},"program":{"fileNames":["../second/second_part1.ts","../second/second_part2.ts"],"fileInfos":["5541258877-namespace N {\r\n    // Comment text\r\n}\r\n\r\nnamespace N {\r\n    function f() {\r\n        console.log('testing');\r\n    }\r\n\r\n    f();\r\n}\r\n\nclass normalC {\n    /**@internal*/ constructor() { }\n    /**@internal*/ prop: string;\n    /**@internal*/ method() { }\n    /**@internal*/ get c() { return 10; }\n    /**@internal*/ set c(val: number) { }\n}\nnamespace normalN {\n    /**@internal*/ export class C { }\n    /**@internal*/ export function foo() {}\n    /**@internal*/ export namespace someNamespace { export class C {} }\n    /**@internal*/ export namespace someOther.something { export class someClass {} }\n    /**@internal*/ export import someImport = someNamespace.C;\n    /**@internal*/ export type internalType = internalC;\n    /**@internal*/ export const internalConst = 10;\n    /**@internal*/ export enum internalEnum { a, b, c }\n}\n/**@internal*/ class internalC {}\n/**@internal*/ function internalfoo() {}\n/**@internal*/ namespace internalNamespace { export class someClass {} }\n/**@internal*/ namespace internalOther.something { export class someClass {} }\n/**@internal*/ import internalImport = internalNamespace.someClass;\n/**@internal*/ type internalType = internalC;\n/**@internal*/ const internalConst = 10;\n/**@internal*/ enum internalEnum { a, b, c }","9339262372-class C {\r\n    doSomething() {\r\n        console.log(\"something got done\");\r\n    }\r\n}\r\n"],"options":{"composite":true,"outFile":"./second-output.js"},"outSignature":"-68578080182-interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hello, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ntype internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n","latestChangedDtsFile":"./second-output.d.ts"},"version":"FakeTSVersion"}
 
 //// [/src/2/second-output.tsbuildinfo.baseline.txt]
 ======================================================================
@@ -11150,7 +11152,7 @@ text: (767-770)
 }
 
 ----------------------------------------------------------------------
-internal: (770-1183)
+internal: (770-1175)
 declare class internalC {
 }
 declare function internalfoo(): void;
@@ -11163,7 +11165,7 @@ declare namespace internalOther.something {
     }
 }
 import internalImport = internalNamespace.someClass;
-declare type internalType = internalC;
+type internalType = internalC;
 declare const internalConst = 10;
 declare enum internalEnum {
     a = 0,
@@ -11171,7 +11173,7 @@ declare enum internalEnum {
     c = 2
 }
 ----------------------------------------------------------------------
-text: (1185-1233)
+text: (1177-1225)
 declare class C {
     doSomething(): void;
 }
@@ -11252,17 +11254,17 @@ declare class C {
         },
         {
           "pos": 770,
-          "end": 1183,
+          "end": 1175,
           "kind": "internal"
         },
         {
-          "pos": 1185,
-          "end": 1233,
+          "pos": 1177,
+          "end": 1225,
           "kind": "text"
         }
       ],
-      "hash": "-13432536459-interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hello, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ndeclare type internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n//# sourceMappingURL=second-output.d.ts.map",
-      "mapHash": "68891964848-{\"version\":3,\"file\":\"second-output.d.ts\",\"sourceRoot\":\"\",\"sources\":[\"../first/first_PART1.ts\",\"../first/first_part3.ts\",\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"AAAA,UAAU,QAAQ;IACd,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,iBAAiB,CAAC;AAEzB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEM,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;IACN,IAAI,CAAC,IACM,MAAM,CADK;IACtB,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACxC;AACD,kBAAU,OAAO,CAAC;IACC,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACtD;AACc,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,aAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC5C,cAAM,CAAC;IACH,WAAW;CAGd\"}"
+      "hash": "-76652520731-interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hello, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ntype internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n//# sourceMappingURL=second-output.d.ts.map",
+      "mapHash": "65800017434-{\"version\":3,\"file\":\"second-output.d.ts\",\"sourceRoot\":\"\",\"sources\":[\"../first/first_PART1.ts\",\"../first/first_part3.ts\",\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"AAAA,UAAU,QAAQ;IACd,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,iBAAiB,CAAC;AAEzB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEM,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;IACN,IAAI,CAAC,IACM,MAAM,CADK;IACtB,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACxC;AACD,kBAAU,OAAO,CAAC;IACC,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACtD;AACc,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,KAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC5C,cAAM,CAAC;IACH,WAAW;CAGd\"}"
     }
   },
   "program": {
@@ -11278,11 +11280,11 @@ declare class C {
       "composite": true,
       "outFile": "./second-output.js"
     },
-    "outSignature": "-25454326822-interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hello, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ndeclare type internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n",
+    "outSignature": "-68578080182-interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hello, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ntype internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n",
     "latestChangedDtsFile": "./second-output.d.ts"
   },
   "version": "FakeTSVersion",
-  "size": 12326
+  "size": 12310
 }
 
 //// [/src/first/bin/first-output.d.ts.map]
diff --git a/tests/baselines/reference/tsbuild/outfile-concat/stripInternal-jsdoc-style-comment.js b/tests/baselines/reference/tsbuild/outfile-concat/stripInternal-jsdoc-style-comment.js
index 3c1a464489781..816a5b53dd69d 100644
--- a/tests/baselines/reference/tsbuild/outfile-concat/stripInternal-jsdoc-style-comment.js
+++ b/tests/baselines/reference/tsbuild/outfile-concat/stripInternal-jsdoc-style-comment.js
@@ -222,7 +222,7 @@ declare namespace internalOther.something {
     }
 }
 import internalImport = internalNamespace.someClass;
-declare type internalType = internalC;
+type internalType = internalC;
 declare const internalConst = 10;
 declare enum internalEnum {
     a = 0,
@@ -235,7 +235,7 @@ declare class C {
 //# sourceMappingURL=second-output.d.ts.map
 
 //// [/src/2/second-output.d.ts.map]
-{"version":3,"file":"second-output.d.ts","sourceRoot":"","sources":["../second/second_part1.ts","../second/second_part2.ts"],"names":[],"mappings":"AAAA,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEM,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;IACN,IAAI,CAAC,IACM,MAAM,CADK;IACtB,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACxC;AACD,kBAAU,OAAO,CAAC;IACC,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACtD;AACc,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,aAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC5C,cAAM,CAAC;IACH,WAAW;CAGd"}
+{"version":3,"file":"second-output.d.ts","sourceRoot":"","sources":["../second/second_part1.ts","../second/second_part2.ts"],"names":[],"mappings":"AAAA,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEM,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;IACN,IAAI,CAAC,IACM,MAAM,CADK;IACtB,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACxC;AACD,kBAAU,OAAO,CAAC;IACC,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACtD;AACc,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,KAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC5C,cAAM,CAAC;IACH,WAAW;CAGd"}
 
 //// [/src/2/second-output.d.ts.map.baseline.txt]
 ===================================================================
@@ -794,42 +794,43 @@ sourceFile:../second/second_part1.ts
 7 >Emitted(44, 52) Source(34, 67) + SourceIndex(0)
 8 >Emitted(44, 53) Source(34, 68) + SourceIndex(0)
 ---
->>>declare type internalType = internalC;
+>>>type internalType = internalC;
 1 >
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^^^^^
-4 >                         ^^^
-5 >                            ^^^^^^^^^
-6 >                                     ^
+2 >^^^^^
+3 >     ^^^^^^^^^^^^
+4 >                 ^^^
+5 >                    ^^^^^^^^^
+6 >                             ^
+7 >                              ^^^^->
 1 >
   >/**@internal*/ 
 2 >type 
-3 >             internalType
-4 >                          = 
-5 >                            internalC
-6 >                                     ;
+3 >     internalType
+4 >                  = 
+5 >                    internalC
+6 >                             ;
 1 >Emitted(45, 1) Source(35, 16) + SourceIndex(0)
-2 >Emitted(45, 14) Source(35, 21) + SourceIndex(0)
-3 >Emitted(45, 26) Source(35, 33) + SourceIndex(0)
-4 >Emitted(45, 29) Source(35, 36) + SourceIndex(0)
-5 >Emitted(45, 38) Source(35, 45) + SourceIndex(0)
-6 >Emitted(45, 39) Source(35, 46) + SourceIndex(0)
+2 >Emitted(45, 6) Source(35, 21) + SourceIndex(0)
+3 >Emitted(45, 18) Source(35, 33) + SourceIndex(0)
+4 >Emitted(45, 21) Source(35, 36) + SourceIndex(0)
+5 >Emitted(45, 30) Source(35, 45) + SourceIndex(0)
+6 >Emitted(45, 31) Source(35, 46) + SourceIndex(0)
 ---
 >>>declare const internalConst = 10;
-1 >
+1->
 2 >^^^^^^^^
 3 >        ^^^^^^
 4 >              ^^^^^^^^^^^^^
 5 >                           ^^^^^
 6 >                                ^
-1 >
+1->
   >/**@internal*/ 
 2 >
 3 >        const 
 4 >              internalConst
 5 >                            = 10
 6 >                                ;
-1 >Emitted(46, 1) Source(36, 16) + SourceIndex(0)
+1->Emitted(46, 1) Source(36, 16) + SourceIndex(0)
 2 >Emitted(46, 9) Source(36, 16) + SourceIndex(0)
 3 >Emitted(46, 15) Source(36, 22) + SourceIndex(0)
 4 >Emitted(46, 28) Source(36, 35) + SourceIndex(0)
@@ -2480,7 +2481,7 @@ sourceFile:../second/second_part2.ts
 >>>//# sourceMappingURL=second-output.js.map
 
 //// [/src/2/second-output.tsbuildinfo]
-{"bundle":{"commonSourceDirectory":"../second","sourceFiles":["../second/second_part1.ts","../second/second_part2.ts"],"js":{"sections":[{"pos":0,"end":3053,"kind":"text"}],"mapHash":"6253281662-{\"version\":3,\"file\":\"second-output.js\",\"sourceRoot\":\"\",\"sources\":[\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"AAIA,IAAU,CAAC,CAMV;AAND,WAAU,CAAC;IACP,SAAS,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC3B,CAAC;IAED,CAAC,EAAE,CAAC;AACR,CAAC,EANS,CAAC,KAAD,CAAC,QAMV;AAED;IACmB;IAAgB,CAAC;IAEjB,wBAAM,GAAN,cAAW,CAAC;IACZ,sBAAI,sBAAC;aAAL,cAAU,OAAO,EAAE,CAAC,CAAC,CAAC;aACtB,UAAM,GAAW,IAAI,CAAC;;;OADA;IAEzC,cAAC;AAAD,CAAC,AAND,IAMC;AACD,IAAU,OAAO,CAShB;AATD,WAAU,OAAO;IACE;QAAA;QAAiB,CAAC;QAAD,QAAC;IAAD,CAAC,AAAlB,IAAkB;IAAL,SAAC,IAAI,CAAA;IAClB,SAAgB,GAAG,KAAI,CAAC;IAAR,WAAG,MAAK,CAAA;IACxB,IAAiB,aAAa,CAAsB;IAApD,WAAiB,aAAa;QAAG;YAAA;YAAgB,CAAC;YAAD,QAAC;QAAD,CAAC,AAAjB,IAAiB;QAAJ,eAAC,IAAG,CAAA;IAAC,CAAC,EAAnC,aAAa,GAAb,qBAAa,KAAb,qBAAa,QAAsB;IACpD,IAAiB,SAAS,CAAwC;IAAlE,WAAiB,SAAS;QAAC,IAAA,SAAS,CAA8B;QAAvC,WAAA,SAAS;YAAG;gBAAA;gBAAwB,CAAC;gBAAD,gBAAC;YAAD,CAAC,AAAzB,IAAyB;YAAZ,mBAAS,YAAG,CAAA;QAAC,CAAC,EAAvC,SAAS,GAAT,mBAAS,KAAT,mBAAS,QAA8B;IAAD,CAAC,EAAjD,SAAS,GAAT,iBAAS,KAAT,iBAAS,QAAwC;IACpD,kBAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAE9B,qBAAa,GAAG,EAAE,CAAC;IAChC,IAAY,YAAwB;IAApC,WAAY,YAAY;QAAG,yCAAC,CAAA;QAAE,yCAAC,CAAA;QAAE,yCAAC,CAAA;IAAC,CAAC,EAAxB,YAAY,GAAZ,oBAAY,KAAZ,oBAAY,QAAY;AACvD,CAAC,EATS,OAAO,KAAP,OAAO,QAShB;AACc;IAAA;IAAiB,CAAC;IAAD,gBAAC;AAAD,CAAC,AAAlB,IAAkB;AAClB,SAAS,WAAW,KAAI,CAAC;AACzB,IAAU,iBAAiB,CAA8B;AAAzD,WAAU,iBAAiB;IAAG;QAAA;QAAwB,CAAC;QAAD,gBAAC;IAAD,CAAC,AAAzB,IAAyB;IAAZ,2BAAS,YAAG,CAAA;AAAC,CAAC,EAA/C,iBAAiB,KAAjB,iBAAiB,QAA8B;AACzD,IAAU,aAAa,CAAwC;AAA/D,WAAU,aAAa;IAAC,IAAA,SAAS,CAA8B;IAAvC,WAAA,SAAS;QAAG;YAAA;YAAwB,CAAC;YAAD,gBAAC;QAAD,CAAC,AAAzB,IAAyB;QAAZ,mBAAS,YAAG,CAAA;IAAC,CAAC,EAAvC,SAAS,GAAT,uBAAS,KAAT,uBAAS,QAA8B;AAAD,CAAC,EAArD,aAAa,KAAb,aAAa,QAAwC;AAC/D,IAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AAEpD,IAAM,aAAa,GAAG,EAAE,CAAC;AACzB,IAAK,YAAwB;AAA7B,WAAK,YAAY;IAAG,yCAAC,CAAA;IAAE,yCAAC,CAAA;IAAE,yCAAC,CAAA;AAAC,CAAC,EAAxB,YAAY,KAAZ,YAAY,QAAY;ACpC5C;IAAA;IAIA,CAAC;IAHG,uBAAW,GAAX;QACI,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;IACtC,CAAC;IACL,QAAC;AAAD,CAAC,AAJD,IAIC\"}","hash":"-8314017635-var N;\r\n(function (N) {\r\n    function f() {\r\n        console.log('testing');\r\n    }\r\n    f();\r\n})(N || (N = {}));\r\nvar normalC = (function () {\r\n    function normalC() {\r\n    }\r\n    normalC.prototype.method = function () { };\r\n    Object.defineProperty(normalC.prototype, \"c\", {\r\n        get: function () { return 10; },\r\n        set: function (val) { },\r\n        enumerable: false,\r\n        configurable: true\r\n    });\r\n    return normalC;\r\n}());\r\nvar normalN;\r\n(function (normalN) {\r\n    var C = (function () {\r\n        function C() {\r\n        }\r\n        return C;\r\n    }());\r\n    normalN.C = C;\r\n    function foo() { }\r\n    normalN.foo = foo;\r\n    var someNamespace;\r\n    (function (someNamespace) {\r\n        var C = (function () {\r\n            function C() {\r\n            }\r\n            return C;\r\n        }());\r\n        someNamespace.C = C;\r\n    })(someNamespace = normalN.someNamespace || (normalN.someNamespace = {}));\r\n    var someOther;\r\n    (function (someOther) {\r\n        var something;\r\n        (function (something) {\r\n            var someClass = (function () {\r\n                function someClass() {\r\n                }\r\n                return someClass;\r\n            }());\r\n            something.someClass = someClass;\r\n        })(something = someOther.something || (someOther.something = {}));\r\n    })(someOther = normalN.someOther || (normalN.someOther = {}));\r\n    normalN.someImport = someNamespace.C;\r\n    normalN.internalConst = 10;\r\n    var internalEnum;\r\n    (function (internalEnum) {\r\n        internalEnum[internalEnum[\"a\"] = 0] = \"a\";\r\n        internalEnum[internalEnum[\"b\"] = 1] = \"b\";\r\n        internalEnum[internalEnum[\"c\"] = 2] = \"c\";\r\n    })(internalEnum = normalN.internalEnum || (normalN.internalEnum = {}));\r\n})(normalN || (normalN = {}));\r\nvar internalC = (function () {\r\n    function internalC() {\r\n    }\r\n    return internalC;\r\n}());\r\nfunction internalfoo() { }\r\nvar internalNamespace;\r\n(function (internalNamespace) {\r\n    var someClass = (function () {\r\n        function someClass() {\r\n        }\r\n        return someClass;\r\n    }());\r\n    internalNamespace.someClass = someClass;\r\n})(internalNamespace || (internalNamespace = {}));\r\nvar internalOther;\r\n(function (internalOther) {\r\n    var something;\r\n    (function (something) {\r\n        var someClass = (function () {\r\n            function someClass() {\r\n            }\r\n            return someClass;\r\n        }());\r\n        something.someClass = someClass;\r\n    })(something = internalOther.something || (internalOther.something = {}));\r\n})(internalOther || (internalOther = {}));\r\nvar internalImport = internalNamespace.someClass;\r\nvar internalConst = 10;\r\nvar internalEnum;\r\n(function (internalEnum) {\r\n    internalEnum[internalEnum[\"a\"] = 0] = \"a\";\r\n    internalEnum[internalEnum[\"b\"] = 1] = \"b\";\r\n    internalEnum[internalEnum[\"c\"] = 2] = \"c\";\r\n})(internalEnum || (internalEnum = {}));\r\nvar C = (function () {\r\n    function C() {\r\n    }\r\n    C.prototype.doSomething = function () {\r\n        console.log(\"something got done\");\r\n    };\r\n    return C;\r\n}());\r\n//# sourceMappingURL=second-output.js.map"},"dts":{"sections":[{"pos":0,"end":77,"kind":"text"},{"pos":77,"end":182,"kind":"internal"},{"pos":184,"end":216,"kind":"text"},{"pos":216,"end":608,"kind":"internal"},{"pos":610,"end":613,"kind":"text"},{"pos":613,"end":1026,"kind":"internal"},{"pos":1028,"end":1076,"kind":"text"}],"mapHash":"109269358215-{\"version\":3,\"file\":\"second-output.d.ts\",\"sourceRoot\":\"\",\"sources\":[\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"AAAA,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEM,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;IACN,IAAI,CAAC,IACM,MAAM,CADK;IACtB,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACxC;AACD,kBAAU,OAAO,CAAC;IACC,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACtD;AACc,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,aAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC5C,cAAM,CAAC;IACH,WAAW;CAGd\"}","hash":"-9468064165-declare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ndeclare type internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n//# sourceMappingURL=second-output.d.ts.map"}},"program":{"fileNames":["../second/second_part1.ts","../second/second_part2.ts"],"fileInfos":["5541258877-namespace N {\r\n    // Comment text\r\n}\r\n\r\nnamespace N {\r\n    function f() {\r\n        console.log('testing');\r\n    }\r\n\r\n    f();\r\n}\r\n\nclass normalC {\n    /**@internal*/ constructor() { }\n    /**@internal*/ prop: string;\n    /**@internal*/ method() { }\n    /**@internal*/ get c() { return 10; }\n    /**@internal*/ set c(val: number) { }\n}\nnamespace normalN {\n    /**@internal*/ export class C { }\n    /**@internal*/ export function foo() {}\n    /**@internal*/ export namespace someNamespace { export class C {} }\n    /**@internal*/ export namespace someOther.something { export class someClass {} }\n    /**@internal*/ export import someImport = someNamespace.C;\n    /**@internal*/ export type internalType = internalC;\n    /**@internal*/ export const internalConst = 10;\n    /**@internal*/ export enum internalEnum { a, b, c }\n}\n/**@internal*/ class internalC {}\n/**@internal*/ function internalfoo() {}\n/**@internal*/ namespace internalNamespace { export class someClass {} }\n/**@internal*/ namespace internalOther.something { export class someClass {} }\n/**@internal*/ import internalImport = internalNamespace.someClass;\n/**@internal*/ type internalType = internalC;\n/**@internal*/ const internalConst = 10;\n/**@internal*/ enum internalEnum { a, b, c }","9339262372-class C {\r\n    doSomething() {\r\n        console.log(\"something got done\");\r\n    }\r\n}\r\n"],"options":{"composite":true,"outFile":"./second-output.js"},"outSignature":"-20504865920-declare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ndeclare type internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n","latestChangedDtsFile":"./second-output.d.ts"},"version":"FakeTSVersion"}
+{"bundle":{"commonSourceDirectory":"../second","sourceFiles":["../second/second_part1.ts","../second/second_part2.ts"],"js":{"sections":[{"pos":0,"end":3053,"kind":"text"}],"mapHash":"6253281662-{\"version\":3,\"file\":\"second-output.js\",\"sourceRoot\":\"\",\"sources\":[\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"AAIA,IAAU,CAAC,CAMV;AAND,WAAU,CAAC;IACP,SAAS,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC3B,CAAC;IAED,CAAC,EAAE,CAAC;AACR,CAAC,EANS,CAAC,KAAD,CAAC,QAMV;AAED;IACmB;IAAgB,CAAC;IAEjB,wBAAM,GAAN,cAAW,CAAC;IACZ,sBAAI,sBAAC;aAAL,cAAU,OAAO,EAAE,CAAC,CAAC,CAAC;aACtB,UAAM,GAAW,IAAI,CAAC;;;OADA;IAEzC,cAAC;AAAD,CAAC,AAND,IAMC;AACD,IAAU,OAAO,CAShB;AATD,WAAU,OAAO;IACE;QAAA;QAAiB,CAAC;QAAD,QAAC;IAAD,CAAC,AAAlB,IAAkB;IAAL,SAAC,IAAI,CAAA;IAClB,SAAgB,GAAG,KAAI,CAAC;IAAR,WAAG,MAAK,CAAA;IACxB,IAAiB,aAAa,CAAsB;IAApD,WAAiB,aAAa;QAAG;YAAA;YAAgB,CAAC;YAAD,QAAC;QAAD,CAAC,AAAjB,IAAiB;QAAJ,eAAC,IAAG,CAAA;IAAC,CAAC,EAAnC,aAAa,GAAb,qBAAa,KAAb,qBAAa,QAAsB;IACpD,IAAiB,SAAS,CAAwC;IAAlE,WAAiB,SAAS;QAAC,IAAA,SAAS,CAA8B;QAAvC,WAAA,SAAS;YAAG;gBAAA;gBAAwB,CAAC;gBAAD,gBAAC;YAAD,CAAC,AAAzB,IAAyB;YAAZ,mBAAS,YAAG,CAAA;QAAC,CAAC,EAAvC,SAAS,GAAT,mBAAS,KAAT,mBAAS,QAA8B;IAAD,CAAC,EAAjD,SAAS,GAAT,iBAAS,KAAT,iBAAS,QAAwC;IACpD,kBAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAE9B,qBAAa,GAAG,EAAE,CAAC;IAChC,IAAY,YAAwB;IAApC,WAAY,YAAY;QAAG,yCAAC,CAAA;QAAE,yCAAC,CAAA;QAAE,yCAAC,CAAA;IAAC,CAAC,EAAxB,YAAY,GAAZ,oBAAY,KAAZ,oBAAY,QAAY;AACvD,CAAC,EATS,OAAO,KAAP,OAAO,QAShB;AACc;IAAA;IAAiB,CAAC;IAAD,gBAAC;AAAD,CAAC,AAAlB,IAAkB;AAClB,SAAS,WAAW,KAAI,CAAC;AACzB,IAAU,iBAAiB,CAA8B;AAAzD,WAAU,iBAAiB;IAAG;QAAA;QAAwB,CAAC;QAAD,gBAAC;IAAD,CAAC,AAAzB,IAAyB;IAAZ,2BAAS,YAAG,CAAA;AAAC,CAAC,EAA/C,iBAAiB,KAAjB,iBAAiB,QAA8B;AACzD,IAAU,aAAa,CAAwC;AAA/D,WAAU,aAAa;IAAC,IAAA,SAAS,CAA8B;IAAvC,WAAA,SAAS;QAAG;YAAA;YAAwB,CAAC;YAAD,gBAAC;QAAD,CAAC,AAAzB,IAAyB;QAAZ,mBAAS,YAAG,CAAA;IAAC,CAAC,EAAvC,SAAS,GAAT,uBAAS,KAAT,uBAAS,QAA8B;AAAD,CAAC,EAArD,aAAa,KAAb,aAAa,QAAwC;AAC/D,IAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AAEpD,IAAM,aAAa,GAAG,EAAE,CAAC;AACzB,IAAK,YAAwB;AAA7B,WAAK,YAAY;IAAG,yCAAC,CAAA;IAAE,yCAAC,CAAA;IAAE,yCAAC,CAAA;AAAC,CAAC,EAAxB,YAAY,KAAZ,YAAY,QAAY;ACpC5C;IAAA;IAIA,CAAC;IAHG,uBAAW,GAAX;QACI,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;IACtC,CAAC;IACL,QAAC;AAAD,CAAC,AAJD,IAIC\"}","hash":"-8314017635-var N;\r\n(function (N) {\r\n    function f() {\r\n        console.log('testing');\r\n    }\r\n    f();\r\n})(N || (N = {}));\r\nvar normalC = (function () {\r\n    function normalC() {\r\n    }\r\n    normalC.prototype.method = function () { };\r\n    Object.defineProperty(normalC.prototype, \"c\", {\r\n        get: function () { return 10; },\r\n        set: function (val) { },\r\n        enumerable: false,\r\n        configurable: true\r\n    });\r\n    return normalC;\r\n}());\r\nvar normalN;\r\n(function (normalN) {\r\n    var C = (function () {\r\n        function C() {\r\n        }\r\n        return C;\r\n    }());\r\n    normalN.C = C;\r\n    function foo() { }\r\n    normalN.foo = foo;\r\n    var someNamespace;\r\n    (function (someNamespace) {\r\n        var C = (function () {\r\n            function C() {\r\n            }\r\n            return C;\r\n        }());\r\n        someNamespace.C = C;\r\n    })(someNamespace = normalN.someNamespace || (normalN.someNamespace = {}));\r\n    var someOther;\r\n    (function (someOther) {\r\n        var something;\r\n        (function (something) {\r\n            var someClass = (function () {\r\n                function someClass() {\r\n                }\r\n                return someClass;\r\n            }());\r\n            something.someClass = someClass;\r\n        })(something = someOther.something || (someOther.something = {}));\r\n    })(someOther = normalN.someOther || (normalN.someOther = {}));\r\n    normalN.someImport = someNamespace.C;\r\n    normalN.internalConst = 10;\r\n    var internalEnum;\r\n    (function (internalEnum) {\r\n        internalEnum[internalEnum[\"a\"] = 0] = \"a\";\r\n        internalEnum[internalEnum[\"b\"] = 1] = \"b\";\r\n        internalEnum[internalEnum[\"c\"] = 2] = \"c\";\r\n    })(internalEnum = normalN.internalEnum || (normalN.internalEnum = {}));\r\n})(normalN || (normalN = {}));\r\nvar internalC = (function () {\r\n    function internalC() {\r\n    }\r\n    return internalC;\r\n}());\r\nfunction internalfoo() { }\r\nvar internalNamespace;\r\n(function (internalNamespace) {\r\n    var someClass = (function () {\r\n        function someClass() {\r\n        }\r\n        return someClass;\r\n    }());\r\n    internalNamespace.someClass = someClass;\r\n})(internalNamespace || (internalNamespace = {}));\r\nvar internalOther;\r\n(function (internalOther) {\r\n    var something;\r\n    (function (something) {\r\n        var someClass = (function () {\r\n            function someClass() {\r\n            }\r\n            return someClass;\r\n        }());\r\n        something.someClass = someClass;\r\n    })(something = internalOther.something || (internalOther.something = {}));\r\n})(internalOther || (internalOther = {}));\r\nvar internalImport = internalNamespace.someClass;\r\nvar internalConst = 10;\r\nvar internalEnum;\r\n(function (internalEnum) {\r\n    internalEnum[internalEnum[\"a\"] = 0] = \"a\";\r\n    internalEnum[internalEnum[\"b\"] = 1] = \"b\";\r\n    internalEnum[internalEnum[\"c\"] = 2] = \"c\";\r\n})(internalEnum || (internalEnum = {}));\r\nvar C = (function () {\r\n    function C() {\r\n    }\r\n    C.prototype.doSomething = function () {\r\n        console.log(\"something got done\");\r\n    };\r\n    return C;\r\n}());\r\n//# sourceMappingURL=second-output.js.map"},"dts":{"sections":[{"pos":0,"end":77,"kind":"text"},{"pos":77,"end":182,"kind":"internal"},{"pos":184,"end":216,"kind":"text"},{"pos":216,"end":608,"kind":"internal"},{"pos":610,"end":613,"kind":"text"},{"pos":613,"end":1018,"kind":"internal"},{"pos":1020,"end":1068,"kind":"text"}],"mapHash":"119062312689-{\"version\":3,\"file\":\"second-output.d.ts\",\"sourceRoot\":\"\",\"sources\":[\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"AAAA,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEM,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;IACN,IAAI,CAAC,IACM,MAAM,CADK;IACtB,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACxC;AACD,kBAAU,OAAO,CAAC;IACC,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACtD;AACc,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,KAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC5C,cAAM,CAAC;IACH,WAAW;CAGd\"}","hash":"11189477579-declare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ntype internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n//# sourceMappingURL=second-output.d.ts.map"}},"program":{"fileNames":["../second/second_part1.ts","../second/second_part2.ts"],"fileInfos":["5541258877-namespace N {\r\n    // Comment text\r\n}\r\n\r\nnamespace N {\r\n    function f() {\r\n        console.log('testing');\r\n    }\r\n\r\n    f();\r\n}\r\n\nclass normalC {\n    /**@internal*/ constructor() { }\n    /**@internal*/ prop: string;\n    /**@internal*/ method() { }\n    /**@internal*/ get c() { return 10; }\n    /**@internal*/ set c(val: number) { }\n}\nnamespace normalN {\n    /**@internal*/ export class C { }\n    /**@internal*/ export function foo() {}\n    /**@internal*/ export namespace someNamespace { export class C {} }\n    /**@internal*/ export namespace someOther.something { export class someClass {} }\n    /**@internal*/ export import someImport = someNamespace.C;\n    /**@internal*/ export type internalType = internalC;\n    /**@internal*/ export const internalConst = 10;\n    /**@internal*/ export enum internalEnum { a, b, c }\n}\n/**@internal*/ class internalC {}\n/**@internal*/ function internalfoo() {}\n/**@internal*/ namespace internalNamespace { export class someClass {} }\n/**@internal*/ namespace internalOther.something { export class someClass {} }\n/**@internal*/ import internalImport = internalNamespace.someClass;\n/**@internal*/ type internalType = internalC;\n/**@internal*/ const internalConst = 10;\n/**@internal*/ enum internalEnum { a, b, c }","9339262372-class C {\r\n    doSomething() {\r\n        console.log(\"something got done\");\r\n    }\r\n}\r\n"],"options":{"composite":true,"outFile":"./second-output.js"},"outSignature":"2446199792-declare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ntype internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n","latestChangedDtsFile":"./second-output.d.ts"},"version":"FakeTSVersion"}
 
 //// [/src/2/second-output.tsbuildinfo.baseline.txt]
 ======================================================================
@@ -2639,7 +2640,7 @@ text: (610-613)
 }
 
 ----------------------------------------------------------------------
-internal: (613-1026)
+internal: (613-1018)
 declare class internalC {
 }
 declare function internalfoo(): void;
@@ -2652,7 +2653,7 @@ declare namespace internalOther.something {
     }
 }
 import internalImport = internalNamespace.someClass;
-declare type internalType = internalC;
+type internalType = internalC;
 declare const internalConst = 10;
 declare enum internalEnum {
     a = 0,
@@ -2660,7 +2661,7 @@ declare enum internalEnum {
     c = 2
 }
 ----------------------------------------------------------------------
-text: (1028-1076)
+text: (1020-1068)
 declare class C {
     doSomething(): void;
 }
@@ -2715,17 +2716,17 @@ declare class C {
         },
         {
           "pos": 613,
-          "end": 1026,
+          "end": 1018,
           "kind": "internal"
         },
         {
-          "pos": 1028,
-          "end": 1076,
+          "pos": 1020,
+          "end": 1068,
           "kind": "text"
         }
       ],
-      "hash": "-9468064165-declare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ndeclare type internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n//# sourceMappingURL=second-output.d.ts.map",
-      "mapHash": "109269358215-{\"version\":3,\"file\":\"second-output.d.ts\",\"sourceRoot\":\"\",\"sources\":[\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"AAAA,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEM,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;IACN,IAAI,CAAC,IACM,MAAM,CADK;IACtB,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACxC;AACD,kBAAU,OAAO,CAAC;IACC,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACtD;AACc,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,aAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC5C,cAAM,CAAC;IACH,WAAW;CAGd\"}"
+      "hash": "11189477579-declare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ntype internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n//# sourceMappingURL=second-output.d.ts.map",
+      "mapHash": "119062312689-{\"version\":3,\"file\":\"second-output.d.ts\",\"sourceRoot\":\"\",\"sources\":[\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"AAAA,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEM,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;IACN,IAAI,CAAC,IACM,MAAM,CADK;IACtB,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACxC;AACD,kBAAU,OAAO,CAAC;IACC,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACtD;AACc,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,KAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC5C,cAAM,CAAC;IACH,WAAW;CAGd\"}"
     }
   },
   "program": {
@@ -2741,11 +2742,11 @@ declare class C {
       "composite": true,
       "outFile": "./second-output.js"
     },
-    "outSignature": "-20504865920-declare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ndeclare type internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n",
+    "outSignature": "2446199792-declare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ntype internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n",
     "latestChangedDtsFile": "./second-output.d.ts"
   },
   "version": "FakeTSVersion",
-  "size": 11091
+  "size": 11073
 }
 
 //// [/src/first/bin/first-output.d.ts]
diff --git a/tests/baselines/reference/tsbuild/outfile-concat/stripInternal-jsdoc-style-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js b/tests/baselines/reference/tsbuild/outfile-concat/stripInternal-jsdoc-style-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js
index 6a0c1f2b7d668..660825b25bc69 100644
--- a/tests/baselines/reference/tsbuild/outfile-concat/stripInternal-jsdoc-style-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js
+++ b/tests/baselines/reference/tsbuild/outfile-concat/stripInternal-jsdoc-style-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js
@@ -231,7 +231,7 @@ declare namespace normalN {
     }
 }
 /**@internal*/ import internalImport = internalNamespace.someClass;
-/**@internal*/ declare type internalType = internalC;
+/**@internal*/ type internalType = internalC;
 /**@internal*/ declare const internalConst = 10;
 /**@internal*/ declare enum internalEnum {
     a = 0,
@@ -244,7 +244,7 @@ declare class C {
 //# sourceMappingURL=second-output.d.ts.map
 
 //// [/src/2/second-output.d.ts.map]
-{"version":3,"file":"second-output.d.ts","sourceRoot":"","sources":["../first/first_PART1.ts","../first/first_part3.ts","../second/second_part1.ts","../second/second_part2.ts"],"names":[],"mappings":"AAAA,cAAc,CAAC,UAAU,QAAQ;IAC7B,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,iBAAiB,CAAC;AAEzB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;IACT,cAAc;IACd,cAAc,CAAC,IAAI,EAAE,MAAM,CAAC;IAC5B,cAAc,CAAC,MAAM;IACrB,cAAc,CAAC,IAAI,CAAC,IACM,MAAM,CADK;IACrC,cAAc,CAAC,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACxC;AACD,kBAAU,OAAO,CAAC;IACd,cAAc,CAAC,MAAa,CAAC;KAAI;IACjC,cAAc,CAAC,SAAgB,GAAG,SAAK;IACvC,cAAc,CAAC,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACnE,cAAc,CAAC,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IACjF,cAAc,CAAC,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC1D,cAAc,CAAC,KAAY,YAAY,GAAG,SAAS,CAAC;IACpD,cAAc,CAAQ,MAAM,aAAa,KAAK,CAAC;IAC/C,cAAc,CAAC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACtD;AACD,cAAc,CAAC,cAAM,SAAS;CAAG;AACjC,cAAc,CAAC,iBAAS,WAAW,SAAK;AACxC,cAAc,CAAC,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACxE,cAAc,CAAC,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC9E,cAAc,CAAC,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACnE,cAAc,CAAC,aAAK,YAAY,GAAG,SAAS,CAAC;AAC7C,cAAc,CAAC,QAAA,MAAM,aAAa,KAAK,CAAC;AACxC,cAAc,CAAC,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC5C,cAAM,CAAC;IACH,WAAW;CAGd"}
+{"version":3,"file":"second-output.d.ts","sourceRoot":"","sources":["../first/first_PART1.ts","../first/first_part3.ts","../second/second_part1.ts","../second/second_part2.ts"],"names":[],"mappings":"AAAA,cAAc,CAAC,UAAU,QAAQ;IAC7B,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,iBAAiB,CAAC;AAEzB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;IACT,cAAc;IACd,cAAc,CAAC,IAAI,EAAE,MAAM,CAAC;IAC5B,cAAc,CAAC,MAAM;IACrB,cAAc,CAAC,IAAI,CAAC,IACM,MAAM,CADK;IACrC,cAAc,CAAC,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACxC;AACD,kBAAU,OAAO,CAAC;IACd,cAAc,CAAC,MAAa,CAAC;KAAI;IACjC,cAAc,CAAC,SAAgB,GAAG,SAAK;IACvC,cAAc,CAAC,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACnE,cAAc,CAAC,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IACjF,cAAc,CAAC,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC1D,cAAc,CAAC,KAAY,YAAY,GAAG,SAAS,CAAC;IACpD,cAAc,CAAQ,MAAM,aAAa,KAAK,CAAC;IAC/C,cAAc,CAAC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACtD;AACD,cAAc,CAAC,cAAM,SAAS;CAAG;AACjC,cAAc,CAAC,iBAAS,WAAW,SAAK;AACxC,cAAc,CAAC,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACxE,cAAc,CAAC,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC9E,cAAc,CAAC,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACnE,cAAc,CAAC,KAAK,YAAY,GAAG,SAAS,CAAC;AAC7C,cAAc,CAAC,QAAA,MAAM,aAAa,KAAK,CAAC;AACxC,cAAc,CAAC,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC5C,cAAM,CAAC;IACH,WAAW;CAGd"}
 
 //// [/src/2/second-output.d.ts.map.baseline.txt]
 ===================================================================
@@ -1041,35 +1041,36 @@ sourceFile:../second/second_part1.ts
 9 >Emitted(52, 67) Source(34, 67) + SourceIndex(2)
 10>Emitted(52, 68) Source(34, 68) + SourceIndex(2)
 ---
->>>/**@internal*/ declare type internalType = internalC;
+>>>/**@internal*/ type internalType = internalC;
 1 >
 2 >^^^^^^^^^^^^^^
 3 >              ^
-4 >               ^^^^^^^^^^^^^
-5 >                            ^^^^^^^^^^^^
-6 >                                        ^^^
-7 >                                           ^^^^^^^^^
-8 >                                                    ^
+4 >               ^^^^^
+5 >                    ^^^^^^^^^^^^
+6 >                                ^^^
+7 >                                   ^^^^^^^^^
+8 >                                            ^
+9 >                                             ^^^^->
 1 >
   >
 2 >/**@internal*/
 3 >               
 4 >               type 
-5 >                            internalType
-6 >                                         = 
-7 >                                           internalC
-8 >                                                    ;
+5 >                    internalType
+6 >                                 = 
+7 >                                   internalC
+8 >                                            ;
 1 >Emitted(53, 1) Source(35, 1) + SourceIndex(2)
 2 >Emitted(53, 15) Source(35, 15) + SourceIndex(2)
 3 >Emitted(53, 16) Source(35, 16) + SourceIndex(2)
-4 >Emitted(53, 29) Source(35, 21) + SourceIndex(2)
-5 >Emitted(53, 41) Source(35, 33) + SourceIndex(2)
-6 >Emitted(53, 44) Source(35, 36) + SourceIndex(2)
-7 >Emitted(53, 53) Source(35, 45) + SourceIndex(2)
-8 >Emitted(53, 54) Source(35, 46) + SourceIndex(2)
+4 >Emitted(53, 21) Source(35, 21) + SourceIndex(2)
+5 >Emitted(53, 33) Source(35, 33) + SourceIndex(2)
+6 >Emitted(53, 36) Source(35, 36) + SourceIndex(2)
+7 >Emitted(53, 45) Source(35, 45) + SourceIndex(2)
+8 >Emitted(53, 46) Source(35, 46) + SourceIndex(2)
 ---
 >>>/**@internal*/ declare const internalConst = 10;
-1 >
+1->
 2 >^^^^^^^^^^^^^^
 3 >              ^
 4 >               ^^^^^^^^
@@ -1077,7 +1078,7 @@ sourceFile:../second/second_part1.ts
 6 >                             ^^^^^^^^^^^^^
 7 >                                          ^^^^^
 8 >                                               ^
-1 >
+1->
   >
 2 >/**@internal*/
 3 >               
@@ -1086,7 +1087,7 @@ sourceFile:../second/second_part1.ts
 6 >                             internalConst
 7 >                                           = 10
 8 >                                               ;
-1 >Emitted(54, 1) Source(36, 1) + SourceIndex(2)
+1->Emitted(54, 1) Source(36, 1) + SourceIndex(2)
 2 >Emitted(54, 15) Source(36, 15) + SourceIndex(2)
 3 >Emitted(54, 16) Source(36, 16) + SourceIndex(2)
 4 >Emitted(54, 24) Source(36, 16) + SourceIndex(2)
@@ -2986,7 +2987,7 @@ sourceFile:../second/second_part2.ts
 >>>//# sourceMappingURL=second-output.js.map
 
 //// [/src/2/second-output.tsbuildinfo]
-{"bundle":{"commonSourceDirectory":"../second","sourceFiles":["../second/second_part1.ts","../second/second_part2.ts"],"js":{"sections":[{"pos":0,"end":110,"kind":"prepend","data":"../first/bin/first-output.js","texts":[{"pos":0,"end":110,"kind":"text"}]},{"pos":110,"end":3545,"kind":"text"}],"mapHash":"73103866863-{\"version\":3,\"file\":\"second-output.js\",\"sourceRoot\":\"\",\"sources\":[\"../first/first_PART1.ts\",\"../first/first_part2.ts\",\"../first/first_part3.ts\",\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"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\"}","hash":"-46276215625-var s = \"Hello, world\";\r\nconsole.log(s);\r\nconsole.log(f());\r\nfunction f() {\r\n    return \"JS does hoists\";\r\n}\r\nvar N;\r\n(function (N) {\r\n    function f() {\r\n        console.log('testing');\r\n    }\r\n    f();\r\n})(N || (N = {}));\r\nvar normalC = /** @class */ (function () {\r\n    /**@internal*/ function normalC() {\r\n    }\r\n    /**@internal*/ normalC.prototype.method = function () { };\r\n    Object.defineProperty(normalC.prototype, \"c\", {\r\n        /**@internal*/ get: function () { return 10; },\r\n        /**@internal*/ set: function (val) { },\r\n        enumerable: false,\r\n        configurable: true\r\n    });\r\n    return normalC;\r\n}());\r\nvar normalN;\r\n(function (normalN) {\r\n    /**@internal*/ var C = /** @class */ (function () {\r\n        function C() {\r\n        }\r\n        return C;\r\n    }());\r\n    normalN.C = C;\r\n    /**@internal*/ function foo() { }\r\n    normalN.foo = foo;\r\n    /**@internal*/ var someNamespace;\r\n    (function (someNamespace) {\r\n        var C = /** @class */ (function () {\r\n            function C() {\r\n            }\r\n            return C;\r\n        }());\r\n        someNamespace.C = C;\r\n    })(someNamespace = normalN.someNamespace || (normalN.someNamespace = {}));\r\n    /**@internal*/ var someOther;\r\n    (function (someOther) {\r\n        var something;\r\n        (function (something) {\r\n            var someClass = /** @class */ (function () {\r\n                function someClass() {\r\n                }\r\n                return someClass;\r\n            }());\r\n            something.someClass = someClass;\r\n        })(something = someOther.something || (someOther.something = {}));\r\n    })(someOther = normalN.someOther || (normalN.someOther = {}));\r\n    /**@internal*/ normalN.someImport = someNamespace.C;\r\n    /**@internal*/ normalN.internalConst = 10;\r\n    /**@internal*/ var internalEnum;\r\n    (function (internalEnum) {\r\n        internalEnum[internalEnum[\"a\"] = 0] = \"a\";\r\n        internalEnum[internalEnum[\"b\"] = 1] = \"b\";\r\n        internalEnum[internalEnum[\"c\"] = 2] = \"c\";\r\n    })(internalEnum = normalN.internalEnum || (normalN.internalEnum = {}));\r\n})(normalN || (normalN = {}));\r\n/**@internal*/ var internalC = /** @class */ (function () {\r\n    function internalC() {\r\n    }\r\n    return internalC;\r\n}());\r\n/**@internal*/ function internalfoo() { }\r\n/**@internal*/ var internalNamespace;\r\n(function (internalNamespace) {\r\n    var someClass = /** @class */ (function () {\r\n        function someClass() {\r\n        }\r\n        return someClass;\r\n    }());\r\n    internalNamespace.someClass = someClass;\r\n})(internalNamespace || (internalNamespace = {}));\r\n/**@internal*/ var internalOther;\r\n(function (internalOther) {\r\n    var something;\r\n    (function (something) {\r\n        var someClass = /** @class */ (function () {\r\n            function someClass() {\r\n            }\r\n            return someClass;\r\n        }());\r\n        something.someClass = someClass;\r\n    })(something = internalOther.something || (internalOther.something = {}));\r\n})(internalOther || (internalOther = {}));\r\n/**@internal*/ var internalImport = internalNamespace.someClass;\r\n/**@internal*/ var internalConst = 10;\r\n/**@internal*/ var internalEnum;\r\n(function (internalEnum) {\r\n    internalEnum[internalEnum[\"a\"] = 0] = \"a\";\r\n    internalEnum[internalEnum[\"b\"] = 1] = \"b\";\r\n    internalEnum[internalEnum[\"c\"] = 2] = \"c\";\r\n})(internalEnum || (internalEnum = {}));\r\nvar C = /** @class */ (function () {\r\n    function C() {\r\n    }\r\n    C.prototype.doSomething = function () {\r\n        console.log(\"something got done\");\r\n    };\r\n    return C;\r\n}());\r\n//# sourceMappingURL=second-output.js.map"},"dts":{"sections":[{"pos":0,"end":172,"kind":"prepend","data":"../first/bin/first-output.d.ts","texts":[{"pos":0,"end":54,"kind":"internal"},{"pos":56,"end":172,"kind":"text"}]},{"pos":172,"end":249,"kind":"text"},{"pos":249,"end":429,"kind":"internal"},{"pos":431,"end":463,"kind":"text"},{"pos":463,"end":975,"kind":"internal"},{"pos":977,"end":980,"kind":"text"},{"pos":980,"end":1513,"kind":"internal"},{"pos":1515,"end":1563,"kind":"text"}],"mapHash":"72637168065-{\"version\":3,\"file\":\"second-output.d.ts\",\"sourceRoot\":\"\",\"sources\":[\"../first/first_PART1.ts\",\"../first/first_part3.ts\",\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"AAAA,cAAc,CAAC,UAAU,QAAQ;IAC7B,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,iBAAiB,CAAC;AAEzB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;IACT,cAAc;IACd,cAAc,CAAC,IAAI,EAAE,MAAM,CAAC;IAC5B,cAAc,CAAC,MAAM;IACrB,cAAc,CAAC,IAAI,CAAC,IACM,MAAM,CADK;IACrC,cAAc,CAAC,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACxC;AACD,kBAAU,OAAO,CAAC;IACd,cAAc,CAAC,MAAa,CAAC;KAAI;IACjC,cAAc,CAAC,SAAgB,GAAG,SAAK;IACvC,cAAc,CAAC,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACnE,cAAc,CAAC,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IACjF,cAAc,CAAC,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC1D,cAAc,CAAC,KAAY,YAAY,GAAG,SAAS,CAAC;IACpD,cAAc,CAAQ,MAAM,aAAa,KAAK,CAAC;IAC/C,cAAc,CAAC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACtD;AACD,cAAc,CAAC,cAAM,SAAS;CAAG;AACjC,cAAc,CAAC,iBAAS,WAAW,SAAK;AACxC,cAAc,CAAC,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACxE,cAAc,CAAC,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC9E,cAAc,CAAC,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACnE,cAAc,CAAC,aAAK,YAAY,GAAG,SAAS,CAAC;AAC7C,cAAc,CAAC,QAAA,MAAM,aAAa,KAAK,CAAC;AACxC,cAAc,CAAC,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC5C,cAAM,CAAC;IACH,WAAW;CAGd\"}","hash":"28495717979-/**@internal*/ interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hello, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    /**@internal*/ constructor();\r\n    /**@internal*/ prop: string;\r\n    /**@internal*/ method(): void;\r\n    /**@internal*/ get c(): number;\r\n    /**@internal*/ set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    /**@internal*/ class C {\r\n    }\r\n    /**@internal*/ function foo(): void;\r\n    /**@internal*/ namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    /**@internal*/ namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    /**@internal*/ export import someImport = someNamespace.C;\r\n    /**@internal*/ type internalType = internalC;\r\n    /**@internal*/ const internalConst = 10;\r\n    /**@internal*/ enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\n/**@internal*/ declare class internalC {\r\n}\r\n/**@internal*/ declare function internalfoo(): void;\r\n/**@internal*/ declare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\n/**@internal*/ declare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\n/**@internal*/ import internalImport = internalNamespace.someClass;\r\n/**@internal*/ declare type internalType = internalC;\r\n/**@internal*/ declare const internalConst = 10;\r\n/**@internal*/ declare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n//# sourceMappingURL=second-output.d.ts.map"}},"program":{"fileNames":["../second/second_part1.ts","../second/second_part2.ts"],"fileInfos":["5541258877-namespace N {\r\n    // Comment text\r\n}\r\n\r\nnamespace N {\r\n    function f() {\r\n        console.log('testing');\r\n    }\r\n\r\n    f();\r\n}\r\n\nclass normalC {\n    /**@internal*/ constructor() { }\n    /**@internal*/ prop: string;\n    /**@internal*/ method() { }\n    /**@internal*/ get c() { return 10; }\n    /**@internal*/ set c(val: number) { }\n}\nnamespace normalN {\n    /**@internal*/ export class C { }\n    /**@internal*/ export function foo() {}\n    /**@internal*/ export namespace someNamespace { export class C {} }\n    /**@internal*/ export namespace someOther.something { export class someClass {} }\n    /**@internal*/ export import someImport = someNamespace.C;\n    /**@internal*/ export type internalType = internalC;\n    /**@internal*/ export const internalConst = 10;\n    /**@internal*/ export enum internalEnum { a, b, c }\n}\n/**@internal*/ class internalC {}\n/**@internal*/ function internalfoo() {}\n/**@internal*/ namespace internalNamespace { export class someClass {} }\n/**@internal*/ namespace internalOther.something { export class someClass {} }\n/**@internal*/ import internalImport = internalNamespace.someClass;\n/**@internal*/ type internalType = internalC;\n/**@internal*/ const internalConst = 10;\n/**@internal*/ enum internalEnum { a, b, c }","9339262372-class C {\r\n    doSomething() {\r\n        console.log(\"something got done\");\r\n    }\r\n}\r\n"],"options":{"composite":true,"outFile":"./second-output.js"},"outSignature":"31678065536-/**@internal*/ interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hello, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    /**@internal*/ constructor();\r\n    /**@internal*/ prop: string;\r\n    /**@internal*/ method(): void;\r\n    /**@internal*/ get c(): number;\r\n    /**@internal*/ set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    /**@internal*/ class C {\r\n    }\r\n    /**@internal*/ function foo(): void;\r\n    /**@internal*/ namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    /**@internal*/ namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    /**@internal*/ export import someImport = someNamespace.C;\r\n    /**@internal*/ type internalType = internalC;\r\n    /**@internal*/ const internalConst = 10;\r\n    /**@internal*/ enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\n/**@internal*/ declare class internalC {\r\n}\r\n/**@internal*/ declare function internalfoo(): void;\r\n/**@internal*/ declare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\n/**@internal*/ declare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\n/**@internal*/ import internalImport = internalNamespace.someClass;\r\n/**@internal*/ declare type internalType = internalC;\r\n/**@internal*/ declare const internalConst = 10;\r\n/**@internal*/ declare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n","latestChangedDtsFile":"./second-output.d.ts"},"version":"FakeTSVersion"}
+{"bundle":{"commonSourceDirectory":"../second","sourceFiles":["../second/second_part1.ts","../second/second_part2.ts"],"js":{"sections":[{"pos":0,"end":110,"kind":"prepend","data":"../first/bin/first-output.js","texts":[{"pos":0,"end":110,"kind":"text"}]},{"pos":110,"end":3545,"kind":"text"}],"mapHash":"73103866863-{\"version\":3,\"file\":\"second-output.js\",\"sourceRoot\":\"\",\"sources\":[\"../first/first_PART1.ts\",\"../first/first_part2.ts\",\"../first/first_part3.ts\",\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"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\"}","hash":"-46276215625-var s = \"Hello, world\";\r\nconsole.log(s);\r\nconsole.log(f());\r\nfunction f() {\r\n    return \"JS does hoists\";\r\n}\r\nvar N;\r\n(function (N) {\r\n    function f() {\r\n        console.log('testing');\r\n    }\r\n    f();\r\n})(N || (N = {}));\r\nvar normalC = /** @class */ (function () {\r\n    /**@internal*/ function normalC() {\r\n    }\r\n    /**@internal*/ normalC.prototype.method = function () { };\r\n    Object.defineProperty(normalC.prototype, \"c\", {\r\n        /**@internal*/ get: function () { return 10; },\r\n        /**@internal*/ set: function (val) { },\r\n        enumerable: false,\r\n        configurable: true\r\n    });\r\n    return normalC;\r\n}());\r\nvar normalN;\r\n(function (normalN) {\r\n    /**@internal*/ var C = /** @class */ (function () {\r\n        function C() {\r\n        }\r\n        return C;\r\n    }());\r\n    normalN.C = C;\r\n    /**@internal*/ function foo() { }\r\n    normalN.foo = foo;\r\n    /**@internal*/ var someNamespace;\r\n    (function (someNamespace) {\r\n        var C = /** @class */ (function () {\r\n            function C() {\r\n            }\r\n            return C;\r\n        }());\r\n        someNamespace.C = C;\r\n    })(someNamespace = normalN.someNamespace || (normalN.someNamespace = {}));\r\n    /**@internal*/ var someOther;\r\n    (function (someOther) {\r\n        var something;\r\n        (function (something) {\r\n            var someClass = /** @class */ (function () {\r\n                function someClass() {\r\n                }\r\n                return someClass;\r\n            }());\r\n            something.someClass = someClass;\r\n        })(something = someOther.something || (someOther.something = {}));\r\n    })(someOther = normalN.someOther || (normalN.someOther = {}));\r\n    /**@internal*/ normalN.someImport = someNamespace.C;\r\n    /**@internal*/ normalN.internalConst = 10;\r\n    /**@internal*/ var internalEnum;\r\n    (function (internalEnum) {\r\n        internalEnum[internalEnum[\"a\"] = 0] = \"a\";\r\n        internalEnum[internalEnum[\"b\"] = 1] = \"b\";\r\n        internalEnum[internalEnum[\"c\"] = 2] = \"c\";\r\n    })(internalEnum = normalN.internalEnum || (normalN.internalEnum = {}));\r\n})(normalN || (normalN = {}));\r\n/**@internal*/ var internalC = /** @class */ (function () {\r\n    function internalC() {\r\n    }\r\n    return internalC;\r\n}());\r\n/**@internal*/ function internalfoo() { }\r\n/**@internal*/ var internalNamespace;\r\n(function (internalNamespace) {\r\n    var someClass = /** @class */ (function () {\r\n        function someClass() {\r\n        }\r\n        return someClass;\r\n    }());\r\n    internalNamespace.someClass = someClass;\r\n})(internalNamespace || (internalNamespace = {}));\r\n/**@internal*/ var internalOther;\r\n(function (internalOther) {\r\n    var something;\r\n    (function (something) {\r\n        var someClass = /** @class */ (function () {\r\n            function someClass() {\r\n            }\r\n            return someClass;\r\n        }());\r\n        something.someClass = someClass;\r\n    })(something = internalOther.something || (internalOther.something = {}));\r\n})(internalOther || (internalOther = {}));\r\n/**@internal*/ var internalImport = internalNamespace.someClass;\r\n/**@internal*/ var internalConst = 10;\r\n/**@internal*/ var internalEnum;\r\n(function (internalEnum) {\r\n    internalEnum[internalEnum[\"a\"] = 0] = \"a\";\r\n    internalEnum[internalEnum[\"b\"] = 1] = \"b\";\r\n    internalEnum[internalEnum[\"c\"] = 2] = \"c\";\r\n})(internalEnum || (internalEnum = {}));\r\nvar C = /** @class */ (function () {\r\n    function C() {\r\n    }\r\n    C.prototype.doSomething = function () {\r\n        console.log(\"something got done\");\r\n    };\r\n    return C;\r\n}());\r\n//# sourceMappingURL=second-output.js.map"},"dts":{"sections":[{"pos":0,"end":172,"kind":"prepend","data":"../first/bin/first-output.d.ts","texts":[{"pos":0,"end":54,"kind":"internal"},{"pos":56,"end":172,"kind":"text"}]},{"pos":172,"end":249,"kind":"text"},{"pos":249,"end":429,"kind":"internal"},{"pos":431,"end":463,"kind":"text"},{"pos":463,"end":975,"kind":"internal"},{"pos":977,"end":980,"kind":"text"},{"pos":980,"end":1505,"kind":"internal"},{"pos":1507,"end":1555,"kind":"text"}],"mapHash":"62262842155-{\"version\":3,\"file\":\"second-output.d.ts\",\"sourceRoot\":\"\",\"sources\":[\"../first/first_PART1.ts\",\"../first/first_part3.ts\",\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"AAAA,cAAc,CAAC,UAAU,QAAQ;IAC7B,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,iBAAiB,CAAC;AAEzB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;IACT,cAAc;IACd,cAAc,CAAC,IAAI,EAAE,MAAM,CAAC;IAC5B,cAAc,CAAC,MAAM;IACrB,cAAc,CAAC,IAAI,CAAC,IACM,MAAM,CADK;IACrC,cAAc,CAAC,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACxC;AACD,kBAAU,OAAO,CAAC;IACd,cAAc,CAAC,MAAa,CAAC;KAAI;IACjC,cAAc,CAAC,SAAgB,GAAG,SAAK;IACvC,cAAc,CAAC,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACnE,cAAc,CAAC,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IACjF,cAAc,CAAC,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC1D,cAAc,CAAC,KAAY,YAAY,GAAG,SAAS,CAAC;IACpD,cAAc,CAAQ,MAAM,aAAa,KAAK,CAAC;IAC/C,cAAc,CAAC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACtD;AACD,cAAc,CAAC,cAAM,SAAS;CAAG;AACjC,cAAc,CAAC,iBAAS,WAAW,SAAK;AACxC,cAAc,CAAC,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACxE,cAAc,CAAC,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC9E,cAAc,CAAC,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACnE,cAAc,CAAC,KAAK,YAAY,GAAG,SAAS,CAAC;AAC7C,cAAc,CAAC,QAAA,MAAM,aAAa,KAAK,CAAC;AACxC,cAAc,CAAC,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC5C,cAAM,CAAC;IACH,WAAW;CAGd\"}","hash":"63279926987-/**@internal*/ interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hello, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    /**@internal*/ constructor();\r\n    /**@internal*/ prop: string;\r\n    /**@internal*/ method(): void;\r\n    /**@internal*/ get c(): number;\r\n    /**@internal*/ set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    /**@internal*/ class C {\r\n    }\r\n    /**@internal*/ function foo(): void;\r\n    /**@internal*/ namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    /**@internal*/ namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    /**@internal*/ export import someImport = someNamespace.C;\r\n    /**@internal*/ type internalType = internalC;\r\n    /**@internal*/ const internalConst = 10;\r\n    /**@internal*/ enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\n/**@internal*/ declare class internalC {\r\n}\r\n/**@internal*/ declare function internalfoo(): void;\r\n/**@internal*/ declare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\n/**@internal*/ declare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\n/**@internal*/ import internalImport = internalNamespace.someClass;\r\n/**@internal*/ type internalType = internalC;\r\n/**@internal*/ declare const internalConst = 10;\r\n/**@internal*/ declare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n//# sourceMappingURL=second-output.d.ts.map"}},"program":{"fileNames":["../second/second_part1.ts","../second/second_part2.ts"],"fileInfos":["5541258877-namespace N {\r\n    // Comment text\r\n}\r\n\r\nnamespace N {\r\n    function f() {\r\n        console.log('testing');\r\n    }\r\n\r\n    f();\r\n}\r\n\nclass normalC {\n    /**@internal*/ constructor() { }\n    /**@internal*/ prop: string;\n    /**@internal*/ method() { }\n    /**@internal*/ get c() { return 10; }\n    /**@internal*/ set c(val: number) { }\n}\nnamespace normalN {\n    /**@internal*/ export class C { }\n    /**@internal*/ export function foo() {}\n    /**@internal*/ export namespace someNamespace { export class C {} }\n    /**@internal*/ export namespace someOther.something { export class someClass {} }\n    /**@internal*/ export import someImport = someNamespace.C;\n    /**@internal*/ export type internalType = internalC;\n    /**@internal*/ export const internalConst = 10;\n    /**@internal*/ export enum internalEnum { a, b, c }\n}\n/**@internal*/ class internalC {}\n/**@internal*/ function internalfoo() {}\n/**@internal*/ namespace internalNamespace { export class someClass {} }\n/**@internal*/ namespace internalOther.something { export class someClass {} }\n/**@internal*/ import internalImport = internalNamespace.someClass;\n/**@internal*/ type internalType = internalC;\n/**@internal*/ const internalConst = 10;\n/**@internal*/ enum internalEnum { a, b, c }","9339262372-class C {\r\n    doSomething() {\r\n        console.log(\"something got done\");\r\n    }\r\n}\r\n"],"options":{"composite":true,"outFile":"./second-output.js"},"outSignature":"57021299184-/**@internal*/ interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hello, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    /**@internal*/ constructor();\r\n    /**@internal*/ prop: string;\r\n    /**@internal*/ method(): void;\r\n    /**@internal*/ get c(): number;\r\n    /**@internal*/ set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    /**@internal*/ class C {\r\n    }\r\n    /**@internal*/ function foo(): void;\r\n    /**@internal*/ namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    /**@internal*/ namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    /**@internal*/ export import someImport = someNamespace.C;\r\n    /**@internal*/ type internalType = internalC;\r\n    /**@internal*/ const internalConst = 10;\r\n    /**@internal*/ enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\n/**@internal*/ declare class internalC {\r\n}\r\n/**@internal*/ declare function internalfoo(): void;\r\n/**@internal*/ declare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\n/**@internal*/ declare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\n/**@internal*/ import internalImport = internalNamespace.someClass;\r\n/**@internal*/ type internalType = internalC;\r\n/**@internal*/ declare const internalConst = 10;\r\n/**@internal*/ declare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n","latestChangedDtsFile":"./second-output.d.ts"},"version":"FakeTSVersion"}
 
 //// [/src/2/second-output.tsbuildinfo.baseline.txt]
 ======================================================================
@@ -3171,7 +3172,7 @@ text: (977-980)
 }
 
 ----------------------------------------------------------------------
-internal: (980-1513)
+internal: (980-1505)
 /**@internal*/ declare class internalC {
 }
 /**@internal*/ declare function internalfoo(): void;
@@ -3184,7 +3185,7 @@ internal: (980-1513)
     }
 }
 /**@internal*/ import internalImport = internalNamespace.someClass;
-/**@internal*/ declare type internalType = internalC;
+/**@internal*/ type internalType = internalC;
 /**@internal*/ declare const internalConst = 10;
 /**@internal*/ declare enum internalEnum {
     a = 0,
@@ -3192,7 +3193,7 @@ internal: (980-1513)
     c = 2
 }
 ----------------------------------------------------------------------
-text: (1515-1563)
+text: (1507-1555)
 declare class C {
     doSomething(): void;
 }
@@ -3278,17 +3279,17 @@ declare class C {
         },
         {
           "pos": 980,
-          "end": 1513,
+          "end": 1505,
           "kind": "internal"
         },
         {
-          "pos": 1515,
-          "end": 1563,
+          "pos": 1507,
+          "end": 1555,
           "kind": "text"
         }
       ],
-      "hash": "28495717979-/**@internal*/ interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hello, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    /**@internal*/ constructor();\r\n    /**@internal*/ prop: string;\r\n    /**@internal*/ method(): void;\r\n    /**@internal*/ get c(): number;\r\n    /**@internal*/ set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    /**@internal*/ class C {\r\n    }\r\n    /**@internal*/ function foo(): void;\r\n    /**@internal*/ namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    /**@internal*/ namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    /**@internal*/ export import someImport = someNamespace.C;\r\n    /**@internal*/ type internalType = internalC;\r\n    /**@internal*/ const internalConst = 10;\r\n    /**@internal*/ enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\n/**@internal*/ declare class internalC {\r\n}\r\n/**@internal*/ declare function internalfoo(): void;\r\n/**@internal*/ declare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\n/**@internal*/ declare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\n/**@internal*/ import internalImport = internalNamespace.someClass;\r\n/**@internal*/ declare type internalType = internalC;\r\n/**@internal*/ declare const internalConst = 10;\r\n/**@internal*/ declare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n//# sourceMappingURL=second-output.d.ts.map",
-      "mapHash": "72637168065-{\"version\":3,\"file\":\"second-output.d.ts\",\"sourceRoot\":\"\",\"sources\":[\"../first/first_PART1.ts\",\"../first/first_part3.ts\",\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"AAAA,cAAc,CAAC,UAAU,QAAQ;IAC7B,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,iBAAiB,CAAC;AAEzB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;IACT,cAAc;IACd,cAAc,CAAC,IAAI,EAAE,MAAM,CAAC;IAC5B,cAAc,CAAC,MAAM;IACrB,cAAc,CAAC,IAAI,CAAC,IACM,MAAM,CADK;IACrC,cAAc,CAAC,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACxC;AACD,kBAAU,OAAO,CAAC;IACd,cAAc,CAAC,MAAa,CAAC;KAAI;IACjC,cAAc,CAAC,SAAgB,GAAG,SAAK;IACvC,cAAc,CAAC,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACnE,cAAc,CAAC,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IACjF,cAAc,CAAC,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC1D,cAAc,CAAC,KAAY,YAAY,GAAG,SAAS,CAAC;IACpD,cAAc,CAAQ,MAAM,aAAa,KAAK,CAAC;IAC/C,cAAc,CAAC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACtD;AACD,cAAc,CAAC,cAAM,SAAS;CAAG;AACjC,cAAc,CAAC,iBAAS,WAAW,SAAK;AACxC,cAAc,CAAC,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACxE,cAAc,CAAC,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC9E,cAAc,CAAC,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACnE,cAAc,CAAC,aAAK,YAAY,GAAG,SAAS,CAAC;AAC7C,cAAc,CAAC,QAAA,MAAM,aAAa,KAAK,CAAC;AACxC,cAAc,CAAC,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC5C,cAAM,CAAC;IACH,WAAW;CAGd\"}"
+      "hash": "63279926987-/**@internal*/ interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hello, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    /**@internal*/ constructor();\r\n    /**@internal*/ prop: string;\r\n    /**@internal*/ method(): void;\r\n    /**@internal*/ get c(): number;\r\n    /**@internal*/ set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    /**@internal*/ class C {\r\n    }\r\n    /**@internal*/ function foo(): void;\r\n    /**@internal*/ namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    /**@internal*/ namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    /**@internal*/ export import someImport = someNamespace.C;\r\n    /**@internal*/ type internalType = internalC;\r\n    /**@internal*/ const internalConst = 10;\r\n    /**@internal*/ enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\n/**@internal*/ declare class internalC {\r\n}\r\n/**@internal*/ declare function internalfoo(): void;\r\n/**@internal*/ declare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\n/**@internal*/ declare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\n/**@internal*/ import internalImport = internalNamespace.someClass;\r\n/**@internal*/ type internalType = internalC;\r\n/**@internal*/ declare const internalConst = 10;\r\n/**@internal*/ declare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n//# sourceMappingURL=second-output.d.ts.map",
+      "mapHash": "62262842155-{\"version\":3,\"file\":\"second-output.d.ts\",\"sourceRoot\":\"\",\"sources\":[\"../first/first_PART1.ts\",\"../first/first_part3.ts\",\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"AAAA,cAAc,CAAC,UAAU,QAAQ;IAC7B,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,iBAAiB,CAAC;AAEzB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;IACT,cAAc;IACd,cAAc,CAAC,IAAI,EAAE,MAAM,CAAC;IAC5B,cAAc,CAAC,MAAM;IACrB,cAAc,CAAC,IAAI,CAAC,IACM,MAAM,CADK;IACrC,cAAc,CAAC,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACxC;AACD,kBAAU,OAAO,CAAC;IACd,cAAc,CAAC,MAAa,CAAC;KAAI;IACjC,cAAc,CAAC,SAAgB,GAAG,SAAK;IACvC,cAAc,CAAC,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACnE,cAAc,CAAC,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IACjF,cAAc,CAAC,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC1D,cAAc,CAAC,KAAY,YAAY,GAAG,SAAS,CAAC;IACpD,cAAc,CAAQ,MAAM,aAAa,KAAK,CAAC;IAC/C,cAAc,CAAC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACtD;AACD,cAAc,CAAC,cAAM,SAAS;CAAG;AACjC,cAAc,CAAC,iBAAS,WAAW,SAAK;AACxC,cAAc,CAAC,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACxE,cAAc,CAAC,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC9E,cAAc,CAAC,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACnE,cAAc,CAAC,KAAK,YAAY,GAAG,SAAS,CAAC;AAC7C,cAAc,CAAC,QAAA,MAAM,aAAa,KAAK,CAAC;AACxC,cAAc,CAAC,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC5C,cAAM,CAAC;IACH,WAAW;CAGd\"}"
     }
   },
   "program": {
@@ -3304,11 +3305,11 @@ declare class C {
       "composite": true,
       "outFile": "./second-output.js"
     },
-    "outSignature": "31678065536-/**@internal*/ interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hello, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    /**@internal*/ constructor();\r\n    /**@internal*/ prop: string;\r\n    /**@internal*/ method(): void;\r\n    /**@internal*/ get c(): number;\r\n    /**@internal*/ set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    /**@internal*/ class C {\r\n    }\r\n    /**@internal*/ function foo(): void;\r\n    /**@internal*/ namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    /**@internal*/ namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    /**@internal*/ export import someImport = someNamespace.C;\r\n    /**@internal*/ type internalType = internalC;\r\n    /**@internal*/ const internalConst = 10;\r\n    /**@internal*/ enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\n/**@internal*/ declare class internalC {\r\n}\r\n/**@internal*/ declare function internalfoo(): void;\r\n/**@internal*/ declare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\n/**@internal*/ declare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\n/**@internal*/ import internalImport = internalNamespace.someClass;\r\n/**@internal*/ declare type internalType = internalC;\r\n/**@internal*/ declare const internalConst = 10;\r\n/**@internal*/ declare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n",
+    "outSignature": "57021299184-/**@internal*/ interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hello, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    /**@internal*/ constructor();\r\n    /**@internal*/ prop: string;\r\n    /**@internal*/ method(): void;\r\n    /**@internal*/ get c(): number;\r\n    /**@internal*/ set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    /**@internal*/ class C {\r\n    }\r\n    /**@internal*/ function foo(): void;\r\n    /**@internal*/ namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    /**@internal*/ namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    /**@internal*/ export import someImport = someNamespace.C;\r\n    /**@internal*/ type internalType = internalC;\r\n    /**@internal*/ const internalConst = 10;\r\n    /**@internal*/ enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\n/**@internal*/ declare class internalC {\r\n}\r\n/**@internal*/ declare function internalfoo(): void;\r\n/**@internal*/ declare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\n/**@internal*/ declare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\n/**@internal*/ import internalImport = internalNamespace.someClass;\r\n/**@internal*/ type internalType = internalC;\r\n/**@internal*/ declare const internalConst = 10;\r\n/**@internal*/ declare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n",
     "latestChangedDtsFile": "./second-output.d.ts"
   },
   "version": "FakeTSVersion",
-  "size": 13747
+  "size": 13731
 }
 
 //// [/src/first/bin/first-output.d.ts]
@@ -7940,7 +7941,7 @@ sourceFile:../second/second_part2.ts
 >>>//# sourceMappingURL=second-output.js.map
 
 //// [/src/2/second-output.tsbuildinfo]
-{"bundle":{"commonSourceDirectory":"../second","sourceFiles":["../second/second_part1.ts","../second/second_part2.ts"],"js":{"sections":[{"pos":0,"end":127,"kind":"prepend","data":"../first/bin/first-output.js","texts":[{"pos":0,"end":127,"kind":"text"}]},{"pos":127,"end":3562,"kind":"text"}],"mapHash":"-92108137693-{\"version\":3,\"file\":\"second-output.js\",\"sourceRoot\":\"\",\"sources\":[\"../first/first_PART1.ts\",\"../first/first_part2.ts\",\"../first/first_part3.ts\",\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"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\"}","hash":"52101774576-var s = \"Hello, world\";\r\nconsole.log(s);\r\nconsole.log(s);\r\nconsole.log(f());\r\nfunction f() {\r\n    return \"JS does hoists\";\r\n}\r\nvar N;\r\n(function (N) {\r\n    function f() {\r\n        console.log('testing');\r\n    }\r\n    f();\r\n})(N || (N = {}));\r\nvar normalC = /** @class */ (function () {\r\n    /**@internal*/ function normalC() {\r\n    }\r\n    /**@internal*/ normalC.prototype.method = function () { };\r\n    Object.defineProperty(normalC.prototype, \"c\", {\r\n        /**@internal*/ get: function () { return 10; },\r\n        /**@internal*/ set: function (val) { },\r\n        enumerable: false,\r\n        configurable: true\r\n    });\r\n    return normalC;\r\n}());\r\nvar normalN;\r\n(function (normalN) {\r\n    /**@internal*/ var C = /** @class */ (function () {\r\n        function C() {\r\n        }\r\n        return C;\r\n    }());\r\n    normalN.C = C;\r\n    /**@internal*/ function foo() { }\r\n    normalN.foo = foo;\r\n    /**@internal*/ var someNamespace;\r\n    (function (someNamespace) {\r\n        var C = /** @class */ (function () {\r\n            function C() {\r\n            }\r\n            return C;\r\n        }());\r\n        someNamespace.C = C;\r\n    })(someNamespace = normalN.someNamespace || (normalN.someNamespace = {}));\r\n    /**@internal*/ var someOther;\r\n    (function (someOther) {\r\n        var something;\r\n        (function (something) {\r\n            var someClass = /** @class */ (function () {\r\n                function someClass() {\r\n                }\r\n                return someClass;\r\n            }());\r\n            something.someClass = someClass;\r\n        })(something = someOther.something || (someOther.something = {}));\r\n    })(someOther = normalN.someOther || (normalN.someOther = {}));\r\n    /**@internal*/ normalN.someImport = someNamespace.C;\r\n    /**@internal*/ normalN.internalConst = 10;\r\n    /**@internal*/ var internalEnum;\r\n    (function (internalEnum) {\r\n        internalEnum[internalEnum[\"a\"] = 0] = \"a\";\r\n        internalEnum[internalEnum[\"b\"] = 1] = \"b\";\r\n        internalEnum[internalEnum[\"c\"] = 2] = \"c\";\r\n    })(internalEnum = normalN.internalEnum || (normalN.internalEnum = {}));\r\n})(normalN || (normalN = {}));\r\n/**@internal*/ var internalC = /** @class */ (function () {\r\n    function internalC() {\r\n    }\r\n    return internalC;\r\n}());\r\n/**@internal*/ function internalfoo() { }\r\n/**@internal*/ var internalNamespace;\r\n(function (internalNamespace) {\r\n    var someClass = /** @class */ (function () {\r\n        function someClass() {\r\n        }\r\n        return someClass;\r\n    }());\r\n    internalNamespace.someClass = someClass;\r\n})(internalNamespace || (internalNamespace = {}));\r\n/**@internal*/ var internalOther;\r\n(function (internalOther) {\r\n    var something;\r\n    (function (something) {\r\n        var someClass = /** @class */ (function () {\r\n            function someClass() {\r\n            }\r\n            return someClass;\r\n        }());\r\n        something.someClass = someClass;\r\n    })(something = internalOther.something || (internalOther.something = {}));\r\n})(internalOther || (internalOther = {}));\r\n/**@internal*/ var internalImport = internalNamespace.someClass;\r\n/**@internal*/ var internalConst = 10;\r\n/**@internal*/ var internalEnum;\r\n(function (internalEnum) {\r\n    internalEnum[internalEnum[\"a\"] = 0] = \"a\";\r\n    internalEnum[internalEnum[\"b\"] = 1] = \"b\";\r\n    internalEnum[internalEnum[\"c\"] = 2] = \"c\";\r\n})(internalEnum || (internalEnum = {}));\r\nvar C = /** @class */ (function () {\r\n    function C() {\r\n    }\r\n    C.prototype.doSomething = function () {\r\n        console.log(\"something got done\");\r\n    };\r\n    return C;\r\n}());\r\n//# sourceMappingURL=second-output.js.map"},"dts":{"sections":[{"pos":0,"end":172,"kind":"prepend","data":"../first/bin/first-output.d.ts","texts":[{"pos":0,"end":54,"kind":"internal"},{"pos":56,"end":172,"kind":"text"}]},{"pos":172,"end":249,"kind":"text"},{"pos":249,"end":429,"kind":"internal"},{"pos":431,"end":463,"kind":"text"},{"pos":463,"end":975,"kind":"internal"},{"pos":977,"end":980,"kind":"text"},{"pos":980,"end":1513,"kind":"internal"},{"pos":1515,"end":1563,"kind":"text"}],"mapHash":"72637168065-{\"version\":3,\"file\":\"second-output.d.ts\",\"sourceRoot\":\"\",\"sources\":[\"../first/first_PART1.ts\",\"../first/first_part3.ts\",\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"AAAA,cAAc,CAAC,UAAU,QAAQ;IAC7B,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,iBAAiB,CAAC;AAEzB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;IACT,cAAc;IACd,cAAc,CAAC,IAAI,EAAE,MAAM,CAAC;IAC5B,cAAc,CAAC,MAAM;IACrB,cAAc,CAAC,IAAI,CAAC,IACM,MAAM,CADK;IACrC,cAAc,CAAC,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACxC;AACD,kBAAU,OAAO,CAAC;IACd,cAAc,CAAC,MAAa,CAAC;KAAI;IACjC,cAAc,CAAC,SAAgB,GAAG,SAAK;IACvC,cAAc,CAAC,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACnE,cAAc,CAAC,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IACjF,cAAc,CAAC,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC1D,cAAc,CAAC,KAAY,YAAY,GAAG,SAAS,CAAC;IACpD,cAAc,CAAQ,MAAM,aAAa,KAAK,CAAC;IAC/C,cAAc,CAAC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACtD;AACD,cAAc,CAAC,cAAM,SAAS;CAAG;AACjC,cAAc,CAAC,iBAAS,WAAW,SAAK;AACxC,cAAc,CAAC,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACxE,cAAc,CAAC,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC9E,cAAc,CAAC,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACnE,cAAc,CAAC,aAAK,YAAY,GAAG,SAAS,CAAC;AAC7C,cAAc,CAAC,QAAA,MAAM,aAAa,KAAK,CAAC;AACxC,cAAc,CAAC,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC5C,cAAM,CAAC;IACH,WAAW;CAGd\"}","hash":"28495717979-/**@internal*/ interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hello, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    /**@internal*/ constructor();\r\n    /**@internal*/ prop: string;\r\n    /**@internal*/ method(): void;\r\n    /**@internal*/ get c(): number;\r\n    /**@internal*/ set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    /**@internal*/ class C {\r\n    }\r\n    /**@internal*/ function foo(): void;\r\n    /**@internal*/ namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    /**@internal*/ namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    /**@internal*/ export import someImport = someNamespace.C;\r\n    /**@internal*/ type internalType = internalC;\r\n    /**@internal*/ const internalConst = 10;\r\n    /**@internal*/ enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\n/**@internal*/ declare class internalC {\r\n}\r\n/**@internal*/ declare function internalfoo(): void;\r\n/**@internal*/ declare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\n/**@internal*/ declare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\n/**@internal*/ import internalImport = internalNamespace.someClass;\r\n/**@internal*/ declare type internalType = internalC;\r\n/**@internal*/ declare const internalConst = 10;\r\n/**@internal*/ declare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n//# sourceMappingURL=second-output.d.ts.map"}},"program":{"fileNames":["../second/second_part1.ts","../second/second_part2.ts"],"fileInfos":["5541258877-namespace N {\r\n    // Comment text\r\n}\r\n\r\nnamespace N {\r\n    function f() {\r\n        console.log('testing');\r\n    }\r\n\r\n    f();\r\n}\r\n\nclass normalC {\n    /**@internal*/ constructor() { }\n    /**@internal*/ prop: string;\n    /**@internal*/ method() { }\n    /**@internal*/ get c() { return 10; }\n    /**@internal*/ set c(val: number) { }\n}\nnamespace normalN {\n    /**@internal*/ export class C { }\n    /**@internal*/ export function foo() {}\n    /**@internal*/ export namespace someNamespace { export class C {} }\n    /**@internal*/ export namespace someOther.something { export class someClass {} }\n    /**@internal*/ export import someImport = someNamespace.C;\n    /**@internal*/ export type internalType = internalC;\n    /**@internal*/ export const internalConst = 10;\n    /**@internal*/ export enum internalEnum { a, b, c }\n}\n/**@internal*/ class internalC {}\n/**@internal*/ function internalfoo() {}\n/**@internal*/ namespace internalNamespace { export class someClass {} }\n/**@internal*/ namespace internalOther.something { export class someClass {} }\n/**@internal*/ import internalImport = internalNamespace.someClass;\n/**@internal*/ type internalType = internalC;\n/**@internal*/ const internalConst = 10;\n/**@internal*/ enum internalEnum { a, b, c }","9339262372-class C {\r\n    doSomething() {\r\n        console.log(\"something got done\");\r\n    }\r\n}\r\n"],"options":{"composite":true,"outFile":"./second-output.js"},"outSignature":"31678065536-/**@internal*/ interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hello, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    /**@internal*/ constructor();\r\n    /**@internal*/ prop: string;\r\n    /**@internal*/ method(): void;\r\n    /**@internal*/ get c(): number;\r\n    /**@internal*/ set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    /**@internal*/ class C {\r\n    }\r\n    /**@internal*/ function foo(): void;\r\n    /**@internal*/ namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    /**@internal*/ namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    /**@internal*/ export import someImport = someNamespace.C;\r\n    /**@internal*/ type internalType = internalC;\r\n    /**@internal*/ const internalConst = 10;\r\n    /**@internal*/ enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\n/**@internal*/ declare class internalC {\r\n}\r\n/**@internal*/ declare function internalfoo(): void;\r\n/**@internal*/ declare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\n/**@internal*/ declare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\n/**@internal*/ import internalImport = internalNamespace.someClass;\r\n/**@internal*/ declare type internalType = internalC;\r\n/**@internal*/ declare const internalConst = 10;\r\n/**@internal*/ declare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n","latestChangedDtsFile":"./second-output.d.ts"},"version":"FakeTSVersion"}
+{"bundle":{"commonSourceDirectory":"../second","sourceFiles":["../second/second_part1.ts","../second/second_part2.ts"],"js":{"sections":[{"pos":0,"end":127,"kind":"prepend","data":"../first/bin/first-output.js","texts":[{"pos":0,"end":127,"kind":"text"}]},{"pos":127,"end":3562,"kind":"text"}],"mapHash":"-92108137693-{\"version\":3,\"file\":\"second-output.js\",\"sourceRoot\":\"\",\"sources\":[\"../first/first_PART1.ts\",\"../first/first_part2.ts\",\"../first/first_part3.ts\",\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"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\"}","hash":"52101774576-var s = \"Hello, world\";\r\nconsole.log(s);\r\nconsole.log(s);\r\nconsole.log(f());\r\nfunction f() {\r\n    return \"JS does hoists\";\r\n}\r\nvar N;\r\n(function (N) {\r\n    function f() {\r\n        console.log('testing');\r\n    }\r\n    f();\r\n})(N || (N = {}));\r\nvar normalC = /** @class */ (function () {\r\n    /**@internal*/ function normalC() {\r\n    }\r\n    /**@internal*/ normalC.prototype.method = function () { };\r\n    Object.defineProperty(normalC.prototype, \"c\", {\r\n        /**@internal*/ get: function () { return 10; },\r\n        /**@internal*/ set: function (val) { },\r\n        enumerable: false,\r\n        configurable: true\r\n    });\r\n    return normalC;\r\n}());\r\nvar normalN;\r\n(function (normalN) {\r\n    /**@internal*/ var C = /** @class */ (function () {\r\n        function C() {\r\n        }\r\n        return C;\r\n    }());\r\n    normalN.C = C;\r\n    /**@internal*/ function foo() { }\r\n    normalN.foo = foo;\r\n    /**@internal*/ var someNamespace;\r\n    (function (someNamespace) {\r\n        var C = /** @class */ (function () {\r\n            function C() {\r\n            }\r\n            return C;\r\n        }());\r\n        someNamespace.C = C;\r\n    })(someNamespace = normalN.someNamespace || (normalN.someNamespace = {}));\r\n    /**@internal*/ var someOther;\r\n    (function (someOther) {\r\n        var something;\r\n        (function (something) {\r\n            var someClass = /** @class */ (function () {\r\n                function someClass() {\r\n                }\r\n                return someClass;\r\n            }());\r\n            something.someClass = someClass;\r\n        })(something = someOther.something || (someOther.something = {}));\r\n    })(someOther = normalN.someOther || (normalN.someOther = {}));\r\n    /**@internal*/ normalN.someImport = someNamespace.C;\r\n    /**@internal*/ normalN.internalConst = 10;\r\n    /**@internal*/ var internalEnum;\r\n    (function (internalEnum) {\r\n        internalEnum[internalEnum[\"a\"] = 0] = \"a\";\r\n        internalEnum[internalEnum[\"b\"] = 1] = \"b\";\r\n        internalEnum[internalEnum[\"c\"] = 2] = \"c\";\r\n    })(internalEnum = normalN.internalEnum || (normalN.internalEnum = {}));\r\n})(normalN || (normalN = {}));\r\n/**@internal*/ var internalC = /** @class */ (function () {\r\n    function internalC() {\r\n    }\r\n    return internalC;\r\n}());\r\n/**@internal*/ function internalfoo() { }\r\n/**@internal*/ var internalNamespace;\r\n(function (internalNamespace) {\r\n    var someClass = /** @class */ (function () {\r\n        function someClass() {\r\n        }\r\n        return someClass;\r\n    }());\r\n    internalNamespace.someClass = someClass;\r\n})(internalNamespace || (internalNamespace = {}));\r\n/**@internal*/ var internalOther;\r\n(function (internalOther) {\r\n    var something;\r\n    (function (something) {\r\n        var someClass = /** @class */ (function () {\r\n            function someClass() {\r\n            }\r\n            return someClass;\r\n        }());\r\n        something.someClass = someClass;\r\n    })(something = internalOther.something || (internalOther.something = {}));\r\n})(internalOther || (internalOther = {}));\r\n/**@internal*/ var internalImport = internalNamespace.someClass;\r\n/**@internal*/ var internalConst = 10;\r\n/**@internal*/ var internalEnum;\r\n(function (internalEnum) {\r\n    internalEnum[internalEnum[\"a\"] = 0] = \"a\";\r\n    internalEnum[internalEnum[\"b\"] = 1] = \"b\";\r\n    internalEnum[internalEnum[\"c\"] = 2] = \"c\";\r\n})(internalEnum || (internalEnum = {}));\r\nvar C = /** @class */ (function () {\r\n    function C() {\r\n    }\r\n    C.prototype.doSomething = function () {\r\n        console.log(\"something got done\");\r\n    };\r\n    return C;\r\n}());\r\n//# sourceMappingURL=second-output.js.map"},"dts":{"sections":[{"pos":0,"end":172,"kind":"prepend","data":"../first/bin/first-output.d.ts","texts":[{"pos":0,"end":54,"kind":"internal"},{"pos":56,"end":172,"kind":"text"}]},{"pos":172,"end":249,"kind":"text"},{"pos":249,"end":429,"kind":"internal"},{"pos":431,"end":463,"kind":"text"},{"pos":463,"end":975,"kind":"internal"},{"pos":977,"end":980,"kind":"text"},{"pos":980,"end":1505,"kind":"internal"},{"pos":1507,"end":1555,"kind":"text"}],"mapHash":"62262842155-{\"version\":3,\"file\":\"second-output.d.ts\",\"sourceRoot\":\"\",\"sources\":[\"../first/first_PART1.ts\",\"../first/first_part3.ts\",\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"AAAA,cAAc,CAAC,UAAU,QAAQ;IAC7B,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,iBAAiB,CAAC;AAEzB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;IACT,cAAc;IACd,cAAc,CAAC,IAAI,EAAE,MAAM,CAAC;IAC5B,cAAc,CAAC,MAAM;IACrB,cAAc,CAAC,IAAI,CAAC,IACM,MAAM,CADK;IACrC,cAAc,CAAC,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACxC;AACD,kBAAU,OAAO,CAAC;IACd,cAAc,CAAC,MAAa,CAAC;KAAI;IACjC,cAAc,CAAC,SAAgB,GAAG,SAAK;IACvC,cAAc,CAAC,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACnE,cAAc,CAAC,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IACjF,cAAc,CAAC,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC1D,cAAc,CAAC,KAAY,YAAY,GAAG,SAAS,CAAC;IACpD,cAAc,CAAQ,MAAM,aAAa,KAAK,CAAC;IAC/C,cAAc,CAAC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACtD;AACD,cAAc,CAAC,cAAM,SAAS;CAAG;AACjC,cAAc,CAAC,iBAAS,WAAW,SAAK;AACxC,cAAc,CAAC,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACxE,cAAc,CAAC,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC9E,cAAc,CAAC,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACnE,cAAc,CAAC,KAAK,YAAY,GAAG,SAAS,CAAC;AAC7C,cAAc,CAAC,QAAA,MAAM,aAAa,KAAK,CAAC;AACxC,cAAc,CAAC,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC5C,cAAM,CAAC;IACH,WAAW;CAGd\"}","hash":"63279926987-/**@internal*/ interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hello, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    /**@internal*/ constructor();\r\n    /**@internal*/ prop: string;\r\n    /**@internal*/ method(): void;\r\n    /**@internal*/ get c(): number;\r\n    /**@internal*/ set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    /**@internal*/ class C {\r\n    }\r\n    /**@internal*/ function foo(): void;\r\n    /**@internal*/ namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    /**@internal*/ namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    /**@internal*/ export import someImport = someNamespace.C;\r\n    /**@internal*/ type internalType = internalC;\r\n    /**@internal*/ const internalConst = 10;\r\n    /**@internal*/ enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\n/**@internal*/ declare class internalC {\r\n}\r\n/**@internal*/ declare function internalfoo(): void;\r\n/**@internal*/ declare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\n/**@internal*/ declare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\n/**@internal*/ import internalImport = internalNamespace.someClass;\r\n/**@internal*/ type internalType = internalC;\r\n/**@internal*/ declare const internalConst = 10;\r\n/**@internal*/ declare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n//# sourceMappingURL=second-output.d.ts.map"}},"program":{"fileNames":["../second/second_part1.ts","../second/second_part2.ts"],"fileInfos":["5541258877-namespace N {\r\n    // Comment text\r\n}\r\n\r\nnamespace N {\r\n    function f() {\r\n        console.log('testing');\r\n    }\r\n\r\n    f();\r\n}\r\n\nclass normalC {\n    /**@internal*/ constructor() { }\n    /**@internal*/ prop: string;\n    /**@internal*/ method() { }\n    /**@internal*/ get c() { return 10; }\n    /**@internal*/ set c(val: number) { }\n}\nnamespace normalN {\n    /**@internal*/ export class C { }\n    /**@internal*/ export function foo() {}\n    /**@internal*/ export namespace someNamespace { export class C {} }\n    /**@internal*/ export namespace someOther.something { export class someClass {} }\n    /**@internal*/ export import someImport = someNamespace.C;\n    /**@internal*/ export type internalType = internalC;\n    /**@internal*/ export const internalConst = 10;\n    /**@internal*/ export enum internalEnum { a, b, c }\n}\n/**@internal*/ class internalC {}\n/**@internal*/ function internalfoo() {}\n/**@internal*/ namespace internalNamespace { export class someClass {} }\n/**@internal*/ namespace internalOther.something { export class someClass {} }\n/**@internal*/ import internalImport = internalNamespace.someClass;\n/**@internal*/ type internalType = internalC;\n/**@internal*/ const internalConst = 10;\n/**@internal*/ enum internalEnum { a, b, c }","9339262372-class C {\r\n    doSomething() {\r\n        console.log(\"something got done\");\r\n    }\r\n}\r\n"],"options":{"composite":true,"outFile":"./second-output.js"},"outSignature":"57021299184-/**@internal*/ interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hello, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    /**@internal*/ constructor();\r\n    /**@internal*/ prop: string;\r\n    /**@internal*/ method(): void;\r\n    /**@internal*/ get c(): number;\r\n    /**@internal*/ set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    /**@internal*/ class C {\r\n    }\r\n    /**@internal*/ function foo(): void;\r\n    /**@internal*/ namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    /**@internal*/ namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    /**@internal*/ export import someImport = someNamespace.C;\r\n    /**@internal*/ type internalType = internalC;\r\n    /**@internal*/ const internalConst = 10;\r\n    /**@internal*/ enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\n/**@internal*/ declare class internalC {\r\n}\r\n/**@internal*/ declare function internalfoo(): void;\r\n/**@internal*/ declare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\n/**@internal*/ declare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\n/**@internal*/ import internalImport = internalNamespace.someClass;\r\n/**@internal*/ type internalType = internalC;\r\n/**@internal*/ declare const internalConst = 10;\r\n/**@internal*/ declare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n","latestChangedDtsFile":"./second-output.d.ts"},"version":"FakeTSVersion"}
 
 //// [/src/2/second-output.tsbuildinfo.baseline.txt]
 ======================================================================
@@ -8126,7 +8127,7 @@ text: (977-980)
 }
 
 ----------------------------------------------------------------------
-internal: (980-1513)
+internal: (980-1505)
 /**@internal*/ declare class internalC {
 }
 /**@internal*/ declare function internalfoo(): void;
@@ -8139,7 +8140,7 @@ internal: (980-1513)
     }
 }
 /**@internal*/ import internalImport = internalNamespace.someClass;
-/**@internal*/ declare type internalType = internalC;
+/**@internal*/ type internalType = internalC;
 /**@internal*/ declare const internalConst = 10;
 /**@internal*/ declare enum internalEnum {
     a = 0,
@@ -8147,7 +8148,7 @@ internal: (980-1513)
     c = 2
 }
 ----------------------------------------------------------------------
-text: (1515-1563)
+text: (1507-1555)
 declare class C {
     doSomething(): void;
 }
@@ -8233,17 +8234,17 @@ declare class C {
         },
         {
           "pos": 980,
-          "end": 1513,
+          "end": 1505,
           "kind": "internal"
         },
         {
-          "pos": 1515,
-          "end": 1563,
+          "pos": 1507,
+          "end": 1555,
           "kind": "text"
         }
       ],
-      "hash": "28495717979-/**@internal*/ interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hello, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    /**@internal*/ constructor();\r\n    /**@internal*/ prop: string;\r\n    /**@internal*/ method(): void;\r\n    /**@internal*/ get c(): number;\r\n    /**@internal*/ set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    /**@internal*/ class C {\r\n    }\r\n    /**@internal*/ function foo(): void;\r\n    /**@internal*/ namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    /**@internal*/ namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    /**@internal*/ export import someImport = someNamespace.C;\r\n    /**@internal*/ type internalType = internalC;\r\n    /**@internal*/ const internalConst = 10;\r\n    /**@internal*/ enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\n/**@internal*/ declare class internalC {\r\n}\r\n/**@internal*/ declare function internalfoo(): void;\r\n/**@internal*/ declare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\n/**@internal*/ declare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\n/**@internal*/ import internalImport = internalNamespace.someClass;\r\n/**@internal*/ declare type internalType = internalC;\r\n/**@internal*/ declare const internalConst = 10;\r\n/**@internal*/ declare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n//# sourceMappingURL=second-output.d.ts.map",
-      "mapHash": "72637168065-{\"version\":3,\"file\":\"second-output.d.ts\",\"sourceRoot\":\"\",\"sources\":[\"../first/first_PART1.ts\",\"../first/first_part3.ts\",\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"AAAA,cAAc,CAAC,UAAU,QAAQ;IAC7B,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,iBAAiB,CAAC;AAEzB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;IACT,cAAc;IACd,cAAc,CAAC,IAAI,EAAE,MAAM,CAAC;IAC5B,cAAc,CAAC,MAAM;IACrB,cAAc,CAAC,IAAI,CAAC,IACM,MAAM,CADK;IACrC,cAAc,CAAC,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACxC;AACD,kBAAU,OAAO,CAAC;IACd,cAAc,CAAC,MAAa,CAAC;KAAI;IACjC,cAAc,CAAC,SAAgB,GAAG,SAAK;IACvC,cAAc,CAAC,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACnE,cAAc,CAAC,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IACjF,cAAc,CAAC,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC1D,cAAc,CAAC,KAAY,YAAY,GAAG,SAAS,CAAC;IACpD,cAAc,CAAQ,MAAM,aAAa,KAAK,CAAC;IAC/C,cAAc,CAAC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACtD;AACD,cAAc,CAAC,cAAM,SAAS;CAAG;AACjC,cAAc,CAAC,iBAAS,WAAW,SAAK;AACxC,cAAc,CAAC,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACxE,cAAc,CAAC,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC9E,cAAc,CAAC,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACnE,cAAc,CAAC,aAAK,YAAY,GAAG,SAAS,CAAC;AAC7C,cAAc,CAAC,QAAA,MAAM,aAAa,KAAK,CAAC;AACxC,cAAc,CAAC,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC5C,cAAM,CAAC;IACH,WAAW;CAGd\"}"
+      "hash": "63279926987-/**@internal*/ interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hello, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    /**@internal*/ constructor();\r\n    /**@internal*/ prop: string;\r\n    /**@internal*/ method(): void;\r\n    /**@internal*/ get c(): number;\r\n    /**@internal*/ set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    /**@internal*/ class C {\r\n    }\r\n    /**@internal*/ function foo(): void;\r\n    /**@internal*/ namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    /**@internal*/ namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    /**@internal*/ export import someImport = someNamespace.C;\r\n    /**@internal*/ type internalType = internalC;\r\n    /**@internal*/ const internalConst = 10;\r\n    /**@internal*/ enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\n/**@internal*/ declare class internalC {\r\n}\r\n/**@internal*/ declare function internalfoo(): void;\r\n/**@internal*/ declare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\n/**@internal*/ declare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\n/**@internal*/ import internalImport = internalNamespace.someClass;\r\n/**@internal*/ type internalType = internalC;\r\n/**@internal*/ declare const internalConst = 10;\r\n/**@internal*/ declare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n//# sourceMappingURL=second-output.d.ts.map",
+      "mapHash": "62262842155-{\"version\":3,\"file\":\"second-output.d.ts\",\"sourceRoot\":\"\",\"sources\":[\"../first/first_PART1.ts\",\"../first/first_part3.ts\",\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"AAAA,cAAc,CAAC,UAAU,QAAQ;IAC7B,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,iBAAiB,CAAC;AAEzB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;IACT,cAAc;IACd,cAAc,CAAC,IAAI,EAAE,MAAM,CAAC;IAC5B,cAAc,CAAC,MAAM;IACrB,cAAc,CAAC,IAAI,CAAC,IACM,MAAM,CADK;IACrC,cAAc,CAAC,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACxC;AACD,kBAAU,OAAO,CAAC;IACd,cAAc,CAAC,MAAa,CAAC;KAAI;IACjC,cAAc,CAAC,SAAgB,GAAG,SAAK;IACvC,cAAc,CAAC,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACnE,cAAc,CAAC,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IACjF,cAAc,CAAC,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC1D,cAAc,CAAC,KAAY,YAAY,GAAG,SAAS,CAAC;IACpD,cAAc,CAAQ,MAAM,aAAa,KAAK,CAAC;IAC/C,cAAc,CAAC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACtD;AACD,cAAc,CAAC,cAAM,SAAS;CAAG;AACjC,cAAc,CAAC,iBAAS,WAAW,SAAK;AACxC,cAAc,CAAC,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACxE,cAAc,CAAC,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC9E,cAAc,CAAC,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACnE,cAAc,CAAC,KAAK,YAAY,GAAG,SAAS,CAAC;AAC7C,cAAc,CAAC,QAAA,MAAM,aAAa,KAAK,CAAC;AACxC,cAAc,CAAC,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC5C,cAAM,CAAC;IACH,WAAW;CAGd\"}"
     }
   },
   "program": {
@@ -8259,11 +8260,11 @@ declare class C {
       "composite": true,
       "outFile": "./second-output.js"
     },
-    "outSignature": "31678065536-/**@internal*/ interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hello, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    /**@internal*/ constructor();\r\n    /**@internal*/ prop: string;\r\n    /**@internal*/ method(): void;\r\n    /**@internal*/ get c(): number;\r\n    /**@internal*/ set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    /**@internal*/ class C {\r\n    }\r\n    /**@internal*/ function foo(): void;\r\n    /**@internal*/ namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    /**@internal*/ namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    /**@internal*/ export import someImport = someNamespace.C;\r\n    /**@internal*/ type internalType = internalC;\r\n    /**@internal*/ const internalConst = 10;\r\n    /**@internal*/ enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\n/**@internal*/ declare class internalC {\r\n}\r\n/**@internal*/ declare function internalfoo(): void;\r\n/**@internal*/ declare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\n/**@internal*/ declare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\n/**@internal*/ import internalImport = internalNamespace.someClass;\r\n/**@internal*/ declare type internalType = internalC;\r\n/**@internal*/ declare const internalConst = 10;\r\n/**@internal*/ declare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n",
+    "outSignature": "57021299184-/**@internal*/ interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hello, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    /**@internal*/ constructor();\r\n    /**@internal*/ prop: string;\r\n    /**@internal*/ method(): void;\r\n    /**@internal*/ get c(): number;\r\n    /**@internal*/ set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    /**@internal*/ class C {\r\n    }\r\n    /**@internal*/ function foo(): void;\r\n    /**@internal*/ namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    /**@internal*/ namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    /**@internal*/ export import someImport = someNamespace.C;\r\n    /**@internal*/ type internalType = internalC;\r\n    /**@internal*/ const internalConst = 10;\r\n    /**@internal*/ enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\n/**@internal*/ declare class internalC {\r\n}\r\n/**@internal*/ declare function internalfoo(): void;\r\n/**@internal*/ declare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\n/**@internal*/ declare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\n/**@internal*/ import internalImport = internalNamespace.someClass;\r\n/**@internal*/ type internalType = internalC;\r\n/**@internal*/ declare const internalConst = 10;\r\n/**@internal*/ declare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n",
     "latestChangedDtsFile": "./second-output.d.ts"
   },
   "version": "FakeTSVersion",
-  "size": 13806
+  "size": 13790
 }
 
 //// [/src/first/bin/first-output.d.ts.map] file written with same contents
diff --git a/tests/baselines/reference/tsbuild/outfile-concat/stripInternal-jsdoc-style-with-comments-emit-enabled.js b/tests/baselines/reference/tsbuild/outfile-concat/stripInternal-jsdoc-style-with-comments-emit-enabled.js
index f04baa4e8c86c..97a9e089c8b7a 100644
--- a/tests/baselines/reference/tsbuild/outfile-concat/stripInternal-jsdoc-style-with-comments-emit-enabled.js
+++ b/tests/baselines/reference/tsbuild/outfile-concat/stripInternal-jsdoc-style-with-comments-emit-enabled.js
@@ -222,7 +222,7 @@ declare namespace normalN {
     }
 }
 /**@internal*/ import internalImport = internalNamespace.someClass;
-/**@internal*/ declare type internalType = internalC;
+/**@internal*/ type internalType = internalC;
 /**@internal*/ declare const internalConst = 10;
 /**@internal*/ declare enum internalEnum {
     a = 0,
@@ -235,7 +235,7 @@ declare class C {
 //# sourceMappingURL=second-output.d.ts.map
 
 //// [/src/2/second-output.d.ts.map]
-{"version":3,"file":"second-output.d.ts","sourceRoot":"","sources":["../second/second_part1.ts","../second/second_part2.ts"],"names":[],"mappings":"AAAA,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;IACT,cAAc;IACd,cAAc,CAAC,IAAI,EAAE,MAAM,CAAC;IAC5B,cAAc,CAAC,MAAM;IACrB,cAAc,CAAC,IAAI,CAAC,IACM,MAAM,CADK;IACrC,cAAc,CAAC,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACxC;AACD,kBAAU,OAAO,CAAC;IACd,cAAc,CAAC,MAAa,CAAC;KAAI;IACjC,cAAc,CAAC,SAAgB,GAAG,SAAK;IACvC,cAAc,CAAC,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACnE,cAAc,CAAC,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IACjF,cAAc,CAAC,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC1D,cAAc,CAAC,KAAY,YAAY,GAAG,SAAS,CAAC;IACpD,cAAc,CAAQ,MAAM,aAAa,KAAK,CAAC;IAC/C,cAAc,CAAC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACtD;AACD,cAAc,CAAC,cAAM,SAAS;CAAG;AACjC,cAAc,CAAC,iBAAS,WAAW,SAAK;AACxC,cAAc,CAAC,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACxE,cAAc,CAAC,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC9E,cAAc,CAAC,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACnE,cAAc,CAAC,aAAK,YAAY,GAAG,SAAS,CAAC;AAC7C,cAAc,CAAC,QAAA,MAAM,aAAa,KAAK,CAAC;AACxC,cAAc,CAAC,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC5C,cAAM,CAAC;IACH,WAAW;CAGd"}
+{"version":3,"file":"second-output.d.ts","sourceRoot":"","sources":["../second/second_part1.ts","../second/second_part2.ts"],"names":[],"mappings":"AAAA,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;IACT,cAAc;IACd,cAAc,CAAC,IAAI,EAAE,MAAM,CAAC;IAC5B,cAAc,CAAC,MAAM;IACrB,cAAc,CAAC,IAAI,CAAC,IACM,MAAM,CADK;IACrC,cAAc,CAAC,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACxC;AACD,kBAAU,OAAO,CAAC;IACd,cAAc,CAAC,MAAa,CAAC;KAAI;IACjC,cAAc,CAAC,SAAgB,GAAG,SAAK;IACvC,cAAc,CAAC,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACnE,cAAc,CAAC,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IACjF,cAAc,CAAC,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC1D,cAAc,CAAC,KAAY,YAAY,GAAG,SAAS,CAAC;IACpD,cAAc,CAAQ,MAAM,aAAa,KAAK,CAAC;IAC/C,cAAc,CAAC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACtD;AACD,cAAc,CAAC,cAAM,SAAS;CAAG;AACjC,cAAc,CAAC,iBAAS,WAAW,SAAK;AACxC,cAAc,CAAC,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACxE,cAAc,CAAC,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC9E,cAAc,CAAC,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACnE,cAAc,CAAC,KAAK,YAAY,GAAG,SAAS,CAAC;AAC7C,cAAc,CAAC,QAAA,MAAM,aAAa,KAAK,CAAC;AACxC,cAAc,CAAC,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC5C,cAAM,CAAC;IACH,WAAW;CAGd"}
 
 //// [/src/2/second-output.d.ts.map.baseline.txt]
 ===================================================================
@@ -906,35 +906,36 @@ sourceFile:../second/second_part1.ts
 9 >Emitted(44, 67) Source(34, 67) + SourceIndex(0)
 10>Emitted(44, 68) Source(34, 68) + SourceIndex(0)
 ---
->>>/**@internal*/ declare type internalType = internalC;
+>>>/**@internal*/ type internalType = internalC;
 1 >
 2 >^^^^^^^^^^^^^^
 3 >              ^
-4 >               ^^^^^^^^^^^^^
-5 >                            ^^^^^^^^^^^^
-6 >                                        ^^^
-7 >                                           ^^^^^^^^^
-8 >                                                    ^
+4 >               ^^^^^
+5 >                    ^^^^^^^^^^^^
+6 >                                ^^^
+7 >                                   ^^^^^^^^^
+8 >                                            ^
+9 >                                             ^^^^->
 1 >
   >
 2 >/**@internal*/
 3 >               
 4 >               type 
-5 >                            internalType
-6 >                                         = 
-7 >                                           internalC
-8 >                                                    ;
+5 >                    internalType
+6 >                                 = 
+7 >                                   internalC
+8 >                                            ;
 1 >Emitted(45, 1) Source(35, 1) + SourceIndex(0)
 2 >Emitted(45, 15) Source(35, 15) + SourceIndex(0)
 3 >Emitted(45, 16) Source(35, 16) + SourceIndex(0)
-4 >Emitted(45, 29) Source(35, 21) + SourceIndex(0)
-5 >Emitted(45, 41) Source(35, 33) + SourceIndex(0)
-6 >Emitted(45, 44) Source(35, 36) + SourceIndex(0)
-7 >Emitted(45, 53) Source(35, 45) + SourceIndex(0)
-8 >Emitted(45, 54) Source(35, 46) + SourceIndex(0)
+4 >Emitted(45, 21) Source(35, 21) + SourceIndex(0)
+5 >Emitted(45, 33) Source(35, 33) + SourceIndex(0)
+6 >Emitted(45, 36) Source(35, 36) + SourceIndex(0)
+7 >Emitted(45, 45) Source(35, 45) + SourceIndex(0)
+8 >Emitted(45, 46) Source(35, 46) + SourceIndex(0)
 ---
 >>>/**@internal*/ declare const internalConst = 10;
-1 >
+1->
 2 >^^^^^^^^^^^^^^
 3 >              ^
 4 >               ^^^^^^^^
@@ -942,7 +943,7 @@ sourceFile:../second/second_part1.ts
 6 >                             ^^^^^^^^^^^^^
 7 >                                          ^^^^^
 8 >                                               ^
-1 >
+1->
   >
 2 >/**@internal*/
 3 >               
@@ -951,7 +952,7 @@ sourceFile:../second/second_part1.ts
 6 >                             internalConst
 7 >                                           = 10
 8 >                                               ;
-1 >Emitted(46, 1) Source(36, 1) + SourceIndex(0)
+1->Emitted(46, 1) Source(36, 1) + SourceIndex(0)
 2 >Emitted(46, 15) Source(36, 15) + SourceIndex(0)
 3 >Emitted(46, 16) Source(36, 16) + SourceIndex(0)
 4 >Emitted(46, 24) Source(36, 16) + SourceIndex(0)
@@ -2710,7 +2711,7 @@ sourceFile:../second/second_part2.ts
 >>>//# sourceMappingURL=second-output.js.map
 
 //// [/src/2/second-output.tsbuildinfo]
-{"bundle":{"commonSourceDirectory":"../second","sourceFiles":["../second/second_part1.ts","../second/second_part2.ts"],"js":{"sections":[{"pos":0,"end":3435,"kind":"text"}],"mapHash":"72728491936-{\"version\":3,\"file\":\"second-output.js\",\"sourceRoot\":\"\",\"sources\":[\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"AAIA,IAAU,CAAC,CAMV;AAND,WAAU,CAAC;IACP,SAAS,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC3B,CAAC;IAED,CAAC,EAAE,CAAC;AACR,CAAC,EANS,CAAC,KAAD,CAAC,QAMV;AAED;IACI,cAAc,CAAC;IAAgB,CAAC;IAEhC,cAAc,CAAC,wBAAM,GAAN,cAAW,CAAC;IACZ,sBAAI,sBAAC;QAApB,cAAc,MAAC,cAAU,OAAO,EAAE,CAAC,CAAC,CAAC;QACrC,cAAc,MAAC,UAAM,GAAW,IAAI,CAAC;;;OADA;IAEzC,cAAC;AAAD,CAAC,AAND,IAMC;AACD,IAAU,OAAO,CAShB;AATD,WAAU,OAAO;IACb,cAAc,CAAC;QAAA;QAAiB,CAAC;QAAD,QAAC;IAAD,CAAC,AAAlB,IAAkB;IAAL,SAAC,IAAI,CAAA;IACjC,cAAc,CAAC,SAAgB,GAAG,KAAI,CAAC;IAAR,WAAG,MAAK,CAAA;IACvC,cAAc,CAAC,IAAiB,aAAa,CAAsB;IAApD,WAAiB,aAAa;QAAG;YAAA;YAAgB,CAAC;YAAD,QAAC;QAAD,CAAC,AAAjB,IAAiB;QAAJ,eAAC,IAAG,CAAA;IAAC,CAAC,EAAnC,aAAa,GAAb,qBAAa,KAAb,qBAAa,QAAsB;IACnE,cAAc,CAAC,IAAiB,SAAS,CAAwC;IAAlE,WAAiB,SAAS;QAAC,IAAA,SAAS,CAA8B;QAAvC,WAAA,SAAS;YAAG;gBAAA;gBAAwB,CAAC;gBAAD,gBAAC;YAAD,CAAC,AAAzB,IAAyB;YAAZ,mBAAS,YAAG,CAAA;QAAC,CAAC,EAAvC,SAAS,GAAT,mBAAS,KAAT,mBAAS,QAA8B;IAAD,CAAC,EAAjD,SAAS,GAAT,iBAAS,KAAT,iBAAS,QAAwC;IACjF,cAAc,CAAe,kBAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAE1D,cAAc,CAAc,qBAAa,GAAG,EAAE,CAAC;IAC/C,cAAc,CAAC,IAAY,YAAwB;IAApC,WAAY,YAAY;QAAG,yCAAC,CAAA;QAAE,yCAAC,CAAA;QAAE,yCAAC,CAAA;IAAC,CAAC,EAAxB,YAAY,GAAZ,oBAAY,KAAZ,oBAAY,QAAY;AACvD,CAAC,EATS,OAAO,KAAP,OAAO,QAShB;AACD,cAAc,CAAC;IAAA;IAAiB,CAAC;IAAD,gBAAC;AAAD,CAAC,AAAlB,IAAkB;AACjC,cAAc,CAAC,SAAS,WAAW,KAAI,CAAC;AACxC,cAAc,CAAC,IAAU,iBAAiB,CAA8B;AAAzD,WAAU,iBAAiB;IAAG;QAAA;QAAwB,CAAC;QAAD,gBAAC;IAAD,CAAC,AAAzB,IAAyB;IAAZ,2BAAS,YAAG,CAAA;AAAC,CAAC,EAA/C,iBAAiB,KAAjB,iBAAiB,QAA8B;AACxE,cAAc,CAAC,IAAU,aAAa,CAAwC;AAA/D,WAAU,aAAa;IAAC,IAAA,SAAS,CAA8B;IAAvC,WAAA,SAAS;QAAG;YAAA;YAAwB,CAAC;YAAD,gBAAC;QAAD,CAAC,AAAzB,IAAyB;QAAZ,mBAAS,YAAG,CAAA;IAAC,CAAC,EAAvC,SAAS,GAAT,uBAAS,KAAT,uBAAS,QAA8B;AAAD,CAAC,EAArD,aAAa,KAAb,aAAa,QAAwC;AAC9E,cAAc,CAAC,IAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AAEnE,cAAc,CAAC,IAAM,aAAa,GAAG,EAAE,CAAC;AACxC,cAAc,CAAC,IAAK,YAAwB;AAA7B,WAAK,YAAY;IAAG,yCAAC,CAAA;IAAE,yCAAC,CAAA;IAAE,yCAAC,CAAA;AAAC,CAAC,EAAxB,YAAY,KAAZ,YAAY,QAAY;ACpC5C;IAAA;IAIA,CAAC;IAHG,uBAAW,GAAX;QACI,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;IACtC,CAAC;IACL,QAAC;AAAD,CAAC,AAJD,IAIC\"}","hash":"33596295407-var N;\r\n(function (N) {\r\n    function f() {\r\n        console.log('testing');\r\n    }\r\n    f();\r\n})(N || (N = {}));\r\nvar normalC = /** @class */ (function () {\r\n    /**@internal*/ function normalC() {\r\n    }\r\n    /**@internal*/ normalC.prototype.method = function () { };\r\n    Object.defineProperty(normalC.prototype, \"c\", {\r\n        /**@internal*/ get: function () { return 10; },\r\n        /**@internal*/ set: function (val) { },\r\n        enumerable: false,\r\n        configurable: true\r\n    });\r\n    return normalC;\r\n}());\r\nvar normalN;\r\n(function (normalN) {\r\n    /**@internal*/ var C = /** @class */ (function () {\r\n        function C() {\r\n        }\r\n        return C;\r\n    }());\r\n    normalN.C = C;\r\n    /**@internal*/ function foo() { }\r\n    normalN.foo = foo;\r\n    /**@internal*/ var someNamespace;\r\n    (function (someNamespace) {\r\n        var C = /** @class */ (function () {\r\n            function C() {\r\n            }\r\n            return C;\r\n        }());\r\n        someNamespace.C = C;\r\n    })(someNamespace = normalN.someNamespace || (normalN.someNamespace = {}));\r\n    /**@internal*/ var someOther;\r\n    (function (someOther) {\r\n        var something;\r\n        (function (something) {\r\n            var someClass = /** @class */ (function () {\r\n                function someClass() {\r\n                }\r\n                return someClass;\r\n            }());\r\n            something.someClass = someClass;\r\n        })(something = someOther.something || (someOther.something = {}));\r\n    })(someOther = normalN.someOther || (normalN.someOther = {}));\r\n    /**@internal*/ normalN.someImport = someNamespace.C;\r\n    /**@internal*/ normalN.internalConst = 10;\r\n    /**@internal*/ var internalEnum;\r\n    (function (internalEnum) {\r\n        internalEnum[internalEnum[\"a\"] = 0] = \"a\";\r\n        internalEnum[internalEnum[\"b\"] = 1] = \"b\";\r\n        internalEnum[internalEnum[\"c\"] = 2] = \"c\";\r\n    })(internalEnum = normalN.internalEnum || (normalN.internalEnum = {}));\r\n})(normalN || (normalN = {}));\r\n/**@internal*/ var internalC = /** @class */ (function () {\r\n    function internalC() {\r\n    }\r\n    return internalC;\r\n}());\r\n/**@internal*/ function internalfoo() { }\r\n/**@internal*/ var internalNamespace;\r\n(function (internalNamespace) {\r\n    var someClass = /** @class */ (function () {\r\n        function someClass() {\r\n        }\r\n        return someClass;\r\n    }());\r\n    internalNamespace.someClass = someClass;\r\n})(internalNamespace || (internalNamespace = {}));\r\n/**@internal*/ var internalOther;\r\n(function (internalOther) {\r\n    var something;\r\n    (function (something) {\r\n        var someClass = /** @class */ (function () {\r\n            function someClass() {\r\n            }\r\n            return someClass;\r\n        }());\r\n        something.someClass = someClass;\r\n    })(something = internalOther.something || (internalOther.something = {}));\r\n})(internalOther || (internalOther = {}));\r\n/**@internal*/ var internalImport = internalNamespace.someClass;\r\n/**@internal*/ var internalConst = 10;\r\n/**@internal*/ var internalEnum;\r\n(function (internalEnum) {\r\n    internalEnum[internalEnum[\"a\"] = 0] = \"a\";\r\n    internalEnum[internalEnum[\"b\"] = 1] = \"b\";\r\n    internalEnum[internalEnum[\"c\"] = 2] = \"c\";\r\n})(internalEnum || (internalEnum = {}));\r\nvar C = /** @class */ (function () {\r\n    function C() {\r\n    }\r\n    C.prototype.doSomething = function () {\r\n        console.log(\"something got done\");\r\n    };\r\n    return C;\r\n}());\r\n//# sourceMappingURL=second-output.js.map"},"dts":{"sections":[{"pos":0,"end":77,"kind":"text"},{"pos":77,"end":257,"kind":"internal"},{"pos":259,"end":291,"kind":"text"},{"pos":291,"end":803,"kind":"internal"},{"pos":805,"end":808,"kind":"text"},{"pos":808,"end":1341,"kind":"internal"},{"pos":1343,"end":1391,"kind":"text"}],"mapHash":"-12724997-{\"version\":3,\"file\":\"second-output.d.ts\",\"sourceRoot\":\"\",\"sources\":[\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"AAAA,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;IACT,cAAc;IACd,cAAc,CAAC,IAAI,EAAE,MAAM,CAAC;IAC5B,cAAc,CAAC,MAAM;IACrB,cAAc,CAAC,IAAI,CAAC,IACM,MAAM,CADK;IACrC,cAAc,CAAC,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACxC;AACD,kBAAU,OAAO,CAAC;IACd,cAAc,CAAC,MAAa,CAAC;KAAI;IACjC,cAAc,CAAC,SAAgB,GAAG,SAAK;IACvC,cAAc,CAAC,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACnE,cAAc,CAAC,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IACjF,cAAc,CAAC,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC1D,cAAc,CAAC,KAAY,YAAY,GAAG,SAAS,CAAC;IACpD,cAAc,CAAQ,MAAM,aAAa,KAAK,CAAC;IAC/C,cAAc,CAAC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACtD;AACD,cAAc,CAAC,cAAM,SAAS;CAAG;AACjC,cAAc,CAAC,iBAAS,WAAW,SAAK;AACxC,cAAc,CAAC,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACxE,cAAc,CAAC,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC9E,cAAc,CAAC,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACnE,cAAc,CAAC,aAAK,YAAY,GAAG,SAAS,CAAC;AAC7C,cAAc,CAAC,QAAA,MAAM,aAAa,KAAK,CAAC;AACxC,cAAc,CAAC,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC5C,cAAM,CAAC;IACH,WAAW;CAGd\"}","hash":"62726964264-declare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    /**@internal*/ constructor();\r\n    /**@internal*/ prop: string;\r\n    /**@internal*/ method(): void;\r\n    /**@internal*/ get c(): number;\r\n    /**@internal*/ set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    /**@internal*/ class C {\r\n    }\r\n    /**@internal*/ function foo(): void;\r\n    /**@internal*/ namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    /**@internal*/ namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    /**@internal*/ export import someImport = someNamespace.C;\r\n    /**@internal*/ type internalType = internalC;\r\n    /**@internal*/ const internalConst = 10;\r\n    /**@internal*/ enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\n/**@internal*/ declare class internalC {\r\n}\r\n/**@internal*/ declare function internalfoo(): void;\r\n/**@internal*/ declare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\n/**@internal*/ declare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\n/**@internal*/ import internalImport = internalNamespace.someClass;\r\n/**@internal*/ declare type internalType = internalC;\r\n/**@internal*/ declare const internalConst = 10;\r\n/**@internal*/ declare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n//# sourceMappingURL=second-output.d.ts.map"}},"program":{"fileNames":["../second/second_part1.ts","../second/second_part2.ts"],"fileInfos":["5541258877-namespace N {\r\n    // Comment text\r\n}\r\n\r\nnamespace N {\r\n    function f() {\r\n        console.log('testing');\r\n    }\r\n\r\n    f();\r\n}\r\n\nclass normalC {\n    /**@internal*/ constructor() { }\n    /**@internal*/ prop: string;\n    /**@internal*/ method() { }\n    /**@internal*/ get c() { return 10; }\n    /**@internal*/ set c(val: number) { }\n}\nnamespace normalN {\n    /**@internal*/ export class C { }\n    /**@internal*/ export function foo() {}\n    /**@internal*/ export namespace someNamespace { export class C {} }\n    /**@internal*/ export namespace someOther.something { export class someClass {} }\n    /**@internal*/ export import someImport = someNamespace.C;\n    /**@internal*/ export type internalType = internalC;\n    /**@internal*/ export const internalConst = 10;\n    /**@internal*/ export enum internalEnum { a, b, c }\n}\n/**@internal*/ class internalC {}\n/**@internal*/ function internalfoo() {}\n/**@internal*/ namespace internalNamespace { export class someClass {} }\n/**@internal*/ namespace internalOther.something { export class someClass {} }\n/**@internal*/ import internalImport = internalNamespace.someClass;\n/**@internal*/ type internalType = internalC;\n/**@internal*/ const internalConst = 10;\n/**@internal*/ enum internalEnum { a, b, c }","9339262372-class C {\r\n    doSomething() {\r\n        console.log(\"something got done\");\r\n    }\r\n}\r\n"],"options":{"composite":true,"outFile":"./second-output.js"},"outSignature":"51852821357-declare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    /**@internal*/ constructor();\r\n    /**@internal*/ prop: string;\r\n    /**@internal*/ method(): void;\r\n    /**@internal*/ get c(): number;\r\n    /**@internal*/ set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    /**@internal*/ class C {\r\n    }\r\n    /**@internal*/ function foo(): void;\r\n    /**@internal*/ namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    /**@internal*/ namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    /**@internal*/ export import someImport = someNamespace.C;\r\n    /**@internal*/ type internalType = internalC;\r\n    /**@internal*/ const internalConst = 10;\r\n    /**@internal*/ enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\n/**@internal*/ declare class internalC {\r\n}\r\n/**@internal*/ declare function internalfoo(): void;\r\n/**@internal*/ declare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\n/**@internal*/ declare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\n/**@internal*/ import internalImport = internalNamespace.someClass;\r\n/**@internal*/ declare type internalType = internalC;\r\n/**@internal*/ declare const internalConst = 10;\r\n/**@internal*/ declare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n","latestChangedDtsFile":"./second-output.d.ts"},"version":"FakeTSVersion"}
+{"bundle":{"commonSourceDirectory":"../second","sourceFiles":["../second/second_part1.ts","../second/second_part2.ts"],"js":{"sections":[{"pos":0,"end":3435,"kind":"text"}],"mapHash":"72728491936-{\"version\":3,\"file\":\"second-output.js\",\"sourceRoot\":\"\",\"sources\":[\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"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\"}","hash":"33596295407-var N;\r\n(function (N) {\r\n    function f() {\r\n        console.log('testing');\r\n    }\r\n    f();\r\n})(N || (N = {}));\r\nvar normalC = /** @class */ (function () {\r\n    /**@internal*/ function normalC() {\r\n    }\r\n    /**@internal*/ normalC.prototype.method = function () { };\r\n    Object.defineProperty(normalC.prototype, \"c\", {\r\n        /**@internal*/ get: function () { return 10; },\r\n        /**@internal*/ set: function (val) { },\r\n        enumerable: false,\r\n        configurable: true\r\n    });\r\n    return normalC;\r\n}());\r\nvar normalN;\r\n(function (normalN) {\r\n    /**@internal*/ var C = /** @class */ (function () {\r\n        function C() {\r\n        }\r\n        return C;\r\n    }());\r\n    normalN.C = C;\r\n    /**@internal*/ function foo() { }\r\n    normalN.foo = foo;\r\n    /**@internal*/ var someNamespace;\r\n    (function (someNamespace) {\r\n        var C = /** @class */ (function () {\r\n            function C() {\r\n            }\r\n            return C;\r\n        }());\r\n        someNamespace.C = C;\r\n    })(someNamespace = normalN.someNamespace || (normalN.someNamespace = {}));\r\n    /**@internal*/ var someOther;\r\n    (function (someOther) {\r\n        var something;\r\n        (function (something) {\r\n            var someClass = /** @class */ (function () {\r\n                function someClass() {\r\n                }\r\n                return someClass;\r\n            }());\r\n            something.someClass = someClass;\r\n        })(something = someOther.something || (someOther.something = {}));\r\n    })(someOther = normalN.someOther || (normalN.someOther = {}));\r\n    /**@internal*/ normalN.someImport = someNamespace.C;\r\n    /**@internal*/ normalN.internalConst = 10;\r\n    /**@internal*/ var internalEnum;\r\n    (function (internalEnum) {\r\n        internalEnum[internalEnum[\"a\"] = 0] = \"a\";\r\n        internalEnum[internalEnum[\"b\"] = 1] = \"b\";\r\n        internalEnum[internalEnum[\"c\"] = 2] = \"c\";\r\n    })(internalEnum = normalN.internalEnum || (normalN.internalEnum = {}));\r\n})(normalN || (normalN = {}));\r\n/**@internal*/ var internalC = /** @class */ (function () {\r\n    function internalC() {\r\n    }\r\n    return internalC;\r\n}());\r\n/**@internal*/ function internalfoo() { }\r\n/**@internal*/ var internalNamespace;\r\n(function (internalNamespace) {\r\n    var someClass = /** @class */ (function () {\r\n        function someClass() {\r\n        }\r\n        return someClass;\r\n    }());\r\n    internalNamespace.someClass = someClass;\r\n})(internalNamespace || (internalNamespace = {}));\r\n/**@internal*/ var internalOther;\r\n(function (internalOther) {\r\n    var something;\r\n    (function (something) {\r\n        var someClass = /** @class */ (function () {\r\n            function someClass() {\r\n            }\r\n            return someClass;\r\n        }());\r\n        something.someClass = someClass;\r\n    })(something = internalOther.something || (internalOther.something = {}));\r\n})(internalOther || (internalOther = {}));\r\n/**@internal*/ var internalImport = internalNamespace.someClass;\r\n/**@internal*/ var internalConst = 10;\r\n/**@internal*/ var internalEnum;\r\n(function (internalEnum) {\r\n    internalEnum[internalEnum[\"a\"] = 0] = \"a\";\r\n    internalEnum[internalEnum[\"b\"] = 1] = \"b\";\r\n    internalEnum[internalEnum[\"c\"] = 2] = \"c\";\r\n})(internalEnum || (internalEnum = {}));\r\nvar C = /** @class */ (function () {\r\n    function C() {\r\n    }\r\n    C.prototype.doSomething = function () {\r\n        console.log(\"something got done\");\r\n    };\r\n    return C;\r\n}());\r\n//# sourceMappingURL=second-output.js.map"},"dts":{"sections":[{"pos":0,"end":77,"kind":"text"},{"pos":77,"end":257,"kind":"internal"},{"pos":259,"end":291,"kind":"text"},{"pos":291,"end":803,"kind":"internal"},{"pos":805,"end":808,"kind":"text"},{"pos":808,"end":1333,"kind":"internal"},{"pos":1335,"end":1383,"kind":"text"}],"mapHash":"-10387050907-{\"version\":3,\"file\":\"second-output.d.ts\",\"sourceRoot\":\"\",\"sources\":[\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"AAAA,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;IACT,cAAc;IACd,cAAc,CAAC,IAAI,EAAE,MAAM,CAAC;IAC5B,cAAc,CAAC,MAAM;IACrB,cAAc,CAAC,IAAI,CAAC,IACM,MAAM,CADK;IACrC,cAAc,CAAC,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACxC;AACD,kBAAU,OAAO,CAAC;IACd,cAAc,CAAC,MAAa,CAAC;KAAI;IACjC,cAAc,CAAC,SAAgB,GAAG,SAAK;IACvC,cAAc,CAAC,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACnE,cAAc,CAAC,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IACjF,cAAc,CAAC,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC1D,cAAc,CAAC,KAAY,YAAY,GAAG,SAAS,CAAC;IACpD,cAAc,CAAQ,MAAM,aAAa,KAAK,CAAC;IAC/C,cAAc,CAAC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACtD;AACD,cAAc,CAAC,cAAM,SAAS;CAAG;AACjC,cAAc,CAAC,iBAAS,WAAW,SAAK;AACxC,cAAc,CAAC,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACxE,cAAc,CAAC,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC9E,cAAc,CAAC,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACnE,cAAc,CAAC,KAAK,YAAY,GAAG,SAAS,CAAC;AAC7C,cAAc,CAAC,QAAA,MAAM,aAAa,KAAK,CAAC;AACxC,cAAc,CAAC,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC5C,cAAM,CAAC;IACH,WAAW;CAGd\"}","hash":"46063415192-declare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    /**@internal*/ constructor();\r\n    /**@internal*/ prop: string;\r\n    /**@internal*/ method(): void;\r\n    /**@internal*/ get c(): number;\r\n    /**@internal*/ set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    /**@internal*/ class C {\r\n    }\r\n    /**@internal*/ function foo(): void;\r\n    /**@internal*/ namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    /**@internal*/ namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    /**@internal*/ export import someImport = someNamespace.C;\r\n    /**@internal*/ type internalType = internalC;\r\n    /**@internal*/ const internalConst = 10;\r\n    /**@internal*/ enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\n/**@internal*/ declare class internalC {\r\n}\r\n/**@internal*/ declare function internalfoo(): void;\r\n/**@internal*/ declare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\n/**@internal*/ declare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\n/**@internal*/ import internalImport = internalNamespace.someClass;\r\n/**@internal*/ type internalType = internalC;\r\n/**@internal*/ declare const internalConst = 10;\r\n/**@internal*/ declare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n//# sourceMappingURL=second-output.d.ts.map"}},"program":{"fileNames":["../second/second_part1.ts","../second/second_part2.ts"],"fileInfos":["5541258877-namespace N {\r\n    // Comment text\r\n}\r\n\r\nnamespace N {\r\n    function f() {\r\n        console.log('testing');\r\n    }\r\n\r\n    f();\r\n}\r\n\nclass normalC {\n    /**@internal*/ constructor() { }\n    /**@internal*/ prop: string;\n    /**@internal*/ method() { }\n    /**@internal*/ get c() { return 10; }\n    /**@internal*/ set c(val: number) { }\n}\nnamespace normalN {\n    /**@internal*/ export class C { }\n    /**@internal*/ export function foo() {}\n    /**@internal*/ export namespace someNamespace { export class C {} }\n    /**@internal*/ export namespace someOther.something { export class someClass {} }\n    /**@internal*/ export import someImport = someNamespace.C;\n    /**@internal*/ export type internalType = internalC;\n    /**@internal*/ export const internalConst = 10;\n    /**@internal*/ export enum internalEnum { a, b, c }\n}\n/**@internal*/ class internalC {}\n/**@internal*/ function internalfoo() {}\n/**@internal*/ namespace internalNamespace { export class someClass {} }\n/**@internal*/ namespace internalOther.something { export class someClass {} }\n/**@internal*/ import internalImport = internalNamespace.someClass;\n/**@internal*/ type internalType = internalC;\n/**@internal*/ const internalConst = 10;\n/**@internal*/ enum internalEnum { a, b, c }","9339262372-class C {\r\n    doSomething() {\r\n        console.log(\"something got done\");\r\n    }\r\n}\r\n"],"options":{"composite":true,"outFile":"./second-output.js"},"outSignature":"43837797597-declare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    /**@internal*/ constructor();\r\n    /**@internal*/ prop: string;\r\n    /**@internal*/ method(): void;\r\n    /**@internal*/ get c(): number;\r\n    /**@internal*/ set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    /**@internal*/ class C {\r\n    }\r\n    /**@internal*/ function foo(): void;\r\n    /**@internal*/ namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    /**@internal*/ namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    /**@internal*/ export import someImport = someNamespace.C;\r\n    /**@internal*/ type internalType = internalC;\r\n    /**@internal*/ const internalConst = 10;\r\n    /**@internal*/ enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\n/**@internal*/ declare class internalC {\r\n}\r\n/**@internal*/ declare function internalfoo(): void;\r\n/**@internal*/ declare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\n/**@internal*/ declare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\n/**@internal*/ import internalImport = internalNamespace.someClass;\r\n/**@internal*/ type internalType = internalC;\r\n/**@internal*/ declare const internalConst = 10;\r\n/**@internal*/ declare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n","latestChangedDtsFile":"./second-output.d.ts"},"version":"FakeTSVersion"}
 
 //// [/src/2/second-output.tsbuildinfo.baseline.txt]
 ======================================================================
@@ -2869,7 +2870,7 @@ text: (805-808)
 }
 
 ----------------------------------------------------------------------
-internal: (808-1341)
+internal: (808-1333)
 /**@internal*/ declare class internalC {
 }
 /**@internal*/ declare function internalfoo(): void;
@@ -2882,7 +2883,7 @@ internal: (808-1341)
     }
 }
 /**@internal*/ import internalImport = internalNamespace.someClass;
-/**@internal*/ declare type internalType = internalC;
+/**@internal*/ type internalType = internalC;
 /**@internal*/ declare const internalConst = 10;
 /**@internal*/ declare enum internalEnum {
     a = 0,
@@ -2890,7 +2891,7 @@ internal: (808-1341)
     c = 2
 }
 ----------------------------------------------------------------------
-text: (1343-1391)
+text: (1335-1383)
 declare class C {
     doSomething(): void;
 }
@@ -2945,17 +2946,17 @@ declare class C {
         },
         {
           "pos": 808,
-          "end": 1341,
+          "end": 1333,
           "kind": "internal"
         },
         {
-          "pos": 1343,
-          "end": 1391,
+          "pos": 1335,
+          "end": 1383,
           "kind": "text"
         }
       ],
-      "hash": "62726964264-declare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    /**@internal*/ constructor();\r\n    /**@internal*/ prop: string;\r\n    /**@internal*/ method(): void;\r\n    /**@internal*/ get c(): number;\r\n    /**@internal*/ set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    /**@internal*/ class C {\r\n    }\r\n    /**@internal*/ function foo(): void;\r\n    /**@internal*/ namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    /**@internal*/ namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    /**@internal*/ export import someImport = someNamespace.C;\r\n    /**@internal*/ type internalType = internalC;\r\n    /**@internal*/ const internalConst = 10;\r\n    /**@internal*/ enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\n/**@internal*/ declare class internalC {\r\n}\r\n/**@internal*/ declare function internalfoo(): void;\r\n/**@internal*/ declare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\n/**@internal*/ declare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\n/**@internal*/ import internalImport = internalNamespace.someClass;\r\n/**@internal*/ declare type internalType = internalC;\r\n/**@internal*/ declare const internalConst = 10;\r\n/**@internal*/ declare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n//# sourceMappingURL=second-output.d.ts.map",
-      "mapHash": "-12724997-{\"version\":3,\"file\":\"second-output.d.ts\",\"sourceRoot\":\"\",\"sources\":[\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"AAAA,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;IACT,cAAc;IACd,cAAc,CAAC,IAAI,EAAE,MAAM,CAAC;IAC5B,cAAc,CAAC,MAAM;IACrB,cAAc,CAAC,IAAI,CAAC,IACM,MAAM,CADK;IACrC,cAAc,CAAC,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACxC;AACD,kBAAU,OAAO,CAAC;IACd,cAAc,CAAC,MAAa,CAAC;KAAI;IACjC,cAAc,CAAC,SAAgB,GAAG,SAAK;IACvC,cAAc,CAAC,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACnE,cAAc,CAAC,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IACjF,cAAc,CAAC,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC1D,cAAc,CAAC,KAAY,YAAY,GAAG,SAAS,CAAC;IACpD,cAAc,CAAQ,MAAM,aAAa,KAAK,CAAC;IAC/C,cAAc,CAAC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACtD;AACD,cAAc,CAAC,cAAM,SAAS;CAAG;AACjC,cAAc,CAAC,iBAAS,WAAW,SAAK;AACxC,cAAc,CAAC,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACxE,cAAc,CAAC,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC9E,cAAc,CAAC,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACnE,cAAc,CAAC,aAAK,YAAY,GAAG,SAAS,CAAC;AAC7C,cAAc,CAAC,QAAA,MAAM,aAAa,KAAK,CAAC;AACxC,cAAc,CAAC,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC5C,cAAM,CAAC;IACH,WAAW;CAGd\"}"
+      "hash": "46063415192-declare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    /**@internal*/ constructor();\r\n    /**@internal*/ prop: string;\r\n    /**@internal*/ method(): void;\r\n    /**@internal*/ get c(): number;\r\n    /**@internal*/ set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    /**@internal*/ class C {\r\n    }\r\n    /**@internal*/ function foo(): void;\r\n    /**@internal*/ namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    /**@internal*/ namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    /**@internal*/ export import someImport = someNamespace.C;\r\n    /**@internal*/ type internalType = internalC;\r\n    /**@internal*/ const internalConst = 10;\r\n    /**@internal*/ enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\n/**@internal*/ declare class internalC {\r\n}\r\n/**@internal*/ declare function internalfoo(): void;\r\n/**@internal*/ declare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\n/**@internal*/ declare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\n/**@internal*/ import internalImport = internalNamespace.someClass;\r\n/**@internal*/ type internalType = internalC;\r\n/**@internal*/ declare const internalConst = 10;\r\n/**@internal*/ declare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n//# sourceMappingURL=second-output.d.ts.map",
+      "mapHash": "-10387050907-{\"version\":3,\"file\":\"second-output.d.ts\",\"sourceRoot\":\"\",\"sources\":[\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"AAAA,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;IACT,cAAc;IACd,cAAc,CAAC,IAAI,EAAE,MAAM,CAAC;IAC5B,cAAc,CAAC,MAAM;IACrB,cAAc,CAAC,IAAI,CAAC,IACM,MAAM,CADK;IACrC,cAAc,CAAC,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACxC;AACD,kBAAU,OAAO,CAAC;IACd,cAAc,CAAC,MAAa,CAAC;KAAI;IACjC,cAAc,CAAC,SAAgB,GAAG,SAAK;IACvC,cAAc,CAAC,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACnE,cAAc,CAAC,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IACjF,cAAc,CAAC,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC1D,cAAc,CAAC,KAAY,YAAY,GAAG,SAAS,CAAC;IACpD,cAAc,CAAQ,MAAM,aAAa,KAAK,CAAC;IAC/C,cAAc,CAAC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACtD;AACD,cAAc,CAAC,cAAM,SAAS;CAAG;AACjC,cAAc,CAAC,iBAAS,WAAW,SAAK;AACxC,cAAc,CAAC,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACxE,cAAc,CAAC,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC9E,cAAc,CAAC,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACnE,cAAc,CAAC,KAAK,YAAY,GAAG,SAAS,CAAC;AAC7C,cAAc,CAAC,QAAA,MAAM,aAAa,KAAK,CAAC;AACxC,cAAc,CAAC,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC5C,cAAM,CAAC;IACH,WAAW;CAGd\"}"
     }
   },
   "program": {
@@ -2971,11 +2972,11 @@ declare class C {
       "composite": true,
       "outFile": "./second-output.js"
     },
-    "outSignature": "51852821357-declare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    /**@internal*/ constructor();\r\n    /**@internal*/ prop: string;\r\n    /**@internal*/ method(): void;\r\n    /**@internal*/ get c(): number;\r\n    /**@internal*/ set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    /**@internal*/ class C {\r\n    }\r\n    /**@internal*/ function foo(): void;\r\n    /**@internal*/ namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    /**@internal*/ namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    /**@internal*/ export import someImport = someNamespace.C;\r\n    /**@internal*/ type internalType = internalC;\r\n    /**@internal*/ const internalConst = 10;\r\n    /**@internal*/ enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\n/**@internal*/ declare class internalC {\r\n}\r\n/**@internal*/ declare function internalfoo(): void;\r\n/**@internal*/ declare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\n/**@internal*/ declare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\n/**@internal*/ import internalImport = internalNamespace.someClass;\r\n/**@internal*/ declare type internalType = internalC;\r\n/**@internal*/ declare const internalConst = 10;\r\n/**@internal*/ declare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n",
+    "outSignature": "43837797597-declare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    /**@internal*/ constructor();\r\n    /**@internal*/ prop: string;\r\n    /**@internal*/ method(): void;\r\n    /**@internal*/ get c(): number;\r\n    /**@internal*/ set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    /**@internal*/ class C {\r\n    }\r\n    /**@internal*/ function foo(): void;\r\n    /**@internal*/ namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    /**@internal*/ namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    /**@internal*/ export import someImport = someNamespace.C;\r\n    /**@internal*/ type internalType = internalC;\r\n    /**@internal*/ const internalConst = 10;\r\n    /**@internal*/ enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\n/**@internal*/ declare class internalC {\r\n}\r\n/**@internal*/ declare function internalfoo(): void;\r\n/**@internal*/ declare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\n/**@internal*/ declare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\n/**@internal*/ import internalImport = internalNamespace.someClass;\r\n/**@internal*/ type internalType = internalC;\r\n/**@internal*/ declare const internalConst = 10;\r\n/**@internal*/ declare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n",
     "latestChangedDtsFile": "./second-output.d.ts"
   },
   "version": "FakeTSVersion",
-  "size": 12491
+  "size": 12478
 }
 
 //// [/src/first/bin/first-output.d.ts]
diff --git a/tests/baselines/reference/tsbuild/outfile-concat/stripInternal-when-one-two-three-are-prepended-in-order.js b/tests/baselines/reference/tsbuild/outfile-concat/stripInternal-when-one-two-three-are-prepended-in-order.js
index b7863f59c9f84..36f03d09aaaa9 100644
--- a/tests/baselines/reference/tsbuild/outfile-concat/stripInternal-when-one-two-three-are-prepended-in-order.js
+++ b/tests/baselines/reference/tsbuild/outfile-concat/stripInternal-when-one-two-three-are-prepended-in-order.js
@@ -251,7 +251,7 @@ declare namespace internalOther.something {
     }
 }
 import internalImport = internalNamespace.someClass;
-declare type internalType = internalC;
+type internalType = internalC;
 declare const internalConst = 10;
 declare enum internalEnum {
     a = 0,
@@ -264,7 +264,7 @@ declare class C {
 //# sourceMappingURL=second-output.d.ts.map
 
 //// [/src/2/second-output.d.ts.map]
-{"version":3,"file":"second-output.d.ts","sourceRoot":"","sources":["../first/first_PART1.ts","../first/first_part3.ts","../second/second_part1.ts","../second/second_part2.ts"],"names":[],"mappings":"AAAc,UAAU,QAAQ;IAC5B,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,iBAAiB,CAAC;AAEzB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEK,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;IACN,IAAI,CAAC,IACM,MAAM,CADK;IACtB,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACvC;AACD,kBAAU,OAAO,CAAC;IACA,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACrD;AACa,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,aAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC3C,cAAM,CAAC;IACH,WAAW;CAGd"}
+{"version":3,"file":"second-output.d.ts","sourceRoot":"","sources":["../first/first_PART1.ts","../first/first_part3.ts","../second/second_part1.ts","../second/second_part2.ts"],"names":[],"mappings":"AAAc,UAAU,QAAQ;IAC5B,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,iBAAiB,CAAC;AAEzB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEK,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;IACN,IAAI,CAAC,IACM,MAAM,CADK;IACtB,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACvC;AACD,kBAAU,OAAO,CAAC;IACA,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACrD;AACa,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,KAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC3C,cAAM,CAAC;IACH,WAAW;CAGd"}
 
 //// [/src/2/second-output.d.ts.map.baseline.txt]
 ===================================================================
@@ -943,42 +943,43 @@ sourceFile:../second/second_part1.ts
 7 >Emitted(52, 52) Source(34, 66) + SourceIndex(2)
 8 >Emitted(52, 53) Source(34, 67) + SourceIndex(2)
 ---
->>>declare type internalType = internalC;
+>>>type internalType = internalC;
 1 >
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^^^^^
-4 >                         ^^^
-5 >                            ^^^^^^^^^
-6 >                                     ^
+2 >^^^^^
+3 >     ^^^^^^^^^^^^
+4 >                 ^^^
+5 >                    ^^^^^^^^^
+6 >                             ^
+7 >                              ^^^^->
 1 >
   >/*@internal*/ 
 2 >type 
-3 >             internalType
-4 >                          = 
-5 >                            internalC
-6 >                                     ;
+3 >     internalType
+4 >                  = 
+5 >                    internalC
+6 >                             ;
 1 >Emitted(53, 1) Source(35, 15) + SourceIndex(2)
-2 >Emitted(53, 14) Source(35, 20) + SourceIndex(2)
-3 >Emitted(53, 26) Source(35, 32) + SourceIndex(2)
-4 >Emitted(53, 29) Source(35, 35) + SourceIndex(2)
-5 >Emitted(53, 38) Source(35, 44) + SourceIndex(2)
-6 >Emitted(53, 39) Source(35, 45) + SourceIndex(2)
+2 >Emitted(53, 6) Source(35, 20) + SourceIndex(2)
+3 >Emitted(53, 18) Source(35, 32) + SourceIndex(2)
+4 >Emitted(53, 21) Source(35, 35) + SourceIndex(2)
+5 >Emitted(53, 30) Source(35, 44) + SourceIndex(2)
+6 >Emitted(53, 31) Source(35, 45) + SourceIndex(2)
 ---
 >>>declare const internalConst = 10;
-1 >
+1->
 2 >^^^^^^^^
 3 >        ^^^^^^
 4 >              ^^^^^^^^^^^^^
 5 >                           ^^^^^
 6 >                                ^
-1 >
+1->
   >/*@internal*/ 
 2 >
 3 >        const 
 4 >              internalConst
 5 >                            = 10
 6 >                                ;
-1 >Emitted(54, 1) Source(36, 15) + SourceIndex(2)
+1->Emitted(54, 1) Source(36, 15) + SourceIndex(2)
 2 >Emitted(54, 9) Source(36, 15) + SourceIndex(2)
 3 >Emitted(54, 15) Source(36, 21) + SourceIndex(2)
 4 >Emitted(54, 28) Source(36, 34) + SourceIndex(2)
@@ -2770,7 +2771,7 @@ sourceFile:../second/second_part2.ts
 >>>//# sourceMappingURL=second-output.js.map
 
 //// [/src/2/second-output.tsbuildinfo]
-{"bundle":{"commonSourceDirectory":"../second","sourceFiles":["../second/second_part1.ts","../second/second_part2.ts"],"js":{"sections":[{"pos":0,"end":110,"kind":"prepend","data":"../first/bin/first-output.js","texts":[{"pos":0,"end":110,"kind":"text"}]},{"pos":110,"end":3163,"kind":"text"}],"mapHash":"-31829622207-{\"version\":3,\"file\":\"second-output.js\",\"sourceRoot\":\"\",\"sources\":[\"../first/first_PART1.ts\",\"../first/first_part2.ts\",\"../first/first_part3.ts\",\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"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\"}","hash":"144238636645-var s = \"Hello, world\";\r\nconsole.log(s);\r\nconsole.log(f());\r\nfunction f() {\r\n    return \"JS does hoists\";\r\n}\r\nvar N;\r\n(function (N) {\r\n    function f() {\r\n        console.log('testing');\r\n    }\r\n    f();\r\n})(N || (N = {}));\r\nvar normalC = (function () {\r\n    function normalC() {\r\n    }\r\n    normalC.prototype.method = function () { };\r\n    Object.defineProperty(normalC.prototype, \"c\", {\r\n        get: function () { return 10; },\r\n        set: function (val) { },\r\n        enumerable: false,\r\n        configurable: true\r\n    });\r\n    return normalC;\r\n}());\r\nvar normalN;\r\n(function (normalN) {\r\n    var C = (function () {\r\n        function C() {\r\n        }\r\n        return C;\r\n    }());\r\n    normalN.C = C;\r\n    function foo() { }\r\n    normalN.foo = foo;\r\n    var someNamespace;\r\n    (function (someNamespace) {\r\n        var C = (function () {\r\n            function C() {\r\n            }\r\n            return C;\r\n        }());\r\n        someNamespace.C = C;\r\n    })(someNamespace = normalN.someNamespace || (normalN.someNamespace = {}));\r\n    var someOther;\r\n    (function (someOther) {\r\n        var something;\r\n        (function (something) {\r\n            var someClass = (function () {\r\n                function someClass() {\r\n                }\r\n                return someClass;\r\n            }());\r\n            something.someClass = someClass;\r\n        })(something = someOther.something || (someOther.something = {}));\r\n    })(someOther = normalN.someOther || (normalN.someOther = {}));\r\n    normalN.someImport = someNamespace.C;\r\n    normalN.internalConst = 10;\r\n    var internalEnum;\r\n    (function (internalEnum) {\r\n        internalEnum[internalEnum[\"a\"] = 0] = \"a\";\r\n        internalEnum[internalEnum[\"b\"] = 1] = \"b\";\r\n        internalEnum[internalEnum[\"c\"] = 2] = \"c\";\r\n    })(internalEnum = normalN.internalEnum || (normalN.internalEnum = {}));\r\n})(normalN || (normalN = {}));\r\nvar internalC = (function () {\r\n    function internalC() {\r\n    }\r\n    return internalC;\r\n}());\r\nfunction internalfoo() { }\r\nvar internalNamespace;\r\n(function (internalNamespace) {\r\n    var someClass = (function () {\r\n        function someClass() {\r\n        }\r\n        return someClass;\r\n    }());\r\n    internalNamespace.someClass = someClass;\r\n})(internalNamespace || (internalNamespace = {}));\r\nvar internalOther;\r\n(function (internalOther) {\r\n    var something;\r\n    (function (something) {\r\n        var someClass = (function () {\r\n            function someClass() {\r\n            }\r\n            return someClass;\r\n        }());\r\n        something.someClass = someClass;\r\n    })(something = internalOther.something || (internalOther.something = {}));\r\n})(internalOther || (internalOther = {}));\r\nvar internalImport = internalNamespace.someClass;\r\nvar internalConst = 10;\r\nvar internalEnum;\r\n(function (internalEnum) {\r\n    internalEnum[internalEnum[\"a\"] = 0] = \"a\";\r\n    internalEnum[internalEnum[\"b\"] = 1] = \"b\";\r\n    internalEnum[internalEnum[\"c\"] = 2] = \"c\";\r\n})(internalEnum || (internalEnum = {}));\r\nvar C = (function () {\r\n    function C() {\r\n    }\r\n    C.prototype.doSomething = function () {\r\n        console.log(\"something got done\");\r\n    };\r\n    return C;\r\n}());\r\n//# sourceMappingURL=second-output.js.map"},"dts":{"sections":[{"pos":0,"end":157,"kind":"prepend","data":"../first/bin/first-output.d.ts","texts":[{"pos":0,"end":39,"kind":"internal"},{"pos":41,"end":157,"kind":"text"}]},{"pos":157,"end":234,"kind":"text"},{"pos":234,"end":339,"kind":"internal"},{"pos":341,"end":373,"kind":"text"},{"pos":373,"end":765,"kind":"internal"},{"pos":767,"end":770,"kind":"text"},{"pos":770,"end":1183,"kind":"internal"},{"pos":1185,"end":1233,"kind":"text"}],"mapHash":"-113365255-{\"version\":3,\"file\":\"second-output.d.ts\",\"sourceRoot\":\"\",\"sources\":[\"../first/first_PART1.ts\",\"../first/first_part3.ts\",\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"AAAc,UAAU,QAAQ;IAC5B,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,iBAAiB,CAAC;AAEzB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEK,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;IACN,IAAI,CAAC,IACM,MAAM,CADK;IACtB,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACvC;AACD,kBAAU,OAAO,CAAC;IACA,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACrD;AACa,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,aAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC3C,cAAM,CAAC;IACH,WAAW;CAGd\"}","hash":"-13432536459-interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hello, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ndeclare type internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n//# sourceMappingURL=second-output.d.ts.map"}},"program":{"fileNames":["../second/second_part1.ts","../second/second_part2.ts"],"fileInfos":["13528403307-namespace N {\r\n    // Comment text\r\n}\r\n\r\nnamespace N {\r\n    function f() {\r\n        console.log('testing');\r\n    }\r\n\r\n    f();\r\n}\r\n\nclass normalC {\n    /*@internal*/ constructor() { }\n    /*@internal*/ prop: string;\n    /*@internal*/ method() { }\n    /*@internal*/ get c() { return 10; }\n    /*@internal*/ set c(val: number) { }\n}\nnamespace normalN {\n    /*@internal*/ export class C { }\n    /*@internal*/ export function foo() {}\n    /*@internal*/ export namespace someNamespace { export class C {} }\n    /*@internal*/ export namespace someOther.something { export class someClass {} }\n    /*@internal*/ export import someImport = someNamespace.C;\n    /*@internal*/ export type internalType = internalC;\n    /*@internal*/ export const internalConst = 10;\n    /*@internal*/ export enum internalEnum { a, b, c }\n}\n/*@internal*/ class internalC {}\n/*@internal*/ function internalfoo() {}\n/*@internal*/ namespace internalNamespace { export class someClass {} }\n/*@internal*/ namespace internalOther.something { export class someClass {} }\n/*@internal*/ import internalImport = internalNamespace.someClass;\n/*@internal*/ type internalType = internalC;\n/*@internal*/ const internalConst = 10;\n/*@internal*/ enum internalEnum { a, b, c }","9339262372-class C {\r\n    doSomething() {\r\n        console.log(\"something got done\");\r\n    }\r\n}\r\n"],"options":{"composite":true,"outFile":"./second-output.js"},"outSignature":"-25454326822-interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hello, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ndeclare type internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n","latestChangedDtsFile":"./second-output.d.ts"},"version":"FakeTSVersion"}
+{"bundle":{"commonSourceDirectory":"../second","sourceFiles":["../second/second_part1.ts","../second/second_part2.ts"],"js":{"sections":[{"pos":0,"end":110,"kind":"prepend","data":"../first/bin/first-output.js","texts":[{"pos":0,"end":110,"kind":"text"}]},{"pos":110,"end":3163,"kind":"text"}],"mapHash":"-31829622207-{\"version\":3,\"file\":\"second-output.js\",\"sourceRoot\":\"\",\"sources\":[\"../first/first_PART1.ts\",\"../first/first_part2.ts\",\"../first/first_part3.ts\",\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"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\"}","hash":"144238636645-var s = \"Hello, world\";\r\nconsole.log(s);\r\nconsole.log(f());\r\nfunction f() {\r\n    return \"JS does hoists\";\r\n}\r\nvar N;\r\n(function (N) {\r\n    function f() {\r\n        console.log('testing');\r\n    }\r\n    f();\r\n})(N || (N = {}));\r\nvar normalC = (function () {\r\n    function normalC() {\r\n    }\r\n    normalC.prototype.method = function () { };\r\n    Object.defineProperty(normalC.prototype, \"c\", {\r\n        get: function () { return 10; },\r\n        set: function (val) { },\r\n        enumerable: false,\r\n        configurable: true\r\n    });\r\n    return normalC;\r\n}());\r\nvar normalN;\r\n(function (normalN) {\r\n    var C = (function () {\r\n        function C() {\r\n        }\r\n        return C;\r\n    }());\r\n    normalN.C = C;\r\n    function foo() { }\r\n    normalN.foo = foo;\r\n    var someNamespace;\r\n    (function (someNamespace) {\r\n        var C = (function () {\r\n            function C() {\r\n            }\r\n            return C;\r\n        }());\r\n        someNamespace.C = C;\r\n    })(someNamespace = normalN.someNamespace || (normalN.someNamespace = {}));\r\n    var someOther;\r\n    (function (someOther) {\r\n        var something;\r\n        (function (something) {\r\n            var someClass = (function () {\r\n                function someClass() {\r\n                }\r\n                return someClass;\r\n            }());\r\n            something.someClass = someClass;\r\n        })(something = someOther.something || (someOther.something = {}));\r\n    })(someOther = normalN.someOther || (normalN.someOther = {}));\r\n    normalN.someImport = someNamespace.C;\r\n    normalN.internalConst = 10;\r\n    var internalEnum;\r\n    (function (internalEnum) {\r\n        internalEnum[internalEnum[\"a\"] = 0] = \"a\";\r\n        internalEnum[internalEnum[\"b\"] = 1] = \"b\";\r\n        internalEnum[internalEnum[\"c\"] = 2] = \"c\";\r\n    })(internalEnum = normalN.internalEnum || (normalN.internalEnum = {}));\r\n})(normalN || (normalN = {}));\r\nvar internalC = (function () {\r\n    function internalC() {\r\n    }\r\n    return internalC;\r\n}());\r\nfunction internalfoo() { }\r\nvar internalNamespace;\r\n(function (internalNamespace) {\r\n    var someClass = (function () {\r\n        function someClass() {\r\n        }\r\n        return someClass;\r\n    }());\r\n    internalNamespace.someClass = someClass;\r\n})(internalNamespace || (internalNamespace = {}));\r\nvar internalOther;\r\n(function (internalOther) {\r\n    var something;\r\n    (function (something) {\r\n        var someClass = (function () {\r\n            function someClass() {\r\n            }\r\n            return someClass;\r\n        }());\r\n        something.someClass = someClass;\r\n    })(something = internalOther.something || (internalOther.something = {}));\r\n})(internalOther || (internalOther = {}));\r\nvar internalImport = internalNamespace.someClass;\r\nvar internalConst = 10;\r\nvar internalEnum;\r\n(function (internalEnum) {\r\n    internalEnum[internalEnum[\"a\"] = 0] = \"a\";\r\n    internalEnum[internalEnum[\"b\"] = 1] = \"b\";\r\n    internalEnum[internalEnum[\"c\"] = 2] = \"c\";\r\n})(internalEnum || (internalEnum = {}));\r\nvar C = (function () {\r\n    function C() {\r\n    }\r\n    C.prototype.doSomething = function () {\r\n        console.log(\"something got done\");\r\n    };\r\n    return C;\r\n}());\r\n//# sourceMappingURL=second-output.js.map"},"dts":{"sections":[{"pos":0,"end":157,"kind":"prepend","data":"../first/bin/first-output.d.ts","texts":[{"pos":0,"end":39,"kind":"internal"},{"pos":41,"end":157,"kind":"text"}]},{"pos":157,"end":234,"kind":"text"},{"pos":234,"end":339,"kind":"internal"},{"pos":341,"end":373,"kind":"text"},{"pos":373,"end":765,"kind":"internal"},{"pos":767,"end":770,"kind":"text"},{"pos":770,"end":1175,"kind":"internal"},{"pos":1177,"end":1225,"kind":"text"}],"mapHash":"13974556515-{\"version\":3,\"file\":\"second-output.d.ts\",\"sourceRoot\":\"\",\"sources\":[\"../first/first_PART1.ts\",\"../first/first_part3.ts\",\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"AAAc,UAAU,QAAQ;IAC5B,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,iBAAiB,CAAC;AAEzB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEK,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;IACN,IAAI,CAAC,IACM,MAAM,CADK;IACtB,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACvC;AACD,kBAAU,OAAO,CAAC;IACA,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACrD;AACa,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,KAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC3C,cAAM,CAAC;IACH,WAAW;CAGd\"}","hash":"-76652520731-interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hello, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ntype internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n//# sourceMappingURL=second-output.d.ts.map"}},"program":{"fileNames":["../second/second_part1.ts","../second/second_part2.ts"],"fileInfos":["13528403307-namespace N {\r\n    // Comment text\r\n}\r\n\r\nnamespace N {\r\n    function f() {\r\n        console.log('testing');\r\n    }\r\n\r\n    f();\r\n}\r\n\nclass normalC {\n    /*@internal*/ constructor() { }\n    /*@internal*/ prop: string;\n    /*@internal*/ method() { }\n    /*@internal*/ get c() { return 10; }\n    /*@internal*/ set c(val: number) { }\n}\nnamespace normalN {\n    /*@internal*/ export class C { }\n    /*@internal*/ export function foo() {}\n    /*@internal*/ export namespace someNamespace { export class C {} }\n    /*@internal*/ export namespace someOther.something { export class someClass {} }\n    /*@internal*/ export import someImport = someNamespace.C;\n    /*@internal*/ export type internalType = internalC;\n    /*@internal*/ export const internalConst = 10;\n    /*@internal*/ export enum internalEnum { a, b, c }\n}\n/*@internal*/ class internalC {}\n/*@internal*/ function internalfoo() {}\n/*@internal*/ namespace internalNamespace { export class someClass {} }\n/*@internal*/ namespace internalOther.something { export class someClass {} }\n/*@internal*/ import internalImport = internalNamespace.someClass;\n/*@internal*/ type internalType = internalC;\n/*@internal*/ const internalConst = 10;\n/*@internal*/ enum internalEnum { a, b, c }","9339262372-class C {\r\n    doSomething() {\r\n        console.log(\"something got done\");\r\n    }\r\n}\r\n"],"options":{"composite":true,"outFile":"./second-output.js"},"outSignature":"-68578080182-interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hello, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ntype internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n","latestChangedDtsFile":"./second-output.d.ts"},"version":"FakeTSVersion"}
 
 //// [/src/2/second-output.tsbuildinfo.baseline.txt]
 ======================================================================
@@ -2955,7 +2956,7 @@ text: (767-770)
 }
 
 ----------------------------------------------------------------------
-internal: (770-1183)
+internal: (770-1175)
 declare class internalC {
 }
 declare function internalfoo(): void;
@@ -2968,7 +2969,7 @@ declare namespace internalOther.something {
     }
 }
 import internalImport = internalNamespace.someClass;
-declare type internalType = internalC;
+type internalType = internalC;
 declare const internalConst = 10;
 declare enum internalEnum {
     a = 0,
@@ -2976,7 +2977,7 @@ declare enum internalEnum {
     c = 2
 }
 ----------------------------------------------------------------------
-text: (1185-1233)
+text: (1177-1225)
 declare class C {
     doSomething(): void;
 }
@@ -3062,17 +3063,17 @@ declare class C {
         },
         {
           "pos": 770,
-          "end": 1183,
+          "end": 1175,
           "kind": "internal"
         },
         {
-          "pos": 1185,
-          "end": 1233,
+          "pos": 1177,
+          "end": 1225,
           "kind": "text"
         }
       ],
-      "hash": "-13432536459-interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hello, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ndeclare type internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n//# sourceMappingURL=second-output.d.ts.map",
-      "mapHash": "-113365255-{\"version\":3,\"file\":\"second-output.d.ts\",\"sourceRoot\":\"\",\"sources\":[\"../first/first_PART1.ts\",\"../first/first_part3.ts\",\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"AAAc,UAAU,QAAQ;IAC5B,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,iBAAiB,CAAC;AAEzB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEK,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;IACN,IAAI,CAAC,IACM,MAAM,CADK;IACtB,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACvC;AACD,kBAAU,OAAO,CAAC;IACA,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACrD;AACa,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,aAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC3C,cAAM,CAAC;IACH,WAAW;CAGd\"}"
+      "hash": "-76652520731-interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hello, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ntype internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n//# sourceMappingURL=second-output.d.ts.map",
+      "mapHash": "13974556515-{\"version\":3,\"file\":\"second-output.d.ts\",\"sourceRoot\":\"\",\"sources\":[\"../first/first_PART1.ts\",\"../first/first_part3.ts\",\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"AAAc,UAAU,QAAQ;IAC5B,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,iBAAiB,CAAC;AAEzB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEK,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;IACN,IAAI,CAAC,IACM,MAAM,CADK;IACtB,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACvC;AACD,kBAAU,OAAO,CAAC;IACA,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACrD;AACa,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,KAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC3C,cAAM,CAAC;IACH,WAAW;CAGd\"}"
     }
   },
   "program": {
@@ -3088,11 +3089,11 @@ declare class C {
       "composite": true,
       "outFile": "./second-output.js"
     },
-    "outSignature": "-25454326822-interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hello, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ndeclare type internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n",
+    "outSignature": "-68578080182-interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hello, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ntype internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n",
     "latestChangedDtsFile": "./second-output.d.ts"
   },
   "version": "FakeTSVersion",
-  "size": 12286
+  "size": 12271
 }
 
 //// [/src/first/bin/first-output.d.ts]
@@ -5867,7 +5868,7 @@ declare namespace internalOther.something {
     }
 }
 import internalImport = internalNamespace.someClass;
-declare type internalType = internalC;
+type internalType = internalC;
 declare const internalConst = 10;
 declare enum internalEnum {
     a = 0,
@@ -5880,7 +5881,7 @@ declare class C {
 //# sourceMappingURL=second-output.d.ts.map
 
 //// [/src/2/second-output.d.ts.map]
-{"version":3,"file":"second-output.d.ts","sourceRoot":"","sources":["../first/first_PART1.ts","../first/first_part3.ts","../second/second_part1.ts","../second/second_part2.ts"],"names":[],"mappings":"AAAc,UAAU,QAAQ;IAC5B,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,gBAAgB,CAAC;AAExB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEK,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;IACN,IAAI,CAAC,IACM,MAAM,CADK;IACtB,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACvC;AACD,kBAAU,OAAO,CAAC;IACA,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACrD;AACa,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,aAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC3C,cAAM,CAAC;IACH,WAAW;CAGd"}
+{"version":3,"file":"second-output.d.ts","sourceRoot":"","sources":["../first/first_PART1.ts","../first/first_part3.ts","../second/second_part1.ts","../second/second_part2.ts"],"names":[],"mappings":"AAAc,UAAU,QAAQ;IAC5B,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,gBAAgB,CAAC;AAExB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEK,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;IACN,IAAI,CAAC,IACM,MAAM,CADK;IACtB,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACvC;AACD,kBAAU,OAAO,CAAC;IACA,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACrD;AACa,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,KAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC3C,cAAM,CAAC;IACH,WAAW;CAGd"}
 
 //// [/src/2/second-output.d.ts.map.baseline.txt]
 ===================================================================
@@ -6559,42 +6560,43 @@ sourceFile:../second/second_part1.ts
 7 >Emitted(52, 52) Source(34, 66) + SourceIndex(2)
 8 >Emitted(52, 53) Source(34, 67) + SourceIndex(2)
 ---
->>>declare type internalType = internalC;
+>>>type internalType = internalC;
 1 >
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^^^^^
-4 >                         ^^^
-5 >                            ^^^^^^^^^
-6 >                                     ^
+2 >^^^^^
+3 >     ^^^^^^^^^^^^
+4 >                 ^^^
+5 >                    ^^^^^^^^^
+6 >                             ^
+7 >                              ^^^^->
 1 >
   >/*@internal*/ 
 2 >type 
-3 >             internalType
-4 >                          = 
-5 >                            internalC
-6 >                                     ;
+3 >     internalType
+4 >                  = 
+5 >                    internalC
+6 >                             ;
 1 >Emitted(53, 1) Source(35, 15) + SourceIndex(2)
-2 >Emitted(53, 14) Source(35, 20) + SourceIndex(2)
-3 >Emitted(53, 26) Source(35, 32) + SourceIndex(2)
-4 >Emitted(53, 29) Source(35, 35) + SourceIndex(2)
-5 >Emitted(53, 38) Source(35, 44) + SourceIndex(2)
-6 >Emitted(53, 39) Source(35, 45) + SourceIndex(2)
+2 >Emitted(53, 6) Source(35, 20) + SourceIndex(2)
+3 >Emitted(53, 18) Source(35, 32) + SourceIndex(2)
+4 >Emitted(53, 21) Source(35, 35) + SourceIndex(2)
+5 >Emitted(53, 30) Source(35, 44) + SourceIndex(2)
+6 >Emitted(53, 31) Source(35, 45) + SourceIndex(2)
 ---
 >>>declare const internalConst = 10;
-1 >
+1->
 2 >^^^^^^^^
 3 >        ^^^^^^
 4 >              ^^^^^^^^^^^^^
 5 >                           ^^^^^
 6 >                                ^
-1 >
+1->
   >/*@internal*/ 
 2 >
 3 >        const 
 4 >              internalConst
 5 >                            = 10
 6 >                                ;
-1 >Emitted(54, 1) Source(36, 15) + SourceIndex(2)
+1->Emitted(54, 1) Source(36, 15) + SourceIndex(2)
 2 >Emitted(54, 9) Source(36, 15) + SourceIndex(2)
 3 >Emitted(54, 15) Source(36, 21) + SourceIndex(2)
 4 >Emitted(54, 28) Source(36, 34) + SourceIndex(2)
@@ -8386,7 +8388,7 @@ sourceFile:../second/second_part2.ts
 >>>//# sourceMappingURL=second-output.js.map
 
 //// [/src/2/second-output.tsbuildinfo]
-{"bundle":{"commonSourceDirectory":"../second","sourceFiles":["../second/second_part1.ts","../second/second_part2.ts"],"js":{"sections":[{"pos":0,"end":109,"kind":"prepend","data":"../first/bin/first-output.js","texts":[{"pos":0,"end":109,"kind":"text"}]},{"pos":109,"end":3162,"kind":"text"}],"mapHash":"44741038523-{\"version\":3,\"file\":\"second-output.js\",\"sourceRoot\":\"\",\"sources\":[\"../first/first_PART1.ts\",\"../first/first_part2.ts\",\"../first/first_part3.ts\",\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"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\"}","hash":"-81921877035-var s = \"Hola, world\";\r\nconsole.log(s);\r\nconsole.log(f());\r\nfunction f() {\r\n    return \"JS does hoists\";\r\n}\r\nvar N;\r\n(function (N) {\r\n    function f() {\r\n        console.log('testing');\r\n    }\r\n    f();\r\n})(N || (N = {}));\r\nvar normalC = (function () {\r\n    function normalC() {\r\n    }\r\n    normalC.prototype.method = function () { };\r\n    Object.defineProperty(normalC.prototype, \"c\", {\r\n        get: function () { return 10; },\r\n        set: function (val) { },\r\n        enumerable: false,\r\n        configurable: true\r\n    });\r\n    return normalC;\r\n}());\r\nvar normalN;\r\n(function (normalN) {\r\n    var C = (function () {\r\n        function C() {\r\n        }\r\n        return C;\r\n    }());\r\n    normalN.C = C;\r\n    function foo() { }\r\n    normalN.foo = foo;\r\n    var someNamespace;\r\n    (function (someNamespace) {\r\n        var C = (function () {\r\n            function C() {\r\n            }\r\n            return C;\r\n        }());\r\n        someNamespace.C = C;\r\n    })(someNamespace = normalN.someNamespace || (normalN.someNamespace = {}));\r\n    var someOther;\r\n    (function (someOther) {\r\n        var something;\r\n        (function (something) {\r\n            var someClass = (function () {\r\n                function someClass() {\r\n                }\r\n                return someClass;\r\n            }());\r\n            something.someClass = someClass;\r\n        })(something = someOther.something || (someOther.something = {}));\r\n    })(someOther = normalN.someOther || (normalN.someOther = {}));\r\n    normalN.someImport = someNamespace.C;\r\n    normalN.internalConst = 10;\r\n    var internalEnum;\r\n    (function (internalEnum) {\r\n        internalEnum[internalEnum[\"a\"] = 0] = \"a\";\r\n        internalEnum[internalEnum[\"b\"] = 1] = \"b\";\r\n        internalEnum[internalEnum[\"c\"] = 2] = \"c\";\r\n    })(internalEnum = normalN.internalEnum || (normalN.internalEnum = {}));\r\n})(normalN || (normalN = {}));\r\nvar internalC = (function () {\r\n    function internalC() {\r\n    }\r\n    return internalC;\r\n}());\r\nfunction internalfoo() { }\r\nvar internalNamespace;\r\n(function (internalNamespace) {\r\n    var someClass = (function () {\r\n        function someClass() {\r\n        }\r\n        return someClass;\r\n    }());\r\n    internalNamespace.someClass = someClass;\r\n})(internalNamespace || (internalNamespace = {}));\r\nvar internalOther;\r\n(function (internalOther) {\r\n    var something;\r\n    (function (something) {\r\n        var someClass = (function () {\r\n            function someClass() {\r\n            }\r\n            return someClass;\r\n        }());\r\n        something.someClass = someClass;\r\n    })(something = internalOther.something || (internalOther.something = {}));\r\n})(internalOther || (internalOther = {}));\r\nvar internalImport = internalNamespace.someClass;\r\nvar internalConst = 10;\r\nvar internalEnum;\r\n(function (internalEnum) {\r\n    internalEnum[internalEnum[\"a\"] = 0] = \"a\";\r\n    internalEnum[internalEnum[\"b\"] = 1] = \"b\";\r\n    internalEnum[internalEnum[\"c\"] = 2] = \"c\";\r\n})(internalEnum || (internalEnum = {}));\r\nvar C = (function () {\r\n    function C() {\r\n    }\r\n    C.prototype.doSomething = function () {\r\n        console.log(\"something got done\");\r\n    };\r\n    return C;\r\n}());\r\n//# sourceMappingURL=second-output.js.map"},"dts":{"sections":[{"pos":0,"end":156,"kind":"prepend","data":"../first/bin/first-output.d.ts","texts":[{"pos":0,"end":39,"kind":"internal"},{"pos":41,"end":156,"kind":"text"}]},{"pos":156,"end":233,"kind":"text"},{"pos":233,"end":338,"kind":"internal"},{"pos":340,"end":372,"kind":"text"},{"pos":372,"end":764,"kind":"internal"},{"pos":766,"end":769,"kind":"text"},{"pos":769,"end":1182,"kind":"internal"},{"pos":1184,"end":1232,"kind":"text"}],"mapHash":"64998097715-{\"version\":3,\"file\":\"second-output.d.ts\",\"sourceRoot\":\"\",\"sources\":[\"../first/first_PART1.ts\",\"../first/first_part3.ts\",\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"AAAc,UAAU,QAAQ;IAC5B,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,gBAAgB,CAAC;AAExB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEK,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;IACN,IAAI,CAAC,IACM,MAAM,CADK;IACtB,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACvC;AACD,kBAAU,OAAO,CAAC;IACA,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACrD;AACa,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,aAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC3C,cAAM,CAAC;IACH,WAAW;CAGd\"}","hash":"-69637640283-interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hola, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ndeclare type internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n//# sourceMappingURL=second-output.d.ts.map"}},"program":{"fileNames":["../second/second_part1.ts","../second/second_part2.ts"],"fileInfos":["13528403307-namespace N {\r\n    // Comment text\r\n}\r\n\r\nnamespace N {\r\n    function f() {\r\n        console.log('testing');\r\n    }\r\n\r\n    f();\r\n}\r\n\nclass normalC {\n    /*@internal*/ constructor() { }\n    /*@internal*/ prop: string;\n    /*@internal*/ method() { }\n    /*@internal*/ get c() { return 10; }\n    /*@internal*/ set c(val: number) { }\n}\nnamespace normalN {\n    /*@internal*/ export class C { }\n    /*@internal*/ export function foo() {}\n    /*@internal*/ export namespace someNamespace { export class C {} }\n    /*@internal*/ export namespace someOther.something { export class someClass {} }\n    /*@internal*/ export import someImport = someNamespace.C;\n    /*@internal*/ export type internalType = internalC;\n    /*@internal*/ export const internalConst = 10;\n    /*@internal*/ export enum internalEnum { a, b, c }\n}\n/*@internal*/ class internalC {}\n/*@internal*/ function internalfoo() {}\n/*@internal*/ namespace internalNamespace { export class someClass {} }\n/*@internal*/ namespace internalOther.something { export class someClass {} }\n/*@internal*/ import internalImport = internalNamespace.someClass;\n/*@internal*/ type internalType = internalC;\n/*@internal*/ const internalConst = 10;\n/*@internal*/ enum internalEnum { a, b, c }","9339262372-class C {\r\n    doSomething() {\r\n        console.log(\"something got done\");\r\n    }\r\n}\r\n"],"options":{"composite":true,"outFile":"./second-output.js"},"outSignature":"-86912100598-interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hola, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ndeclare type internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n","latestChangedDtsFile":"./second-output.d.ts"},"version":"FakeTSVersion"}
+{"bundle":{"commonSourceDirectory":"../second","sourceFiles":["../second/second_part1.ts","../second/second_part2.ts"],"js":{"sections":[{"pos":0,"end":109,"kind":"prepend","data":"../first/bin/first-output.js","texts":[{"pos":0,"end":109,"kind":"text"}]},{"pos":109,"end":3162,"kind":"text"}],"mapHash":"44741038523-{\"version\":3,\"file\":\"second-output.js\",\"sourceRoot\":\"\",\"sources\":[\"../first/first_PART1.ts\",\"../first/first_part2.ts\",\"../first/first_part3.ts\",\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"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\"}","hash":"-81921877035-var s = \"Hola, world\";\r\nconsole.log(s);\r\nconsole.log(f());\r\nfunction f() {\r\n    return \"JS does hoists\";\r\n}\r\nvar N;\r\n(function (N) {\r\n    function f() {\r\n        console.log('testing');\r\n    }\r\n    f();\r\n})(N || (N = {}));\r\nvar normalC = (function () {\r\n    function normalC() {\r\n    }\r\n    normalC.prototype.method = function () { };\r\n    Object.defineProperty(normalC.prototype, \"c\", {\r\n        get: function () { return 10; },\r\n        set: function (val) { },\r\n        enumerable: false,\r\n        configurable: true\r\n    });\r\n    return normalC;\r\n}());\r\nvar normalN;\r\n(function (normalN) {\r\n    var C = (function () {\r\n        function C() {\r\n        }\r\n        return C;\r\n    }());\r\n    normalN.C = C;\r\n    function foo() { }\r\n    normalN.foo = foo;\r\n    var someNamespace;\r\n    (function (someNamespace) {\r\n        var C = (function () {\r\n            function C() {\r\n            }\r\n            return C;\r\n        }());\r\n        someNamespace.C = C;\r\n    })(someNamespace = normalN.someNamespace || (normalN.someNamespace = {}));\r\n    var someOther;\r\n    (function (someOther) {\r\n        var something;\r\n        (function (something) {\r\n            var someClass = (function () {\r\n                function someClass() {\r\n                }\r\n                return someClass;\r\n            }());\r\n            something.someClass = someClass;\r\n        })(something = someOther.something || (someOther.something = {}));\r\n    })(someOther = normalN.someOther || (normalN.someOther = {}));\r\n    normalN.someImport = someNamespace.C;\r\n    normalN.internalConst = 10;\r\n    var internalEnum;\r\n    (function (internalEnum) {\r\n        internalEnum[internalEnum[\"a\"] = 0] = \"a\";\r\n        internalEnum[internalEnum[\"b\"] = 1] = \"b\";\r\n        internalEnum[internalEnum[\"c\"] = 2] = \"c\";\r\n    })(internalEnum = normalN.internalEnum || (normalN.internalEnum = {}));\r\n})(normalN || (normalN = {}));\r\nvar internalC = (function () {\r\n    function internalC() {\r\n    }\r\n    return internalC;\r\n}());\r\nfunction internalfoo() { }\r\nvar internalNamespace;\r\n(function (internalNamespace) {\r\n    var someClass = (function () {\r\n        function someClass() {\r\n        }\r\n        return someClass;\r\n    }());\r\n    internalNamespace.someClass = someClass;\r\n})(internalNamespace || (internalNamespace = {}));\r\nvar internalOther;\r\n(function (internalOther) {\r\n    var something;\r\n    (function (something) {\r\n        var someClass = (function () {\r\n            function someClass() {\r\n            }\r\n            return someClass;\r\n        }());\r\n        something.someClass = someClass;\r\n    })(something = internalOther.something || (internalOther.something = {}));\r\n})(internalOther || (internalOther = {}));\r\nvar internalImport = internalNamespace.someClass;\r\nvar internalConst = 10;\r\nvar internalEnum;\r\n(function (internalEnum) {\r\n    internalEnum[internalEnum[\"a\"] = 0] = \"a\";\r\n    internalEnum[internalEnum[\"b\"] = 1] = \"b\";\r\n    internalEnum[internalEnum[\"c\"] = 2] = \"c\";\r\n})(internalEnum || (internalEnum = {}));\r\nvar C = (function () {\r\n    function C() {\r\n    }\r\n    C.prototype.doSomething = function () {\r\n        console.log(\"something got done\");\r\n    };\r\n    return C;\r\n}());\r\n//# sourceMappingURL=second-output.js.map"},"dts":{"sections":[{"pos":0,"end":156,"kind":"prepend","data":"../first/bin/first-output.d.ts","texts":[{"pos":0,"end":39,"kind":"internal"},{"pos":41,"end":156,"kind":"text"}]},{"pos":156,"end":233,"kind":"text"},{"pos":233,"end":338,"kind":"internal"},{"pos":340,"end":372,"kind":"text"},{"pos":372,"end":764,"kind":"internal"},{"pos":766,"end":769,"kind":"text"},{"pos":769,"end":1174,"kind":"internal"},{"pos":1176,"end":1224,"kind":"text"}],"mapHash":"96265888669-{\"version\":3,\"file\":\"second-output.d.ts\",\"sourceRoot\":\"\",\"sources\":[\"../first/first_PART1.ts\",\"../first/first_part3.ts\",\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"AAAc,UAAU,QAAQ;IAC5B,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,gBAAgB,CAAC;AAExB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEK,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;IACN,IAAI,CAAC,IACM,MAAM,CADK;IACtB,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACvC;AACD,kBAAU,OAAO,CAAC;IACA,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACrD;AACa,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,KAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC3C,cAAM,CAAC;IACH,WAAW;CAGd\"}","hash":"-114771929067-interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hola, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ntype internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n//# sourceMappingURL=second-output.d.ts.map"}},"program":{"fileNames":["../second/second_part1.ts","../second/second_part2.ts"],"fileInfos":["13528403307-namespace N {\r\n    // Comment text\r\n}\r\n\r\nnamespace N {\r\n    function f() {\r\n        console.log('testing');\r\n    }\r\n\r\n    f();\r\n}\r\n\nclass normalC {\n    /*@internal*/ constructor() { }\n    /*@internal*/ prop: string;\n    /*@internal*/ method() { }\n    /*@internal*/ get c() { return 10; }\n    /*@internal*/ set c(val: number) { }\n}\nnamespace normalN {\n    /*@internal*/ export class C { }\n    /*@internal*/ export function foo() {}\n    /*@internal*/ export namespace someNamespace { export class C {} }\n    /*@internal*/ export namespace someOther.something { export class someClass {} }\n    /*@internal*/ export import someImport = someNamespace.C;\n    /*@internal*/ export type internalType = internalC;\n    /*@internal*/ export const internalConst = 10;\n    /*@internal*/ export enum internalEnum { a, b, c }\n}\n/*@internal*/ class internalC {}\n/*@internal*/ function internalfoo() {}\n/*@internal*/ namespace internalNamespace { export class someClass {} }\n/*@internal*/ namespace internalOther.something { export class someClass {} }\n/*@internal*/ import internalImport = internalNamespace.someClass;\n/*@internal*/ type internalType = internalC;\n/*@internal*/ const internalConst = 10;\n/*@internal*/ enum internalEnum { a, b, c }","9339262372-class C {\r\n    doSomething() {\r\n        console.log(\"something got done\");\r\n    }\r\n}\r\n"],"options":{"composite":true,"outFile":"./second-output.js"},"outSignature":"-95739042438-interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hola, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ntype internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n","latestChangedDtsFile":"./second-output.d.ts"},"version":"FakeTSVersion"}
 
 //// [/src/2/second-output.tsbuildinfo.baseline.txt]
 ======================================================================
@@ -8571,7 +8573,7 @@ text: (766-769)
 }
 
 ----------------------------------------------------------------------
-internal: (769-1182)
+internal: (769-1174)
 declare class internalC {
 }
 declare function internalfoo(): void;
@@ -8584,7 +8586,7 @@ declare namespace internalOther.something {
     }
 }
 import internalImport = internalNamespace.someClass;
-declare type internalType = internalC;
+type internalType = internalC;
 declare const internalConst = 10;
 declare enum internalEnum {
     a = 0,
@@ -8592,7 +8594,7 @@ declare enum internalEnum {
     c = 2
 }
 ----------------------------------------------------------------------
-text: (1184-1232)
+text: (1176-1224)
 declare class C {
     doSomething(): void;
 }
@@ -8678,17 +8680,17 @@ declare class C {
         },
         {
           "pos": 769,
-          "end": 1182,
+          "end": 1174,
           "kind": "internal"
         },
         {
-          "pos": 1184,
-          "end": 1232,
+          "pos": 1176,
+          "end": 1224,
           "kind": "text"
         }
       ],
-      "hash": "-69637640283-interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hola, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ndeclare type internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n//# sourceMappingURL=second-output.d.ts.map",
-      "mapHash": "64998097715-{\"version\":3,\"file\":\"second-output.d.ts\",\"sourceRoot\":\"\",\"sources\":[\"../first/first_PART1.ts\",\"../first/first_part3.ts\",\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"AAAc,UAAU,QAAQ;IAC5B,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,gBAAgB,CAAC;AAExB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEK,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;IACN,IAAI,CAAC,IACM,MAAM,CADK;IACtB,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACvC;AACD,kBAAU,OAAO,CAAC;IACA,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACrD;AACa,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,aAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC3C,cAAM,CAAC;IACH,WAAW;CAGd\"}"
+      "hash": "-114771929067-interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hola, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ntype internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n//# sourceMappingURL=second-output.d.ts.map",
+      "mapHash": "96265888669-{\"version\":3,\"file\":\"second-output.d.ts\",\"sourceRoot\":\"\",\"sources\":[\"../first/first_PART1.ts\",\"../first/first_part3.ts\",\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"AAAc,UAAU,QAAQ;IAC5B,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,gBAAgB,CAAC;AAExB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEK,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;IACN,IAAI,CAAC,IACM,MAAM,CADK;IACtB,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACvC;AACD,kBAAU,OAAO,CAAC;IACA,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACrD;AACa,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,KAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC3C,cAAM,CAAC;IACH,WAAW;CAGd\"}"
     }
   },
   "program": {
@@ -8704,11 +8706,11 @@ declare class C {
       "composite": true,
       "outFile": "./second-output.js"
     },
-    "outSignature": "-86912100598-interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hola, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ndeclare type internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n",
+    "outSignature": "-95739042438-interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hola, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ntype internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n",
     "latestChangedDtsFile": "./second-output.d.ts"
   },
   "version": "FakeTSVersion",
-  "size": 12283
+  "size": 12268
 }
 
 //// [/src/first/bin/first-output.d.ts]
@@ -13156,7 +13158,7 @@ sourceFile:../second/second_part2.ts
 >>>//# sourceMappingURL=second-output.js.map
 
 //// [/src/2/second-output.tsbuildinfo]
-{"bundle":{"commonSourceDirectory":"../second","sourceFiles":["../second/second_part1.ts","../second/second_part2.ts"],"js":{"sections":[{"pos":0,"end":126,"kind":"prepend","data":"../first/bin/first-output.js","texts":[{"pos":0,"end":126,"kind":"text"}]},{"pos":126,"end":3179,"kind":"text"}],"mapHash":"25332072687-{\"version\":3,\"file\":\"second-output.js\",\"sourceRoot\":\"\",\"sources\":[\"../first/first_PART1.ts\",\"../first/first_part2.ts\",\"../first/first_part3.ts\",\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"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\"}","hash":"-22338327474-var s = \"Hola, world\";\r\nconsole.log(s);\r\nconsole.log(s);\r\nconsole.log(f());\r\nfunction f() {\r\n    return \"JS does hoists\";\r\n}\r\nvar N;\r\n(function (N) {\r\n    function f() {\r\n        console.log('testing');\r\n    }\r\n    f();\r\n})(N || (N = {}));\r\nvar normalC = (function () {\r\n    function normalC() {\r\n    }\r\n    normalC.prototype.method = function () { };\r\n    Object.defineProperty(normalC.prototype, \"c\", {\r\n        get: function () { return 10; },\r\n        set: function (val) { },\r\n        enumerable: false,\r\n        configurable: true\r\n    });\r\n    return normalC;\r\n}());\r\nvar normalN;\r\n(function (normalN) {\r\n    var C = (function () {\r\n        function C() {\r\n        }\r\n        return C;\r\n    }());\r\n    normalN.C = C;\r\n    function foo() { }\r\n    normalN.foo = foo;\r\n    var someNamespace;\r\n    (function (someNamespace) {\r\n        var C = (function () {\r\n            function C() {\r\n            }\r\n            return C;\r\n        }());\r\n        someNamespace.C = C;\r\n    })(someNamespace = normalN.someNamespace || (normalN.someNamespace = {}));\r\n    var someOther;\r\n    (function (someOther) {\r\n        var something;\r\n        (function (something) {\r\n            var someClass = (function () {\r\n                function someClass() {\r\n                }\r\n                return someClass;\r\n            }());\r\n            something.someClass = someClass;\r\n        })(something = someOther.something || (someOther.something = {}));\r\n    })(someOther = normalN.someOther || (normalN.someOther = {}));\r\n    normalN.someImport = someNamespace.C;\r\n    normalN.internalConst = 10;\r\n    var internalEnum;\r\n    (function (internalEnum) {\r\n        internalEnum[internalEnum[\"a\"] = 0] = \"a\";\r\n        internalEnum[internalEnum[\"b\"] = 1] = \"b\";\r\n        internalEnum[internalEnum[\"c\"] = 2] = \"c\";\r\n    })(internalEnum = normalN.internalEnum || (normalN.internalEnum = {}));\r\n})(normalN || (normalN = {}));\r\nvar internalC = (function () {\r\n    function internalC() {\r\n    }\r\n    return internalC;\r\n}());\r\nfunction internalfoo() { }\r\nvar internalNamespace;\r\n(function (internalNamespace) {\r\n    var someClass = (function () {\r\n        function someClass() {\r\n        }\r\n        return someClass;\r\n    }());\r\n    internalNamespace.someClass = someClass;\r\n})(internalNamespace || (internalNamespace = {}));\r\nvar internalOther;\r\n(function (internalOther) {\r\n    var something;\r\n    (function (something) {\r\n        var someClass = (function () {\r\n            function someClass() {\r\n            }\r\n            return someClass;\r\n        }());\r\n        something.someClass = someClass;\r\n    })(something = internalOther.something || (internalOther.something = {}));\r\n})(internalOther || (internalOther = {}));\r\nvar internalImport = internalNamespace.someClass;\r\nvar internalConst = 10;\r\nvar internalEnum;\r\n(function (internalEnum) {\r\n    internalEnum[internalEnum[\"a\"] = 0] = \"a\";\r\n    internalEnum[internalEnum[\"b\"] = 1] = \"b\";\r\n    internalEnum[internalEnum[\"c\"] = 2] = \"c\";\r\n})(internalEnum || (internalEnum = {}));\r\nvar C = (function () {\r\n    function C() {\r\n    }\r\n    C.prototype.doSomething = function () {\r\n        console.log(\"something got done\");\r\n    };\r\n    return C;\r\n}());\r\n//# sourceMappingURL=second-output.js.map"},"dts":{"sections":[{"pos":0,"end":156,"kind":"prepend","data":"../first/bin/first-output.d.ts","texts":[{"pos":0,"end":39,"kind":"internal"},{"pos":41,"end":156,"kind":"text"}]},{"pos":156,"end":233,"kind":"text"},{"pos":233,"end":338,"kind":"internal"},{"pos":340,"end":372,"kind":"text"},{"pos":372,"end":764,"kind":"internal"},{"pos":766,"end":769,"kind":"text"},{"pos":769,"end":1182,"kind":"internal"},{"pos":1184,"end":1232,"kind":"text"}],"mapHash":"64998097715-{\"version\":3,\"file\":\"second-output.d.ts\",\"sourceRoot\":\"\",\"sources\":[\"../first/first_PART1.ts\",\"../first/first_part3.ts\",\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"AAAc,UAAU,QAAQ;IAC5B,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,gBAAgB,CAAC;AAExB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEK,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;IACN,IAAI,CAAC,IACM,MAAM,CADK;IACtB,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACvC;AACD,kBAAU,OAAO,CAAC;IACA,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACrD;AACa,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,aAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC3C,cAAM,CAAC;IACH,WAAW;CAGd\"}","hash":"-69637640283-interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hola, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ndeclare type internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n//# sourceMappingURL=second-output.d.ts.map"}},"program":{"fileNames":["../second/second_part1.ts","../second/second_part2.ts"],"fileInfos":["13528403307-namespace N {\r\n    // Comment text\r\n}\r\n\r\nnamespace N {\r\n    function f() {\r\n        console.log('testing');\r\n    }\r\n\r\n    f();\r\n}\r\n\nclass normalC {\n    /*@internal*/ constructor() { }\n    /*@internal*/ prop: string;\n    /*@internal*/ method() { }\n    /*@internal*/ get c() { return 10; }\n    /*@internal*/ set c(val: number) { }\n}\nnamespace normalN {\n    /*@internal*/ export class C { }\n    /*@internal*/ export function foo() {}\n    /*@internal*/ export namespace someNamespace { export class C {} }\n    /*@internal*/ export namespace someOther.something { export class someClass {} }\n    /*@internal*/ export import someImport = someNamespace.C;\n    /*@internal*/ export type internalType = internalC;\n    /*@internal*/ export const internalConst = 10;\n    /*@internal*/ export enum internalEnum { a, b, c }\n}\n/*@internal*/ class internalC {}\n/*@internal*/ function internalfoo() {}\n/*@internal*/ namespace internalNamespace { export class someClass {} }\n/*@internal*/ namespace internalOther.something { export class someClass {} }\n/*@internal*/ import internalImport = internalNamespace.someClass;\n/*@internal*/ type internalType = internalC;\n/*@internal*/ const internalConst = 10;\n/*@internal*/ enum internalEnum { a, b, c }","9339262372-class C {\r\n    doSomething() {\r\n        console.log(\"something got done\");\r\n    }\r\n}\r\n"],"options":{"composite":true,"outFile":"./second-output.js"},"outSignature":"-86912100598-interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hola, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ndeclare type internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n","latestChangedDtsFile":"./second-output.d.ts"},"version":"FakeTSVersion"}
+{"bundle":{"commonSourceDirectory":"../second","sourceFiles":["../second/second_part1.ts","../second/second_part2.ts"],"js":{"sections":[{"pos":0,"end":126,"kind":"prepend","data":"../first/bin/first-output.js","texts":[{"pos":0,"end":126,"kind":"text"}]},{"pos":126,"end":3179,"kind":"text"}],"mapHash":"25332072687-{\"version\":3,\"file\":\"second-output.js\",\"sourceRoot\":\"\",\"sources\":[\"../first/first_PART1.ts\",\"../first/first_part2.ts\",\"../first/first_part3.ts\",\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"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\"}","hash":"-22338327474-var s = \"Hola, world\";\r\nconsole.log(s);\r\nconsole.log(s);\r\nconsole.log(f());\r\nfunction f() {\r\n    return \"JS does hoists\";\r\n}\r\nvar N;\r\n(function (N) {\r\n    function f() {\r\n        console.log('testing');\r\n    }\r\n    f();\r\n})(N || (N = {}));\r\nvar normalC = (function () {\r\n    function normalC() {\r\n    }\r\n    normalC.prototype.method = function () { };\r\n    Object.defineProperty(normalC.prototype, \"c\", {\r\n        get: function () { return 10; },\r\n        set: function (val) { },\r\n        enumerable: false,\r\n        configurable: true\r\n    });\r\n    return normalC;\r\n}());\r\nvar normalN;\r\n(function (normalN) {\r\n    var C = (function () {\r\n        function C() {\r\n        }\r\n        return C;\r\n    }());\r\n    normalN.C = C;\r\n    function foo() { }\r\n    normalN.foo = foo;\r\n    var someNamespace;\r\n    (function (someNamespace) {\r\n        var C = (function () {\r\n            function C() {\r\n            }\r\n            return C;\r\n        }());\r\n        someNamespace.C = C;\r\n    })(someNamespace = normalN.someNamespace || (normalN.someNamespace = {}));\r\n    var someOther;\r\n    (function (someOther) {\r\n        var something;\r\n        (function (something) {\r\n            var someClass = (function () {\r\n                function someClass() {\r\n                }\r\n                return someClass;\r\n            }());\r\n            something.someClass = someClass;\r\n        })(something = someOther.something || (someOther.something = {}));\r\n    })(someOther = normalN.someOther || (normalN.someOther = {}));\r\n    normalN.someImport = someNamespace.C;\r\n    normalN.internalConst = 10;\r\n    var internalEnum;\r\n    (function (internalEnum) {\r\n        internalEnum[internalEnum[\"a\"] = 0] = \"a\";\r\n        internalEnum[internalEnum[\"b\"] = 1] = \"b\";\r\n        internalEnum[internalEnum[\"c\"] = 2] = \"c\";\r\n    })(internalEnum = normalN.internalEnum || (normalN.internalEnum = {}));\r\n})(normalN || (normalN = {}));\r\nvar internalC = (function () {\r\n    function internalC() {\r\n    }\r\n    return internalC;\r\n}());\r\nfunction internalfoo() { }\r\nvar internalNamespace;\r\n(function (internalNamespace) {\r\n    var someClass = (function () {\r\n        function someClass() {\r\n        }\r\n        return someClass;\r\n    }());\r\n    internalNamespace.someClass = someClass;\r\n})(internalNamespace || (internalNamespace = {}));\r\nvar internalOther;\r\n(function (internalOther) {\r\n    var something;\r\n    (function (something) {\r\n        var someClass = (function () {\r\n            function someClass() {\r\n            }\r\n            return someClass;\r\n        }());\r\n        something.someClass = someClass;\r\n    })(something = internalOther.something || (internalOther.something = {}));\r\n})(internalOther || (internalOther = {}));\r\nvar internalImport = internalNamespace.someClass;\r\nvar internalConst = 10;\r\nvar internalEnum;\r\n(function (internalEnum) {\r\n    internalEnum[internalEnum[\"a\"] = 0] = \"a\";\r\n    internalEnum[internalEnum[\"b\"] = 1] = \"b\";\r\n    internalEnum[internalEnum[\"c\"] = 2] = \"c\";\r\n})(internalEnum || (internalEnum = {}));\r\nvar C = (function () {\r\n    function C() {\r\n    }\r\n    C.prototype.doSomething = function () {\r\n        console.log(\"something got done\");\r\n    };\r\n    return C;\r\n}());\r\n//# sourceMappingURL=second-output.js.map"},"dts":{"sections":[{"pos":0,"end":156,"kind":"prepend","data":"../first/bin/first-output.d.ts","texts":[{"pos":0,"end":39,"kind":"internal"},{"pos":41,"end":156,"kind":"text"}]},{"pos":156,"end":233,"kind":"text"},{"pos":233,"end":338,"kind":"internal"},{"pos":340,"end":372,"kind":"text"},{"pos":372,"end":764,"kind":"internal"},{"pos":766,"end":769,"kind":"text"},{"pos":769,"end":1174,"kind":"internal"},{"pos":1176,"end":1224,"kind":"text"}],"mapHash":"96265888669-{\"version\":3,\"file\":\"second-output.d.ts\",\"sourceRoot\":\"\",\"sources\":[\"../first/first_PART1.ts\",\"../first/first_part3.ts\",\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"AAAc,UAAU,QAAQ;IAC5B,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,gBAAgB,CAAC;AAExB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEK,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;IACN,IAAI,CAAC,IACM,MAAM,CADK;IACtB,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACvC;AACD,kBAAU,OAAO,CAAC;IACA,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACrD;AACa,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,KAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC3C,cAAM,CAAC;IACH,WAAW;CAGd\"}","hash":"-114771929067-interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hola, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ntype internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n//# sourceMappingURL=second-output.d.ts.map"}},"program":{"fileNames":["../second/second_part1.ts","../second/second_part2.ts"],"fileInfos":["13528403307-namespace N {\r\n    // Comment text\r\n}\r\n\r\nnamespace N {\r\n    function f() {\r\n        console.log('testing');\r\n    }\r\n\r\n    f();\r\n}\r\n\nclass normalC {\n    /*@internal*/ constructor() { }\n    /*@internal*/ prop: string;\n    /*@internal*/ method() { }\n    /*@internal*/ get c() { return 10; }\n    /*@internal*/ set c(val: number) { }\n}\nnamespace normalN {\n    /*@internal*/ export class C { }\n    /*@internal*/ export function foo() {}\n    /*@internal*/ export namespace someNamespace { export class C {} }\n    /*@internal*/ export namespace someOther.something { export class someClass {} }\n    /*@internal*/ export import someImport = someNamespace.C;\n    /*@internal*/ export type internalType = internalC;\n    /*@internal*/ export const internalConst = 10;\n    /*@internal*/ export enum internalEnum { a, b, c }\n}\n/*@internal*/ class internalC {}\n/*@internal*/ function internalfoo() {}\n/*@internal*/ namespace internalNamespace { export class someClass {} }\n/*@internal*/ namespace internalOther.something { export class someClass {} }\n/*@internal*/ import internalImport = internalNamespace.someClass;\n/*@internal*/ type internalType = internalC;\n/*@internal*/ const internalConst = 10;\n/*@internal*/ enum internalEnum { a, b, c }","9339262372-class C {\r\n    doSomething() {\r\n        console.log(\"something got done\");\r\n    }\r\n}\r\n"],"options":{"composite":true,"outFile":"./second-output.js"},"outSignature":"-95739042438-interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hola, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ntype internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n","latestChangedDtsFile":"./second-output.d.ts"},"version":"FakeTSVersion"}
 
 //// [/src/2/second-output.tsbuildinfo.baseline.txt]
 ======================================================================
@@ -13342,7 +13344,7 @@ text: (766-769)
 }
 
 ----------------------------------------------------------------------
-internal: (769-1182)
+internal: (769-1174)
 declare class internalC {
 }
 declare function internalfoo(): void;
@@ -13355,7 +13357,7 @@ declare namespace internalOther.something {
     }
 }
 import internalImport = internalNamespace.someClass;
-declare type internalType = internalC;
+type internalType = internalC;
 declare const internalConst = 10;
 declare enum internalEnum {
     a = 0,
@@ -13363,7 +13365,7 @@ declare enum internalEnum {
     c = 2
 }
 ----------------------------------------------------------------------
-text: (1184-1232)
+text: (1176-1224)
 declare class C {
     doSomething(): void;
 }
@@ -13449,17 +13451,17 @@ declare class C {
         },
         {
           "pos": 769,
-          "end": 1182,
+          "end": 1174,
           "kind": "internal"
         },
         {
-          "pos": 1184,
-          "end": 1232,
+          "pos": 1176,
+          "end": 1224,
           "kind": "text"
         }
       ],
-      "hash": "-69637640283-interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hola, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ndeclare type internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n//# sourceMappingURL=second-output.d.ts.map",
-      "mapHash": "64998097715-{\"version\":3,\"file\":\"second-output.d.ts\",\"sourceRoot\":\"\",\"sources\":[\"../first/first_PART1.ts\",\"../first/first_part3.ts\",\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"AAAc,UAAU,QAAQ;IAC5B,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,gBAAgB,CAAC;AAExB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEK,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;IACN,IAAI,CAAC,IACM,MAAM,CADK;IACtB,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACvC;AACD,kBAAU,OAAO,CAAC;IACA,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACrD;AACa,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,aAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC3C,cAAM,CAAC;IACH,WAAW;CAGd\"}"
+      "hash": "-114771929067-interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hola, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ntype internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n//# sourceMappingURL=second-output.d.ts.map",
+      "mapHash": "96265888669-{\"version\":3,\"file\":\"second-output.d.ts\",\"sourceRoot\":\"\",\"sources\":[\"../first/first_PART1.ts\",\"../first/first_part3.ts\",\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"AAAc,UAAU,QAAQ;IAC5B,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,gBAAgB,CAAC;AAExB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEK,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;IACN,IAAI,CAAC,IACM,MAAM,CADK;IACtB,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACvC;AACD,kBAAU,OAAO,CAAC;IACA,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACrD;AACa,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,KAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC3C,cAAM,CAAC;IACH,WAAW;CAGd\"}"
     }
   },
   "program": {
@@ -13475,11 +13477,11 @@ declare class C {
       "composite": true,
       "outFile": "./second-output.js"
     },
-    "outSignature": "-86912100598-interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hola, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ndeclare type internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n",
+    "outSignature": "-95739042438-interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hola, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ntype internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n",
     "latestChangedDtsFile": "./second-output.d.ts"
   },
   "version": "FakeTSVersion",
-  "size": 12342
+  "size": 12327
 }
 
 //// [/src/first/bin/first-output.d.ts.map] file written with same contents
@@ -15835,7 +15837,7 @@ readFiles:: {
 } 
 
 //// [/src/2/second-output.d.ts.map]
-{"version":3,"file":"second-output.d.ts","sourceRoot":"","sources":["../first/first_PART1.ts","../first/first_part3.ts","../second/second_part1.ts","../second/second_part2.ts"],"names":[],"mappings":"AAAA,UAAU,QAAQ;IACd,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,gBAAgB,CAAC;AAExB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEK,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;IACN,IAAI,CAAC,IACM,MAAM,CADK;IACtB,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACvC;AACD,kBAAU,OAAO,CAAC;IACA,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACrD;AACa,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,aAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC3C,cAAM,CAAC;IACH,WAAW;CAGd"}
+{"version":3,"file":"second-output.d.ts","sourceRoot":"","sources":["../first/first_PART1.ts","../first/first_part3.ts","../second/second_part1.ts","../second/second_part2.ts"],"names":[],"mappings":"AAAA,UAAU,QAAQ;IACd,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,gBAAgB,CAAC;AAExB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEK,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;IACN,IAAI,CAAC,IACM,MAAM,CADK;IACtB,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACvC;AACD,kBAAU,OAAO,CAAC;IACA,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACrD;AACa,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,KAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC3C,cAAM,CAAC;IACH,WAAW;CAGd"}
 
 //// [/src/2/second-output.d.ts.map.baseline.txt]
 ===================================================================
@@ -16514,42 +16516,43 @@ sourceFile:../second/second_part1.ts
 7 >Emitted(52, 52) Source(34, 66) + SourceIndex(2)
 8 >Emitted(52, 53) Source(34, 67) + SourceIndex(2)
 ---
->>>declare type internalType = internalC;
+>>>type internalType = internalC;
 1 >
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^^^^^
-4 >                         ^^^
-5 >                            ^^^^^^^^^
-6 >                                     ^
+2 >^^^^^
+3 >     ^^^^^^^^^^^^
+4 >                 ^^^
+5 >                    ^^^^^^^^^
+6 >                             ^
+7 >                              ^^^^->
 1 >
   >/*@internal*/ 
 2 >type 
-3 >             internalType
-4 >                          = 
-5 >                            internalC
-6 >                                     ;
+3 >     internalType
+4 >                  = 
+5 >                    internalC
+6 >                             ;
 1 >Emitted(53, 1) Source(35, 15) + SourceIndex(2)
-2 >Emitted(53, 14) Source(35, 20) + SourceIndex(2)
-3 >Emitted(53, 26) Source(35, 32) + SourceIndex(2)
-4 >Emitted(53, 29) Source(35, 35) + SourceIndex(2)
-5 >Emitted(53, 38) Source(35, 44) + SourceIndex(2)
-6 >Emitted(53, 39) Source(35, 45) + SourceIndex(2)
+2 >Emitted(53, 6) Source(35, 20) + SourceIndex(2)
+3 >Emitted(53, 18) Source(35, 32) + SourceIndex(2)
+4 >Emitted(53, 21) Source(35, 35) + SourceIndex(2)
+5 >Emitted(53, 30) Source(35, 44) + SourceIndex(2)
+6 >Emitted(53, 31) Source(35, 45) + SourceIndex(2)
 ---
 >>>declare const internalConst = 10;
-1 >
+1->
 2 >^^^^^^^^
 3 >        ^^^^^^
 4 >              ^^^^^^^^^^^^^
 5 >                           ^^^^^
 6 >                                ^
-1 >
+1->
   >/*@internal*/ 
 2 >
 3 >        const 
 4 >              internalConst
 5 >                            = 10
 6 >                                ;
-1 >Emitted(54, 1) Source(36, 15) + SourceIndex(2)
+1->Emitted(54, 1) Source(36, 15) + SourceIndex(2)
 2 >Emitted(54, 9) Source(36, 15) + SourceIndex(2)
 3 >Emitted(54, 15) Source(36, 21) + SourceIndex(2)
 4 >Emitted(54, 28) Source(36, 34) + SourceIndex(2)
@@ -16646,7 +16649,7 @@ sourceFile:../second/second_part2.ts
 >>>//# sourceMappingURL=second-output.d.ts.map
 
 //// [/src/2/second-output.tsbuildinfo]
-{"bundle":{"commonSourceDirectory":"../second","sourceFiles":["../second/second_part1.ts","../second/second_part2.ts"],"js":{"sections":[{"pos":0,"end":126,"kind":"prepend","data":"../first/bin/first-output.js","texts":[{"pos":0,"end":126,"kind":"text"}]},{"pos":126,"end":3179,"kind":"text"}],"mapHash":"25332072687-{\"version\":3,\"file\":\"second-output.js\",\"sourceRoot\":\"\",\"sources\":[\"../first/first_PART1.ts\",\"../first/first_part2.ts\",\"../first/first_part3.ts\",\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"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\"}","hash":"-22338327474-var s = \"Hola, world\";\r\nconsole.log(s);\r\nconsole.log(s);\r\nconsole.log(f());\r\nfunction f() {\r\n    return \"JS does hoists\";\r\n}\r\nvar N;\r\n(function (N) {\r\n    function f() {\r\n        console.log('testing');\r\n    }\r\n    f();\r\n})(N || (N = {}));\r\nvar normalC = (function () {\r\n    function normalC() {\r\n    }\r\n    normalC.prototype.method = function () { };\r\n    Object.defineProperty(normalC.prototype, \"c\", {\r\n        get: function () { return 10; },\r\n        set: function (val) { },\r\n        enumerable: false,\r\n        configurable: true\r\n    });\r\n    return normalC;\r\n}());\r\nvar normalN;\r\n(function (normalN) {\r\n    var C = (function () {\r\n        function C() {\r\n        }\r\n        return C;\r\n    }());\r\n    normalN.C = C;\r\n    function foo() { }\r\n    normalN.foo = foo;\r\n    var someNamespace;\r\n    (function (someNamespace) {\r\n        var C = (function () {\r\n            function C() {\r\n            }\r\n            return C;\r\n        }());\r\n        someNamespace.C = C;\r\n    })(someNamespace = normalN.someNamespace || (normalN.someNamespace = {}));\r\n    var someOther;\r\n    (function (someOther) {\r\n        var something;\r\n        (function (something) {\r\n            var someClass = (function () {\r\n                function someClass() {\r\n                }\r\n                return someClass;\r\n            }());\r\n            something.someClass = someClass;\r\n        })(something = someOther.something || (someOther.something = {}));\r\n    })(someOther = normalN.someOther || (normalN.someOther = {}));\r\n    normalN.someImport = someNamespace.C;\r\n    normalN.internalConst = 10;\r\n    var internalEnum;\r\n    (function (internalEnum) {\r\n        internalEnum[internalEnum[\"a\"] = 0] = \"a\";\r\n        internalEnum[internalEnum[\"b\"] = 1] = \"b\";\r\n        internalEnum[internalEnum[\"c\"] = 2] = \"c\";\r\n    })(internalEnum = normalN.internalEnum || (normalN.internalEnum = {}));\r\n})(normalN || (normalN = {}));\r\nvar internalC = (function () {\r\n    function internalC() {\r\n    }\r\n    return internalC;\r\n}());\r\nfunction internalfoo() { }\r\nvar internalNamespace;\r\n(function (internalNamespace) {\r\n    var someClass = (function () {\r\n        function someClass() {\r\n        }\r\n        return someClass;\r\n    }());\r\n    internalNamespace.someClass = someClass;\r\n})(internalNamespace || (internalNamespace = {}));\r\nvar internalOther;\r\n(function (internalOther) {\r\n    var something;\r\n    (function (something) {\r\n        var someClass = (function () {\r\n            function someClass() {\r\n            }\r\n            return someClass;\r\n        }());\r\n        something.someClass = someClass;\r\n    })(something = internalOther.something || (internalOther.something = {}));\r\n})(internalOther || (internalOther = {}));\r\nvar internalImport = internalNamespace.someClass;\r\nvar internalConst = 10;\r\nvar internalEnum;\r\n(function (internalEnum) {\r\n    internalEnum[internalEnum[\"a\"] = 0] = \"a\";\r\n    internalEnum[internalEnum[\"b\"] = 1] = \"b\";\r\n    internalEnum[internalEnum[\"c\"] = 2] = \"c\";\r\n})(internalEnum || (internalEnum = {}));\r\nvar C = (function () {\r\n    function C() {\r\n    }\r\n    C.prototype.doSomething = function () {\r\n        console.log(\"something got done\");\r\n    };\r\n    return C;\r\n}());\r\n//# sourceMappingURL=second-output.js.map"},"dts":{"sections":[{"pos":0,"end":156,"kind":"prepend","data":"../first/bin/first-output.d.ts","texts":[{"pos":0,"end":156,"kind":"text"}]},{"pos":156,"end":233,"kind":"text"},{"pos":233,"end":338,"kind":"internal"},{"pos":340,"end":372,"kind":"text"},{"pos":372,"end":764,"kind":"internal"},{"pos":766,"end":769,"kind":"text"},{"pos":769,"end":1182,"kind":"internal"},{"pos":1184,"end":1232,"kind":"text"}],"mapHash":"-5262111010-{\"version\":3,\"file\":\"second-output.d.ts\",\"sourceRoot\":\"\",\"sources\":[\"../first/first_PART1.ts\",\"../first/first_part3.ts\",\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"AAAA,UAAU,QAAQ;IACd,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,gBAAgB,CAAC;AAExB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEK,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;IACN,IAAI,CAAC,IACM,MAAM,CADK;IACtB,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACvC;AACD,kBAAU,OAAO,CAAC;IACA,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACrD;AACa,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,aAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC3C,cAAM,CAAC;IACH,WAAW;CAGd\"}","hash":"-69637640283-interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hola, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ndeclare type internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n//# sourceMappingURL=second-output.d.ts.map"}},"program":{"fileNames":["../second/second_part1.ts","../second/second_part2.ts"],"fileInfos":["13528403307-namespace N {\r\n    // Comment text\r\n}\r\n\r\nnamespace N {\r\n    function f() {\r\n        console.log('testing');\r\n    }\r\n\r\n    f();\r\n}\r\n\nclass normalC {\n    /*@internal*/ constructor() { }\n    /*@internal*/ prop: string;\n    /*@internal*/ method() { }\n    /*@internal*/ get c() { return 10; }\n    /*@internal*/ set c(val: number) { }\n}\nnamespace normalN {\n    /*@internal*/ export class C { }\n    /*@internal*/ export function foo() {}\n    /*@internal*/ export namespace someNamespace { export class C {} }\n    /*@internal*/ export namespace someOther.something { export class someClass {} }\n    /*@internal*/ export import someImport = someNamespace.C;\n    /*@internal*/ export type internalType = internalC;\n    /*@internal*/ export const internalConst = 10;\n    /*@internal*/ export enum internalEnum { a, b, c }\n}\n/*@internal*/ class internalC {}\n/*@internal*/ function internalfoo() {}\n/*@internal*/ namespace internalNamespace { export class someClass {} }\n/*@internal*/ namespace internalOther.something { export class someClass {} }\n/*@internal*/ import internalImport = internalNamespace.someClass;\n/*@internal*/ type internalType = internalC;\n/*@internal*/ const internalConst = 10;\n/*@internal*/ enum internalEnum { a, b, c }","9339262372-class C {\r\n    doSomething() {\r\n        console.log(\"something got done\");\r\n    }\r\n}\r\n"],"options":{"composite":true,"outFile":"./second-output.js"},"outSignature":"-86912100598-interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hola, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ndeclare type internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n","latestChangedDtsFile":"./second-output.d.ts"},"version":"FakeTSVersion"}
+{"bundle":{"commonSourceDirectory":"../second","sourceFiles":["../second/second_part1.ts","../second/second_part2.ts"],"js":{"sections":[{"pos":0,"end":126,"kind":"prepend","data":"../first/bin/first-output.js","texts":[{"pos":0,"end":126,"kind":"text"}]},{"pos":126,"end":3179,"kind":"text"}],"mapHash":"25332072687-{\"version\":3,\"file\":\"second-output.js\",\"sourceRoot\":\"\",\"sources\":[\"../first/first_PART1.ts\",\"../first/first_part2.ts\",\"../first/first_part3.ts\",\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"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\"}","hash":"-22338327474-var s = \"Hola, world\";\r\nconsole.log(s);\r\nconsole.log(s);\r\nconsole.log(f());\r\nfunction f() {\r\n    return \"JS does hoists\";\r\n}\r\nvar N;\r\n(function (N) {\r\n    function f() {\r\n        console.log('testing');\r\n    }\r\n    f();\r\n})(N || (N = {}));\r\nvar normalC = (function () {\r\n    function normalC() {\r\n    }\r\n    normalC.prototype.method = function () { };\r\n    Object.defineProperty(normalC.prototype, \"c\", {\r\n        get: function () { return 10; },\r\n        set: function (val) { },\r\n        enumerable: false,\r\n        configurable: true\r\n    });\r\n    return normalC;\r\n}());\r\nvar normalN;\r\n(function (normalN) {\r\n    var C = (function () {\r\n        function C() {\r\n        }\r\n        return C;\r\n    }());\r\n    normalN.C = C;\r\n    function foo() { }\r\n    normalN.foo = foo;\r\n    var someNamespace;\r\n    (function (someNamespace) {\r\n        var C = (function () {\r\n            function C() {\r\n            }\r\n            return C;\r\n        }());\r\n        someNamespace.C = C;\r\n    })(someNamespace = normalN.someNamespace || (normalN.someNamespace = {}));\r\n    var someOther;\r\n    (function (someOther) {\r\n        var something;\r\n        (function (something) {\r\n            var someClass = (function () {\r\n                function someClass() {\r\n                }\r\n                return someClass;\r\n            }());\r\n            something.someClass = someClass;\r\n        })(something = someOther.something || (someOther.something = {}));\r\n    })(someOther = normalN.someOther || (normalN.someOther = {}));\r\n    normalN.someImport = someNamespace.C;\r\n    normalN.internalConst = 10;\r\n    var internalEnum;\r\n    (function (internalEnum) {\r\n        internalEnum[internalEnum[\"a\"] = 0] = \"a\";\r\n        internalEnum[internalEnum[\"b\"] = 1] = \"b\";\r\n        internalEnum[internalEnum[\"c\"] = 2] = \"c\";\r\n    })(internalEnum = normalN.internalEnum || (normalN.internalEnum = {}));\r\n})(normalN || (normalN = {}));\r\nvar internalC = (function () {\r\n    function internalC() {\r\n    }\r\n    return internalC;\r\n}());\r\nfunction internalfoo() { }\r\nvar internalNamespace;\r\n(function (internalNamespace) {\r\n    var someClass = (function () {\r\n        function someClass() {\r\n        }\r\n        return someClass;\r\n    }());\r\n    internalNamespace.someClass = someClass;\r\n})(internalNamespace || (internalNamespace = {}));\r\nvar internalOther;\r\n(function (internalOther) {\r\n    var something;\r\n    (function (something) {\r\n        var someClass = (function () {\r\n            function someClass() {\r\n            }\r\n            return someClass;\r\n        }());\r\n        something.someClass = someClass;\r\n    })(something = internalOther.something || (internalOther.something = {}));\r\n})(internalOther || (internalOther = {}));\r\nvar internalImport = internalNamespace.someClass;\r\nvar internalConst = 10;\r\nvar internalEnum;\r\n(function (internalEnum) {\r\n    internalEnum[internalEnum[\"a\"] = 0] = \"a\";\r\n    internalEnum[internalEnum[\"b\"] = 1] = \"b\";\r\n    internalEnum[internalEnum[\"c\"] = 2] = \"c\";\r\n})(internalEnum || (internalEnum = {}));\r\nvar C = (function () {\r\n    function C() {\r\n    }\r\n    C.prototype.doSomething = function () {\r\n        console.log(\"something got done\");\r\n    };\r\n    return C;\r\n}());\r\n//# sourceMappingURL=second-output.js.map"},"dts":{"sections":[{"pos":0,"end":156,"kind":"prepend","data":"../first/bin/first-output.d.ts","texts":[{"pos":0,"end":156,"kind":"text"}]},{"pos":156,"end":233,"kind":"text"},{"pos":233,"end":338,"kind":"internal"},{"pos":340,"end":372,"kind":"text"},{"pos":372,"end":764,"kind":"internal"},{"pos":766,"end":769,"kind":"text"},{"pos":769,"end":1174,"kind":"internal"},{"pos":1176,"end":1224,"kind":"text"}],"mapHash":"-16943993016-{\"version\":3,\"file\":\"second-output.d.ts\",\"sourceRoot\":\"\",\"sources\":[\"../first/first_PART1.ts\",\"../first/first_part3.ts\",\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"AAAA,UAAU,QAAQ;IACd,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,gBAAgB,CAAC;AAExB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEK,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;IACN,IAAI,CAAC,IACM,MAAM,CADK;IACtB,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACvC;AACD,kBAAU,OAAO,CAAC;IACA,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACrD;AACa,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,KAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC3C,cAAM,CAAC;IACH,WAAW;CAGd\"}","hash":"-114771929067-interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hola, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ntype internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n//# sourceMappingURL=second-output.d.ts.map"}},"program":{"fileNames":["../second/second_part1.ts","../second/second_part2.ts"],"fileInfos":["13528403307-namespace N {\r\n    // Comment text\r\n}\r\n\r\nnamespace N {\r\n    function f() {\r\n        console.log('testing');\r\n    }\r\n\r\n    f();\r\n}\r\n\nclass normalC {\n    /*@internal*/ constructor() { }\n    /*@internal*/ prop: string;\n    /*@internal*/ method() { }\n    /*@internal*/ get c() { return 10; }\n    /*@internal*/ set c(val: number) { }\n}\nnamespace normalN {\n    /*@internal*/ export class C { }\n    /*@internal*/ export function foo() {}\n    /*@internal*/ export namespace someNamespace { export class C {} }\n    /*@internal*/ export namespace someOther.something { export class someClass {} }\n    /*@internal*/ export import someImport = someNamespace.C;\n    /*@internal*/ export type internalType = internalC;\n    /*@internal*/ export const internalConst = 10;\n    /*@internal*/ export enum internalEnum { a, b, c }\n}\n/*@internal*/ class internalC {}\n/*@internal*/ function internalfoo() {}\n/*@internal*/ namespace internalNamespace { export class someClass {} }\n/*@internal*/ namespace internalOther.something { export class someClass {} }\n/*@internal*/ import internalImport = internalNamespace.someClass;\n/*@internal*/ type internalType = internalC;\n/*@internal*/ const internalConst = 10;\n/*@internal*/ enum internalEnum { a, b, c }","9339262372-class C {\r\n    doSomething() {\r\n        console.log(\"something got done\");\r\n    }\r\n}\r\n"],"options":{"composite":true,"outFile":"./second-output.js"},"outSignature":"-95739042438-interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hola, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ntype internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n","latestChangedDtsFile":"./second-output.d.ts"},"version":"FakeTSVersion"}
 
 //// [/src/2/second-output.tsbuildinfo.baseline.txt]
 ======================================================================
@@ -16830,7 +16833,7 @@ text: (766-769)
 }
 
 ----------------------------------------------------------------------
-internal: (769-1182)
+internal: (769-1174)
 declare class internalC {
 }
 declare function internalfoo(): void;
@@ -16843,7 +16846,7 @@ declare namespace internalOther.something {
     }
 }
 import internalImport = internalNamespace.someClass;
-declare type internalType = internalC;
+type internalType = internalC;
 declare const internalConst = 10;
 declare enum internalEnum {
     a = 0,
@@ -16851,7 +16854,7 @@ declare enum internalEnum {
     c = 2
 }
 ----------------------------------------------------------------------
-text: (1184-1232)
+text: (1176-1224)
 declare class C {
     doSomething(): void;
 }
@@ -16932,17 +16935,17 @@ declare class C {
         },
         {
           "pos": 769,
-          "end": 1182,
+          "end": 1174,
           "kind": "internal"
         },
         {
-          "pos": 1184,
-          "end": 1232,
+          "pos": 1176,
+          "end": 1224,
           "kind": "text"
         }
       ],
-      "hash": "-69637640283-interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hola, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ndeclare type internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n//# sourceMappingURL=second-output.d.ts.map",
-      "mapHash": "-5262111010-{\"version\":3,\"file\":\"second-output.d.ts\",\"sourceRoot\":\"\",\"sources\":[\"../first/first_PART1.ts\",\"../first/first_part3.ts\",\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"AAAA,UAAU,QAAQ;IACd,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,gBAAgB,CAAC;AAExB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEK,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;IACN,IAAI,CAAC,IACM,MAAM,CADK;IACtB,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACvC;AACD,kBAAU,OAAO,CAAC;IACA,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACrD;AACa,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,aAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC3C,cAAM,CAAC;IACH,WAAW;CAGd\"}"
+      "hash": "-114771929067-interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hola, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ntype internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n//# sourceMappingURL=second-output.d.ts.map",
+      "mapHash": "-16943993016-{\"version\":3,\"file\":\"second-output.d.ts\",\"sourceRoot\":\"\",\"sources\":[\"../first/first_PART1.ts\",\"../first/first_part3.ts\",\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"AAAA,UAAU,QAAQ;IACd,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,gBAAgB,CAAC;AAExB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEK,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;IACN,IAAI,CAAC,IACM,MAAM,CADK;IACtB,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACvC;AACD,kBAAU,OAAO,CAAC;IACA,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACrD;AACa,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,KAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC3C,cAAM,CAAC;IACH,WAAW;CAGd\"}"
     }
   },
   "program": {
@@ -16958,11 +16961,11 @@ declare class C {
       "composite": true,
       "outFile": "./second-output.js"
     },
-    "outSignature": "-86912100598-interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hola, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ndeclare type internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n",
+    "outSignature": "-95739042438-interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hola, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ntype internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n",
     "latestChangedDtsFile": "./second-output.d.ts"
   },
   "version": "FakeTSVersion",
-  "size": 12303
+  "size": 12289
 }
 
 //// [/src/first/bin/first-output.d.ts.map]
diff --git a/tests/baselines/reference/tsbuild/outfile-concat/stripInternal-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js b/tests/baselines/reference/tsbuild/outfile-concat/stripInternal-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js
index a538a08ad6d35..1e331dc5db11d 100644
--- a/tests/baselines/reference/tsbuild/outfile-concat/stripInternal-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js
+++ b/tests/baselines/reference/tsbuild/outfile-concat/stripInternal-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js
@@ -231,7 +231,7 @@ declare namespace internalOther.something {
     }
 }
 import internalImport = internalNamespace.someClass;
-declare type internalType = internalC;
+type internalType = internalC;
 declare const internalConst = 10;
 declare enum internalEnum {
     a = 0,
@@ -244,7 +244,7 @@ declare class C {
 //# sourceMappingURL=second-output.d.ts.map
 
 //// [/src/2/second-output.d.ts.map]
-{"version":3,"file":"second-output.d.ts","sourceRoot":"","sources":["../first/first_PART1.ts","../first/first_part3.ts","../second/second_part1.ts","../second/second_part2.ts"],"names":[],"mappings":"AAAc,UAAU,QAAQ;IAC5B,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,iBAAiB,CAAC;AAEzB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEK,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;IACN,IAAI,CAAC,IACM,MAAM,CADK;IACtB,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACvC;AACD,kBAAU,OAAO,CAAC;IACA,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACrD;AACa,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,aAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC3C,cAAM,CAAC;IACH,WAAW;CAGd"}
+{"version":3,"file":"second-output.d.ts","sourceRoot":"","sources":["../first/first_PART1.ts","../first/first_part3.ts","../second/second_part1.ts","../second/second_part2.ts"],"names":[],"mappings":"AAAc,UAAU,QAAQ;IAC5B,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,iBAAiB,CAAC;AAEzB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEK,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;IACN,IAAI,CAAC,IACM,MAAM,CADK;IACtB,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACvC;AACD,kBAAU,OAAO,CAAC;IACA,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACrD;AACa,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,KAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC3C,cAAM,CAAC;IACH,WAAW;CAGd"}
 
 //// [/src/2/second-output.d.ts.map.baseline.txt]
 ===================================================================
@@ -923,42 +923,43 @@ sourceFile:../second/second_part1.ts
 7 >Emitted(52, 52) Source(34, 66) + SourceIndex(2)
 8 >Emitted(52, 53) Source(34, 67) + SourceIndex(2)
 ---
->>>declare type internalType = internalC;
+>>>type internalType = internalC;
 1 >
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^^^^^
-4 >                         ^^^
-5 >                            ^^^^^^^^^
-6 >                                     ^
+2 >^^^^^
+3 >     ^^^^^^^^^^^^
+4 >                 ^^^
+5 >                    ^^^^^^^^^
+6 >                             ^
+7 >                              ^^^^->
 1 >
   >/*@internal*/ 
 2 >type 
-3 >             internalType
-4 >                          = 
-5 >                            internalC
-6 >                                     ;
+3 >     internalType
+4 >                  = 
+5 >                    internalC
+6 >                             ;
 1 >Emitted(53, 1) Source(35, 15) + SourceIndex(2)
-2 >Emitted(53, 14) Source(35, 20) + SourceIndex(2)
-3 >Emitted(53, 26) Source(35, 32) + SourceIndex(2)
-4 >Emitted(53, 29) Source(35, 35) + SourceIndex(2)
-5 >Emitted(53, 38) Source(35, 44) + SourceIndex(2)
-6 >Emitted(53, 39) Source(35, 45) + SourceIndex(2)
+2 >Emitted(53, 6) Source(35, 20) + SourceIndex(2)
+3 >Emitted(53, 18) Source(35, 32) + SourceIndex(2)
+4 >Emitted(53, 21) Source(35, 35) + SourceIndex(2)
+5 >Emitted(53, 30) Source(35, 44) + SourceIndex(2)
+6 >Emitted(53, 31) Source(35, 45) + SourceIndex(2)
 ---
 >>>declare const internalConst = 10;
-1 >
+1->
 2 >^^^^^^^^
 3 >        ^^^^^^
 4 >              ^^^^^^^^^^^^^
 5 >                           ^^^^^
 6 >                                ^
-1 >
+1->
   >/*@internal*/ 
 2 >
 3 >        const 
 4 >              internalConst
 5 >                            = 10
 6 >                                ;
-1 >Emitted(54, 1) Source(36, 15) + SourceIndex(2)
+1->Emitted(54, 1) Source(36, 15) + SourceIndex(2)
 2 >Emitted(54, 9) Source(36, 15) + SourceIndex(2)
 3 >Emitted(54, 15) Source(36, 21) + SourceIndex(2)
 4 >Emitted(54, 28) Source(36, 34) + SourceIndex(2)
@@ -2850,7 +2851,7 @@ sourceFile:../second/second_part2.ts
 >>>//# sourceMappingURL=second-output.js.map
 
 //// [/src/2/second-output.tsbuildinfo]
-{"bundle":{"commonSourceDirectory":"../second","sourceFiles":["../second/second_part1.ts","../second/second_part2.ts"],"js":{"sections":[{"pos":0,"end":110,"kind":"prepend","data":"../first/bin/first-output.js","texts":[{"pos":0,"end":110,"kind":"text"}]},{"pos":110,"end":3527,"kind":"text"}],"mapHash":"49450898210-{\"version\":3,\"file\":\"second-output.js\",\"sourceRoot\":\"\",\"sources\":[\"../first/first_PART1.ts\",\"../first/first_part2.ts\",\"../first/first_part3.ts\",\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"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\"}","hash":"35368666403-var s = \"Hello, world\";\r\nconsole.log(s);\r\nconsole.log(f());\r\nfunction f() {\r\n    return \"JS does hoists\";\r\n}\r\nvar N;\r\n(function (N) {\r\n    function f() {\r\n        console.log('testing');\r\n    }\r\n    f();\r\n})(N || (N = {}));\r\nvar normalC = /** @class */ (function () {\r\n    /*@internal*/ function normalC() {\r\n    }\r\n    /*@internal*/ normalC.prototype.method = function () { };\r\n    Object.defineProperty(normalC.prototype, \"c\", {\r\n        /*@internal*/ get: function () { return 10; },\r\n        /*@internal*/ set: function (val) { },\r\n        enumerable: false,\r\n        configurable: true\r\n    });\r\n    return normalC;\r\n}());\r\nvar normalN;\r\n(function (normalN) {\r\n    /*@internal*/ var C = /** @class */ (function () {\r\n        function C() {\r\n        }\r\n        return C;\r\n    }());\r\n    normalN.C = C;\r\n    /*@internal*/ function foo() { }\r\n    normalN.foo = foo;\r\n    /*@internal*/ var someNamespace;\r\n    (function (someNamespace) {\r\n        var C = /** @class */ (function () {\r\n            function C() {\r\n            }\r\n            return C;\r\n        }());\r\n        someNamespace.C = C;\r\n    })(someNamespace = normalN.someNamespace || (normalN.someNamespace = {}));\r\n    /*@internal*/ var someOther;\r\n    (function (someOther) {\r\n        var something;\r\n        (function (something) {\r\n            var someClass = /** @class */ (function () {\r\n                function someClass() {\r\n                }\r\n                return someClass;\r\n            }());\r\n            something.someClass = someClass;\r\n        })(something = someOther.something || (someOther.something = {}));\r\n    })(someOther = normalN.someOther || (normalN.someOther = {}));\r\n    /*@internal*/ normalN.someImport = someNamespace.C;\r\n    /*@internal*/ normalN.internalConst = 10;\r\n    /*@internal*/ var internalEnum;\r\n    (function (internalEnum) {\r\n        internalEnum[internalEnum[\"a\"] = 0] = \"a\";\r\n        internalEnum[internalEnum[\"b\"] = 1] = \"b\";\r\n        internalEnum[internalEnum[\"c\"] = 2] = \"c\";\r\n    })(internalEnum = normalN.internalEnum || (normalN.internalEnum = {}));\r\n})(normalN || (normalN = {}));\r\n/*@internal*/ var internalC = /** @class */ (function () {\r\n    function internalC() {\r\n    }\r\n    return internalC;\r\n}());\r\n/*@internal*/ function internalfoo() { }\r\n/*@internal*/ var internalNamespace;\r\n(function (internalNamespace) {\r\n    var someClass = /** @class */ (function () {\r\n        function someClass() {\r\n        }\r\n        return someClass;\r\n    }());\r\n    internalNamespace.someClass = someClass;\r\n})(internalNamespace || (internalNamespace = {}));\r\n/*@internal*/ var internalOther;\r\n(function (internalOther) {\r\n    var something;\r\n    (function (something) {\r\n        var someClass = /** @class */ (function () {\r\n            function someClass() {\r\n            }\r\n            return someClass;\r\n        }());\r\n        something.someClass = someClass;\r\n    })(something = internalOther.something || (internalOther.something = {}));\r\n})(internalOther || (internalOther = {}));\r\n/*@internal*/ var internalImport = internalNamespace.someClass;\r\n/*@internal*/ var internalConst = 10;\r\n/*@internal*/ var internalEnum;\r\n(function (internalEnum) {\r\n    internalEnum[internalEnum[\"a\"] = 0] = \"a\";\r\n    internalEnum[internalEnum[\"b\"] = 1] = \"b\";\r\n    internalEnum[internalEnum[\"c\"] = 2] = \"c\";\r\n})(internalEnum || (internalEnum = {}));\r\nvar C = /** @class */ (function () {\r\n    function C() {\r\n    }\r\n    C.prototype.doSomething = function () {\r\n        console.log(\"something got done\");\r\n    };\r\n    return C;\r\n}());\r\n//# sourceMappingURL=second-output.js.map"},"dts":{"sections":[{"pos":0,"end":157,"kind":"prepend","data":"../first/bin/first-output.d.ts","texts":[{"pos":0,"end":39,"kind":"internal"},{"pos":41,"end":157,"kind":"text"}]},{"pos":157,"end":234,"kind":"text"},{"pos":234,"end":339,"kind":"internal"},{"pos":341,"end":373,"kind":"text"},{"pos":373,"end":765,"kind":"internal"},{"pos":767,"end":770,"kind":"text"},{"pos":770,"end":1183,"kind":"internal"},{"pos":1185,"end":1233,"kind":"text"}],"mapHash":"-113365255-{\"version\":3,\"file\":\"second-output.d.ts\",\"sourceRoot\":\"\",\"sources\":[\"../first/first_PART1.ts\",\"../first/first_part3.ts\",\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"AAAc,UAAU,QAAQ;IAC5B,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,iBAAiB,CAAC;AAEzB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEK,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;IACN,IAAI,CAAC,IACM,MAAM,CADK;IACtB,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACvC;AACD,kBAAU,OAAO,CAAC;IACA,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACrD;AACa,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,aAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC3C,cAAM,CAAC;IACH,WAAW;CAGd\"}","hash":"-13432536459-interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hello, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ndeclare type internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n//# sourceMappingURL=second-output.d.ts.map"}},"program":{"fileNames":["../second/second_part1.ts","../second/second_part2.ts"],"fileInfos":["13528403307-namespace N {\r\n    // Comment text\r\n}\r\n\r\nnamespace N {\r\n    function f() {\r\n        console.log('testing');\r\n    }\r\n\r\n    f();\r\n}\r\n\nclass normalC {\n    /*@internal*/ constructor() { }\n    /*@internal*/ prop: string;\n    /*@internal*/ method() { }\n    /*@internal*/ get c() { return 10; }\n    /*@internal*/ set c(val: number) { }\n}\nnamespace normalN {\n    /*@internal*/ export class C { }\n    /*@internal*/ export function foo() {}\n    /*@internal*/ export namespace someNamespace { export class C {} }\n    /*@internal*/ export namespace someOther.something { export class someClass {} }\n    /*@internal*/ export import someImport = someNamespace.C;\n    /*@internal*/ export type internalType = internalC;\n    /*@internal*/ export const internalConst = 10;\n    /*@internal*/ export enum internalEnum { a, b, c }\n}\n/*@internal*/ class internalC {}\n/*@internal*/ function internalfoo() {}\n/*@internal*/ namespace internalNamespace { export class someClass {} }\n/*@internal*/ namespace internalOther.something { export class someClass {} }\n/*@internal*/ import internalImport = internalNamespace.someClass;\n/*@internal*/ type internalType = internalC;\n/*@internal*/ const internalConst = 10;\n/*@internal*/ enum internalEnum { a, b, c }","9339262372-class C {\r\n    doSomething() {\r\n        console.log(\"something got done\");\r\n    }\r\n}\r\n"],"options":{"composite":true,"outFile":"./second-output.js"},"outSignature":"-25454326822-interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hello, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ndeclare type internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n","latestChangedDtsFile":"./second-output.d.ts"},"version":"FakeTSVersion"}
+{"bundle":{"commonSourceDirectory":"../second","sourceFiles":["../second/second_part1.ts","../second/second_part2.ts"],"js":{"sections":[{"pos":0,"end":110,"kind":"prepend","data":"../first/bin/first-output.js","texts":[{"pos":0,"end":110,"kind":"text"}]},{"pos":110,"end":3527,"kind":"text"}],"mapHash":"49450898210-{\"version\":3,\"file\":\"second-output.js\",\"sourceRoot\":\"\",\"sources\":[\"../first/first_PART1.ts\",\"../first/first_part2.ts\",\"../first/first_part3.ts\",\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"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\"}","hash":"35368666403-var s = \"Hello, world\";\r\nconsole.log(s);\r\nconsole.log(f());\r\nfunction f() {\r\n    return \"JS does hoists\";\r\n}\r\nvar N;\r\n(function (N) {\r\n    function f() {\r\n        console.log('testing');\r\n    }\r\n    f();\r\n})(N || (N = {}));\r\nvar normalC = /** @class */ (function () {\r\n    /*@internal*/ function normalC() {\r\n    }\r\n    /*@internal*/ normalC.prototype.method = function () { };\r\n    Object.defineProperty(normalC.prototype, \"c\", {\r\n        /*@internal*/ get: function () { return 10; },\r\n        /*@internal*/ set: function (val) { },\r\n        enumerable: false,\r\n        configurable: true\r\n    });\r\n    return normalC;\r\n}());\r\nvar normalN;\r\n(function (normalN) {\r\n    /*@internal*/ var C = /** @class */ (function () {\r\n        function C() {\r\n        }\r\n        return C;\r\n    }());\r\n    normalN.C = C;\r\n    /*@internal*/ function foo() { }\r\n    normalN.foo = foo;\r\n    /*@internal*/ var someNamespace;\r\n    (function (someNamespace) {\r\n        var C = /** @class */ (function () {\r\n            function C() {\r\n            }\r\n            return C;\r\n        }());\r\n        someNamespace.C = C;\r\n    })(someNamespace = normalN.someNamespace || (normalN.someNamespace = {}));\r\n    /*@internal*/ var someOther;\r\n    (function (someOther) {\r\n        var something;\r\n        (function (something) {\r\n            var someClass = /** @class */ (function () {\r\n                function someClass() {\r\n                }\r\n                return someClass;\r\n            }());\r\n            something.someClass = someClass;\r\n        })(something = someOther.something || (someOther.something = {}));\r\n    })(someOther = normalN.someOther || (normalN.someOther = {}));\r\n    /*@internal*/ normalN.someImport = someNamespace.C;\r\n    /*@internal*/ normalN.internalConst = 10;\r\n    /*@internal*/ var internalEnum;\r\n    (function (internalEnum) {\r\n        internalEnum[internalEnum[\"a\"] = 0] = \"a\";\r\n        internalEnum[internalEnum[\"b\"] = 1] = \"b\";\r\n        internalEnum[internalEnum[\"c\"] = 2] = \"c\";\r\n    })(internalEnum = normalN.internalEnum || (normalN.internalEnum = {}));\r\n})(normalN || (normalN = {}));\r\n/*@internal*/ var internalC = /** @class */ (function () {\r\n    function internalC() {\r\n    }\r\n    return internalC;\r\n}());\r\n/*@internal*/ function internalfoo() { }\r\n/*@internal*/ var internalNamespace;\r\n(function (internalNamespace) {\r\n    var someClass = /** @class */ (function () {\r\n        function someClass() {\r\n        }\r\n        return someClass;\r\n    }());\r\n    internalNamespace.someClass = someClass;\r\n})(internalNamespace || (internalNamespace = {}));\r\n/*@internal*/ var internalOther;\r\n(function (internalOther) {\r\n    var something;\r\n    (function (something) {\r\n        var someClass = /** @class */ (function () {\r\n            function someClass() {\r\n            }\r\n            return someClass;\r\n        }());\r\n        something.someClass = someClass;\r\n    })(something = internalOther.something || (internalOther.something = {}));\r\n})(internalOther || (internalOther = {}));\r\n/*@internal*/ var internalImport = internalNamespace.someClass;\r\n/*@internal*/ var internalConst = 10;\r\n/*@internal*/ var internalEnum;\r\n(function (internalEnum) {\r\n    internalEnum[internalEnum[\"a\"] = 0] = \"a\";\r\n    internalEnum[internalEnum[\"b\"] = 1] = \"b\";\r\n    internalEnum[internalEnum[\"c\"] = 2] = \"c\";\r\n})(internalEnum || (internalEnum = {}));\r\nvar C = /** @class */ (function () {\r\n    function C() {\r\n    }\r\n    C.prototype.doSomething = function () {\r\n        console.log(\"something got done\");\r\n    };\r\n    return C;\r\n}());\r\n//# sourceMappingURL=second-output.js.map"},"dts":{"sections":[{"pos":0,"end":157,"kind":"prepend","data":"../first/bin/first-output.d.ts","texts":[{"pos":0,"end":39,"kind":"internal"},{"pos":41,"end":157,"kind":"text"}]},{"pos":157,"end":234,"kind":"text"},{"pos":234,"end":339,"kind":"internal"},{"pos":341,"end":373,"kind":"text"},{"pos":373,"end":765,"kind":"internal"},{"pos":767,"end":770,"kind":"text"},{"pos":770,"end":1175,"kind":"internal"},{"pos":1177,"end":1225,"kind":"text"}],"mapHash":"13974556515-{\"version\":3,\"file\":\"second-output.d.ts\",\"sourceRoot\":\"\",\"sources\":[\"../first/first_PART1.ts\",\"../first/first_part3.ts\",\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"AAAc,UAAU,QAAQ;IAC5B,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,iBAAiB,CAAC;AAEzB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEK,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;IACN,IAAI,CAAC,IACM,MAAM,CADK;IACtB,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACvC;AACD,kBAAU,OAAO,CAAC;IACA,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACrD;AACa,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,KAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC3C,cAAM,CAAC;IACH,WAAW;CAGd\"}","hash":"-76652520731-interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hello, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ntype internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n//# sourceMappingURL=second-output.d.ts.map"}},"program":{"fileNames":["../second/second_part1.ts","../second/second_part2.ts"],"fileInfos":["13528403307-namespace N {\r\n    // Comment text\r\n}\r\n\r\nnamespace N {\r\n    function f() {\r\n        console.log('testing');\r\n    }\r\n\r\n    f();\r\n}\r\n\nclass normalC {\n    /*@internal*/ constructor() { }\n    /*@internal*/ prop: string;\n    /*@internal*/ method() { }\n    /*@internal*/ get c() { return 10; }\n    /*@internal*/ set c(val: number) { }\n}\nnamespace normalN {\n    /*@internal*/ export class C { }\n    /*@internal*/ export function foo() {}\n    /*@internal*/ export namespace someNamespace { export class C {} }\n    /*@internal*/ export namespace someOther.something { export class someClass {} }\n    /*@internal*/ export import someImport = someNamespace.C;\n    /*@internal*/ export type internalType = internalC;\n    /*@internal*/ export const internalConst = 10;\n    /*@internal*/ export enum internalEnum { a, b, c }\n}\n/*@internal*/ class internalC {}\n/*@internal*/ function internalfoo() {}\n/*@internal*/ namespace internalNamespace { export class someClass {} }\n/*@internal*/ namespace internalOther.something { export class someClass {} }\n/*@internal*/ import internalImport = internalNamespace.someClass;\n/*@internal*/ type internalType = internalC;\n/*@internal*/ const internalConst = 10;\n/*@internal*/ enum internalEnum { a, b, c }","9339262372-class C {\r\n    doSomething() {\r\n        console.log(\"something got done\");\r\n    }\r\n}\r\n"],"options":{"composite":true,"outFile":"./second-output.js"},"outSignature":"-68578080182-interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hello, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ntype internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n","latestChangedDtsFile":"./second-output.d.ts"},"version":"FakeTSVersion"}
 
 //// [/src/2/second-output.tsbuildinfo.baseline.txt]
 ======================================================================
@@ -3035,7 +3036,7 @@ text: (767-770)
 }
 
 ----------------------------------------------------------------------
-internal: (770-1183)
+internal: (770-1175)
 declare class internalC {
 }
 declare function internalfoo(): void;
@@ -3048,7 +3049,7 @@ declare namespace internalOther.something {
     }
 }
 import internalImport = internalNamespace.someClass;
-declare type internalType = internalC;
+type internalType = internalC;
 declare const internalConst = 10;
 declare enum internalEnum {
     a = 0,
@@ -3056,7 +3057,7 @@ declare enum internalEnum {
     c = 2
 }
 ----------------------------------------------------------------------
-text: (1185-1233)
+text: (1177-1225)
 declare class C {
     doSomething(): void;
 }
@@ -3142,17 +3143,17 @@ declare class C {
         },
         {
           "pos": 770,
-          "end": 1183,
+          "end": 1175,
           "kind": "internal"
         },
         {
-          "pos": 1185,
-          "end": 1233,
+          "pos": 1177,
+          "end": 1225,
           "kind": "text"
         }
       ],
-      "hash": "-13432536459-interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hello, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ndeclare type internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n//# sourceMappingURL=second-output.d.ts.map",
-      "mapHash": "-113365255-{\"version\":3,\"file\":\"second-output.d.ts\",\"sourceRoot\":\"\",\"sources\":[\"../first/first_PART1.ts\",\"../first/first_part3.ts\",\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"AAAc,UAAU,QAAQ;IAC5B,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,iBAAiB,CAAC;AAEzB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEK,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;IACN,IAAI,CAAC,IACM,MAAM,CADK;IACtB,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACvC;AACD,kBAAU,OAAO,CAAC;IACA,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACrD;AACa,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,aAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC3C,cAAM,CAAC;IACH,WAAW;CAGd\"}"
+      "hash": "-76652520731-interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hello, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ntype internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n//# sourceMappingURL=second-output.d.ts.map",
+      "mapHash": "13974556515-{\"version\":3,\"file\":\"second-output.d.ts\",\"sourceRoot\":\"\",\"sources\":[\"../first/first_PART1.ts\",\"../first/first_part3.ts\",\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"AAAc,UAAU,QAAQ;IAC5B,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,iBAAiB,CAAC;AAEzB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEK,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;IACN,IAAI,CAAC,IACM,MAAM,CADK;IACtB,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACvC;AACD,kBAAU,OAAO,CAAC;IACA,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACrD;AACa,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,KAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC3C,cAAM,CAAC;IACH,WAAW;CAGd\"}"
     }
   },
   "program": {
@@ -3168,11 +3169,11 @@ declare class C {
       "composite": true,
       "outFile": "./second-output.js"
     },
-    "outSignature": "-25454326822-interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hello, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ndeclare type internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n",
+    "outSignature": "-68578080182-interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hello, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ntype internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n",
     "latestChangedDtsFile": "./second-output.d.ts"
   },
   "version": "FakeTSVersion",
-  "size": 12828
+  "size": 12813
 }
 
 //// [/src/first/bin/first-output.d.ts]
@@ -7798,7 +7799,7 @@ sourceFile:../second/second_part2.ts
 >>>//# sourceMappingURL=second-output.js.map
 
 //// [/src/2/second-output.tsbuildinfo]
-{"bundle":{"commonSourceDirectory":"../second","sourceFiles":["../second/second_part1.ts","../second/second_part2.ts"],"js":{"sections":[{"pos":0,"end":127,"kind":"prepend","data":"../first/bin/first-output.js","texts":[{"pos":0,"end":127,"kind":"text"}]},{"pos":127,"end":3544,"kind":"text"}],"mapHash":"4497977942-{\"version\":3,\"file\":\"second-output.js\",\"sourceRoot\":\"\",\"sources\":[\"../first/first_PART1.ts\",\"../first/first_part2.ts\",\"../first/first_part3.ts\",\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"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\"}","hash":"-62899236580-var s = \"Hello, world\";\r\nconsole.log(s);\r\nconsole.log(s);\r\nconsole.log(f());\r\nfunction f() {\r\n    return \"JS does hoists\";\r\n}\r\nvar N;\r\n(function (N) {\r\n    function f() {\r\n        console.log('testing');\r\n    }\r\n    f();\r\n})(N || (N = {}));\r\nvar normalC = /** @class */ (function () {\r\n    /*@internal*/ function normalC() {\r\n    }\r\n    /*@internal*/ normalC.prototype.method = function () { };\r\n    Object.defineProperty(normalC.prototype, \"c\", {\r\n        /*@internal*/ get: function () { return 10; },\r\n        /*@internal*/ set: function (val) { },\r\n        enumerable: false,\r\n        configurable: true\r\n    });\r\n    return normalC;\r\n}());\r\nvar normalN;\r\n(function (normalN) {\r\n    /*@internal*/ var C = /** @class */ (function () {\r\n        function C() {\r\n        }\r\n        return C;\r\n    }());\r\n    normalN.C = C;\r\n    /*@internal*/ function foo() { }\r\n    normalN.foo = foo;\r\n    /*@internal*/ var someNamespace;\r\n    (function (someNamespace) {\r\n        var C = /** @class */ (function () {\r\n            function C() {\r\n            }\r\n            return C;\r\n        }());\r\n        someNamespace.C = C;\r\n    })(someNamespace = normalN.someNamespace || (normalN.someNamespace = {}));\r\n    /*@internal*/ var someOther;\r\n    (function (someOther) {\r\n        var something;\r\n        (function (something) {\r\n            var someClass = /** @class */ (function () {\r\n                function someClass() {\r\n                }\r\n                return someClass;\r\n            }());\r\n            something.someClass = someClass;\r\n        })(something = someOther.something || (someOther.something = {}));\r\n    })(someOther = normalN.someOther || (normalN.someOther = {}));\r\n    /*@internal*/ normalN.someImport = someNamespace.C;\r\n    /*@internal*/ normalN.internalConst = 10;\r\n    /*@internal*/ var internalEnum;\r\n    (function (internalEnum) {\r\n        internalEnum[internalEnum[\"a\"] = 0] = \"a\";\r\n        internalEnum[internalEnum[\"b\"] = 1] = \"b\";\r\n        internalEnum[internalEnum[\"c\"] = 2] = \"c\";\r\n    })(internalEnum = normalN.internalEnum || (normalN.internalEnum = {}));\r\n})(normalN || (normalN = {}));\r\n/*@internal*/ var internalC = /** @class */ (function () {\r\n    function internalC() {\r\n    }\r\n    return internalC;\r\n}());\r\n/*@internal*/ function internalfoo() { }\r\n/*@internal*/ var internalNamespace;\r\n(function (internalNamespace) {\r\n    var someClass = /** @class */ (function () {\r\n        function someClass() {\r\n        }\r\n        return someClass;\r\n    }());\r\n    internalNamespace.someClass = someClass;\r\n})(internalNamespace || (internalNamespace = {}));\r\n/*@internal*/ var internalOther;\r\n(function (internalOther) {\r\n    var something;\r\n    (function (something) {\r\n        var someClass = /** @class */ (function () {\r\n            function someClass() {\r\n            }\r\n            return someClass;\r\n        }());\r\n        something.someClass = someClass;\r\n    })(something = internalOther.something || (internalOther.something = {}));\r\n})(internalOther || (internalOther = {}));\r\n/*@internal*/ var internalImport = internalNamespace.someClass;\r\n/*@internal*/ var internalConst = 10;\r\n/*@internal*/ var internalEnum;\r\n(function (internalEnum) {\r\n    internalEnum[internalEnum[\"a\"] = 0] = \"a\";\r\n    internalEnum[internalEnum[\"b\"] = 1] = \"b\";\r\n    internalEnum[internalEnum[\"c\"] = 2] = \"c\";\r\n})(internalEnum || (internalEnum = {}));\r\nvar C = /** @class */ (function () {\r\n    function C() {\r\n    }\r\n    C.prototype.doSomething = function () {\r\n        console.log(\"something got done\");\r\n    };\r\n    return C;\r\n}());\r\n//# sourceMappingURL=second-output.js.map"},"dts":{"sections":[{"pos":0,"end":157,"kind":"prepend","data":"../first/bin/first-output.d.ts","texts":[{"pos":0,"end":39,"kind":"internal"},{"pos":41,"end":157,"kind":"text"}]},{"pos":157,"end":234,"kind":"text"},{"pos":234,"end":339,"kind":"internal"},{"pos":341,"end":373,"kind":"text"},{"pos":373,"end":765,"kind":"internal"},{"pos":767,"end":770,"kind":"text"},{"pos":770,"end":1183,"kind":"internal"},{"pos":1185,"end":1233,"kind":"text"}],"mapHash":"-113365255-{\"version\":3,\"file\":\"second-output.d.ts\",\"sourceRoot\":\"\",\"sources\":[\"../first/first_PART1.ts\",\"../first/first_part3.ts\",\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"AAAc,UAAU,QAAQ;IAC5B,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,iBAAiB,CAAC;AAEzB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEK,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;IACN,IAAI,CAAC,IACM,MAAM,CADK;IACtB,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACvC;AACD,kBAAU,OAAO,CAAC;IACA,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACrD;AACa,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,aAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC3C,cAAM,CAAC;IACH,WAAW;CAGd\"}","hash":"-13432536459-interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hello, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ndeclare type internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n//# sourceMappingURL=second-output.d.ts.map"}},"program":{"fileNames":["../second/second_part1.ts","../second/second_part2.ts"],"fileInfos":["13528403307-namespace N {\r\n    // Comment text\r\n}\r\n\r\nnamespace N {\r\n    function f() {\r\n        console.log('testing');\r\n    }\r\n\r\n    f();\r\n}\r\n\nclass normalC {\n    /*@internal*/ constructor() { }\n    /*@internal*/ prop: string;\n    /*@internal*/ method() { }\n    /*@internal*/ get c() { return 10; }\n    /*@internal*/ set c(val: number) { }\n}\nnamespace normalN {\n    /*@internal*/ export class C { }\n    /*@internal*/ export function foo() {}\n    /*@internal*/ export namespace someNamespace { export class C {} }\n    /*@internal*/ export namespace someOther.something { export class someClass {} }\n    /*@internal*/ export import someImport = someNamespace.C;\n    /*@internal*/ export type internalType = internalC;\n    /*@internal*/ export const internalConst = 10;\n    /*@internal*/ export enum internalEnum { a, b, c }\n}\n/*@internal*/ class internalC {}\n/*@internal*/ function internalfoo() {}\n/*@internal*/ namespace internalNamespace { export class someClass {} }\n/*@internal*/ namespace internalOther.something { export class someClass {} }\n/*@internal*/ import internalImport = internalNamespace.someClass;\n/*@internal*/ type internalType = internalC;\n/*@internal*/ const internalConst = 10;\n/*@internal*/ enum internalEnum { a, b, c }","9339262372-class C {\r\n    doSomething() {\r\n        console.log(\"something got done\");\r\n    }\r\n}\r\n"],"options":{"composite":true,"outFile":"./second-output.js"},"outSignature":"-25454326822-interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hello, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ndeclare type internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n","latestChangedDtsFile":"./second-output.d.ts"},"version":"FakeTSVersion"}
+{"bundle":{"commonSourceDirectory":"../second","sourceFiles":["../second/second_part1.ts","../second/second_part2.ts"],"js":{"sections":[{"pos":0,"end":127,"kind":"prepend","data":"../first/bin/first-output.js","texts":[{"pos":0,"end":127,"kind":"text"}]},{"pos":127,"end":3544,"kind":"text"}],"mapHash":"4497977942-{\"version\":3,\"file\":\"second-output.js\",\"sourceRoot\":\"\",\"sources\":[\"../first/first_PART1.ts\",\"../first/first_part2.ts\",\"../first/first_part3.ts\",\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"AAIA,IAAM,CAAC,GAAG,cAAc,CAAC;AAMzB,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;AACf,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;ACXf,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC;ACAjB,SAAS,CAAC;IACN,OAAO,gBAAgB,CAAC;AAC5B,CAAC;ACED,IAAU,CAAC,CAMV;AAND,WAAU,CAAC;IACP,SAAS,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC3B,CAAC;IAED,CAAC,EAAE,CAAC;AACR,CAAC,EANS,CAAC,KAAD,CAAC,QAMV;AAED;IACI,aAAa,CAAC;IAAgB,CAAC;IAE/B,aAAa,CAAC,wBAAM,GAAN,cAAW,CAAC;IACZ,sBAAI,sBAAC;QAAnB,aAAa,MAAC,cAAU,OAAO,EAAE,CAAC,CAAC,CAAC;QACpC,aAAa,MAAC,UAAM,GAAW,IAAI,CAAC;;;OADA;IAExC,cAAC;AAAD,CAAC,AAND,IAMC;AACD,IAAU,OAAO,CAShB;AATD,WAAU,OAAO;IACb,aAAa,CAAC;QAAA;QAAiB,CAAC;QAAD,QAAC;IAAD,CAAC,AAAlB,IAAkB;IAAL,SAAC,IAAI,CAAA;IAChC,aAAa,CAAC,SAAgB,GAAG,KAAI,CAAC;IAAR,WAAG,MAAK,CAAA;IACtC,aAAa,CAAC,IAAiB,aAAa,CAAsB;IAApD,WAAiB,aAAa;QAAG;YAAA;YAAgB,CAAC;YAAD,QAAC;QAAD,CAAC,AAAjB,IAAiB;QAAJ,eAAC,IAAG,CAAA;IAAC,CAAC,EAAnC,aAAa,GAAb,qBAAa,KAAb,qBAAa,QAAsB;IAClE,aAAa,CAAC,IAAiB,SAAS,CAAwC;IAAlE,WAAiB,SAAS;QAAC,IAAA,SAAS,CAA8B;QAAvC,WAAA,SAAS;YAAG;gBAAA;gBAAwB,CAAC;gBAAD,gBAAC;YAAD,CAAC,AAAzB,IAAyB;YAAZ,mBAAS,YAAG,CAAA;QAAC,CAAC,EAAvC,SAAS,GAAT,mBAAS,KAAT,mBAAS,QAA8B;IAAD,CAAC,EAAjD,SAAS,GAAT,iBAAS,KAAT,iBAAS,QAAwC;IAChF,aAAa,CAAe,kBAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAEzD,aAAa,CAAc,qBAAa,GAAG,EAAE,CAAC;IAC9C,aAAa,CAAC,IAAY,YAAwB;IAApC,WAAY,YAAY;QAAG,yCAAC,CAAA;QAAE,yCAAC,CAAA;QAAE,yCAAC,CAAA;IAAC,CAAC,EAAxB,YAAY,GAAZ,oBAAY,KAAZ,oBAAY,QAAY;AACtD,CAAC,EATS,OAAO,KAAP,OAAO,QAShB;AACD,aAAa,CAAC;IAAA;IAAiB,CAAC;IAAD,gBAAC;AAAD,CAAC,AAAlB,IAAkB;AAChC,aAAa,CAAC,SAAS,WAAW,KAAI,CAAC;AACvC,aAAa,CAAC,IAAU,iBAAiB,CAA8B;AAAzD,WAAU,iBAAiB;IAAG;QAAA;QAAwB,CAAC;QAAD,gBAAC;IAAD,CAAC,AAAzB,IAAyB;IAAZ,2BAAS,YAAG,CAAA;AAAC,CAAC,EAA/C,iBAAiB,KAAjB,iBAAiB,QAA8B;AACvE,aAAa,CAAC,IAAU,aAAa,CAAwC;AAA/D,WAAU,aAAa;IAAC,IAAA,SAAS,CAA8B;IAAvC,WAAA,SAAS;QAAG;YAAA;YAAwB,CAAC;YAAD,gBAAC;QAAD,CAAC,AAAzB,IAAyB;QAAZ,mBAAS,YAAG,CAAA;IAAC,CAAC,EAAvC,SAAS,GAAT,uBAAS,KAAT,uBAAS,QAA8B;AAAD,CAAC,EAArD,aAAa,KAAb,aAAa,QAAwC;AAC7E,aAAa,CAAC,IAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AAElE,aAAa,CAAC,IAAM,aAAa,GAAG,EAAE,CAAC;AACvC,aAAa,CAAC,IAAK,YAAwB;AAA7B,WAAK,YAAY;IAAG,yCAAC,CAAA;IAAE,yCAAC,CAAA;IAAE,yCAAC,CAAA;AAAC,CAAC,EAAxB,YAAY,KAAZ,YAAY,QAAY;ACpC3C;IAAA;IAIA,CAAC;IAHG,uBAAW,GAAX;QACI,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;IACtC,CAAC;IACL,QAAC;AAAD,CAAC,AAJD,IAIC\"}","hash":"-62899236580-var s = \"Hello, world\";\r\nconsole.log(s);\r\nconsole.log(s);\r\nconsole.log(f());\r\nfunction f() {\r\n    return \"JS does hoists\";\r\n}\r\nvar N;\r\n(function (N) {\r\n    function f() {\r\n        console.log('testing');\r\n    }\r\n    f();\r\n})(N || (N = {}));\r\nvar normalC = /** @class */ (function () {\r\n    /*@internal*/ function normalC() {\r\n    }\r\n    /*@internal*/ normalC.prototype.method = function () { };\r\n    Object.defineProperty(normalC.prototype, \"c\", {\r\n        /*@internal*/ get: function () { return 10; },\r\n        /*@internal*/ set: function (val) { },\r\n        enumerable: false,\r\n        configurable: true\r\n    });\r\n    return normalC;\r\n}());\r\nvar normalN;\r\n(function (normalN) {\r\n    /*@internal*/ var C = /** @class */ (function () {\r\n        function C() {\r\n        }\r\n        return C;\r\n    }());\r\n    normalN.C = C;\r\n    /*@internal*/ function foo() { }\r\n    normalN.foo = foo;\r\n    /*@internal*/ var someNamespace;\r\n    (function (someNamespace) {\r\n        var C = /** @class */ (function () {\r\n            function C() {\r\n            }\r\n            return C;\r\n        }());\r\n        someNamespace.C = C;\r\n    })(someNamespace = normalN.someNamespace || (normalN.someNamespace = {}));\r\n    /*@internal*/ var someOther;\r\n    (function (someOther) {\r\n        var something;\r\n        (function (something) {\r\n            var someClass = /** @class */ (function () {\r\n                function someClass() {\r\n                }\r\n                return someClass;\r\n            }());\r\n            something.someClass = someClass;\r\n        })(something = someOther.something || (someOther.something = {}));\r\n    })(someOther = normalN.someOther || (normalN.someOther = {}));\r\n    /*@internal*/ normalN.someImport = someNamespace.C;\r\n    /*@internal*/ normalN.internalConst = 10;\r\n    /*@internal*/ var internalEnum;\r\n    (function (internalEnum) {\r\n        internalEnum[internalEnum[\"a\"] = 0] = \"a\";\r\n        internalEnum[internalEnum[\"b\"] = 1] = \"b\";\r\n        internalEnum[internalEnum[\"c\"] = 2] = \"c\";\r\n    })(internalEnum = normalN.internalEnum || (normalN.internalEnum = {}));\r\n})(normalN || (normalN = {}));\r\n/*@internal*/ var internalC = /** @class */ (function () {\r\n    function internalC() {\r\n    }\r\n    return internalC;\r\n}());\r\n/*@internal*/ function internalfoo() { }\r\n/*@internal*/ var internalNamespace;\r\n(function (internalNamespace) {\r\n    var someClass = /** @class */ (function () {\r\n        function someClass() {\r\n        }\r\n        return someClass;\r\n    }());\r\n    internalNamespace.someClass = someClass;\r\n})(internalNamespace || (internalNamespace = {}));\r\n/*@internal*/ var internalOther;\r\n(function (internalOther) {\r\n    var something;\r\n    (function (something) {\r\n        var someClass = /** @class */ (function () {\r\n            function someClass() {\r\n            }\r\n            return someClass;\r\n        }());\r\n        something.someClass = someClass;\r\n    })(something = internalOther.something || (internalOther.something = {}));\r\n})(internalOther || (internalOther = {}));\r\n/*@internal*/ var internalImport = internalNamespace.someClass;\r\n/*@internal*/ var internalConst = 10;\r\n/*@internal*/ var internalEnum;\r\n(function (internalEnum) {\r\n    internalEnum[internalEnum[\"a\"] = 0] = \"a\";\r\n    internalEnum[internalEnum[\"b\"] = 1] = \"b\";\r\n    internalEnum[internalEnum[\"c\"] = 2] = \"c\";\r\n})(internalEnum || (internalEnum = {}));\r\nvar C = /** @class */ (function () {\r\n    function C() {\r\n    }\r\n    C.prototype.doSomething = function () {\r\n        console.log(\"something got done\");\r\n    };\r\n    return C;\r\n}());\r\n//# sourceMappingURL=second-output.js.map"},"dts":{"sections":[{"pos":0,"end":157,"kind":"prepend","data":"../first/bin/first-output.d.ts","texts":[{"pos":0,"end":39,"kind":"internal"},{"pos":41,"end":157,"kind":"text"}]},{"pos":157,"end":234,"kind":"text"},{"pos":234,"end":339,"kind":"internal"},{"pos":341,"end":373,"kind":"text"},{"pos":373,"end":765,"kind":"internal"},{"pos":767,"end":770,"kind":"text"},{"pos":770,"end":1175,"kind":"internal"},{"pos":1177,"end":1225,"kind":"text"}],"mapHash":"13974556515-{\"version\":3,\"file\":\"second-output.d.ts\",\"sourceRoot\":\"\",\"sources\":[\"../first/first_PART1.ts\",\"../first/first_part3.ts\",\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"AAAc,UAAU,QAAQ;IAC5B,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,iBAAiB,CAAC;AAEzB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEK,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;IACN,IAAI,CAAC,IACM,MAAM,CADK;IACtB,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACvC;AACD,kBAAU,OAAO,CAAC;IACA,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACrD;AACa,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,KAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC3C,cAAM,CAAC;IACH,WAAW;CAGd\"}","hash":"-76652520731-interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hello, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ntype internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n//# sourceMappingURL=second-output.d.ts.map"}},"program":{"fileNames":["../second/second_part1.ts","../second/second_part2.ts"],"fileInfos":["13528403307-namespace N {\r\n    // Comment text\r\n}\r\n\r\nnamespace N {\r\n    function f() {\r\n        console.log('testing');\r\n    }\r\n\r\n    f();\r\n}\r\n\nclass normalC {\n    /*@internal*/ constructor() { }\n    /*@internal*/ prop: string;\n    /*@internal*/ method() { }\n    /*@internal*/ get c() { return 10; }\n    /*@internal*/ set c(val: number) { }\n}\nnamespace normalN {\n    /*@internal*/ export class C { }\n    /*@internal*/ export function foo() {}\n    /*@internal*/ export namespace someNamespace { export class C {} }\n    /*@internal*/ export namespace someOther.something { export class someClass {} }\n    /*@internal*/ export import someImport = someNamespace.C;\n    /*@internal*/ export type internalType = internalC;\n    /*@internal*/ export const internalConst = 10;\n    /*@internal*/ export enum internalEnum { a, b, c }\n}\n/*@internal*/ class internalC {}\n/*@internal*/ function internalfoo() {}\n/*@internal*/ namespace internalNamespace { export class someClass {} }\n/*@internal*/ namespace internalOther.something { export class someClass {} }\n/*@internal*/ import internalImport = internalNamespace.someClass;\n/*@internal*/ type internalType = internalC;\n/*@internal*/ const internalConst = 10;\n/*@internal*/ enum internalEnum { a, b, c }","9339262372-class C {\r\n    doSomething() {\r\n        console.log(\"something got done\");\r\n    }\r\n}\r\n"],"options":{"composite":true,"outFile":"./second-output.js"},"outSignature":"-68578080182-interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hello, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ntype internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n","latestChangedDtsFile":"./second-output.d.ts"},"version":"FakeTSVersion"}
 
 //// [/src/2/second-output.tsbuildinfo.baseline.txt]
 ======================================================================
@@ -7984,7 +7985,7 @@ text: (767-770)
 }
 
 ----------------------------------------------------------------------
-internal: (770-1183)
+internal: (770-1175)
 declare class internalC {
 }
 declare function internalfoo(): void;
@@ -7997,7 +7998,7 @@ declare namespace internalOther.something {
     }
 }
 import internalImport = internalNamespace.someClass;
-declare type internalType = internalC;
+type internalType = internalC;
 declare const internalConst = 10;
 declare enum internalEnum {
     a = 0,
@@ -8005,7 +8006,7 @@ declare enum internalEnum {
     c = 2
 }
 ----------------------------------------------------------------------
-text: (1185-1233)
+text: (1177-1225)
 declare class C {
     doSomething(): void;
 }
@@ -8091,17 +8092,17 @@ declare class C {
         },
         {
           "pos": 770,
-          "end": 1183,
+          "end": 1175,
           "kind": "internal"
         },
         {
-          "pos": 1185,
-          "end": 1233,
+          "pos": 1177,
+          "end": 1225,
           "kind": "text"
         }
       ],
-      "hash": "-13432536459-interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hello, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ndeclare type internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n//# sourceMappingURL=second-output.d.ts.map",
-      "mapHash": "-113365255-{\"version\":3,\"file\":\"second-output.d.ts\",\"sourceRoot\":\"\",\"sources\":[\"../first/first_PART1.ts\",\"../first/first_part3.ts\",\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"AAAc,UAAU,QAAQ;IAC5B,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,iBAAiB,CAAC;AAEzB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEK,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;IACN,IAAI,CAAC,IACM,MAAM,CADK;IACtB,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACvC;AACD,kBAAU,OAAO,CAAC;IACA,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACrD;AACa,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,aAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC3C,cAAM,CAAC;IACH,WAAW;CAGd\"}"
+      "hash": "-76652520731-interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hello, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ntype internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n//# sourceMappingURL=second-output.d.ts.map",
+      "mapHash": "13974556515-{\"version\":3,\"file\":\"second-output.d.ts\",\"sourceRoot\":\"\",\"sources\":[\"../first/first_PART1.ts\",\"../first/first_part3.ts\",\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"AAAc,UAAU,QAAQ;IAC5B,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,iBAAiB,CAAC;AAEzB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEK,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;IACN,IAAI,CAAC,IACM,MAAM,CADK;IACtB,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACvC;AACD,kBAAU,OAAO,CAAC;IACA,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACrD;AACa,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,KAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC3C,cAAM,CAAC;IACH,WAAW;CAGd\"}"
     }
   },
   "program": {
@@ -8117,11 +8118,11 @@ declare class C {
       "composite": true,
       "outFile": "./second-output.js"
     },
-    "outSignature": "-25454326822-interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hello, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ndeclare type internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n",
+    "outSignature": "-68578080182-interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hello, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ntype internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n",
     "latestChangedDtsFile": "./second-output.d.ts"
   },
   "version": "FakeTSVersion",
-  "size": 12887
+  "size": 12872
 }
 
 //// [/src/first/bin/first-output.d.ts.map] file written with same contents
@@ -10555,7 +10556,7 @@ exitCode:: ExitStatus.Success
 
 
 //// [/src/2/second-output.d.ts.map]
-{"version":3,"file":"second-output.d.ts","sourceRoot":"","sources":["../first/first_PART1.ts","../first/first_part3.ts","../second/second_part1.ts","../second/second_part2.ts"],"names":[],"mappings":"AAAA,UAAU,QAAQ;IACd,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,iBAAiB,CAAC;AAEzB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEK,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;IACN,IAAI,CAAC,IACM,MAAM,CADK;IACtB,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACvC;AACD,kBAAU,OAAO,CAAC;IACA,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACrD;AACa,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,aAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC3C,cAAM,CAAC;IACH,WAAW;CAGd"}
+{"version":3,"file":"second-output.d.ts","sourceRoot":"","sources":["../first/first_PART1.ts","../first/first_part3.ts","../second/second_part1.ts","../second/second_part2.ts"],"names":[],"mappings":"AAAA,UAAU,QAAQ;IACd,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,iBAAiB,CAAC;AAEzB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEK,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;IACN,IAAI,CAAC,IACM,MAAM,CADK;IACtB,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACvC;AACD,kBAAU,OAAO,CAAC;IACA,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACrD;AACa,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,KAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC3C,cAAM,CAAC;IACH,WAAW;CAGd"}
 
 //// [/src/2/second-output.d.ts.map.baseline.txt]
 ===================================================================
@@ -11234,42 +11235,43 @@ sourceFile:../second/second_part1.ts
 7 >Emitted(52, 52) Source(34, 66) + SourceIndex(2)
 8 >Emitted(52, 53) Source(34, 67) + SourceIndex(2)
 ---
->>>declare type internalType = internalC;
+>>>type internalType = internalC;
 1 >
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^^^^^
-4 >                         ^^^
-5 >                            ^^^^^^^^^
-6 >                                     ^
+2 >^^^^^
+3 >     ^^^^^^^^^^^^
+4 >                 ^^^
+5 >                    ^^^^^^^^^
+6 >                             ^
+7 >                              ^^^^->
 1 >
   >/*@internal*/ 
 2 >type 
-3 >             internalType
-4 >                          = 
-5 >                            internalC
-6 >                                     ;
+3 >     internalType
+4 >                  = 
+5 >                    internalC
+6 >                             ;
 1 >Emitted(53, 1) Source(35, 15) + SourceIndex(2)
-2 >Emitted(53, 14) Source(35, 20) + SourceIndex(2)
-3 >Emitted(53, 26) Source(35, 32) + SourceIndex(2)
-4 >Emitted(53, 29) Source(35, 35) + SourceIndex(2)
-5 >Emitted(53, 38) Source(35, 44) + SourceIndex(2)
-6 >Emitted(53, 39) Source(35, 45) + SourceIndex(2)
+2 >Emitted(53, 6) Source(35, 20) + SourceIndex(2)
+3 >Emitted(53, 18) Source(35, 32) + SourceIndex(2)
+4 >Emitted(53, 21) Source(35, 35) + SourceIndex(2)
+5 >Emitted(53, 30) Source(35, 44) + SourceIndex(2)
+6 >Emitted(53, 31) Source(35, 45) + SourceIndex(2)
 ---
 >>>declare const internalConst = 10;
-1 >
+1->
 2 >^^^^^^^^
 3 >        ^^^^^^
 4 >              ^^^^^^^^^^^^^
 5 >                           ^^^^^
 6 >                                ^
-1 >
+1->
   >/*@internal*/ 
 2 >
 3 >        const 
 4 >              internalConst
 5 >                            = 10
 6 >                                ;
-1 >Emitted(54, 1) Source(36, 15) + SourceIndex(2)
+1->Emitted(54, 1) Source(36, 15) + SourceIndex(2)
 2 >Emitted(54, 9) Source(36, 15) + SourceIndex(2)
 3 >Emitted(54, 15) Source(36, 21) + SourceIndex(2)
 4 >Emitted(54, 28) Source(36, 34) + SourceIndex(2)
@@ -11366,7 +11368,7 @@ sourceFile:../second/second_part2.ts
 >>>//# sourceMappingURL=second-output.d.ts.map
 
 //// [/src/2/second-output.tsbuildinfo]
-{"bundle":{"commonSourceDirectory":"../second","sourceFiles":["../second/second_part1.ts","../second/second_part2.ts"],"js":{"sections":[{"pos":0,"end":127,"kind":"prepend","data":"../first/bin/first-output.js","texts":[{"pos":0,"end":127,"kind":"text"}]},{"pos":127,"end":3544,"kind":"text"}],"mapHash":"4497977942-{\"version\":3,\"file\":\"second-output.js\",\"sourceRoot\":\"\",\"sources\":[\"../first/first_PART1.ts\",\"../first/first_part2.ts\",\"../first/first_part3.ts\",\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"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\"}","hash":"-62899236580-var s = \"Hello, world\";\r\nconsole.log(s);\r\nconsole.log(s);\r\nconsole.log(f());\r\nfunction f() {\r\n    return \"JS does hoists\";\r\n}\r\nvar N;\r\n(function (N) {\r\n    function f() {\r\n        console.log('testing');\r\n    }\r\n    f();\r\n})(N || (N = {}));\r\nvar normalC = /** @class */ (function () {\r\n    /*@internal*/ function normalC() {\r\n    }\r\n    /*@internal*/ normalC.prototype.method = function () { };\r\n    Object.defineProperty(normalC.prototype, \"c\", {\r\n        /*@internal*/ get: function () { return 10; },\r\n        /*@internal*/ set: function (val) { },\r\n        enumerable: false,\r\n        configurable: true\r\n    });\r\n    return normalC;\r\n}());\r\nvar normalN;\r\n(function (normalN) {\r\n    /*@internal*/ var C = /** @class */ (function () {\r\n        function C() {\r\n        }\r\n        return C;\r\n    }());\r\n    normalN.C = C;\r\n    /*@internal*/ function foo() { }\r\n    normalN.foo = foo;\r\n    /*@internal*/ var someNamespace;\r\n    (function (someNamespace) {\r\n        var C = /** @class */ (function () {\r\n            function C() {\r\n            }\r\n            return C;\r\n        }());\r\n        someNamespace.C = C;\r\n    })(someNamespace = normalN.someNamespace || (normalN.someNamespace = {}));\r\n    /*@internal*/ var someOther;\r\n    (function (someOther) {\r\n        var something;\r\n        (function (something) {\r\n            var someClass = /** @class */ (function () {\r\n                function someClass() {\r\n                }\r\n                return someClass;\r\n            }());\r\n            something.someClass = someClass;\r\n        })(something = someOther.something || (someOther.something = {}));\r\n    })(someOther = normalN.someOther || (normalN.someOther = {}));\r\n    /*@internal*/ normalN.someImport = someNamespace.C;\r\n    /*@internal*/ normalN.internalConst = 10;\r\n    /*@internal*/ var internalEnum;\r\n    (function (internalEnum) {\r\n        internalEnum[internalEnum[\"a\"] = 0] = \"a\";\r\n        internalEnum[internalEnum[\"b\"] = 1] = \"b\";\r\n        internalEnum[internalEnum[\"c\"] = 2] = \"c\";\r\n    })(internalEnum = normalN.internalEnum || (normalN.internalEnum = {}));\r\n})(normalN || (normalN = {}));\r\n/*@internal*/ var internalC = /** @class */ (function () {\r\n    function internalC() {\r\n    }\r\n    return internalC;\r\n}());\r\n/*@internal*/ function internalfoo() { }\r\n/*@internal*/ var internalNamespace;\r\n(function (internalNamespace) {\r\n    var someClass = /** @class */ (function () {\r\n        function someClass() {\r\n        }\r\n        return someClass;\r\n    }());\r\n    internalNamespace.someClass = someClass;\r\n})(internalNamespace || (internalNamespace = {}));\r\n/*@internal*/ var internalOther;\r\n(function (internalOther) {\r\n    var something;\r\n    (function (something) {\r\n        var someClass = /** @class */ (function () {\r\n            function someClass() {\r\n            }\r\n            return someClass;\r\n        }());\r\n        something.someClass = someClass;\r\n    })(something = internalOther.something || (internalOther.something = {}));\r\n})(internalOther || (internalOther = {}));\r\n/*@internal*/ var internalImport = internalNamespace.someClass;\r\n/*@internal*/ var internalConst = 10;\r\n/*@internal*/ var internalEnum;\r\n(function (internalEnum) {\r\n    internalEnum[internalEnum[\"a\"] = 0] = \"a\";\r\n    internalEnum[internalEnum[\"b\"] = 1] = \"b\";\r\n    internalEnum[internalEnum[\"c\"] = 2] = \"c\";\r\n})(internalEnum || (internalEnum = {}));\r\nvar C = /** @class */ (function () {\r\n    function C() {\r\n    }\r\n    C.prototype.doSomething = function () {\r\n        console.log(\"something got done\");\r\n    };\r\n    return C;\r\n}());\r\n//# sourceMappingURL=second-output.js.map"},"dts":{"sections":[{"pos":0,"end":157,"kind":"prepend","data":"../first/bin/first-output.d.ts","texts":[{"pos":0,"end":157,"kind":"text"}]},{"pos":157,"end":234,"kind":"text"},{"pos":234,"end":339,"kind":"internal"},{"pos":341,"end":373,"kind":"text"},{"pos":373,"end":765,"kind":"internal"},{"pos":767,"end":770,"kind":"text"},{"pos":770,"end":1183,"kind":"internal"},{"pos":1185,"end":1233,"kind":"text"}],"mapHash":"28410673828-{\"version\":3,\"file\":\"second-output.d.ts\",\"sourceRoot\":\"\",\"sources\":[\"../first/first_PART1.ts\",\"../first/first_part3.ts\",\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"AAAA,UAAU,QAAQ;IACd,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,iBAAiB,CAAC;AAEzB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEK,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;IACN,IAAI,CAAC,IACM,MAAM,CADK;IACtB,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACvC;AACD,kBAAU,OAAO,CAAC;IACA,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACrD;AACa,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,aAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC3C,cAAM,CAAC;IACH,WAAW;CAGd\"}","hash":"-13432536459-interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hello, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ndeclare type internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n//# sourceMappingURL=second-output.d.ts.map"}},"program":{"fileNames":["../second/second_part1.ts","../second/second_part2.ts"],"fileInfos":["13528403307-namespace N {\r\n    // Comment text\r\n}\r\n\r\nnamespace N {\r\n    function f() {\r\n        console.log('testing');\r\n    }\r\n\r\n    f();\r\n}\r\n\nclass normalC {\n    /*@internal*/ constructor() { }\n    /*@internal*/ prop: string;\n    /*@internal*/ method() { }\n    /*@internal*/ get c() { return 10; }\n    /*@internal*/ set c(val: number) { }\n}\nnamespace normalN {\n    /*@internal*/ export class C { }\n    /*@internal*/ export function foo() {}\n    /*@internal*/ export namespace someNamespace { export class C {} }\n    /*@internal*/ export namespace someOther.something { export class someClass {} }\n    /*@internal*/ export import someImport = someNamespace.C;\n    /*@internal*/ export type internalType = internalC;\n    /*@internal*/ export const internalConst = 10;\n    /*@internal*/ export enum internalEnum { a, b, c }\n}\n/*@internal*/ class internalC {}\n/*@internal*/ function internalfoo() {}\n/*@internal*/ namespace internalNamespace { export class someClass {} }\n/*@internal*/ namespace internalOther.something { export class someClass {} }\n/*@internal*/ import internalImport = internalNamespace.someClass;\n/*@internal*/ type internalType = internalC;\n/*@internal*/ const internalConst = 10;\n/*@internal*/ enum internalEnum { a, b, c }","9339262372-class C {\r\n    doSomething() {\r\n        console.log(\"something got done\");\r\n    }\r\n}\r\n"],"options":{"composite":true,"outFile":"./second-output.js"},"outSignature":"-25454326822-interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hello, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ndeclare type internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n","latestChangedDtsFile":"./second-output.d.ts"},"version":"FakeTSVersion"}
+{"bundle":{"commonSourceDirectory":"../second","sourceFiles":["../second/second_part1.ts","../second/second_part2.ts"],"js":{"sections":[{"pos":0,"end":127,"kind":"prepend","data":"../first/bin/first-output.js","texts":[{"pos":0,"end":127,"kind":"text"}]},{"pos":127,"end":3544,"kind":"text"}],"mapHash":"4497977942-{\"version\":3,\"file\":\"second-output.js\",\"sourceRoot\":\"\",\"sources\":[\"../first/first_PART1.ts\",\"../first/first_part2.ts\",\"../first/first_part3.ts\",\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"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\"}","hash":"-62899236580-var s = \"Hello, world\";\r\nconsole.log(s);\r\nconsole.log(s);\r\nconsole.log(f());\r\nfunction f() {\r\n    return \"JS does hoists\";\r\n}\r\nvar N;\r\n(function (N) {\r\n    function f() {\r\n        console.log('testing');\r\n    }\r\n    f();\r\n})(N || (N = {}));\r\nvar normalC = /** @class */ (function () {\r\n    /*@internal*/ function normalC() {\r\n    }\r\n    /*@internal*/ normalC.prototype.method = function () { };\r\n    Object.defineProperty(normalC.prototype, \"c\", {\r\n        /*@internal*/ get: function () { return 10; },\r\n        /*@internal*/ set: function (val) { },\r\n        enumerable: false,\r\n        configurable: true\r\n    });\r\n    return normalC;\r\n}());\r\nvar normalN;\r\n(function (normalN) {\r\n    /*@internal*/ var C = /** @class */ (function () {\r\n        function C() {\r\n        }\r\n        return C;\r\n    }());\r\n    normalN.C = C;\r\n    /*@internal*/ function foo() { }\r\n    normalN.foo = foo;\r\n    /*@internal*/ var someNamespace;\r\n    (function (someNamespace) {\r\n        var C = /** @class */ (function () {\r\n            function C() {\r\n            }\r\n            return C;\r\n        }());\r\n        someNamespace.C = C;\r\n    })(someNamespace = normalN.someNamespace || (normalN.someNamespace = {}));\r\n    /*@internal*/ var someOther;\r\n    (function (someOther) {\r\n        var something;\r\n        (function (something) {\r\n            var someClass = /** @class */ (function () {\r\n                function someClass() {\r\n                }\r\n                return someClass;\r\n            }());\r\n            something.someClass = someClass;\r\n        })(something = someOther.something || (someOther.something = {}));\r\n    })(someOther = normalN.someOther || (normalN.someOther = {}));\r\n    /*@internal*/ normalN.someImport = someNamespace.C;\r\n    /*@internal*/ normalN.internalConst = 10;\r\n    /*@internal*/ var internalEnum;\r\n    (function (internalEnum) {\r\n        internalEnum[internalEnum[\"a\"] = 0] = \"a\";\r\n        internalEnum[internalEnum[\"b\"] = 1] = \"b\";\r\n        internalEnum[internalEnum[\"c\"] = 2] = \"c\";\r\n    })(internalEnum = normalN.internalEnum || (normalN.internalEnum = {}));\r\n})(normalN || (normalN = {}));\r\n/*@internal*/ var internalC = /** @class */ (function () {\r\n    function internalC() {\r\n    }\r\n    return internalC;\r\n}());\r\n/*@internal*/ function internalfoo() { }\r\n/*@internal*/ var internalNamespace;\r\n(function (internalNamespace) {\r\n    var someClass = /** @class */ (function () {\r\n        function someClass() {\r\n        }\r\n        return someClass;\r\n    }());\r\n    internalNamespace.someClass = someClass;\r\n})(internalNamespace || (internalNamespace = {}));\r\n/*@internal*/ var internalOther;\r\n(function (internalOther) {\r\n    var something;\r\n    (function (something) {\r\n        var someClass = /** @class */ (function () {\r\n            function someClass() {\r\n            }\r\n            return someClass;\r\n        }());\r\n        something.someClass = someClass;\r\n    })(something = internalOther.something || (internalOther.something = {}));\r\n})(internalOther || (internalOther = {}));\r\n/*@internal*/ var internalImport = internalNamespace.someClass;\r\n/*@internal*/ var internalConst = 10;\r\n/*@internal*/ var internalEnum;\r\n(function (internalEnum) {\r\n    internalEnum[internalEnum[\"a\"] = 0] = \"a\";\r\n    internalEnum[internalEnum[\"b\"] = 1] = \"b\";\r\n    internalEnum[internalEnum[\"c\"] = 2] = \"c\";\r\n})(internalEnum || (internalEnum = {}));\r\nvar C = /** @class */ (function () {\r\n    function C() {\r\n    }\r\n    C.prototype.doSomething = function () {\r\n        console.log(\"something got done\");\r\n    };\r\n    return C;\r\n}());\r\n//# sourceMappingURL=second-output.js.map"},"dts":{"sections":[{"pos":0,"end":157,"kind":"prepend","data":"../first/bin/first-output.d.ts","texts":[{"pos":0,"end":157,"kind":"text"}]},{"pos":157,"end":234,"kind":"text"},{"pos":234,"end":339,"kind":"internal"},{"pos":341,"end":373,"kind":"text"},{"pos":373,"end":765,"kind":"internal"},{"pos":767,"end":770,"kind":"text"},{"pos":770,"end":1175,"kind":"internal"},{"pos":1177,"end":1225,"kind":"text"}],"mapHash":"55383497486-{\"version\":3,\"file\":\"second-output.d.ts\",\"sourceRoot\":\"\",\"sources\":[\"../first/first_PART1.ts\",\"../first/first_part3.ts\",\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"AAAA,UAAU,QAAQ;IACd,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,iBAAiB,CAAC;AAEzB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEK,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;IACN,IAAI,CAAC,IACM,MAAM,CADK;IACtB,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACvC;AACD,kBAAU,OAAO,CAAC;IACA,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACrD;AACa,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,KAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC3C,cAAM,CAAC;IACH,WAAW;CAGd\"}","hash":"-76652520731-interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hello, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ntype internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n//# sourceMappingURL=second-output.d.ts.map"}},"program":{"fileNames":["../second/second_part1.ts","../second/second_part2.ts"],"fileInfos":["13528403307-namespace N {\r\n    // Comment text\r\n}\r\n\r\nnamespace N {\r\n    function f() {\r\n        console.log('testing');\r\n    }\r\n\r\n    f();\r\n}\r\n\nclass normalC {\n    /*@internal*/ constructor() { }\n    /*@internal*/ prop: string;\n    /*@internal*/ method() { }\n    /*@internal*/ get c() { return 10; }\n    /*@internal*/ set c(val: number) { }\n}\nnamespace normalN {\n    /*@internal*/ export class C { }\n    /*@internal*/ export function foo() {}\n    /*@internal*/ export namespace someNamespace { export class C {} }\n    /*@internal*/ export namespace someOther.something { export class someClass {} }\n    /*@internal*/ export import someImport = someNamespace.C;\n    /*@internal*/ export type internalType = internalC;\n    /*@internal*/ export const internalConst = 10;\n    /*@internal*/ export enum internalEnum { a, b, c }\n}\n/*@internal*/ class internalC {}\n/*@internal*/ function internalfoo() {}\n/*@internal*/ namespace internalNamespace { export class someClass {} }\n/*@internal*/ namespace internalOther.something { export class someClass {} }\n/*@internal*/ import internalImport = internalNamespace.someClass;\n/*@internal*/ type internalType = internalC;\n/*@internal*/ const internalConst = 10;\n/*@internal*/ enum internalEnum { a, b, c }","9339262372-class C {\r\n    doSomething() {\r\n        console.log(\"something got done\");\r\n    }\r\n}\r\n"],"options":{"composite":true,"outFile":"./second-output.js"},"outSignature":"-68578080182-interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hello, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ntype internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n","latestChangedDtsFile":"./second-output.d.ts"},"version":"FakeTSVersion"}
 
 //// [/src/2/second-output.tsbuildinfo.baseline.txt]
 ======================================================================
@@ -11550,7 +11552,7 @@ text: (767-770)
 }
 
 ----------------------------------------------------------------------
-internal: (770-1183)
+internal: (770-1175)
 declare class internalC {
 }
 declare function internalfoo(): void;
@@ -11563,7 +11565,7 @@ declare namespace internalOther.something {
     }
 }
 import internalImport = internalNamespace.someClass;
-declare type internalType = internalC;
+type internalType = internalC;
 declare const internalConst = 10;
 declare enum internalEnum {
     a = 0,
@@ -11571,7 +11573,7 @@ declare enum internalEnum {
     c = 2
 }
 ----------------------------------------------------------------------
-text: (1185-1233)
+text: (1177-1225)
 declare class C {
     doSomething(): void;
 }
@@ -11652,17 +11654,17 @@ declare class C {
         },
         {
           "pos": 770,
-          "end": 1183,
+          "end": 1175,
           "kind": "internal"
         },
         {
-          "pos": 1185,
-          "end": 1233,
+          "pos": 1177,
+          "end": 1225,
           "kind": "text"
         }
       ],
-      "hash": "-13432536459-interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hello, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ndeclare type internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n//# sourceMappingURL=second-output.d.ts.map",
-      "mapHash": "28410673828-{\"version\":3,\"file\":\"second-output.d.ts\",\"sourceRoot\":\"\",\"sources\":[\"../first/first_PART1.ts\",\"../first/first_part3.ts\",\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"AAAA,UAAU,QAAQ;IACd,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,iBAAiB,CAAC;AAEzB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEK,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;IACN,IAAI,CAAC,IACM,MAAM,CADK;IACtB,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACvC;AACD,kBAAU,OAAO,CAAC;IACA,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACrD;AACa,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,aAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC3C,cAAM,CAAC;IACH,WAAW;CAGd\"}"
+      "hash": "-76652520731-interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hello, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ntype internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n//# sourceMappingURL=second-output.d.ts.map",
+      "mapHash": "55383497486-{\"version\":3,\"file\":\"second-output.d.ts\",\"sourceRoot\":\"\",\"sources\":[\"../first/first_PART1.ts\",\"../first/first_part3.ts\",\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"AAAA,UAAU,QAAQ;IACd,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,iBAAiB,CAAC;AAEzB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEK,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;IACN,IAAI,CAAC,IACM,MAAM,CADK;IACtB,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACvC;AACD,kBAAU,OAAO,CAAC;IACA,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACrD;AACa,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,KAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC3C,cAAM,CAAC;IACH,WAAW;CAGd\"}"
     }
   },
   "program": {
@@ -11678,11 +11680,11 @@ declare class C {
       "composite": true,
       "outFile": "./second-output.js"
     },
-    "outSignature": "-25454326822-interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hello, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ndeclare type internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n",
+    "outSignature": "-68578080182-interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hello, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\ndeclare function f(): string;\r\ndeclare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ntype internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n",
     "latestChangedDtsFile": "./second-output.d.ts"
   },
   "version": "FakeTSVersion",
-  "size": 12849
+  "size": 12833
 }
 
 //// [/src/first/bin/first-output.d.ts.map]
diff --git a/tests/baselines/reference/tsbuild/outfile-concat/stripInternal-with-comments-emit-enabled.js b/tests/baselines/reference/tsbuild/outfile-concat/stripInternal-with-comments-emit-enabled.js
index 5ef8f02b850d6..78d5174dd6b15 100644
--- a/tests/baselines/reference/tsbuild/outfile-concat/stripInternal-with-comments-emit-enabled.js
+++ b/tests/baselines/reference/tsbuild/outfile-concat/stripInternal-with-comments-emit-enabled.js
@@ -222,7 +222,7 @@ declare namespace internalOther.something {
     }
 }
 import internalImport = internalNamespace.someClass;
-declare type internalType = internalC;
+type internalType = internalC;
 declare const internalConst = 10;
 declare enum internalEnum {
     a = 0,
@@ -235,7 +235,7 @@ declare class C {
 //# sourceMappingURL=second-output.d.ts.map
 
 //// [/src/2/second-output.d.ts.map]
-{"version":3,"file":"second-output.d.ts","sourceRoot":"","sources":["../second/second_part1.ts","../second/second_part2.ts"],"names":[],"mappings":"AAAA,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEK,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;IACN,IAAI,CAAC,IACM,MAAM,CADK;IACtB,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACvC;AACD,kBAAU,OAAO,CAAC;IACA,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACrD;AACa,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,aAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC3C,cAAM,CAAC;IACH,WAAW;CAGd"}
+{"version":3,"file":"second-output.d.ts","sourceRoot":"","sources":["../second/second_part1.ts","../second/second_part2.ts"],"names":[],"mappings":"AAAA,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEK,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;IACN,IAAI,CAAC,IACM,MAAM,CADK;IACtB,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACvC;AACD,kBAAU,OAAO,CAAC;IACA,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACrD;AACa,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,KAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC3C,cAAM,CAAC;IACH,WAAW;CAGd"}
 
 //// [/src/2/second-output.d.ts.map.baseline.txt]
 ===================================================================
@@ -794,42 +794,43 @@ sourceFile:../second/second_part1.ts
 7 >Emitted(44, 52) Source(34, 66) + SourceIndex(0)
 8 >Emitted(44, 53) Source(34, 67) + SourceIndex(0)
 ---
->>>declare type internalType = internalC;
+>>>type internalType = internalC;
 1 >
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^^^^^
-4 >                         ^^^
-5 >                            ^^^^^^^^^
-6 >                                     ^
+2 >^^^^^
+3 >     ^^^^^^^^^^^^
+4 >                 ^^^
+5 >                    ^^^^^^^^^
+6 >                             ^
+7 >                              ^^^^->
 1 >
   >/*@internal*/ 
 2 >type 
-3 >             internalType
-4 >                          = 
-5 >                            internalC
-6 >                                     ;
+3 >     internalType
+4 >                  = 
+5 >                    internalC
+6 >                             ;
 1 >Emitted(45, 1) Source(35, 15) + SourceIndex(0)
-2 >Emitted(45, 14) Source(35, 20) + SourceIndex(0)
-3 >Emitted(45, 26) Source(35, 32) + SourceIndex(0)
-4 >Emitted(45, 29) Source(35, 35) + SourceIndex(0)
-5 >Emitted(45, 38) Source(35, 44) + SourceIndex(0)
-6 >Emitted(45, 39) Source(35, 45) + SourceIndex(0)
+2 >Emitted(45, 6) Source(35, 20) + SourceIndex(0)
+3 >Emitted(45, 18) Source(35, 32) + SourceIndex(0)
+4 >Emitted(45, 21) Source(35, 35) + SourceIndex(0)
+5 >Emitted(45, 30) Source(35, 44) + SourceIndex(0)
+6 >Emitted(45, 31) Source(35, 45) + SourceIndex(0)
 ---
 >>>declare const internalConst = 10;
-1 >
+1->
 2 >^^^^^^^^
 3 >        ^^^^^^
 4 >              ^^^^^^^^^^^^^
 5 >                           ^^^^^
 6 >                                ^
-1 >
+1->
   >/*@internal*/ 
 2 >
 3 >        const 
 4 >              internalConst
 5 >                            = 10
 6 >                                ;
-1 >Emitted(46, 1) Source(36, 15) + SourceIndex(0)
+1->Emitted(46, 1) Source(36, 15) + SourceIndex(0)
 2 >Emitted(46, 9) Source(36, 15) + SourceIndex(0)
 3 >Emitted(46, 15) Source(36, 21) + SourceIndex(0)
 4 >Emitted(46, 28) Source(36, 34) + SourceIndex(0)
@@ -2580,7 +2581,7 @@ sourceFile:../second/second_part2.ts
 >>>//# sourceMappingURL=second-output.js.map
 
 //// [/src/2/second-output.tsbuildinfo]
-{"bundle":{"commonSourceDirectory":"../second","sourceFiles":["../second/second_part1.ts","../second/second_part2.ts"],"js":{"sections":[{"pos":0,"end":3417,"kind":"text"}],"mapHash":"-2464084269-{\"version\":3,\"file\":\"second-output.js\",\"sourceRoot\":\"\",\"sources\":[\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"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\"}","hash":"-136024231077-var N;\r\n(function (N) {\r\n    function f() {\r\n        console.log('testing');\r\n    }\r\n    f();\r\n})(N || (N = {}));\r\nvar normalC = /** @class */ (function () {\r\n    /*@internal*/ function normalC() {\r\n    }\r\n    /*@internal*/ normalC.prototype.method = function () { };\r\n    Object.defineProperty(normalC.prototype, \"c\", {\r\n        /*@internal*/ get: function () { return 10; },\r\n        /*@internal*/ set: function (val) { },\r\n        enumerable: false,\r\n        configurable: true\r\n    });\r\n    return normalC;\r\n}());\r\nvar normalN;\r\n(function (normalN) {\r\n    /*@internal*/ var C = /** @class */ (function () {\r\n        function C() {\r\n        }\r\n        return C;\r\n    }());\r\n    normalN.C = C;\r\n    /*@internal*/ function foo() { }\r\n    normalN.foo = foo;\r\n    /*@internal*/ var someNamespace;\r\n    (function (someNamespace) {\r\n        var C = /** @class */ (function () {\r\n            function C() {\r\n            }\r\n            return C;\r\n        }());\r\n        someNamespace.C = C;\r\n    })(someNamespace = normalN.someNamespace || (normalN.someNamespace = {}));\r\n    /*@internal*/ var someOther;\r\n    (function (someOther) {\r\n        var something;\r\n        (function (something) {\r\n            var someClass = /** @class */ (function () {\r\n                function someClass() {\r\n                }\r\n                return someClass;\r\n            }());\r\n            something.someClass = someClass;\r\n        })(something = someOther.something || (someOther.something = {}));\r\n    })(someOther = normalN.someOther || (normalN.someOther = {}));\r\n    /*@internal*/ normalN.someImport = someNamespace.C;\r\n    /*@internal*/ normalN.internalConst = 10;\r\n    /*@internal*/ var internalEnum;\r\n    (function (internalEnum) {\r\n        internalEnum[internalEnum[\"a\"] = 0] = \"a\";\r\n        internalEnum[internalEnum[\"b\"] = 1] = \"b\";\r\n        internalEnum[internalEnum[\"c\"] = 2] = \"c\";\r\n    })(internalEnum = normalN.internalEnum || (normalN.internalEnum = {}));\r\n})(normalN || (normalN = {}));\r\n/*@internal*/ var internalC = /** @class */ (function () {\r\n    function internalC() {\r\n    }\r\n    return internalC;\r\n}());\r\n/*@internal*/ function internalfoo() { }\r\n/*@internal*/ var internalNamespace;\r\n(function (internalNamespace) {\r\n    var someClass = /** @class */ (function () {\r\n        function someClass() {\r\n        }\r\n        return someClass;\r\n    }());\r\n    internalNamespace.someClass = someClass;\r\n})(internalNamespace || (internalNamespace = {}));\r\n/*@internal*/ var internalOther;\r\n(function (internalOther) {\r\n    var something;\r\n    (function (something) {\r\n        var someClass = /** @class */ (function () {\r\n            function someClass() {\r\n            }\r\n            return someClass;\r\n        }());\r\n        something.someClass = someClass;\r\n    })(something = internalOther.something || (internalOther.something = {}));\r\n})(internalOther || (internalOther = {}));\r\n/*@internal*/ var internalImport = internalNamespace.someClass;\r\n/*@internal*/ var internalConst = 10;\r\n/*@internal*/ var internalEnum;\r\n(function (internalEnum) {\r\n    internalEnum[internalEnum[\"a\"] = 0] = \"a\";\r\n    internalEnum[internalEnum[\"b\"] = 1] = \"b\";\r\n    internalEnum[internalEnum[\"c\"] = 2] = \"c\";\r\n})(internalEnum || (internalEnum = {}));\r\nvar C = /** @class */ (function () {\r\n    function C() {\r\n    }\r\n    C.prototype.doSomething = function () {\r\n        console.log(\"something got done\");\r\n    };\r\n    return C;\r\n}());\r\n//# sourceMappingURL=second-output.js.map"},"dts":{"sections":[{"pos":0,"end":77,"kind":"text"},{"pos":77,"end":182,"kind":"internal"},{"pos":184,"end":216,"kind":"text"},{"pos":216,"end":608,"kind":"internal"},{"pos":610,"end":613,"kind":"text"},{"pos":613,"end":1026,"kind":"internal"},{"pos":1028,"end":1076,"kind":"text"}],"mapHash":"-21406246021-{\"version\":3,\"file\":\"second-output.d.ts\",\"sourceRoot\":\"\",\"sources\":[\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"AAAA,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEK,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;IACN,IAAI,CAAC,IACM,MAAM,CADK;IACtB,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACvC;AACD,kBAAU,OAAO,CAAC;IACA,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACrD;AACa,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,aAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC3C,cAAM,CAAC;IACH,WAAW;CAGd\"}","hash":"-9468064165-declare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ndeclare type internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n//# sourceMappingURL=second-output.d.ts.map"}},"program":{"fileNames":["../second/second_part1.ts","../second/second_part2.ts"],"fileInfos":["13528403307-namespace N {\r\n    // Comment text\r\n}\r\n\r\nnamespace N {\r\n    function f() {\r\n        console.log('testing');\r\n    }\r\n\r\n    f();\r\n}\r\n\nclass normalC {\n    /*@internal*/ constructor() { }\n    /*@internal*/ prop: string;\n    /*@internal*/ method() { }\n    /*@internal*/ get c() { return 10; }\n    /*@internal*/ set c(val: number) { }\n}\nnamespace normalN {\n    /*@internal*/ export class C { }\n    /*@internal*/ export function foo() {}\n    /*@internal*/ export namespace someNamespace { export class C {} }\n    /*@internal*/ export namespace someOther.something { export class someClass {} }\n    /*@internal*/ export import someImport = someNamespace.C;\n    /*@internal*/ export type internalType = internalC;\n    /*@internal*/ export const internalConst = 10;\n    /*@internal*/ export enum internalEnum { a, b, c }\n}\n/*@internal*/ class internalC {}\n/*@internal*/ function internalfoo() {}\n/*@internal*/ namespace internalNamespace { export class someClass {} }\n/*@internal*/ namespace internalOther.something { export class someClass {} }\n/*@internal*/ import internalImport = internalNamespace.someClass;\n/*@internal*/ type internalType = internalC;\n/*@internal*/ const internalConst = 10;\n/*@internal*/ enum internalEnum { a, b, c }","9339262372-class C {\r\n    doSomething() {\r\n        console.log(\"something got done\");\r\n    }\r\n}\r\n"],"options":{"composite":true,"outFile":"./second-output.js"},"outSignature":"-20504865920-declare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ndeclare type internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n","latestChangedDtsFile":"./second-output.d.ts"},"version":"FakeTSVersion"}
+{"bundle":{"commonSourceDirectory":"../second","sourceFiles":["../second/second_part1.ts","../second/second_part2.ts"],"js":{"sections":[{"pos":0,"end":3417,"kind":"text"}],"mapHash":"-2464084269-{\"version\":3,\"file\":\"second-output.js\",\"sourceRoot\":\"\",\"sources\":[\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"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\"}","hash":"-136024231077-var N;\r\n(function (N) {\r\n    function f() {\r\n        console.log('testing');\r\n    }\r\n    f();\r\n})(N || (N = {}));\r\nvar normalC = /** @class */ (function () {\r\n    /*@internal*/ function normalC() {\r\n    }\r\n    /*@internal*/ normalC.prototype.method = function () { };\r\n    Object.defineProperty(normalC.prototype, \"c\", {\r\n        /*@internal*/ get: function () { return 10; },\r\n        /*@internal*/ set: function (val) { },\r\n        enumerable: false,\r\n        configurable: true\r\n    });\r\n    return normalC;\r\n}());\r\nvar normalN;\r\n(function (normalN) {\r\n    /*@internal*/ var C = /** @class */ (function () {\r\n        function C() {\r\n        }\r\n        return C;\r\n    }());\r\n    normalN.C = C;\r\n    /*@internal*/ function foo() { }\r\n    normalN.foo = foo;\r\n    /*@internal*/ var someNamespace;\r\n    (function (someNamespace) {\r\n        var C = /** @class */ (function () {\r\n            function C() {\r\n            }\r\n            return C;\r\n        }());\r\n        someNamespace.C = C;\r\n    })(someNamespace = normalN.someNamespace || (normalN.someNamespace = {}));\r\n    /*@internal*/ var someOther;\r\n    (function (someOther) {\r\n        var something;\r\n        (function (something) {\r\n            var someClass = /** @class */ (function () {\r\n                function someClass() {\r\n                }\r\n                return someClass;\r\n            }());\r\n            something.someClass = someClass;\r\n        })(something = someOther.something || (someOther.something = {}));\r\n    })(someOther = normalN.someOther || (normalN.someOther = {}));\r\n    /*@internal*/ normalN.someImport = someNamespace.C;\r\n    /*@internal*/ normalN.internalConst = 10;\r\n    /*@internal*/ var internalEnum;\r\n    (function (internalEnum) {\r\n        internalEnum[internalEnum[\"a\"] = 0] = \"a\";\r\n        internalEnum[internalEnum[\"b\"] = 1] = \"b\";\r\n        internalEnum[internalEnum[\"c\"] = 2] = \"c\";\r\n    })(internalEnum = normalN.internalEnum || (normalN.internalEnum = {}));\r\n})(normalN || (normalN = {}));\r\n/*@internal*/ var internalC = /** @class */ (function () {\r\n    function internalC() {\r\n    }\r\n    return internalC;\r\n}());\r\n/*@internal*/ function internalfoo() { }\r\n/*@internal*/ var internalNamespace;\r\n(function (internalNamespace) {\r\n    var someClass = /** @class */ (function () {\r\n        function someClass() {\r\n        }\r\n        return someClass;\r\n    }());\r\n    internalNamespace.someClass = someClass;\r\n})(internalNamespace || (internalNamespace = {}));\r\n/*@internal*/ var internalOther;\r\n(function (internalOther) {\r\n    var something;\r\n    (function (something) {\r\n        var someClass = /** @class */ (function () {\r\n            function someClass() {\r\n            }\r\n            return someClass;\r\n        }());\r\n        something.someClass = someClass;\r\n    })(something = internalOther.something || (internalOther.something = {}));\r\n})(internalOther || (internalOther = {}));\r\n/*@internal*/ var internalImport = internalNamespace.someClass;\r\n/*@internal*/ var internalConst = 10;\r\n/*@internal*/ var internalEnum;\r\n(function (internalEnum) {\r\n    internalEnum[internalEnum[\"a\"] = 0] = \"a\";\r\n    internalEnum[internalEnum[\"b\"] = 1] = \"b\";\r\n    internalEnum[internalEnum[\"c\"] = 2] = \"c\";\r\n})(internalEnum || (internalEnum = {}));\r\nvar C = /** @class */ (function () {\r\n    function C() {\r\n    }\r\n    C.prototype.doSomething = function () {\r\n        console.log(\"something got done\");\r\n    };\r\n    return C;\r\n}());\r\n//# sourceMappingURL=second-output.js.map"},"dts":{"sections":[{"pos":0,"end":77,"kind":"text"},{"pos":77,"end":182,"kind":"internal"},{"pos":184,"end":216,"kind":"text"},{"pos":216,"end":608,"kind":"internal"},{"pos":610,"end":613,"kind":"text"},{"pos":613,"end":1018,"kind":"internal"},{"pos":1020,"end":1068,"kind":"text"}],"mapHash":"-11613291547-{\"version\":3,\"file\":\"second-output.d.ts\",\"sourceRoot\":\"\",\"sources\":[\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"AAAA,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEK,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;IACN,IAAI,CAAC,IACM,MAAM,CADK;IACtB,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACvC;AACD,kBAAU,OAAO,CAAC;IACA,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACrD;AACa,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,KAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC3C,cAAM,CAAC;IACH,WAAW;CAGd\"}","hash":"11189477579-declare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ntype internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n//# sourceMappingURL=second-output.d.ts.map"}},"program":{"fileNames":["../second/second_part1.ts","../second/second_part2.ts"],"fileInfos":["13528403307-namespace N {\r\n    // Comment text\r\n}\r\n\r\nnamespace N {\r\n    function f() {\r\n        console.log('testing');\r\n    }\r\n\r\n    f();\r\n}\r\n\nclass normalC {\n    /*@internal*/ constructor() { }\n    /*@internal*/ prop: string;\n    /*@internal*/ method() { }\n    /*@internal*/ get c() { return 10; }\n    /*@internal*/ set c(val: number) { }\n}\nnamespace normalN {\n    /*@internal*/ export class C { }\n    /*@internal*/ export function foo() {}\n    /*@internal*/ export namespace someNamespace { export class C {} }\n    /*@internal*/ export namespace someOther.something { export class someClass {} }\n    /*@internal*/ export import someImport = someNamespace.C;\n    /*@internal*/ export type internalType = internalC;\n    /*@internal*/ export const internalConst = 10;\n    /*@internal*/ export enum internalEnum { a, b, c }\n}\n/*@internal*/ class internalC {}\n/*@internal*/ function internalfoo() {}\n/*@internal*/ namespace internalNamespace { export class someClass {} }\n/*@internal*/ namespace internalOther.something { export class someClass {} }\n/*@internal*/ import internalImport = internalNamespace.someClass;\n/*@internal*/ type internalType = internalC;\n/*@internal*/ const internalConst = 10;\n/*@internal*/ enum internalEnum { a, b, c }","9339262372-class C {\r\n    doSomething() {\r\n        console.log(\"something got done\");\r\n    }\r\n}\r\n"],"options":{"composite":true,"outFile":"./second-output.js"},"outSignature":"2446199792-declare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ntype internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n","latestChangedDtsFile":"./second-output.d.ts"},"version":"FakeTSVersion"}
 
 //// [/src/2/second-output.tsbuildinfo.baseline.txt]
 ======================================================================
@@ -2739,7 +2740,7 @@ text: (610-613)
 }
 
 ----------------------------------------------------------------------
-internal: (613-1026)
+internal: (613-1018)
 declare class internalC {
 }
 declare function internalfoo(): void;
@@ -2752,7 +2753,7 @@ declare namespace internalOther.something {
     }
 }
 import internalImport = internalNamespace.someClass;
-declare type internalType = internalC;
+type internalType = internalC;
 declare const internalConst = 10;
 declare enum internalEnum {
     a = 0,
@@ -2760,7 +2761,7 @@ declare enum internalEnum {
     c = 2
 }
 ----------------------------------------------------------------------
-text: (1028-1076)
+text: (1020-1068)
 declare class C {
     doSomething(): void;
 }
@@ -2815,17 +2816,17 @@ declare class C {
         },
         {
           "pos": 613,
-          "end": 1026,
+          "end": 1018,
           "kind": "internal"
         },
         {
-          "pos": 1028,
-          "end": 1076,
+          "pos": 1020,
+          "end": 1068,
           "kind": "text"
         }
       ],
-      "hash": "-9468064165-declare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ndeclare type internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n//# sourceMappingURL=second-output.d.ts.map",
-      "mapHash": "-21406246021-{\"version\":3,\"file\":\"second-output.d.ts\",\"sourceRoot\":\"\",\"sources\":[\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"AAAA,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEK,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;IACN,IAAI,CAAC,IACM,MAAM,CADK;IACtB,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACvC;AACD,kBAAU,OAAO,CAAC;IACA,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACrD;AACa,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,aAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC3C,cAAM,CAAC;IACH,WAAW;CAGd\"}"
+      "hash": "11189477579-declare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ntype internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n//# sourceMappingURL=second-output.d.ts.map",
+      "mapHash": "-11613291547-{\"version\":3,\"file\":\"second-output.d.ts\",\"sourceRoot\":\"\",\"sources\":[\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"AAAA,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEK,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;IACN,IAAI,CAAC,IACM,MAAM,CADK;IACtB,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACvC;AACD,kBAAU,OAAO,CAAC;IACA,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACrD;AACa,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,KAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC3C,cAAM,CAAC;IACH,WAAW;CAGd\"}"
     }
   },
   "program": {
@@ -2841,11 +2842,11 @@ declare class C {
       "composite": true,
       "outFile": "./second-output.js"
     },
-    "outSignature": "-20504865920-declare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ndeclare type internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n",
+    "outSignature": "2446199792-declare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ntype internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n",
     "latestChangedDtsFile": "./second-output.d.ts"
   },
   "version": "FakeTSVersion",
-  "size": 11618
+  "size": 11600
 }
 
 //// [/src/first/bin/first-output.d.ts]
diff --git a/tests/baselines/reference/tsbuild/outfile-concat/stripInternal.js b/tests/baselines/reference/tsbuild/outfile-concat/stripInternal.js
index 65c909b13ee2c..92e1d292adaeb 100644
--- a/tests/baselines/reference/tsbuild/outfile-concat/stripInternal.js
+++ b/tests/baselines/reference/tsbuild/outfile-concat/stripInternal.js
@@ -242,7 +242,7 @@ declare namespace internalOther.something {
     }
 }
 import internalImport = internalNamespace.someClass;
-declare type internalType = internalC;
+type internalType = internalC;
 declare const internalConst = 10;
 declare enum internalEnum {
     a = 0,
@@ -255,7 +255,7 @@ declare class C {
 //# sourceMappingURL=second-output.d.ts.map
 
 //// [/src/2/second-output.d.ts.map]
-{"version":3,"file":"second-output.d.ts","sourceRoot":"","sources":["../second/second_part1.ts","../second/second_part2.ts"],"names":[],"mappings":"AAAA,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEK,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;IACN,IAAI,CAAC,IACM,MAAM,CADK;IACtB,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACvC;AACD,kBAAU,OAAO,CAAC;IACA,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACrD;AACa,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,aAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC3C,cAAM,CAAC;IACH,WAAW;CAGd"}
+{"version":3,"file":"second-output.d.ts","sourceRoot":"","sources":["../second/second_part1.ts","../second/second_part2.ts"],"names":[],"mappings":"AAAA,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEK,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;IACN,IAAI,CAAC,IACM,MAAM,CADK;IACtB,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACvC;AACD,kBAAU,OAAO,CAAC;IACA,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACrD;AACa,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,KAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC3C,cAAM,CAAC;IACH,WAAW;CAGd"}
 
 //// [/src/2/second-output.d.ts.map.baseline.txt]
 ===================================================================
@@ -814,42 +814,43 @@ sourceFile:../second/second_part1.ts
 7 >Emitted(44, 52) Source(34, 66) + SourceIndex(0)
 8 >Emitted(44, 53) Source(34, 67) + SourceIndex(0)
 ---
->>>declare type internalType = internalC;
+>>>type internalType = internalC;
 1 >
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^^^^^
-4 >                         ^^^
-5 >                            ^^^^^^^^^
-6 >                                     ^
+2 >^^^^^
+3 >     ^^^^^^^^^^^^
+4 >                 ^^^
+5 >                    ^^^^^^^^^
+6 >                             ^
+7 >                              ^^^^->
 1 >
   >/*@internal*/ 
 2 >type 
-3 >             internalType
-4 >                          = 
-5 >                            internalC
-6 >                                     ;
+3 >     internalType
+4 >                  = 
+5 >                    internalC
+6 >                             ;
 1 >Emitted(45, 1) Source(35, 15) + SourceIndex(0)
-2 >Emitted(45, 14) Source(35, 20) + SourceIndex(0)
-3 >Emitted(45, 26) Source(35, 32) + SourceIndex(0)
-4 >Emitted(45, 29) Source(35, 35) + SourceIndex(0)
-5 >Emitted(45, 38) Source(35, 44) + SourceIndex(0)
-6 >Emitted(45, 39) Source(35, 45) + SourceIndex(0)
+2 >Emitted(45, 6) Source(35, 20) + SourceIndex(0)
+3 >Emitted(45, 18) Source(35, 32) + SourceIndex(0)
+4 >Emitted(45, 21) Source(35, 35) + SourceIndex(0)
+5 >Emitted(45, 30) Source(35, 44) + SourceIndex(0)
+6 >Emitted(45, 31) Source(35, 45) + SourceIndex(0)
 ---
 >>>declare const internalConst = 10;
-1 >
+1->
 2 >^^^^^^^^
 3 >        ^^^^^^
 4 >              ^^^^^^^^^^^^^
 5 >                           ^^^^^
 6 >                                ^
-1 >
+1->
   >/*@internal*/ 
 2 >
 3 >        const 
 4 >              internalConst
 5 >                            = 10
 6 >                                ;
-1 >Emitted(46, 1) Source(36, 15) + SourceIndex(0)
+1->Emitted(46, 1) Source(36, 15) + SourceIndex(0)
 2 >Emitted(46, 9) Source(36, 15) + SourceIndex(0)
 3 >Emitted(46, 15) Source(36, 21) + SourceIndex(0)
 4 >Emitted(46, 28) Source(36, 34) + SourceIndex(0)
@@ -2500,7 +2501,7 @@ sourceFile:../second/second_part2.ts
 >>>//# sourceMappingURL=second-output.js.map
 
 //// [/src/2/second-output.tsbuildinfo]
-{"bundle":{"commonSourceDirectory":"../second","sourceFiles":["../second/second_part1.ts","../second/second_part2.ts"],"js":{"sections":[{"pos":0,"end":3053,"kind":"text"}],"mapHash":"47594977138-{\"version\":3,\"file\":\"second-output.js\",\"sourceRoot\":\"\",\"sources\":[\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"AAIA,IAAU,CAAC,CAMV;AAND,WAAU,CAAC;IACP,SAAS,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC3B,CAAC;IAED,CAAC,EAAE,CAAC;AACR,CAAC,EANS,CAAC,KAAD,CAAC,QAMV;AAED;IACkB;IAAgB,CAAC;IAEjB,wBAAM,GAAN,cAAW,CAAC;IACZ,sBAAI,sBAAC;aAAL,cAAU,OAAO,EAAE,CAAC,CAAC,CAAC;aACtB,UAAM,GAAW,IAAI,CAAC;;;OADA;IAExC,cAAC;AAAD,CAAC,AAND,IAMC;AACD,IAAU,OAAO,CAShB;AATD,WAAU,OAAO;IACC;QAAA;QAAiB,CAAC;QAAD,QAAC;IAAD,CAAC,AAAlB,IAAkB;IAAL,SAAC,IAAI,CAAA;IAClB,SAAgB,GAAG,KAAI,CAAC;IAAR,WAAG,MAAK,CAAA;IACxB,IAAiB,aAAa,CAAsB;IAApD,WAAiB,aAAa;QAAG;YAAA;YAAgB,CAAC;YAAD,QAAC;QAAD,CAAC,AAAjB,IAAiB;QAAJ,eAAC,IAAG,CAAA;IAAC,CAAC,EAAnC,aAAa,GAAb,qBAAa,KAAb,qBAAa,QAAsB;IACpD,IAAiB,SAAS,CAAwC;IAAlE,WAAiB,SAAS;QAAC,IAAA,SAAS,CAA8B;QAAvC,WAAA,SAAS;YAAG;gBAAA;gBAAwB,CAAC;gBAAD,gBAAC;YAAD,CAAC,AAAzB,IAAyB;YAAZ,mBAAS,YAAG,CAAA;QAAC,CAAC,EAAvC,SAAS,GAAT,mBAAS,KAAT,mBAAS,QAA8B;IAAD,CAAC,EAAjD,SAAS,GAAT,iBAAS,KAAT,iBAAS,QAAwC;IACpD,kBAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAE9B,qBAAa,GAAG,EAAE,CAAC;IAChC,IAAY,YAAwB;IAApC,WAAY,YAAY;QAAG,yCAAC,CAAA;QAAE,yCAAC,CAAA;QAAE,yCAAC,CAAA;IAAC,CAAC,EAAxB,YAAY,GAAZ,oBAAY,KAAZ,oBAAY,QAAY;AACtD,CAAC,EATS,OAAO,KAAP,OAAO,QAShB;AACa;IAAA;IAAiB,CAAC;IAAD,gBAAC;AAAD,CAAC,AAAlB,IAAkB;AAClB,SAAS,WAAW,KAAI,CAAC;AACzB,IAAU,iBAAiB,CAA8B;AAAzD,WAAU,iBAAiB;IAAG;QAAA;QAAwB,CAAC;QAAD,gBAAC;IAAD,CAAC,AAAzB,IAAyB;IAAZ,2BAAS,YAAG,CAAA;AAAC,CAAC,EAA/C,iBAAiB,KAAjB,iBAAiB,QAA8B;AACzD,IAAU,aAAa,CAAwC;AAA/D,WAAU,aAAa;IAAC,IAAA,SAAS,CAA8B;IAAvC,WAAA,SAAS;QAAG;YAAA;YAAwB,CAAC;YAAD,gBAAC;QAAD,CAAC,AAAzB,IAAyB;QAAZ,mBAAS,YAAG,CAAA;IAAC,CAAC,EAAvC,SAAS,GAAT,uBAAS,KAAT,uBAAS,QAA8B;AAAD,CAAC,EAArD,aAAa,KAAb,aAAa,QAAwC;AAC/D,IAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AAEpD,IAAM,aAAa,GAAG,EAAE,CAAC;AACzB,IAAK,YAAwB;AAA7B,WAAK,YAAY;IAAG,yCAAC,CAAA;IAAE,yCAAC,CAAA;IAAE,yCAAC,CAAA;AAAC,CAAC,EAAxB,YAAY,KAAZ,YAAY,QAAY;ACpC3C;IAAA;IAIA,CAAC;IAHG,uBAAW,GAAX;QACI,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;IACtC,CAAC;IACL,QAAC;AAAD,CAAC,AAJD,IAIC\"}","hash":"-8314017635-var N;\r\n(function (N) {\r\n    function f() {\r\n        console.log('testing');\r\n    }\r\n    f();\r\n})(N || (N = {}));\r\nvar normalC = (function () {\r\n    function normalC() {\r\n    }\r\n    normalC.prototype.method = function () { };\r\n    Object.defineProperty(normalC.prototype, \"c\", {\r\n        get: function () { return 10; },\r\n        set: function (val) { },\r\n        enumerable: false,\r\n        configurable: true\r\n    });\r\n    return normalC;\r\n}());\r\nvar normalN;\r\n(function (normalN) {\r\n    var C = (function () {\r\n        function C() {\r\n        }\r\n        return C;\r\n    }());\r\n    normalN.C = C;\r\n    function foo() { }\r\n    normalN.foo = foo;\r\n    var someNamespace;\r\n    (function (someNamespace) {\r\n        var C = (function () {\r\n            function C() {\r\n            }\r\n            return C;\r\n        }());\r\n        someNamespace.C = C;\r\n    })(someNamespace = normalN.someNamespace || (normalN.someNamespace = {}));\r\n    var someOther;\r\n    (function (someOther) {\r\n        var something;\r\n        (function (something) {\r\n            var someClass = (function () {\r\n                function someClass() {\r\n                }\r\n                return someClass;\r\n            }());\r\n            something.someClass = someClass;\r\n        })(something = someOther.something || (someOther.something = {}));\r\n    })(someOther = normalN.someOther || (normalN.someOther = {}));\r\n    normalN.someImport = someNamespace.C;\r\n    normalN.internalConst = 10;\r\n    var internalEnum;\r\n    (function (internalEnum) {\r\n        internalEnum[internalEnum[\"a\"] = 0] = \"a\";\r\n        internalEnum[internalEnum[\"b\"] = 1] = \"b\";\r\n        internalEnum[internalEnum[\"c\"] = 2] = \"c\";\r\n    })(internalEnum = normalN.internalEnum || (normalN.internalEnum = {}));\r\n})(normalN || (normalN = {}));\r\nvar internalC = (function () {\r\n    function internalC() {\r\n    }\r\n    return internalC;\r\n}());\r\nfunction internalfoo() { }\r\nvar internalNamespace;\r\n(function (internalNamespace) {\r\n    var someClass = (function () {\r\n        function someClass() {\r\n        }\r\n        return someClass;\r\n    }());\r\n    internalNamespace.someClass = someClass;\r\n})(internalNamespace || (internalNamespace = {}));\r\nvar internalOther;\r\n(function (internalOther) {\r\n    var something;\r\n    (function (something) {\r\n        var someClass = (function () {\r\n            function someClass() {\r\n            }\r\n            return someClass;\r\n        }());\r\n        something.someClass = someClass;\r\n    })(something = internalOther.something || (internalOther.something = {}));\r\n})(internalOther || (internalOther = {}));\r\nvar internalImport = internalNamespace.someClass;\r\nvar internalConst = 10;\r\nvar internalEnum;\r\n(function (internalEnum) {\r\n    internalEnum[internalEnum[\"a\"] = 0] = \"a\";\r\n    internalEnum[internalEnum[\"b\"] = 1] = \"b\";\r\n    internalEnum[internalEnum[\"c\"] = 2] = \"c\";\r\n})(internalEnum || (internalEnum = {}));\r\nvar C = (function () {\r\n    function C() {\r\n    }\r\n    C.prototype.doSomething = function () {\r\n        console.log(\"something got done\");\r\n    };\r\n    return C;\r\n}());\r\n//# sourceMappingURL=second-output.js.map"},"dts":{"sections":[{"pos":0,"end":77,"kind":"text"},{"pos":77,"end":182,"kind":"internal"},{"pos":184,"end":216,"kind":"text"},{"pos":216,"end":608,"kind":"internal"},{"pos":610,"end":613,"kind":"text"},{"pos":613,"end":1026,"kind":"internal"},{"pos":1028,"end":1076,"kind":"text"}],"mapHash":"-21406246021-{\"version\":3,\"file\":\"second-output.d.ts\",\"sourceRoot\":\"\",\"sources\":[\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"AAAA,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEK,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;IACN,IAAI,CAAC,IACM,MAAM,CADK;IACtB,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACvC;AACD,kBAAU,OAAO,CAAC;IACA,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACrD;AACa,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,aAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC3C,cAAM,CAAC;IACH,WAAW;CAGd\"}","hash":"-9468064165-declare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ndeclare type internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n//# sourceMappingURL=second-output.d.ts.map"}},"program":{"fileNames":["../second/second_part1.ts","../second/second_part2.ts"],"fileInfos":["13528403307-namespace N {\r\n    // Comment text\r\n}\r\n\r\nnamespace N {\r\n    function f() {\r\n        console.log('testing');\r\n    }\r\n\r\n    f();\r\n}\r\n\nclass normalC {\n    /*@internal*/ constructor() { }\n    /*@internal*/ prop: string;\n    /*@internal*/ method() { }\n    /*@internal*/ get c() { return 10; }\n    /*@internal*/ set c(val: number) { }\n}\nnamespace normalN {\n    /*@internal*/ export class C { }\n    /*@internal*/ export function foo() {}\n    /*@internal*/ export namespace someNamespace { export class C {} }\n    /*@internal*/ export namespace someOther.something { export class someClass {} }\n    /*@internal*/ export import someImport = someNamespace.C;\n    /*@internal*/ export type internalType = internalC;\n    /*@internal*/ export const internalConst = 10;\n    /*@internal*/ export enum internalEnum { a, b, c }\n}\n/*@internal*/ class internalC {}\n/*@internal*/ function internalfoo() {}\n/*@internal*/ namespace internalNamespace { export class someClass {} }\n/*@internal*/ namespace internalOther.something { export class someClass {} }\n/*@internal*/ import internalImport = internalNamespace.someClass;\n/*@internal*/ type internalType = internalC;\n/*@internal*/ const internalConst = 10;\n/*@internal*/ enum internalEnum { a, b, c }","9339262372-class C {\r\n    doSomething() {\r\n        console.log(\"something got done\");\r\n    }\r\n}\r\n"],"options":{"composite":true,"outFile":"./second-output.js"},"outSignature":"-20504865920-declare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ndeclare type internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n","latestChangedDtsFile":"./second-output.d.ts"},"version":"FakeTSVersion"}
+{"bundle":{"commonSourceDirectory":"../second","sourceFiles":["../second/second_part1.ts","../second/second_part2.ts"],"js":{"sections":[{"pos":0,"end":3053,"kind":"text"}],"mapHash":"47594977138-{\"version\":3,\"file\":\"second-output.js\",\"sourceRoot\":\"\",\"sources\":[\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"AAIA,IAAU,CAAC,CAMV;AAND,WAAU,CAAC;IACP,SAAS,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC3B,CAAC;IAED,CAAC,EAAE,CAAC;AACR,CAAC,EANS,CAAC,KAAD,CAAC,QAMV;AAED;IACkB;IAAgB,CAAC;IAEjB,wBAAM,GAAN,cAAW,CAAC;IACZ,sBAAI,sBAAC;aAAL,cAAU,OAAO,EAAE,CAAC,CAAC,CAAC;aACtB,UAAM,GAAW,IAAI,CAAC;;;OADA;IAExC,cAAC;AAAD,CAAC,AAND,IAMC;AACD,IAAU,OAAO,CAShB;AATD,WAAU,OAAO;IACC;QAAA;QAAiB,CAAC;QAAD,QAAC;IAAD,CAAC,AAAlB,IAAkB;IAAL,SAAC,IAAI,CAAA;IAClB,SAAgB,GAAG,KAAI,CAAC;IAAR,WAAG,MAAK,CAAA;IACxB,IAAiB,aAAa,CAAsB;IAApD,WAAiB,aAAa;QAAG;YAAA;YAAgB,CAAC;YAAD,QAAC;QAAD,CAAC,AAAjB,IAAiB;QAAJ,eAAC,IAAG,CAAA;IAAC,CAAC,EAAnC,aAAa,GAAb,qBAAa,KAAb,qBAAa,QAAsB;IACpD,IAAiB,SAAS,CAAwC;IAAlE,WAAiB,SAAS;QAAC,IAAA,SAAS,CAA8B;QAAvC,WAAA,SAAS;YAAG;gBAAA;gBAAwB,CAAC;gBAAD,gBAAC;YAAD,CAAC,AAAzB,IAAyB;YAAZ,mBAAS,YAAG,CAAA;QAAC,CAAC,EAAvC,SAAS,GAAT,mBAAS,KAAT,mBAAS,QAA8B;IAAD,CAAC,EAAjD,SAAS,GAAT,iBAAS,KAAT,iBAAS,QAAwC;IACpD,kBAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAE9B,qBAAa,GAAG,EAAE,CAAC;IAChC,IAAY,YAAwB;IAApC,WAAY,YAAY;QAAG,yCAAC,CAAA;QAAE,yCAAC,CAAA;QAAE,yCAAC,CAAA;IAAC,CAAC,EAAxB,YAAY,GAAZ,oBAAY,KAAZ,oBAAY,QAAY;AACtD,CAAC,EATS,OAAO,KAAP,OAAO,QAShB;AACa;IAAA;IAAiB,CAAC;IAAD,gBAAC;AAAD,CAAC,AAAlB,IAAkB;AAClB,SAAS,WAAW,KAAI,CAAC;AACzB,IAAU,iBAAiB,CAA8B;AAAzD,WAAU,iBAAiB;IAAG;QAAA;QAAwB,CAAC;QAAD,gBAAC;IAAD,CAAC,AAAzB,IAAyB;IAAZ,2BAAS,YAAG,CAAA;AAAC,CAAC,EAA/C,iBAAiB,KAAjB,iBAAiB,QAA8B;AACzD,IAAU,aAAa,CAAwC;AAA/D,WAAU,aAAa;IAAC,IAAA,SAAS,CAA8B;IAAvC,WAAA,SAAS;QAAG;YAAA;YAAwB,CAAC;YAAD,gBAAC;QAAD,CAAC,AAAzB,IAAyB;QAAZ,mBAAS,YAAG,CAAA;IAAC,CAAC,EAAvC,SAAS,GAAT,uBAAS,KAAT,uBAAS,QAA8B;AAAD,CAAC,EAArD,aAAa,KAAb,aAAa,QAAwC;AAC/D,IAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AAEpD,IAAM,aAAa,GAAG,EAAE,CAAC;AACzB,IAAK,YAAwB;AAA7B,WAAK,YAAY;IAAG,yCAAC,CAAA;IAAE,yCAAC,CAAA;IAAE,yCAAC,CAAA;AAAC,CAAC,EAAxB,YAAY,KAAZ,YAAY,QAAY;ACpC3C;IAAA;IAIA,CAAC;IAHG,uBAAW,GAAX;QACI,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;IACtC,CAAC;IACL,QAAC;AAAD,CAAC,AAJD,IAIC\"}","hash":"-8314017635-var N;\r\n(function (N) {\r\n    function f() {\r\n        console.log('testing');\r\n    }\r\n    f();\r\n})(N || (N = {}));\r\nvar normalC = (function () {\r\n    function normalC() {\r\n    }\r\n    normalC.prototype.method = function () { };\r\n    Object.defineProperty(normalC.prototype, \"c\", {\r\n        get: function () { return 10; },\r\n        set: function (val) { },\r\n        enumerable: false,\r\n        configurable: true\r\n    });\r\n    return normalC;\r\n}());\r\nvar normalN;\r\n(function (normalN) {\r\n    var C = (function () {\r\n        function C() {\r\n        }\r\n        return C;\r\n    }());\r\n    normalN.C = C;\r\n    function foo() { }\r\n    normalN.foo = foo;\r\n    var someNamespace;\r\n    (function (someNamespace) {\r\n        var C = (function () {\r\n            function C() {\r\n            }\r\n            return C;\r\n        }());\r\n        someNamespace.C = C;\r\n    })(someNamespace = normalN.someNamespace || (normalN.someNamespace = {}));\r\n    var someOther;\r\n    (function (someOther) {\r\n        var something;\r\n        (function (something) {\r\n            var someClass = (function () {\r\n                function someClass() {\r\n                }\r\n                return someClass;\r\n            }());\r\n            something.someClass = someClass;\r\n        })(something = someOther.something || (someOther.something = {}));\r\n    })(someOther = normalN.someOther || (normalN.someOther = {}));\r\n    normalN.someImport = someNamespace.C;\r\n    normalN.internalConst = 10;\r\n    var internalEnum;\r\n    (function (internalEnum) {\r\n        internalEnum[internalEnum[\"a\"] = 0] = \"a\";\r\n        internalEnum[internalEnum[\"b\"] = 1] = \"b\";\r\n        internalEnum[internalEnum[\"c\"] = 2] = \"c\";\r\n    })(internalEnum = normalN.internalEnum || (normalN.internalEnum = {}));\r\n})(normalN || (normalN = {}));\r\nvar internalC = (function () {\r\n    function internalC() {\r\n    }\r\n    return internalC;\r\n}());\r\nfunction internalfoo() { }\r\nvar internalNamespace;\r\n(function (internalNamespace) {\r\n    var someClass = (function () {\r\n        function someClass() {\r\n        }\r\n        return someClass;\r\n    }());\r\n    internalNamespace.someClass = someClass;\r\n})(internalNamespace || (internalNamespace = {}));\r\nvar internalOther;\r\n(function (internalOther) {\r\n    var something;\r\n    (function (something) {\r\n        var someClass = (function () {\r\n            function someClass() {\r\n            }\r\n            return someClass;\r\n        }());\r\n        something.someClass = someClass;\r\n    })(something = internalOther.something || (internalOther.something = {}));\r\n})(internalOther || (internalOther = {}));\r\nvar internalImport = internalNamespace.someClass;\r\nvar internalConst = 10;\r\nvar internalEnum;\r\n(function (internalEnum) {\r\n    internalEnum[internalEnum[\"a\"] = 0] = \"a\";\r\n    internalEnum[internalEnum[\"b\"] = 1] = \"b\";\r\n    internalEnum[internalEnum[\"c\"] = 2] = \"c\";\r\n})(internalEnum || (internalEnum = {}));\r\nvar C = (function () {\r\n    function C() {\r\n    }\r\n    C.prototype.doSomething = function () {\r\n        console.log(\"something got done\");\r\n    };\r\n    return C;\r\n}());\r\n//# sourceMappingURL=second-output.js.map"},"dts":{"sections":[{"pos":0,"end":77,"kind":"text"},{"pos":77,"end":182,"kind":"internal"},{"pos":184,"end":216,"kind":"text"},{"pos":216,"end":608,"kind":"internal"},{"pos":610,"end":613,"kind":"text"},{"pos":613,"end":1018,"kind":"internal"},{"pos":1020,"end":1068,"kind":"text"}],"mapHash":"-11613291547-{\"version\":3,\"file\":\"second-output.d.ts\",\"sourceRoot\":\"\",\"sources\":[\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"AAAA,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEK,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;IACN,IAAI,CAAC,IACM,MAAM,CADK;IACtB,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACvC;AACD,kBAAU,OAAO,CAAC;IACA,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACrD;AACa,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,KAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC3C,cAAM,CAAC;IACH,WAAW;CAGd\"}","hash":"11189477579-declare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ntype internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n//# sourceMappingURL=second-output.d.ts.map"}},"program":{"fileNames":["../second/second_part1.ts","../second/second_part2.ts"],"fileInfos":["13528403307-namespace N {\r\n    // Comment text\r\n}\r\n\r\nnamespace N {\r\n    function f() {\r\n        console.log('testing');\r\n    }\r\n\r\n    f();\r\n}\r\n\nclass normalC {\n    /*@internal*/ constructor() { }\n    /*@internal*/ prop: string;\n    /*@internal*/ method() { }\n    /*@internal*/ get c() { return 10; }\n    /*@internal*/ set c(val: number) { }\n}\nnamespace normalN {\n    /*@internal*/ export class C { }\n    /*@internal*/ export function foo() {}\n    /*@internal*/ export namespace someNamespace { export class C {} }\n    /*@internal*/ export namespace someOther.something { export class someClass {} }\n    /*@internal*/ export import someImport = someNamespace.C;\n    /*@internal*/ export type internalType = internalC;\n    /*@internal*/ export const internalConst = 10;\n    /*@internal*/ export enum internalEnum { a, b, c }\n}\n/*@internal*/ class internalC {}\n/*@internal*/ function internalfoo() {}\n/*@internal*/ namespace internalNamespace { export class someClass {} }\n/*@internal*/ namespace internalOther.something { export class someClass {} }\n/*@internal*/ import internalImport = internalNamespace.someClass;\n/*@internal*/ type internalType = internalC;\n/*@internal*/ const internalConst = 10;\n/*@internal*/ enum internalEnum { a, b, c }","9339262372-class C {\r\n    doSomething() {\r\n        console.log(\"something got done\");\r\n    }\r\n}\r\n"],"options":{"composite":true,"outFile":"./second-output.js"},"outSignature":"2446199792-declare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ntype internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n","latestChangedDtsFile":"./second-output.d.ts"},"version":"FakeTSVersion"}
 
 //// [/src/2/second-output.tsbuildinfo.baseline.txt]
 ======================================================================
@@ -2659,7 +2660,7 @@ text: (610-613)
 }
 
 ----------------------------------------------------------------------
-internal: (613-1026)
+internal: (613-1018)
 declare class internalC {
 }
 declare function internalfoo(): void;
@@ -2672,7 +2673,7 @@ declare namespace internalOther.something {
     }
 }
 import internalImport = internalNamespace.someClass;
-declare type internalType = internalC;
+type internalType = internalC;
 declare const internalConst = 10;
 declare enum internalEnum {
     a = 0,
@@ -2680,7 +2681,7 @@ declare enum internalEnum {
     c = 2
 }
 ----------------------------------------------------------------------
-text: (1028-1076)
+text: (1020-1068)
 declare class C {
     doSomething(): void;
 }
@@ -2735,17 +2736,17 @@ declare class C {
         },
         {
           "pos": 613,
-          "end": 1026,
+          "end": 1018,
           "kind": "internal"
         },
         {
-          "pos": 1028,
-          "end": 1076,
+          "pos": 1020,
+          "end": 1068,
           "kind": "text"
         }
       ],
-      "hash": "-9468064165-declare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ndeclare type internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n//# sourceMappingURL=second-output.d.ts.map",
-      "mapHash": "-21406246021-{\"version\":3,\"file\":\"second-output.d.ts\",\"sourceRoot\":\"\",\"sources\":[\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"AAAA,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEK,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;IACN,IAAI,CAAC,IACM,MAAM,CADK;IACtB,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACvC;AACD,kBAAU,OAAO,CAAC;IACA,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACrD;AACa,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,aAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC3C,cAAM,CAAC;IACH,WAAW;CAGd\"}"
+      "hash": "11189477579-declare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ntype internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n//# sourceMappingURL=second-output.d.ts.map",
+      "mapHash": "-11613291547-{\"version\":3,\"file\":\"second-output.d.ts\",\"sourceRoot\":\"\",\"sources\":[\"../second/second_part1.ts\",\"../second/second_part2.ts\"],\"names\":[],\"mappings\":\"AAAA,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEK,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;IACN,IAAI,CAAC,IACM,MAAM,CADK;IACtB,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACvC;AACD,kBAAU,OAAO,CAAC;IACA,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACrD;AACa,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,KAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC3C,cAAM,CAAC;IACH,WAAW;CAGd\"}"
     }
   },
   "program": {
@@ -2761,11 +2762,11 @@ declare class C {
       "composite": true,
       "outFile": "./second-output.js"
     },
-    "outSignature": "-20504865920-declare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ndeclare type internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n",
+    "outSignature": "2446199792-declare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\ndeclare class normalC {\r\n    constructor();\r\n    prop: string;\r\n    method(): void;\r\n    get c(): number;\r\n    set c(val: number);\r\n}\r\ndeclare namespace normalN {\r\n    class C {\r\n    }\r\n    function foo(): void;\r\n    namespace someNamespace {\r\n        class C {\r\n        }\r\n    }\r\n    namespace someOther.something {\r\n        class someClass {\r\n        }\r\n    }\r\n    export import someImport = someNamespace.C;\r\n    type internalType = internalC;\r\n    const internalConst = 10;\r\n    enum internalEnum {\r\n        a = 0,\r\n        b = 1,\r\n        c = 2\r\n    }\r\n}\r\ndeclare class internalC {\r\n}\r\ndeclare function internalfoo(): void;\r\ndeclare namespace internalNamespace {\r\n    class someClass {\r\n    }\r\n}\r\ndeclare namespace internalOther.something {\r\n    class someClass {\r\n    }\r\n}\r\nimport internalImport = internalNamespace.someClass;\r\ntype internalType = internalC;\r\ndeclare const internalConst = 10;\r\ndeclare enum internalEnum {\r\n    a = 0,\r\n    b = 1,\r\n    c = 2\r\n}\r\ndeclare class C {\r\n    doSomething(): void;\r\n}\r\n",
     "latestChangedDtsFile": "./second-output.d.ts"
   },
   "version": "FakeTSVersion",
-  "size": 11072
+  "size": 11054
 }
 
 //// [/src/first/bin/first-output.d.ts]
diff --git a/tests/baselines/reference/tsbuild/outputPaths/when-rootDir-is-specified-but-not-all-files-belong-to-rootDir-and-is-composite.js b/tests/baselines/reference/tsbuild/outputPaths/when-rootDir-is-specified-but-not-all-files-belong-to-rootDir-and-is-composite.js
index 36f4ff67f8f5b..db7935db61147 100644
--- a/tests/baselines/reference/tsbuild/outputPaths/when-rootDir-is-specified-but-not-all-files-belong-to-rootDir-and-is-composite.js
+++ b/tests/baselines/reference/tsbuild/outputPaths/when-rootDir-is-specified-but-not-all-files-belong-to-rootDir-and-is-composite.js
@@ -139,7 +139,7 @@ exports.x = 10;
 
 
 //// [/src/tsconfig.tsbuildinfo]
-{"program":{"fileNames":["../lib/lib.d.ts","./src/index.ts","./types/type.ts"],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true},{"version":"-10726455937-export const x = 10;","signature":"-6057683066-export declare const x = 10;\r\n"},{"version":"-4885977236-export type t = string;","signature":"-4409762125-export declare type t = string;\r\n"}],"options":{"composite":true,"outDir":"./dist","rootDir":"./src"},"referencedMap":[],"exportedModulesMap":[],"latestChangedDtsFile":"./types/type.d.ts"},"version":"FakeTSVersion"}
+{"program":{"fileNames":["../lib/lib.d.ts","./src/index.ts","./types/type.ts"],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true},{"version":"-10726455937-export const x = 10;","signature":"-6057683066-export declare const x = 10;\r\n"},{"version":"-4885977236-export type t = string;","signature":"-7954664413-export type t = string;\r\n"}],"options":{"composite":true,"outDir":"./dist","rootDir":"./src"},"referencedMap":[],"exportedModulesMap":[],"latestChangedDtsFile":"./types/type.d.ts"},"version":"FakeTSVersion"}
 
 //// [/src/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -161,7 +161,7 @@ exports.x = 10;
       },
       "./types/type.ts": {
         "version": "-4885977236-export type t = string;",
-        "signature": "-4409762125-export declare type t = string;\r\n"
+        "signature": "-7954664413-export type t = string;\r\n"
       }
     },
     "options": {
@@ -174,11 +174,11 @@ exports.x = 10;
     "latestChangedDtsFile": "./types/type.d.ts"
   },
   "version": "FakeTSVersion",
-  "size": 969
+  "size": 961
 }
 
 //// [/src/types/type.d.ts]
-export declare type t = string;
+export type t = string;
 
 
 //// [/src/types/type.js]
diff --git a/tests/baselines/reference/tsbuildWatch/demo/updates-with-circular-reference.js b/tests/baselines/reference/tsbuildWatch/demo/updates-with-circular-reference.js
index 376c53f1a12cd..d875c49116676 100644
--- a/tests/baselines/reference/tsbuildWatch/demo/updates-with-circular-reference.js
+++ b/tests/baselines/reference/tsbuildWatch/demo/updates-with-circular-reference.js
@@ -405,7 +405,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [/user/username/projects/demo/lib/animals/animal.d.ts]
-export declare type Size = "small" | "medium" | "large";
+export type Size = "small" | "medium" | "large";
 export default interface Animal {
     size: Size;
 }
@@ -453,7 +453,7 @@ export declare function createDog(): Dog;
 
 
 //// [/user/username/projects/demo/lib/animals/tsconfig.tsbuildinfo]
-{"program":{"fileNames":["../../../../../../a/lib/lib.d.ts","../../animals/animal.ts","../../animals/index.ts","../core/utilities.d.ts","../../animals/dog.ts"],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true},{"version":"-14984181202-export type Size = \"small\" | \"medium\" | \"large\";\r\nexport default interface Animal {\r\n    size: Size;\r\n}\r\n","signature":"-10510161654-export declare type Size = \"small\" | \"medium\" | \"large\";\nexport default interface Animal {\n    size: Size;\n}\n"},{"version":"-5382672599-import Animal from './animal';\r\n\r\nexport default Animal;\r\nimport { createDog, Dog } from './dog';\r\nexport { createDog, Dog };\r\n","signature":"1096904574-import Animal from './animal';\nexport default Animal;\nimport { createDog, Dog } from './dog';\nexport { createDog, Dog };\n"},"-11345568166-export declare function makeRandomName(): string;\nexport declare function lastElementOf<T>(arr: T[]): T | undefined;\n",{"version":"-10991948013-import Animal from '.';\r\nimport { makeRandomName } from '../core/utilities';\r\n\r\nexport interface Dog extends Animal {\r\n    woof(): void;\r\n    name: string;\r\n}\r\n\r\nexport function createDog(): Dog {\r\n    return ({\r\n        size: \"medium\",\r\n        woof: function(this: Dog) {\r\n            console.log(`${this.name} says \"Woof\"!`);\r\n        },\r\n        name: makeRandomName()\r\n    });\r\n}\r\n\r\n","signature":"6032048049-import Animal from '.';\nexport interface Dog extends Animal {\n    woof(): void;\n    name: string;\n}\nexport declare function createDog(): Dog;\n"}],"options":{"composite":true,"declaration":true,"module":1,"noFallthroughCasesInSwitch":true,"noImplicitReturns":true,"noUnusedLocals":true,"noUnusedParameters":true,"outDir":"./","rootDir":"../../animals","strict":true,"target":1},"fileIdsList":[[3,4],[2,5],[3]],"referencedMap":[[5,1],[3,2]],"exportedModulesMap":[[5,3],[3,2]],"semanticDiagnosticsPerFile":[1,2,5,3,4],"latestChangedDtsFile":"./dog.d.ts"},"version":"FakeTSVersion"}
+{"program":{"fileNames":["../../../../../../a/lib/lib.d.ts","../../animals/animal.ts","../../animals/index.ts","../core/utilities.d.ts","../../animals/dog.ts"],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true},{"version":"-14984181202-export type Size = \"small\" | \"medium\" | \"large\";\r\nexport default interface Animal {\r\n    size: Size;\r\n}\r\n","signature":"-9289341318-export type Size = \"small\" | \"medium\" | \"large\";\nexport default interface Animal {\n    size: Size;\n}\n"},{"version":"-5382672599-import Animal from './animal';\r\n\r\nexport default Animal;\r\nimport { createDog, Dog } from './dog';\r\nexport { createDog, Dog };\r\n","signature":"1096904574-import Animal from './animal';\nexport default Animal;\nimport { createDog, Dog } from './dog';\nexport { createDog, Dog };\n"},"-11345568166-export declare function makeRandomName(): string;\nexport declare function lastElementOf<T>(arr: T[]): T | undefined;\n",{"version":"-10991948013-import Animal from '.';\r\nimport { makeRandomName } from '../core/utilities';\r\n\r\nexport interface Dog extends Animal {\r\n    woof(): void;\r\n    name: string;\r\n}\r\n\r\nexport function createDog(): Dog {\r\n    return ({\r\n        size: \"medium\",\r\n        woof: function(this: Dog) {\r\n            console.log(`${this.name} says \"Woof\"!`);\r\n        },\r\n        name: makeRandomName()\r\n    });\r\n}\r\n\r\n","signature":"6032048049-import Animal from '.';\nexport interface Dog extends Animal {\n    woof(): void;\n    name: string;\n}\nexport declare function createDog(): Dog;\n"}],"options":{"composite":true,"declaration":true,"module":1,"noFallthroughCasesInSwitch":true,"noImplicitReturns":true,"noUnusedLocals":true,"noUnusedParameters":true,"outDir":"./","rootDir":"../../animals","strict":true,"target":1},"fileIdsList":[[3,4],[2,5],[3]],"referencedMap":[[5,1],[3,2]],"exportedModulesMap":[[5,3],[3,2]],"semanticDiagnosticsPerFile":[1,2,5,3,4],"latestChangedDtsFile":"./dog.d.ts"},"version":"FakeTSVersion"}
 
 //// [/user/username/projects/demo/lib/animals/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -486,7 +486,7 @@ export declare function createDog(): Dog;
       },
       "../../animals/animal.ts": {
         "version": "-14984181202-export type Size = \"small\" | \"medium\" | \"large\";\r\nexport default interface Animal {\r\n    size: Size;\r\n}\r\n",
-        "signature": "-10510161654-export declare type Size = \"small\" | \"medium\" | \"large\";\nexport default interface Animal {\n    size: Size;\n}\n"
+        "signature": "-9289341318-export type Size = \"small\" | \"medium\" | \"large\";\nexport default interface Animal {\n    size: Size;\n}\n"
       },
       "../../animals/index.ts": {
         "version": "-5382672599-import Animal from './animal';\r\n\r\nexport default Animal;\r\nimport { createDog, Dog } from './dog';\r\nexport { createDog, Dog };\r\n",
@@ -543,7 +543,7 @@ export declare function createDog(): Dog;
     "latestChangedDtsFile": "./dog.d.ts"
   },
   "version": "FakeTSVersion",
-  "size": 2459
+  "size": 2450
 }
 
 //// [/user/username/projects/demo/lib/zoo/zoo.js]
@@ -565,7 +565,7 @@ export declare function createZoo(): Array<Dog>;
 
 
 //// [/user/username/projects/demo/lib/zoo/tsconfig.tsbuildinfo]
-{"program":{"fileNames":["../../../../../../a/lib/lib.d.ts","../animals/animal.d.ts","../animals/dog.d.ts","../animals/index.d.ts","../../zoo/zoo.ts"],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true},"-10510161654-export declare type Size = \"small\" | \"medium\" | \"large\";\nexport default interface Animal {\n    size: Size;\n}\n","6032048049-import Animal from '.';\nexport interface Dog extends Animal {\n    woof(): void;\n    name: string;\n}\nexport declare function createDog(): Dog;\n","1096904574-import Animal from './animal';\nexport default Animal;\nimport { createDog, Dog } from './dog';\nexport { createDog, Dog };\n",{"version":"8797123924-import { Dog, createDog } from '../animals/index';\r\n\r\nexport function createZoo(): Array<Dog> {\r\n    return [\r\n        createDog()\r\n    ];\r\n}\r\n\r\n","signature":"10305066551-import { Dog } from '../animals/index';\nexport declare function createZoo(): Array<Dog>;\n"}],"options":{"composite":true,"declaration":true,"module":1,"noFallthroughCasesInSwitch":true,"noImplicitReturns":true,"noUnusedLocals":true,"noUnusedParameters":true,"outDir":"./","rootDir":"../../zoo","strict":true,"target":1},"fileIdsList":[[4],[2,3]],"referencedMap":[[3,1],[4,2],[5,1]],"exportedModulesMap":[[3,1],[4,2],[5,1]],"semanticDiagnosticsPerFile":[1,2,3,4,5],"latestChangedDtsFile":"./zoo.d.ts"},"version":"FakeTSVersion"}
+{"program":{"fileNames":["../../../../../../a/lib/lib.d.ts","../animals/animal.d.ts","../animals/dog.d.ts","../animals/index.d.ts","../../zoo/zoo.ts"],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true},"-9289341318-export type Size = \"small\" | \"medium\" | \"large\";\nexport default interface Animal {\n    size: Size;\n}\n","6032048049-import Animal from '.';\nexport interface Dog extends Animal {\n    woof(): void;\n    name: string;\n}\nexport declare function createDog(): Dog;\n","1096904574-import Animal from './animal';\nexport default Animal;\nimport { createDog, Dog } from './dog';\nexport { createDog, Dog };\n",{"version":"8797123924-import { Dog, createDog } from '../animals/index';\r\n\r\nexport function createZoo(): Array<Dog> {\r\n    return [\r\n        createDog()\r\n    ];\r\n}\r\n\r\n","signature":"10305066551-import { Dog } from '../animals/index';\nexport declare function createZoo(): Array<Dog>;\n"}],"options":{"composite":true,"declaration":true,"module":1,"noFallthroughCasesInSwitch":true,"noImplicitReturns":true,"noUnusedLocals":true,"noUnusedParameters":true,"outDir":"./","rootDir":"../../zoo","strict":true,"target":1},"fileIdsList":[[4],[2,3]],"referencedMap":[[3,1],[4,2],[5,1]],"exportedModulesMap":[[3,1],[4,2],[5,1]],"semanticDiagnosticsPerFile":[1,2,3,4,5],"latestChangedDtsFile":"./zoo.d.ts"},"version":"FakeTSVersion"}
 
 //// [/user/username/projects/demo/lib/zoo/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -593,8 +593,8 @@ export declare function createZoo(): Array<Dog>;
         "affectsGlobalScope": true
       },
       "../animals/animal.d.ts": {
-        "version": "-10510161654-export declare type Size = \"small\" | \"medium\" | \"large\";\nexport default interface Animal {\n    size: Size;\n}\n",
-        "signature": "-10510161654-export declare type Size = \"small\" | \"medium\" | \"large\";\nexport default interface Animal {\n    size: Size;\n}\n"
+        "version": "-9289341318-export type Size = \"small\" | \"medium\" | \"large\";\nexport default interface Animal {\n    size: Size;\n}\n",
+        "signature": "-9289341318-export type Size = \"small\" | \"medium\" | \"large\";\nexport default interface Animal {\n    size: Size;\n}\n"
       },
       "../animals/dog.d.ts": {
         "version": "6032048049-import Animal from '.';\nexport interface Dog extends Animal {\n    woof(): void;\n    name: string;\n}\nexport declare function createDog(): Dog;\n",
@@ -656,6 +656,6 @@ export declare function createZoo(): Array<Dog>;
     "latestChangedDtsFile": "./zoo.d.ts"
   },
   "version": "FakeTSVersion",
-  "size": 1819
+  "size": 1810
 }
 
diff --git a/tests/baselines/reference/tsbuildWatch/moduleResolution/build-mode-watches-for-changes-to-package-json-main-fields.js b/tests/baselines/reference/tsbuildWatch/moduleResolution/build-mode-watches-for-changes-to-package-json-main-fields.js
index 0a9f1d1b7234b..b66d658f16e06 100644
--- a/tests/baselines/reference/tsbuildWatch/moduleResolution/build-mode-watches-for-changes-to-package-json-main-fields.js
+++ b/tests/baselines/reference/tsbuildWatch/moduleResolution/build-mode-watches-for-changes-to-package-json-main-fields.js
@@ -180,7 +180,7 @@ exports.__esModule = true;
 
 
 //// [/user/username/projects/myproject/packages/pkg2/build/const.d.ts]
-export declare type TheNum = 42;
+export type TheNum = 42;
 
 
 //// [/user/username/projects/myproject/packages/pkg2/build/index.js]
@@ -198,11 +198,11 @@ exports.__esModule = true;
 
 
 //// [/user/username/projects/myproject/packages/pkg2/build/other.d.ts]
-export declare type TheStr = string;
+export type TheStr = string;
 
 
 //// [/user/username/projects/myproject/packages/pkg2/build/tsconfig.tsbuildinfo]
-{"program":{"fileNames":["../../../../../../../a/lib/lib.d.ts","../const.ts","../index.ts","../other.ts"],"fileInfos":[{"version":"-7698705165-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }","affectsGlobalScope":true},{"version":"-11202312776-export type TheNum = 42;","signature":"-9649133742-export declare type TheNum = 42;\n"},{"version":"-11225381282-export type { TheNum } from './const.js';","signature":"-9660329432-export type { TheNum } from './const.js';\n"},{"version":"-4609154030-export type TheStr = string;","signature":"-10420741908-export declare type TheStr = string;\n"}],"options":{"composite":true,"outDir":"./"},"fileIdsList":[[2]],"referencedMap":[[3,1]],"exportedModulesMap":[[3,1]],"semanticDiagnosticsPerFile":[1,2,3,4],"latestChangedDtsFile":"./other.d.ts"},"version":"FakeTSVersion"}
+{"program":{"fileNames":["../../../../../../../a/lib/lib.d.ts","../const.ts","../index.ts","../other.ts"],"fileInfos":[{"version":"-7698705165-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }","affectsGlobalScope":true},{"version":"-11202312776-export type TheNum = 42;","signature":"-13194036030-export type TheNum = 42;\n"},{"version":"-11225381282-export type { TheNum } from './const.js';","signature":"-9660329432-export type { TheNum } from './const.js';\n"},{"version":"-4609154030-export type TheStr = string;","signature":"-6073194916-export type TheStr = string;\n"}],"options":{"composite":true,"outDir":"./"},"fileIdsList":[[2]],"referencedMap":[[3,1]],"exportedModulesMap":[[3,1]],"semanticDiagnosticsPerFile":[1,2,3,4],"latestChangedDtsFile":"./other.d.ts"},"version":"FakeTSVersion"}
 
 //// [/user/username/projects/myproject/packages/pkg2/build/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -226,7 +226,7 @@ export declare type TheStr = string;
       },
       "../const.ts": {
         "version": "-11202312776-export type TheNum = 42;",
-        "signature": "-9649133742-export declare type TheNum = 42;\n"
+        "signature": "-13194036030-export type TheNum = 42;\n"
       },
       "../index.ts": {
         "version": "-11225381282-export type { TheNum } from './const.js';",
@@ -234,7 +234,7 @@ export declare type TheStr = string;
       },
       "../other.ts": {
         "version": "-4609154030-export type TheStr = string;",
-        "signature": "-10420741908-export declare type TheStr = string;\n"
+        "signature": "-6073194916-export type TheStr = string;\n"
       }
     },
     "options": {
@@ -260,7 +260,7 @@ export declare type TheStr = string;
     "latestChangedDtsFile": "./other.d.ts"
   },
   "version": "FakeTSVersion",
-  "size": 1112
+  "size": 1096
 }
 
 //// [/user/username/projects/myproject/packages/pkg1/build/index.js]
diff --git a/tests/baselines/reference/tsbuildWatch/moduleResolution/resolves-specifier-in-output-declaration-file-from-referenced-project-correctly-with-cts-and-mts-extensions.js b/tests/baselines/reference/tsbuildWatch/moduleResolution/resolves-specifier-in-output-declaration-file-from-referenced-project-correctly-with-cts-and-mts-extensions.js
index a59b6a3e2637f..c813f2c658a30 100644
--- a/tests/baselines/reference/tsbuildWatch/moduleResolution/resolves-specifier-in-output-declaration-file-from-referenced-project-correctly-with-cts-and-mts-extensions.js
+++ b/tests/baselines/reference/tsbuildWatch/moduleResolution/resolves-specifier-in-output-declaration-file-from-referenced-project-correctly-with-cts-and-mts-extensions.js
@@ -182,7 +182,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [/user/username/projects/myproject/packages/pkg2/build/const.d.cts]
-export declare type TheNum = 42;
+export type TheNum = 42;
 
 
 //// [/user/username/projects/myproject/packages/pkg2/build/index.js]
@@ -194,7 +194,7 @@ export type { TheNum } from './const.cjs';
 
 
 //// [/user/username/projects/myproject/packages/pkg2/build/tsconfig.tsbuildinfo]
-{"program":{"fileNames":["../../../../../../../a/lib/lib.es2022.full.d.ts","../const.cts","../index.ts"],"fileInfos":[{"version":"-7698705165-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }","affectsGlobalScope":true,"impliedFormat":1},{"version":"-11202312776-export type TheNum = 42;","signature":"-9649133742-export declare type TheNum = 42;\n","impliedFormat":1},{"version":"-9668872159-export type { TheNum } from './const.cjs';","signature":"-9835135925-export type { TheNum } from './const.cjs';\n","impliedFormat":99}],"options":{"composite":true,"module":100,"outDir":"./"},"fileIdsList":[[2]],"referencedMap":[[3,1]],"exportedModulesMap":[[3,1]],"semanticDiagnosticsPerFile":[1,2,3],"latestChangedDtsFile":"./index.d.ts"},"version":"FakeTSVersion"}
+{"program":{"fileNames":["../../../../../../../a/lib/lib.es2022.full.d.ts","../const.cts","../index.ts"],"fileInfos":[{"version":"-7698705165-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }","affectsGlobalScope":true,"impliedFormat":1},{"version":"-11202312776-export type TheNum = 42;","signature":"-13194036030-export type TheNum = 42;\n","impliedFormat":1},{"version":"-9668872159-export type { TheNum } from './const.cjs';","signature":"-9835135925-export type { TheNum } from './const.cjs';\n","impliedFormat":99}],"options":{"composite":true,"module":100,"outDir":"./"},"fileIdsList":[[2]],"referencedMap":[[3,1]],"exportedModulesMap":[[3,1]],"semanticDiagnosticsPerFile":[1,2,3],"latestChangedDtsFile":"./index.d.ts"},"version":"FakeTSVersion"}
 
 //// [/user/username/projects/myproject/packages/pkg2/build/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -218,7 +218,7 @@ export type { TheNum } from './const.cjs';
       },
       "../const.cts": {
         "version": "-11202312776-export type TheNum = 42;",
-        "signature": "-9649133742-export declare type TheNum = 42;\n",
+        "signature": "-13194036030-export type TheNum = 42;\n",
         "impliedFormat": "commonjs"
       },
       "../index.ts": {
@@ -250,7 +250,7 @@ export type { TheNum } from './const.cjs';
     "latestChangedDtsFile": "./index.d.ts"
   },
   "version": "FakeTSVersion",
-  "size": 1057
+  "size": 1050
 }
 
 //// [/user/username/projects/myproject/packages/pkg1/build/index.js]
@@ -744,7 +744,7 @@ FsWatchesRecursive::
 exitCode:: ExitStatus.undefined
 
 //// [/user/username/projects/myproject/packages/pkg2/build/tsconfig.tsbuildinfo]
-{"program":{"fileNames":["../../../../../../../a/lib/lib.es2022.full.d.ts","../const.cts","../index.cts"],"fileInfos":[{"version":"-7698705165-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }","affectsGlobalScope":true,"impliedFormat":1},{"version":"-11202312776-export type TheNum = 42;","signature":"-9649133742-export declare type TheNum = 42;\n","impliedFormat":1},{"version":"-9668872159-export type { TheNum } from './const.cjs';","signature":"-9835135925-export type { TheNum } from './const.cjs';\n","impliedFormat":1}],"options":{"composite":true,"module":100,"outDir":"./"},"fileIdsList":[[2]],"referencedMap":[[3,1]],"exportedModulesMap":[[3,1]],"semanticDiagnosticsPerFile":[1,2,3],"latestChangedDtsFile":"./index.d.cts"},"version":"FakeTSVersion"}
+{"program":{"fileNames":["../../../../../../../a/lib/lib.es2022.full.d.ts","../const.cts","../index.cts"],"fileInfos":[{"version":"-7698705165-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }","affectsGlobalScope":true,"impliedFormat":1},{"version":"-11202312776-export type TheNum = 42;","signature":"-13194036030-export type TheNum = 42;\n","impliedFormat":1},{"version":"-9668872159-export type { TheNum } from './const.cjs';","signature":"-9835135925-export type { TheNum } from './const.cjs';\n","impliedFormat":1}],"options":{"composite":true,"module":100,"outDir":"./"},"fileIdsList":[[2]],"referencedMap":[[3,1]],"exportedModulesMap":[[3,1]],"semanticDiagnosticsPerFile":[1,2,3],"latestChangedDtsFile":"./index.d.cts"},"version":"FakeTSVersion"}
 
 //// [/user/username/projects/myproject/packages/pkg2/build/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -768,7 +768,7 @@ exitCode:: ExitStatus.undefined
       },
       "../const.cts": {
         "version": "-11202312776-export type TheNum = 42;",
-        "signature": "-9649133742-export declare type TheNum = 42;\n",
+        "signature": "-13194036030-export type TheNum = 42;\n",
         "impliedFormat": "commonjs"
       },
       "../index.cts": {
@@ -800,7 +800,7 @@ exitCode:: ExitStatus.undefined
     "latestChangedDtsFile": "./index.d.cts"
   },
   "version": "FakeTSVersion",
-  "size": 1058
+  "size": 1051
 }
 
 //// [/user/username/projects/myproject/packages/pkg1/build/index.js]
diff --git a/tests/baselines/reference/tsc/incremental/change-to-modifier-of-class-expression-field-with-declaration-emit-enabled.js b/tests/baselines/reference/tsc/incremental/change-to-modifier-of-class-expression-field-with-declaration-emit-enabled.js
index cea58e7453ae1..b85622f2cb5a5 100644
--- a/tests/baselines/reference/tsc/incremental/change-to-modifier-of-class-expression-field-with-declaration-emit-enabled.js
+++ b/tests/baselines/reference/tsc/incremental/change-to-modifier-of-class-expression-field-with-declaration-emit-enabled.js
@@ -59,7 +59,7 @@ declare const wrapper: () => {
         message: string;
     };
 };
-declare type MessageablePerson = InstanceType<ReturnType<typeof wrapper>>;
+type MessageablePerson = InstanceType<ReturnType<typeof wrapper>>;
 export default MessageablePerson;
 
 
@@ -78,7 +78,7 @@ var wrapper = function () { return Messageable(); };
 
 
 //// [/src/project/tsconfig.tsbuildinfo]
-{"program":{"fileNames":["../../lib/lib.d.ts","./messageableperson.ts","./main.ts"],"fileInfos":[{"version":"5700251342-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };type ReturnType<T extends (...args: any) => any> = T extends (...args: any) => infer R ? R : any;\ntype InstanceType<T extends abstract new (...args: any) => any> = T extends abstract new (...args: any) => infer R ? R : any;","affectsGlobalScope":true},{"version":"31173349369-const Messageable = () => {\n    return class MessageableClass {\n        public message = 'hello';\n    }\n};\nconst wrapper = () => Messageable();\ntype MessageablePerson = InstanceType<ReturnType<typeof wrapper>>;\nexport default MessageablePerson;","signature":"-13324779423-declare const wrapper: () => {\r\n    new (): {\r\n        message: string;\r\n    };\r\n};\r\ndeclare type MessageablePerson = InstanceType<ReturnType<typeof wrapper>>;\r\nexport default MessageablePerson;\r\n"},{"version":"4191603667-import MessageablePerson from './MessageablePerson.js';\nfunction logMessage( person: MessageablePerson ) {\n    console.log( person.message );\n}","signature":"-4882119183-export {};\r\n"}],"options":{"declaration":true},"fileIdsList":[[2]],"referencedMap":[[3,1]],"exportedModulesMap":[],"semanticDiagnosticsPerFile":[1,3,2]},"version":"FakeTSVersion"}
+{"program":{"fileNames":["../../lib/lib.d.ts","./messageableperson.ts","./main.ts"],"fileInfos":[{"version":"5700251342-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };type ReturnType<T extends (...args: any) => any> = T extends (...args: any) => infer R ? R : any;\ntype InstanceType<T extends abstract new (...args: any) => any> = T extends abstract new (...args: any) => infer R ? R : any;","affectsGlobalScope":true},{"version":"31173349369-const Messageable = () => {\n    return class MessageableClass {\n        public message = 'hello';\n    }\n};\nconst wrapper = () => Messageable();\ntype MessageablePerson = InstanceType<ReturnType<typeof wrapper>>;\nexport default MessageablePerson;","signature":"-26007269167-declare const wrapper: () => {\r\n    new (): {\r\n        message: string;\r\n    };\r\n};\r\ntype MessageablePerson = InstanceType<ReturnType<typeof wrapper>>;\r\nexport default MessageablePerson;\r\n"},{"version":"4191603667-import MessageablePerson from './MessageablePerson.js';\nfunction logMessage( person: MessageablePerson ) {\n    console.log( person.message );\n}","signature":"-4882119183-export {};\r\n"}],"options":{"declaration":true},"fileIdsList":[[2]],"referencedMap":[[3,1]],"exportedModulesMap":[],"semanticDiagnosticsPerFile":[1,3,2]},"version":"FakeTSVersion"}
 
 //// [/src/project/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -101,7 +101,7 @@ var wrapper = function () { return Messageable(); };
       },
       "./messageableperson.ts": {
         "version": "31173349369-const Messageable = () => {\n    return class MessageableClass {\n        public message = 'hello';\n    }\n};\nconst wrapper = () => Messageable();\ntype MessageablePerson = InstanceType<ReturnType<typeof wrapper>>;\nexport default MessageablePerson;",
-        "signature": "-13324779423-declare const wrapper: () => {\r\n    new (): {\r\n        message: string;\r\n    };\r\n};\r\ndeclare type MessageablePerson = InstanceType<ReturnType<typeof wrapper>>;\r\nexport default MessageablePerson;\r\n"
+        "signature": "-26007269167-declare const wrapper: () => {\r\n    new (): {\r\n        message: string;\r\n    };\r\n};\r\ntype MessageablePerson = InstanceType<ReturnType<typeof wrapper>>;\r\nexport default MessageablePerson;\r\n"
       },
       "./main.ts": {
         "version": "4191603667-import MessageablePerson from './MessageablePerson.js';\nfunction logMessage( person: MessageablePerson ) {\n    console.log( person.message );\n}",
@@ -124,7 +124,7 @@ var wrapper = function () { return Messageable(); };
     ]
   },
   "version": "FakeTSVersion",
-  "size": 1693
+  "size": 1685
 }
 
 
@@ -168,7 +168,7 @@ exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 //// [/src/project/main.js] file written with same contents
 //// [/src/project/MessageablePerson.js] file written with same contents
 //// [/src/project/tsconfig.tsbuildinfo]
-{"program":{"fileNames":["../../lib/lib.d.ts","./messageableperson.ts","./main.ts"],"fileInfos":[{"version":"5700251342-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };type ReturnType<T extends (...args: any) => any> = T extends (...args: any) => infer R ? R : any;\ntype InstanceType<T extends abstract new (...args: any) => any> = T extends abstract new (...args: any) => infer R ? R : any;","affectsGlobalScope":true},{"version":"3462418372-const Messageable = () => {\n    return class MessageableClass {\n        protected message = 'hello';\n    }\n};\nconst wrapper = () => Messageable();\ntype MessageablePerson = InstanceType<ReturnType<typeof wrapper>>;\nexport default MessageablePerson;","signature":"-4323958125-declare const wrapper: () => {\r\n    new (): {\r\n        message: string;\r\n    };\r\n};\r\ndeclare type MessageablePerson = InstanceType<ReturnType<typeof wrapper>>;\r\nexport default MessageablePerson;\r\n(116,7)Error4094: Property 'message' of exported class expression may not be private or protected."},{"version":"4191603667-import MessageablePerson from './MessageablePerson.js';\nfunction logMessage( person: MessageablePerson ) {\n    console.log( person.message );\n}","signature":"-4882119183-export {};\r\n"}],"options":{"declaration":true},"fileIdsList":[[2]],"referencedMap":[[3,1]],"exportedModulesMap":[],"semanticDiagnosticsPerFile":[1,[3,[{"file":"./main.ts","start":131,"length":7,"messageText":"Property 'message' is protected and only accessible within class 'MessageableClass' and its subclasses.","category":1,"code":2445}]],2]},"version":"FakeTSVersion"}
+{"program":{"fileNames":["../../lib/lib.d.ts","./messageableperson.ts","./main.ts"],"fileInfos":[{"version":"5700251342-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };type ReturnType<T extends (...args: any) => any> = T extends (...args: any) => infer R ? R : any;\ntype InstanceType<T extends abstract new (...args: any) => any> = T extends abstract new (...args: any) => infer R ? R : any;","affectsGlobalScope":true},{"version":"3462418372-const Messageable = () => {\n    return class MessageableClass {\n        protected message = 'hello';\n    }\n};\nconst wrapper = () => Messageable();\ntype MessageablePerson = InstanceType<ReturnType<typeof wrapper>>;\nexport default MessageablePerson;","signature":"-16190189821-declare const wrapper: () => {\r\n    new (): {\r\n        message: string;\r\n    };\r\n};\r\ntype MessageablePerson = InstanceType<ReturnType<typeof wrapper>>;\r\nexport default MessageablePerson;\r\n(116,7)Error4094: Property 'message' of exported class expression may not be private or protected."},{"version":"4191603667-import MessageablePerson from './MessageablePerson.js';\nfunction logMessage( person: MessageablePerson ) {\n    console.log( person.message );\n}","signature":"-4882119183-export {};\r\n"}],"options":{"declaration":true},"fileIdsList":[[2]],"referencedMap":[[3,1]],"exportedModulesMap":[],"semanticDiagnosticsPerFile":[1,[3,[{"file":"./main.ts","start":131,"length":7,"messageText":"Property 'message' is protected and only accessible within class 'MessageableClass' and its subclasses.","category":1,"code":2445}]],2]},"version":"FakeTSVersion"}
 
 //// [/src/project/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -191,7 +191,7 @@ exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
       },
       "./messageableperson.ts": {
         "version": "3462418372-const Messageable = () => {\n    return class MessageableClass {\n        protected message = 'hello';\n    }\n};\nconst wrapper = () => Messageable();\ntype MessageablePerson = InstanceType<ReturnType<typeof wrapper>>;\nexport default MessageablePerson;",
-        "signature": "-4323958125-declare const wrapper: () => {\r\n    new (): {\r\n        message: string;\r\n    };\r\n};\r\ndeclare type MessageablePerson = InstanceType<ReturnType<typeof wrapper>>;\r\nexport default MessageablePerson;\r\n(116,7)Error4094: Property 'message' of exported class expression may not be private or protected."
+        "signature": "-16190189821-declare const wrapper: () => {\r\n    new (): {\r\n        message: string;\r\n    };\r\n};\r\ntype MessageablePerson = InstanceType<ReturnType<typeof wrapper>>;\r\nexport default MessageablePerson;\r\n(116,7)Error4094: Property 'message' of exported class expression may not be private or protected."
       },
       "./main.ts": {
         "version": "4191603667-import MessageablePerson from './MessageablePerson.js';\nfunction logMessage( person: MessageablePerson ) {\n    console.log( person.message );\n}",
@@ -226,7 +226,7 @@ exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
     ]
   },
   "version": "FakeTSVersion",
-  "size": 1985
+  "size": 1978
 }
 
 
@@ -255,7 +255,7 @@ exitCode:: ExitStatus.Success
 //// [/src/project/MessageablePerson.d.ts] file written with same contents
 //// [/src/project/MessageablePerson.js] file written with same contents
 //// [/src/project/tsconfig.tsbuildinfo]
-{"program":{"fileNames":["../../lib/lib.d.ts","./messageableperson.ts","./main.ts"],"fileInfos":[{"version":"5700251342-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };type ReturnType<T extends (...args: any) => any> = T extends (...args: any) => infer R ? R : any;\ntype InstanceType<T extends abstract new (...args: any) => any> = T extends abstract new (...args: any) => infer R ? R : any;","affectsGlobalScope":true},{"version":"31173349369-const Messageable = () => {\n    return class MessageableClass {\n        public message = 'hello';\n    }\n};\nconst wrapper = () => Messageable();\ntype MessageablePerson = InstanceType<ReturnType<typeof wrapper>>;\nexport default MessageablePerson;","signature":"-13324779423-declare const wrapper: () => {\r\n    new (): {\r\n        message: string;\r\n    };\r\n};\r\ndeclare type MessageablePerson = InstanceType<ReturnType<typeof wrapper>>;\r\nexport default MessageablePerson;\r\n"},{"version":"4191603667-import MessageablePerson from './MessageablePerson.js';\nfunction logMessage( person: MessageablePerson ) {\n    console.log( person.message );\n}","signature":"-4882119183-export {};\r\n"}],"options":{"declaration":true},"fileIdsList":[[2]],"referencedMap":[[3,1]],"exportedModulesMap":[],"semanticDiagnosticsPerFile":[1,3,2]},"version":"FakeTSVersion"}
+{"program":{"fileNames":["../../lib/lib.d.ts","./messageableperson.ts","./main.ts"],"fileInfos":[{"version":"5700251342-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };type ReturnType<T extends (...args: any) => any> = T extends (...args: any) => infer R ? R : any;\ntype InstanceType<T extends abstract new (...args: any) => any> = T extends abstract new (...args: any) => infer R ? R : any;","affectsGlobalScope":true},{"version":"31173349369-const Messageable = () => {\n    return class MessageableClass {\n        public message = 'hello';\n    }\n};\nconst wrapper = () => Messageable();\ntype MessageablePerson = InstanceType<ReturnType<typeof wrapper>>;\nexport default MessageablePerson;","signature":"-26007269167-declare const wrapper: () => {\r\n    new (): {\r\n        message: string;\r\n    };\r\n};\r\ntype MessageablePerson = InstanceType<ReturnType<typeof wrapper>>;\r\nexport default MessageablePerson;\r\n"},{"version":"4191603667-import MessageablePerson from './MessageablePerson.js';\nfunction logMessage( person: MessageablePerson ) {\n    console.log( person.message );\n}","signature":"-4882119183-export {};\r\n"}],"options":{"declaration":true},"fileIdsList":[[2]],"referencedMap":[[3,1]],"exportedModulesMap":[],"semanticDiagnosticsPerFile":[1,3,2]},"version":"FakeTSVersion"}
 
 //// [/src/project/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -278,7 +278,7 @@ exitCode:: ExitStatus.Success
       },
       "./messageableperson.ts": {
         "version": "31173349369-const Messageable = () => {\n    return class MessageableClass {\n        public message = 'hello';\n    }\n};\nconst wrapper = () => Messageable();\ntype MessageablePerson = InstanceType<ReturnType<typeof wrapper>>;\nexport default MessageablePerson;",
-        "signature": "-13324779423-declare const wrapper: () => {\r\n    new (): {\r\n        message: string;\r\n    };\r\n};\r\ndeclare type MessageablePerson = InstanceType<ReturnType<typeof wrapper>>;\r\nexport default MessageablePerson;\r\n"
+        "signature": "-26007269167-declare const wrapper: () => {\r\n    new (): {\r\n        message: string;\r\n    };\r\n};\r\ntype MessageablePerson = InstanceType<ReturnType<typeof wrapper>>;\r\nexport default MessageablePerson;\r\n"
       },
       "./main.ts": {
         "version": "4191603667-import MessageablePerson from './MessageablePerson.js';\nfunction logMessage( person: MessageablePerson ) {\n    console.log( person.message );\n}",
@@ -301,6 +301,6 @@ exitCode:: ExitStatus.Success
     ]
   },
   "version": "FakeTSVersion",
-  "size": 1693
+  "size": 1685
 }
 
diff --git a/tests/baselines/reference/tsc/incremental/change-to-modifier-of-class-expression-field.js b/tests/baselines/reference/tsc/incremental/change-to-modifier-of-class-expression-field.js
index 922df600ea416..ecf784da73195 100644
--- a/tests/baselines/reference/tsc/incremental/change-to-modifier-of-class-expression-field.js
+++ b/tests/baselines/reference/tsc/incremental/change-to-modifier-of-class-expression-field.js
@@ -149,7 +149,7 @@ exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 //// [/src/project/main.js] file written with same contents
 //// [/src/project/MessageablePerson.js] file written with same contents
 //// [/src/project/tsconfig.tsbuildinfo]
-{"program":{"fileNames":["../../lib/lib.d.ts","./messageableperson.ts","./main.ts"],"fileInfos":[{"version":"5700251342-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };type ReturnType<T extends (...args: any) => any> = T extends (...args: any) => infer R ? R : any;\ntype InstanceType<T extends abstract new (...args: any) => any> = T extends abstract new (...args: any) => infer R ? R : any;","affectsGlobalScope":true},{"version":"3462418372-const Messageable = () => {\n    return class MessageableClass {\n        protected message = 'hello';\n    }\n};\nconst wrapper = () => Messageable();\ntype MessageablePerson = InstanceType<ReturnType<typeof wrapper>>;\nexport default MessageablePerson;","signature":"-4323958125-declare const wrapper: () => {\r\n    new (): {\r\n        message: string;\r\n    };\r\n};\r\ndeclare type MessageablePerson = InstanceType<ReturnType<typeof wrapper>>;\r\nexport default MessageablePerson;\r\n(116,7)Error4094: Property 'message' of exported class expression may not be private or protected."},{"version":"4191603667-import MessageablePerson from './MessageablePerson.js';\nfunction logMessage( person: MessageablePerson ) {\n    console.log( person.message );\n}","signature":"-4882119183-export {};\r\n"}],"options":{"declaration":false},"fileIdsList":[[2]],"referencedMap":[[3,1]],"exportedModulesMap":[],"semanticDiagnosticsPerFile":[1,[3,[{"file":"./main.ts","start":131,"length":7,"messageText":"Property 'message' is protected and only accessible within class 'MessageableClass' and its subclasses.","category":1,"code":2445}]],2]},"version":"FakeTSVersion"}
+{"program":{"fileNames":["../../lib/lib.d.ts","./messageableperson.ts","./main.ts"],"fileInfos":[{"version":"5700251342-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };type ReturnType<T extends (...args: any) => any> = T extends (...args: any) => infer R ? R : any;\ntype InstanceType<T extends abstract new (...args: any) => any> = T extends abstract new (...args: any) => infer R ? R : any;","affectsGlobalScope":true},{"version":"3462418372-const Messageable = () => {\n    return class MessageableClass {\n        protected message = 'hello';\n    }\n};\nconst wrapper = () => Messageable();\ntype MessageablePerson = InstanceType<ReturnType<typeof wrapper>>;\nexport default MessageablePerson;","signature":"-16190189821-declare const wrapper: () => {\r\n    new (): {\r\n        message: string;\r\n    };\r\n};\r\ntype MessageablePerson = InstanceType<ReturnType<typeof wrapper>>;\r\nexport default MessageablePerson;\r\n(116,7)Error4094: Property 'message' of exported class expression may not be private or protected."},{"version":"4191603667-import MessageablePerson from './MessageablePerson.js';\nfunction logMessage( person: MessageablePerson ) {\n    console.log( person.message );\n}","signature":"-4882119183-export {};\r\n"}],"options":{"declaration":false},"fileIdsList":[[2]],"referencedMap":[[3,1]],"exportedModulesMap":[],"semanticDiagnosticsPerFile":[1,[3,[{"file":"./main.ts","start":131,"length":7,"messageText":"Property 'message' is protected and only accessible within class 'MessageableClass' and its subclasses.","category":1,"code":2445}]],2]},"version":"FakeTSVersion"}
 
 //// [/src/project/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -172,7 +172,7 @@ exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
       },
       "./messageableperson.ts": {
         "version": "3462418372-const Messageable = () => {\n    return class MessageableClass {\n        protected message = 'hello';\n    }\n};\nconst wrapper = () => Messageable();\ntype MessageablePerson = InstanceType<ReturnType<typeof wrapper>>;\nexport default MessageablePerson;",
-        "signature": "-4323958125-declare const wrapper: () => {\r\n    new (): {\r\n        message: string;\r\n    };\r\n};\r\ndeclare type MessageablePerson = InstanceType<ReturnType<typeof wrapper>>;\r\nexport default MessageablePerson;\r\n(116,7)Error4094: Property 'message' of exported class expression may not be private or protected."
+        "signature": "-16190189821-declare const wrapper: () => {\r\n    new (): {\r\n        message: string;\r\n    };\r\n};\r\ntype MessageablePerson = InstanceType<ReturnType<typeof wrapper>>;\r\nexport default MessageablePerson;\r\n(116,7)Error4094: Property 'message' of exported class expression may not be private or protected."
       },
       "./main.ts": {
         "version": "4191603667-import MessageablePerson from './MessageablePerson.js';\nfunction logMessage( person: MessageablePerson ) {\n    console.log( person.message );\n}",
@@ -207,7 +207,7 @@ exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
     ]
   },
   "version": "FakeTSVersion",
-  "size": 1986
+  "size": 1979
 }
 
 
@@ -234,7 +234,7 @@ exitCode:: ExitStatus.Success
 //// [/src/project/main.js] file written with same contents
 //// [/src/project/MessageablePerson.js] file written with same contents
 //// [/src/project/tsconfig.tsbuildinfo]
-{"program":{"fileNames":["../../lib/lib.d.ts","./messageableperson.ts","./main.ts"],"fileInfos":[{"version":"5700251342-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };type ReturnType<T extends (...args: any) => any> = T extends (...args: any) => infer R ? R : any;\ntype InstanceType<T extends abstract new (...args: any) => any> = T extends abstract new (...args: any) => infer R ? R : any;","affectsGlobalScope":true},{"version":"31173349369-const Messageable = () => {\n    return class MessageableClass {\n        public message = 'hello';\n    }\n};\nconst wrapper = () => Messageable();\ntype MessageablePerson = InstanceType<ReturnType<typeof wrapper>>;\nexport default MessageablePerson;","signature":"-13324779423-declare const wrapper: () => {\r\n    new (): {\r\n        message: string;\r\n    };\r\n};\r\ndeclare type MessageablePerson = InstanceType<ReturnType<typeof wrapper>>;\r\nexport default MessageablePerson;\r\n"},{"version":"4191603667-import MessageablePerson from './MessageablePerson.js';\nfunction logMessage( person: MessageablePerson ) {\n    console.log( person.message );\n}","signature":"-4882119183-export {};\r\n"}],"options":{"declaration":false},"fileIdsList":[[2]],"referencedMap":[[3,1]],"exportedModulesMap":[],"semanticDiagnosticsPerFile":[1,3,2]},"version":"FakeTSVersion"}
+{"program":{"fileNames":["../../lib/lib.d.ts","./messageableperson.ts","./main.ts"],"fileInfos":[{"version":"5700251342-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };type ReturnType<T extends (...args: any) => any> = T extends (...args: any) => infer R ? R : any;\ntype InstanceType<T extends abstract new (...args: any) => any> = T extends abstract new (...args: any) => infer R ? R : any;","affectsGlobalScope":true},{"version":"31173349369-const Messageable = () => {\n    return class MessageableClass {\n        public message = 'hello';\n    }\n};\nconst wrapper = () => Messageable();\ntype MessageablePerson = InstanceType<ReturnType<typeof wrapper>>;\nexport default MessageablePerson;","signature":"-26007269167-declare const wrapper: () => {\r\n    new (): {\r\n        message: string;\r\n    };\r\n};\r\ntype MessageablePerson = InstanceType<ReturnType<typeof wrapper>>;\r\nexport default MessageablePerson;\r\n"},{"version":"4191603667-import MessageablePerson from './MessageablePerson.js';\nfunction logMessage( person: MessageablePerson ) {\n    console.log( person.message );\n}","signature":"-4882119183-export {};\r\n"}],"options":{"declaration":false},"fileIdsList":[[2]],"referencedMap":[[3,1]],"exportedModulesMap":[],"semanticDiagnosticsPerFile":[1,3,2]},"version":"FakeTSVersion"}
 
 //// [/src/project/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -257,7 +257,7 @@ exitCode:: ExitStatus.Success
       },
       "./messageableperson.ts": {
         "version": "31173349369-const Messageable = () => {\n    return class MessageableClass {\n        public message = 'hello';\n    }\n};\nconst wrapper = () => Messageable();\ntype MessageablePerson = InstanceType<ReturnType<typeof wrapper>>;\nexport default MessageablePerson;",
-        "signature": "-13324779423-declare const wrapper: () => {\r\n    new (): {\r\n        message: string;\r\n    };\r\n};\r\ndeclare type MessageablePerson = InstanceType<ReturnType<typeof wrapper>>;\r\nexport default MessageablePerson;\r\n"
+        "signature": "-26007269167-declare const wrapper: () => {\r\n    new (): {\r\n        message: string;\r\n    };\r\n};\r\ntype MessageablePerson = InstanceType<ReturnType<typeof wrapper>>;\r\nexport default MessageablePerson;\r\n"
       },
       "./main.ts": {
         "version": "4191603667-import MessageablePerson from './MessageablePerson.js';\nfunction logMessage( person: MessageablePerson ) {\n    console.log( person.message );\n}",
@@ -280,6 +280,6 @@ exitCode:: ExitStatus.Success
     ]
   },
   "version": "FakeTSVersion",
-  "size": 1694
+  "size": 1686
 }
 
diff --git a/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/with-simple-project-when-solution-is-already-built.js b/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/with-simple-project-when-solution-is-already-built.js
index d499020543d59..760b3e5c7f2e5 100644
--- a/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/with-simple-project-when-solution-is-already-built.js
+++ b/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/with-simple-project-when-solution-is-already-built.js
@@ -173,7 +173,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [/user/username/projects/demo/lib/animals/animal.d.ts]
-export declare type Size = "small" | "medium" | "large";
+export type Size = "small" | "medium" | "large";
 export default interface Animal {
     size: Size;
 }
@@ -221,7 +221,7 @@ export declare function createDog(): Dog;
 
 
 //// [/user/username/projects/demo/lib/animals/tsconfig.tsbuildinfo]
-{"program":{"fileNames":["../../../../../../a/lib/lib.d.ts","../../animals/animal.ts","../../animals/index.ts","../core/utilities.d.ts","../../animals/dog.ts"],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true},{"version":"-14984181202-export type Size = \"small\" | \"medium\" | \"large\";\r\nexport default interface Animal {\r\n    size: Size;\r\n}\r\n","signature":"-10510161654-export declare type Size = \"small\" | \"medium\" | \"large\";\nexport default interface Animal {\n    size: Size;\n}\n"},{"version":"-5382672599-import Animal from './animal';\r\n\r\nexport default Animal;\r\nimport { createDog, Dog } from './dog';\r\nexport { createDog, Dog };\r\n","signature":"1096904574-import Animal from './animal';\nexport default Animal;\nimport { createDog, Dog } from './dog';\nexport { createDog, Dog };\n"},"-11345568166-export declare function makeRandomName(): string;\nexport declare function lastElementOf<T>(arr: T[]): T | undefined;\n",{"version":"-10991948013-import Animal from '.';\r\nimport { makeRandomName } from '../core/utilities';\r\n\r\nexport interface Dog extends Animal {\r\n    woof(): void;\r\n    name: string;\r\n}\r\n\r\nexport function createDog(): Dog {\r\n    return ({\r\n        size: \"medium\",\r\n        woof: function(this: Dog) {\r\n            console.log(`${this.name} says \"Woof\"!`);\r\n        },\r\n        name: makeRandomName()\r\n    });\r\n}\r\n\r\n","signature":"6032048049-import Animal from '.';\nexport interface Dog extends Animal {\n    woof(): void;\n    name: string;\n}\nexport declare function createDog(): Dog;\n"}],"options":{"composite":true,"declaration":true,"module":1,"noFallthroughCasesInSwitch":true,"noImplicitReturns":true,"noUnusedLocals":true,"noUnusedParameters":true,"outDir":"./","rootDir":"../../animals","strict":true,"target":1},"fileIdsList":[[3,4],[2,5],[3]],"referencedMap":[[5,1],[3,2]],"exportedModulesMap":[[5,3],[3,2]],"semanticDiagnosticsPerFile":[1,2,5,3,4],"latestChangedDtsFile":"./dog.d.ts"},"version":"FakeTSVersion"}
+{"program":{"fileNames":["../../../../../../a/lib/lib.d.ts","../../animals/animal.ts","../../animals/index.ts","../core/utilities.d.ts","../../animals/dog.ts"],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true},{"version":"-14984181202-export type Size = \"small\" | \"medium\" | \"large\";\r\nexport default interface Animal {\r\n    size: Size;\r\n}\r\n","signature":"-9289341318-export type Size = \"small\" | \"medium\" | \"large\";\nexport default interface Animal {\n    size: Size;\n}\n"},{"version":"-5382672599-import Animal from './animal';\r\n\r\nexport default Animal;\r\nimport { createDog, Dog } from './dog';\r\nexport { createDog, Dog };\r\n","signature":"1096904574-import Animal from './animal';\nexport default Animal;\nimport { createDog, Dog } from './dog';\nexport { createDog, Dog };\n"},"-11345568166-export declare function makeRandomName(): string;\nexport declare function lastElementOf<T>(arr: T[]): T | undefined;\n",{"version":"-10991948013-import Animal from '.';\r\nimport { makeRandomName } from '../core/utilities';\r\n\r\nexport interface Dog extends Animal {\r\n    woof(): void;\r\n    name: string;\r\n}\r\n\r\nexport function createDog(): Dog {\r\n    return ({\r\n        size: \"medium\",\r\n        woof: function(this: Dog) {\r\n            console.log(`${this.name} says \"Woof\"!`);\r\n        },\r\n        name: makeRandomName()\r\n    });\r\n}\r\n\r\n","signature":"6032048049-import Animal from '.';\nexport interface Dog extends Animal {\n    woof(): void;\n    name: string;\n}\nexport declare function createDog(): Dog;\n"}],"options":{"composite":true,"declaration":true,"module":1,"noFallthroughCasesInSwitch":true,"noImplicitReturns":true,"noUnusedLocals":true,"noUnusedParameters":true,"outDir":"./","rootDir":"../../animals","strict":true,"target":1},"fileIdsList":[[3,4],[2,5],[3]],"referencedMap":[[5,1],[3,2]],"exportedModulesMap":[[5,3],[3,2]],"semanticDiagnosticsPerFile":[1,2,5,3,4],"latestChangedDtsFile":"./dog.d.ts"},"version":"FakeTSVersion"}
 
 //// [/user/username/projects/demo/lib/animals/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -254,7 +254,7 @@ export declare function createDog(): Dog;
       },
       "../../animals/animal.ts": {
         "version": "-14984181202-export type Size = \"small\" | \"medium\" | \"large\";\r\nexport default interface Animal {\r\n    size: Size;\r\n}\r\n",
-        "signature": "-10510161654-export declare type Size = \"small\" | \"medium\" | \"large\";\nexport default interface Animal {\n    size: Size;\n}\n"
+        "signature": "-9289341318-export type Size = \"small\" | \"medium\" | \"large\";\nexport default interface Animal {\n    size: Size;\n}\n"
       },
       "../../animals/index.ts": {
         "version": "-5382672599-import Animal from './animal';\r\n\r\nexport default Animal;\r\nimport { createDog, Dog } from './dog';\r\nexport { createDog, Dog };\r\n",
@@ -311,7 +311,7 @@ export declare function createDog(): Dog;
     "latestChangedDtsFile": "./dog.d.ts"
   },
   "version": "FakeTSVersion",
-  "size": 2459
+  "size": 2450
 }
 
 
@@ -378,7 +378,7 @@ exitCode:: ExitStatus.undefined
 
 //// [/user/username/projects/demo/lib/animals/dog.js] file written with same contents
 //// [/user/username/projects/demo/lib/animals/tsconfig.tsbuildinfo]
-{"program":{"fileNames":["../../../../../../a/lib/lib.d.ts","../../animals/animal.ts","../../animals/index.ts","../../core/utilities.ts","../../animals/dog.ts"],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true},{"version":"-14984181202-export type Size = \"small\" | \"medium\" | \"large\";\r\nexport default interface Animal {\r\n    size: Size;\r\n}\r\n","signature":"-10510161654-export declare type Size = \"small\" | \"medium\" | \"large\";\nexport default interface Animal {\n    size: Size;\n}\n"},{"version":"-5382672599-import Animal from './animal';\r\n\r\nexport default Animal;\r\nimport { createDog, Dog } from './dog';\r\nexport { createDog, Dog };\r\n","signature":"1096904574-import Animal from './animal';\nexport default Animal;\nimport { createDog, Dog } from './dog';\nexport { createDog, Dog };\n"},{"version":"25274411612-\r\nexport function makeRandomName() {\r\n    return \"Bob!?! \";\r\n}\r\n\r\nexport function lastElementOf<T>(arr: T[]): T | undefined {\r\n    if (arr.length === 0) return undefined;\r\n    return arr[arr.length - 1];\r\n}\r\n\r\n","signature":"-11345568166-export declare function makeRandomName(): string;\nexport declare function lastElementOf<T>(arr: T[]): T | undefined;\n"},{"version":"-10991948013-import Animal from '.';\r\nimport { makeRandomName } from '../core/utilities';\r\n\r\nexport interface Dog extends Animal {\r\n    woof(): void;\r\n    name: string;\r\n}\r\n\r\nexport function createDog(): Dog {\r\n    return ({\r\n        size: \"medium\",\r\n        woof: function(this: Dog) {\r\n            console.log(`${this.name} says \"Woof\"!`);\r\n        },\r\n        name: makeRandomName()\r\n    });\r\n}\r\n\r\n","signature":"6032048049-import Animal from '.';\nexport interface Dog extends Animal {\n    woof(): void;\n    name: string;\n}\nexport declare function createDog(): Dog;\n"}],"options":{"composite":true,"declaration":true,"module":1,"noFallthroughCasesInSwitch":true,"noImplicitReturns":true,"noUnusedLocals":true,"noUnusedParameters":true,"outDir":"./","rootDir":"../../animals","strict":true,"target":1},"fileIdsList":[[3,4],[2,5],[3]],"referencedMap":[[5,1],[3,2]],"exportedModulesMap":[[5,3],[3,2]],"semanticDiagnosticsPerFile":[1,2,5,3,4],"latestChangedDtsFile":"./dog.d.ts"},"version":"FakeTSVersion"}
+{"program":{"fileNames":["../../../../../../a/lib/lib.d.ts","../../animals/animal.ts","../../animals/index.ts","../../core/utilities.ts","../../animals/dog.ts"],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true},{"version":"-14984181202-export type Size = \"small\" | \"medium\" | \"large\";\r\nexport default interface Animal {\r\n    size: Size;\r\n}\r\n","signature":"-9289341318-export type Size = \"small\" | \"medium\" | \"large\";\nexport default interface Animal {\n    size: Size;\n}\n"},{"version":"-5382672599-import Animal from './animal';\r\n\r\nexport default Animal;\r\nimport { createDog, Dog } from './dog';\r\nexport { createDog, Dog };\r\n","signature":"1096904574-import Animal from './animal';\nexport default Animal;\nimport { createDog, Dog } from './dog';\nexport { createDog, Dog };\n"},{"version":"25274411612-\r\nexport function makeRandomName() {\r\n    return \"Bob!?! \";\r\n}\r\n\r\nexport function lastElementOf<T>(arr: T[]): T | undefined {\r\n    if (arr.length === 0) return undefined;\r\n    return arr[arr.length - 1];\r\n}\r\n\r\n","signature":"-11345568166-export declare function makeRandomName(): string;\nexport declare function lastElementOf<T>(arr: T[]): T | undefined;\n"},{"version":"-10991948013-import Animal from '.';\r\nimport { makeRandomName } from '../core/utilities';\r\n\r\nexport interface Dog extends Animal {\r\n    woof(): void;\r\n    name: string;\r\n}\r\n\r\nexport function createDog(): Dog {\r\n    return ({\r\n        size: \"medium\",\r\n        woof: function(this: Dog) {\r\n            console.log(`${this.name} says \"Woof\"!`);\r\n        },\r\n        name: makeRandomName()\r\n    });\r\n}\r\n\r\n","signature":"6032048049-import Animal from '.';\nexport interface Dog extends Animal {\n    woof(): void;\n    name: string;\n}\nexport declare function createDog(): Dog;\n"}],"options":{"composite":true,"declaration":true,"module":1,"noFallthroughCasesInSwitch":true,"noImplicitReturns":true,"noUnusedLocals":true,"noUnusedParameters":true,"outDir":"./","rootDir":"../../animals","strict":true,"target":1},"fileIdsList":[[3,4],[2,5],[3]],"referencedMap":[[5,1],[3,2]],"exportedModulesMap":[[5,3],[3,2]],"semanticDiagnosticsPerFile":[1,2,5,3,4],"latestChangedDtsFile":"./dog.d.ts"},"version":"FakeTSVersion"}
 
 //// [/user/username/projects/demo/lib/animals/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -411,7 +411,7 @@ exitCode:: ExitStatus.undefined
       },
       "../../animals/animal.ts": {
         "version": "-14984181202-export type Size = \"small\" | \"medium\" | \"large\";\r\nexport default interface Animal {\r\n    size: Size;\r\n}\r\n",
-        "signature": "-10510161654-export declare type Size = \"small\" | \"medium\" | \"large\";\nexport default interface Animal {\n    size: Size;\n}\n"
+        "signature": "-9289341318-export type Size = \"small\" | \"medium\" | \"large\";\nexport default interface Animal {\n    size: Size;\n}\n"
       },
       "../../animals/index.ts": {
         "version": "-5382672599-import Animal from './animal';\r\n\r\nexport default Animal;\r\nimport { createDog, Dog } from './dog';\r\nexport { createDog, Dog };\r\n",
@@ -468,6 +468,6 @@ exitCode:: ExitStatus.undefined
     "latestChangedDtsFile": "./dog.d.ts"
   },
   "version": "FakeTSVersion",
-  "size": 2731
+  "size": 2722
 }
 
diff --git a/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/with-simple-project.js b/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/with-simple-project.js
index 48ff70c790d94..311d03dc487c2 100644
--- a/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/with-simple-project.js
+++ b/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/with-simple-project.js
@@ -174,7 +174,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [/user/username/projects/demo/lib/animals/animal.d.ts]
-export declare type Size = "small" | "medium" | "large";
+export type Size = "small" | "medium" | "large";
 export default interface Animal {
     size: Size;
 }
@@ -222,7 +222,7 @@ export declare function createDog(): Dog;
 
 
 //// [/user/username/projects/demo/lib/animals/tsconfig.tsbuildinfo]
-{"program":{"fileNames":["../../../../../../a/lib/lib.d.ts","../../animals/animal.ts","../../animals/index.ts","../../core/utilities.ts","../../animals/dog.ts"],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true},{"version":"-14984181202-export type Size = \"small\" | \"medium\" | \"large\";\r\nexport default interface Animal {\r\n    size: Size;\r\n}\r\n","signature":"-10510161654-export declare type Size = \"small\" | \"medium\" | \"large\";\nexport default interface Animal {\n    size: Size;\n}\n"},{"version":"-5382672599-import Animal from './animal';\r\n\r\nexport default Animal;\r\nimport { createDog, Dog } from './dog';\r\nexport { createDog, Dog };\r\n","signature":"1096904574-import Animal from './animal';\nexport default Animal;\nimport { createDog, Dog } from './dog';\nexport { createDog, Dog };\n"},"25274411612-\r\nexport function makeRandomName() {\r\n    return \"Bob!?! \";\r\n}\r\n\r\nexport function lastElementOf<T>(arr: T[]): T | undefined {\r\n    if (arr.length === 0) return undefined;\r\n    return arr[arr.length - 1];\r\n}\r\n\r\n",{"version":"-10991948013-import Animal from '.';\r\nimport { makeRandomName } from '../core/utilities';\r\n\r\nexport interface Dog extends Animal {\r\n    woof(): void;\r\n    name: string;\r\n}\r\n\r\nexport function createDog(): Dog {\r\n    return ({\r\n        size: \"medium\",\r\n        woof: function(this: Dog) {\r\n            console.log(`${this.name} says \"Woof\"!`);\r\n        },\r\n        name: makeRandomName()\r\n    });\r\n}\r\n\r\n","signature":"6032048049-import Animal from '.';\nexport interface Dog extends Animal {\n    woof(): void;\n    name: string;\n}\nexport declare function createDog(): Dog;\n"}],"options":{"composite":true,"declaration":true,"module":1,"noFallthroughCasesInSwitch":true,"noImplicitReturns":true,"noUnusedLocals":true,"noUnusedParameters":true,"outDir":"./","rootDir":"../../animals","strict":true,"target":1},"fileIdsList":[[3,4],[2,5],[3]],"referencedMap":[[5,1],[3,2]],"exportedModulesMap":[[5,3],[3,2]],"semanticDiagnosticsPerFile":[1,2,5,3,4],"latestChangedDtsFile":"./dog.d.ts"},"version":"FakeTSVersion"}
+{"program":{"fileNames":["../../../../../../a/lib/lib.d.ts","../../animals/animal.ts","../../animals/index.ts","../../core/utilities.ts","../../animals/dog.ts"],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true},{"version":"-14984181202-export type Size = \"small\" | \"medium\" | \"large\";\r\nexport default interface Animal {\r\n    size: Size;\r\n}\r\n","signature":"-9289341318-export type Size = \"small\" | \"medium\" | \"large\";\nexport default interface Animal {\n    size: Size;\n}\n"},{"version":"-5382672599-import Animal from './animal';\r\n\r\nexport default Animal;\r\nimport { createDog, Dog } from './dog';\r\nexport { createDog, Dog };\r\n","signature":"1096904574-import Animal from './animal';\nexport default Animal;\nimport { createDog, Dog } from './dog';\nexport { createDog, Dog };\n"},"25274411612-\r\nexport function makeRandomName() {\r\n    return \"Bob!?! \";\r\n}\r\n\r\nexport function lastElementOf<T>(arr: T[]): T | undefined {\r\n    if (arr.length === 0) return undefined;\r\n    return arr[arr.length - 1];\r\n}\r\n\r\n",{"version":"-10991948013-import Animal from '.';\r\nimport { makeRandomName } from '../core/utilities';\r\n\r\nexport interface Dog extends Animal {\r\n    woof(): void;\r\n    name: string;\r\n}\r\n\r\nexport function createDog(): Dog {\r\n    return ({\r\n        size: \"medium\",\r\n        woof: function(this: Dog) {\r\n            console.log(`${this.name} says \"Woof\"!`);\r\n        },\r\n        name: makeRandomName()\r\n    });\r\n}\r\n\r\n","signature":"6032048049-import Animal from '.';\nexport interface Dog extends Animal {\n    woof(): void;\n    name: string;\n}\nexport declare function createDog(): Dog;\n"}],"options":{"composite":true,"declaration":true,"module":1,"noFallthroughCasesInSwitch":true,"noImplicitReturns":true,"noUnusedLocals":true,"noUnusedParameters":true,"outDir":"./","rootDir":"../../animals","strict":true,"target":1},"fileIdsList":[[3,4],[2,5],[3]],"referencedMap":[[5,1],[3,2]],"exportedModulesMap":[[5,3],[3,2]],"semanticDiagnosticsPerFile":[1,2,5,3,4],"latestChangedDtsFile":"./dog.d.ts"},"version":"FakeTSVersion"}
 
 //// [/user/username/projects/demo/lib/animals/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -255,7 +255,7 @@ export declare function createDog(): Dog;
       },
       "../../animals/animal.ts": {
         "version": "-14984181202-export type Size = \"small\" | \"medium\" | \"large\";\r\nexport default interface Animal {\r\n    size: Size;\r\n}\r\n",
-        "signature": "-10510161654-export declare type Size = \"small\" | \"medium\" | \"large\";\nexport default interface Animal {\n    size: Size;\n}\n"
+        "signature": "-9289341318-export type Size = \"small\" | \"medium\" | \"large\";\nexport default interface Animal {\n    size: Size;\n}\n"
       },
       "../../animals/index.ts": {
         "version": "-5382672599-import Animal from './animal';\r\n\r\nexport default Animal;\r\nimport { createDog, Dog } from './dog';\r\nexport { createDog, Dog };\r\n",
@@ -312,6 +312,6 @@ export declare function createDog(): Dog;
     "latestChangedDtsFile": "./dog.d.ts"
   },
   "version": "FakeTSVersion",
-  "size": 2572
+  "size": 2563
 }
 
diff --git a/tests/baselines/reference/typeAliasDeclarationEmit.js b/tests/baselines/reference/typeAliasDeclarationEmit.js
index 2106e1498d374..f2f223bf44b31 100644
--- a/tests/baselines/reference/typeAliasDeclarationEmit.js
+++ b/tests/baselines/reference/typeAliasDeclarationEmit.js
@@ -11,5 +11,5 @@ define(["require", "exports"], function (require, exports) {
 
 
 //// [typeAliasDeclarationEmit.d.ts]
-export declare type callback<T> = () => T;
-export declare type CallbackArray<T extends callback> = () => T;
+export type callback<T> = () => T;
+export type CallbackArray<T extends callback> = () => T;
diff --git a/tests/baselines/reference/typeAliasDeclarationEmit2.js b/tests/baselines/reference/typeAliasDeclarationEmit2.js
index cf890a4679834..2cef2e975f268 100644
--- a/tests/baselines/reference/typeAliasDeclarationEmit2.js
+++ b/tests/baselines/reference/typeAliasDeclarationEmit2.js
@@ -9,6 +9,6 @@ define(["require", "exports"], function (require, exports) {
 
 
 //// [typeAliasDeclarationEmit2.d.ts]
-export declare type A<a> = {
+export type A<a> = {
     value: a;
 };
diff --git a/tests/baselines/reference/unionTypeWithLeadingOperator.js b/tests/baselines/reference/unionTypeWithLeadingOperator.js
index 84572d9430e66..d206f5fc7e40b 100644
--- a/tests/baselines/reference/unionTypeWithLeadingOperator.js
+++ b/tests/baselines/reference/unionTypeWithLeadingOperator.js
@@ -17,4 +17,4 @@ exports.__esModule = true;
 
 
 //// [unionTypeWithLeadingOperator.d.ts]
-export declare type D = /*leading1*/ 1 | /*leading2*/ 2;
+export type D = /*leading1*/ 1 | /*leading2*/ 2;
diff --git a/tests/baselines/reference/uniqueSymbolsDeclarations.js b/tests/baselines/reference/uniqueSymbolsDeclarations.js
index c70a2163e3dcc..6f121ef9c7711 100644
--- a/tests/baselines/reference/uniqueSymbolsDeclarations.js
+++ b/tests/baselines/reference/uniqueSymbolsDeclarations.js
@@ -470,7 +470,7 @@ declare const i: I;
 declare const constInitToIReadonlyType: symbol;
 declare const constInitToIReadonlyTypeWithTypeQuery: typeof i.readonlyType;
 declare const constInitToIReadonlyTypeWithIndexedAccess: I["readonlyType"];
-declare type L = {
+type L = {
     readonly readonlyType: unique symbol;
     nested: {
         readonly readonlyNestedType: unique symbol;
diff --git a/tests/baselines/reference/uniqueSymbolsDeclarationsErrors.js b/tests/baselines/reference/uniqueSymbolsDeclarationsErrors.js
index 68970221a716d..4303204be8803 100644
--- a/tests/baselines/reference/uniqueSymbolsDeclarationsErrors.js
+++ b/tests/baselines/reference/uniqueSymbolsDeclarationsErrors.js
@@ -128,10 +128,10 @@ export interface InterfaceWithPrivateNamedProperties {
 export interface InterfaceWithPrivateNamedMethods {
     [s](): any;
 }
-export declare type TypeLiteralWithPrivateNamedProperties = {
+export type TypeLiteralWithPrivateNamedProperties = {
     [s]: any;
 };
-export declare type TypeLiteralWithPrivateNamedMethods = {
+export type TypeLiteralWithPrivateNamedMethods = {
     [s](): any;
 };
 export declare class ClassWithPrivateNamedProperties {
diff --git a/tests/baselines/reference/unknownControlFlow.js b/tests/baselines/reference/unknownControlFlow.js
index b924cf83ffb83..8b4681eee071e 100644
--- a/tests/baselines/reference/unknownControlFlow.js
+++ b/tests/baselines/reference/unknownControlFlow.js
@@ -555,21 +555,21 @@ ff4(null, 'foo'); // Error
 
 
 //// [unknownControlFlow.d.ts]
-declare type T01 = {} & string;
-declare type T02 = {} & 'a';
-declare type T03 = {} & object;
-declare type T04 = {} & {
+type T01 = {} & string;
+type T02 = {} & 'a';
+type T03 = {} & object;
+type T04 = {} & {
     x: number;
 };
-declare type T05 = {} & null;
-declare type T06 = {} & undefined;
-declare type T07 = undefined & void;
-declare type T10 = string & {};
-declare type T11 = number & {};
-declare type T12 = bigint & {};
-declare type ThisNode = {};
-declare type ThatNode = {};
-declare type ThisOrThatNode = ThisNode | ThatNode;
+type T05 = {} & null;
+type T06 = {} & undefined;
+type T07 = undefined & void;
+type T10 = string & {};
+type T11 = number & {};
+type T12 = bigint & {};
+type ThisNode = {};
+type ThatNode = {};
+type ThisOrThatNode = ThisNode | ThatNode;
 declare function f01(u: unknown): void;
 declare function f10(x: unknown): void;
 declare function f11<T>(x: T): void;
@@ -588,7 +588,7 @@ declare function ensureNotNull<T>(x: T): T & ({} | undefined);
 declare function ensureNotUndefined<T>(x: T): T & ({} | null);
 declare function ensureNotNullOrUndefined<T>(x: T): T & {};
 declare function f40(a: string | undefined, b: number | null | undefined): void;
-declare type QQ<T> = NonNullable<NonNullable<NonNullable<T>>>;
+type QQ<T> = NonNullable<NonNullable<NonNullable<T>>>;
 declare function f41<T>(a: T): void;
 declare function deepEquals<T>(a: T, b: T): boolean;
 declare function foo<T>(x: T | null): void;
@@ -596,8 +596,8 @@ declare function ff1<T>(t: T, k: keyof T): void;
 declare function ff2<T>(t: T & {}, k: keyof T): void;
 declare function ff3<T>(t: T, k: keyof (T & {})): void;
 declare function ff4<T>(t: T & {}, k: keyof (T & {})): void;
-declare type Foo = {
+type Foo = {
     [key: string]: unknown;
 };
-declare type NullableFoo = Foo | undefined;
-declare type Bar<T extends NullableFoo> = NonNullable<T>[string];
+type NullableFoo = Foo | undefined;
+type Bar<T extends NullableFoo> = NonNullable<T>[string];
diff --git a/tests/baselines/reference/variadicTuples1.js b/tests/baselines/reference/variadicTuples1.js
index 4b8df48890e21..443176fc9a468 100644
--- a/tests/baselines/reference/variadicTuples1.js
+++ b/tests/baselines/reference/variadicTuples1.js
@@ -626,17 +626,17 @@ var data = [false, false]; // Error
 
 
 //// [variadicTuples1.d.ts]
-declare type TV0<T extends unknown[]> = [string, ...T];
-declare type TV1<T extends unknown[]> = [string, ...T, number];
-declare type TV2<T extends unknown[]> = [string, ...T, number, ...T];
-declare type TV3<T extends unknown[]> = [string, ...T, ...number[], ...T];
-declare type TN1 = TV1<[boolean, string]>;
-declare type TN2 = TV1<[]>;
-declare type TN3 = TV1<[boolean?]>;
-declare type TN4 = TV1<string[]>;
-declare type TN5 = TV1<[boolean] | [symbol, symbol]>;
-declare type TN6 = TV1<any>;
-declare type TN7 = TV1<never>;
+type TV0<T extends unknown[]> = [string, ...T];
+type TV1<T extends unknown[]> = [string, ...T, number];
+type TV2<T extends unknown[]> = [string, ...T, number, ...T];
+type TV3<T extends unknown[]> = [string, ...T, ...number[], ...T];
+type TN1 = TV1<[boolean, string]>;
+type TN2 = TV1<[]>;
+type TN3 = TV1<[boolean?]>;
+type TN4 = TV1<string[]>;
+type TN5 = TV1<[boolean] | [symbol, symbol]>;
+type TN6 = TV1<any>;
+type TN7 = TV1<never>;
 declare function tup2<T extends unknown[], U extends unknown[]>(t: [...T], u: [...U]): readonly [1, ...T, 2, ...U, 3];
 declare const t2: readonly [1, string, 2, number, boolean, 3];
 declare function concat<T extends unknown[], U extends unknown[]>(t: [...T], u: [...U]): [...T, ...U];
@@ -659,12 +659,12 @@ declare function f0<T extends unknown[]>(t: [string, ...T], n: number): void;
 declare function f1<T extends unknown[]>(t: [string, ...T, number], n: number): void;
 declare function f2<T extends unknown[]>(t: [string, ...T]): void;
 declare function f3<T extends unknown[]>(t: [string, ...T, number]): void;
-declare type Arrayify<T> = {
+type Arrayify<T> = {
     [P in keyof T]: T[P][];
 };
-declare type TM1<U extends unknown[]> = Arrayify<readonly [string, number?, ...U, ...boolean[]]>;
-declare type TP1<T extends unknown[]> = Partial<[string, ...T, number]>;
-declare type TP2<T extends unknown[]> = Partial<[string, ...T, ...number[]]>;
+type TM1<U extends unknown[]> = Arrayify<readonly [string, number?, ...U, ...boolean[]]>;
+type TP1<T extends unknown[]> = Partial<[string, ...T, number]>;
+type TP2<T extends unknown[]> = Partial<[string, ...T, ...number[]]>;
 declare function fm1<T extends unknown[]>(t: Arrayify<[string, number, ...T]>): T;
 declare let tm1: [boolean, string];
 declare function fx1<T extends unknown[]>(a: string, ...args: T): T;
@@ -677,78 +677,78 @@ declare function f12<T extends readonly unknown[]>(t: T, m: [...T], r: readonly
 declare function f13<T extends string[], U extends T>(t0: T, t1: [...T], t2: [...U]): void;
 declare function f14<T extends readonly string[], U extends T>(t0: T, t1: [...T], t2: [...U]): void;
 declare function f15<T extends string[], U extends T>(k0: keyof T, k1: keyof [...T], k2: keyof [...U], k3: keyof [1, 2, ...T]): void;
-declare type First<T extends readonly unknown[]> = T extends readonly [unknown, ...unknown[]] ? T[0] : T[0] | undefined;
-declare type DropFirst<T extends readonly unknown[]> = T extends readonly [unknown?, ...infer U] ? U : [...T];
-declare type Last<T extends readonly unknown[]> = T extends readonly [...unknown[], infer U] ? U : T extends readonly [unknown, ...unknown[]] ? T[number] : T[number] | undefined;
-declare type DropLast<T extends readonly unknown[]> = T extends readonly [...infer U, unknown] ? U : [...T];
-declare type T00 = First<[number, symbol, string]>;
-declare type T01 = First<[symbol, string]>;
-declare type T02 = First<[string]>;
-declare type T03 = First<[number, symbol, ...string[]]>;
-declare type T04 = First<[symbol, ...string[]]>;
-declare type T05 = First<[string?]>;
-declare type T06 = First<string[]>;
-declare type T07 = First<[]>;
-declare type T08 = First<any>;
-declare type T09 = First<never>;
-declare type T10 = DropFirst<[number, symbol, string]>;
-declare type T11 = DropFirst<[symbol, string]>;
-declare type T12 = DropFirst<[string]>;
-declare type T13 = DropFirst<[number, symbol, ...string[]]>;
-declare type T14 = DropFirst<[symbol, ...string[]]>;
-declare type T15 = DropFirst<[string?]>;
-declare type T16 = DropFirst<string[]>;
-declare type T17 = DropFirst<[]>;
-declare type T18 = DropFirst<any>;
-declare type T19 = DropFirst<never>;
-declare type T20 = Last<[number, symbol, string]>;
-declare type T21 = Last<[symbol, string]>;
-declare type T22 = Last<[string]>;
-declare type T23 = Last<[number, symbol, ...string[]]>;
-declare type T24 = Last<[symbol, ...string[]]>;
-declare type T25 = Last<[string?]>;
-declare type T26 = Last<string[]>;
-declare type T27 = Last<[]>;
-declare type T28 = Last<any>;
-declare type T29 = Last<never>;
-declare type T30 = DropLast<[number, symbol, string]>;
-declare type T31 = DropLast<[symbol, string]>;
-declare type T32 = DropLast<[string]>;
-declare type T33 = DropLast<[number, symbol, ...string[]]>;
-declare type T34 = DropLast<[symbol, ...string[]]>;
-declare type T35 = DropLast<[string?]>;
-declare type T36 = DropLast<string[]>;
-declare type T37 = DropLast<[]>;
-declare type T38 = DropLast<any>;
-declare type T39 = DropLast<never>;
-declare type R00 = First<readonly [number, symbol, string]>;
-declare type R01 = First<readonly [symbol, string]>;
-declare type R02 = First<readonly [string]>;
-declare type R03 = First<readonly [number, symbol, ...string[]]>;
-declare type R04 = First<readonly [symbol, ...string[]]>;
-declare type R05 = First<readonly string[]>;
-declare type R06 = First<readonly []>;
-declare type R10 = DropFirst<readonly [number, symbol, string]>;
-declare type R11 = DropFirst<readonly [symbol, string]>;
-declare type R12 = DropFirst<readonly [string]>;
-declare type R13 = DropFirst<readonly [number, symbol, ...string[]]>;
-declare type R14 = DropFirst<readonly [symbol, ...string[]]>;
-declare type R15 = DropFirst<readonly string[]>;
-declare type R16 = DropFirst<readonly []>;
-declare type R20 = Last<readonly [number, symbol, string]>;
-declare type R21 = Last<readonly [symbol, string]>;
-declare type R22 = Last<readonly [string]>;
-declare type R23 = Last<readonly [number, symbol, ...string[]]>;
-declare type R24 = Last<readonly [symbol, ...string[]]>;
-declare type R25 = Last<readonly string[]>;
-declare type R26 = Last<readonly []>;
-declare type R30 = DropLast<readonly [number, symbol, string]>;
-declare type R31 = DropLast<readonly [symbol, string]>;
-declare type R32 = DropLast<readonly [string]>;
-declare type R33 = DropLast<readonly [number, symbol, ...string[]]>;
-declare type R34 = DropLast<readonly [symbol, ...string[]]>;
-declare type R35 = DropLast<readonly string[]>;
-declare type R36 = DropLast<readonly []>;
+type First<T extends readonly unknown[]> = T extends readonly [unknown, ...unknown[]] ? T[0] : T[0] | undefined;
+type DropFirst<T extends readonly unknown[]> = T extends readonly [unknown?, ...infer U] ? U : [...T];
+type Last<T extends readonly unknown[]> = T extends readonly [...unknown[], infer U] ? U : T extends readonly [unknown, ...unknown[]] ? T[number] : T[number] | undefined;
+type DropLast<T extends readonly unknown[]> = T extends readonly [...infer U, unknown] ? U : [...T];
+type T00 = First<[number, symbol, string]>;
+type T01 = First<[symbol, string]>;
+type T02 = First<[string]>;
+type T03 = First<[number, symbol, ...string[]]>;
+type T04 = First<[symbol, ...string[]]>;
+type T05 = First<[string?]>;
+type T06 = First<string[]>;
+type T07 = First<[]>;
+type T08 = First<any>;
+type T09 = First<never>;
+type T10 = DropFirst<[number, symbol, string]>;
+type T11 = DropFirst<[symbol, string]>;
+type T12 = DropFirst<[string]>;
+type T13 = DropFirst<[number, symbol, ...string[]]>;
+type T14 = DropFirst<[symbol, ...string[]]>;
+type T15 = DropFirst<[string?]>;
+type T16 = DropFirst<string[]>;
+type T17 = DropFirst<[]>;
+type T18 = DropFirst<any>;
+type T19 = DropFirst<never>;
+type T20 = Last<[number, symbol, string]>;
+type T21 = Last<[symbol, string]>;
+type T22 = Last<[string]>;
+type T23 = Last<[number, symbol, ...string[]]>;
+type T24 = Last<[symbol, ...string[]]>;
+type T25 = Last<[string?]>;
+type T26 = Last<string[]>;
+type T27 = Last<[]>;
+type T28 = Last<any>;
+type T29 = Last<never>;
+type T30 = DropLast<[number, symbol, string]>;
+type T31 = DropLast<[symbol, string]>;
+type T32 = DropLast<[string]>;
+type T33 = DropLast<[number, symbol, ...string[]]>;
+type T34 = DropLast<[symbol, ...string[]]>;
+type T35 = DropLast<[string?]>;
+type T36 = DropLast<string[]>;
+type T37 = DropLast<[]>;
+type T38 = DropLast<any>;
+type T39 = DropLast<never>;
+type R00 = First<readonly [number, symbol, string]>;
+type R01 = First<readonly [symbol, string]>;
+type R02 = First<readonly [string]>;
+type R03 = First<readonly [number, symbol, ...string[]]>;
+type R04 = First<readonly [symbol, ...string[]]>;
+type R05 = First<readonly string[]>;
+type R06 = First<readonly []>;
+type R10 = DropFirst<readonly [number, symbol, string]>;
+type R11 = DropFirst<readonly [symbol, string]>;
+type R12 = DropFirst<readonly [string]>;
+type R13 = DropFirst<readonly [number, symbol, ...string[]]>;
+type R14 = DropFirst<readonly [symbol, ...string[]]>;
+type R15 = DropFirst<readonly string[]>;
+type R16 = DropFirst<readonly []>;
+type R20 = Last<readonly [number, symbol, string]>;
+type R21 = Last<readonly [symbol, string]>;
+type R22 = Last<readonly [string]>;
+type R23 = Last<readonly [number, symbol, ...string[]]>;
+type R24 = Last<readonly [symbol, ...string[]]>;
+type R25 = Last<readonly string[]>;
+type R26 = Last<readonly []>;
+type R30 = DropLast<readonly [number, symbol, string]>;
+type R31 = DropLast<readonly [symbol, string]>;
+type R32 = DropLast<readonly [string]>;
+type R33 = DropLast<readonly [number, symbol, ...string[]]>;
+type R34 = DropLast<readonly [symbol, ...string[]]>;
+type R35 = DropLast<readonly string[]>;
+type R36 = DropLast<readonly []>;
 declare function curry<T extends unknown[], U extends unknown[], R>(f: (...args: [...T, ...U]) => R, ...a: T): (...b: U) => R;
 declare const fn1: (a: number, b: string, c: boolean, d: string[]) => number;
 declare const c0: (a: number, b: string, c: boolean, d: string[]) => number;
@@ -788,9 +788,9 @@ declare function getOrgUser(id: string, orgId: number, options?: {
     z?: boolean;
 }): void;
 declare function callApi<T extends unknown[] = [], U = void>(method: (...args: [...T, object]) => U): (...args_0: T) => U;
-declare type Numbers = number[];
-declare type Unbounded = [...Numbers, boolean];
+type Numbers = number[];
+type Unbounded = [...Numbers, boolean];
 declare const data: Unbounded;
-declare type U1 = [string, ...Numbers, boolean];
-declare type U2 = [...[string, ...Numbers], boolean];
-declare type U3 = [...[string, number], boolean];
+type U1 = [string, ...Numbers, boolean];
+type U2 = [...[string, ...Numbers], boolean];
+type U3 = [...[string, number], boolean];
diff --git a/tests/baselines/reference/variadicTuples2.js b/tests/baselines/reference/variadicTuples2.js
index e84d0bb3d85df..db69874f71de0 100644
--- a/tests/baselines/reference/variadicTuples2.js
+++ b/tests/baselines/reference/variadicTuples2.js
@@ -229,30 +229,30 @@ var e1 = foo('blah1', 'blah2', 1, 2, 3); // Error
 
 
 //// [variadicTuples2.d.ts]
-declare type V00 = [number, ...string[]];
-declare type V01 = [...string[], number];
-declare type V03 = [number, ...string[], number];
-declare type V10 = [number, ...string[], ...boolean[]];
-declare type V11 = [number, ...string[], boolean?];
-declare type V12 = [number, string?, boolean];
-declare type Tup3<T extends unknown[], U extends unknown[], V extends unknown[]> = [...T, ...U, ...V];
-declare type V20 = Tup3<[number], string[], [number]>;
-declare type V21 = Tup3<[number], [string?], [boolean]>;
-declare type V22 = Tup3<[number], string[], boolean[]>;
-declare type V23 = Tup3<[number], string[], [boolean?]>;
-declare type V24 = Tup3<[number], [boolean?], string[]>;
-declare type V25 = Tup3<string[], number[], boolean[]>;
-declare type V26 = Tup3<string[], number[], [boolean]>;
-declare type V27 = Tup3<[number?], [string], [boolean?]>;
-declare type V30<A extends unknown[]> = Tup3<A, string[], number[]>;
-declare type V31<A extends unknown[]> = Tup3<string[], A, number[]>;
-declare type V32<A extends unknown[]> = Tup3<string[], number[], A>;
-declare type V40<A extends unknown[]> = Tup3<A, [string?], number[]>;
-declare type V41<A extends unknown[]> = Tup3<[string?], A, number[]>;
-declare type V42<A extends unknown[]> = Tup3<[string?], number[], A>;
-declare type V50<A extends unknown[]> = Tup3<A, string[], [number?]>;
-declare type V51<A extends unknown[]> = Tup3<string[], A, [number?]>;
-declare type V52<A extends unknown[]> = Tup3<string[], [number?], A>;
+type V00 = [number, ...string[]];
+type V01 = [...string[], number];
+type V03 = [number, ...string[], number];
+type V10 = [number, ...string[], ...boolean[]];
+type V11 = [number, ...string[], boolean?];
+type V12 = [number, string?, boolean];
+type Tup3<T extends unknown[], U extends unknown[], V extends unknown[]> = [...T, ...U, ...V];
+type V20 = Tup3<[number], string[], [number]>;
+type V21 = Tup3<[number], [string?], [boolean]>;
+type V22 = Tup3<[number], string[], boolean[]>;
+type V23 = Tup3<[number], string[], [boolean?]>;
+type V24 = Tup3<[number], [boolean?], string[]>;
+type V25 = Tup3<string[], number[], boolean[]>;
+type V26 = Tup3<string[], number[], [boolean]>;
+type V27 = Tup3<[number?], [string], [boolean?]>;
+type V30<A extends unknown[]> = Tup3<A, string[], number[]>;
+type V31<A extends unknown[]> = Tup3<string[], A, number[]>;
+type V32<A extends unknown[]> = Tup3<string[], number[], A>;
+type V40<A extends unknown[]> = Tup3<A, [string?], number[]>;
+type V41<A extends unknown[]> = Tup3<[string?], A, number[]>;
+type V42<A extends unknown[]> = Tup3<[string?], number[], A>;
+type V50<A extends unknown[]> = Tup3<A, string[], [number?]>;
+type V51<A extends unknown[]> = Tup3<string[], A, [number?]>;
+type V52<A extends unknown[]> = Tup3<string[], [number?], A>;
 declare let tt1: [...string[], number];
 declare function ft1(...args: [...strs: string[], num: number]): void;
 declare let tt2: [number, ...string[], number];
diff --git a/tests/baselines/reference/varianceAnnotations.js b/tests/baselines/reference/varianceAnnotations.js
index aaecab6ac6803..d649b6c236181 100644
--- a/tests/baselines/reference/varianceAnnotations.js
+++ b/tests/baselines/reference/varianceAnnotations.js
@@ -220,66 +220,66 @@ var OuterC = /** @class */ (function () {
 
 
 //// [varianceAnnotations.d.ts]
-declare type Covariant<out T> = {
+type Covariant<out T> = {
     x: T;
 };
 declare let super_covariant: Covariant<unknown>;
 declare let sub_covariant: Covariant<string>;
-declare type Contravariant<in T> = {
+type Contravariant<in T> = {
     f: (x: T) => void;
 };
 declare let super_contravariant: Contravariant<unknown>;
 declare let sub_contravariant: Contravariant<string>;
-declare type Invariant<in out T> = {
+type Invariant<in out T> = {
     f: (x: T) => T;
 };
 declare let super_invariant: Invariant<unknown>;
 declare let sub_invariant: Invariant<string>;
-declare type T10<out T> = T;
-declare type T11<in T> = keyof T;
-declare type T12<out T, out K extends keyof T> = T[K];
-declare type T13<in out T> = T[keyof T];
-declare type Covariant1<in T> = {
+type T10<out T> = T;
+type T11<in T> = keyof T;
+type T12<out T, out K extends keyof T> = T[K];
+type T13<in out T> = T[keyof T];
+type Covariant1<in T> = {
     x: T;
 };
-declare type Contravariant1<out T> = keyof T;
-declare type Contravariant2<out T> = {
+type Contravariant1<out T> = keyof T;
+type Contravariant2<out T> = {
     f: (x: T) => void;
 };
-declare type Invariant1<in T> = {
+type Invariant1<in T> = {
     f: (x: T) => T;
 };
-declare type Invariant2<out T> = {
+type Invariant2<out T> = {
     f: (x: T) => T;
 };
-declare type Foo1<in T> = {
+type Foo1<in T> = {
     x: T;
     f: FooFn1<T>;
 };
-declare type FooFn1<T> = (foo: Bar1<T[]>) => void;
-declare type Bar1<T> = {
+type FooFn1<T> = (foo: Bar1<T[]>) => void;
+type Bar1<T> = {
     value: Foo1<T[]>;
 };
-declare type Foo2<out T> = {
+type Foo2<out T> = {
     x: T;
     f: FooFn2<T>;
 };
-declare type FooFn2<T> = (foo: Bar2<T[]>) => void;
-declare type Bar2<T> = {
+type FooFn2<T> = (foo: Bar2<T[]>) => void;
+type Bar2<T> = {
     value: Foo2<T[]>;
 };
-declare type Foo3<in out T> = {
+type Foo3<in out T> = {
     x: T;
     f: FooFn3<T>;
 };
-declare type FooFn3<T> = (foo: Bar3<T[]>) => void;
-declare type Bar3<T> = {
+type FooFn3<T> = (foo: Bar3<T[]>) => void;
+type Bar3<T> = {
     value: Foo3<T[]>;
 };
-declare type T20<public T> = T;
-declare type T21<in out in T> = T;
-declare type T22<in out out T> = T;
-declare type T23<out in T> = T;
+type T20<public T> = T;
+type T21<in out in T> = T;
+type T22<in out out T> = T;
+type T23<out in T> = T;
 declare function f1<in T>(x: T): void;
 declare function f2<out T>(): T;
 declare class C {
diff --git a/tests/baselines/reference/varianceAnnotationsWithCircularlyReferencesError.js b/tests/baselines/reference/varianceAnnotationsWithCircularlyReferencesError.js
index 8f2cc8a9c387e..9d6672ef47dde 100644
--- a/tests/baselines/reference/varianceAnnotationsWithCircularlyReferencesError.js
+++ b/tests/baselines/reference/varianceAnnotationsWithCircularlyReferencesError.js
@@ -7,5 +7,5 @@ type T2<out out> = T2 // Error: circularly references
 
 
 //// [varianceAnnotationsWithCircularlyReferencesError.d.ts]
-declare type T1<in , > = T1;
-declare type T2<out out> = T2;
+type T1<in , > = T1;
+type T2<out out> = T2;

From 2513a2d98c4d68207d1396784a51c3303eeb8230 Mon Sep 17 00:00:00 2001
From: Andrew Casey <amcasey@users.noreply.github.com>
Date: Tue, 9 Aug 2022 16:47:07 -0700
Subject: [PATCH 17/18] Use binary search in file system cache (#50163)

* Use binary search in file system cache

Previously, we were linear searching a linear number of times, resulting in too many `toLowerCaseFileName` calls on Windows.

* Use SortedArray types for clarity

* Use insertSorted after making it return a flat

* Drop redundant undefined

* Correct copy-paste error
---
 src/compiler/core.ts           | 11 +++--
 src/compiler/watchUtilities.ts | 79 +++++++++++++++++++++++-----------
 2 files changed, 62 insertions(+), 28 deletions(-)

diff --git a/src/compiler/core.ts b/src/compiler/core.ts
index 51452b173a0a1..0aa901fdab19b 100644
--- a/src/compiler/core.ts
+++ b/src/compiler/core.ts
@@ -778,19 +778,24 @@ namespace ts {
         return [] as any as SortedArray<T>; // TODO: GH#19873
     }
 
-    export function insertSorted<T>(array: SortedArray<T>, insert: T, compare: Comparer<T>, allowDuplicates?: boolean): void {
+    export function insertSorted<T>(array: SortedArray<T>, insert: T, compare: Comparer<T>, allowDuplicates?: boolean): boolean {
         if (array.length === 0) {
             array.push(insert);
-            return;
+            return true;
         }
 
         const insertIndex = binarySearch(array, insert, identity, compare);
         if (insertIndex < 0) {
             array.splice(~insertIndex, 0, insert);
+            return true;
         }
-        else if (allowDuplicates) {
+
+        if (allowDuplicates) {
             array.splice(insertIndex, 0, insert);
+            return true;
         }
+
+        return false;
     }
 
     export function sortAndDeduplicate<T>(array: readonly string[]): SortedReadonlyArray<string>;
diff --git a/src/compiler/watchUtilities.ts b/src/compiler/watchUtilities.ts
index e2fba1da6575d..e8c21aa8f63c9 100644
--- a/src/compiler/watchUtilities.ts
+++ b/src/compiler/watchUtilities.ts
@@ -34,9 +34,20 @@ namespace ts {
         clearCache(): void;
     }
 
+    type Canonicalized = string & { __canonicalized: void };
+
     interface MutableFileSystemEntries {
         readonly files: string[];
         readonly directories: string[];
+        sortedAndCanonicalizedFiles?: SortedArray<Canonicalized>
+        sortedAndCanonicalizedDirectories?: SortedArray<Canonicalized>
+    }
+
+    interface SortedAndCanonicalizedMutableFileSystemEntries {
+        readonly files: string[];
+        readonly directories: string[];
+        readonly sortedAndCanonicalizedFiles: SortedArray<Canonicalized>
+        readonly sortedAndCanonicalizedDirectories: SortedArray<Canonicalized>
     }
 
     export function createCachedDirectoryStructureHost(host: DirectoryStructureHost, currentDirectory: string, useCaseSensitiveFileNames: boolean): CachedDirectoryStructureHost | undefined {
@@ -45,7 +56,7 @@ namespace ts {
         }
 
         const cachedReadDirectoryResult = new Map<string, MutableFileSystemEntries | false>();
-        const getCanonicalFileName = createGetCanonicalFileName(useCaseSensitiveFileNames);
+        const getCanonicalFileName = createGetCanonicalFileName(useCaseSensitiveFileNames) as ((name: string) => Canonicalized);
         return {
             useCaseSensitiveFileNames,
             fileExists,
@@ -70,7 +81,17 @@ namespace ts {
         }
 
         function getCachedFileSystemEntriesForBaseDir(path: Path) {
-            return getCachedFileSystemEntries(getDirectoryPath(path));
+            const entries = getCachedFileSystemEntries(getDirectoryPath(path));
+            if (!entries) {
+                return entries;
+            }
+
+            // If we're looking for the base directory, we're definitely going to search the entries
+            if (!entries.sortedAndCanonicalizedFiles) {
+                entries.sortedAndCanonicalizedFiles = entries.files.map(getCanonicalFileName).sort() as SortedArray<Canonicalized>;
+                entries.sortedAndCanonicalizedDirectories = entries.directories.map(getCanonicalFileName).sort() as SortedArray<Canonicalized>;
+            }
+            return entries as SortedAndCanonicalizedMutableFileSystemEntries;
         }
 
         function getBaseNameOfFileName(fileName: string) {
@@ -120,23 +141,10 @@ namespace ts {
             }
         }
 
-        function fileNameEqual(name1: string, name2: string) {
-            return getCanonicalFileName(name1) === getCanonicalFileName(name2);
-        }
-
-        function hasEntry(entries: readonly string[], name: string) {
-            return some(entries, file => fileNameEqual(file, name));
-        }
-
-        function updateFileSystemEntry(entries: string[], baseName: string, isValid: boolean) {
-            if (hasEntry(entries, baseName)) {
-                if (!isValid) {
-                    return filterMutate(entries, entry => !fileNameEqual(entry, baseName));
-                }
-            }
-            else if (isValid) {
-                return entries.push(baseName);
-            }
+        function hasEntry(entries: SortedReadonlyArray<Canonicalized>, name: Canonicalized) {
+            // Case-sensitive comparison since already canonicalized
+            const index = binarySearch(entries, name, identity, compareStringsCaseSensitive);
+            return index >= 0;
         }
 
         function writeFile(fileName: string, data: string, writeByteOrderMark?: boolean): void {
@@ -151,7 +159,7 @@ namespace ts {
         function fileExists(fileName: string): boolean {
             const path = toPath(fileName);
             const result = getCachedFileSystemEntriesForBaseDir(path);
-            return result && hasEntry(result.files, getBaseNameOfFileName(fileName)) ||
+            return result && hasEntry(result.sortedAndCanonicalizedFiles, getCanonicalFileName(getBaseNameOfFileName(fileName))) ||
                 host.fileExists(fileName);
         }
 
@@ -163,9 +171,14 @@ namespace ts {
         function createDirectory(dirPath: string) {
             const path = toPath(dirPath);
             const result = getCachedFileSystemEntriesForBaseDir(path);
-            const baseFileName = getBaseNameOfFileName(dirPath);
             if (result) {
-                updateFileSystemEntry(result.directories, baseFileName, /*isValid*/ true);
+                const baseName = getBaseNameOfFileName(dirPath);
+                const canonicalizedBaseName = getCanonicalFileName(baseName);
+                const canonicalizedDirectories = result.sortedAndCanonicalizedDirectories;
+                // Case-sensitive comparison since already canonicalized
+                if (insertSorted(canonicalizedDirectories, canonicalizedBaseName, compareStringsCaseSensitive)) {
+                    result.directories.push(baseName);
+                }
             }
             host.createDirectory!(dirPath);
         }
@@ -242,7 +255,7 @@ namespace ts {
                 fileExists: host.fileExists(fileOrDirectoryPath),
                 directoryExists: host.directoryExists(fileOrDirectoryPath)
             };
-            if (fsQueryResult.directoryExists || hasEntry(parentResult.directories, baseName)) {
+            if (fsQueryResult.directoryExists || hasEntry(parentResult.sortedAndCanonicalizedDirectories, getCanonicalFileName(baseName))) {
                 // Folder added or removed, clear the cache instead of updating the folder and its structure
                 clearCache();
             }
@@ -265,8 +278,24 @@ namespace ts {
             }
         }
 
-        function updateFilesOfFileSystemEntry(parentResult: MutableFileSystemEntries, baseName: string, fileExists: boolean) {
-            updateFileSystemEntry(parentResult.files, baseName, fileExists);
+        function updateFilesOfFileSystemEntry(parentResult: SortedAndCanonicalizedMutableFileSystemEntries, baseName: string, fileExists: boolean): void {
+            const canonicalizedFiles = parentResult.sortedAndCanonicalizedFiles;
+            const canonicalizedBaseName = getCanonicalFileName(baseName);
+            if (fileExists) {
+                // Case-sensitive comparison since already canonicalized
+                if (insertSorted(canonicalizedFiles, canonicalizedBaseName, compareStringsCaseSensitive)) {
+                    parentResult.files.push(baseName);
+                }
+            }
+            else {
+                // Case-sensitive comparison since already canonicalized
+                const sortedIndex = binarySearch(canonicalizedFiles, canonicalizedBaseName, identity, compareStringsCaseSensitive);
+                if (sortedIndex >= 0) {
+                    canonicalizedFiles.splice(sortedIndex, 1);
+                    const unsortedIndex = parentResult.files.findIndex(entry => getCanonicalFileName(entry) === canonicalizedBaseName);
+                    parentResult.files.splice(unsortedIndex, 1);
+                }
+            }
         }
 
         function clearCache() {

From 35c6fbfee06c09493d9a7e0016a45bd3204cc5f8 Mon Sep 17 00:00:00 2001
From: Jack Bates <jack@nottheoilrig.com>
Date: Tue, 9 Aug 2022 17:03:30 -0700
Subject: [PATCH 18/18] JSDoc @type tag optional parameters (#48132)

* JSDoc @type tag optional parameters

* Don't repeat isInJSFile() condition

* Exclude variable initializers

* Add tests for class methods

* Don't contextually type JS function declarations

* Update Baselines and/or Applied Lint Fixes

* Reword comment

Co-authored-by: TypeScript Bot <typescriptbot@microsoft.com>
---
 src/compiler/checker.ts                       | 22 ++---
 .../reference/checkJsdocTypeTag5.types        |  4 +-
 .../reference/checkJsdocTypeTag6.errors.txt   | 31 ++++++-
 .../reference/checkJsdocTypeTag6.symbols      | 26 ++++++
 .../reference/checkJsdocTypeTag6.types        | 35 +++++++-
 .../reference/checkJsdocTypeTag7.symbols      |  4 +
 .../reference/checkJsdocTypeTag7.types        |  4 +
 .../jsDocDontBreakWithNamespaces.baseline     | 81 ++++++++++++++++---
 .../jsdocTypeTagRequiredParameters.errors.txt |  4 +-
 .../typeTagWithGenericSignature.types         |  4 +-
 .../conformance/jsdoc/checkJsdocTypeTag6.ts   | 17 ++++
 .../conformance/jsdoc/checkJsdocTypeTag7.ts   |  3 +
 12 files changed, 208 insertions(+), 27 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 701747ce8de2c..f95addbaddae8 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -9065,10 +9065,8 @@ namespace ts {
                         return getReturnTypeOfSignature(getterSignature);
                     }
                 }
-                if (isInJSFile(declaration)) {
-                    const type = getParameterTypeOfTypeTag(func, declaration);
-                    if (type) return type;
-                }
+                const parameterTypeOfTypeTag = getParameterTypeOfTypeTag(func, declaration);
+                if (parameterTypeOfTypeTag) return parameterTypeOfTypeTag;
                 // Use contextual parameter type if one is available
                 const type = declaration.symbol.escapedName === InternalSymbolName.This ? getContextualThisParameterType(func) : getContextuallyTypedParameterType(declaration);
                 if (type) {
@@ -13117,7 +13115,14 @@ namespace ts {
                         continue;
                     }
                 }
-                result.push(getSignatureFromDeclaration(decl));
+                // If this is a function or method declaration, get the signature from the @type tag for the sake of optional parameters.
+                // Exclude contextually-typed kinds because we already apply the @type tag to the context, plus applying it here to the initializer would supress checks that the two are compatible.
+                result.push(
+                    (!isFunctionExpressionOrArrowFunction(decl) &&
+                        !isObjectLiteralMethod(decl) &&
+                        getSignatureOfTypeTag(decl)) ||
+                        getSignatureFromDeclaration(decl)
+                );
             }
             return result;
         }
@@ -13152,7 +13157,7 @@ namespace ts {
                 else {
                     const type = signature.declaration && getEffectiveReturnTypeNode(signature.declaration);
                     let jsdocPredicate: TypePredicate | undefined;
-                    if (!type && isInJSFile(signature.declaration)) {
+                    if (!type) {
                         const jsdocSignature = getSignatureOfTypeTag(signature.declaration!);
                         if (jsdocSignature && signature !== jsdocSignature) {
                             jsdocPredicate = getTypePredicateOfSignature(jsdocSignature);
@@ -17470,8 +17475,7 @@ namespace ts {
         }
 
         function isContextSensitiveFunctionLikeDeclaration(node: FunctionLikeDeclaration): boolean {
-            return (!isFunctionDeclaration(node) || isInJSFile(node) && !!getTypeForDeclarationFromJSDocComment(node)) &&
-                (hasContextSensitiveParameters(node) || hasContextSensitiveReturnExpression(node));
+            return hasContextSensitiveParameters(node) || hasContextSensitiveReturnExpression(node);
         }
 
         function hasContextSensitiveReturnExpression(node: FunctionLikeDeclaration) {
@@ -17480,7 +17484,7 @@ namespace ts {
         }
 
         function isContextSensitiveFunctionOrObjectLiteralMethod(func: Node): func is FunctionExpression | ArrowFunction | MethodDeclaration {
-            return (isInJSFile(func) && isFunctionDeclaration(func) || isFunctionExpressionOrArrowFunction(func) || isObjectLiteralMethod(func)) &&
+            return (isFunctionExpressionOrArrowFunction(func) || isObjectLiteralMethod(func)) &&
                 isContextSensitiveFunctionLikeDeclaration(func);
         }
 
diff --git a/tests/baselines/reference/checkJsdocTypeTag5.types b/tests/baselines/reference/checkJsdocTypeTag5.types
index 816f86a80a66c..c2dca1475daa3 100644
--- a/tests/baselines/reference/checkJsdocTypeTag5.types
+++ b/tests/baselines/reference/checkJsdocTypeTag5.types
@@ -44,7 +44,7 @@ var k = function (x) { return x }
 /** @typedef {(x: 'hi' | 'bye') => 0 | 1 | 2} Argle */
 /** @type {Argle} */
 function blargle(s) {
->blargle : (s: "hi" | "bye") => 0 | 1 | 2
+>blargle : (x: 'hi' | 'bye') => 0 | 1 | 2
 >s : "hi" | "bye"
 
     return 0;
@@ -55,7 +55,7 @@ function blargle(s) {
 var zeroonetwo = blargle('hi')
 >zeroonetwo : 0 | 1 | 2
 >blargle('hi') : 0 | 1 | 2
->blargle : (s: "hi" | "bye") => 0 | 1 | 2
+>blargle : (x: "hi" | "bye") => 0 | 1 | 2
 >'hi' : "hi"
 
 /** @typedef {{(s: string): 0 | 1; (b: boolean): 2 | 3 }} Gioconda */
diff --git a/tests/baselines/reference/checkJsdocTypeTag6.errors.txt b/tests/baselines/reference/checkJsdocTypeTag6.errors.txt
index 1106e60da7502..605ddad823a4f 100644
--- a/tests/baselines/reference/checkJsdocTypeTag6.errors.txt
+++ b/tests/baselines/reference/checkJsdocTypeTag6.errors.txt
@@ -1,9 +1,13 @@
 tests/cases/conformance/jsdoc/test.js(1,12): error TS8030: The type of a function declaration must match the function's signature.
 tests/cases/conformance/jsdoc/test.js(7,5): error TS2322: Type '(prop: any) => void' is not assignable to type '{ prop: string; }'.
 tests/cases/conformance/jsdoc/test.js(10,12): error TS8030: The type of a function declaration must match the function's signature.
+tests/cases/conformance/jsdoc/test.js(23,12): error TS8030: The type of a function declaration must match the function's signature.
+tests/cases/conformance/jsdoc/test.js(27,7): error TS2322: Type '(more: any) => void' is not assignable to type '() => void'.
+tests/cases/conformance/jsdoc/test.js(30,7): error TS2322: Type '(more: any) => void' is not assignable to type '() => void'.
+tests/cases/conformance/jsdoc/test.js(34,3): error TS2322: Type '(more: any) => void' is not assignable to type '() => void'.
 
 
-==== tests/cases/conformance/jsdoc/test.js (3 errors) ====
+==== tests/cases/conformance/jsdoc/test.js (7 errors) ====
     /** @type {number} */
                ~~~~~~
 !!! error TS8030: The type of a function declaration must match the function's signature.
@@ -28,4 +32,29 @@ tests/cases/conformance/jsdoc/test.js(10,12): error TS8030: The type of a functi
     // TODO: Should be an error since signature doesn't match.
     /** @type {(a: number, b: number, c: number) => number} */
     function add3(a, b) { return a + b; }
+    
+    // Confirm initializers are compatible.
+    // They can't have more parameters than the type/context.
+    
+    /** @type {() => void} */
+               ~~~~~~~~~~
+!!! error TS8030: The type of a function declaration must match the function's signature.
+    function funcWithMoreParameters(more) {} // error
+    
+    /** @type {() => void} */
+    const variableWithMoreParameters = function (more) {}; // error
+          ~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2322: Type '(more: any) => void' is not assignable to type '() => void'.
+    
+    /** @type {() => void} */
+    const arrowWithMoreParameters = (more) => {}; // error
+          ~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2322: Type '(more: any) => void' is not assignable to type '() => void'.
+    
+    ({
+      /** @type {() => void} */
+      methodWithMoreParameters(more) {}, // error
+      ~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2322: Type '(more: any) => void' is not assignable to type '() => void'.
+    });
     
\ No newline at end of file
diff --git a/tests/baselines/reference/checkJsdocTypeTag6.symbols b/tests/baselines/reference/checkJsdocTypeTag6.symbols
index b7ddd9f289b4e..e87b49f2a1d82 100644
--- a/tests/baselines/reference/checkJsdocTypeTag6.symbols
+++ b/tests/baselines/reference/checkJsdocTypeTag6.symbols
@@ -37,3 +37,29 @@ function add3(a, b) { return a + b; }
 >a : Symbol(a, Decl(test.js, 17, 14))
 >b : Symbol(b, Decl(test.js, 17, 16))
 
+// Confirm initializers are compatible.
+// They can't have more parameters than the type/context.
+
+/** @type {() => void} */
+function funcWithMoreParameters(more) {} // error
+>funcWithMoreParameters : Symbol(funcWithMoreParameters, Decl(test.js, 17, 37))
+>more : Symbol(more, Decl(test.js, 23, 32))
+
+/** @type {() => void} */
+const variableWithMoreParameters = function (more) {}; // error
+>variableWithMoreParameters : Symbol(variableWithMoreParameters, Decl(test.js, 26, 5))
+>more : Symbol(more, Decl(test.js, 26, 45))
+
+/** @type {() => void} */
+const arrowWithMoreParameters = (more) => {}; // error
+>arrowWithMoreParameters : Symbol(arrowWithMoreParameters, Decl(test.js, 29, 5))
+>more : Symbol(more, Decl(test.js, 29, 33))
+
+({
+  /** @type {() => void} */
+  methodWithMoreParameters(more) {}, // error
+>methodWithMoreParameters : Symbol(methodWithMoreParameters, Decl(test.js, 31, 2))
+>more : Symbol(more, Decl(test.js, 33, 27))
+
+});
+
diff --git a/tests/baselines/reference/checkJsdocTypeTag6.types b/tests/baselines/reference/checkJsdocTypeTag6.types
index 16f22e1332b9f..3feb2222e292b 100644
--- a/tests/baselines/reference/checkJsdocTypeTag6.types
+++ b/tests/baselines/reference/checkJsdocTypeTag6.types
@@ -16,7 +16,7 @@ var g = function (prop) {
 
 /** @type {(a: number) => number} */
 function add1(a, b) { return a + b; }
->add1 : (a: number, b: any) => number
+>add1 : (a: number) => number
 >a : number
 >b : any
 >a + b : any
@@ -35,10 +35,41 @@ function add2(a, b) { return a + b; }
 // TODO: Should be an error since signature doesn't match.
 /** @type {(a: number, b: number, c: number) => number} */
 function add3(a, b) { return a + b; }
->add3 : (a: number, b: number) => number
+>add3 : (a: number, b: number, c: number) => number
 >a : number
 >b : number
 >a + b : number
 >a : number
 >b : number
 
+// Confirm initializers are compatible.
+// They can't have more parameters than the type/context.
+
+/** @type {() => void} */
+function funcWithMoreParameters(more) {} // error
+>funcWithMoreParameters : () => void
+>more : any
+
+/** @type {() => void} */
+const variableWithMoreParameters = function (more) {}; // error
+>variableWithMoreParameters : () => void
+>function (more) {} : (more: any) => void
+>more : any
+
+/** @type {() => void} */
+const arrowWithMoreParameters = (more) => {}; // error
+>arrowWithMoreParameters : () => void
+>(more) => {} : (more: any) => void
+>more : any
+
+({
+>({  /** @type {() => void} */  methodWithMoreParameters(more) {}, // error}) : { methodWithMoreParameters(): void; }
+>{  /** @type {() => void} */  methodWithMoreParameters(more) {}, // error} : { methodWithMoreParameters(): void; }
+
+  /** @type {() => void} */
+  methodWithMoreParameters(more) {}, // error
+>methodWithMoreParameters : (more: any) => void
+>more : any
+
+});
+
diff --git a/tests/baselines/reference/checkJsdocTypeTag7.symbols b/tests/baselines/reference/checkJsdocTypeTag7.symbols
index 7013bb921a5a9..50b91e0984572 100644
--- a/tests/baselines/reference/checkJsdocTypeTag7.symbols
+++ b/tests/baselines/reference/checkJsdocTypeTag7.symbols
@@ -11,5 +11,9 @@ class C {
 >foo : Symbol(C.foo, Decl(test.js, 4, 9))
 >a : Symbol(a, Decl(test.js, 6, 8))
 >b : Symbol(b, Decl(test.js, 6, 10))
+
+    /** @type {(optional?) => void} */
+    methodWithOptionalParameters() {}
+>methodWithOptionalParameters : Symbol(C.methodWithOptionalParameters, Decl(test.js, 6, 16))
 }
 
diff --git a/tests/baselines/reference/checkJsdocTypeTag7.types b/tests/baselines/reference/checkJsdocTypeTag7.types
index f4aac580feefa..990535c17e45f 100644
--- a/tests/baselines/reference/checkJsdocTypeTag7.types
+++ b/tests/baselines/reference/checkJsdocTypeTag7.types
@@ -11,5 +11,9 @@ class C {
 >foo : (a: string, b: number) => void
 >a : string
 >b : number
+
+    /** @type {(optional?) => void} */
+    methodWithOptionalParameters() {}
+>methodWithOptionalParameters : (optional?: any) => void
 }
 
diff --git a/tests/baselines/reference/jsDocDontBreakWithNamespaces.baseline b/tests/baselines/reference/jsDocDontBreakWithNamespaces.baseline
index 3618b914c58c3..df5d7365580d6 100644
--- a/tests/baselines/reference/jsDocDontBreakWithNamespaces.baseline
+++ b/tests/baselines/reference/jsDocDontBreakWithNamespaces.baseline
@@ -181,19 +181,82 @@
               "kind": "space"
             }
           ],
-          "parameters": [],
-          "documentation": [],
-          "tags": [
+          "parameters": [
             {
-              "name": "type",
-              "text": [
+              "name": "arg0",
+              "documentation": [],
+              "displayParts": [
                 {
-                  "text": "{function(module:xxxx, module:xxxx): module:xxxxx}",
-                  "kind": "text"
+                  "text": "arg0",
+                  "kind": "parameterName"
+                },
+                {
+                  "text": ":",
+                  "kind": "punctuation"
+                },
+                {
+                  "text": " ",
+                  "kind": "space"
+                },
+                {
+                  "text": "any",
+                  "kind": "keyword"
                 }
-              ]
+              ],
+              "isOptional": false,
+              "isRest": false
+            },
+            {
+              "name": "arg1",
+              "documentation": [],
+              "displayParts": [
+                {
+                  "text": "arg1",
+                  "kind": "parameterName"
+                },
+                {
+                  "text": ":",
+                  "kind": "punctuation"
+                },
+                {
+                  "text": " ",
+                  "kind": "space"
+                },
+                {
+                  "text": "any",
+                  "kind": "keyword"
+                }
+              ],
+              "isOptional": false,
+              "isRest": false
+            },
+            {
+              "name": "arg2",
+              "documentation": [],
+              "displayParts": [
+                {
+                  "text": "arg2",
+                  "kind": "parameterName"
+                },
+                {
+                  "text": ":",
+                  "kind": "punctuation"
+                },
+                {
+                  "text": " ",
+                  "kind": "space"
+                },
+                {
+                  "text": "any",
+                  "kind": "keyword"
+                }
+              ],
+              "isOptional": false,
+              "isRest": false
             }
-          ]
+          ],
+          "documentation": [],
+          "tags": []
         }
       ],
       "applicableSpan": {
diff --git a/tests/baselines/reference/jsdocTypeTagRequiredParameters.errors.txt b/tests/baselines/reference/jsdocTypeTagRequiredParameters.errors.txt
index 3658797f87f02..22379631294b8 100644
--- a/tests/baselines/reference/jsdocTypeTagRequiredParameters.errors.txt
+++ b/tests/baselines/reference/jsdocTypeTagRequiredParameters.errors.txt
@@ -21,9 +21,9 @@ tests/cases/conformance/jsdoc/a.js(13,1): error TS2554: Expected 1 arguments, bu
     g() // should error
     ~~~
 !!! error TS2554: Expected 1 arguments, but got 0.
-!!! related TS6210 tests/cases/conformance/jsdoc/a.js:5:12: An argument for 's' was not provided.
+!!! related TS6210 tests/cases/conformance/jsdoc/a.js:4:13: An argument for 's' was not provided.
     h()
     ~~~
 !!! error TS2554: Expected 1 arguments, but got 0.
-!!! related TS6210 tests/cases/conformance/jsdoc/a.js:8:12: An argument for 's' was not provided.
+!!! related TS6210 tests/cases/conformance/jsdoc/a.js:7:14: An argument for 's' was not provided.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/typeTagWithGenericSignature.types b/tests/baselines/reference/typeTagWithGenericSignature.types
index 585fd49fbf48b..a5b92a7db8650 100644
--- a/tests/baselines/reference/typeTagWithGenericSignature.types
+++ b/tests/baselines/reference/typeTagWithGenericSignature.types
@@ -1,7 +1,7 @@
 === tests/cases/conformance/jsdoc/bug25618.js ===
 /** @type {<T>(param?: T) => T | undefined} */
 function typed(param) {
->typed : <T>(param: T | undefined) => T | undefined
+>typed : <T>(param?: T | undefined) => T | undefined
 >param : T | undefined
 
     return param;
@@ -11,7 +11,7 @@ function typed(param) {
 var n = typed(1);
 >n : number | undefined
 >typed(1) : 1 | undefined
->typed : <T>(param: T | undefined) => T | undefined
+>typed : <T>(param?: T | undefined) => T | undefined
 >1 : 1
 
 
diff --git a/tests/cases/conformance/jsdoc/checkJsdocTypeTag6.ts b/tests/cases/conformance/jsdoc/checkJsdocTypeTag6.ts
index 5f629d42b3b58..73b387c203e7e 100644
--- a/tests/cases/conformance/jsdoc/checkJsdocTypeTag6.ts
+++ b/tests/cases/conformance/jsdoc/checkJsdocTypeTag6.ts
@@ -21,3 +21,20 @@ function add2(a, b) { return a + b; }
 // TODO: Should be an error since signature doesn't match.
 /** @type {(a: number, b: number, c: number) => number} */
 function add3(a, b) { return a + b; }
+
+// Confirm initializers are compatible.
+// They can't have more parameters than the type/context.
+
+/** @type {() => void} */
+function funcWithMoreParameters(more) {} // error
+
+/** @type {() => void} */
+const variableWithMoreParameters = function (more) {}; // error
+
+/** @type {() => void} */
+const arrowWithMoreParameters = (more) => {}; // error
+
+({
+  /** @type {() => void} */
+  methodWithMoreParameters(more) {}, // error
+});
diff --git a/tests/cases/conformance/jsdoc/checkJsdocTypeTag7.ts b/tests/cases/conformance/jsdoc/checkJsdocTypeTag7.ts
index c65b206a859b3..2981292ba7e58 100644
--- a/tests/cases/conformance/jsdoc/checkJsdocTypeTag7.ts
+++ b/tests/cases/conformance/jsdoc/checkJsdocTypeTag7.ts
@@ -10,4 +10,7 @@
 class C {
     /** @type {Foo} */
     foo(a, b) {}
+
+    /** @type {(optional?) => void} */
+    methodWithOptionalParameters() {}
 }