typescript 4.8.0-dev.20220601 → 4.8.0-dev.20220604

package/lib/typescriptServices.js

@@ -294,7 +294,7 @@ var ts;
     // 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
-    ts.version = ts.versionMajorMinor + ".0-dev.20220601";
+    ts.version = ts.versionMajorMinor + ".0-dev.20220604";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -5766,21 +5766,22 @@ var ts;
         TransformFlags[TransformFlags["ContainsDestructuringAssignment"] = 4096] = "ContainsDestructuringAssignment";
         // Markers
         // - Flags used to indicate that a subtree contains a specific transformation.
-        TransformFlags[TransformFlags["ContainsTypeScriptClassSyntax"] = 4096] = "ContainsTypeScriptClassSyntax";
-        TransformFlags[TransformFlags["ContainsLexicalThis"] = 8192] = "ContainsLexicalThis";
-        TransformFlags[TransformFlags["ContainsRestOrSpread"] = 16384] = "ContainsRestOrSpread";
-        TransformFlags[TransformFlags["ContainsObjectRestOrSpread"] = 32768] = "ContainsObjectRestOrSpread";
-        TransformFlags[TransformFlags["ContainsComputedPropertyName"] = 65536] = "ContainsComputedPropertyName";
-        TransformFlags[TransformFlags["ContainsBlockScopedBinding"] = 131072] = "ContainsBlockScopedBinding";
-        TransformFlags[TransformFlags["ContainsBindingPattern"] = 262144] = "ContainsBindingPattern";
-        TransformFlags[TransformFlags["ContainsYield"] = 524288] = "ContainsYield";
-        TransformFlags[TransformFlags["ContainsAwait"] = 1048576] = "ContainsAwait";
-        TransformFlags[TransformFlags["ContainsHoistedDeclarationOrCompletion"] = 2097152] = "ContainsHoistedDeclarationOrCompletion";
-        TransformFlags[TransformFlags["ContainsDynamicImport"] = 4194304] = "ContainsDynamicImport";
-        TransformFlags[TransformFlags["ContainsClassFields"] = 8388608] = "ContainsClassFields";
-        TransformFlags[TransformFlags["ContainsPossibleTopLevelAwait"] = 16777216] = "ContainsPossibleTopLevelAwait";
-        TransformFlags[TransformFlags["ContainsLexicalSuper"] = 33554432] = "ContainsLexicalSuper";
-        TransformFlags[TransformFlags["ContainsUpdateExpressionForIdentifier"] = 67108864] = "ContainsUpdateExpressionForIdentifier";
+        TransformFlags[TransformFlags["ContainsTypeScriptClassSyntax"] = 8192] = "ContainsTypeScriptClassSyntax";
+        TransformFlags[TransformFlags["ContainsLexicalThis"] = 16384] = "ContainsLexicalThis";
+        TransformFlags[TransformFlags["ContainsRestOrSpread"] = 32768] = "ContainsRestOrSpread";
+        TransformFlags[TransformFlags["ContainsObjectRestOrSpread"] = 65536] = "ContainsObjectRestOrSpread";
+        TransformFlags[TransformFlags["ContainsComputedPropertyName"] = 131072] = "ContainsComputedPropertyName";
+        TransformFlags[TransformFlags["ContainsBlockScopedBinding"] = 262144] = "ContainsBlockScopedBinding";
+        TransformFlags[TransformFlags["ContainsBindingPattern"] = 524288] = "ContainsBindingPattern";
+        TransformFlags[TransformFlags["ContainsYield"] = 1048576] = "ContainsYield";
+        TransformFlags[TransformFlags["ContainsAwait"] = 2097152] = "ContainsAwait";
+        TransformFlags[TransformFlags["ContainsHoistedDeclarationOrCompletion"] = 4194304] = "ContainsHoistedDeclarationOrCompletion";
+        TransformFlags[TransformFlags["ContainsDynamicImport"] = 8388608] = "ContainsDynamicImport";
+        TransformFlags[TransformFlags["ContainsClassFields"] = 16777216] = "ContainsClassFields";
+        TransformFlags[TransformFlags["ContainsDecorators"] = 33554432] = "ContainsDecorators";
+        TransformFlags[TransformFlags["ContainsPossibleTopLevelAwait"] = 67108864] = "ContainsPossibleTopLevelAwait";
+        TransformFlags[TransformFlags["ContainsLexicalSuper"] = 134217728] = "ContainsLexicalSuper";
+        TransformFlags[TransformFlags["ContainsUpdateExpressionForIdentifier"] = 268435456] = "ContainsUpdateExpressionForIdentifier";
         // Please leave this as 1 << 29.
         // It is the maximum bit we can set before we outgrow the size of a v8 small integer (SMI) on an x86 system.
         // It is a good reminder of how much room we have left
@@ -5806,24 +5807,24 @@ var ts;
         TransformFlags[TransformFlags["OuterExpressionExcludes"] = 536870912] = "OuterExpressionExcludes";
         TransformFlags[TransformFlags["PropertyAccessExcludes"] = 536870912] = "PropertyAccessExcludes";
         TransformFlags[TransformFlags["NodeExcludes"] = 536870912] = "NodeExcludes";
-        TransformFlags[TransformFlags["ArrowFunctionExcludes"] = 557748224] = "ArrowFunctionExcludes";
-        TransformFlags[TransformFlags["FunctionExcludes"] = 591310848] = "FunctionExcludes";
-        TransformFlags[TransformFlags["ConstructorExcludes"] = 591306752] = "ConstructorExcludes";
-        TransformFlags[TransformFlags["MethodOrAccessorExcludes"] = 574529536] = "MethodOrAccessorExcludes";
-        TransformFlags[TransformFlags["PropertyExcludes"] = 570433536] = "PropertyExcludes";
-        TransformFlags[TransformFlags["ClassExcludes"] = 536940544] = "ClassExcludes";
-        TransformFlags[TransformFlags["ModuleExcludes"] = 589443072] = "ModuleExcludes";
+        TransformFlags[TransformFlags["ArrowFunctionExcludes"] = 612179968] = "ArrowFunctionExcludes";
+        TransformFlags[TransformFlags["FunctionExcludes"] = 746414080] = "FunctionExcludes";
+        TransformFlags[TransformFlags["ConstructorExcludes"] = 746405888] = "ConstructorExcludes";
+        TransformFlags[TransformFlags["MethodOrAccessorExcludes"] = 679297024] = "MethodOrAccessorExcludes";
+        TransformFlags[TransformFlags["PropertyExcludes"] = 671105024] = "PropertyExcludes";
+        TransformFlags[TransformFlags["ClassExcludes"] = 537010176] = "ClassExcludes";
+        TransformFlags[TransformFlags["ModuleExcludes"] = 742678528] = "ModuleExcludes";
         TransformFlags[TransformFlags["TypeExcludes"] = -2] = "TypeExcludes";
-        TransformFlags[TransformFlags["ObjectLiteralExcludes"] = 536973312] = "ObjectLiteralExcludes";
-        TransformFlags[TransformFlags["ArrayLiteralOrCallOrNewExcludes"] = 536887296] = "ArrayLiteralOrCallOrNewExcludes";
-        TransformFlags[TransformFlags["VariableDeclarationListExcludes"] = 537165824] = "VariableDeclarationListExcludes";
+        TransformFlags[TransformFlags["ObjectLiteralExcludes"] = 537075712] = "ObjectLiteralExcludes";
+        TransformFlags[TransformFlags["ArrayLiteralOrCallOrNewExcludes"] = 536903680] = "ArrayLiteralOrCallOrNewExcludes";
+        TransformFlags[TransformFlags["VariableDeclarationListExcludes"] = 537460736] = "VariableDeclarationListExcludes";
         TransformFlags[TransformFlags["ParameterExcludes"] = 536870912] = "ParameterExcludes";
-        TransformFlags[TransformFlags["CatchClauseExcludes"] = 536903680] = "CatchClauseExcludes";
-        TransformFlags[TransformFlags["BindingPatternExcludes"] = 536887296] = "BindingPatternExcludes";
-        TransformFlags[TransformFlags["ContainsLexicalThisOrSuper"] = 33562624] = "ContainsLexicalThisOrSuper";
+        TransformFlags[TransformFlags["CatchClauseExcludes"] = 536936448] = "CatchClauseExcludes";
+        TransformFlags[TransformFlags["BindingPatternExcludes"] = 536903680] = "BindingPatternExcludes";
+        TransformFlags[TransformFlags["ContainsLexicalThisOrSuper"] = 134234112] = "ContainsLexicalThisOrSuper";
         // Propagating flags
         // - Bitmasks for flags that should propagate from a child
-        TransformFlags[TransformFlags["PropertyNamePropagatingFlags"] = 33562624] = "PropertyNamePropagatingFlags";
+        TransformFlags[TransformFlags["PropertyNamePropagatingFlags"] = 134234112] = "PropertyNamePropagatingFlags";
         // Masks
         // - Additional bitmasks
     })(TransformFlags = ts.TransformFlags || (ts.TransformFlags = {}));
@@ -8396,6 +8397,7 @@ var ts;
         Decorators_are_not_valid_here: diag(1206, ts.DiagnosticCategory.Error, "Decorators_are_not_valid_here_1206", "Decorators are not valid here."),
         Decorators_cannot_be_applied_to_multiple_get_Slashset_accessors_of_the_same_name: diag(1207, ts.DiagnosticCategory.Error, "Decorators_cannot_be_applied_to_multiple_get_Slashset_accessors_of_the_same_name_1207", "Decorators cannot be applied to multiple get/set accessors of the same name."),
         _0_cannot_be_compiled_under_isolatedModules_because_it_is_considered_a_global_script_file_Add_an_import_export_or_an_empty_export_statement_to_make_it_a_module: diag(1208, ts.DiagnosticCategory.Error, "_0_cannot_be_compiled_under_isolatedModules_because_it_is_considered_a_global_script_file_Add_an_imp_1208", "'{0}' cannot be compiled under '--isolatedModules' because it is considered a global script file. Add an import, export, or an empty 'export {}' statement to make it a module."),
+        Invalid_optional_chain_from_new_expression_Did_you_mean_to_call_0: diag(1209, ts.DiagnosticCategory.Error, "Invalid_optional_chain_from_new_expression_Did_you_mean_to_call_0_1209", "Invalid optional chain from new expression. Did you mean to call '{0}()'?"),
         Code_contained_in_a_class_is_evaluated_in_JavaScript_s_strict_mode_which_does_not_allow_this_use_of_0_For_more_information_see_https_Colon_Slash_Slashdeveloper_mozilla_org_Slashen_US_Slashdocs_SlashWeb_SlashJavaScript_SlashReference_SlashStrict_mode: diag(1210, ts.DiagnosticCategory.Error, "Code_contained_in_a_class_is_evaluated_in_JavaScript_s_strict_mode_which_does_not_allow_this_use_of__1210", "Code contained in a class is evaluated in JavaScript's strict mode which does not allow this use of '{0}'. For more information, see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Strict_mode."),
         A_class_declaration_without_the_default_modifier_must_have_a_name: diag(1211, ts.DiagnosticCategory.Error, "A_class_declaration_without_the_default_modifier_must_have_a_name_1211", "A class declaration without the 'default' modifier must have a name."),
         Identifier_expected_0_is_a_reserved_word_in_strict_mode: diag(1212, ts.DiagnosticCategory.Error, "Identifier_expected_0_is_a_reserved_word_in_strict_mode_1212", "Identifier expected. '{0}' is a reserved word in strict mode."),
@@ -8592,7 +8594,7 @@ var ts;
         Preserve_unused_imported_values_in_the_JavaScript_output_that_would_otherwise_be_removed: diag(1449, ts.DiagnosticCategory.Message, "Preserve_unused_imported_values_in_the_JavaScript_output_that_would_otherwise_be_removed_1449", "Preserve unused imported values in the JavaScript output that would otherwise be removed."),
         Dynamic_imports_can_only_accept_a_module_specifier_and_an_optional_assertion_as_arguments: diag(1450, ts.DiagnosticCategory.Message, "Dynamic_imports_can_only_accept_a_module_specifier_and_an_optional_assertion_as_arguments_1450", "Dynamic imports can only accept a module specifier and an optional assertion as arguments"),
         Private_identifiers_are_only_allowed_in_class_bodies_and_may_only_be_used_as_part_of_a_class_member_declaration_property_access_or_on_the_left_hand_side_of_an_in_expression: diag(1451, ts.DiagnosticCategory.Error, "Private_identifiers_are_only_allowed_in_class_bodies_and_may_only_be_used_as_part_of_a_class_member__1451", "Private identifiers are only allowed in class bodies and may only be used as part of a class member declaration, property access, or on the left-hand-side of an 'in' expression"),
-        Resolution_modes_are_only_supported_when_moduleResolution_is_node16_or_nodenext: diag(1452, ts.DiagnosticCategory.Error, "Resolution_modes_are_only_supported_when_moduleResolution_is_node16_or_nodenext_1452", "Resolution modes are only supported when `moduleResolution` is `node16` or `nodenext`."),
+        resolution_mode_assertions_are_only_supported_when_moduleResolution_is_node16_or_nodenext: diag(1452, ts.DiagnosticCategory.Error, "resolution_mode_assertions_are_only_supported_when_moduleResolution_is_node16_or_nodenext_1452", "'resolution-mode' assertions are only supported when `moduleResolution` is `node16` or `nodenext`."),
         resolution_mode_should_be_either_require_or_import: diag(1453, ts.DiagnosticCategory.Error, "resolution_mode_should_be_either_require_or_import_1453", "`resolution-mode` should be either `require` or `import`."),
         resolution_mode_can_only_be_set_for_type_only_imports: diag(1454, ts.DiagnosticCategory.Error, "resolution_mode_can_only_be_set_for_type_only_imports_1454", "`resolution-mode` can only be set for type-only imports."),
         resolution_mode_is_the_only_valid_key_for_type_import_assertions: diag(1455, ts.DiagnosticCategory.Error, "resolution_mode_is_the_only_valid_key_for_type_import_assertions_1455", "`resolution-mode` is the only valid key for type import assertions."),
@@ -9100,6 +9102,7 @@ var ts;
         All_declarations_of_0_must_have_identical_constraints: diag(2838, ts.DiagnosticCategory.Error, "All_declarations_of_0_must_have_identical_constraints_2838", "All declarations of '{0}' must have identical constraints."),
         This_condition_will_always_return_0_since_JavaScript_compares_objects_by_reference_not_value: diag(2839, ts.DiagnosticCategory.Error, "This_condition_will_always_return_0_since_JavaScript_compares_objects_by_reference_not_value_2839", "This condition will always return '{0}' since JavaScript compares objects by reference, not value."),
         An_interface_cannot_extend_a_primitive_type_like_0_an_interface_can_only_extend_named_types_and_classes: diag(2840, ts.DiagnosticCategory.Error, "An_interface_cannot_extend_a_primitive_type_like_0_an_interface_can_only_extend_named_types_and_clas_2840", "An interface cannot extend a primitive type like '{0}'; an interface can only extend named types and classes"),
+        The_type_of_this_expression_cannot_be_named_without_a_resolution_mode_assertion_which_is_an_unstable_feature_Use_nightly_TypeScript_to_silence_this_error_Try_updating_with_npm_install_D_typescript_next: diag(2841, ts.DiagnosticCategory.Error, "The_type_of_this_expression_cannot_be_named_without_a_resolution_mode_assertion_which_is_an_unstable_2841", "The type of this expression cannot be named without a 'resolution-mode' assertion, which is an unstable feature. Use nightly TypeScript to silence this error. Try updating with 'npm install -D typescript@next'."),
         Import_declaration_0_is_using_private_name_1: diag(4000, ts.DiagnosticCategory.Error, "Import_declaration_0_is_using_private_name_1_4000", "Import declaration '{0}' is using private name '{1}'."),
         Type_parameter_0_of_exported_class_has_or_is_using_private_name_1: diag(4002, ts.DiagnosticCategory.Error, "Type_parameter_0_of_exported_class_has_or_is_using_private_name_1_4002", "Type parameter '{0}' of exported class has or is using private name '{1}'."),
         Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1: diag(4004, ts.DiagnosticCategory.Error, "Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1_4004", "Type parameter '{0}' of exported interface has or is using private name '{1}'."),
@@ -9207,7 +9210,7 @@ var ts;
         This_member_cannot_have_a_JSDoc_comment_with_an_override_tag_because_it_is_not_declared_in_the_base_class_0: diag(4122, ts.DiagnosticCategory.Error, "This_member_cannot_have_a_JSDoc_comment_with_an_override_tag_because_it_is_not_declared_in_the_base__4122", "This member cannot have a JSDoc comment with an '@override' tag because it is not declared in the base class '{0}'."),
         This_member_cannot_have_a_JSDoc_comment_with_an_override_tag_because_it_is_not_declared_in_the_base_class_0_Did_you_mean_1: diag(4123, ts.DiagnosticCategory.Error, "This_member_cannot_have_a_JSDoc_comment_with_an_override_tag_because_it_is_not_declared_in_the_base__4123", "This member cannot have a JSDoc comment with an 'override' tag because it is not declared in the base class '{0}'. Did you mean '{1}'?"),
         Compiler_option_0_of_value_1_is_unstable_Use_nightly_TypeScript_to_silence_this_error_Try_updating_with_npm_install_D_typescript_next: diag(4124, ts.DiagnosticCategory.Error, "Compiler_option_0_of_value_1_is_unstable_Use_nightly_TypeScript_to_silence_this_error_Try_updating_w_4124", "Compiler option '{0}' of value '{1}' is unstable. Use nightly TypeScript to silence this error. Try updating with 'npm install -D typescript@next'."),
-        Resolution_mode_assertions_are_unstable_Use_nightly_TypeScript_to_silence_this_error_Try_updating_with_npm_install_D_typescript_next: diag(4125, ts.DiagnosticCategory.Error, "Resolution_mode_assertions_are_unstable_Use_nightly_TypeScript_to_silence_this_error_Try_updating_wi_4125", "Resolution mode assertions are unstable. Use nightly TypeScript to silence this error. Try updating with 'npm install -D typescript@next'."),
+        resolution_mode_assertions_are_unstable_Use_nightly_TypeScript_to_silence_this_error_Try_updating_with_npm_install_D_typescript_next: diag(4125, ts.DiagnosticCategory.Error, "resolution_mode_assertions_are_unstable_Use_nightly_TypeScript_to_silence_this_error_Try_updating_wi_4125", "'resolution-mode' assertions are unstable. Use nightly TypeScript to silence this error. Try updating with 'npm install -D typescript@next'."),
         The_current_host_does_not_support_the_0_option: diag(5001, ts.DiagnosticCategory.Error, "The_current_host_does_not_support_the_0_option_5001", "The current host does not support the '{0}' option."),
         Cannot_find_the_common_subdirectory_path_for_the_input_files: diag(5009, ts.DiagnosticCategory.Error, "Cannot_find_the_common_subdirectory_path_for_the_input_files_5009", "Cannot find the common subdirectory path for the input files."),
         File_specification_cannot_end_in_a_recursive_directory_wildcard_Asterisk_Asterisk_Colon_0: diag(5010, ts.DiagnosticCategory.Error, "File_specification_cannot_end_in_a_recursive_directory_wildcard_Asterisk_Asterisk_Colon_0_5010", "File specification cannot end in a recursive directory wildcard ('**'): '{0}'."),
@@ -16248,6 +16251,8 @@ var ts;
             case 218 /* AwaitExpression */:
             case 231 /* MetaProperty */:
                 return true;
+            case 228 /* ExpressionWithTypeArguments */:
+                return !ts.isHeritageClause(node.parent);
             case 161 /* QualifiedName */:
                 while (node.parent.kind === 161 /* QualifiedName */) {
                     node = node.parent;
@@ -17191,6 +17196,12 @@ var ts;
         return [child, node];
     }
     ts.walkUpParenthesizedTypesAndGetParentAndChild = walkUpParenthesizedTypesAndGetParentAndChild;
+    function skipTypeParentheses(node) {
+        while (ts.isParenthesizedTypeNode(node))
+            node = node.type;
+        return node;
+    }
+    ts.skipTypeParentheses = skipTypeParentheses;
     function skipParentheses(node, excludeJSDocTypeAssertions) {
         var flags = excludeJSDocTypeAssertions ?
             1 /* Parentheses */ | 16 /* ExcludeJSDocTypeAssertion */ :
@@ -19425,7 +19436,7 @@ var ts;
      * Moves the start position of a range past any decorators.
      */
     function moveRangePastDecorators(node) {
-        return node.decorators && node.decorators.length > 0
+        return node.decorators && !positionIsSynthesized(node.decorators.end)
             ? moveRangePos(node, node.decorators.end)
             : node;
     }
@@ -19434,7 +19445,7 @@ var ts;
      * Moves the start position of a range past any decorators or modifiers.
      */
     function moveRangePastModifiers(node) {
-        return node.modifiers && node.modifiers.length > 0
+        return node.modifiers && !positionIsSynthesized(node.modifiers.end)
             ? moveRangePos(node, node.modifiers.end)
             : moveRangePastDecorators(node);
     }
@@ -22864,7 +22875,7 @@ var ts;
         function createBaseFunctionLikeDeclaration(kind, decorators, modifiers, name, typeParameters, parameters, type, body) {
             var node = createBaseSignatureDeclaration(kind, decorators, modifiers, name, typeParameters, parameters, type);
             node.body = body;
-            node.transformFlags |= propagateChildFlags(node.body) & ~16777216 /* ContainsPossibleTopLevelAwait */;
+            node.transformFlags |= propagateChildFlags(node.body) & ~67108864 /* ContainsPossibleTopLevelAwait */;
             if (!body)
                 node.transformFlags |= 1 /* ContainsTypeScript */;
             return node;
@@ -22992,7 +23003,7 @@ var ts;
                 node.typeArguments = createNodeArray(typeArguments);
             }
             if (node.originalKeywordKind === 132 /* AwaitKeyword */) {
-                node.transformFlags |= 16777216 /* ContainsPossibleTopLevelAwait */;
+                node.transformFlags |= 67108864 /* ContainsPossibleTopLevelAwait */;
             }
             return node;
         }
@@ -23044,7 +23055,7 @@ var ts;
                 ts.Debug.fail("First character of private identifier must be #: " + text);
             var node = baseFactory.createBasePrivateIdentifierNode(80 /* PrivateIdentifier */);
             node.escapedText = ts.escapeLeadingUnderscores(text);
-            node.transformFlags |= 8388608 /* ContainsClassFields */;
+            node.transformFlags |= 16777216 /* ContainsClassFields */;
             return node;
         }
         //
@@ -23091,14 +23102,14 @@ var ts;
                     transformFlags = 1 /* ContainsTypeScript */;
                     break;
                 case 106 /* SuperKeyword */:
-                    transformFlags = 1024 /* ContainsES2015 */ | 33554432 /* ContainsLexicalSuper */;
+                    transformFlags = 1024 /* ContainsES2015 */ | 134217728 /* ContainsLexicalSuper */;
                     break;
                 case 124 /* StaticKeyword */:
                     transformFlags = 1024 /* ContainsES2015 */;
                     break;
                 case 108 /* ThisKeyword */:
                     // 'this' indicates a lexical 'this'
-                    transformFlags = 8192 /* ContainsLexicalThis */;
+                    transformFlags = 16384 /* ContainsLexicalThis */;
                     break;
             }
             if (transformFlags) {
@@ -23196,7 +23207,7 @@ var ts;
             node.transformFlags |=
                 propagateChildFlags(node.expression) |
                     1024 /* ContainsES2015 */ |
-                    65536 /* ContainsComputedPropertyName */;
+                    131072 /* ContainsComputedPropertyName */;
             return node;
         }
         // @api
@@ -23262,7 +23273,7 @@ var ts;
                 if (questionToken)
                     node.transformFlags |= 1 /* ContainsTypeScript */;
                 if (ts.modifiersToFlags(node.modifiers) & 16476 /* ParameterPropertyModifier */)
-                    node.transformFlags |= 4096 /* ContainsTypeScriptClassSyntax */;
+                    node.transformFlags |= 8192 /* ContainsTypeScriptClassSyntax */;
                 if (initializer || dotDotDotToken)
                     node.transformFlags |= 1024 /* ContainsES2015 */;
             }
@@ -23287,7 +23298,8 @@ var ts;
             node.transformFlags |=
                 propagateChildFlags(node.expression) |
                     1 /* ContainsTypeScript */ |
-                    4096 /* ContainsTypeScriptClassSyntax */;
+                    8192 /* ContainsTypeScriptClassSyntax */ |
+                    33554432 /* ContainsDecorators */;
             return node;
         }
         // @api
@@ -23325,9 +23337,9 @@ var ts;
             node.transformFlags |=
                 propagateChildFlags(node.questionToken) |
                     propagateChildFlags(node.exclamationToken) |
-                    8388608 /* ContainsClassFields */;
+                    16777216 /* ContainsClassFields */;
             if (ts.isComputedPropertyName(node.name) || (ts.hasStaticModifier(node) && node.initializer)) {
-                node.transformFlags |= 4096 /* ContainsTypeScriptClassSyntax */;
+                node.transformFlags |= 8192 /* ContainsTypeScriptClassSyntax */;
             }
             if (questionOrExclamationToken || ts.modifiersToFlags(node.modifiers) & 2 /* Ambient */) {
                 node.transformFlags |= 1 /* ContainsTypeScript */;
@@ -23410,7 +23422,7 @@ var ts;
             /*name*/ undefined, 
             /*typeParameters*/ undefined);
             node.body = body;
-            node.transformFlags = propagateChildFlags(body) | 8388608 /* ContainsClassFields */;
+            node.transformFlags = propagateChildFlags(body) | 16777216 /* ContainsClassFields */;
             return node;
         }
         // @api
@@ -23934,11 +23946,11 @@ var ts;
             node.transformFlags |=
                 propagateChildrenFlags(node.elements) |
                     1024 /* ContainsES2015 */ |
-                    262144 /* ContainsBindingPattern */;
-            if (node.transformFlags & 16384 /* ContainsRestOrSpread */) {
+                    524288 /* ContainsBindingPattern */;
+            if (node.transformFlags & 32768 /* ContainsRestOrSpread */) {
                 node.transformFlags |=
                     128 /* ContainsES2018 */ |
-                        32768 /* ContainsObjectRestOrSpread */;
+                        65536 /* ContainsObjectRestOrSpread */;
             }
             return node;
         }
@@ -23955,7 +23967,7 @@ var ts;
             node.transformFlags |=
                 propagateChildrenFlags(node.elements) |
                     1024 /* ContainsES2015 */ |
-                    262144 /* ContainsBindingPattern */;
+                    524288 /* ContainsBindingPattern */;
             return node;
         }
         // @api
@@ -23980,7 +23992,7 @@ var ts;
                     propagateChildFlags(node.propertyName);
             }
             if (dotDotDotToken)
-                node.transformFlags |= 16384 /* ContainsRestOrSpread */;
+                node.transformFlags |= 32768 /* ContainsRestOrSpread */;
             return node;
         }
         // @api
@@ -24155,10 +24167,10 @@ var ts;
                 node.transformFlags |= 1 /* ContainsTypeScript */;
             }
             if (ts.isImportKeyword(node.expression)) {
-                node.transformFlags |= 4194304 /* ContainsDynamicImport */;
+                node.transformFlags |= 8388608 /* ContainsDynamicImport */;
             }
             else if (ts.isSuperProperty(node.expression)) {
-                node.transformFlags |= 8192 /* ContainsLexicalThis */;
+                node.transformFlags |= 16384 /* ContainsLexicalThis */;
             }
             return node;
         }
@@ -24191,7 +24203,7 @@ var ts;
                 node.transformFlags |= 1 /* ContainsTypeScript */;
             }
             if (ts.isSuperProperty(node.expression)) {
-                node.transformFlags |= 8192 /* ContainsLexicalThis */;
+                node.transformFlags |= 16384 /* ContainsLexicalThis */;
             }
             return node;
         }
@@ -24331,7 +24343,7 @@ var ts;
                 propagateChildFlags(node.equalsGreaterThanToken) |
                     1024 /* ContainsES2015 */;
             if (ts.modifiersToFlags(node.modifiers) & 256 /* Async */) {
-                node.transformFlags |= 256 /* ContainsES2017 */ | 8192 /* ContainsLexicalThis */;
+                node.transformFlags |= 256 /* ContainsES2017 */ | 16384 /* ContainsLexicalThis */;
             }
             return node;
         }
@@ -24393,7 +24405,7 @@ var ts;
                 propagateChildFlags(node.expression) |
                     256 /* ContainsES2017 */ |
                     128 /* ContainsES2018 */ |
-                    1048576 /* ContainsAwait */;
+                    2097152 /* ContainsAwait */;
             return node;
         }
         // @api
@@ -24414,7 +24426,7 @@ var ts;
                 ts.isIdentifier(node.operand) &&
                 !ts.isGeneratedIdentifier(node.operand) &&
                 !ts.isLocalName(node.operand)) {
-                node.transformFlags |= 67108864 /* ContainsUpdateExpressionForIdentifier */;
+                node.transformFlags |= 268435456 /* ContainsUpdateExpressionForIdentifier */;
             }
             return node;
         }
@@ -24435,7 +24447,7 @@ var ts;
             if (ts.isIdentifier(node.operand) &&
                 !ts.isGeneratedIdentifier(node.operand) &&
                 !ts.isLocalName(node.operand)) {
-                node.transformFlags |= 67108864 /* ContainsUpdateExpressionForIdentifier */;
+                node.transformFlags |= 268435456 /* ContainsUpdateExpressionForIdentifier */;
             }
             return node;
         }
@@ -24484,8 +24496,8 @@ var ts;
             return node;
         }
         function propagateAssignmentPatternFlags(node) {
-            if (node.transformFlags & 32768 /* ContainsObjectRestOrSpread */)
-                return 32768 /* ContainsObjectRestOrSpread */;
+            if (node.transformFlags & 65536 /* ContainsObjectRestOrSpread */)
+                return 65536 /* ContainsObjectRestOrSpread */;
             if (node.transformFlags & 128 /* ContainsES2018 */) {
                 // check for nested spread assignments, otherwise '{ x: { a, ...b } = foo } = c'
                 // will not be correctly interpreted by the ES2018 transformer
@@ -24493,8 +24505,8 @@ var ts;
                     var element = _a[_i];
                     var target = ts.getTargetOfBindingOrAssignmentElement(element);
                     if (target && ts.isAssignmentPattern(target)) {
-                        if (target.transformFlags & 32768 /* ContainsObjectRestOrSpread */) {
-                            return 32768 /* ContainsObjectRestOrSpread */;
+                        if (target.transformFlags & 65536 /* ContainsObjectRestOrSpread */) {
+                            return 65536 /* ContainsObjectRestOrSpread */;
                         }
                         if (target.transformFlags & 128 /* ContainsES2018 */) {
                             var flags_1 = propagateAssignmentPatternFlags(target);
@@ -24620,7 +24632,7 @@ var ts;
                     propagateChildFlags(node.asteriskToken) |
                     1024 /* ContainsES2015 */ |
                     128 /* ContainsES2018 */ |
-                    524288 /* ContainsYield */;
+                    1048576 /* ContainsYield */;
             return node;
         }
         // @api
@@ -24637,7 +24649,7 @@ var ts;
             node.transformFlags |=
                 propagateChildFlags(node.expression) |
                     1024 /* ContainsES2015 */ |
-                    16384 /* ContainsRestOrSpread */;
+                    32768 /* ContainsRestOrSpread */;
             return node;
         }
         // @api
@@ -24970,7 +24982,7 @@ var ts;
             node.label = asName(label);
             node.transformFlags |=
                 propagateChildFlags(node.label) |
-                    2097152 /* ContainsHoistedDeclarationOrCompletion */;
+                    4194304 /* ContainsHoistedDeclarationOrCompletion */;
             return node;
         }
         // @api
@@ -24985,7 +24997,7 @@ var ts;
             node.label = asName(label);
             node.transformFlags |=
                 propagateChildFlags(node.label) |
-                    2097152 /* ContainsHoistedDeclarationOrCompletion */;
+                    4194304 /* ContainsHoistedDeclarationOrCompletion */;
             return node;
         }
         // @api
@@ -25002,7 +25014,7 @@ var ts;
             node.transformFlags |=
                 propagateChildFlags(node.expression) |
                     128 /* ContainsES2018 */ |
-                    2097152 /* ContainsHoistedDeclarationOrCompletion */;
+                    4194304 /* ContainsHoistedDeclarationOrCompletion */;
             return node;
         }
         // @api
@@ -25128,11 +25140,11 @@ var ts;
             node.declarations = createNodeArray(declarations);
             node.transformFlags |=
                 propagateChildrenFlags(node.declarations) |
-                    2097152 /* ContainsHoistedDeclarationOrCompletion */;
+                    4194304 /* ContainsHoistedDeclarationOrCompletion */;
             if (flags & 3 /* BlockScoped */) {
                 node.transformFlags |=
                     1024 /* ContainsES2015 */ |
-                        131072 /* ContainsBlockScopedBinding */;
+                        262144 /* ContainsBlockScopedBinding */;
             }
             return node;
         }
@@ -25152,7 +25164,7 @@ var ts;
             else {
                 node.transformFlags |=
                     propagateChildFlags(node.asteriskToken) |
-                        2097152 /* ContainsHoistedDeclarationOrCompletion */;
+                        4194304 /* ContainsHoistedDeclarationOrCompletion */;
                 if (ts.modifiersToFlags(node.modifiers) & 256 /* Async */) {
                     if (node.asteriskToken) {
                         node.transformFlags |= 128 /* ContainsES2018 */;
@@ -25188,7 +25200,7 @@ var ts;
             }
             else {
                 node.transformFlags |= 1024 /* ContainsES2015 */;
-                if (node.transformFlags & 4096 /* ContainsTypeScriptClassSyntax */) {
+                if (node.transformFlags & 8192 /* ContainsTypeScriptClassSyntax */) {
                     node.transformFlags |= 1 /* ContainsTypeScript */;
                 }
             }
@@ -25247,7 +25259,7 @@ var ts;
             node.transformFlags |=
                 propagateChildrenFlags(node.members) |
                     1 /* ContainsTypeScript */;
-            node.transformFlags &= ~16777216 /* ContainsPossibleTopLevelAwait */; // Enum declarations cannot contain `await`
+            node.transformFlags &= ~67108864 /* ContainsPossibleTopLevelAwait */; // Enum declarations cannot contain `await`
             return node;
         }
         // @api
@@ -25275,7 +25287,7 @@ var ts;
                         propagateChildFlags(node.body) |
                         1 /* ContainsTypeScript */;
             }
-            node.transformFlags &= ~16777216 /* ContainsPossibleTopLevelAwait */; // Module declarations cannot contain `await`.
+            node.transformFlags &= ~67108864 /* ContainsPossibleTopLevelAwait */; // Module declarations cannot contain `await`.
             return node;
         }
         // @api
@@ -25335,7 +25347,7 @@ var ts;
             node.transformFlags |= propagateChildFlags(node.moduleReference);
             if (!ts.isExternalModuleReference(node.moduleReference))
                 node.transformFlags |= 1 /* ContainsTypeScript */;
-            node.transformFlags &= ~16777216 /* ContainsPossibleTopLevelAwait */; // Import= declaration is always parsed in an Await context
+            node.transformFlags &= ~67108864 /* ContainsPossibleTopLevelAwait */; // Import= declaration is always parsed in an Await context
             return node;
         }
         // @api
@@ -25357,7 +25369,7 @@ var ts;
             node.transformFlags |=
                 propagateChildFlags(node.importClause) |
                     propagateChildFlags(node.moduleSpecifier);
-            node.transformFlags &= ~16777216 /* ContainsPossibleTopLevelAwait */; // always parsed in an Await context
+            node.transformFlags &= ~67108864 /* ContainsPossibleTopLevelAwait */; // always parsed in an Await context
             return node;
         }
         // @api
@@ -25382,7 +25394,7 @@ var ts;
             if (isTypeOnly) {
                 node.transformFlags |= 1 /* ContainsTypeScript */;
             }
-            node.transformFlags &= ~16777216 /* ContainsPossibleTopLevelAwait */; // always parsed in an Await context
+            node.transformFlags &= ~67108864 /* ContainsPossibleTopLevelAwait */; // always parsed in an Await context
             return node;
         }
         // @api
@@ -25442,7 +25454,7 @@ var ts;
             var node = createBaseNode(268 /* NamespaceImport */);
             node.name = name;
             node.transformFlags |= propagateChildFlags(node.name);
-            node.transformFlags &= ~16777216 /* ContainsPossibleTopLevelAwait */; // always parsed in an Await context
+            node.transformFlags &= ~67108864 /* ContainsPossibleTopLevelAwait */; // always parsed in an Await context
             return node;
         }
         // @api
@@ -25458,7 +25470,7 @@ var ts;
             node.transformFlags |=
                 propagateChildFlags(node.name) |
                     4 /* ContainsESNext */;
-            node.transformFlags &= ~16777216 /* ContainsPossibleTopLevelAwait */; // always parsed in an Await context
+            node.transformFlags &= ~67108864 /* ContainsPossibleTopLevelAwait */; // always parsed in an Await context
             return node;
         }
         // @api
@@ -25472,7 +25484,7 @@ var ts;
             var node = createBaseNode(269 /* NamedImports */);
             node.elements = createNodeArray(elements);
             node.transformFlags |= propagateChildrenFlags(node.elements);
-            node.transformFlags &= ~16777216 /* ContainsPossibleTopLevelAwait */; // always parsed in an Await context
+            node.transformFlags &= ~67108864 /* ContainsPossibleTopLevelAwait */; // always parsed in an Await context
             return node;
         }
         // @api
@@ -25490,7 +25502,7 @@ var ts;
             node.transformFlags |=
                 propagateChildFlags(node.propertyName) |
                     propagateChildFlags(node.name);
-            node.transformFlags &= ~16777216 /* ContainsPossibleTopLevelAwait */; // always parsed in an Await context
+            node.transformFlags &= ~67108864 /* ContainsPossibleTopLevelAwait */; // always parsed in an Await context
             return node;
         }
         // @api
@@ -25509,7 +25521,7 @@ var ts;
                 ? parenthesizerRules().parenthesizeRightSideOfBinary(63 /* EqualsToken */, /*leftSide*/ undefined, expression)
                 : parenthesizerRules().parenthesizeExpressionOfExportDefault(expression);
             node.transformFlags |= propagateChildFlags(node.expression);
-            node.transformFlags &= ~16777216 /* ContainsPossibleTopLevelAwait */; // always parsed in an Await context
+            node.transformFlags &= ~67108864 /* ContainsPossibleTopLevelAwait */; // always parsed in an Await context
             return node;
         }
         // @api
@@ -25530,7 +25542,7 @@ var ts;
             node.transformFlags |=
                 propagateChildFlags(node.exportClause) |
                     propagateChildFlags(node.moduleSpecifier);
-            node.transformFlags &= ~16777216 /* ContainsPossibleTopLevelAwait */; // always parsed in an Await context
+            node.transformFlags &= ~67108864 /* ContainsPossibleTopLevelAwait */; // always parsed in an Await context
             return node;
         }
         // @api
@@ -25549,7 +25561,7 @@ var ts;
             var node = createBaseNode(273 /* NamedExports */);
             node.elements = createNodeArray(elements);
             node.transformFlags |= propagateChildrenFlags(node.elements);
-            node.transformFlags &= ~16777216 /* ContainsPossibleTopLevelAwait */; // always parsed in an Await context
+            node.transformFlags &= ~67108864 /* ContainsPossibleTopLevelAwait */; // always parsed in an Await context
             return node;
         }
         // @api
@@ -25567,7 +25579,7 @@ var ts;
             node.transformFlags |=
                 propagateChildFlags(node.propertyName) |
                     propagateChildFlags(node.name);
-            node.transformFlags &= ~16777216 /* ContainsPossibleTopLevelAwait */; // always parsed in an Await context
+            node.transformFlags &= ~67108864 /* ContainsPossibleTopLevelAwait */; // always parsed in an Await context
             return node;
         }
         // @api
@@ -25593,7 +25605,7 @@ var ts;
             var node = createBaseNode(277 /* ExternalModuleReference */);
             node.expression = expression;
             node.transformFlags |= propagateChildFlags(node.expression);
-            node.transformFlags &= ~16777216 /* ContainsPossibleTopLevelAwait */; // always parsed in an Await context
+            node.transformFlags &= ~67108864 /* ContainsPossibleTopLevelAwait */; // always parsed in an Await context
             return node;
         }
         // @api
@@ -26367,7 +26379,7 @@ var ts;
             node.transformFlags |=
                 propagateChildFlags(node.expression) |
                     128 /* ContainsES2018 */ |
-                    32768 /* ContainsObjectRestOrSpread */;
+                    65536 /* ContainsObjectRestOrSpread */;
             return node;
         }
         // @api
@@ -27324,10 +27336,10 @@ var ts;
     }
     function propagateIdentifierNameFlags(node) {
         // An IdentifierName is allowed to be `await`
-        return propagateChildFlags(node) & ~16777216 /* ContainsPossibleTopLevelAwait */;
+        return propagateChildFlags(node) & ~67108864 /* ContainsPossibleTopLevelAwait */;
     }
     function propagatePropertyNameFlagsOfChild(node, transformFlags) {
-        return transformFlags | (node.transformFlags & 33562624 /* PropertyNamePropagatingFlags */);
+        return transformFlags | (node.transformFlags & 134234112 /* PropertyNamePropagatingFlags */);
     }
     function propagateChildFlags(child) {
         if (!child)
@@ -27358,29 +27370,29 @@ var ts;
             case 208 /* CallExpression */:
             case 209 /* NewExpression */:
             case 204 /* ArrayLiteralExpression */:
-                return 536887296 /* ArrayLiteralOrCallOrNewExcludes */;
+                return 536903680 /* ArrayLiteralOrCallOrNewExcludes */;
             case 261 /* ModuleDeclaration */:
-                return 589443072 /* ModuleExcludes */;
+                return 742678528 /* ModuleExcludes */;
             case 164 /* Parameter */:
                 return 536870912 /* ParameterExcludes */;
             case 214 /* ArrowFunction */:
-                return 557748224 /* ArrowFunctionExcludes */;
+                return 612179968 /* ArrowFunctionExcludes */;
             case 213 /* FunctionExpression */:
             case 256 /* FunctionDeclaration */:
-                return 591310848 /* FunctionExcludes */;
+                return 746414080 /* FunctionExcludes */;
             case 255 /* VariableDeclarationList */:
-                return 537165824 /* VariableDeclarationListExcludes */;
+                return 537460736 /* VariableDeclarationListExcludes */;
             case 257 /* ClassDeclaration */:
             case 226 /* ClassExpression */:
-                return 536940544 /* ClassExcludes */;
+                return 537010176 /* ClassExcludes */;
             case 171 /* Constructor */:
-                return 591306752 /* ConstructorExcludes */;
+                return 746405888 /* ConstructorExcludes */;
             case 167 /* PropertyDeclaration */:
-                return 570433536 /* PropertyExcludes */;
+                return 671105024 /* PropertyExcludes */;
             case 169 /* MethodDeclaration */:
             case 172 /* GetAccessor */:
             case 173 /* SetAccessor */:
-                return 574529536 /* MethodOrAccessorExcludes */;
+                return 679297024 /* MethodOrAccessorExcludes */;
             case 130 /* AnyKeyword */:
             case 147 /* NumberKeyword */:
             case 158 /* BigIntKeyword */:
@@ -27400,12 +27412,12 @@ var ts;
             case 259 /* TypeAliasDeclaration */:
                 return -2 /* TypeExcludes */;
             case 205 /* ObjectLiteralExpression */:
-                return 536973312 /* ObjectLiteralExcludes */;
+                return 537075712 /* ObjectLiteralExcludes */;
             case 292 /* CatchClause */:
-                return 536903680 /* CatchClauseExcludes */;
+                return 536936448 /* CatchClauseExcludes */;
             case 201 /* ObjectBindingPattern */:
             case 202 /* ArrayBindingPattern */:
-                return 536887296 /* BindingPatternExcludes */;
+                return 536903680 /* BindingPatternExcludes */;
             case 211 /* TypeAssertionExpression */:
             case 229 /* AsExpression */:
             case 350 /* PartiallyEmittedExpression */:
@@ -29281,6 +29293,10 @@ var ts;
         return node.kind === 267 /* ImportClause */;
     }
     ts.isImportClause = isImportClause;
+    function isImportTypeAssertionContainer(node) {
+        return node.kind === 295 /* ImportTypeAssertionContainer */;
+    }
+    ts.isImportTypeAssertionContainer = isImportTypeAssertionContainer;
     function isAssertClause(node) {
         return node.kind === 293 /* AssertClause */;
     }
@@ -30635,6 +30651,14 @@ var ts;
         }
     }
     ts.createBinaryExpressionTrampoline = createBinaryExpressionTrampoline;
+    function elideNodes(factory, nodes) {
+        if (nodes === undefined)
+            return undefined;
+        if (nodes.length === 0)
+            return nodes;
+        return ts.setTextRange(factory.createNodeArray([], nodes.hasTrailingComma), nodes);
+    }
+    ts.elideNodes = elideNodes;
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
@@ -31806,7 +31830,7 @@ var ts;
             return factory.updateSourceFile(sourceFile, ts.setTextRange(factory.createNodeArray(statements), sourceFile.statements));
             function containsPossibleTopLevelAwait(node) {
                 return !(node.flags & 32768 /* AwaitContext */)
-                    && !!(node.transformFlags & 16777216 /* ContainsPossibleTopLevelAwait */);
+                    && !!(node.transformFlags & 67108864 /* ContainsPossibleTopLevelAwait */);
             }
             function findNextStatementWithAwait(statements, start) {
                 for (var i = start; i < statements.length; i++) {
@@ -31847,7 +31871,7 @@ var ts;
             ts.setTextRangePosWidth(sourceFile, 0, sourceText.length);
             setFields(sourceFile);
             // If we parsed this as an external module, it may contain top-level await
-            if (!isDeclarationFile && isExternalModule(sourceFile) && sourceFile.transformFlags & 16777216 /* ContainsPossibleTopLevelAwait */) {
+            if (!isDeclarationFile && isExternalModule(sourceFile) && sourceFile.transformFlags & 67108864 /* ContainsPossibleTopLevelAwait */) {
                 sourceFile = reparseTopLevelAwait(sourceFile);
                 setFields(sourceFile);
             }
@@ -35853,6 +35877,9 @@ var ts;
                 typeArguments = expression.typeArguments;
                 expression = expression.expression;
             }
+            if (token() === 28 /* QuestionDotToken */) {
+                parseErrorAtCurrentToken(ts.Diagnostics.Invalid_optional_chain_from_new_expression_Did_you_mean_to_call_0, ts.getTextOfNodeFromSourceText(sourceText, expression));
+            }
             var argumentList = token() === 20 /* OpenParenToken */ ? parseArgumentList() : undefined;
             return finishNode(factory.createNewExpression(expression, typeArguments, argumentList), pos);
         }
@@ -44044,13 +44071,36 @@ var ts;
         }
         return toSearchResult(/*value*/ undefined);
     }
+    /**
+     * From https://github.com/nodejs/node/blob/8f39f51cbbd3b2de14b9ee896e26421cc5b20121/lib/internal/modules/esm/resolve.js#L722 -
+     * "longest" has some nuance as to what "longest" means in the presence of pattern trailers
+     */
+    function comparePatternKeys(a, b) {
+        var aPatternIndex = a.indexOf("*");
+        var bPatternIndex = b.indexOf("*");
+        var baseLenA = aPatternIndex === -1 ? a.length : aPatternIndex + 1;
+        var baseLenB = bPatternIndex === -1 ? b.length : bPatternIndex + 1;
+        if (baseLenA > baseLenB)
+            return -1;
+        if (baseLenB > baseLenA)
+            return 1;
+        if (aPatternIndex === -1)
+            return 1;
+        if (bPatternIndex === -1)
+            return -1;
+        if (a.length > b.length)
+            return -1;
+        if (b.length > a.length)
+            return 1;
+        return 0;
+    }
     function loadModuleFromImportsOrExports(extensions, state, cache, redirectedReference, moduleName, lookupTable, scope, isImports) {
         var loadModuleFromTargetImportOrExport = getLoadModuleFromTargetImportOrExport(extensions, state, cache, redirectedReference, moduleName, scope, isImports);
         if (!ts.endsWith(moduleName, ts.directorySeparator) && moduleName.indexOf("*") === -1 && ts.hasProperty(lookupTable, moduleName)) {
             var target = lookupTable[moduleName];
             return loadModuleFromTargetImportOrExport(target, /*subpath*/ "", /*pattern*/ false);
         }
-        var expandingKeys = ts.sort(ts.filter(ts.getOwnKeys(lookupTable), function (k) { return k.indexOf("*") !== -1 || ts.endsWith(k, "/"); }), function (a, b) { return a.length - b.length; });
+        var expandingKeys = ts.sort(ts.filter(ts.getOwnKeys(lookupTable), function (k) { return k.indexOf("*") !== -1 || ts.endsWith(k, "/"); }), comparePatternKeys);
         for (var _i = 0, expandingKeys_1 = expandingKeys; _i < expandingKeys_1.length; _i++) {
             var potentialTarget = expandingKeys_1[_i];
             if (state.features & NodeResolutionFeatures.ExportsPatternTrailers && matchesPatternWithTrailer(potentialTarget, moduleName)) {
@@ -53629,6 +53679,7 @@ var ts;
                 return symbol.parent ? ts.factory.createQualifiedName(symbolToEntityNameNode(symbol.parent), identifier) : identifier;
             }
             function symbolToTypeNode(symbol, context, meaning, overrideTypeArguments) {
+                var _a, _b, _c, _d;
                 var chain = lookupSymbolChain(symbol, context, meaning, !(context.flags & 16384 /* UseAliasDefinedOutsideCurrentScope */)); // If we're using aliases outside the current scope, dont bother with the module
                 var isTypeOf = meaning === 111551 /* Value */;
                 if (ts.some(chain[0].declarations, hasNonGlobalAugmentationExternalModuleSymbol)) {
@@ -53646,6 +53697,7 @@ var ts;
                             assertion = ts.factory.createImportTypeAssertionContainer(ts.factory.createAssertClause(ts.factory.createNodeArray([
                                 ts.factory.createAssertEntry(ts.factory.createStringLiteral("resolution-mode"), ts.factory.createStringLiteral("import"))
                             ])));
+                            (_b = (_a = context.tracker).reportImportTypeNodeResolutionModeOverride) === null || _b === void 0 ? void 0 : _b.call(_a);
                         }
                     }
                     if (!specifier) {
@@ -53665,6 +53717,7 @@ var ts;
                                 assertion = ts.factory.createImportTypeAssertionContainer(ts.factory.createAssertClause(ts.factory.createNodeArray([
                                     ts.factory.createAssertEntry(ts.factory.createStringLiteral("resolution-mode"), ts.factory.createStringLiteral(swappedMode === ts.ModuleKind.ESNext ? "import" : "require"))
                                 ])));
+                                (_d = (_c = context.tracker).reportImportTypeNodeResolutionModeOverride) === null || _d === void 0 ? void 0 : _d.call(_c);
                             }
                         }
                         if (!assertion) {
@@ -59153,7 +59206,7 @@ var ts;
             var objectType;
             return !!(type.flags & 8388608 /* IndexedAccess */ && ts.getObjectFlags(objectType = type.objectType) & 32 /* Mapped */ &&
                 !isGenericMappedType(objectType) && isGenericIndexType(type.indexType) &&
-                !objectType.declaration.questionToken && !objectType.declaration.nameType);
+                !(getMappedTypeModifiers(objectType) & 8 /* ExcludeOptional */) && !objectType.declaration.nameType);
         }
         /**
          * For a type parameter, return the base constraint of the type parameter. For the string, number,
@@ -78980,6 +79033,10 @@ var ts;
             if (target.kind === 221 /* BinaryExpression */ && target.operatorToken.kind === 63 /* EqualsToken */) {
                 checkBinaryExpression(target, checkMode);
                 target = target.left;
+                // A default value is specified, so remove undefined from the final type.
+                if (strictNullChecks) {
+                    sourceType = getTypeWithFacts(sourceType, 524288 /* NEUndefined */);
+                }
             }
             if (target.kind === 205 /* ObjectLiteralExpression */) {
                 return checkObjectLiteralAssignment(target, sourceType, rightIsThis);
@@ -81070,8 +81127,11 @@ var ts;
             if (node.assertions) {
                 var override = ts.getResolutionModeOverrideForClause(node.assertions.assertClause, grammarErrorOnNode);
                 if (override) {
+                    if (!ts.isNightly()) {
+                        grammarErrorOnNode(node.assertions.assertClause, ts.Diagnostics.resolution_mode_assertions_are_unstable_Use_nightly_TypeScript_to_silence_this_error_Try_updating_with_npm_install_D_typescript_next);
+                    }
                     if (ts.getEmitModuleResolutionKind(compilerOptions) !== ts.ModuleResolutionKind.Node16 && ts.getEmitModuleResolutionKind(compilerOptions) !== ts.ModuleResolutionKind.NodeNext) {
-                        grammarErrorOnNode(node.assertions.assertClause, ts.Diagnostics.Resolution_modes_are_only_supported_when_moduleResolution_is_node16_or_nodenext);
+                        grammarErrorOnNode(node.assertions.assertClause, ts.Diagnostics.resolution_mode_assertions_are_only_supported_when_moduleResolution_is_node16_or_nodenext);
                     }
                 }
             }
@@ -85477,10 +85537,10 @@ var ts;
                 var override = ts.getResolutionModeOverrideForClause(declaration.assertClause, validForTypeAssertions ? grammarErrorOnNode : undefined);
                 if (validForTypeAssertions && override) {
                     if (!ts.isNightly()) {
-                        grammarErrorOnNode(declaration.assertClause, ts.Diagnostics.Resolution_mode_assertions_are_unstable_Use_nightly_TypeScript_to_silence_this_error_Try_updating_with_npm_install_D_typescript_next);
+                        grammarErrorOnNode(declaration.assertClause, ts.Diagnostics.resolution_mode_assertions_are_unstable_Use_nightly_TypeScript_to_silence_this_error_Try_updating_with_npm_install_D_typescript_next);
                     }
                     if (ts.getEmitModuleResolutionKind(compilerOptions) !== ts.ModuleResolutionKind.Node16 && ts.getEmitModuleResolutionKind(compilerOptions) !== ts.ModuleResolutionKind.NodeNext) {
-                        return grammarErrorOnNode(declaration.assertClause, ts.Diagnostics.Resolution_modes_are_only_supported_when_moduleResolution_is_node16_or_nodenext);
+                        return grammarErrorOnNode(declaration.assertClause, ts.Diagnostics.resolution_mode_assertions_are_only_supported_when_moduleResolution_is_node16_or_nodenext);
                     }
                     return; // Other grammar checks do not apply to type-only imports with resolution mode assertions
                 }
@@ -91209,6 +91269,124 @@ var ts;
         return !ts.isStatic(member) && ts.isMethodOrAccessor(member) && ts.isPrivateIdentifier(member.name);
     }
     ts.isNonStaticMethodOrAccessorWithPrivateName = isNonStaticMethodOrAccessorWithPrivateName;
+    /**
+     * Gets an array of arrays of decorators for the parameters of a function-like node.
+     * The offset into the result array should correspond to the offset of the parameter.
+     *
+     * @param node The function-like node.
+     */
+    function getDecoratorsOfParameters(node) {
+        var decorators;
+        if (node) {
+            var parameters = node.parameters;
+            var firstParameterIsThis = parameters.length > 0 && ts.parameterIsThisKeyword(parameters[0]);
+            var firstParameterOffset = firstParameterIsThis ? 1 : 0;
+            var numParameters = firstParameterIsThis ? parameters.length - 1 : parameters.length;
+            for (var i = 0; i < numParameters; i++) {
+                var parameter = parameters[i + firstParameterOffset];
+                if (decorators || parameter.decorators) {
+                    if (!decorators) {
+                        decorators = new Array(numParameters);
+                    }
+                    decorators[i] = parameter.decorators;
+                }
+            }
+        }
+        return decorators;
+    }
+    /**
+     * Gets an AllDecorators object containing the decorators for the class and the decorators for the
+     * parameters of the constructor of the class.
+     *
+     * @param node The class node.
+     */
+    function getAllDecoratorsOfClass(node) {
+        var decorators = node.decorators;
+        var parameters = getDecoratorsOfParameters(ts.getFirstConstructorWithBody(node));
+        if (!decorators && !parameters) {
+            return undefined;
+        }
+        return {
+            decorators: decorators,
+            parameters: parameters
+        };
+    }
+    ts.getAllDecoratorsOfClass = getAllDecoratorsOfClass;
+    /**
+     * Gets an AllDecorators object containing the decorators for the member and its parameters.
+     *
+     * @param parent The class node that contains the member.
+     * @param member The class member.
+     */
+    function getAllDecoratorsOfClassElement(member, parent) {
+        switch (member.kind) {
+            case 172 /* GetAccessor */:
+            case 173 /* SetAccessor */:
+                return getAllDecoratorsOfAccessors(member, parent);
+            case 169 /* MethodDeclaration */:
+                return getAllDecoratorsOfMethod(member);
+            case 167 /* PropertyDeclaration */:
+                return getAllDecoratorsOfProperty(member);
+            default:
+                return undefined;
+        }
+    }
+    ts.getAllDecoratorsOfClassElement = getAllDecoratorsOfClassElement;
+    /**
+     * Gets an AllDecorators object containing the decorators for the accessor and its parameters.
+     *
+     * @param parent The class node that contains the accessor.
+     * @param accessor The class accessor member.
+     */
+    function getAllDecoratorsOfAccessors(accessor, parent) {
+        if (!accessor.body) {
+            return undefined;
+        }
+        var _a = ts.getAllAccessorDeclarations(parent.members, accessor), firstAccessor = _a.firstAccessor, secondAccessor = _a.secondAccessor, getAccessor = _a.getAccessor, setAccessor = _a.setAccessor;
+        var firstAccessorWithDecorators = firstAccessor.decorators ? firstAccessor : secondAccessor && secondAccessor.decorators ? secondAccessor : undefined;
+        if (!firstAccessorWithDecorators || accessor !== firstAccessorWithDecorators) {
+            return undefined;
+        }
+        var decorators = firstAccessorWithDecorators.decorators;
+        var parameters = getDecoratorsOfParameters(setAccessor);
+        if (!decorators && !parameters) {
+            return undefined;
+        }
+        return {
+            decorators: decorators,
+            parameters: parameters,
+            getDecorators: getAccessor === null || getAccessor === void 0 ? void 0 : getAccessor.decorators,
+            setDecorators: setAccessor === null || setAccessor === void 0 ? void 0 : setAccessor.decorators
+        };
+    }
+    /**
+     * Gets an AllDecorators object containing the decorators for the method and its parameters.
+     *
+     * @param method The class method member.
+     */
+    function getAllDecoratorsOfMethod(method) {
+        if (!method.body) {
+            return undefined;
+        }
+        var decorators = method.decorators;
+        var parameters = getDecoratorsOfParameters(method);
+        if (!decorators && !parameters) {
+            return undefined;
+        }
+        return { decorators: decorators, parameters: parameters };
+    }
+    /**
+     * Gets an AllDecorators object containing the decorators for the property.
+     *
+     * @param property The class property member.
+     */
+    function getAllDecoratorsOfProperty(property) {
+        var decorators = property.decorators;
+        if (!decorators) {
+            return undefined;
+        }
+        return { decorators: decorators };
+    }
 })(ts || (ts = {}));
 /*@internal*/
 var ts;
@@ -91482,8 +91660,8 @@ var ts;
             if (!ts.getRestIndicatorOfBindingOrAssignmentElement(element)) {
                 var propertyName = ts.getPropertyNameOfBindingOrAssignmentElement(element);
                 if (flattenContext.level >= 1 /* ObjectRest */
-                    && !(element.transformFlags & (16384 /* ContainsRestOrSpread */ | 32768 /* ContainsObjectRestOrSpread */))
-                    && !(ts.getTargetOfBindingOrAssignmentElement(element).transformFlags & (16384 /* ContainsRestOrSpread */ | 32768 /* ContainsObjectRestOrSpread */))
+                    && !(element.transformFlags & (32768 /* ContainsRestOrSpread */ | 65536 /* ContainsObjectRestOrSpread */))
+                    && !(ts.getTargetOfBindingOrAssignmentElement(element).transformFlags & (32768 /* ContainsRestOrSpread */ | 65536 /* ContainsObjectRestOrSpread */))
                     && !ts.isComputedPropertyName(propertyName)) {
                     bindingElements = ts.append(bindingElements, ts.visitNode(element, flattenContext.visitor));
                 }
@@ -91549,7 +91727,7 @@ var ts;
             if (flattenContext.level >= 1 /* ObjectRest */) {
                 // If an array pattern contains an ObjectRest, we must cache the result so that we
                 // can perform the ObjectRest destructuring in a different declaration
-                if (element.transformFlags & 32768 /* ContainsObjectRestOrSpread */ || flattenContext.hasTransformedPriorElement && !isSimpleBindingOrAssignmentElement(element)) {
+                if (element.transformFlags & 65536 /* ContainsObjectRestOrSpread */ || flattenContext.hasTransformedPriorElement && !isSimpleBindingOrAssignmentElement(element)) {
                     flattenContext.hasTransformedPriorElement = true;
                     var temp = flattenContext.context.factory.createTempVariable(/*recordTempVariable*/ undefined);
                     if (flattenContext.hoistTempVariables) {
@@ -91771,8 +91949,6 @@ var ts;
     var USE_NEW_TYPE_METADATA_FORMAT = false;
     var TypeScriptSubstitutionFlags;
     (function (TypeScriptSubstitutionFlags) {
-        /** Enables substitutions for decorated classes. */
-        TypeScriptSubstitutionFlags[TypeScriptSubstitutionFlags["ClassAliases"] = 1] = "ClassAliases";
         /** Enables substitutions for namespace exports. */
         TypeScriptSubstitutionFlags[TypeScriptSubstitutionFlags["NamespaceExports"] = 2] = "NamespaceExports";
         /* Enables substitutions for unqualified enum members */
@@ -91798,9 +91974,9 @@ var ts;
         var factory = context.factory, emitHelpers = context.getEmitHelperFactory, startLexicalEnvironment = context.startLexicalEnvironment, resumeLexicalEnvironment = context.resumeLexicalEnvironment, endLexicalEnvironment = context.endLexicalEnvironment, hoistVariableDeclaration = context.hoistVariableDeclaration;
         var resolver = context.getEmitResolver();
         var compilerOptions = context.getCompilerOptions();
-        var strictNullChecks = ts.getStrictOptionValue(compilerOptions, "strictNullChecks");
         var languageVersion = ts.getEmitScriptTarget(compilerOptions);
         var moduleKind = ts.getEmitModuleKind(compilerOptions);
+        var typeSerializer = compilerOptions.emitDecoratorMetadata ? ts.createRuntimeTypeSerializer(context) : undefined;
         // Save the previous transformation hooks.
         var previousOnEmitNode = context.onEmitNode;
         var previousOnSubstituteNode = context.onSubstituteNode;
@@ -91815,7 +91991,6 @@ var ts;
         var currentNamespace;
         var currentNamespaceContainerName;
         var currentLexicalScope;
-        var currentNameScope;
         var currentScopeFirstDeclarationsOfName;
         var currentClassHasParameterProperties;
         /**
@@ -91823,11 +91998,6 @@ var ts;
          * They are persisted between each SourceFile transformation and should not be reset.
          */
         var enabledSubstitutions;
-        /**
-         * A map that keeps track of aliases created for classes with decorators to avoid issues
-         * with the double-binding behavior of classes.
-         */
-        var classAliases;
         /**
          * Keeps track of whether we are within any containing namespaces when performing
          * just-in-time substitution while printing an expression identifier.
@@ -91871,7 +92041,6 @@ var ts;
         function saveStateAndInvoke(node, f) {
             // Save state
             var savedCurrentScope = currentLexicalScope;
-            var savedCurrentNameScope = currentNameScope;
             var savedCurrentScopeFirstDeclarationsOfName = currentScopeFirstDeclarationsOfName;
             var savedCurrentClassHasParameterProperties = currentClassHasParameterProperties;
             // Handle state changes before visiting a node.
@@ -91882,7 +92051,6 @@ var ts;
                 currentScopeFirstDeclarationsOfName = savedCurrentScopeFirstDeclarationsOfName;
             }
             currentLexicalScope = savedCurrentScope;
-            currentNameScope = savedCurrentNameScope;
             currentClassHasParameterProperties = savedCurrentClassHasParameterProperties;
             return visited;
         }
@@ -91898,7 +92066,6 @@ var ts;
                 case 262 /* ModuleBlock */:
                 case 235 /* Block */:
                     currentLexicalScope = node;
-                    currentNameScope = undefined;
                     currentScopeFirstDeclarationsOfName = undefined;
                     break;
                 case 257 /* ClassDeclaration */:
@@ -91916,10 +92083,6 @@ var ts;
                         // programs may also have an undefined name.
                         ts.Debug.assert(node.kind === 257 /* ClassDeclaration */ || ts.hasSyntacticModifier(node, 512 /* Default */));
                     }
-                    if (ts.isClassDeclaration(node)) {
-                        // XXX: should probably also cover interfaces and type aliases that can have type variables?
-                        currentNameScope = node;
-                    }
                     break;
             }
         }
@@ -92021,35 +92184,66 @@ var ts;
             return node;
         }
         /**
-         * Specialized visitor that visits the immediate children of a class with TypeScript syntax.
+         * Gets a specialized visitor that visits the immediate children of a class with TypeScript syntax.
          *
-         * @param node The node to visit.
+         * @param parent The class containing the elements to visit.
          */
-        function classElementVisitor(node) {
-            return saveStateAndInvoke(node, classElementVisitorWorker);
+        function getClassElementVisitor(parent) {
+            return function (node) { return saveStateAndInvoke(node, function (n) { return classElementVisitorWorker(n, parent); }); };
         }
         /**
          * Specialized visitor that visits the immediate children of a class with TypeScript syntax.
          *
          * @param node The node to visit.
          */
-        function classElementVisitorWorker(node) {
+        function classElementVisitorWorker(node, parent) {
             switch (node.kind) {
                 case 171 /* Constructor */:
                     return visitConstructor(node);
                 case 167 /* PropertyDeclaration */:
                     // Property declarations are not TypeScript syntax, but they must be visited
                     // for the decorator transformation.
-                    return visitPropertyDeclaration(node);
-                case 176 /* IndexSignature */:
+                    return visitPropertyDeclaration(node, parent);
                 case 172 /* GetAccessor */:
+                    // Get Accessors can have TypeScript modifiers, decorators, and type annotations.
+                    return visitGetAccessor(node, parent);
                 case 173 /* SetAccessor */:
+                    // Set Accessors can have TypeScript modifiers and type annotations.
+                    return visitSetAccessor(node, parent);
                 case 169 /* MethodDeclaration */:
+                    // TypeScript method declarations may have decorators, modifiers
+                    // or type annotations.
+                    return visitMethodDeclaration(node, parent);
                 case 170 /* ClassStaticBlockDeclaration */:
-                    // Fallback to the default visit behavior.
-                    return visitorWorker(node);
+                    return ts.visitEachChild(node, visitor, context);
                 case 234 /* SemicolonClassElement */:
                     return node;
+                case 176 /* IndexSignature */:
+                    // Index signatures are elided
+                    return;
+                default:
+                    return ts.Debug.failBadSyntaxKind(node);
+            }
+        }
+        function getObjectLiteralElementVisitor(parent) {
+            return function (node) { return saveStateAndInvoke(node, function (n) { return objectLiteralElementVisitorWorker(n, parent); }); };
+        }
+        function objectLiteralElementVisitorWorker(node, parent) {
+            switch (node.kind) {
+                case 296 /* PropertyAssignment */:
+                case 297 /* ShorthandPropertyAssignment */:
+                case 298 /* SpreadAssignment */:
+                    return visitor(node);
+                case 172 /* GetAccessor */:
+                    // Get Accessors can have TypeScript modifiers, decorators, and type annotations.
+                    return visitGetAccessor(node, parent);
+                case 173 /* SetAccessor */:
+                    // Set Accessors can have TypeScript modifiers and type annotations.
+                    return visitSetAccessor(node, parent);
+                case 169 /* MethodDeclaration */:
+                    // TypeScript method declarations may have decorators, modifiers
+                    // or type annotations.
+                    return visitMethodDeclaration(node, parent);
                 default:
                     return ts.Debug.failBadSyntaxKind(node);
             }
@@ -92122,22 +92316,14 @@ var ts;
                 // TypeScript type nodes are elided.
                 // falls through
                 case 176 /* IndexSignature */:
-                // TypeScript index signatures are elided.
-                // falls through
-                case 165 /* Decorator */:
-                    // TypeScript decorators are elided. They will be emitted as part of visitClassDeclaration.
+                    // TypeScript index signatures are elided.
                     return undefined;
                 case 259 /* TypeAliasDeclaration */:
                     // TypeScript type-only declarations are elided.
                     return factory.createNotEmittedStatement(node);
-                case 167 /* PropertyDeclaration */:
-                    // TypeScript property declarations are elided. However their names are still visited, and can potentially be retained if they could have sideeffects
-                    return visitPropertyDeclaration(node);
                 case 264 /* NamespaceExportDeclaration */:
                     // TypeScript namespace export declarations are elided.
                     return undefined;
-                case 171 /* Constructor */:
-                    return visitConstructor(node);
                 case 258 /* InterfaceDeclaration */:
                     // TypeScript interfaces are elided, but some comments may be preserved.
                     // See the implementation of `getLeadingComments` in comments.ts for more details.
@@ -92171,16 +92357,15 @@ var ts;
                 case 228 /* ExpressionWithTypeArguments */:
                     // TypeScript supports type arguments on an expression in an `extends` heritage clause.
                     return visitExpressionWithTypeArguments(node);
+                case 205 /* ObjectLiteralExpression */:
+                    return visitObjectLiteralExpression(node);
+                case 171 /* Constructor */:
+                case 167 /* PropertyDeclaration */:
                 case 169 /* MethodDeclaration */:
-                    // TypeScript method declarations may have decorators, modifiers
-                    // or type annotations.
-                    return visitMethodDeclaration(node);
                 case 172 /* GetAccessor */:
-                    // Get Accessors can have TypeScript modifiers, decorators, and type annotations.
-                    return visitGetAccessor(node);
                 case 173 /* SetAccessor */:
-                    // Set Accessors can have TypeScript modifiers and type annotations.
-                    return visitSetAccessor(node);
+                case 170 /* ClassStaticBlockDeclaration */:
+                    return ts.Debug.fail("Class and object literal elements must be visited with their respective visitors");
                 case 256 /* FunctionDeclaration */:
                     // Typescript function declarations can have modifiers, decorators, and type annotations.
                     return visitFunctionDeclaration(node);
@@ -92246,6 +92431,9 @@ var ts;
                 !ts.isJsonSourceFile(node);
             return factory.updateSourceFile(node, ts.visitLexicalEnvironment(node.statements, sourceElementVisitor, context, /*start*/ 0, alwaysStrict));
         }
+        function visitObjectLiteralExpression(node) {
+            return factory.updateObjectLiteralExpression(node, ts.visitNodes(node.properties, getObjectLiteralElementVisitor(node), ts.isObjectLiteralElement));
+        }
         function getClassFacts(node, staticProperties) {
             var facts = 0 /* None */;
             if (ts.some(staticProperties))
@@ -92268,7 +92456,7 @@ var ts;
             return facts;
         }
         function hasTypeScriptClassSyntax(node) {
-            return !!(node.transformFlags & 4096 /* ContainsTypeScriptClassSyntax */);
+            return !!(node.transformFlags & 8192 /* ContainsTypeScriptClassSyntax */);
         }
         function isClassLikeDeclarationWithTypeScriptSyntax(node) {
             return ts.some(node.decorators)
@@ -92278,7 +92466,9 @@ var ts;
         }
         function visitClassDeclaration(node) {
             if (!isClassLikeDeclarationWithTypeScriptSyntax(node) && !(currentNamespace && ts.hasSyntacticModifier(node, 1 /* Export */))) {
-                return ts.visitEachChild(node, visitor, context);
+                return factory.updateClassDeclaration(node, ts.elideNodes(factory, node.decorators), // preserve positions, if available
+                ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), node.name, 
+                /*typeParameters*/ undefined, ts.visitNodes(node.heritageClauses, visitor, ts.isHeritageClause), ts.visitNodes(node.members, getClassElementVisitor(node), ts.isClassElement));
             }
             var staticProperties = ts.getProperties(node, /*requireInitializer*/ true, /*isStatic*/ true);
             var facts = getClassFacts(node, staticProperties);
@@ -92286,14 +92476,25 @@ var ts;
                 context.startLexicalEnvironment();
             }
             var name = node.name || (facts & 5 /* NeedsName */ ? factory.getGeneratedNameForNode(node) : undefined);
-            var classStatement = facts & 2 /* HasConstructorDecorators */
-                ? createClassDeclarationHeadWithDecorators(node, name)
-                : createClassDeclarationHeadWithoutDecorators(node, name, facts);
+            var allDecorators = getAllDecoratorsOfConstructor(node);
+            var decorators = transformAllDecoratorsOfDeclaration(node, node, allDecorators);
+            // we do not emit modifiers on the declaration if we are emitting an IIFE
+            var modifiers = !(facts & 128 /* UseImmediatelyInvokedFunctionExpression */)
+                ? ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier)
+                : ts.elideNodes(factory, node.modifiers); // preserve positions, if available
+            //  ${modifiers} class ${name} ${heritageClauses} {
+            //      ${members}
+            //  }
+            var classStatement = factory.updateClassDeclaration(node, decorators, modifiers, name, 
+            /*typeParameters*/ undefined, ts.visitNodes(node.heritageClauses, visitor, ts.isHeritageClause), transformClassMembers(node));
+            // To better align with the old emitter, we should not emit a trailing source map
+            // entry if the class has static properties.
+            var emitFlags = ts.getEmitFlags(node);
+            if (facts & 1 /* HasStaticInitializedProperties */) {
+                emitFlags |= 32 /* NoTrailingSourceMap */;
+            }
+            ts.setEmitFlags(classStatement, emitFlags);
             var statements = [classStatement];
-            // Write any decorators of the node.
-            addClassElementDecorationStatements(statements, node, /*isStatic*/ false);
-            addClassElementDecorationStatements(statements, node, /*isStatic*/ true);
-            addConstructorDecorationStatement(statements, node);
             if (facts & 128 /* UseImmediatelyInvokedFunctionExpression */) {
                 // When we emit a TypeScript class down to ES5, we must wrap it in an IIFE so that the
                 // 'es2015' transformer can properly nest static initializers and decorators. The result
@@ -92353,164 +92554,14 @@ var ts;
             }
             return ts.singleOrMany(statements);
         }
-        /**
-         * Transforms a non-decorated class declaration and appends the resulting statements.
-         *
-         * @param node A ClassDeclaration node.
-         * @param name The name of the class.
-         * @param facts Precomputed facts about the class.
-         */
-        function createClassDeclarationHeadWithoutDecorators(node, name, facts) {
-            //  ${modifiers} class ${name} ${heritageClauses} {
-            //      ${members}
-            //  }
-            // we do not emit modifiers on the declaration if we are emitting an IIFE
-            var modifiers = !(facts & 128 /* UseImmediatelyInvokedFunctionExpression */)
-                ? ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier)
-                : undefined;
-            var classDeclaration = factory.createClassDeclaration(
-            /*decorators*/ undefined, modifiers, name, 
-            /*typeParameters*/ undefined, ts.visitNodes(node.heritageClauses, visitor, ts.isHeritageClause), transformClassMembers(node));
-            // To better align with the old emitter, we should not emit a trailing source map
-            // entry if the class has static properties.
-            var emitFlags = ts.getEmitFlags(node);
-            if (facts & 1 /* HasStaticInitializedProperties */) {
-                emitFlags |= 32 /* NoTrailingSourceMap */;
-            }
-            ts.setTextRange(classDeclaration, node);
-            ts.setOriginalNode(classDeclaration, node);
-            ts.setEmitFlags(classDeclaration, emitFlags);
-            return classDeclaration;
-        }
-        /**
-         * Transforms a decorated class declaration and appends the resulting statements. If
-         * the class requires an alias to avoid issues with double-binding, the alias is returned.
-         */
-        function createClassDeclarationHeadWithDecorators(node, name) {
-            // When we emit an ES6 class that has a class decorator, we must tailor the
-            // emit to certain specific cases.
-            //
-            // In the simplest case, we emit the class declaration as a let declaration, and
-            // evaluate decorators after the close of the class body:
-            //
-            //  [Example 1]
-            //  ---------------------------------------------------------------------
-            //  TypeScript                      | Javascript
-            //  ---------------------------------------------------------------------
-            //  @dec                            | let C = class C {
-            //  class C {                       | }
-            //  }                               | C = __decorate([dec], C);
-            //  ---------------------------------------------------------------------
-            //  @dec                            | let C = class C {
-            //  export class C {                | }
-            //  }                               | C = __decorate([dec], C);
-            //                                  | export { C };
-            //  ---------------------------------------------------------------------
-            //
-            // If a class declaration contains a reference to itself *inside* of the class body,
-            // this introduces two bindings to the class: One outside of the class body, and one
-            // inside of the class body. If we apply decorators as in [Example 1] above, there
-            // is the possibility that the decorator `dec` will return a new value for the
-            // constructor, which would result in the binding inside of the class no longer
-            // pointing to the same reference as the binding outside of the class.
-            //
-            // As a result, we must instead rewrite all references to the class *inside* of the
-            // class body to instead point to a local temporary alias for the class:
-            //
-            //  [Example 2]
-            //  ---------------------------------------------------------------------
-            //  TypeScript                      | Javascript
-            //  ---------------------------------------------------------------------
-            //  @dec                            | let C = C_1 = class C {
-            //  class C {                       |   static x() { return C_1.y; }
-            //    static x() { return C.y; }    | }
-            //    static y = 1;                 | C.y = 1;
-            //  }                               | C = C_1 = __decorate([dec], C);
-            //                                  | var C_1;
-            //  ---------------------------------------------------------------------
-            //  @dec                            | let C = class C {
-            //  export class C {                |   static x() { return C_1.y; }
-            //    static x() { return C.y; }    | }
-            //    static y = 1;                 | C.y = 1;
-            //  }                               | C = C_1 = __decorate([dec], C);
-            //                                  | export { C };
-            //                                  | var C_1;
-            //  ---------------------------------------------------------------------
-            //
-            // If a class declaration is the default export of a module, we instead emit
-            // the export after the decorated declaration:
-            //
-            //  [Example 3]
-            //  ---------------------------------------------------------------------
-            //  TypeScript                      | Javascript
-            //  ---------------------------------------------------------------------
-            //  @dec                            | let default_1 = class {
-            //  export default class {          | }
-            //  }                               | default_1 = __decorate([dec], default_1);
-            //                                  | export default default_1;
-            //  ---------------------------------------------------------------------
-            //  @dec                            | let C = class C {
-            //  export default class C {        | }
-            //  }                               | C = __decorate([dec], C);
-            //                                  | export default C;
-            //  ---------------------------------------------------------------------
-            //
-            // If the class declaration is the default export and a reference to itself
-            // inside of the class body, we must emit both an alias for the class *and*
-            // move the export after the declaration:
-            //
-            //  [Example 4]
-            //  ---------------------------------------------------------------------
-            //  TypeScript                      | Javascript
-            //  ---------------------------------------------------------------------
-            //  @dec                            | let C = class C {
-            //  export default class C {        |   static x() { return C_1.y; }
-            //    static x() { return C.y; }    | }
-            //    static y = 1;                 | C.y = 1;
-            //  }                               | C = C_1 = __decorate([dec], C);
-            //                                  | export default C;
-            //                                  | var C_1;
-            //  ---------------------------------------------------------------------
-            //
-            var location = ts.moveRangePastDecorators(node);
-            var classAlias = getClassAliasIfNeeded(node);
-            // When we transform to ES5/3 this will be moved inside an IIFE and should reference the name
-            // without any block-scoped variable collision handling
-            var declName = languageVersion <= 2 /* ES2015 */ ?
-                factory.getInternalName(node, /*allowComments*/ false, /*allowSourceMaps*/ true) :
-                factory.getLocalName(node, /*allowComments*/ false, /*allowSourceMaps*/ true);
-            //  ... = class ${name} ${heritageClauses} {
-            //      ${members}
-            //  }
-            var heritageClauses = ts.visitNodes(node.heritageClauses, visitor, ts.isHeritageClause);
-            var members = transformClassMembers(node);
-            var classExpression = factory.createClassExpression(/*decorators*/ undefined, /*modifiers*/ undefined, name, /*typeParameters*/ undefined, heritageClauses, members);
-            ts.setOriginalNode(classExpression, node);
-            ts.setTextRange(classExpression, location);
-            //  let ${name} = ${classExpression} where name is either declaredName if the class doesn't contain self-reference
-            //                                         or decoratedClassAlias if the class contain self-reference.
-            var statement = factory.createVariableStatement(
-            /*modifiers*/ undefined, factory.createVariableDeclarationList([
-                factory.createVariableDeclaration(declName, 
-                /*exclamationToken*/ undefined, 
-                /*type*/ undefined, classAlias ? factory.createAssignment(classAlias, classExpression) : classExpression)
-            ], 1 /* Let */));
-            ts.setOriginalNode(statement, node);
-            ts.setTextRange(statement, location);
-            ts.setCommentRange(statement, node);
-            return statement;
-        }
         function visitClassExpression(node) {
-            if (!isClassLikeDeclarationWithTypeScriptSyntax(node)) {
-                return ts.visitEachChild(node, visitor, context);
-            }
-            var classExpression = factory.createClassExpression(
-            /*decorators*/ undefined, 
+            var allDecorators = getAllDecoratorsOfConstructor(node);
+            var decorators = transformAllDecoratorsOfDeclaration(node, node, allDecorators);
+            return factory.updateClassExpression(node, decorators, 
             /*modifiers*/ undefined, node.name, 
-            /*typeParameters*/ undefined, ts.visitNodes(node.heritageClauses, visitor, ts.isHeritageClause), transformClassMembers(node));
-            ts.setOriginalNode(classExpression, node);
-            ts.setTextRange(classExpression, node);
-            return classExpression;
+            /*typeParameters*/ undefined, ts.visitNodes(node.heritageClauses, visitor, ts.isHeritageClause), isClassLikeDeclarationWithTypeScriptSyntax(node) ?
+                transformClassMembers(node) :
+                ts.visitNodes(node.members, getClassElementVisitor(node), ts.isClassElement));
         }
         /**
          * Transforms the members of a class.
@@ -92535,48 +92586,9 @@ var ts;
                     }
                 }
             }
-            ts.addRange(members, ts.visitNodes(node.members, classElementVisitor, ts.isClassElement));
+            ts.addRange(members, ts.visitNodes(node.members, getClassElementVisitor(node), ts.isClassElement));
             return ts.setTextRange(factory.createNodeArray(members), /*location*/ node.members);
         }
-        /**
-         * Gets either the static or instance members of a class that are decorated, or have
-         * parameters that are decorated.
-         *
-         * @param node The class containing the member.
-         * @param isStatic A value indicating whether to retrieve static or instance members of
-         *                 the class.
-         */
-        function getDecoratedClassElements(node, isStatic) {
-            return ts.filter(node.members, isStatic ? function (m) { return isStaticDecoratedClassElement(m, node); } : function (m) { return isInstanceDecoratedClassElement(m, node); });
-        }
-        /**
-         * Determines whether a class member is a static member of a class that is decorated, or
-         * has parameters that are decorated.
-         *
-         * @param member The class member.
-         */
-        function isStaticDecoratedClassElement(member, parent) {
-            return isDecoratedClassElement(member, /*isStaticElement*/ true, parent);
-        }
-        /**
-         * Determines whether a class member is an instance member of a class that is decorated,
-         * or has parameters that are decorated.
-         *
-         * @param member The class member.
-         */
-        function isInstanceDecoratedClassElement(member, parent) {
-            return isDecoratedClassElement(member, /*isStaticElement*/ false, parent);
-        }
-        /**
-         * Determines whether a class member is either a static or an instance member of a class
-         * that is decorated, or has parameters that are decorated.
-         *
-         * @param member The class member.
-         */
-        function isDecoratedClassElement(member, isStaticElement, parent) {
-            return ts.nodeOrChildIsDecorated(member, parent)
-                && isStaticElement === ts.isStatic(member);
-        }
         /**
          * Gets an array of arrays of decorators for the parameters of a function-like node.
          * The offset into the result array should correspond to the offset of the parameter.
@@ -92622,14 +92634,14 @@ var ts;
         /**
          * Gets an AllDecorators object containing the decorators for the member and its parameters.
          *
-         * @param node The class node that contains the member.
+         * @param parent The class node that contains the member.
          * @param member The class member.
          */
-        function getAllDecoratorsOfClassElement(node, member) {
+        function getAllDecoratorsOfClassElement(member, parent) {
             switch (member.kind) {
                 case 172 /* GetAccessor */:
                 case 173 /* SetAccessor */:
-                    return getAllDecoratorsOfAccessors(node, member);
+                    return getAllDecoratorsOfAccessors(parent, member);
                 case 169 /* MethodDeclaration */:
                     return getAllDecoratorsOfMethod(member);
                 case 167 /* PropertyDeclaration */:
@@ -92698,209 +92710,82 @@ var ts;
             if (!allDecorators) {
                 return undefined;
             }
-            var decoratorExpressions = [];
-            ts.addRange(decoratorExpressions, ts.map(allDecorators.decorators, transformDecorator));
-            ts.addRange(decoratorExpressions, ts.flatMap(allDecorators.parameters, transformDecoratorsOfParameter));
-            addTypeMetadata(node, container, decoratorExpressions);
-            return decoratorExpressions;
-        }
-        /**
-         * Generates statements used to apply decorators to either the static or instance members
-         * of a class.
-         *
-         * @param node The class node.
-         * @param isStatic A value indicating whether to generate statements for static or
-         *                 instance members.
-         */
-        function addClassElementDecorationStatements(statements, node, isStatic) {
-            ts.addRange(statements, ts.map(generateClassElementDecorationExpressions(node, isStatic), expressionToStatement));
-        }
-        /**
-         * Generates expressions used to apply decorators to either the static or instance members
-         * of a class.
-         *
-         * @param node The class node.
-         * @param isStatic A value indicating whether to generate expressions for static or
-         *                 instance members.
-         */
-        function generateClassElementDecorationExpressions(node, isStatic) {
-            var members = getDecoratedClassElements(node, isStatic);
-            var expressions;
-            for (var _i = 0, members_8 = members; _i < members_8.length; _i++) {
-                var member = members_8[_i];
-                var expression = generateClassElementDecorationExpression(node, member);
-                if (expression) {
-                    if (!expressions) {
-                        expressions = [expression];
-                    }
-                    else {
-                        expressions.push(expression);
-                    }
-                }
-            }
-            return expressions;
-        }
-        /**
-         * Generates an expression used to evaluate class element decorators at runtime.
-         *
-         * @param node The class node that contains the member.
-         * @param member The class member.
-         */
-        function generateClassElementDecorationExpression(node, member) {
-            var allDecorators = getAllDecoratorsOfClassElement(node, member);
-            var decoratorExpressions = transformAllDecoratorsOfDeclaration(member, node, allDecorators);
-            if (!decoratorExpressions) {
-                return undefined;
-            }
-            // Emit the call to __decorate. Given the following:
-            //
-            //   class C {
-            //     @dec method(@dec2 x) {}
-            //     @dec get accessor() {}
-            //     @dec prop;
-            //   }
-            //
-            // The emit for a method is:
-            //
-            //   __decorate([
-            //       dec,
-            //       __param(0, dec2),
-            //       __metadata("design:type", Function),
-            //       __metadata("design:paramtypes", [Object]),
-            //       __metadata("design:returntype", void 0)
-            //   ], C.prototype, "method", null);
-            //
-            // The emit for an accessor is:
-            //
-            //   __decorate([
-            //       dec
-            //   ], C.prototype, "accessor", null);
-            //
-            // The emit for a property is:
-            //
-            //   __decorate([
-            //       dec
-            //   ], C.prototype, "prop");
-            //
-            var prefix = getClassMemberPrefix(node, member);
-            var memberName = getExpressionForPropertyName(member, /*generateNameForComputedPropertyName*/ !ts.hasSyntacticModifier(member, 2 /* Ambient */));
-            var descriptor = languageVersion > 0 /* ES3 */
-                ? member.kind === 167 /* PropertyDeclaration */
-                    // We emit `void 0` here to indicate to `__decorate` that it can invoke `Object.defineProperty` directly, but that it
-                    // should not invoke `Object.getOwnPropertyDescriptor`.
-                    ? factory.createVoidZero()
-                    // We emit `null` here to indicate to `__decorate` that it can invoke `Object.getOwnPropertyDescriptor` directly.
-                    // We have this extra argument here so that we can inject an explicit property descriptor at a later date.
-                    : factory.createNull()
-                : undefined;
-            var helper = emitHelpers().createDecorateHelper(decoratorExpressions, prefix, memberName, descriptor);
-            ts.setTextRange(helper, ts.moveRangePastDecorators(member));
-            ts.setEmitFlags(helper, 1536 /* NoComments */);
-            return helper;
-        }
-        /**
-         * Generates a __decorate helper call for a class constructor.
-         *
-         * @param node The class node.
-         */
-        function addConstructorDecorationStatement(statements, node) {
-            var expression = generateConstructorDecorationExpression(node);
-            if (expression) {
-                statements.push(ts.setOriginalNode(factory.createExpressionStatement(expression), node));
-            }
-        }
-        /**
-         * Generates a __decorate helper call for a class constructor.
-         *
-         * @param node The class node.
-         */
-        function generateConstructorDecorationExpression(node) {
-            var allDecorators = getAllDecoratorsOfConstructor(node);
-            var decoratorExpressions = transformAllDecoratorsOfDeclaration(node, node, allDecorators);
-            if (!decoratorExpressions) {
-                return undefined;
-            }
-            var classAlias = classAliases && classAliases[ts.getOriginalNodeId(node)];
-            // When we transform to ES5/3 this will be moved inside an IIFE and should reference the name
-            // without any block-scoped variable collision handling
-            var localName = languageVersion <= 2 /* ES2015 */ ?
-                factory.getInternalName(node, /*allowComments*/ false, /*allowSourceMaps*/ true) :
-                factory.getLocalName(node, /*allowComments*/ false, /*allowSourceMaps*/ true);
-            var decorate = emitHelpers().createDecorateHelper(decoratorExpressions, localName);
-            var expression = factory.createAssignment(localName, classAlias ? factory.createAssignment(classAlias, decorate) : decorate);
-            ts.setEmitFlags(expression, 1536 /* NoComments */);
-            ts.setSourceMapRange(expression, ts.moveRangePastDecorators(node));
-            return expression;
-        }
-        /**
-         * Transforms a decorator into an expression.
-         *
-         * @param decorator The decorator node.
-         */
-        function transformDecorator(decorator) {
-            return ts.visitNode(decorator.expression, visitor, ts.isExpression);
+            var decorators = ts.visitNodes(allDecorators.decorators, visitor, ts.isDecorator);
+            var parameterDecorators = ts.flatMap(allDecorators.parameters, transformDecoratorsOfParameter);
+            var metadataDecorators = ts.some(decorators) || ts.some(parameterDecorators) ? getTypeMetadata(node, container) : undefined;
+            var result = factory.createNodeArray(ts.concatenate(ts.concatenate(decorators, parameterDecorators), metadataDecorators));
+            ts.setTextRange(result, decorators);
+            return result;
         }
         /**
-         * Transforms the decorators of a parameter.
+         * Transforms the decorators of a parameter into decorators of the class/method.
          *
-         * @param decorators The decorators for the parameter at the provided offset.
+         * @param parameterDecorators The decorators for the parameter at the provided offset.
          * @param parameterOffset The offset of the parameter.
          */
-        function transformDecoratorsOfParameter(decorators, parameterOffset) {
-            var expressions;
-            if (decorators) {
-                expressions = [];
-                for (var _i = 0, decorators_1 = decorators; _i < decorators_1.length; _i++) {
-                    var decorator = decorators_1[_i];
-                    var helper = emitHelpers().createParamHelper(transformDecorator(decorator), parameterOffset);
-                    ts.setTextRange(helper, decorator.expression);
+        function transformDecoratorsOfParameter(parameterDecorators, parameterOffset) {
+            if (parameterDecorators) {
+                var decorators = [];
+                for (var _i = 0, parameterDecorators_1 = parameterDecorators; _i < parameterDecorators_1.length; _i++) {
+                    var parameterDecorator = parameterDecorators_1[_i];
+                    var expression = ts.visitNode(parameterDecorator.expression, visitor, ts.isExpression);
+                    var helper = emitHelpers().createParamHelper(expression, parameterOffset);
+                    ts.setTextRange(helper, parameterDecorator.expression);
                     ts.setEmitFlags(helper, 1536 /* NoComments */);
-                    expressions.push(helper);
+                    var decorator = factory.createDecorator(helper);
+                    ts.setTextRange(decorator, parameterDecorator.expression);
+                    ts.setEmitFlags(decorator, 1536 /* NoComments */);
+                    decorators.push(decorator);
                 }
+                return decorators;
             }
-            return expressions;
         }
         /**
-         * Adds optional type metadata for a declaration.
+         * Gets optional type metadata for a declaration.
          *
          * @param node The declaration node.
-         * @param decoratorExpressions The destination array to which to add new decorator expressions.
          */
-        function addTypeMetadata(node, container, decoratorExpressions) {
-            if (USE_NEW_TYPE_METADATA_FORMAT) {
-                addNewTypeMetadata(node, container, decoratorExpressions);
-            }
-            else {
-                addOldTypeMetadata(node, container, decoratorExpressions);
-            }
+        function getTypeMetadata(node, container) {
+            return USE_NEW_TYPE_METADATA_FORMAT ?
+                getNewTypeMetadata(node, container) :
+                getOldTypeMetadata(node, container);
         }
-        function addOldTypeMetadata(node, container, decoratorExpressions) {
-            if (compilerOptions.emitDecoratorMetadata) {
+        function getOldTypeMetadata(node, container) {
+            if (typeSerializer) {
+                var decorators = void 0;
                 if (shouldAddTypeMetadata(node)) {
-                    decoratorExpressions.push(emitHelpers().createMetadataHelper("design:type", serializeTypeOfNode(node)));
+                    var typeMetadata = emitHelpers().createMetadataHelper("design:type", typeSerializer.serializeTypeOfNode({ currentLexicalScope: currentLexicalScope, currentNameScope: container }, node));
+                    decorators = ts.append(decorators, factory.createDecorator(typeMetadata));
                 }
                 if (shouldAddParamTypesMetadata(node)) {
-                    decoratorExpressions.push(emitHelpers().createMetadataHelper("design:paramtypes", serializeParameterTypesOfNode(node, container)));
+                    var paramTypesMetadata = emitHelpers().createMetadataHelper("design:paramtypes", typeSerializer.serializeParameterTypesOfNode({ currentLexicalScope: currentLexicalScope, currentNameScope: container }, node, container));
+                    decorators = ts.append(decorators, factory.createDecorator(paramTypesMetadata));
                 }
                 if (shouldAddReturnTypeMetadata(node)) {
-                    decoratorExpressions.push(emitHelpers().createMetadataHelper("design:returntype", serializeReturnTypeOfNode(node)));
+                    var returnTypeMetadata = emitHelpers().createMetadataHelper("design:returntype", typeSerializer.serializeReturnTypeOfNode({ currentLexicalScope: currentLexicalScope, currentNameScope: container }, node));
+                    decorators = ts.append(decorators, factory.createDecorator(returnTypeMetadata));
                 }
+                return decorators;
             }
         }
-        function addNewTypeMetadata(node, container, decoratorExpressions) {
-            if (compilerOptions.emitDecoratorMetadata) {
+        function getNewTypeMetadata(node, container) {
+            if (typeSerializer) {
                 var properties = void 0;
                 if (shouldAddTypeMetadata(node)) {
-                    (properties || (properties = [])).push(factory.createPropertyAssignment("type", factory.createArrowFunction(/*modifiers*/ undefined, /*typeParameters*/ undefined, [], /*type*/ undefined, factory.createToken(38 /* EqualsGreaterThanToken */), serializeTypeOfNode(node))));
+                    var typeProperty = factory.createPropertyAssignment("type", factory.createArrowFunction(/*modifiers*/ undefined, /*typeParameters*/ undefined, [], /*type*/ undefined, factory.createToken(38 /* EqualsGreaterThanToken */), typeSerializer.serializeTypeOfNode({ currentLexicalScope: currentLexicalScope, currentNameScope: container }, node)));
+                    properties = ts.append(properties, typeProperty);
                 }
                 if (shouldAddParamTypesMetadata(node)) {
-                    (properties || (properties = [])).push(factory.createPropertyAssignment("paramTypes", factory.createArrowFunction(/*modifiers*/ undefined, /*typeParameters*/ undefined, [], /*type*/ undefined, factory.createToken(38 /* EqualsGreaterThanToken */), serializeParameterTypesOfNode(node, container))));
+                    var paramTypeProperty = factory.createPropertyAssignment("paramTypes", factory.createArrowFunction(/*modifiers*/ undefined, /*typeParameters*/ undefined, [], /*type*/ undefined, factory.createToken(38 /* EqualsGreaterThanToken */), typeSerializer.serializeParameterTypesOfNode({ currentLexicalScope: currentLexicalScope, currentNameScope: container }, node, container)));
+                    properties = ts.append(properties, paramTypeProperty);
                 }
                 if (shouldAddReturnTypeMetadata(node)) {
-                    (properties || (properties = [])).push(factory.createPropertyAssignment("returnType", factory.createArrowFunction(/*modifiers*/ undefined, /*typeParameters*/ undefined, [], /*type*/ undefined, factory.createToken(38 /* EqualsGreaterThanToken */), serializeReturnTypeOfNode(node))));
+                    var returnTypeProperty = factory.createPropertyAssignment("returnType", factory.createArrowFunction(/*modifiers*/ undefined, /*typeParameters*/ undefined, [], /*type*/ undefined, factory.createToken(38 /* EqualsGreaterThanToken */), typeSerializer.serializeReturnTypeOfNode({ currentLexicalScope: currentLexicalScope, currentNameScope: container }, node)));
+                    properties = ts.append(properties, returnTypeProperty);
                 }
                 if (properties) {
-                    decoratorExpressions.push(emitHelpers().createMetadataHelper("design:typeinfo", factory.createObjectLiteralExpression(properties, /*multiLine*/ true)));
+                    var typeInfoMetadata = emitHelpers().createMetadataHelper("design:typeinfo", factory.createObjectLiteralExpression(properties, /*multiLine*/ true));
+                    return [factory.createDecorator(typeInfoMetadata)];
                 }
             }
         }
@@ -92947,347 +92832,6 @@ var ts;
             }
             return false;
         }
-        function getAccessorTypeNode(node) {
-            var accessors = resolver.getAllAccessorDeclarations(node);
-            return accessors.setAccessor && ts.getSetAccessorTypeAnnotationNode(accessors.setAccessor)
-                || accessors.getAccessor && ts.getEffectiveReturnTypeNode(accessors.getAccessor);
-        }
-        /**
-         * Serializes the type of a node for use with decorator type metadata.
-         *
-         * @param node The node that should have its type serialized.
-         */
-        function serializeTypeOfNode(node) {
-            switch (node.kind) {
-                case 167 /* PropertyDeclaration */:
-                case 164 /* Parameter */:
-                    return serializeTypeNode(node.type);
-                case 173 /* SetAccessor */:
-                case 172 /* GetAccessor */:
-                    return serializeTypeNode(getAccessorTypeNode(node));
-                case 257 /* ClassDeclaration */:
-                case 226 /* ClassExpression */:
-                case 169 /* MethodDeclaration */:
-                    return factory.createIdentifier("Function");
-                default:
-                    return factory.createVoidZero();
-            }
-        }
-        /**
-         * Serializes the types of the parameters of a node for use with decorator type metadata.
-         *
-         * @param node The node that should have its parameter types serialized.
-         */
-        function serializeParameterTypesOfNode(node, container) {
-            var valueDeclaration = ts.isClassLike(node)
-                ? ts.getFirstConstructorWithBody(node)
-                : ts.isFunctionLike(node) && ts.nodeIsPresent(node.body)
-                    ? node
-                    : undefined;
-            var expressions = [];
-            if (valueDeclaration) {
-                var parameters = getParametersOfDecoratedDeclaration(valueDeclaration, container);
-                var numParameters = parameters.length;
-                for (var i = 0; i < numParameters; i++) {
-                    var parameter = parameters[i];
-                    if (i === 0 && ts.isIdentifier(parameter.name) && parameter.name.escapedText === "this") {
-                        continue;
-                    }
-                    if (parameter.dotDotDotToken) {
-                        expressions.push(serializeTypeNode(ts.getRestParameterElementType(parameter.type)));
-                    }
-                    else {
-                        expressions.push(serializeTypeOfNode(parameter));
-                    }
-                }
-            }
-            return factory.createArrayLiteralExpression(expressions);
-        }
-        function getParametersOfDecoratedDeclaration(node, container) {
-            if (container && node.kind === 172 /* GetAccessor */) {
-                var setAccessor = ts.getAllAccessorDeclarations(container.members, node).setAccessor;
-                if (setAccessor) {
-                    return setAccessor.parameters;
-                }
-            }
-            return node.parameters;
-        }
-        /**
-         * Serializes the return type of a node for use with decorator type metadata.
-         *
-         * @param node The node that should have its return type serialized.
-         */
-        function serializeReturnTypeOfNode(node) {
-            if (ts.isFunctionLike(node) && node.type) {
-                return serializeTypeNode(node.type);
-            }
-            else if (ts.isAsyncFunction(node)) {
-                return factory.createIdentifier("Promise");
-            }
-            return factory.createVoidZero();
-        }
-        /**
-         * Serializes a type node for use with decorator type metadata.
-         *
-         * Types are serialized in the following fashion:
-         * - Void types point to "undefined" (e.g. "void 0")
-         * - Function and Constructor types point to the global "Function" constructor.
-         * - Interface types with a call or construct signature types point to the global
-         *   "Function" constructor.
-         * - Array and Tuple types point to the global "Array" constructor.
-         * - Type predicates and booleans point to the global "Boolean" constructor.
-         * - String literal types and strings point to the global "String" constructor.
-         * - Enum and number types point to the global "Number" constructor.
-         * - Symbol types point to the global "Symbol" constructor.
-         * - Type references to classes (or class-like variables) point to the constructor for the class.
-         * - Anything else points to the global "Object" constructor.
-         *
-         * @param node The type node to serialize.
-         */
-        function serializeTypeNode(node) {
-            if (node === undefined) {
-                return factory.createIdentifier("Object");
-            }
-            switch (node.kind) {
-                case 114 /* VoidKeyword */:
-                case 153 /* UndefinedKeyword */:
-                case 143 /* NeverKeyword */:
-                    return factory.createVoidZero();
-                case 191 /* ParenthesizedType */:
-                    return serializeTypeNode(node.type);
-                case 179 /* FunctionType */:
-                case 180 /* ConstructorType */:
-                    return factory.createIdentifier("Function");
-                case 183 /* ArrayType */:
-                case 184 /* TupleType */:
-                    return factory.createIdentifier("Array");
-                case 177 /* TypePredicate */:
-                case 133 /* BooleanKeyword */:
-                    return factory.createIdentifier("Boolean");
-                case 198 /* TemplateLiteralType */:
-                case 150 /* StringKeyword */:
-                    return factory.createIdentifier("String");
-                case 148 /* ObjectKeyword */:
-                    return factory.createIdentifier("Object");
-                case 196 /* LiteralType */:
-                    switch (node.literal.kind) {
-                        case 10 /* StringLiteral */:
-                        case 14 /* NoSubstitutionTemplateLiteral */:
-                            return factory.createIdentifier("String");
-                        case 219 /* PrefixUnaryExpression */:
-                        case 8 /* NumericLiteral */:
-                            return factory.createIdentifier("Number");
-                        case 9 /* BigIntLiteral */:
-                            return getGlobalBigIntNameWithFallback();
-                        case 110 /* TrueKeyword */:
-                        case 95 /* FalseKeyword */:
-                            return factory.createIdentifier("Boolean");
-                        case 104 /* NullKeyword */:
-                            return factory.createVoidZero();
-                        default:
-                            return ts.Debug.failBadSyntaxKind(node.literal);
-                    }
-                case 147 /* NumberKeyword */:
-                    return factory.createIdentifier("Number");
-                case 158 /* BigIntKeyword */:
-                    return getGlobalBigIntNameWithFallback();
-                case 151 /* SymbolKeyword */:
-                    return languageVersion < 2 /* ES2015 */
-                        ? getGlobalSymbolNameWithFallback()
-                        : factory.createIdentifier("Symbol");
-                case 178 /* TypeReference */:
-                    return serializeTypeReferenceNode(node);
-                case 188 /* IntersectionType */:
-                case 187 /* UnionType */:
-                    return serializeTypeList(node.types);
-                case 189 /* ConditionalType */:
-                    return serializeTypeList([node.trueType, node.falseType]);
-                case 193 /* TypeOperator */:
-                    if (node.operator === 145 /* ReadonlyKeyword */) {
-                        return serializeTypeNode(node.type);
-                    }
-                    break;
-                case 181 /* TypeQuery */:
-                case 194 /* IndexedAccessType */:
-                case 195 /* MappedType */:
-                case 182 /* TypeLiteral */:
-                case 130 /* AnyKeyword */:
-                case 155 /* UnknownKeyword */:
-                case 192 /* ThisType */:
-                case 200 /* ImportType */:
-                    break;
-                // handle JSDoc types from an invalid parse
-                case 312 /* JSDocAllType */:
-                case 313 /* JSDocUnknownType */:
-                case 317 /* JSDocFunctionType */:
-                case 318 /* JSDocVariadicType */:
-                case 319 /* JSDocNamepathType */:
-                    break;
-                case 314 /* JSDocNullableType */:
-                case 315 /* JSDocNonNullableType */:
-                case 316 /* JSDocOptionalType */:
-                    return serializeTypeNode(node.type);
-                default:
-                    return ts.Debug.failBadSyntaxKind(node);
-            }
-            return factory.createIdentifier("Object");
-        }
-        function serializeTypeList(types) {
-            // Note when updating logic here also update getEntityNameForDecoratorMetadata
-            // so that aliases can be marked as referenced
-            var serializedUnion;
-            for (var _i = 0, types_22 = types; _i < types_22.length; _i++) {
-                var typeNode = types_22[_i];
-                while (typeNode.kind === 191 /* ParenthesizedType */) {
-                    typeNode = typeNode.type; // Skip parens if need be
-                }
-                if (typeNode.kind === 143 /* NeverKeyword */) {
-                    continue; // Always elide `never` from the union/intersection if possible
-                }
-                if (!strictNullChecks && (typeNode.kind === 196 /* LiteralType */ && typeNode.literal.kind === 104 /* NullKeyword */ || typeNode.kind === 153 /* UndefinedKeyword */)) {
-                    continue; // Elide null and undefined from unions for metadata, just like what we did prior to the implementation of strict null checks
-                }
-                var serializedIndividual = serializeTypeNode(typeNode);
-                if (ts.isIdentifier(serializedIndividual) && serializedIndividual.escapedText === "Object") {
-                    // One of the individual is global object, return immediately
-                    return serializedIndividual;
-                }
-                // If there exists union that is not void 0 expression, check if the the common type is identifier.
-                // anything more complex and we will just default to Object
-                else if (serializedUnion) {
-                    // Different types
-                    if (!ts.isIdentifier(serializedUnion) ||
-                        !ts.isIdentifier(serializedIndividual) ||
-                        serializedUnion.escapedText !== serializedIndividual.escapedText) {
-                        return factory.createIdentifier("Object");
-                    }
-                }
-                else {
-                    // Initialize the union type
-                    serializedUnion = serializedIndividual;
-                }
-            }
-            // If we were able to find common type, use it
-            return serializedUnion || factory.createVoidZero(); // Fallback is only hit if all union constituients are null/undefined/never
-        }
-        /**
-         * Serializes a TypeReferenceNode to an appropriate JS constructor value for use with
-         * decorator type metadata.
-         *
-         * @param node The type reference node.
-         */
-        function serializeTypeReferenceNode(node) {
-            var kind = resolver.getTypeReferenceSerializationKind(node.typeName, currentNameScope || currentLexicalScope);
-            switch (kind) {
-                case ts.TypeReferenceSerializationKind.Unknown:
-                    // From conditional type type reference that cannot be resolved is Similar to any or unknown
-                    if (ts.findAncestor(node, function (n) { return n.parent && ts.isConditionalTypeNode(n.parent) && (n.parent.trueType === n || n.parent.falseType === n); })) {
-                        return factory.createIdentifier("Object");
-                    }
-                    var serialized = serializeEntityNameAsExpressionFallback(node.typeName);
-                    var temp = factory.createTempVariable(hoistVariableDeclaration);
-                    return factory.createConditionalExpression(factory.createTypeCheck(factory.createAssignment(temp, serialized), "function"), 
-                    /*questionToken*/ undefined, temp, 
-                    /*colonToken*/ undefined, factory.createIdentifier("Object"));
-                case ts.TypeReferenceSerializationKind.TypeWithConstructSignatureAndValue:
-                    return serializeEntityNameAsExpression(node.typeName);
-                case ts.TypeReferenceSerializationKind.VoidNullableOrNeverType:
-                    return factory.createVoidZero();
-                case ts.TypeReferenceSerializationKind.BigIntLikeType:
-                    return getGlobalBigIntNameWithFallback();
-                case ts.TypeReferenceSerializationKind.BooleanType:
-                    return factory.createIdentifier("Boolean");
-                case ts.TypeReferenceSerializationKind.NumberLikeType:
-                    return factory.createIdentifier("Number");
-                case ts.TypeReferenceSerializationKind.StringLikeType:
-                    return factory.createIdentifier("String");
-                case ts.TypeReferenceSerializationKind.ArrayLikeType:
-                    return factory.createIdentifier("Array");
-                case ts.TypeReferenceSerializationKind.ESSymbolType:
-                    return languageVersion < 2 /* ES2015 */
-                        ? getGlobalSymbolNameWithFallback()
-                        : factory.createIdentifier("Symbol");
-                case ts.TypeReferenceSerializationKind.TypeWithCallSignature:
-                    return factory.createIdentifier("Function");
-                case ts.TypeReferenceSerializationKind.Promise:
-                    return factory.createIdentifier("Promise");
-                case ts.TypeReferenceSerializationKind.ObjectType:
-                    return factory.createIdentifier("Object");
-                default:
-                    return ts.Debug.assertNever(kind);
-            }
-        }
-        function createCheckedValue(left, right) {
-            return factory.createLogicalAnd(factory.createStrictInequality(factory.createTypeOfExpression(left), factory.createStringLiteral("undefined")), right);
-        }
-        /**
-         * Serializes an entity name which may not exist at runtime, but whose access shouldn't throw
-         *
-         * @param node The entity name to serialize.
-         */
-        function serializeEntityNameAsExpressionFallback(node) {
-            if (node.kind === 79 /* Identifier */) {
-                // A -> typeof A !== undefined && A
-                var copied = serializeEntityNameAsExpression(node);
-                return createCheckedValue(copied, copied);
-            }
-            if (node.left.kind === 79 /* Identifier */) {
-                // A.B -> typeof A !== undefined && A.B
-                return createCheckedValue(serializeEntityNameAsExpression(node.left), serializeEntityNameAsExpression(node));
-            }
-            // A.B.C -> typeof A !== undefined && (_a = A.B) !== void 0 && _a.C
-            var left = serializeEntityNameAsExpressionFallback(node.left);
-            var temp = factory.createTempVariable(hoistVariableDeclaration);
-            return factory.createLogicalAnd(factory.createLogicalAnd(left.left, factory.createStrictInequality(factory.createAssignment(temp, left.right), factory.createVoidZero())), factory.createPropertyAccessExpression(temp, node.right));
-        }
-        /**
-         * Serializes an entity name as an expression for decorator type metadata.
-         *
-         * @param node The entity name to serialize.
-         */
-        function serializeEntityNameAsExpression(node) {
-            switch (node.kind) {
-                case 79 /* Identifier */:
-                    // Create a clone of the name with a new parent, and treat it as if it were
-                    // a source tree node for the purposes of the checker.
-                    var name = ts.setParent(ts.setTextRange(ts.parseNodeFactory.cloneNode(node), node), node.parent);
-                    name.original = undefined;
-                    ts.setParent(name, ts.getParseTreeNode(currentLexicalScope)); // ensure the parent is set to a parse tree node.
-                    return name;
-                case 161 /* QualifiedName */:
-                    return serializeQualifiedNameAsExpression(node);
-            }
-        }
-        /**
-         * Serializes an qualified name as an expression for decorator type metadata.
-         *
-         * @param node The qualified name to serialize.
-         * @param useFallback A value indicating whether to use logical operators to test for the
-         *                    qualified name at runtime.
-         */
-        function serializeQualifiedNameAsExpression(node) {
-            return factory.createPropertyAccessExpression(serializeEntityNameAsExpression(node.left), node.right);
-        }
-        /**
-         * Gets an expression that points to the global "Symbol" constructor at runtime if it is
-         * available.
-         */
-        function getGlobalSymbolNameWithFallback() {
-            return factory.createConditionalExpression(factory.createTypeCheck(factory.createIdentifier("Symbol"), "function"), 
-            /*questionToken*/ undefined, factory.createIdentifier("Symbol"), 
-            /*colonToken*/ undefined, factory.createIdentifier("Object"));
-        }
-        /**
-         * Gets an expression that points to the global "BigInt" constructor at runtime if it is
-         * available.
-         */
-        function getGlobalBigIntNameWithFallback() {
-            return languageVersion < 99 /* ESNext */
-                ? factory.createConditionalExpression(factory.createTypeCheck(factory.createIdentifier("BigInt"), "function"), 
-                /*questionToken*/ undefined, factory.createIdentifier("BigInt"), 
-                /*colonToken*/ undefined, factory.createIdentifier("Object"))
-                : factory.createIdentifier("BigInt");
-        }
         /**
          * Gets an expression that represents a property name (for decorated properties or enums).
          * For a computed property, a name is generated for the node.
@@ -93372,21 +92916,23 @@ var ts;
         function shouldEmitFunctionLikeDeclaration(node) {
             return !ts.nodeIsMissing(node.body);
         }
-        function visitPropertyDeclaration(node) {
-            if (node.flags & 16777216 /* Ambient */ || ts.hasSyntacticModifier(node, 128 /* Abstract */)) {
+        function visitPropertyDeclaration(node, parent) {
+            var isAmbient = node.flags & 16777216 /* Ambient */ || ts.hasSyntacticModifier(node, 128 /* Abstract */);
+            if (isAmbient && !ts.some(node.decorators)) {
                 return undefined;
             }
-            var updated = factory.updatePropertyDeclaration(node, 
-            /*decorators*/ undefined, ts.visitNodes(node.modifiers, visitor, ts.isModifier), visitPropertyNameOfClassElement(node), 
+            var allDecorators = getAllDecoratorsOfClassElement(node, parent);
+            var decorators = transformAllDecoratorsOfDeclaration(node, parent, allDecorators);
+            // Preserve a `declare x` property with decorators to be handled by the decorators transform
+            if (isAmbient) {
+                return factory.updatePropertyDeclaration(node, decorators, factory.createModifiersFromModifierFlags(2 /* Ambient */), ts.visitNode(node.name, visitor, ts.isPropertyName), 
+                /*questionOrExclamationToken*/ undefined, 
+                /*type*/ undefined, 
+                /*initializer*/ undefined);
+            }
+            return factory.updatePropertyDeclaration(node, decorators, ts.visitNodes(node.modifiers, visitor, ts.isModifier), visitPropertyNameOfClassElement(node), 
             /*questionOrExclamationToken*/ undefined, 
             /*type*/ undefined, ts.visitNode(node.initializer, visitor));
-            if (updated !== node) {
-                // While we emit the source map for the node after skipping decorators and modifiers,
-                // we need to emit the comments for the original range.
-                ts.setCommentRange(updated, node);
-                ts.setSourceMapRange(updated, ts.moveRangePastDecorators(node));
-            }
-            return updated;
         }
         function visitConstructor(node) {
             if (!shouldEmitFunctionLikeDeclaration(node)) {
@@ -93394,7 +92940,7 @@ var ts;
             }
             return factory.updateConstructorDeclaration(node, 
             /*decorators*/ undefined, 
-            /*modifiers*/ undefined, ts.visitParameterList(node.parameters, visitor, context), transformConstructorBody(node.body, node));
+            /*modifiers*/ ts.visitNodes(node.modifiers, visitor, ts.isModifier), ts.visitParameterList(node.parameters, visitor, context), transformConstructorBody(node.body, node));
         }
         function transformConstructorBody(body, constructor) {
             var parametersWithPropertyAssignments = constructor &&
@@ -93458,22 +93004,19 @@ var ts;
             ts.setEmitFlags(localName, 1536 /* NoComments */);
             return ts.startOnNewLine(ts.removeAllComments(ts.setTextRange(ts.setOriginalNode(factory.createExpressionStatement(factory.createAssignment(ts.setTextRange(factory.createPropertyAccessExpression(factory.createThis(), propertyName), node.name), localName)), node), ts.moveRangePos(node, -1))));
         }
-        function visitMethodDeclaration(node) {
+        function visitMethodDeclaration(node, parent) {
+            if (!(node.transformFlags & 1 /* ContainsTypeScript */)) {
+                return node;
+            }
             if (!shouldEmitFunctionLikeDeclaration(node)) {
                 return undefined;
             }
-            var updated = factory.updateMethodDeclaration(node, 
-            /*decorators*/ undefined, ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), node.asteriskToken, visitPropertyNameOfClassElement(node), 
+            var allDecorators = ts.isClassLike(parent) ? getAllDecoratorsOfClassElement(node, parent) : undefined;
+            var decorators = ts.isClassLike(parent) ? transformAllDecoratorsOfDeclaration(node, parent, allDecorators) : undefined;
+            return factory.updateMethodDeclaration(node, decorators, ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), node.asteriskToken, visitPropertyNameOfClassElement(node), 
             /*questionToken*/ undefined, 
             /*typeParameters*/ undefined, ts.visitParameterList(node.parameters, visitor, context), 
             /*type*/ undefined, ts.visitFunctionBody(node.body, visitor, context));
-            if (updated !== node) {
-                // While we emit the source map for the node after skipping decorators and modifiers,
-                // we need to emit the comments for the original range.
-                ts.setCommentRange(updated, node);
-                ts.setSourceMapRange(updated, ts.moveRangePastDecorators(node));
-            }
-            return updated;
         }
         /**
          * Determines whether to emit an accessor declaration. We should not emit the
@@ -93484,34 +93027,30 @@ var ts;
         function shouldEmitAccessorDeclaration(node) {
             return !(ts.nodeIsMissing(node.body) && ts.hasSyntacticModifier(node, 128 /* Abstract */));
         }
-        function visitGetAccessor(node) {
+        function visitGetAccessor(node, parent) {
+            if (!(node.transformFlags & 1 /* ContainsTypeScript */)) {
+                return node;
+            }
             if (!shouldEmitAccessorDeclaration(node)) {
                 return undefined;
             }
-            var updated = factory.updateGetAccessorDeclaration(node, 
-            /*decorators*/ undefined, ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), visitPropertyNameOfClassElement(node), ts.visitParameterList(node.parameters, visitor, context), 
+            var decorators = ts.isClassLike(parent) ?
+                transformAllDecoratorsOfDeclaration(node, parent, getAllDecoratorsOfClassElement(node, parent)) :
+                undefined;
+            return factory.updateGetAccessorDeclaration(node, decorators, ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), visitPropertyNameOfClassElement(node), ts.visitParameterList(node.parameters, visitor, context), 
             /*type*/ undefined, ts.visitFunctionBody(node.body, visitor, context) || factory.createBlock([]));
-            if (updated !== node) {
-                // While we emit the source map for the node after skipping decorators and modifiers,
-                // we need to emit the comments for the original range.
-                ts.setCommentRange(updated, node);
-                ts.setSourceMapRange(updated, ts.moveRangePastDecorators(node));
-            }
-            return updated;
         }
-        function visitSetAccessor(node) {
+        function visitSetAccessor(node, parent) {
+            if (!(node.transformFlags & 1 /* ContainsTypeScript */)) {
+                return node;
+            }
             if (!shouldEmitAccessorDeclaration(node)) {
                 return undefined;
             }
-            var updated = factory.updateSetAccessorDeclaration(node, 
-            /*decorators*/ undefined, ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), visitPropertyNameOfClassElement(node), ts.visitParameterList(node.parameters, visitor, context), ts.visitFunctionBody(node.body, visitor, context) || factory.createBlock([]));
-            if (updated !== node) {
-                // While we emit the source map for the node after skipping decorators and modifiers,
-                // we need to emit the comments for the original range.
-                ts.setCommentRange(updated, node);
-                ts.setSourceMapRange(updated, ts.moveRangePastDecorators(node));
-            }
-            return updated;
+            var decorators = ts.isClassLike(parent) ?
+                transformAllDecoratorsOfDeclaration(node, parent, getAllDecoratorsOfClassElement(node, parent)) :
+                undefined;
+            return factory.updateSetAccessorDeclaration(node, decorators, ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), visitPropertyNameOfClassElement(node), ts.visitParameterList(node.parameters, visitor, context), ts.visitFunctionBody(node.body, visitor, context) || factory.createBlock([]));
         }
         function visitFunctionDeclaration(node) {
             if (!shouldEmitFunctionLikeDeclaration(node)) {
@@ -93547,9 +93086,9 @@ var ts;
             if (ts.parameterIsThisKeyword(node)) {
                 return undefined;
             }
-            var updated = factory.updateParameterDeclaration(node, 
-            /*decorators*/ undefined, 
-            /*modifiers*/ undefined, node.dotDotDotToken, ts.visitNode(node.name, visitor, ts.isBindingName), 
+            var updated = factory.updateParameterDeclaration(node, ts.elideNodes(factory, node.decorators), // preserve positions, if available
+            ts.elideNodes(factory, node.modifiers), // preserve positions, if available
+            node.dotDotDotToken, ts.visitNode(node.name, visitor, ts.isBindingName), 
             /*questionToken*/ undefined, 
             /*type*/ undefined, ts.visitNode(node.initializer, visitor, ts.isExpression));
             if (updated !== node) {
@@ -94245,12 +93784,6 @@ var ts;
             return isExternalModuleExport(node)
                 && ts.hasSyntacticModifier(node, 512 /* Default */);
         }
-        /**
-         * Creates a statement for the provided expression. This is used in calls to `map`.
-         */
-        function expressionToStatement(expression) {
-            return factory.createExpressionStatement(expression);
-        }
         function addExportMemberAssignment(statements, node) {
             var expression = factory.createAssignment(factory.getExternalModuleOrNamespaceExportName(currentNamespaceContainerName, node, /*allowComments*/ false, /*allowSourceMaps*/ true), factory.getLocalName(node));
             ts.setSourceMapRange(expression, ts.createRange(node.name ? node.name.pos : node.pos, node.end));
@@ -94282,44 +93815,12 @@ var ts;
         function getNamespaceContainerName(node) {
             return factory.getGeneratedNameForNode(node);
         }
-        /**
-         * Gets a local alias for a class declaration if it is a decorated class with an internal
-         * reference to the static side of the class. This is necessary to avoid issues with
-         * double-binding semantics for the class name.
-         */
-        function getClassAliasIfNeeded(node) {
-            if (resolver.getNodeCheckFlags(node) & 16777216 /* ClassWithConstructorReference */) {
-                enableSubstitutionForClassAliases();
-                var classAlias = factory.createUniqueName(node.name && !ts.isGeneratedIdentifier(node.name) ? ts.idText(node.name) : "default");
-                classAliases[ts.getOriginalNodeId(node)] = classAlias;
-                hoistVariableDeclaration(classAlias);
-                return classAlias;
-            }
-        }
-        function getClassPrototype(node) {
-            return factory.createPropertyAccessExpression(factory.getDeclarationName(node), "prototype");
-        }
-        function getClassMemberPrefix(node, member) {
-            return ts.isStatic(member)
-                ? factory.getDeclarationName(node)
-                : getClassPrototype(node);
-        }
         function enableSubstitutionForNonQualifiedEnumMembers() {
             if ((enabledSubstitutions & 8 /* NonQualifiedEnumMembers */) === 0) {
                 enabledSubstitutions |= 8 /* NonQualifiedEnumMembers */;
                 context.enableSubstitution(79 /* Identifier */);
             }
         }
-        function enableSubstitutionForClassAliases() {
-            if ((enabledSubstitutions & 1 /* ClassAliases */) === 0) {
-                enabledSubstitutions |= 1 /* ClassAliases */;
-                // We need to enable substitutions for identifiers. This allows us to
-                // substitute class names inside of a class declaration.
-                context.enableSubstitution(79 /* Identifier */);
-                // Keep track of class aliases.
-                classAliases = [];
-            }
-        }
         function enableSubstitutionForNamespaceExports() {
             if ((enabledSubstitutions & 2 /* NamespaceExports */) === 0) {
                 enabledSubstitutions |= 2 /* NamespaceExports */;
@@ -94404,32 +93905,9 @@ var ts;
             return node;
         }
         function substituteExpressionIdentifier(node) {
-            return trySubstituteClassAlias(node)
-                || trySubstituteNamespaceExportedName(node)
+            return trySubstituteNamespaceExportedName(node)
                 || node;
         }
-        function trySubstituteClassAlias(node) {
-            if (enabledSubstitutions & 1 /* ClassAliases */) {
-                if (resolver.getNodeCheckFlags(node) & 33554432 /* ConstructorReferenceInClass */) {
-                    // Due to the emit for class decorators, any reference to the class from inside of the class body
-                    // must instead be rewritten to point to a temporary variable to avoid issues with the double-bind
-                    // behavior of class names in ES6.
-                    // Also, when emitting statics for class expressions, we must substitute a class alias for
-                    // constructor references in static property initializers.
-                    var declaration = resolver.getReferencedValueDeclaration(node);
-                    if (declaration) {
-                        var classAlias = classAliases[declaration.id]; // TODO: GH#18217
-                        if (classAlias) {
-                            var clone_2 = factory.cloneNode(classAlias);
-                            ts.setSourceMapRange(clone_2, node);
-                            ts.setCommentRange(clone_2, node);
-                            return clone_2;
-                        }
-                    }
-                }
-            }
-            return undefined;
-        }
         function trySubstituteNamespaceExportedName(node) {
             // If this is explicitly a local name, do not substitute.
             if (enabledSubstitutions & applicableSubstitutions && !ts.isGeneratedIdentifier(node) && !ts.isLocalName(node)) {
@@ -94567,7 +94045,7 @@ var ts;
             return visited;
         }
         function visitorWorker(node, valueIsDiscarded) {
-            if (node.transformFlags & 8388608 /* ContainsClassFields */) {
+            if (node.transformFlags & 16777216 /* ContainsClassFields */) {
                 switch (node.kind) {
                     case 226 /* ClassExpression */:
                     case 257 /* ClassDeclaration */:
@@ -94582,8 +94060,8 @@ var ts;
                         return visitClassStaticBlockDeclaration(node);
                 }
             }
-            if (node.transformFlags & 8388608 /* ContainsClassFields */ ||
-                node.transformFlags & 33554432 /* ContainsLexicalSuper */ &&
+            if (node.transformFlags & 16777216 /* ContainsClassFields */ ||
+                node.transformFlags & 134217728 /* ContainsLexicalSuper */ &&
                     shouldTransformSuperInStaticInitializers &&
                     currentStaticPropertyDeclarationOrStaticBlock &&
                     currentClassLexicalEnvironment) {
@@ -95157,13 +94635,13 @@ var ts;
                     facts |= 2 /* NeedsClassConstructorReference */;
                 }
                 if (ts.isPropertyDeclaration(member) || ts.isClassStaticBlockDeclaration(member)) {
-                    if (shouldTransformThisInStaticInitializers && member.transformFlags & 8192 /* ContainsLexicalThis */) {
+                    if (shouldTransformThisInStaticInitializers && member.transformFlags & 16384 /* ContainsLexicalThis */) {
                         facts |= 8 /* NeedsSubstitutionForThisInClassStaticField */;
                         if (!(facts & 1 /* ClassWasDecorated */)) {
                             facts |= 2 /* NeedsClassConstructorReference */;
                         }
                     }
-                    if (shouldTransformSuperInStaticInitializers && member.transformFlags & 33554432 /* ContainsLexicalSuper */) {
+                    if (shouldTransformSuperInStaticInitializers && member.transformFlags & 134217728 /* ContainsLexicalSuper */) {
                         if (!(facts & 1 /* ClassWasDecorated */)) {
                             facts |= 2 /* NeedsClassConstructorReference */ | 4 /* NeedsClassSuperReference */;
                         }
@@ -95748,10 +95226,10 @@ var ts;
                     if (declaration) {
                         var classAlias = classAliases[declaration.id]; // TODO: GH#18217
                         if (classAlias) {
-                            var clone_3 = factory.cloneNode(classAlias);
-                            ts.setSourceMapRange(clone_3, node);
-                            ts.setCommentRange(clone_3, node);
-                            return clone_3;
+                            var clone_2 = factory.cloneNode(classAlias);
+                            ts.setSourceMapRange(clone_2, node);
+                            ts.setCommentRange(clone_2, node);
+                            return clone_2;
                         }
                     }
                 }
@@ -96113,6 +95591,965 @@ var ts;
 })(ts || (ts = {}));
 /*@internal*/
 var ts;
+(function (ts) {
+    function createRuntimeTypeSerializer(context) {
+        var hoistVariableDeclaration = context.hoistVariableDeclaration;
+        var resolver = context.getEmitResolver();
+        var compilerOptions = context.getCompilerOptions();
+        var languageVersion = ts.getEmitScriptTarget(compilerOptions);
+        var strictNullChecks = ts.getStrictOptionValue(compilerOptions, "strictNullChecks");
+        var currentLexicalScope;
+        var currentNameScope;
+        return {
+            serializeTypeNode: function (serializerContext, node) { return setSerializerContextAnd(serializerContext, serializeTypeNode, node); },
+            serializeTypeOfNode: function (serializerContext, node) { return setSerializerContextAnd(serializerContext, serializeTypeOfNode, node); },
+            serializeParameterTypesOfNode: function (serializerContext, node, container) { return setSerializerContextAnd(serializerContext, serializeParameterTypesOfNode, node, container); },
+            serializeReturnTypeOfNode: function (serializerContext, node) { return setSerializerContextAnd(serializerContext, serializeReturnTypeOfNode, node); },
+        };
+        function setSerializerContextAnd(serializerContext, cb, node, arg) {
+            var savedCurrentLexicalScope = currentLexicalScope;
+            var savedCurrentNameScope = currentNameScope;
+            currentLexicalScope = serializerContext.currentLexicalScope;
+            currentNameScope = serializerContext.currentNameScope;
+            var result = arg === undefined ? cb(node) : cb(node, arg);
+            currentLexicalScope = savedCurrentLexicalScope;
+            currentNameScope = savedCurrentNameScope;
+            return result;
+        }
+        function getAccessorTypeNode(node) {
+            var accessors = resolver.getAllAccessorDeclarations(node);
+            return accessors.setAccessor && ts.getSetAccessorTypeAnnotationNode(accessors.setAccessor)
+                || accessors.getAccessor && ts.getEffectiveReturnTypeNode(accessors.getAccessor);
+        }
+        /**
+         * Serializes the type of a node for use with decorator type metadata.
+         * @param node The node that should have its type serialized.
+         */
+        function serializeTypeOfNode(node) {
+            switch (node.kind) {
+                case 167 /* PropertyDeclaration */:
+                case 164 /* Parameter */:
+                    return serializeTypeNode(node.type);
+                case 173 /* SetAccessor */:
+                case 172 /* GetAccessor */:
+                    return serializeTypeNode(getAccessorTypeNode(node));
+                case 257 /* ClassDeclaration */:
+                case 226 /* ClassExpression */:
+                case 169 /* MethodDeclaration */:
+                    return ts.factory.createIdentifier("Function");
+                default:
+                    return ts.factory.createVoidZero();
+            }
+        }
+        /**
+         * Serializes the type of a node for use with decorator type metadata.
+         * @param node The node that should have its type serialized.
+         */
+        function serializeParameterTypesOfNode(node, container) {
+            var valueDeclaration = ts.isClassLike(node)
+                ? ts.getFirstConstructorWithBody(node)
+                : ts.isFunctionLike(node) && ts.nodeIsPresent(node.body)
+                    ? node
+                    : undefined;
+            var expressions = [];
+            if (valueDeclaration) {
+                var parameters = getParametersOfDecoratedDeclaration(valueDeclaration, container);
+                var numParameters = parameters.length;
+                for (var i = 0; i < numParameters; i++) {
+                    var parameter = parameters[i];
+                    if (i === 0 && ts.isIdentifier(parameter.name) && parameter.name.escapedText === "this") {
+                        continue;
+                    }
+                    if (parameter.dotDotDotToken) {
+                        expressions.push(serializeTypeNode(ts.getRestParameterElementType(parameter.type)));
+                    }
+                    else {
+                        expressions.push(serializeTypeOfNode(parameter));
+                    }
+                }
+            }
+            return ts.factory.createArrayLiteralExpression(expressions);
+        }
+        function getParametersOfDecoratedDeclaration(node, container) {
+            if (container && node.kind === 172 /* GetAccessor */) {
+                var setAccessor = ts.getAllAccessorDeclarations(container.members, node).setAccessor;
+                if (setAccessor) {
+                    return setAccessor.parameters;
+                }
+            }
+            return node.parameters;
+        }
+        /**
+         * Serializes the return type of a node for use with decorator type metadata.
+         * @param node The node that should have its return type serialized.
+         */
+        function serializeReturnTypeOfNode(node) {
+            if (ts.isFunctionLike(node) && node.type) {
+                return serializeTypeNode(node.type);
+            }
+            else if (ts.isAsyncFunction(node)) {
+                return ts.factory.createIdentifier("Promise");
+            }
+            return ts.factory.createVoidZero();
+        }
+        /**
+         * Serializes a type node for use with decorator type metadata.
+         *
+         * Types are serialized in the following fashion:
+         * - Void types point to "undefined" (e.g. "void 0")
+         * - Function and Constructor types point to the global "Function" constructor.
+         * - Interface types with a call or construct signature types point to the global
+         *   "Function" constructor.
+         * - Array and Tuple types point to the global "Array" constructor.
+         * - Type predicates and booleans point to the global "Boolean" constructor.
+         * - String literal types and strings point to the global "String" constructor.
+         * - Enum and number types point to the global "Number" constructor.
+         * - Symbol types point to the global "Symbol" constructor.
+         * - Type references to classes (or class-like variables) point to the constructor for the class.
+         * - Anything else points to the global "Object" constructor.
+         *
+         * @param node The type node to serialize.
+         */
+        function serializeTypeNode(node) {
+            if (node === undefined) {
+                return ts.factory.createIdentifier("Object");
+            }
+            node = ts.skipTypeParentheses(node);
+            switch (node.kind) {
+                case 114 /* VoidKeyword */:
+                case 153 /* UndefinedKeyword */:
+                case 143 /* NeverKeyword */:
+                    return ts.factory.createVoidZero();
+                case 179 /* FunctionType */:
+                case 180 /* ConstructorType */:
+                    return ts.factory.createIdentifier("Function");
+                case 183 /* ArrayType */:
+                case 184 /* TupleType */:
+                    return ts.factory.createIdentifier("Array");
+                case 177 /* TypePredicate */:
+                    return node.assertsModifier ?
+                        ts.factory.createVoidZero() :
+                        ts.factory.createIdentifier("Boolean");
+                case 133 /* BooleanKeyword */:
+                    return ts.factory.createIdentifier("Boolean");
+                case 198 /* TemplateLiteralType */:
+                case 150 /* StringKeyword */:
+                    return ts.factory.createIdentifier("String");
+                case 148 /* ObjectKeyword */:
+                    return ts.factory.createIdentifier("Object");
+                case 196 /* LiteralType */:
+                    return serializeLiteralOfLiteralTypeNode(node.literal);
+                case 147 /* NumberKeyword */:
+                    return ts.factory.createIdentifier("Number");
+                case 158 /* BigIntKeyword */:
+                    return getGlobalConstructor("BigInt", 7 /* ES2020 */);
+                case 151 /* SymbolKeyword */:
+                    return getGlobalConstructor("Symbol", 2 /* ES2015 */);
+                case 178 /* TypeReference */:
+                    return serializeTypeReferenceNode(node);
+                case 188 /* IntersectionType */:
+                    return serializeUnionOrIntersectionConstituents(node.types, /*isIntersection*/ true);
+                case 187 /* UnionType */:
+                    return serializeUnionOrIntersectionConstituents(node.types, /*isIntersection*/ false);
+                case 189 /* ConditionalType */:
+                    return serializeUnionOrIntersectionConstituents([node.trueType, node.falseType], /*isIntersection*/ false);
+                case 193 /* TypeOperator */:
+                    if (node.operator === 145 /* ReadonlyKeyword */) {
+                        return serializeTypeNode(node.type);
+                    }
+                    break;
+                case 181 /* TypeQuery */:
+                case 194 /* IndexedAccessType */:
+                case 195 /* MappedType */:
+                case 182 /* TypeLiteral */:
+                case 130 /* AnyKeyword */:
+                case 155 /* UnknownKeyword */:
+                case 192 /* ThisType */:
+                case 200 /* ImportType */:
+                    break;
+                // handle JSDoc types from an invalid parse
+                case 312 /* JSDocAllType */:
+                case 313 /* JSDocUnknownType */:
+                case 317 /* JSDocFunctionType */:
+                case 318 /* JSDocVariadicType */:
+                case 319 /* JSDocNamepathType */:
+                    break;
+                case 314 /* JSDocNullableType */:
+                case 315 /* JSDocNonNullableType */:
+                case 316 /* JSDocOptionalType */:
+                    return serializeTypeNode(node.type);
+                default:
+                    return ts.Debug.failBadSyntaxKind(node);
+            }
+            return ts.factory.createIdentifier("Object");
+        }
+        function serializeLiteralOfLiteralTypeNode(node) {
+            switch (node.kind) {
+                case 10 /* StringLiteral */:
+                case 14 /* NoSubstitutionTemplateLiteral */:
+                    return ts.factory.createIdentifier("String");
+                case 219 /* PrefixUnaryExpression */: {
+                    var operand = node.operand;
+                    switch (operand.kind) {
+                        case 8 /* NumericLiteral */:
+                        case 9 /* BigIntLiteral */:
+                            return serializeLiteralOfLiteralTypeNode(operand);
+                        default:
+                            return ts.Debug.failBadSyntaxKind(operand);
+                    }
+                }
+                case 8 /* NumericLiteral */:
+                    return ts.factory.createIdentifier("Number");
+                case 9 /* BigIntLiteral */:
+                    return getGlobalConstructor("BigInt", 7 /* ES2020 */);
+                case 110 /* TrueKeyword */:
+                case 95 /* FalseKeyword */:
+                    return ts.factory.createIdentifier("Boolean");
+                case 104 /* NullKeyword */:
+                    return ts.factory.createVoidZero();
+                default:
+                    return ts.Debug.failBadSyntaxKind(node);
+            }
+        }
+        function serializeUnionOrIntersectionConstituents(types, isIntersection) {
+            // Note when updating logic here also update `getEntityNameForDecoratorMetadata` in checker.ts so that aliases can be marked as referenced
+            var serializedType;
+            for (var _i = 0, types_22 = types; _i < types_22.length; _i++) {
+                var typeNode = types_22[_i];
+                typeNode = ts.skipTypeParentheses(typeNode);
+                if (typeNode.kind === 143 /* NeverKeyword */) {
+                    if (isIntersection)
+                        return ts.factory.createVoidZero(); // Reduce to `never` in an intersection
+                    continue; // Elide `never` in a union
+                }
+                if (typeNode.kind === 155 /* UnknownKeyword */) {
+                    if (!isIntersection)
+                        return ts.factory.createIdentifier("Object"); // Reduce to `unknown` in a union
+                    continue; // Elide `unknown` in an intersection
+                }
+                if (typeNode.kind === 130 /* AnyKeyword */) {
+                    return ts.factory.createIdentifier("Object"); // Reduce to `any` in a union or intersection
+                }
+                if (!strictNullChecks && ((ts.isLiteralTypeNode(typeNode) && typeNode.literal.kind === 104 /* NullKeyword */) || typeNode.kind === 153 /* UndefinedKeyword */)) {
+                    continue; // Elide null and undefined from unions for metadata, just like what we did prior to the implementation of strict null checks
+                }
+                var serializedConstituent = serializeTypeNode(typeNode);
+                if (ts.isIdentifier(serializedConstituent) && serializedConstituent.escapedText === "Object") {
+                    // One of the individual is global object, return immediately
+                    return serializedConstituent;
+                }
+                // If there exists union that is not `void 0` expression, check if the the common type is identifier.
+                // anything more complex and we will just default to Object
+                if (serializedType) {
+                    // Different types
+                    if (!equateSerializedTypeNodes(serializedType, serializedConstituent)) {
+                        return ts.factory.createIdentifier("Object");
+                    }
+                }
+                else {
+                    // Initialize the union type
+                    serializedType = serializedConstituent;
+                }
+            }
+            // If we were able to find common type, use it
+            return serializedType !== null && serializedType !== void 0 ? serializedType : (ts.factory.createVoidZero()); // Fallback is only hit if all union constituents are null/undefined/never
+        }
+        function equateSerializedTypeNodes(left, right) {
+            return (
+            // temp vars used in fallback
+            ts.isGeneratedIdentifier(left) ? ts.isGeneratedIdentifier(right) :
+                // entity names
+                ts.isIdentifier(left) ? ts.isIdentifier(right)
+                    && left.escapedText === right.escapedText :
+                    ts.isPropertyAccessExpression(left) ? ts.isPropertyAccessExpression(right)
+                        && equateSerializedTypeNodes(left.expression, right.expression)
+                        && equateSerializedTypeNodes(left.name, right.name) :
+                        // `void 0`
+                        ts.isVoidExpression(left) ? ts.isVoidExpression(right)
+                            && ts.isNumericLiteral(left.expression) && left.expression.text === "0"
+                            && ts.isNumericLiteral(right.expression) && right.expression.text === "0" :
+                            // `"undefined"` or `"function"` in `typeof` checks
+                            ts.isStringLiteral(left) ? ts.isStringLiteral(right)
+                                && left.text === right.text :
+                                // used in `typeof` checks for fallback
+                                ts.isTypeOfExpression(left) ? ts.isTypeOfExpression(right)
+                                    && equateSerializedTypeNodes(left.expression, right.expression) :
+                                    // parens in `typeof` checks with temps
+                                    ts.isParenthesizedExpression(left) ? ts.isParenthesizedExpression(right)
+                                        && equateSerializedTypeNodes(left.expression, right.expression) :
+                                        // conditionals used in fallback
+                                        ts.isConditionalExpression(left) ? ts.isConditionalExpression(right)
+                                            && equateSerializedTypeNodes(left.condition, right.condition)
+                                            && equateSerializedTypeNodes(left.whenTrue, right.whenTrue)
+                                            && equateSerializedTypeNodes(left.whenFalse, right.whenFalse) :
+                                            // logical binary and assignments used in fallback
+                                            ts.isBinaryExpression(left) ? ts.isBinaryExpression(right)
+                                                && left.operatorToken.kind === right.operatorToken.kind
+                                                && equateSerializedTypeNodes(left.left, right.left)
+                                                && equateSerializedTypeNodes(left.right, right.right) :
+                                                false);
+        }
+        /**
+         * Serializes a TypeReferenceNode to an appropriate JS constructor value for use with decorator type metadata.
+         * @param node The type reference node.
+         */
+        function serializeTypeReferenceNode(node) {
+            var kind = resolver.getTypeReferenceSerializationKind(node.typeName, currentNameScope !== null && currentNameScope !== void 0 ? currentNameScope : currentLexicalScope);
+            switch (kind) {
+                case ts.TypeReferenceSerializationKind.Unknown:
+                    // From conditional type type reference that cannot be resolved is Similar to any or unknown
+                    if (ts.findAncestor(node, function (n) { return n.parent && ts.isConditionalTypeNode(n.parent) && (n.parent.trueType === n || n.parent.falseType === n); })) {
+                        return ts.factory.createIdentifier("Object");
+                    }
+                    var serialized = serializeEntityNameAsExpressionFallback(node.typeName);
+                    var temp = ts.factory.createTempVariable(hoistVariableDeclaration);
+                    return ts.factory.createConditionalExpression(ts.factory.createTypeCheck(ts.factory.createAssignment(temp, serialized), "function"), 
+                    /*questionToken*/ undefined, temp, 
+                    /*colonToken*/ undefined, ts.factory.createIdentifier("Object"));
+                case ts.TypeReferenceSerializationKind.TypeWithConstructSignatureAndValue:
+                    return serializeEntityNameAsExpression(node.typeName);
+                case ts.TypeReferenceSerializationKind.VoidNullableOrNeverType:
+                    return ts.factory.createVoidZero();
+                case ts.TypeReferenceSerializationKind.BigIntLikeType:
+                    return getGlobalConstructor("BigInt", 7 /* ES2020 */);
+                case ts.TypeReferenceSerializationKind.BooleanType:
+                    return ts.factory.createIdentifier("Boolean");
+                case ts.TypeReferenceSerializationKind.NumberLikeType:
+                    return ts.factory.createIdentifier("Number");
+                case ts.TypeReferenceSerializationKind.StringLikeType:
+                    return ts.factory.createIdentifier("String");
+                case ts.TypeReferenceSerializationKind.ArrayLikeType:
+                    return ts.factory.createIdentifier("Array");
+                case ts.TypeReferenceSerializationKind.ESSymbolType:
+                    return getGlobalConstructor("Symbol", 2 /* ES2015 */);
+                case ts.TypeReferenceSerializationKind.TypeWithCallSignature:
+                    return ts.factory.createIdentifier("Function");
+                case ts.TypeReferenceSerializationKind.Promise:
+                    return ts.factory.createIdentifier("Promise");
+                case ts.TypeReferenceSerializationKind.ObjectType:
+                    return ts.factory.createIdentifier("Object");
+                default:
+                    return ts.Debug.assertNever(kind);
+            }
+        }
+        /**
+         * Produces an expression that results in `right` if `left` is not undefined at runtime:
+         *
+         * ```
+         * typeof left !== "undefined" && right
+         * ```
+         *
+         * We use `typeof L !== "undefined"` (rather than `L !== undefined`) since `L` may not be declared.
+         * It's acceptable for this expression to result in `false` at runtime, as the result is intended to be
+         * further checked by any containing expression.
+         */
+        function createCheckedValue(left, right) {
+            return ts.factory.createLogicalAnd(ts.factory.createStrictInequality(ts.factory.createTypeOfExpression(left), ts.factory.createStringLiteral("undefined")), right);
+        }
+        /**
+         * Serializes an entity name which may not exist at runtime, but whose access shouldn't throw
+         * @param node The entity name to serialize.
+         */
+        function serializeEntityNameAsExpressionFallback(node) {
+            if (node.kind === 79 /* Identifier */) {
+                // A -> typeof A !== "undefined" && A
+                var copied = serializeEntityNameAsExpression(node);
+                return createCheckedValue(copied, copied);
+            }
+            if (node.left.kind === 79 /* Identifier */) {
+                // A.B -> typeof A !== "undefined" && A.B
+                return createCheckedValue(serializeEntityNameAsExpression(node.left), serializeEntityNameAsExpression(node));
+            }
+            // A.B.C -> typeof A !== "undefined" && (_a = A.B) !== void 0 && _a.C
+            var left = serializeEntityNameAsExpressionFallback(node.left);
+            var temp = ts.factory.createTempVariable(hoistVariableDeclaration);
+            return ts.factory.createLogicalAnd(ts.factory.createLogicalAnd(left.left, ts.factory.createStrictInequality(ts.factory.createAssignment(temp, left.right), ts.factory.createVoidZero())), ts.factory.createPropertyAccessExpression(temp, node.right));
+        }
+        /**
+         * Serializes an entity name as an expression for decorator type metadata.
+         * @param node The entity name to serialize.
+         */
+        function serializeEntityNameAsExpression(node) {
+            switch (node.kind) {
+                case 79 /* Identifier */:
+                    // Create a clone of the name with a new parent, and treat it as if it were
+                    // a source tree node for the purposes of the checker.
+                    var name = ts.setParent(ts.setTextRange(ts.parseNodeFactory.cloneNode(node), node), node.parent);
+                    name.original = undefined;
+                    ts.setParent(name, ts.getParseTreeNode(currentLexicalScope)); // ensure the parent is set to a parse tree node.
+                    return name;
+                case 161 /* QualifiedName */:
+                    return serializeQualifiedNameAsExpression(node);
+            }
+        }
+        /**
+         * Serializes an qualified name as an expression for decorator type metadata.
+         * @param node The qualified name to serialize.
+         */
+        function serializeQualifiedNameAsExpression(node) {
+            return ts.factory.createPropertyAccessExpression(serializeEntityNameAsExpression(node.left), node.right);
+        }
+        function getGlobalConstructorWithFallback(name) {
+            return ts.factory.createConditionalExpression(ts.factory.createTypeCheck(ts.factory.createIdentifier(name), "function"), 
+            /*questionToken*/ undefined, ts.factory.createIdentifier(name), 
+            /*colonToken*/ undefined, ts.factory.createIdentifier("Object"));
+        }
+        function getGlobalConstructor(name, minLanguageVersion) {
+            return languageVersion < minLanguageVersion ?
+                getGlobalConstructorWithFallback(name) :
+                ts.factory.createIdentifier(name);
+        }
+    }
+    ts.createRuntimeTypeSerializer = createRuntimeTypeSerializer;
+})(ts || (ts = {}));
+/*@internal*/
+var ts;
+(function (ts) {
+    function transformLegacyDecorators(context) {
+        var factory = context.factory, emitHelpers = context.getEmitHelperFactory, hoistVariableDeclaration = context.hoistVariableDeclaration;
+        var resolver = context.getEmitResolver();
+        var compilerOptions = context.getCompilerOptions();
+        var languageVersion = ts.getEmitScriptTarget(compilerOptions);
+        // Save the previous transformation hooks.
+        var previousOnSubstituteNode = context.onSubstituteNode;
+        // Set new transformation hooks.
+        context.onSubstituteNode = onSubstituteNode;
+        /**
+         * A map that keeps track of aliases created for classes with decorators to avoid issues
+         * with the double-binding behavior of classes.
+         */
+        var classAliases;
+        return ts.chainBundle(context, transformSourceFile);
+        function transformSourceFile(node) {
+            var visited = ts.visitEachChild(node, visitor, context);
+            ts.addEmitHelpers(visited, context.readEmitHelpers());
+            return visited;
+        }
+        function visitor(node) {
+            if (!(node.transformFlags & 33554432 /* ContainsDecorators */)) {
+                return node;
+            }
+            switch (node.kind) {
+                case 165 /* Decorator */:
+                    // Decorators are elided. They will be emitted as part of `visitClassDeclaration`.
+                    return undefined;
+                case 257 /* ClassDeclaration */:
+                    return visitClassDeclaration(node);
+                case 226 /* ClassExpression */:
+                    return visitClassExpression(node);
+                case 171 /* Constructor */:
+                    return visitConstructorDeclaration(node);
+                case 169 /* MethodDeclaration */:
+                    return visitMethodDeclaration(node);
+                case 173 /* SetAccessor */:
+                    return visitSetAccessorDeclaration(node);
+                case 172 /* GetAccessor */:
+                    return visitGetAccessorDeclaration(node);
+                case 170 /* ClassStaticBlockDeclaration */:
+                    return visitClassStaticBlockDeclaration(node);
+                case 167 /* PropertyDeclaration */:
+                    return visitPropertyDeclaration(node);
+                case 164 /* Parameter */:
+                    return visitParameterDeclaration(node);
+                default:
+                    return ts.visitEachChild(node, visitor, context);
+            }
+        }
+        function visitClassDeclaration(node) {
+            if (!(ts.classOrConstructorParameterIsDecorated(node) || ts.childIsDecorated(node)))
+                return ts.visitEachChild(node, visitor, context);
+            var classStatement = ts.some(node.decorators) ?
+                createClassDeclarationHeadWithDecorators(node, node.name) :
+                createClassDeclarationHeadWithoutDecorators(node, node.name);
+            var statements = [classStatement];
+            // Write any decorators of the node.
+            addClassElementDecorationStatements(statements, node, /*isStatic*/ false);
+            addClassElementDecorationStatements(statements, node, /*isStatic*/ true);
+            addConstructorDecorationStatement(statements, node);
+            if (statements.length > 1) {
+                // Add a DeclarationMarker as a marker for the end of the declaration
+                statements.push(factory.createEndOfDeclarationMarker(node));
+                ts.setEmitFlags(classStatement, ts.getEmitFlags(classStatement) | 4194304 /* HasEndOfDeclarationMarker */);
+            }
+            return ts.singleOrMany(statements);
+        }
+        /**
+         * Transforms a non-decorated class declaration.
+         *
+         * @param node A ClassDeclaration node.
+         * @param name The name of the class.
+         */
+        function createClassDeclarationHeadWithoutDecorators(node, name) {
+            //  ${modifiers} class ${name} ${heritageClauses} {
+            //      ${members}
+            //  }
+            return factory.updateClassDeclaration(node, ts.elideNodes(factory, node.decorators), node.modifiers, name, 
+            /*typeParameters*/ undefined, ts.visitNodes(node.heritageClauses, visitor, ts.isHeritageClause), ts.visitNodes(node.members, visitor, ts.isClassElement));
+        }
+        /**
+         * Transforms a decorated class declaration and appends the resulting statements. If
+         * the class requires an alias to avoid issues with double-binding, the alias is returned.
+         */
+        function createClassDeclarationHeadWithDecorators(node, name) {
+            // When we emit an ES6 class that has a class decorator, we must tailor the
+            // emit to certain specific cases.
+            //
+            // In the simplest case, we emit the class declaration as a let declaration, and
+            // evaluate decorators after the close of the class body:
+            //
+            //  [Example 1]
+            //  ---------------------------------------------------------------------
+            //  TypeScript                      | Javascript
+            //  ---------------------------------------------------------------------
+            //  @dec                            | let C = class C {
+            //  class C {                       | }
+            //  }                               | C = __decorate([dec], C);
+            //  ---------------------------------------------------------------------
+            //  @dec                            | let C = class C {
+            //  export class C {                | }
+            //  }                               | C = __decorate([dec], C);
+            //                                  | export { C };
+            //  ---------------------------------------------------------------------
+            //
+            // If a class declaration contains a reference to itself *inside* of the class body,
+            // this introduces two bindings to the class: One outside of the class body, and one
+            // inside of the class body. If we apply decorators as in [Example 1] above, there
+            // is the possibility that the decorator `dec` will return a new value for the
+            // constructor, which would result in the binding inside of the class no longer
+            // pointing to the same reference as the binding outside of the class.
+            //
+            // As a result, we must instead rewrite all references to the class *inside* of the
+            // class body to instead point to a local temporary alias for the class:
+            //
+            //  [Example 2]
+            //  ---------------------------------------------------------------------
+            //  TypeScript                      | Javascript
+            //  ---------------------------------------------------------------------
+            //  @dec                            | let C = C_1 = class C {
+            //  class C {                       |   static x() { return C_1.y; }
+            //    static x() { return C.y; }    | }
+            //    static y = 1;                 | C.y = 1;
+            //  }                               | C = C_1 = __decorate([dec], C);
+            //                                  | var C_1;
+            //  ---------------------------------------------------------------------
+            //  @dec                            | let C = class C {
+            //  export class C {                |   static x() { return C_1.y; }
+            //    static x() { return C.y; }    | }
+            //    static y = 1;                 | C.y = 1;
+            //  }                               | C = C_1 = __decorate([dec], C);
+            //                                  | export { C };
+            //                                  | var C_1;
+            //  ---------------------------------------------------------------------
+            //
+            // If a class declaration is the default export of a module, we instead emit
+            // the export after the decorated declaration:
+            //
+            //  [Example 3]
+            //  ---------------------------------------------------------------------
+            //  TypeScript                      | Javascript
+            //  ---------------------------------------------------------------------
+            //  @dec                            | let default_1 = class {
+            //  export default class {          | }
+            //  }                               | default_1 = __decorate([dec], default_1);
+            //                                  | export default default_1;
+            //  ---------------------------------------------------------------------
+            //  @dec                            | let C = class C {
+            //  export default class C {        | }
+            //  }                               | C = __decorate([dec], C);
+            //                                  | export default C;
+            //  ---------------------------------------------------------------------
+            //
+            // If the class declaration is the default export and a reference to itself
+            // inside of the class body, we must emit both an alias for the class *and*
+            // move the export after the declaration:
+            //
+            //  [Example 4]
+            //  ---------------------------------------------------------------------
+            //  TypeScript                      | Javascript
+            //  ---------------------------------------------------------------------
+            //  @dec                            | let C = class C {
+            //  export default class C {        |   static x() { return C_1.y; }
+            //    static x() { return C.y; }    | }
+            //    static y = 1;                 | C.y = 1;
+            //  }                               | C = C_1 = __decorate([dec], C);
+            //                                  | export default C;
+            //                                  | var C_1;
+            //  ---------------------------------------------------------------------
+            //
+            var location = ts.moveRangePastModifiers(node);
+            var classAlias = getClassAliasIfNeeded(node);
+            // When we transform to ES5/3 this will be moved inside an IIFE and should reference the name
+            // without any block-scoped variable collision handling
+            var declName = languageVersion <= 2 /* ES2015 */ ?
+                factory.getInternalName(node, /*allowComments*/ false, /*allowSourceMaps*/ true) :
+                factory.getLocalName(node, /*allowComments*/ false, /*allowSourceMaps*/ true);
+            //  ... = class ${name} ${heritageClauses} {
+            //      ${members}
+            //  }
+            var heritageClauses = ts.visitNodes(node.heritageClauses, visitor, ts.isHeritageClause);
+            var members = ts.visitNodes(node.members, visitor, ts.isClassElement);
+            var classExpression = factory.createClassExpression(/*decorators*/ undefined, /*modifiers*/ undefined, name, /*typeParameters*/ undefined, heritageClauses, members);
+            ts.setOriginalNode(classExpression, node);
+            ts.setTextRange(classExpression, location);
+            //  let ${name} = ${classExpression} where name is either declaredName if the class doesn't contain self-reference
+            //                                         or decoratedClassAlias if the class contain self-reference.
+            var statement = factory.createVariableStatement(
+            /*modifiers*/ undefined, factory.createVariableDeclarationList([
+                factory.createVariableDeclaration(declName, 
+                /*exclamationToken*/ undefined, 
+                /*type*/ undefined, classAlias ? factory.createAssignment(classAlias, classExpression) : classExpression)
+            ], 1 /* Let */));
+            ts.setOriginalNode(statement, node);
+            ts.setTextRange(statement, location);
+            ts.setCommentRange(statement, node);
+            return statement;
+        }
+        function visitClassExpression(node) {
+            // Legacy decorators were not supported on class expressions
+            return factory.updateClassExpression(node, ts.elideNodes(factory, node.decorators), node.modifiers, node.name, 
+            /*typeParameters*/ undefined, ts.visitNodes(node.heritageClauses, visitor, ts.isHeritageClause), ts.visitNodes(node.members, visitor, ts.isClassElement));
+        }
+        function visitConstructorDeclaration(node) {
+            return factory.updateConstructorDeclaration(node, 
+            /*decorators*/ undefined, node.modifiers, ts.visitNodes(node.parameters, visitor, ts.isParameterDeclaration), ts.visitNode(node.body, visitor, ts.isBlock));
+        }
+        function finishClassElement(updated, original) {
+            if (updated !== original) {
+                // While we emit the source map for the node after skipping decorators and modifiers,
+                // we need to emit the comments for the original range.
+                ts.setCommentRange(updated, original);
+                ts.setSourceMapRange(updated, ts.moveRangePastModifiers(original));
+            }
+            return updated;
+        }
+        function visitMethodDeclaration(node) {
+            return finishClassElement(factory.updateMethodDeclaration(node, ts.elideNodes(factory, node.decorators), node.modifiers, node.asteriskToken, ts.visitNode(node.name, visitor, ts.isPropertyName), 
+            /*questionToken*/ undefined, 
+            /*typeParameters*/ undefined, ts.visitNodes(node.parameters, visitor, ts.isParameterDeclaration), 
+            /*type*/ undefined, ts.visitNode(node.body, visitor, ts.isBlock)), node);
+        }
+        function visitGetAccessorDeclaration(node) {
+            return finishClassElement(factory.updateGetAccessorDeclaration(node, ts.elideNodes(factory, node.decorators), node.modifiers, ts.visitNode(node.name, visitor, ts.isPropertyName), ts.visitNodes(node.parameters, visitor, ts.isParameterDeclaration), 
+            /*type*/ undefined, ts.visitNode(node.body, visitor, ts.isBlock)), node);
+        }
+        function visitSetAccessorDeclaration(node) {
+            return finishClassElement(factory.updateSetAccessorDeclaration(node, ts.elideNodes(factory, node.decorators), node.modifiers, ts.visitNode(node.name, visitor, ts.isPropertyName), ts.visitNodes(node.parameters, visitor, ts.isParameterDeclaration), ts.visitNode(node.body, visitor, ts.isBlock)), node);
+        }
+        function visitClassStaticBlockDeclaration(node) {
+            return factory.updateClassStaticBlockDeclaration(node, 
+            /*decorators*/ undefined, node.modifiers, ts.visitNode(node.body, visitor, ts.isBlock));
+        }
+        function visitPropertyDeclaration(node) {
+            if (node.flags & 16777216 /* Ambient */ || ts.hasSyntacticModifier(node, 2 /* Ambient */)) {
+                return undefined;
+            }
+            return finishClassElement(factory.updatePropertyDeclaration(node, ts.elideNodes(factory, node.decorators), node.modifiers, ts.visitNode(node.name, visitor, ts.isPropertyName), 
+            /*questionOrExclamationToken*/ undefined, 
+            /*type*/ undefined, ts.visitNode(node.initializer, visitor, ts.isExpression)), node);
+        }
+        function visitParameterDeclaration(node) {
+            var updated = factory.updateParameterDeclaration(node, ts.elideNodes(factory, node.decorators), 
+            /*modifiers*/ undefined, node.dotDotDotToken, ts.visitNode(node.name, visitor, ts.isBindingName), 
+            /*questionToken*/ undefined, 
+            /*type*/ undefined, ts.visitNode(node.initializer, visitor, ts.isExpression));
+            if (updated !== node) {
+                // While we emit the source map for the node after skipping decorators and modifiers,
+                // we need to emit the comments for the original range.
+                ts.setCommentRange(updated, node);
+                ts.setTextRange(updated, ts.moveRangePastModifiers(node));
+                ts.setSourceMapRange(updated, ts.moveRangePastModifiers(node));
+                ts.setEmitFlags(updated.name, 32 /* NoTrailingSourceMap */);
+            }
+            return updated;
+        }
+        /**
+         * Transforms all of the decorators for a declaration into an array of expressions.
+         *
+         * @param allDecorators An object containing all of the decorators for the declaration.
+         */
+        function transformAllDecoratorsOfDeclaration(allDecorators) {
+            if (!allDecorators) {
+                return undefined;
+            }
+            var decoratorExpressions = [];
+            ts.addRange(decoratorExpressions, ts.map(allDecorators.decorators, transformDecorator));
+            ts.addRange(decoratorExpressions, ts.flatMap(allDecorators.parameters, transformDecoratorsOfParameter));
+            return decoratorExpressions;
+        }
+        /**
+         * Generates statements used to apply decorators to either the static or instance members
+         * of a class.
+         *
+         * @param node The class node.
+         * @param isStatic A value indicating whether to generate statements for static or
+         *                 instance members.
+         */
+        function addClassElementDecorationStatements(statements, node, isStatic) {
+            ts.addRange(statements, ts.map(generateClassElementDecorationExpressions(node, isStatic), function (expr) { return factory.createExpressionStatement(expr); }));
+        }
+        /**
+         * Determines whether a class member is either a static or an instance member of a class
+         * that is decorated, or has parameters that are decorated.
+         *
+         * @param member The class member.
+         */
+        function isDecoratedClassElement(member, isStaticElement, parent) {
+            return ts.nodeOrChildIsDecorated(member, parent)
+                && isStaticElement === ts.isStatic(member);
+        }
+        /**
+         * Gets either the static or instance members of a class that are decorated, or have
+         * parameters that are decorated.
+         *
+         * @param node The class containing the member.
+         * @param isStatic A value indicating whether to retrieve static or instance members of
+         *                 the class.
+         */
+        function getDecoratedClassElements(node, isStatic) {
+            return ts.filter(node.members, function (m) { return isDecoratedClassElement(m, isStatic, node); });
+        }
+        /**
+         * Generates expressions used to apply decorators to either the static or instance members
+         * of a class.
+         *
+         * @param node The class node.
+         * @param isStatic A value indicating whether to generate expressions for static or
+         *                 instance members.
+         */
+        function generateClassElementDecorationExpressions(node, isStatic) {
+            var members = getDecoratedClassElements(node, isStatic);
+            var expressions;
+            for (var _i = 0, members_8 = members; _i < members_8.length; _i++) {
+                var member = members_8[_i];
+                expressions = ts.append(expressions, generateClassElementDecorationExpression(node, member));
+            }
+            return expressions;
+        }
+        /**
+         * Generates an expression used to evaluate class element decorators at runtime.
+         *
+         * @param node The class node that contains the member.
+         * @param member The class member.
+         */
+        function generateClassElementDecorationExpression(node, member) {
+            var allDecorators = ts.getAllDecoratorsOfClassElement(member, node);
+            var decoratorExpressions = transformAllDecoratorsOfDeclaration(allDecorators);
+            if (!decoratorExpressions) {
+                return undefined;
+            }
+            // Emit the call to __decorate. Given the following:
+            //
+            //   class C {
+            //     @dec method(@dec2 x) {}
+            //     @dec get accessor() {}
+            //     @dec prop;
+            //   }
+            //
+            // The emit for a method is:
+            //
+            //   __decorate([
+            //       dec,
+            //       __param(0, dec2),
+            //       __metadata("design:type", Function),
+            //       __metadata("design:paramtypes", [Object]),
+            //       __metadata("design:returntype", void 0)
+            //   ], C.prototype, "method", null);
+            //
+            // The emit for an accessor is:
+            //
+            //   __decorate([
+            //       dec
+            //   ], C.prototype, "accessor", null);
+            //
+            // The emit for a property is:
+            //
+            //   __decorate([
+            //       dec
+            //   ], C.prototype, "prop");
+            //
+            var prefix = getClassMemberPrefix(node, member);
+            var memberName = getExpressionForPropertyName(member, /*generateNameForComputedPropertyName*/ !ts.hasSyntacticModifier(member, 2 /* Ambient */));
+            var descriptor = languageVersion > 0 /* ES3 */
+                ? member.kind === 167 /* PropertyDeclaration */
+                    // We emit `void 0` here to indicate to `__decorate` that it can invoke `Object.defineProperty` directly, but that it
+                    // should not invoke `Object.getOwnPropertyDescriptor`.
+                    ? factory.createVoidZero()
+                    // We emit `null` here to indicate to `__decorate` that it can invoke `Object.getOwnPropertyDescriptor` directly.
+                    // We have this extra argument here so that we can inject an explicit property descriptor at a later date.
+                    : factory.createNull()
+                : undefined;
+            var helper = emitHelpers().createDecorateHelper(decoratorExpressions, prefix, memberName, descriptor);
+            ts.setEmitFlags(helper, 1536 /* NoComments */);
+            ts.setSourceMapRange(helper, ts.moveRangePastModifiers(member));
+            return helper;
+        }
+        /**
+         * Generates a __decorate helper call for a class constructor.
+         *
+         * @param node The class node.
+         */
+        function addConstructorDecorationStatement(statements, node) {
+            var expression = generateConstructorDecorationExpression(node);
+            if (expression) {
+                statements.push(ts.setOriginalNode(factory.createExpressionStatement(expression), node));
+            }
+        }
+        /**
+         * Generates a __decorate helper call for a class constructor.
+         *
+         * @param node The class node.
+         */
+        function generateConstructorDecorationExpression(node) {
+            var allDecorators = ts.getAllDecoratorsOfClass(node);
+            var decoratorExpressions = transformAllDecoratorsOfDeclaration(allDecorators);
+            if (!decoratorExpressions) {
+                return undefined;
+            }
+            var classAlias = classAliases && classAliases[ts.getOriginalNodeId(node)];
+            // When we transform to ES5/3 this will be moved inside an IIFE and should reference the name
+            // without any block-scoped variable collision handling
+            var localName = languageVersion <= 2 /* ES2015 */ ?
+                factory.getInternalName(node, /*allowComments*/ false, /*allowSourceMaps*/ true) :
+                factory.getLocalName(node, /*allowComments*/ false, /*allowSourceMaps*/ true);
+            var decorate = emitHelpers().createDecorateHelper(decoratorExpressions, localName);
+            var expression = factory.createAssignment(localName, classAlias ? factory.createAssignment(classAlias, decorate) : decorate);
+            ts.setEmitFlags(expression, 1536 /* NoComments */);
+            ts.setSourceMapRange(expression, ts.moveRangePastModifiers(node));
+            return expression;
+        }
+        /**
+         * Transforms a decorator into an expression.
+         *
+         * @param decorator The decorator node.
+         */
+        function transformDecorator(decorator) {
+            return ts.visitNode(decorator.expression, visitor, ts.isExpression);
+        }
+        /**
+         * Transforms the decorators of a parameter.
+         *
+         * @param decorators The decorators for the parameter at the provided offset.
+         * @param parameterOffset The offset of the parameter.
+         */
+        function transformDecoratorsOfParameter(decorators, parameterOffset) {
+            var expressions;
+            if (decorators) {
+                expressions = [];
+                for (var _i = 0, decorators_1 = decorators; _i < decorators_1.length; _i++) {
+                    var decorator = decorators_1[_i];
+                    var helper = emitHelpers().createParamHelper(transformDecorator(decorator), parameterOffset);
+                    ts.setTextRange(helper, decorator.expression);
+                    ts.setEmitFlags(helper, 1536 /* NoComments */);
+                    expressions.push(helper);
+                }
+            }
+            return expressions;
+        }
+        /**
+         * Gets an expression that represents a property name (for decorated properties or enums).
+         * For a computed property, a name is generated for the node.
+         *
+         * @param member The member whose name should be converted into an expression.
+         */
+        function getExpressionForPropertyName(member, generateNameForComputedPropertyName) {
+            var name = member.name;
+            if (ts.isPrivateIdentifier(name)) {
+                return factory.createIdentifier("");
+            }
+            else if (ts.isComputedPropertyName(name)) {
+                return generateNameForComputedPropertyName && !ts.isSimpleInlineableExpression(name.expression)
+                    ? factory.getGeneratedNameForNode(name)
+                    : name.expression;
+            }
+            else if (ts.isIdentifier(name)) {
+                return factory.createStringLiteral(ts.idText(name));
+            }
+            else {
+                return factory.cloneNode(name);
+            }
+        }
+        function enableSubstitutionForClassAliases() {
+            if (!classAliases) {
+                // We need to enable substitutions for identifiers. This allows us to
+                // substitute class names inside of a class declaration.
+                context.enableSubstitution(79 /* Identifier */);
+                // Keep track of class aliases.
+                classAliases = [];
+            }
+        }
+        /**
+         * Gets a local alias for a class declaration if it is a decorated class with an internal
+         * reference to the static side of the class. This is necessary to avoid issues with
+         * double-binding semantics for the class name.
+         */
+        function getClassAliasIfNeeded(node) {
+            if (resolver.getNodeCheckFlags(node) & 16777216 /* ClassWithConstructorReference */) {
+                enableSubstitutionForClassAliases();
+                var classAlias = factory.createUniqueName(node.name && !ts.isGeneratedIdentifier(node.name) ? ts.idText(node.name) : "default");
+                classAliases[ts.getOriginalNodeId(node)] = classAlias;
+                hoistVariableDeclaration(classAlias);
+                return classAlias;
+            }
+        }
+        function getClassPrototype(node) {
+            return factory.createPropertyAccessExpression(factory.getDeclarationName(node), "prototype");
+        }
+        function getClassMemberPrefix(node, member) {
+            return ts.isStatic(member)
+                ? factory.getDeclarationName(node)
+                : getClassPrototype(node);
+        }
+        /**
+         * Hooks node substitutions.
+         *
+         * @param hint A hint as to the intended usage of the node.
+         * @param node The node to substitute.
+         */
+        function onSubstituteNode(hint, node) {
+            node = previousOnSubstituteNode(hint, node);
+            if (hint === 1 /* Expression */) {
+                return substituteExpression(node);
+            }
+            return node;
+        }
+        function substituteExpression(node) {
+            switch (node.kind) {
+                case 79 /* Identifier */:
+                    return substituteExpressionIdentifier(node);
+            }
+            return node;
+        }
+        function substituteExpressionIdentifier(node) {
+            var _a;
+            return (_a = trySubstituteClassAlias(node)) !== null && _a !== void 0 ? _a : node;
+        }
+        function trySubstituteClassAlias(node) {
+            if (classAliases) {
+                if (resolver.getNodeCheckFlags(node) & 33554432 /* ConstructorReferenceInClass */) {
+                    // Due to the emit for class decorators, any reference to the class from inside of the class body
+                    // must instead be rewritten to point to a temporary variable to avoid issues with the double-bind
+                    // behavior of class names in ES6.
+                    // Also, when emitting statics for class expressions, we must substitute a class alias for
+                    // constructor references in static property initializers.
+                    var declaration = resolver.getReferencedValueDeclaration(node);
+                    if (declaration) {
+                        var classAlias = classAliases[declaration.id]; // TODO: GH#18217
+                        if (classAlias) {
+                            var clone_3 = factory.cloneNode(classAlias);
+                            ts.setSourceMapRange(clone_3, node);
+                            ts.setCommentRange(clone_3, node);
+                            return clone_3;
+                        }
+                    }
+                }
+            }
+            return undefined;
+        }
+    }
+    ts.transformLegacyDecorators = transformLegacyDecorators;
+})(ts || (ts = {}));
+/*@internal*/
+var ts;
 (function (ts) {
     var ES2017SubstitutionFlags;
     (function (ES2017SubstitutionFlags) {
@@ -96961,7 +97398,7 @@ var ts;
             return objects;
         }
         function visitObjectLiteralExpression(node) {
-            if (node.transformFlags & 32768 /* ContainsObjectRestOrSpread */) {
+            if (node.transformFlags & 65536 /* ContainsObjectRestOrSpread */) {
                 // spread elements emit like so:
                 // non-spread elements are chunked together into object literals, and then all are passed to __assign:
                 //     { a, ...o, b } => __assign(__assign({a}, o), {b});
@@ -97034,7 +97471,7 @@ var ts;
          * expression of an `ExpressionStatement`).
          */
         function visitBinaryExpression(node, expressionResultIsUnused) {
-            if (ts.isDestructuringAssignment(node) && node.left.transformFlags & 32768 /* ContainsObjectRestOrSpread */) {
+            if (ts.isDestructuringAssignment(node) && node.left.transformFlags & 65536 /* ContainsObjectRestOrSpread */) {
                 return ts.flattenDestructuringAssignment(node, visitor, context, 1 /* ObjectRest */, !expressionResultIsUnused);
             }
             if (node.operatorToken.kind === 27 /* CommaToken */) {
@@ -97065,7 +97502,7 @@ var ts;
         function visitCatchClause(node) {
             if (node.variableDeclaration &&
                 ts.isBindingPattern(node.variableDeclaration.name) &&
-                node.variableDeclaration.name.transformFlags & 32768 /* ContainsObjectRestOrSpread */) {
+                node.variableDeclaration.name.transformFlags & 65536 /* ContainsObjectRestOrSpread */) {
                 var name = factory.getGeneratedNameForNode(node.variableDeclaration.name);
                 var updatedDecl = factory.updateVariableDeclaration(node.variableDeclaration, node.variableDeclaration.name, /*exclamationToken*/ undefined, /*type*/ undefined, name);
                 var visitedBindings = ts.flattenDestructuringBinding(updatedDecl, visitor, context, 1 /* ObjectRest */);
@@ -97106,7 +97543,7 @@ var ts;
         }
         function visitVariableDeclarationWorker(node, exportedVariableStatement) {
             // If we are here it is because the name contains a binding pattern with a rest somewhere in it.
-            if (ts.isBindingPattern(node.name) && node.name.transformFlags & 32768 /* ContainsObjectRestOrSpread */) {
+            if (ts.isBindingPattern(node.name) && node.name.transformFlags & 65536 /* ContainsObjectRestOrSpread */) {
                 return ts.flattenDestructuringBinding(node, visitor, context, 1 /* ObjectRest */, 
                 /*rval*/ undefined, exportedVariableStatement);
             }
@@ -97125,7 +97562,7 @@ var ts;
          */
         function visitForOfStatement(node, outermostLabeledStatement) {
             var ancestorFacts = enterSubtree(0 /* IterationStatementExcludes */, 2 /* IterationStatementIncludes */);
-            if (node.initializer.transformFlags & 32768 /* ContainsObjectRestOrSpread */) {
+            if (node.initializer.transformFlags & 65536 /* ContainsObjectRestOrSpread */) {
                 node = transformForOfStatementWithObjectRest(node);
             }
             var result = node.awaitModifier ?
@@ -97238,7 +97675,7 @@ var ts;
                 /*type*/ undefined, 
                 /*initializer*/ undefined);
             }
-            if (node.transformFlags & 32768 /* ContainsObjectRestOrSpread */) {
+            if (node.transformFlags & 65536 /* ContainsObjectRestOrSpread */) {
                 // Binding patterns are converted into a generated name and are
                 // evaluated inside the function body.
                 return factory.updateParameterDeclaration(node, 
@@ -97256,7 +97693,7 @@ var ts;
                 if (parameters) {
                     parameters.add(parameter);
                 }
-                else if (parameter.transformFlags & 32768 /* ContainsObjectRestOrSpread */) {
+                else if (parameter.transformFlags & 65536 /* ContainsObjectRestOrSpread */) {
                     parameters = new ts.Set();
                 }
             }
@@ -97479,7 +97916,7 @@ var ts;
                         statements = ts.append(statements, statement);
                     }
                 }
-                else if (parameter.transformFlags & 32768 /* ContainsObjectRestOrSpread */) {
+                else if (parameter.transformFlags & 65536 /* ContainsObjectRestOrSpread */) {
                     containsPrecedingObjectRestOrSpread = true;
                     var declarations = ts.flattenDestructuringBinding(parameter, visitor, context, 1 /* ObjectRest */, factory.getGeneratedNameForNode(parameter), 
                     /*doNotRecordTempVariablesInLine*/ false, 
@@ -98851,7 +99288,7 @@ var ts;
                 && !node.expression;
         }
         function isOrMayContainReturnCompletion(node) {
-            return node.transformFlags & 2097152 /* ContainsHoistedDeclarationOrCompletion */
+            return node.transformFlags & 4194304 /* ContainsHoistedDeclarationOrCompletion */
                 && (ts.isReturnStatement(node)
                     || ts.isIfStatement(node)
                     || ts.isWithStatement(node)
@@ -99415,7 +99852,7 @@ var ts;
             factory.mergeLexicalEnvironment(prologue, endLexicalEnvironment());
             insertCaptureNewTargetIfNeeded(prologue, constructor, /*copyOnWrite*/ false);
             if (isDerivedClass || superCallExpression) {
-                if (superCallExpression && postSuperStatementsStart === constructor.body.statements.length && !(constructor.body.transformFlags & 8192 /* ContainsLexicalThis */)) {
+                if (superCallExpression && postSuperStatementsStart === constructor.body.statements.length && !(constructor.body.transformFlags & 16384 /* ContainsLexicalThis */)) {
                     // If the subclass constructor does *not* contain `this` and *ends* with a `super()` call, we will use the
                     // following representation:
                     //
@@ -99960,7 +100397,7 @@ var ts;
          * @param node An ArrowFunction node.
          */
         function visitArrowFunction(node) {
-            if (node.transformFlags & 8192 /* ContainsLexicalThis */ && !(hierarchyFacts & 16384 /* StaticInitializer */)) {
+            if (node.transformFlags & 16384 /* ContainsLexicalThis */ && !(hierarchyFacts & 16384 /* StaticInitializer */)) {
                 hierarchyFacts |= 65536 /* CapturedLexicalThis */;
             }
             var savedConvertedLoopState = convertedLoopState;
@@ -100246,7 +100683,7 @@ var ts;
          * @param node A VariableDeclarationList node.
          */
         function visitVariableDeclarationList(node) {
-            if (node.flags & 3 /* BlockScoped */ || node.transformFlags & 262144 /* ContainsBindingPattern */) {
+            if (node.flags & 3 /* BlockScoped */ || node.transformFlags & 524288 /* ContainsBindingPattern */) {
                 if (node.flags & 3 /* BlockScoped */) {
                     enableSubstitutionsForBlockScopedBindings();
                 }
@@ -100259,7 +100696,7 @@ var ts;
                 ts.setCommentRange(declarationList, node);
                 // If the first or last declaration is a binding pattern, we need to modify
                 // the source map range for the declaration list.
-                if (node.transformFlags & 262144 /* ContainsBindingPattern */
+                if (node.transformFlags & 524288 /* ContainsBindingPattern */
                     && (ts.isBindingPattern(node.declarations[0].name) || ts.isBindingPattern(ts.last(node.declarations).name))) {
                     ts.setSourceMapRange(declarationList, getRangeUnion(declarations));
                 }
@@ -100583,7 +101020,7 @@ var ts;
             var numInitialProperties = -1, hasComputed = false;
             for (var i = 0; i < properties.length; i++) {
                 var property = properties[i];
-                if ((property.transformFlags & 524288 /* ContainsYield */ &&
+                if ((property.transformFlags & 1048576 /* ContainsYield */ &&
                     hierarchyFacts & 4 /* AsyncFunctionBody */)
                     || (hasComputed = ts.Debug.checkDefined(property.name).kind === 162 /* ComputedPropertyName */)) {
                     numInitialProperties = i;
@@ -100856,7 +101293,7 @@ var ts;
          */
         function createFunctionForInitializerOfForStatement(node, currentState) {
             var functionName = factory.createUniqueName("_loop_init");
-            var containsYield = (node.initializer.transformFlags & 524288 /* ContainsYield */) !== 0;
+            var containsYield = (node.initializer.transformFlags & 1048576 /* ContainsYield */) !== 0;
             var emitFlags = 0 /* None */;
             if (currentState.containsLexicalThis)
                 emitFlags |= 8 /* CapturesThis */;
@@ -100971,7 +101408,7 @@ var ts;
             var loopBody = factory.createBlock(statements, /*multiLine*/ true);
             if (ts.isBlock(statement))
                 ts.setOriginalNode(loopBody, statement);
-            var containsYield = (node.statement.transformFlags & 524288 /* ContainsYield */) !== 0;
+            var containsYield = (node.statement.transformFlags & 1048576 /* ContainsYield */) !== 0;
             var emitFlags = 524288 /* ReuseTempVariableScope */;
             if (currentState.containsLexicalThis)
                 emitFlags |= 8 /* CapturesThis */;
@@ -101453,7 +101890,7 @@ var ts;
         function visitCallExpressionWithPotentialCapturedThisAssignment(node, assignToCapturedThis) {
             // We are here either because SuperKeyword was used somewhere in the expression, or
             // because we contain a SpreadElementExpression.
-            if (node.transformFlags & 16384 /* ContainsRestOrSpread */ ||
+            if (node.transformFlags & 32768 /* ContainsRestOrSpread */ ||
                 node.expression.kind === 106 /* SuperKeyword */ ||
                 ts.isSuperProperty(ts.skipOuterExpressions(node.expression))) {
                 var _a = factory.createCallBinding(node.expression, hoistVariableDeclaration), target = _a.target, thisArg = _a.thisArg;
@@ -101461,7 +101898,7 @@ var ts;
                     ts.setEmitFlags(thisArg, 4 /* NoSubstitution */);
                 }
                 var resultingCall = void 0;
-                if (node.transformFlags & 16384 /* ContainsRestOrSpread */) {
+                if (node.transformFlags & 32768 /* ContainsRestOrSpread */) {
                     // [source]
                     //      f(...a, b)
                     //      x.m(...a, b)
@@ -102303,10 +102740,10 @@ var ts;
                 case 247 /* ReturnStatement */:
                     return visitReturnStatement(node);
                 default:
-                    if (node.transformFlags & 524288 /* ContainsYield */) {
+                    if (node.transformFlags & 1048576 /* ContainsYield */) {
                         return visitJavaScriptContainingYield(node);
                     }
-                    else if (node.transformFlags & (2048 /* ContainsGenerator */ | 2097152 /* ContainsHoistedDeclarationOrCompletion */)) {
+                    else if (node.transformFlags & (2048 /* ContainsGenerator */ | 4194304 /* ContainsHoistedDeclarationOrCompletion */)) {
                         return ts.visitEachChild(node, visitor, context);
                     }
                     else {
@@ -102511,7 +102948,7 @@ var ts;
          * @param node The node to visit.
          */
         function visitVariableStatement(node) {
-            if (node.transformFlags & 524288 /* ContainsYield */) {
+            if (node.transformFlags & 1048576 /* ContainsYield */) {
                 transformAndEmitVariableDeclarationList(node.declarationList);
                 return undefined;
             }
@@ -103569,7 +104006,7 @@ var ts;
             }
         }
         function containsYield(node) {
-            return !!node && (node.transformFlags & 524288 /* ContainsYield */) !== 0;
+            return !!node && (node.transformFlags & 1048576 /* ContainsYield */) !== 0;
         }
         function countInitialNodesWithoutYield(nodes) {
             var numNodes = nodes.length;
@@ -104618,7 +105055,7 @@ var ts;
         function transformSourceFile(node) {
             if (node.isDeclarationFile ||
                 !(ts.isEffectiveExternalModule(node, compilerOptions) ||
-                    node.transformFlags & 4194304 /* ContainsDynamicImport */ ||
+                    node.transformFlags & 8388608 /* ContainsDynamicImport */ ||
                     (ts.isJsonSourceFile(node) && ts.hasJsonModuleEmitEnabled(compilerOptions) && ts.outFile(compilerOptions)))) {
                 return node;
             }
@@ -104955,7 +105392,7 @@ var ts;
         function visitorWorker(node, valueIsDiscarded) {
             // This visitor does not need to descend into the tree if there is no dynamic import, destructuring assignment, or update expression
             // as export/import statements are only transformed at the top level of a file.
-            if (!(node.transformFlags & (4194304 /* ContainsDynamicImport */ | 4096 /* ContainsDestructuringAssignment */ | 67108864 /* ContainsUpdateExpressionForIdentifier */))) {
+            if (!(node.transformFlags & (8388608 /* ContainsDynamicImport */ | 4096 /* ContainsDestructuringAssignment */ | 268435456 /* ContainsUpdateExpressionForIdentifier */))) {
                 return node;
             }
             switch (node.kind) {
@@ -105106,7 +105543,7 @@ var ts;
             var firstArgument = ts.visitNode(ts.firstOrUndefined(node.arguments), visitor);
             // Only use the external module name if it differs from the first argument. This allows us to preserve the quote style of the argument on output.
             var argument = externalModuleName && (!firstArgument || !ts.isStringLiteral(firstArgument) || firstArgument.text !== externalModuleName.text) ? externalModuleName : firstArgument;
-            var containsLexicalThis = !!(node.transformFlags & 8192 /* ContainsLexicalThis */);
+            var containsLexicalThis = !!(node.transformFlags & 16384 /* ContainsLexicalThis */);
             switch (compilerOptions.module) {
                 case ts.ModuleKind.AMD:
                     return createImportCallExpressionAMD(argument, containsLexicalThis);
@@ -106093,7 +106530,7 @@ var ts;
          * @param node The SourceFile node.
          */
         function transformSourceFile(node) {
-            if (node.isDeclarationFile || !(ts.isEffectiveExternalModule(node, compilerOptions) || node.transformFlags & 4194304 /* ContainsDynamicImport */)) {
+            if (node.isDeclarationFile || !(ts.isEffectiveExternalModule(node, compilerOptions) || node.transformFlags & 8388608 /* ContainsDynamicImport */)) {
                 return node;
             }
             var id = ts.getOriginalNodeId(node);
@@ -106262,7 +106699,7 @@ var ts;
             // - Temporary variables will appear at the top rather than at the bottom of the file
             ts.insertStatementsAfterStandardPrologue(statements, endLexicalEnvironment());
             var exportStarFunction = addExportStarIfNeeded(statements); // TODO: GH#18217
-            var modifiers = node.transformFlags & 1048576 /* ContainsAwait */ ?
+            var modifiers = node.transformFlags & 2097152 /* ContainsAwait */ ?
                 factory.createModifiersFromModifierFlags(256 /* Async */) :
                 undefined;
             var moduleObject = factory.createObjectLiteralExpression([
@@ -107171,7 +107608,7 @@ var ts;
          * @param node The node to visit.
          */
         function visitorWorker(node, valueIsDiscarded) {
-            if (!(node.transformFlags & (4096 /* ContainsDestructuringAssignment */ | 4194304 /* ContainsDynamicImport */ | 67108864 /* ContainsUpdateExpressionForIdentifier */))) {
+            if (!(node.transformFlags & (4096 /* ContainsDestructuringAssignment */ | 8388608 /* ContainsDynamicImport */ | 268435456 /* ContainsUpdateExpressionForIdentifier */))) {
                 return node;
             }
             switch (node.kind) {
@@ -108339,7 +108776,8 @@ var ts;
             trackReferencedAmbientModule: trackReferencedAmbientModule,
             trackExternalModuleSymbolOfImportTypeNode: trackExternalModuleSymbolOfImportTypeNode,
             reportNonlocalAugmentation: reportNonlocalAugmentation,
-            reportNonSerializableProperty: reportNonSerializableProperty
+            reportNonSerializableProperty: reportNonSerializableProperty,
+            reportImportTypeNodeResolutionModeOverride: reportImportTypeNodeResolutionModeOverride,
         };
         var errorNameNode;
         var errorFallbackNode;
@@ -108466,6 +108904,11 @@ var ts;
                 context.addDiagnostic(ts.createDiagnosticForNode((errorNameNode || errorFallbackNode), ts.Diagnostics.The_type_of_this_node_cannot_be_serialized_because_its_property_0_cannot_be_serialized, propertyName));
             }
         }
+        function reportImportTypeNodeResolutionModeOverride() {
+            if (!ts.isNightly() && (errorNameNode || errorFallbackNode)) {
+                context.addDiagnostic(ts.createDiagnosticForNode((errorNameNode || errorFallbackNode), ts.Diagnostics.The_type_of_this_expression_cannot_be_named_without_a_resolution_mode_assertion_which_is_an_unstable_feature_Use_nightly_TypeScript_to_silence_this_error_Try_updating_with_npm_install_D_typescript_next));
+            }
+        }
         function transformDeclarationsForJS(sourceFile, bundled) {
             var oldDiag = getSymbolAccessibilityDiagnostic;
             getSymbolAccessibilityDiagnostic = function (s) { return (s.errorNode && ts.canProduceDiagnostics(s.errorNode) ? ts.createGetSymbolAccessibilityDiagnosticForNode(s.errorNode)(s) : ({
@@ -108916,7 +109359,7 @@ var ts;
             var mode = ts.getResolutionModeOverrideForClause(assertClause);
             if (mode !== undefined) {
                 if (!ts.isNightly()) {
-                    context.addDiagnostic(ts.createDiagnosticForNode(assertClause, ts.Diagnostics.Resolution_mode_assertions_are_unstable_Use_nightly_TypeScript_to_silence_this_error_Try_updating_with_npm_install_D_typescript_next));
+                    context.addDiagnostic(ts.createDiagnosticForNode(assertClause, ts.Diagnostics.resolution_mode_assertions_are_unstable_Use_nightly_TypeScript_to_silence_this_error_Try_updating_with_npm_install_D_typescript_next));
                 }
                 return assertClause;
             }
@@ -109708,6 +110151,7 @@ var ts;
         var transformers = [];
         ts.addRange(transformers, customTransformers && ts.map(customTransformers.before, wrapScriptTransformerFactory));
         transformers.push(ts.transformTypeScript);
+        transformers.push(ts.transformLegacyDecorators);
         transformers.push(ts.transformClassFields);
         if (ts.getJSXTransformEnabled(compilerOptions)) {
             transformers.push(ts.transformJsx);
@@ -116425,12 +116869,14 @@ var ts;
     }
     ts.loadWithTypeDirectiveCache = loadWithTypeDirectiveCache;
     ;
-    /* @internal */
+    /**
+     * Calculates the resulting resolution mode for some reference in some file - this is generally the explicitly
+     * provided resolution mode in the reference, unless one is not present, in which case it is the mode of the containing file.
+     */
     function getModeForFileReference(ref, containingFileMode) {
         return (ts.isString(ref) ? containingFileMode : ref.resolutionMode) || containingFileMode;
     }
     ts.getModeForFileReference = getModeForFileReference;
-    /* @internal */
     function getModeForResolutionAtIndex(file, index) {
         if (file.impliedNodeFormat === undefined)
             return undefined;
@@ -116451,7 +116897,15 @@ var ts;
         return false;
     }
     ts.isExclusivelyTypeOnlyImportOrExport = isExclusivelyTypeOnlyImportOrExport;
-    /* @internal */
+    /**
+     * Calculates the final resolution mode for a given module reference node. This is generally the explicitly provided resolution mode, if
+     * one exists, or the mode of the containing source file. (Excepting import=require, which is always commonjs, and dynamic import, which is always esm).
+     * Notably, this function always returns `undefined` if the containing file has an `undefined` `impliedNodeFormat` - this field is only set when
+     * `moduleResolution` is `node16`+.
+     * @param file The file the import or import-like reference is contained within
+     * @param usage The module reference string
+     * @returns The final resolution mode of the import
+     */
     function getModeForUsageLocation(file, usage) {
         var _a, _b;
         if (file.impliedNodeFormat === undefined)
@@ -118687,7 +119141,7 @@ var ts;
                 ts.setResolvedTypeReferenceDirective(file, fileName, resolvedTypeReferenceDirective);
                 var mode = ref.resolutionMode || file.impliedNodeFormat;
                 if (mode && ts.getEmitModuleResolutionKind(options) !== ts.ModuleResolutionKind.Node16 && ts.getEmitModuleResolutionKind(options) !== ts.ModuleResolutionKind.NodeNext) {
-                    programDiagnostics.add(ts.createDiagnosticForRange(file, ref, ts.Diagnostics.Resolution_modes_are_only_supported_when_moduleResolution_is_node16_or_nodenext));
+                    programDiagnostics.add(ts.createDiagnosticForRange(file, ref, ts.Diagnostics.resolution_mode_assertions_are_only_supported_when_moduleResolution_is_node16_or_nodenext));
                 }
                 processTypeReferenceDirective(fileName, mode, resolvedTypeReferenceDirective, { kind: ts.FileIncludeKind.TypeReferenceDirective, file: file.path, index: index, });
             }
@@ -125997,7 +126451,7 @@ var ts;
          * @param typeAcquisition is used to customize the typing acquisition process
          * @param compilerOptions are used as a source for typing inference
          */
-        function discoverTypings(host, log, fileNames, projectRootPath, safeList, packageNameToTypingLocation, typeAcquisition, unresolvedImports, typesRegistry) {
+        function discoverTypings(host, log, fileNames, projectRootPath, safeList, packageNameToTypingLocation, typeAcquisition, unresolvedImports, typesRegistry, compilerOptions) {
             if (!typeAcquisition || !typeAcquisition.enable) {
                 return { cachedTypingPaths: [], newTypingNames: [], filesToWatch: [] };
             }
@@ -126015,12 +126469,14 @@ var ts;
                 addInferredTypings(typeAcquisition.include, "Explicitly included types");
             var exclude = typeAcquisition.exclude || [];
             // Directories to search for package.json, bower.json and other typing information
-            var possibleSearchDirs = new ts.Set(fileNames.map(ts.getDirectoryPath));
-            possibleSearchDirs.add(projectRootPath);
-            possibleSearchDirs.forEach(function (searchDir) {
-                getTypingNames(searchDir, "bower.json", "bower_components", filesToWatch);
-                getTypingNames(searchDir, "package.json", "node_modules", filesToWatch);
-            });
+            if (!compilerOptions.types) {
+                var possibleSearchDirs = new ts.Set(fileNames.map(ts.getDirectoryPath));
+                possibleSearchDirs.add(projectRootPath);
+                possibleSearchDirs.forEach(function (searchDir) {
+                    getTypingNames(searchDir, "bower.json", "bower_components", filesToWatch);
+                    getTypingNames(searchDir, "package.json", "node_modules", filesToWatch);
+                });
+            }
             if (!typeAcquisition.disableFilenameBasedTypeAcquisition) {
                 getTypingNamesFromSourceFileNames(fileNames);
             }
@@ -168019,7 +168475,7 @@ var ts;
                 if (_this.safeList === undefined) {
                     _this.safeList = ts.JsTyping.loadSafeList(_this.host, ts.toPath(info.safeListPath, info.safeListPath, getCanonicalFileName));
                 }
-                return ts.JsTyping.discoverTypings(_this.host, function (msg) { return _this.logger.log(msg); }, info.fileNames, ts.toPath(info.projectRootPath, info.projectRootPath, getCanonicalFileName), _this.safeList, info.packageNameToTypingLocation, info.typeAcquisition, info.unresolvedImports, info.typesRegistry);
+                return ts.JsTyping.discoverTypings(_this.host, function (msg) { return _this.logger.log(msg); }, info.fileNames, ts.toPath(info.projectRootPath, info.projectRootPath, getCanonicalFileName), _this.safeList, info.packageNameToTypingLocation, info.typeAcquisition, info.unresolvedImports, info.typesRegistry, ts.emptyOptions);
             });
         };
         return CoreServicesShimObject;