@typescript-deploys/pr-build 5.5.0-pr-57989-9 → 5.5.0-pr-57996-3

package/lib/tsc.js

@@ -18,7 +18,7 @@ and limitations under the License.
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.5";
-var version = `${versionMajorMinor}.0-insiders.20240328`;
+var version = `${versionMajorMinor}.0-insiders.20240329`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -49851,7 +49851,7 @@ function createTypeChecker(host) {
       return initial;
     }
     function getDeclarationWithTypeAnnotation(symbol, enclosingDeclaration) {
-      return symbol.declarations && find(symbol.declarations, (s) => !!getEffectiveTypeAnnotationNode(s) && (!enclosingDeclaration || !!findAncestor(s, (n) => n === enclosingDeclaration)));
+      return symbol.declarations && find(symbol.declarations, (s) => !!getNonlocalEffectiveTypeAnnotationNode(s) && (!enclosingDeclaration || !!findAncestor(s, (n) => n === enclosingDeclaration)));
     }
     function existingTypeNodeIsNotReferenceOrIsReferenceWithCompatibleTypeArgumentCount(existing, type) {
       return !(getObjectFlags(type) & 4 /* Reference */) || !isTypeReferenceNode(existing) || length(existing.typeArguments) >= getMinTypeArgumentCount(type.target.typeParameters);
@@ -49867,7 +49867,7 @@ function createTypeChecker(host) {
       if (!isErrorType(type) && enclosingDeclaration) {
         const declWithExistingAnnotation = getDeclarationWithTypeAnnotation(symbol, getEnclosingDeclarationIgnoringFakeScope(enclosingDeclaration));
         if (declWithExistingAnnotation && !isFunctionLikeDeclaration(declWithExistingAnnotation) && !isGetAccessorDeclaration(declWithExistingAnnotation)) {
-          const existing = getEffectiveTypeAnnotationNode(declWithExistingAnnotation);
+          const existing = getNonlocalEffectiveTypeAnnotationNode(declWithExistingAnnotation);
           const result2 = tryReuseExistingTypeNode(context, existing, type, declWithExistingAnnotation, addUndefined, includePrivateSymbol, bundled);
           if (result2) {
             return result2;
@@ -49912,7 +49912,7 @@ function createTypeChecker(host) {
       const typePredicate = getTypePredicateOfSignature(signature);
       const type = getReturnTypeOfSignature(signature);
       if (!isErrorType(type) && context.enclosingDeclaration) {
-        const annotation = signature.declaration && getEffectiveReturnTypeNode(signature.declaration);
+        const annotation = signature.declaration && getNonlocalEffectiveReturnTypeAnnotationNode(signature.declaration);
         const enclosingDeclarationIgnoringFakeScope = getEnclosingDeclarationIgnoringFakeScope(context.enclosingDeclaration);
         if (!!findAncestor(annotation, (n) => n === enclosingDeclarationIgnoringFakeScope) && annotation) {
           const annotated = getTypeFromTypeNode(annotation);
@@ -60965,7 +60965,6 @@ function createTypeChecker(host) {
     const result = isRelatedTo(
       source,
       target,
-      0 /* None */,
       3 /* Both */,
       /*reportErrors*/
       !!errorNode,
@@ -61249,7 +61248,10 @@ function createTypeChecker(host) {
       }
       return true;
     }
-    function isRelatedTo(originalSource, originalTarget, intersectionState, recursionFlags = 3 /* Both */, reportErrors2 = false, headMessage2) {
+    function isRelatedToWorker(source2, target2, reportErrors2) {
+      return isRelatedTo(source2, target2, 3 /* Both */, reportErrors2);
+    }
+    function isRelatedTo(originalSource, originalTarget, recursionFlags = 3 /* Both */, reportErrors2 = false, headMessage2, intersectionState = 0 /* None */) {
       if (originalSource === originalTarget)
         return -1 /* True */;
       if (originalSource.flags & 524288 /* Object */ && originalTarget.flags & 402784252 /* Primitive */) {
@@ -61309,7 +61311,7 @@ function createTypeChecker(host) {
       if (source2.flags & 469499904 /* StructuredOrInstantiable */ || target2.flags & 469499904 /* StructuredOrInstantiable */) {
         const isPerformingExcessPropertyChecks = !(intersectionState & 2 /* Target */) && (isObjectLiteralType(source2) && getObjectFlags(source2) & 8192 /* FreshLiteral */);
         if (isPerformingExcessPropertyChecks) {
-          if (hasExcessProperties(source2, target2, reportErrors2, intersectionState)) {
+          if (hasExcessProperties(source2, target2, reportErrors2)) {
             if (reportErrors2) {
               reportRelationError(headMessage2, source2, originalTarget.aliasSymbol ? originalTarget : target2);
             }
@@ -61327,14 +61329,12 @@ function createTypeChecker(host) {
             if (calls.length > 0 && isRelatedTo(
               getReturnTypeOfSignature(calls[0]),
               target2,
-              intersectionState,
               1 /* Source */,
               /*reportErrors*/
               false
             ) || constructs.length > 0 && isRelatedTo(
               getReturnTypeOfSignature(constructs[0]),
               target2,
-              intersectionState,
               1 /* Source */,
               /*reportErrors*/
               false
@@ -61447,7 +61447,7 @@ function createTypeChecker(host) {
         void 0
       ) || emptyArray);
     }
-    function hasExcessProperties(source2, target2, reportErrors2, intersectionState) {
+    function hasExcessProperties(source2, target2, reportErrors2) {
       var _a2;
       if (!isExcessPropertyCheckTarget(target2) || !noImplicitAny && getObjectFlags(target2) & 4096 /* JSLiteral */) {
         return false;
@@ -61459,11 +61459,7 @@ function createTypeChecker(host) {
       let reducedTarget = target2;
       let checkTypes;
       if (target2.flags & 1048576 /* Union */) {
-        let isRelatedToWorker2 = function(source3, target3) {
-          return isRelatedTo(source3, target3, intersectionState);
-        };
-        var isRelatedToWorker = isRelatedToWorker2;
-        reducedTarget = findMatchingDiscriminantType(source2, target2, isRelatedToWorker2) || filterPrimitivesIfContainsNonPrimitive(target2);
+        reducedTarget = findMatchingDiscriminantType(source2, target2, isRelatedTo) || filterPrimitivesIfContainsNonPrimitive(target2);
         checkTypes = reducedTarget.flags & 1048576 /* Union */ ? reducedTarget.types : [reducedTarget];
       }
       for (const prop of getPropertiesOfType(source2)) {
@@ -61506,7 +61502,7 @@ function createTypeChecker(host) {
             }
             return true;
           }
-          if (checkTypes && !isRelatedTo(getTypeOfSymbol(prop), getTypeOfPropertyInTypes(checkTypes, prop.escapedName), intersectionState, 3 /* Both */, reportErrors2)) {
+          if (checkTypes && !isRelatedTo(getTypeOfSymbol(prop), getTypeOfPropertyInTypes(checkTypes, prop.escapedName), 3 /* Both */, reportErrors2)) {
             if (reportErrors2) {
               reportIncompatibleError(Diagnostics.Types_of_property_0_are_incompatible, symbolToString(prop));
             }
@@ -61550,14 +61546,12 @@ function createTypeChecker(host) {
             return isRelatedTo(
               source2,
               target2,
-              intersectionState,
               1 /* Source */,
               /*reportErrors*/
               false
             ) || isRelatedTo(
               target2,
               source2,
-              intersectionState,
               1 /* Source */,
               /*reportErrors*/
               false
@@ -61573,7 +61567,7 @@ function createTypeChecker(host) {
         1 /* Source */
       );
     }
-    function eachTypeRelatedToSomeType(source2, target2, intersectionState) {
+    function eachTypeRelatedToSomeType(source2, target2) {
       let result2 = -1 /* True */;
       const sourceTypes = source2.types;
       for (const sourceType of sourceTypes) {
@@ -61582,7 +61576,7 @@ function createTypeChecker(host) {
           target2,
           /*reportErrors*/
           false,
-          intersectionState
+          0 /* None */
         );
         if (!related) {
           return 0 /* False */;
@@ -61607,12 +61601,12 @@ function createTypeChecker(host) {
           const related = isRelatedTo(
             source2,
             match,
-            intersectionState,
             2 /* Target */,
             /*reportErrors*/
             false,
             /*headMessage*/
-            void 0
+            void 0,
+            intersectionState
           );
           if (related) {
             return related;
@@ -61623,31 +61617,29 @@ function createTypeChecker(host) {
         const related = isRelatedTo(
           source2,
           type,
-          intersectionState,
           2 /* Target */,
           /*reportErrors*/
           false,
           /*headMessage*/
-          void 0
+          void 0,
+          intersectionState
         );
         if (related) {
           return related;
         }
       }
       if (reportErrors2) {
-        let isRelatedToWorker2 = function(source3, target3) {
-          return isRelatedTo(source3, target3, intersectionState);
-        };
-        var isRelatedToWorker = isRelatedToWorker2;
-        const bestMatchingType = getBestMatchingType(source2, target2, isRelatedToWorker2);
+        const bestMatchingType = getBestMatchingType(source2, target2, isRelatedTo);
         if (bestMatchingType) {
           isRelatedTo(
             source2,
             bestMatchingType,
-            intersectionState,
             2 /* Target */,
             /*reportErrors*/
-            true
+            true,
+            /*headMessage*/
+            void 0,
+            intersectionState
           );
         }
       }
@@ -61660,11 +61652,11 @@ function createTypeChecker(host) {
         const related = isRelatedTo(
           source2,
           targetType,
-          intersectionState,
           2 /* Target */,
           reportErrors2,
           /*headMessage*/
-          void 0
+          void 0,
+          intersectionState
         );
         if (!related) {
           return 0 /* False */;
@@ -61683,11 +61675,11 @@ function createTypeChecker(host) {
         const related = isRelatedTo(
           sourceTypes[i],
           target2,
-          intersectionState,
           1 /* Source */,
           reportErrors2 && i === len - 1,
           /*headMessage*/
-          void 0
+          void 0,
+          intersectionState
         );
         if (related) {
           return related;
@@ -61711,12 +61703,12 @@ function createTypeChecker(host) {
           const related2 = isRelatedTo(
             sourceType,
             undefinedStrippedTarget.types[i % undefinedStrippedTarget.types.length],
-            intersectionState,
             3 /* Both */,
             /*reportErrors*/
             false,
             /*headMessage*/
-            void 0
+            void 0,
+            intersectionState
           );
           if (related2) {
             result2 &= related2;
@@ -61726,11 +61718,11 @@ function createTypeChecker(host) {
         const related = isRelatedTo(
           sourceType,
           target2,
-          intersectionState,
           1 /* Source */,
           reportErrors2,
           /*headMessage*/
-          void 0
+          void 0,
+          intersectionState
         );
         if (!related) {
           return 0 /* False */;
@@ -61756,7 +61748,6 @@ function createTypeChecker(host) {
             related = relation === identityRelation ? isRelatedTo(
               s,
               t,
-              intersectionState,
               3 /* Both */,
               /*reportErrors*/
               false
@@ -61765,27 +61756,26 @@ function createTypeChecker(host) {
             related = isRelatedTo(
               s,
               t,
-              intersectionState,
               3 /* Both */,
               reportErrors2,
               /*headMessage*/
-              void 0
+              void 0,
+              intersectionState
             );
           } else if (variance === 2 /* Contravariant */) {
             related = isRelatedTo(
               t,
               s,
-              intersectionState,
               3 /* Both */,
               reportErrors2,
               /*headMessage*/
-              void 0
+              void 0,
+              intersectionState
             );
           } else if (variance === 3 /* Bivariant */) {
             related = isRelatedTo(
               t,
               s,
-              intersectionState,
               3 /* Both */,
               /*reportErrors*/
               false
@@ -61794,32 +61784,32 @@ function createTypeChecker(host) {
               related = isRelatedTo(
                 s,
                 t,
-                intersectionState,
                 3 /* Both */,
                 reportErrors2,
                 /*headMessage*/
-                void 0
+                void 0,
+                intersectionState
               );
             }
           } else {
             related = isRelatedTo(
               s,
               t,
-              intersectionState,
               3 /* Both */,
               reportErrors2,
               /*headMessage*/
-              void 0
+              void 0,
+              intersectionState
             );
             if (related) {
               related &= isRelatedTo(
                 t,
                 s,
-                intersectionState,
                 3 /* Both */,
                 reportErrors2,
                 /*headMessage*/
-                void 0
+                void 0,
+                intersectionState
               );
             }
           }
@@ -61985,12 +61975,12 @@ function createTypeChecker(host) {
             result2 = isRelatedTo(
               constraint,
               target2,
-              intersectionState,
               1 /* Source */,
               /*reportErrors*/
               false,
               /*headMessage*/
-              void 0
+              void 0,
+              intersectionState
             );
           }
         }
@@ -62053,9 +62043,9 @@ function createTypeChecker(host) {
       const targetFlags = target2.flags;
       if (relation === identityRelation) {
         if (sourceFlags & 3145728 /* UnionOrIntersection */) {
-          let result3 = eachTypeRelatedToSomeType(source2, target2, intersectionState);
+          let result3 = eachTypeRelatedToSomeType(source2, target2);
           if (result3) {
-            result3 &= eachTypeRelatedToSomeType(target2, source2, intersectionState);
+            result3 &= eachTypeRelatedToSomeType(target2, source2);
           }
           return result3;
         }
@@ -62063,7 +62053,6 @@ function createTypeChecker(host) {
           return isRelatedTo(
             source2.type,
             target2.type,
-            intersectionState,
             3 /* Both */,
             /*reportErrors*/
             false
@@ -62073,7 +62062,6 @@ function createTypeChecker(host) {
           if (result2 = isRelatedTo(
             source2.objectType,
             target2.objectType,
-            intersectionState,
             3 /* Both */,
             /*reportErrors*/
             false
@@ -62081,7 +62069,6 @@ function createTypeChecker(host) {
             if (result2 &= isRelatedTo(
               source2.indexType,
               target2.indexType,
-              intersectionState,
               3 /* Both */,
               /*reportErrors*/
               false
@@ -62095,7 +62082,6 @@ function createTypeChecker(host) {
             if (result2 = isRelatedTo(
               source2.checkType,
               target2.checkType,
-              intersectionState,
               3 /* Both */,
               /*reportErrors*/
               false
@@ -62103,7 +62089,6 @@ function createTypeChecker(host) {
               if (result2 &= isRelatedTo(
                 source2.extendsType,
                 target2.extendsType,
-                intersectionState,
                 3 /* Both */,
                 /*reportErrors*/
                 false
@@ -62111,7 +62096,6 @@ function createTypeChecker(host) {
                 if (result2 &= isRelatedTo(
                   getTrueTypeFromConditionalType(source2),
                   getTrueTypeFromConditionalType(target2),
-                  intersectionState,
                   3 /* Both */,
                   /*reportErrors*/
                   false
@@ -62119,7 +62103,6 @@ function createTypeChecker(host) {
                   if (result2 &= isRelatedTo(
                     getFalseTypeFromConditionalType(source2),
                     getFalseTypeFromConditionalType(target2),
-                    intersectionState,
                     3 /* Both */,
                     /*reportErrors*/
                     false
@@ -62135,7 +62118,6 @@ function createTypeChecker(host) {
           if (result2 = isRelatedTo(
             source2.baseType,
             target2.baseType,
-            intersectionState,
             3 /* Both */,
             /*reportErrors*/
             false
@@ -62143,7 +62125,6 @@ function createTypeChecker(host) {
             if (result2 &= isRelatedTo(
               source2.constraint,
               target2.constraint,
-              intersectionState,
               3 /* Both */,
               /*reportErrors*/
               false
@@ -62177,15 +62158,15 @@ function createTypeChecker(host) {
           return varianceResult;
         }
       }
-      if (isSingleElementGenericTupleType(source2) && !source2.target.readonly && (result2 = isRelatedTo(getTypeArguments(source2)[0], target2, intersectionState, 1 /* Source */)) || isSingleElementGenericTupleType(target2) && (target2.target.readonly || isMutableArrayOrTuple(getBaseConstraintOfType(source2) || source2)) && (result2 = isRelatedTo(source2, getTypeArguments(target2)[0], intersectionState, 2 /* Target */))) {
+      if (isSingleElementGenericTupleType(source2) && !source2.target.readonly && (result2 = isRelatedTo(getTypeArguments(source2)[0], target2, 1 /* Source */)) || isSingleElementGenericTupleType(target2) && (target2.target.readonly || isMutableArrayOrTuple(getBaseConstraintOfType(source2) || source2)) && (result2 = isRelatedTo(source2, getTypeArguments(target2)[0], 2 /* Target */))) {
         return result2;
       }
       if (targetFlags & 262144 /* TypeParameter */) {
-        if (getObjectFlags(source2) & 32 /* Mapped */ && !source2.declaration.nameType && isRelatedTo(getIndexType(target2), getConstraintTypeFromMappedType(source2), intersectionState, 3 /* Both */)) {
+        if (getObjectFlags(source2) & 32 /* Mapped */ && !source2.declaration.nameType && isRelatedTo(getIndexType(target2), getConstraintTypeFromMappedType(source2), 3 /* Both */)) {
           if (!(getMappedTypeModifiers(source2) & 4 /* IncludeOptional */)) {
             const templateType = getTemplateTypeFromMappedType(source2);
             const indexedAccessType = getIndexedAccessType(target2, getTypeParameterFromMappedType(source2));
-            if (result2 = isRelatedTo(templateType, indexedAccessType, intersectionState, 3 /* Both */, reportErrors2)) {
+            if (result2 = isRelatedTo(templateType, indexedAccessType, 3 /* Both */, reportErrors2)) {
               return result2;
             }
           }
@@ -62197,7 +62178,6 @@ function createTypeChecker(host) {
               if (result2 = isRelatedTo(
                 constraint,
                 target2,
-                intersectionState,
                 1 /* Source */,
                 /*reportErrors*/
                 false
@@ -62215,7 +62195,6 @@ function createTypeChecker(host) {
           if (result2 = isRelatedTo(
             targetType,
             source2.type,
-            intersectionState,
             3 /* Both */,
             /*reportErrors*/
             false
@@ -62224,13 +62203,13 @@ function createTypeChecker(host) {
           }
         }
         if (isTupleType(targetType)) {
-          if (result2 = isRelatedTo(source2, getKnownKeysOfTupleType(targetType), intersectionState, 2 /* Target */, reportErrors2)) {
+          if (result2 = isRelatedTo(source2, getKnownKeysOfTupleType(targetType), 2 /* Target */, reportErrors2)) {
             return result2;
           }
         } else {
           const constraint = getSimplifiedTypeOrConstraint(targetType);
           if (constraint) {
-            if (isRelatedTo(source2, getIndexType(constraint, target2.indexFlags | 4 /* NoReducibleCheck */), intersectionState, 2 /* Target */, reportErrors2) === -1 /* True */) {
+            if (isRelatedTo(source2, getIndexType(constraint, target2.indexFlags | 4 /* NoReducibleCheck */), 2 /* Target */, reportErrors2) === -1 /* True */) {
               return -1 /* True */;
             }
           } else if (isGenericMappedType(targetType)) {
@@ -62243,15 +62222,15 @@ function createTypeChecker(host) {
             } else {
               targetKeys = nameType || constraintType;
             }
-            if (isRelatedTo(source2, targetKeys, intersectionState, 2 /* Target */, reportErrors2) === -1 /* True */) {
+            if (isRelatedTo(source2, targetKeys, 2 /* Target */, reportErrors2) === -1 /* True */) {
               return -1 /* True */;
             }
           }
         }
       } else if (targetFlags & 8388608 /* IndexedAccess */) {
         if (sourceFlags & 8388608 /* IndexedAccess */) {
-          if (result2 = isRelatedTo(source2.objectType, target2.objectType, intersectionState, 3 /* Both */, reportErrors2)) {
-            result2 &= isRelatedTo(source2.indexType, target2.indexType, intersectionState, 3 /* Both */, reportErrors2);
+          if (result2 = isRelatedTo(source2.objectType, target2.objectType, 3 /* Both */, reportErrors2)) {
+            result2 &= isRelatedTo(source2.indexType, target2.indexType, 3 /* Both */, reportErrors2);
           }
           if (result2) {
             return result2;
@@ -62275,11 +62254,11 @@ function createTypeChecker(host) {
               if (result2 = isRelatedTo(
                 source2,
                 constraint,
-                intersectionState,
                 2 /* Target */,
                 reportErrors2,
                 /*headMessage*/
-                void 0
+                void 0,
+                intersectionState
               )) {
                 return result2;
               }
@@ -62305,18 +62284,18 @@ function createTypeChecker(host) {
             const sourceKeys = getIndexType(source2, 2 /* NoIndexSignatures */);
             const includeOptional = modifiers & 4 /* IncludeOptional */;
             const filteredByApplicability = includeOptional ? intersectTypes(targetKeys, sourceKeys) : void 0;
-            if (includeOptional ? !(filteredByApplicability.flags & 131072 /* Never */) : isRelatedTo(targetKeys, sourceKeys, intersectionState, 3 /* Both */)) {
+            if (includeOptional ? !(filteredByApplicability.flags & 131072 /* Never */) : isRelatedTo(targetKeys, sourceKeys, 3 /* Both */)) {
               const templateType2 = getTemplateTypeFromMappedType(target2);
               const typeParameter = getTypeParameterFromMappedType(target2);
               const nonNullComponent = extractTypesOfKind(templateType2, ~98304 /* Nullable */);
               if (!keysRemapped && nonNullComponent.flags & 8388608 /* IndexedAccess */ && nonNullComponent.indexType === typeParameter) {
-                if (result2 = isRelatedTo(source2, nonNullComponent.objectType, intersectionState, 2 /* Target */, reportErrors2)) {
+                if (result2 = isRelatedTo(source2, nonNullComponent.objectType, 2 /* Target */, reportErrors2)) {
                   return result2;
                 }
               } else {
                 const indexingType = keysRemapped ? filteredByApplicability || targetKeys : filteredByApplicability ? getIntersectionType([filteredByApplicability, typeParameter]) : typeParameter;
                 const indexedAccessType = getIndexedAccessType(source2, indexingType);
-                if (result2 = isRelatedTo(indexedAccessType, templateType2, intersectionState, 3 /* Both */, reportErrors2)) {
+                if (result2 = isRelatedTo(indexedAccessType, templateType2, 3 /* Both */, reportErrors2)) {
                   return result2;
                 }
               }
@@ -62336,22 +62315,22 @@ function createTypeChecker(host) {
           if (result2 = skipTrue ? -1 /* True */ : isRelatedTo(
             source2,
             getTrueTypeFromConditionalType(c),
-            intersectionState,
             2 /* Target */,
             /*reportErrors*/
             false,
             /*headMessage*/
-            void 0
+            void 0,
+            intersectionState
           )) {
             result2 &= skipFalse ? -1 /* True */ : isRelatedTo(
               source2,
               getFalseTypeFromConditionalType(c),
-              intersectionState,
               2 /* Target */,
               /*reportErrors*/
               false,
               /*headMessage*/
-              void 0
+              void 0,
+              intersectionState
             );
             if (result2) {
               return result2;
@@ -62381,29 +62360,29 @@ function createTypeChecker(host) {
           if (result2 = isRelatedTo(
             constraint,
             target2,
-            intersectionState,
             1 /* Source */,
             /*reportErrors*/
             false,
             /*headMessage*/
-            void 0
+            void 0,
+            intersectionState
           )) {
             return result2;
           } else if (result2 = isRelatedTo(
             getTypeWithThisArgument(constraint, source2),
             target2,
-            intersectionState,
             1 /* Source */,
             reportErrors2 && constraint !== unknownType && !(targetFlags & sourceFlags & 262144 /* TypeParameter */),
             /*headMessage*/
-            void 0
+            void 0,
+            intersectionState
           )) {
             return result2;
           }
           if (isMappedTypeGenericIndexedAccess(source2)) {
             const indexConstraint = getConstraintOfType(source2.indexType);
             if (indexConstraint) {
-              if (result2 = isRelatedTo(getIndexedAccessType(source2.objectType, indexConstraint), target2, intersectionState, 1 /* Source */, reportErrors2)) {
+              if (result2 = isRelatedTo(getIndexedAccessType(source2.objectType, indexConstraint), target2, 1 /* Source */, reportErrors2)) {
                 return result2;
               }
             }
@@ -62411,21 +62390,21 @@ function createTypeChecker(host) {
         }
       } else if (sourceFlags & 4194304 /* Index */) {
         const isDeferredMappedIndex = shouldDeferIndexType(source2.type, source2.indexFlags) && getObjectFlags(source2.type) & 32 /* Mapped */;
-        if (result2 = isRelatedTo(stringNumberSymbolType, target2, intersectionState, 1 /* Source */, reportErrors2 && !isDeferredMappedIndex)) {
+        if (result2 = isRelatedTo(stringNumberSymbolType, target2, 1 /* Source */, reportErrors2 && !isDeferredMappedIndex)) {
           return result2;
         }
         if (isDeferredMappedIndex) {
           const mappedType = source2.type;
           const nameType = getNameTypeFromMappedType(mappedType);
           const sourceMappedKeys = nameType && isMappedTypeWithKeyofConstraintDeclaration(mappedType) ? getApparentMappedTypeKeys(nameType, mappedType) : nameType || getConstraintTypeFromMappedType(mappedType);
-          if (result2 = isRelatedTo(sourceMappedKeys, target2, intersectionState, 1 /* Source */, reportErrors2)) {
+          if (result2 = isRelatedTo(sourceMappedKeys, target2, 1 /* Source */, reportErrors2)) {
             return result2;
           }
         }
       } else if (sourceFlags & 134217728 /* TemplateLiteral */ && !(targetFlags & 524288 /* Object */)) {
         if (!(targetFlags & 134217728 /* TemplateLiteral */)) {
           const constraint = getBaseConstraintOfType(source2);
-          if (constraint && constraint !== source2 && (result2 = isRelatedTo(constraint, target2, intersectionState, 1 /* Source */, reportErrors2))) {
+          if (constraint && constraint !== source2 && (result2 = isRelatedTo(constraint, target2, 1 /* Source */, reportErrors2))) {
             return result2;
           }
         }
@@ -62434,12 +62413,12 @@ function createTypeChecker(host) {
           if (source2.symbol !== target2.symbol) {
             return 0 /* False */;
           }
-          if (result2 = isRelatedTo(source2.type, target2.type, intersectionState, 3 /* Both */, reportErrors2)) {
+          if (result2 = isRelatedTo(source2.type, target2.type, 3 /* Both */, reportErrors2)) {
             return result2;
           }
         } else {
           const constraint = getBaseConstraintOfType(source2);
-          if (constraint && (result2 = isRelatedTo(constraint, target2, intersectionState, 1 /* Source */, reportErrors2))) {
+          if (constraint && (result2 = isRelatedTo(constraint, target2, 1 /* Source */, reportErrors2))) {
             return result2;
           }
         }
@@ -62452,24 +62431,20 @@ function createTypeChecker(host) {
           let sourceExtends = source2.extendsType;
           let mapper;
           if (sourceParams) {
-            let isRelatedToWorker2 = function(source3, target3, reportErrors3) {
-              return isRelatedTo(source3, target3, 0 /* None */, 3 /* Both */, reportErrors3);
-            };
-            var isRelatedToWorker = isRelatedToWorker2;
             const ctx = createInferenceContext(
               sourceParams,
               /*signature*/
               void 0,
               0 /* None */,
-              isRelatedToWorker2
+              isRelatedToWorker
             );
             inferTypes(ctx.inferences, target2.extendsType, sourceExtends, 512 /* NoConstraints */ | 1024 /* AlwaysStrict */);
             sourceExtends = instantiateType(sourceExtends, ctx.mapper);
             mapper = ctx.mapper;
           }
-          if (isTypeIdenticalTo(sourceExtends, target2.extendsType) && (isRelatedTo(source2.checkType, target2.checkType, intersectionState, 3 /* Both */) || isRelatedTo(target2.checkType, source2.checkType, intersectionState, 3 /* Both */))) {
-            if (result2 = isRelatedTo(instantiateType(getTrueTypeFromConditionalType(source2), mapper), getTrueTypeFromConditionalType(target2), intersectionState, 3 /* Both */, reportErrors2)) {
-              result2 &= isRelatedTo(getFalseTypeFromConditionalType(source2), getFalseTypeFromConditionalType(target2), intersectionState, 3 /* Both */, reportErrors2);
+          if (isTypeIdenticalTo(sourceExtends, target2.extendsType) && (isRelatedTo(source2.checkType, target2.checkType, 3 /* Both */) || isRelatedTo(target2.checkType, source2.checkType, 3 /* Both */))) {
+            if (result2 = isRelatedTo(instantiateType(getTrueTypeFromConditionalType(source2), mapper), getTrueTypeFromConditionalType(target2), 3 /* Both */, reportErrors2)) {
+              result2 &= isRelatedTo(getFalseTypeFromConditionalType(source2), getFalseTypeFromConditionalType(target2), 3 /* Both */, reportErrors2);
             }
             if (result2) {
               return result2;
@@ -62478,14 +62453,14 @@ function createTypeChecker(host) {
         }
         const defaultConstraint = getDefaultConstraintOfConditionalType(source2);
         if (defaultConstraint) {
-          if (result2 = isRelatedTo(defaultConstraint, target2, intersectionState, 1 /* Source */, reportErrors2)) {
+          if (result2 = isRelatedTo(defaultConstraint, target2, 1 /* Source */, reportErrors2)) {
             return result2;
           }
         }
         const distributiveConstraint = !(targetFlags & 16777216 /* Conditional */) && hasNonCircularBaseConstraint(source2) ? getConstraintOfDistributiveConditionalType(source2) : void 0;
         if (distributiveConstraint) {
           resetErrorInfo(saveErrorInfo);
-          if (result2 = isRelatedTo(distributiveConstraint, target2, intersectionState, 1 /* Source */, reportErrors2)) {
+          if (result2 = isRelatedTo(distributiveConstraint, target2, 1 /* Source */, reportErrors2)) {
             return result2;
           }
         }
@@ -62495,7 +62470,7 @@ function createTypeChecker(host) {
         }
         if (isGenericMappedType(target2)) {
           if (isGenericMappedType(source2)) {
-            if (result2 = mappedTypeRelatedTo(source2, target2, reportErrors2, intersectionState)) {
+            if (result2 = mappedTypeRelatedTo(source2, target2, reportErrors2)) {
               return result2;
             }
           }
@@ -62522,14 +62497,14 @@ function createTypeChecker(host) {
           }
         } else if (isReadonlyArrayType(target2) ? everyType(source2, isArrayOrTupleType) : isArrayType(target2) && everyType(source2, (t) => isTupleType(t) && !t.target.readonly)) {
           if (relation !== identityRelation) {
-            return isRelatedTo(getIndexTypeOfType(source2, numberType) || anyType, getIndexTypeOfType(target2, numberType) || anyType, intersectionState, 3 /* Both */, reportErrors2);
+            return isRelatedTo(getIndexTypeOfType(source2, numberType) || anyType, getIndexTypeOfType(target2, numberType) || anyType, 3 /* Both */, reportErrors2);
           } else {
             return 0 /* False */;
           }
         } else if (isGenericTupleType(source2) && isTupleType(target2) && !isGenericTupleType(target2)) {
           const constraint = getBaseConstraintOrType(source2);
           if (constraint !== source2) {
-            return isRelatedTo(constraint, target2, intersectionState, 1 /* Source */, reportErrors2);
+            return isRelatedTo(constraint, target2, 1 /* Source */, reportErrors2);
           }
         } else if ((relation === subtypeRelation || relation === strictSubtypeRelation) && isEmptyObjectType(target2) && getObjectFlags(target2) & 8192 /* FreshLiteral */ && !isEmptyObjectType(source2)) {
           return 0 /* False */;
@@ -62597,16 +62572,16 @@ function createTypeChecker(host) {
         }
       }
     }
-    function mappedTypeRelatedTo(source2, target2, reportErrors2, intersectionState) {
+    function mappedTypeRelatedTo(source2, target2, reportErrors2) {
       const modifiersRelated = relation === comparableRelation || (relation === identityRelation ? getMappedTypeModifiers(source2) === getMappedTypeModifiers(target2) : getCombinedMappedTypeOptionality(source2) <= getCombinedMappedTypeOptionality(target2));
       if (modifiersRelated) {
         let result2;
         const targetConstraint = getConstraintTypeFromMappedType(target2);
         const sourceConstraint = instantiateType(getConstraintTypeFromMappedType(source2), getCombinedMappedTypeOptionality(source2) < 0 ? reportUnmeasurableMapper : reportUnreliableMapper);
-        if (result2 = isRelatedTo(targetConstraint, sourceConstraint, intersectionState, 3 /* Both */, reportErrors2)) {
+        if (result2 = isRelatedTo(targetConstraint, sourceConstraint, 3 /* Both */, reportErrors2)) {
           const mapper = createTypeMapper([getTypeParameterFromMappedType(source2)], [getTypeParameterFromMappedType(target2)]);
           if (instantiateType(getNameTypeFromMappedType(source2), mapper) === instantiateType(getNameTypeFromMappedType(target2), mapper)) {
-            return result2 & isRelatedTo(instantiateType(getTemplateTypeFromMappedType(source2), mapper), getTemplateTypeFromMappedType(target2), intersectionState, 3 /* Both */, reportErrors2);
+            return result2 & isRelatedTo(instantiateType(getTemplateTypeFromMappedType(source2), mapper), getTemplateTypeFromMappedType(target2), 3 /* Both */, reportErrors2);
           }
         }
       }
@@ -62746,11 +62721,11 @@ function createTypeChecker(host) {
       return isRelatedTo(
         effectiveSource,
         effectiveTarget,
-        intersectionState,
         3 /* Both */,
         reportErrors2,
         /*headMessage*/
-        void 0
+        void 0,
+        intersectionState
       );
     }
     function propertyRelatedTo(source2, target2, sourceProp, targetProp, getTypeOfSourceProperty, reportErrors2, intersectionState, skipOptional) {
@@ -62858,7 +62833,7 @@ function createTypeChecker(host) {
     }
     function propertiesRelatedTo(source2, target2, reportErrors2, excludedProperties, optionalsOnly, intersectionState) {
       if (relation === identityRelation) {
-        return propertiesIdenticalTo(source2, target2, excludedProperties, intersectionState);
+        return propertiesIdenticalTo(source2, target2, excludedProperties);
       }
       let result2 = -1 /* True */;
       if (isTupleType(target2)) {
@@ -62937,11 +62912,11 @@ function createTypeChecker(host) {
             const related = isRelatedTo(
               sourceType,
               targetCheckType,
-              intersectionState,
               3 /* Both */,
               reportErrors2,
               /*headMessage*/
-              void 0
+              void 0,
+              intersectionState
             );
             if (!related) {
               if (reportErrors2 && (targetArity > 1 || sourceArity > 1)) {
@@ -63005,7 +62980,7 @@ function createTypeChecker(host) {
       }
       return result2;
     }
-    function propertiesIdenticalTo(source2, target2, excludedProperties, intersectionState) {
+    function propertiesIdenticalTo(source2, target2, excludedProperties) {
       if (!(source2.flags & 524288 /* Object */ && target2.flags & 524288 /* Object */)) {
         return 0 /* False */;
       }
@@ -63020,21 +62995,18 @@ function createTypeChecker(host) {
         if (!targetProp) {
           return 0 /* False */;
         }
-        const related = compareProperties(sourceProp, targetProp, isRelatedToWorker);
+        const related = compareProperties(sourceProp, targetProp, isRelatedTo);
         if (!related) {
           return 0 /* False */;
         }
         result2 &= related;
       }
       return result2;
-      function isRelatedToWorker(source3, target3) {
-        return isRelatedTo(source3, target3, intersectionState);
-      }
     }
     function signaturesRelatedTo(source2, target2, kind, reportErrors2, intersectionState) {
       var _a2, _b;
       if (relation === identityRelation) {
-        return signaturesIdenticalTo(source2, target2, kind, intersectionState);
+        return signaturesIdenticalTo(source2, target2, kind);
       }
       if (target2 === anyFunctionType || source2 === anyFunctionType) {
         return -1 /* True */;
@@ -63163,20 +63135,20 @@ function createTypeChecker(host) {
     }
     function signatureRelatedTo(source2, target2, erase, reportErrors2, intersectionState, incompatibleReporter) {
       const checkMode = relation === subtypeRelation ? 16 /* StrictTopSignature */ : relation === strictSubtypeRelation ? 16 /* StrictTopSignature */ | 8 /* StrictArity */ : 0 /* None */;
-      return compareSignaturesRelated(erase ? getErasedSignature(source2) : source2, erase ? getErasedSignature(target2) : target2, checkMode, reportErrors2, reportError, incompatibleReporter, isRelatedToWorker, reportUnreliableMapper);
-      function isRelatedToWorker(source3, target3, reportErrors3) {
+      return compareSignaturesRelated(erase ? getErasedSignature(source2) : source2, erase ? getErasedSignature(target2) : target2, checkMode, reportErrors2, reportError, incompatibleReporter, isRelatedToWorker2, reportUnreliableMapper);
+      function isRelatedToWorker2(source3, target3, reportErrors3) {
         return isRelatedTo(
           source3,
           target3,
-          intersectionState,
           3 /* Both */,
           reportErrors3,
           /*headMessage*/
-          void 0
+          void 0,
+          intersectionState
         );
       }
     }
-    function signaturesIdenticalTo(source2, target2, kind, intersectionState) {
+    function signaturesIdenticalTo(source2, target2, kind) {
       const sourceSignatures = getSignaturesOfType(source2, kind);
       const targetSignatures = getSignaturesOfType(target2, kind);
       if (sourceSignatures.length !== targetSignatures.length) {
@@ -63193,7 +63165,7 @@ function createTypeChecker(host) {
           false,
           /*ignoreReturnTypes*/
           false,
-          isRelatedToWorker
+          isRelatedTo
         );
         if (!related) {
           return 0 /* False */;
@@ -63201,9 +63173,6 @@ function createTypeChecker(host) {
         result2 &= related;
       }
       return result2;
-      function isRelatedToWorker(source3, target3) {
-        return isRelatedTo(source3, target3, intersectionState);
-      }
     }
     function membersRelatedToIndexInfo(source2, targetInfo, reportErrors2, intersectionState) {
       let result2 = -1 /* True */;
@@ -63219,11 +63188,11 @@ function createTypeChecker(host) {
           const related = isRelatedTo(
             type,
             targetInfo.type,
-            intersectionState,
             3 /* Both */,
             reportErrors2,
             /*headMessage*/
-            void 0
+            void 0,
+            intersectionState
           );
           if (!related) {
             if (reportErrors2) {
@@ -63249,11 +63218,11 @@ function createTypeChecker(host) {
       const related = isRelatedTo(
         sourceInfo.type,
         targetInfo.type,
-        intersectionState,
         3 /* Both */,
         reportErrors2,
         /*headMessage*/
-        void 0
+        void 0,
+        intersectionState
       );
       if (!related && reportErrors2) {
         if (sourceInfo.keyType === targetInfo.keyType) {
@@ -63266,13 +63235,13 @@ function createTypeChecker(host) {
     }
     function indexSignaturesRelatedTo(source2, target2, sourceIsPrimitive, reportErrors2, intersectionState) {
       if (relation === identityRelation) {
-        return indexSignaturesIdenticalTo(source2, target2, intersectionState);
+        return indexSignaturesIdenticalTo(source2, target2);
       }
       const indexInfos = getIndexInfosOfType(target2);
       const targetHasStringIndex = some(indexInfos, (info) => info.keyType === stringType);
       let result2 = -1 /* True */;
       for (const targetInfo of indexInfos) {
-        const related = relation !== strictSubtypeRelation && !sourceIsPrimitive && targetHasStringIndex && targetInfo.type.flags & 1 /* Any */ ? -1 /* True */ : isGenericMappedType(source2) && targetHasStringIndex ? isRelatedTo(getTemplateTypeFromMappedType(source2), targetInfo.type, intersectionState, 3 /* Both */, reportErrors2) : typeRelatedToIndexInfo(source2, targetInfo, reportErrors2, intersectionState);
+        const related = relation !== strictSubtypeRelation && !sourceIsPrimitive && targetHasStringIndex && targetInfo.type.flags & 1 /* Any */ ? -1 /* True */ : isGenericMappedType(source2) && targetHasStringIndex ? isRelatedTo(getTemplateTypeFromMappedType(source2), targetInfo.type, 3 /* Both */, reportErrors2) : typeRelatedToIndexInfo(source2, targetInfo, reportErrors2, intersectionState);
         if (!related) {
           return 0 /* False */;
         }
@@ -63293,7 +63262,7 @@ function createTypeChecker(host) {
       }
       return 0 /* False */;
     }
-    function indexSignaturesIdenticalTo(source2, target2, intersectionState) {
+    function indexSignaturesIdenticalTo(source2, target2) {
       const sourceInfos = getIndexInfosOfType(source2);
       const targetInfos = getIndexInfosOfType(target2);
       if (sourceInfos.length !== targetInfos.length) {
@@ -63301,7 +63270,7 @@ function createTypeChecker(host) {
       }
       for (const targetInfo of targetInfos) {
         const sourceInfo = getIndexInfoOfType(source2, targetInfo.keyType);
-        if (!(sourceInfo && isRelatedTo(sourceInfo.type, targetInfo.type, intersectionState, 3 /* Both */) && sourceInfo.isReadonly === targetInfo.isReadonly)) {
+        if (!(sourceInfo && isRelatedTo(sourceInfo.type, targetInfo.type, 3 /* Both */) && sourceInfo.isReadonly === targetInfo.isReadonly)) {
           return 0 /* False */;
         }
       }
@@ -71247,7 +71216,7 @@ function createTypeChecker(host) {
     if (isErrorType(objectType) || objectType === silentNeverType) {
       return objectType;
     }
-    if (isConstEnumObjectType(objectType) && !isStringLiteralLike(indexExpression)) {
+    if (isConstEnumObjectType(objectType) && !isStringLiteralLike(indexExpression) && !isPreservedConstEnumUse(node, objectType)) {
       error(indexExpression, Diagnostics.A_const_enum_member_can_only_be_accessed_using_a_string_literal);
       return errorType;
     }
@@ -76291,17 +76260,28 @@ function createTypeChecker(host) {
   }
   function checkConstEnumAccess(node, type) {
     const ok = node.parent.kind === 211 /* PropertyAccessExpression */ && node.parent.expression === node || node.parent.kind === 212 /* ElementAccessExpression */ && node.parent.expression === node || ((node.kind === 80 /* Identifier */ || node.kind === 166 /* QualifiedName */) && isInRightSideOfImportOrExportAssignment(node) || node.parent.kind === 186 /* TypeQuery */ && node.parent.exprName === node) || node.parent.kind === 281 /* ExportSpecifier */;
-    if (!ok) {
-      error(node, Diagnostics.const_enums_can_only_be_used_in_property_or_index_access_expressions_or_the_right_hand_side_of_an_import_declaration_or_export_assignment_or_type_query);
+    if (!ok || getIsolatedModules(compilerOptions)) {
+      if (!isPreservedConstEnumUse(node, type)) {
+        if (!ok) {
+          error(node, Diagnostics.const_enums_can_only_be_used_in_property_or_index_access_expressions_or_the_right_hand_side_of_an_import_declaration_or_export_assignment_or_type_query);
+        } else if (type.symbol.valueDeclaration.flags & 33554432 /* Ambient */ && !isValidTypeOnlyAliasUseSite(node)) {
+          error(node, Diagnostics.Cannot_access_ambient_const_enums_when_0_is_enabled, isolatedModulesLikeFlagName);
+        }
+      }
     }
-    if (getIsolatedModules(compilerOptions)) {
-      Debug.assert(!!(type.symbol.flags & 128 /* ConstEnum */));
-      const constEnumDeclaration = type.symbol.valueDeclaration;
-      const redirect = host.getRedirectReferenceForResolutionFromSourceOfProject(getSourceFileOfNode(constEnumDeclaration).resolvedPath);
-      if (constEnumDeclaration.flags & 33554432 /* Ambient */ && !isValidTypeOnlyAliasUseSite(node) && (!redirect || !shouldPreserveConstEnums(redirect.commandLine.options))) {
-        error(node, Diagnostics.Cannot_access_ambient_const_enums_when_0_is_enabled, isolatedModulesLikeFlagName);
+  }
+  function isPreservedConstEnumUse(use, enumType) {
+    Debug.assert(!!(enumType.symbol.flags & 128 /* ConstEnum */));
+    const constEnumDeclaration = enumType.symbol.valueDeclaration;
+    const otherFile = getSourceFileOfNode(constEnumDeclaration);
+    if (!otherFile.isDeclarationFile) {
+      if (constEnumDeclaration.flags & 33554432 /* Ambient */ && !isValidTypeOnlyAliasUseSite(use)) {
+        return false;
       }
+      return shouldPreserveConstEnums(compilerOptions);
     }
+    const redirect = host.getRedirectReferenceForResolutionFromSourceOfProject(otherFile.resolvedPath);
+    return redirect && shouldPreserveConstEnums(redirect.commandLine.options);
   }
   function checkParenthesizedExpression(node, checkMode) {
     if (hasJSDocNodes(node)) {
@@ -83211,9 +83191,23 @@ function createTypeChecker(host) {
   function isDeclarationWithPossibleInnerTypeNodeReuse(declaration) {
     return isFunctionLike(declaration) || isExportAssignment(declaration) || isVariableLike(declaration);
   }
+  function getAllAccessorDeclarationsForDeclaration(accessor) {
+    accessor = getParseTreeNode(accessor, isGetOrSetAccessorDeclaration);
+    const otherKind = accessor.kind === 178 /* SetAccessor */ ? 177 /* GetAccessor */ : 178 /* SetAccessor */;
+    const otherAccessor = getDeclarationOfKind(getSymbolOfDeclaration(accessor), otherKind);
+    const firstAccessor = otherAccessor && otherAccessor.pos < accessor.pos ? otherAccessor : accessor;
+    const secondAccessor = otherAccessor && otherAccessor.pos < accessor.pos ? accessor : otherAccessor;
+    const setAccessor = accessor.kind === 178 /* SetAccessor */ ? accessor : otherAccessor;
+    const getAccessor = accessor.kind === 177 /* GetAccessor */ ? accessor : otherAccessor;
+    return {
+      firstAccessor,
+      secondAccessor,
+      setAccessor,
+      getAccessor
+    };
+  }
   function getPossibleTypeNodeReuseExpression(declaration) {
-    var _a;
-    return isFunctionLike(declaration) && !isSetAccessor(declaration) ? getSingleReturnExpression(declaration) : isExportAssignment(declaration) ? declaration.expression : !!declaration.initializer ? declaration.initializer : isParameter(declaration) && isSetAccessor(declaration.parent) ? getSingleReturnExpression(getAllAccessorDeclarations((_a = getSymbolOfDeclaration(declaration.parent)) == null ? void 0 : _a.declarations, declaration.parent).getAccessor) : void 0;
+    return isFunctionLike(declaration) && !isSetAccessor(declaration) ? getSingleReturnExpression(declaration) : isExportAssignment(declaration) ? declaration.expression : !!declaration.initializer ? declaration.initializer : isParameter(declaration) && isSetAccessor(declaration.parent) ? getSingleReturnExpression(getAllAccessorDeclarationsForDeclaration(declaration.parent).getAccessor) : void 0;
   }
   function getSingleReturnExpression(declaration) {
     let candidateExpr;
@@ -83398,6 +83392,35 @@ function createTypeChecker(host) {
       return parseIsolatedEntityName(compilerOptions.jsxFragmentFactory, languageVersion);
     }
   }
+  function getNonlocalEffectiveTypeAnnotationNode(node) {
+    const direct = getEffectiveTypeAnnotationNode(node);
+    if (direct) {
+      return direct;
+    }
+    if (node.kind === 169 /* Parameter */ && node.parent.kind === 178 /* SetAccessor */) {
+      const other = getAllAccessorDeclarationsForDeclaration(node.parent).getAccessor;
+      if (other) {
+        return getEffectiveReturnTypeNode(other);
+      }
+    }
+    return void 0;
+  }
+  function getNonlocalEffectiveReturnTypeAnnotationNode(node) {
+    const direct = getEffectiveReturnTypeNode(node);
+    if (direct) {
+      return direct;
+    }
+    if (node.kind === 177 /* GetAccessor */) {
+      const other = getAllAccessorDeclarationsForDeclaration(node).setAccessor;
+      if (other) {
+        const param = getSetAccessorValueParameter(other);
+        if (param) {
+          return getEffectiveTypeAnnotationNode(param);
+        }
+      }
+    }
+    return void 0;
+  }
   function createResolver() {
     return {
       getReferencedExportContainer,
@@ -83451,21 +83474,6 @@ function createTypeChecker(host) {
       },
       getJsxFactoryEntity,
       getJsxFragmentFactoryEntity,
-      getAllAccessorDeclarations(accessor) {
-        accessor = getParseTreeNode(accessor, isGetOrSetAccessorDeclaration);
-        const otherKind = accessor.kind === 178 /* SetAccessor */ ? 177 /* GetAccessor */ : 178 /* SetAccessor */;
-        const otherAccessor = getDeclarationOfKind(getSymbolOfDeclaration(accessor), otherKind);
-        const firstAccessor = otherAccessor && otherAccessor.pos < accessor.pos ? otherAccessor : accessor;
-        const secondAccessor = otherAccessor && otherAccessor.pos < accessor.pos ? accessor : otherAccessor;
-        const setAccessor = accessor.kind === 178 /* SetAccessor */ ? accessor : otherAccessor;
-        const getAccessor = accessor.kind === 177 /* GetAccessor */ ? accessor : otherAccessor;
-        return {
-          firstAccessor,
-          secondAccessor,
-          setAccessor,
-          getAccessor
-        };
-      },
       isBindingCapturedByNode: (node, decl) => {
         const parseNode = getParseTreeNode(node);
         const parseDecl = getParseTreeNode(decl);
@@ -83820,7 +83828,7 @@ function createTypeChecker(host) {
             return grammarErrorOnFirstToken(node, Diagnostics.Decorators_are_not_valid_here);
           }
         } else if (legacyDecorators && (node.kind === 177 /* GetAccessor */ || node.kind === 178 /* SetAccessor */)) {
-          const accessors = getAllAccessorDeclarations(node.parent.members, node);
+          const accessors = getAllAccessorDeclarationsForDeclaration(node);
           if (hasDecorators(accessors.firstAccessor) && node === accessors.secondAccessor) {
             return grammarErrorOnFirstToken(node, Diagnostics.Decorators_cannot_be_applied_to_multiple_get_Slashset_accessors_of_the_same_name);
           }
@@ -89011,7 +89019,7 @@ function transformTypeScript(context) {
     if (typeSerializer) {
       let decorators;
       if (shouldAddTypeMetadata(node)) {
-        const typeMetadata = emitHelpers().createMetadataHelper("design:type", typeSerializer.serializeTypeOfNode({ currentLexicalScope, currentNameScope: container }, node));
+        const typeMetadata = emitHelpers().createMetadataHelper("design:type", typeSerializer.serializeTypeOfNode({ currentLexicalScope, currentNameScope: container }, node, container));
         decorators = append(decorators, factory2.createDecorator(typeMetadata));
       }
       if (shouldAddParamTypesMetadata(node)) {
@@ -89038,7 +89046,7 @@ function transformTypeScript(context) {
           /*type*/
           void 0,
           factory2.createToken(39 /* EqualsGreaterThanToken */),
-          typeSerializer.serializeTypeOfNode({ currentLexicalScope, currentNameScope: container }, node)
+          typeSerializer.serializeTypeOfNode({ currentLexicalScope, currentNameScope: container }, node, container)
         ));
         properties = append(properties, typeProperty);
       }
@@ -92475,7 +92483,7 @@ function createRuntimeTypeSerializer(context) {
   let currentNameScope;
   return {
     serializeTypeNode: (serializerContext, node) => setSerializerContextAnd(serializerContext, serializeTypeNode, node),
-    serializeTypeOfNode: (serializerContext, node) => setSerializerContextAnd(serializerContext, serializeTypeOfNode, node),
+    serializeTypeOfNode: (serializerContext, node, container) => setSerializerContextAnd(serializerContext, serializeTypeOfNode, node, container),
     serializeParameterTypesOfNode: (serializerContext, node, container) => setSerializerContextAnd(serializerContext, serializeParameterTypesOfNode, node, container),
     serializeReturnTypeOfNode: (serializerContext, node) => setSerializerContextAnd(serializerContext, serializeReturnTypeOfNode, node)
   };
@@ -92489,18 +92497,18 @@ function createRuntimeTypeSerializer(context) {
     currentNameScope = savedCurrentNameScope;
     return result;
   }
-  function getAccessorTypeNode(node) {
-    const accessors = resolver.getAllAccessorDeclarations(node);
+  function getAccessorTypeNode(node, container) {
+    const accessors = getAllAccessorDeclarations(container.members, node);
     return accessors.setAccessor && getSetAccessorTypeAnnotationNode(accessors.setAccessor) || accessors.getAccessor && getEffectiveReturnTypeNode(accessors.getAccessor);
   }
-  function serializeTypeOfNode(node) {
+  function serializeTypeOfNode(node, container) {
     switch (node.kind) {
       case 172 /* PropertyDeclaration */:
       case 169 /* Parameter */:
         return serializeTypeNode(node.type);
       case 178 /* SetAccessor */:
       case 177 /* GetAccessor */:
-        return serializeTypeNode(getAccessorTypeNode(node));
+        return serializeTypeNode(getAccessorTypeNode(node, container));
       case 263 /* ClassDeclaration */:
       case 231 /* ClassExpression */:
       case 174 /* MethodDeclaration */:
@@ -92523,7 +92531,7 @@ function createRuntimeTypeSerializer(context) {
         if (parameter.dotDotDotToken) {
           expressions.push(serializeTypeNode(getRestParameterElementType(parameter.type)));
         } else {
-          expressions.push(serializeTypeOfNode(parameter));
+          expressions.push(serializeTypeOfNode(parameter, container));
         }
       }
     }
@@ -108913,7 +108921,7 @@ function transformDeclarations(context) {
       if (!isPrivate) {
         const valueParameter = getSetAccessorValueParameter(input);
         if (valueParameter) {
-          const accessorType = getTypeAnnotationFromAllAccessorDeclarations(input, resolver.getAllAccessorDeclarations(input));
+          const accessorType = getTypeAnnotationFromAllAccessorDeclarations(input, getAllAccessorDeclarations(isObjectLiteralExpression(input.parent) ? input.parent.properties : input.parent.members, input));
           newValueParameter = ensureParameter(
             valueParameter,
             /*modifierMask*/
@@ -109199,7 +109207,7 @@ function transformDeclarations(context) {
               void 0
             );
           }
-          const accessorType = getTypeAnnotationFromAllAccessorDeclarations(input, resolver.getAllAccessorDeclarations(input));
+          const accessorType = getTypeAnnotationFromAllAccessorDeclarations(input, getAllAccessorDeclarations(isObjectLiteralExpression(input.parent) ? input.parent.properties : input.parent.members, input));
           return cleanup(factory2.updateGetAccessorDeclaration(
             input,
             ensureModifiers(input),
@@ -111047,7 +111055,6 @@ var notImplementedResolver = {
   isLiteralConstDeclaration: notImplemented,
   getJsxFactoryEntity: notImplemented,
   getJsxFragmentFactoryEntity: notImplemented,
-  getAllAccessorDeclarations: notImplemented,
   isBindingCapturedByNode: notImplemented,
   getDeclarationStatementsForSourceFile: notImplemented,
   isImportRequiredByAugmentation: notImplemented