typescript 4.7.0-dev.20220328 → 4.7.0-dev.20220329

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.20220328";
+    ts.version = ts.versionMajorMinor + ".0-dev.20220329";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -13606,7 +13606,9 @@ var ts;
             || kind === 174 /* CallSignature */
             || kind === 166 /* PropertySignature */
             || kind === 168 /* MethodSignature */
-            || kind === 176 /* IndexSignature */;
+            || kind === 176 /* IndexSignature */
+            || kind === 172 /* GetAccessor */
+            || kind === 173 /* SetAccessor */;
     }
     ts.isTypeElement = isTypeElement;
     function isClassOrTypeElement(node) {
@@ -47588,6 +47590,7 @@ var ts;
         TypeSystemPropertyName[TypeSystemPropertyName["EnumTagType"] = 5] = "EnumTagType";
         TypeSystemPropertyName[TypeSystemPropertyName["ResolvedTypeArguments"] = 6] = "ResolvedTypeArguments";
         TypeSystemPropertyName[TypeSystemPropertyName["ResolvedBaseTypes"] = 7] = "ResolvedBaseTypes";
+        TypeSystemPropertyName[TypeSystemPropertyName["WriteType"] = 8] = "WriteType";
     })(TypeSystemPropertyName || (TypeSystemPropertyName = {}));
     var CheckMode;
     (function (CheckMode) {
@@ -49102,6 +49105,10 @@ var ts;
                 }
             }
         }
+        function isConstAssertion(location) {
+            return (ts.isAssertionExpression(location) && ts.isConstTypeReference(location.type))
+                || (ts.isJSDocTypeTag(location) && ts.isConstTypeReference(location.typeExpression));
+        }
         /**
          * Resolve a given name for a given meaning at a given location. An error is reported if the name was not found and
          * the nameNotFoundMessage argument is not undefined. Returns the resolved symbol, or undefined if no symbol with
@@ -49127,6 +49134,11 @@ var ts;
             var grandparent;
             var isInExternalModule = false;
             loop: while (location) {
+                if (name === "const" && isConstAssertion(location)) {
+                    // `const` in an `as const` has no symbol, but issues no error because there is no *actual* lookup of the type
+                    // (it refers to the constant type of the expression instead)
+                    return undefined;
+                }
                 // Locals of a source file are not in scope (because they get merged into the global symbol table)
                 if (location.locals && !isGlobalSourceFile(location)) {
                     if (result = lookup(location.locals, name, meaning)) {
@@ -55075,6 +55087,8 @@ var ts;
                     return !!target.resolvedTypeArguments;
                 case 7 /* ResolvedBaseTypes */:
                     return !!target.baseTypesResolved;
+                case 8 /* WriteType */:
+                    return !!getSymbolLinks(target).writeType;
             }
             return ts.Debug.assertNever(propertyName);
         }
@@ -55992,6 +56006,11 @@ var ts;
                 }
                 return getWidenedType(getWidenedLiteralType(checkExpression(declaration.statements[0].expression)));
             }
+            if (ts.isAccessor(declaration)) {
+                // Binding of certain patterns in JS code will occasionally mark symbols as both properties
+                // and accessors. Here we dispatch to accessor resolution if needed.
+                return getTypeOfAccessors(symbol);
+            }
             // Handle variable, parameter or property
             if (!pushTypeResolution(symbol, 0 /* Type */)) {
                 // Symbol is property of some kind that is merged with something - should use `getTypeOfFuncClassEnumModule` and not `getTypeOfVariableOrParameterOrProperty`
@@ -56055,9 +56074,6 @@ var ts;
             else if (ts.isEnumMember(declaration)) {
                 type = getTypeOfEnumMember(symbol);
             }
-            else if (ts.isAccessor(declaration)) {
-                type = resolveTypeOfAccessors(symbol) || ts.Debug.fail("Non-write accessor resolution must always produce a type");
-            }
             else {
                 return ts.Debug.fail("Unhandled declaration kind! " + ts.Debug.formatSyntaxKind(declaration.kind) + " for " + ts.Debug.formatSymbol(symbol));
             }
@@ -56096,87 +56112,61 @@ var ts;
         }
         function getTypeOfAccessors(symbol) {
             var links = getSymbolLinks(symbol);
-            return links.type || (links.type = getTypeOfAccessorsWorker(symbol) || ts.Debug.fail("Read type of accessor must always produce a type"));
-        }
-        function getTypeOfSetAccessor(symbol) {
-            var links = getSymbolLinks(symbol);
-            return links.writeType || (links.writeType = getTypeOfAccessorsWorker(symbol, /*writing*/ true));
-        }
-        function getTypeOfAccessorsWorker(symbol, writing) {
-            if (writing === void 0) { writing = false; }
-            if (!pushTypeResolution(symbol, 0 /* Type */)) {
-                return errorType;
-            }
-            var type = resolveTypeOfAccessors(symbol, writing);
-            if (!popTypeResolution()) {
+            if (!links.type) {
+                if (!pushTypeResolution(symbol, 0 /* Type */)) {
+                    return errorType;
+                }
                 var getter = ts.getDeclarationOfKind(symbol, 172 /* GetAccessor */);
-                if (getter) {
-                    if (ts.getEffectiveTypeAnnotationNode(getter)) {
-                        error(getter.name, ts.Diagnostics._0_is_referenced_directly_or_indirectly_in_its_own_type_annotation, symbolToString(symbol));
+                var setter = ts.getDeclarationOfKind(symbol, 173 /* SetAccessor */);
+                // We try to resolve a getter type annotation, a setter type annotation, or a getter function
+                // body return type inference, in that order.
+                var type = getter && ts.isInJSFile(getter) && getTypeForDeclarationFromJSDocComment(getter) ||
+                    getAnnotatedAccessorType(getter) ||
+                    getAnnotatedAccessorType(setter) ||
+                    getter && getter.body && getReturnTypeFromBody(getter);
+                if (!type) {
+                    if (setter && !isPrivateWithinAmbient(setter)) {
+                        errorOrSuggestion(noImplicitAny, setter, ts.Diagnostics.Property_0_implicitly_has_type_any_because_its_set_accessor_lacks_a_parameter_type_annotation, symbolToString(symbol));
+                    }
+                    else if (getter && !isPrivateWithinAmbient(getter)) {
+                        errorOrSuggestion(noImplicitAny, getter, ts.Diagnostics.Property_0_implicitly_has_type_any_because_its_get_accessor_lacks_a_return_type_annotation, symbolToString(symbol));
+                    }
+                    type = anyType;
+                }
+                if (!popTypeResolution()) {
+                    if (getAnnotatedAccessorTypeNode(getter)) {
+                        error(getter, ts.Diagnostics._0_is_referenced_directly_or_indirectly_in_its_own_type_annotation, symbolToString(symbol));
+                    }
+                    else if (getAnnotatedAccessorTypeNode(setter)) {
+                        error(setter, ts.Diagnostics._0_is_referenced_directly_or_indirectly_in_its_own_type_annotation, symbolToString(symbol));
                     }
-                    else if (noImplicitAny) {
+                    else if (getter && noImplicitAny) {
                         error(getter, ts.Diagnostics._0_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_referenced_directly_or_indirectly_in_one_of_its_return_expressions, symbolToString(symbol));
                     }
+                    type = anyType;
                 }
-                type = anyType;
+                links.type = type;
             }
-            return type;
+            return links.type;
         }
-        function resolveTypeOfAccessors(symbol, writing) {
-            if (writing === void 0) { writing = false; }
-            var getter = ts.getDeclarationOfKind(symbol, 172 /* GetAccessor */);
-            var setter = ts.getDeclarationOfKind(symbol, 173 /* SetAccessor */);
-            // For write operations, prioritize type annotations on the setter
-            if (writing) {
-                var setterType_1 = getAnnotatedAccessorType(setter);
-                if (setterType_1) {
-                    return instantiateTypeIfNeeded(setterType_1, symbol);
-                }
-            }
-            // Else defer to the getter type
-            if (getter && ts.isInJSFile(getter)) {
-                var jsDocType = getTypeForDeclarationFromJSDocComment(getter);
-                if (jsDocType) {
-                    return instantiateTypeIfNeeded(jsDocType, symbol);
-                }
-            }
-            // Try to see if the user specified a return type on the get-accessor.
-            var getterType = getAnnotatedAccessorType(getter);
-            if (getterType) {
-                return instantiateTypeIfNeeded(getterType, symbol);
-            }
-            // If the user didn't specify a return type, try to use the set-accessor's parameter type.
-            var setterType = getAnnotatedAccessorType(setter);
-            if (setterType) {
-                return setterType;
-            }
-            // If there are no specified types, try to infer it from the body of the get accessor if it exists.
-            if (getter && getter.body) {
-                var returnTypeFromBody = getReturnTypeFromBody(getter);
-                return instantiateTypeIfNeeded(returnTypeFromBody, symbol);
-            }
-            // Otherwise, fall back to 'any'.
-            if (setter) {
-                if (!isPrivateWithinAmbient(setter)) {
-                    errorOrSuggestion(noImplicitAny, setter, ts.Diagnostics.Property_0_implicitly_has_type_any_because_its_set_accessor_lacks_a_parameter_type_annotation, symbolToString(symbol));
-                }
-                return anyType;
-            }
-            else if (getter) {
-                ts.Debug.assert(!!getter, "there must exist a getter as we are current checking either setter or getter in this function");
-                if (!isPrivateWithinAmbient(getter)) {
-                    errorOrSuggestion(noImplicitAny, getter, ts.Diagnostics.Property_0_implicitly_has_type_any_because_its_get_accessor_lacks_a_return_type_annotation, symbolToString(symbol));
+        function getWriteTypeOfAccessors(symbol) {
+            var links = getSymbolLinks(symbol);
+            if (!links.writeType) {
+                if (!pushTypeResolution(symbol, 8 /* WriteType */)) {
+                    return errorType;
                 }
-                return anyType;
-            }
-            return undefined;
-            function instantiateTypeIfNeeded(type, symbol) {
-                if (ts.getCheckFlags(symbol) & 1 /* Instantiated */) {
-                    var links = getSymbolLinks(symbol);
-                    return instantiateType(type, links.mapper);
+                var setter = ts.getDeclarationOfKind(symbol, 173 /* SetAccessor */);
+                var writeType = getAnnotatedAccessorType(setter);
+                if (!popTypeResolution()) {
+                    if (getAnnotatedAccessorTypeNode(setter)) {
+                        error(setter, ts.Diagnostics._0_is_referenced_directly_or_indirectly_in_its_own_type_annotation, symbolToString(symbol));
+                    }
+                    writeType = anyType;
                 }
-                return type;
+                // Absent an explicit setter type annotation we use the read type of the accessor.
+                links.writeType = writeType || getTypeOfAccessors(symbol);
             }
+            return links.writeType;
         }
         function getBaseTypeVariableOfClass(symbol) {
             var baseConstructorType = getBaseConstructorTypeOfClass(getDeclaredTypeOfClassOrInterface(symbol));
@@ -56258,17 +56248,11 @@ var ts;
         }
         function getTypeOfInstantiatedSymbol(symbol) {
             var links = getSymbolLinks(symbol);
-            if (!links.type) {
-                if (!pushTypeResolution(symbol, 0 /* Type */)) {
-                    return links.type = errorType;
-                }
-                var type = instantiateType(getTypeOfSymbol(links.target), links.mapper);
-                if (!popTypeResolution()) {
-                    type = reportCircularityError(symbol);
-                }
-                links.type = type;
-            }
-            return links.type;
+            return links.type || (links.type = instantiateType(getTypeOfSymbol(links.target), links.mapper));
+        }
+        function getWriteTypeOfInstantiatedSymbol(symbol) {
+            var links = getSymbolLinks(symbol);
+            return links.writeType || (links.writeType = instantiateType(getWriteTypeOfSymbol(links.target), links.mapper));
         }
         function reportCircularityError(symbol) {
             var declaration = symbol.valueDeclaration;
@@ -56305,35 +56289,23 @@ var ts;
             return links.writeType;
         }
         /**
-         * Distinct write types come only from set accessors, but union and intersection
-         * properties deriving from set accessors will either pre-compute or defer the
-         * union or intersection of the writeTypes of their constituents. To account for
-         * this, we will assume that any deferred type or transient symbol may have a
-         * `writeType` (or a deferred write type ready to be computed) that should be
-         * used before looking for set accessor declarations.
+         * Distinct write types come only from set accessors, but synthetic union and intersection
+         * properties deriving from set accessors will either pre-compute or defer the union or
+         * intersection of the writeTypes of their constituents.
          */
         function getWriteTypeOfSymbol(symbol) {
             var checkFlags = ts.getCheckFlags(symbol);
-            if (checkFlags & 65536 /* DeferredType */) {
-                var writeType = getWriteTypeOfSymbolWithDeferredType(symbol);
-                if (writeType) {
-                    return writeType;
-                }
+            if (symbol.flags & 4 /* Property */) {
+                return checkFlags & 2 /* SyntheticProperty */ ?
+                    checkFlags & 65536 /* DeferredType */ ?
+                        getWriteTypeOfSymbolWithDeferredType(symbol) || getTypeOfSymbolWithDeferredType(symbol) :
+                        symbol.writeType || symbol.type :
+                    getTypeOfSymbol(symbol);
             }
-            if (symbol.flags & 33554432 /* Transient */) {
-                var writeType = symbol.writeType;
-                if (writeType) {
-                    return writeType;
-                }
-            }
-            return getSetAccessorTypeOfSymbol(symbol);
-        }
-        function getSetAccessorTypeOfSymbol(symbol) {
             if (symbol.flags & 98304 /* Accessor */) {
-                var type = getTypeOfSetAccessor(symbol);
-                if (type) {
-                    return type;
-                }
+                return checkFlags & 1 /* Instantiated */ ?
+                    getWriteTypeOfInstantiatedSymbol(symbol) :
+                    getWriteTypeOfAccessors(symbol);
             }
             return getTypeOfSymbol(symbol);
         }
@@ -70804,7 +70776,7 @@ var ts;
                 }
             }
             if (ts.isDeclarationName(location) && ts.isSetAccessor(location.parent) && getAnnotatedAccessorTypeNode(location.parent)) {
-                return resolveTypeOfAccessors(location.parent.symbol, /*writing*/ true);
+                return getWriteTypeOfAccessors(location.parent.symbol);
             }
             // The location isn't a reference to the given symbol, meaning we're being asked
             // a hypothetical question of what type the symbol would have if there was a reference
@@ -82007,6 +81979,8 @@ var ts;
                     (condExpr.operatorToken.kind === 56 /* BarBarToken */ || condExpr.operatorToken.kind === 55 /* AmpersandAmpersandToken */)
                     ? condExpr.right
                     : condExpr;
+                if (ts.isModuleExportsAccessExpression(location))
+                    return;
                 var type = checkTruthinessExpression(location);
                 var isPropertyExpressionCast = ts.isPropertyAccessExpression(location) && isTypeAssertion(location.expression);
                 if (getFalsyFlags(type) || isPropertyExpressionCast)
@@ -126684,12 +126658,8 @@ var ts;
         }
     }
     ts.findNextToken = findNextToken;
-    /**
-     * Finds the rightmost token satisfying `token.end <= position`,
-     * excluding `JsxText` tokens containing only whitespace.
-     */
     function findPrecedingToken(position, sourceFile, startNode, excludeJsdoc) {
-        var result = find(startNode || sourceFile);
+        var result = find((startNode || sourceFile));
         ts.Debug.assert(!(result && isWhiteSpaceOnlyJsxText(result)));
         return result;
         function find(n) {
@@ -145947,6 +145917,7 @@ var ts;
             return formatting.getFormattingScanner(sourceFile.text, sourceFile.languageVariant, getScanStartPosition(enclosingNode, originalRange, sourceFile), originalRange.end, function (scanner) { return formatSpanWorker(originalRange, enclosingNode, formatting.SmartIndenter.getIndentationForNode(enclosingNode, originalRange, sourceFile, formatContext.options), getOwnOrInheritedDelta(enclosingNode, formatContext.options, sourceFile), scanner, formatContext, requestKind, prepareRangeContainsErrorFunction(sourceFile.parseDiagnostics, originalRange), sourceFile); });
         }
         function formatSpanWorker(originalRange, enclosingNode, initialIndentation, delta, formattingScanner, _a, requestKind, rangeContainsError, sourceFile) {
+            var _b;
             var options = _a.options, getRules = _a.getRules, host = _a.host;
             // formatting context is used by rules provider
             var formattingContext = new formatting.FormattingContext(sourceFile, requestKind, options);
@@ -145978,11 +145949,12 @@ var ts;
                 }
             }
             if (previousRange && formattingScanner.getStartPos() >= originalRange.end) {
-                var token = formattingScanner.isOnEOF() ? formattingScanner.readEOFTokenRange() :
+                var tokenInfo = formattingScanner.isOnEOF() ? formattingScanner.readEOFTokenRange() :
                     formattingScanner.isOnToken() ? formattingScanner.readTokenInfo(enclosingNode).token :
                         undefined;
-                if (token) {
-                    processPair(token, sourceFile.getLineAndCharacterOfPosition(token.pos).line, enclosingNode, previousRange, previousRangeStartLine, previousParent, enclosingNode, 
+                if (tokenInfo) {
+                    var parent = ((_b = ts.findPrecedingToken(tokenInfo.end, sourceFile, enclosingNode)) === null || _b === void 0 ? void 0 : _b.parent) || previousParent;
+                    processPair(tokenInfo, sourceFile.getLineAndCharacterOfPosition(tokenInfo.pos).line, parent, previousRange, previousRangeStartLine, previousParent, parent, 
                     /*dynamicIndentation*/ undefined);
                 }
             }

package/lib/typingsInstaller.js

@@ -89,7 +89,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.20220328";
+    ts.version = ts.versionMajorMinor + ".0-dev.20220329";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -13401,7 +13401,9 @@ var ts;
             || kind === 174 /* CallSignature */
             || kind === 166 /* PropertySignature */
             || kind === 168 /* MethodSignature */
-            || kind === 176 /* IndexSignature */;
+            || kind === 176 /* IndexSignature */
+            || kind === 172 /* GetAccessor */
+            || kind === 173 /* SetAccessor */;
     }
     ts.isTypeElement = isTypeElement;
     function isClassOrTypeElement(node) {
@@ -47383,6 +47385,7 @@ var ts;
         TypeSystemPropertyName[TypeSystemPropertyName["EnumTagType"] = 5] = "EnumTagType";
         TypeSystemPropertyName[TypeSystemPropertyName["ResolvedTypeArguments"] = 6] = "ResolvedTypeArguments";
         TypeSystemPropertyName[TypeSystemPropertyName["ResolvedBaseTypes"] = 7] = "ResolvedBaseTypes";
+        TypeSystemPropertyName[TypeSystemPropertyName["WriteType"] = 8] = "WriteType";
     })(TypeSystemPropertyName || (TypeSystemPropertyName = {}));
     var CheckMode;
     (function (CheckMode) {
@@ -48897,6 +48900,10 @@ var ts;
                 }
             }
         }
+        function isConstAssertion(location) {
+            return (ts.isAssertionExpression(location) && ts.isConstTypeReference(location.type))
+                || (ts.isJSDocTypeTag(location) && ts.isConstTypeReference(location.typeExpression));
+        }
         /**
          * Resolve a given name for a given meaning at a given location. An error is reported if the name was not found and
          * the nameNotFoundMessage argument is not undefined. Returns the resolved symbol, or undefined if no symbol with
@@ -48922,6 +48929,11 @@ var ts;
             var grandparent;
             var isInExternalModule = false;
             loop: while (location) {
+                if (name === "const" && isConstAssertion(location)) {
+                    // `const` in an `as const` has no symbol, but issues no error because there is no *actual* lookup of the type
+                    // (it refers to the constant type of the expression instead)
+                    return undefined;
+                }
                 // Locals of a source file are not in scope (because they get merged into the global symbol table)
                 if (location.locals && !isGlobalSourceFile(location)) {
                     if (result = lookup(location.locals, name, meaning)) {
@@ -54870,6 +54882,8 @@ var ts;
                     return !!target.resolvedTypeArguments;
                 case 7 /* ResolvedBaseTypes */:
                     return !!target.baseTypesResolved;
+                case 8 /* WriteType */:
+                    return !!getSymbolLinks(target).writeType;
             }
             return ts.Debug.assertNever(propertyName);
         }
@@ -55787,6 +55801,11 @@ var ts;
                 }
                 return getWidenedType(getWidenedLiteralType(checkExpression(declaration.statements[0].expression)));
             }
+            if (ts.isAccessor(declaration)) {
+                // Binding of certain patterns in JS code will occasionally mark symbols as both properties
+                // and accessors. Here we dispatch to accessor resolution if needed.
+                return getTypeOfAccessors(symbol);
+            }
             // Handle variable, parameter or property
             if (!pushTypeResolution(symbol, 0 /* Type */)) {
                 // Symbol is property of some kind that is merged with something - should use `getTypeOfFuncClassEnumModule` and not `getTypeOfVariableOrParameterOrProperty`
@@ -55850,9 +55869,6 @@ var ts;
             else if (ts.isEnumMember(declaration)) {
                 type = getTypeOfEnumMember(symbol);
             }
-            else if (ts.isAccessor(declaration)) {
-                type = resolveTypeOfAccessors(symbol) || ts.Debug.fail("Non-write accessor resolution must always produce a type");
-            }
             else {
                 return ts.Debug.fail("Unhandled declaration kind! " + ts.Debug.formatSyntaxKind(declaration.kind) + " for " + ts.Debug.formatSymbol(symbol));
             }
@@ -55891,87 +55907,61 @@ var ts;
         }
         function getTypeOfAccessors(symbol) {
             var links = getSymbolLinks(symbol);
-            return links.type || (links.type = getTypeOfAccessorsWorker(symbol) || ts.Debug.fail("Read type of accessor must always produce a type"));
-        }
-        function getTypeOfSetAccessor(symbol) {
-            var links = getSymbolLinks(symbol);
-            return links.writeType || (links.writeType = getTypeOfAccessorsWorker(symbol, /*writing*/ true));
-        }
-        function getTypeOfAccessorsWorker(symbol, writing) {
-            if (writing === void 0) { writing = false; }
-            if (!pushTypeResolution(symbol, 0 /* Type */)) {
-                return errorType;
-            }
-            var type = resolveTypeOfAccessors(symbol, writing);
-            if (!popTypeResolution()) {
+            if (!links.type) {
+                if (!pushTypeResolution(symbol, 0 /* Type */)) {
+                    return errorType;
+                }
                 var getter = ts.getDeclarationOfKind(symbol, 172 /* GetAccessor */);
-                if (getter) {
-                    if (ts.getEffectiveTypeAnnotationNode(getter)) {
-                        error(getter.name, ts.Diagnostics._0_is_referenced_directly_or_indirectly_in_its_own_type_annotation, symbolToString(symbol));
+                var setter = ts.getDeclarationOfKind(symbol, 173 /* SetAccessor */);
+                // We try to resolve a getter type annotation, a setter type annotation, or a getter function
+                // body return type inference, in that order.
+                var type = getter && ts.isInJSFile(getter) && getTypeForDeclarationFromJSDocComment(getter) ||
+                    getAnnotatedAccessorType(getter) ||
+                    getAnnotatedAccessorType(setter) ||
+                    getter && getter.body && getReturnTypeFromBody(getter);
+                if (!type) {
+                    if (setter && !isPrivateWithinAmbient(setter)) {
+                        errorOrSuggestion(noImplicitAny, setter, ts.Diagnostics.Property_0_implicitly_has_type_any_because_its_set_accessor_lacks_a_parameter_type_annotation, symbolToString(symbol));
+                    }
+                    else if (getter && !isPrivateWithinAmbient(getter)) {
+                        errorOrSuggestion(noImplicitAny, getter, ts.Diagnostics.Property_0_implicitly_has_type_any_because_its_get_accessor_lacks_a_return_type_annotation, symbolToString(symbol));
+                    }
+                    type = anyType;
+                }
+                if (!popTypeResolution()) {
+                    if (getAnnotatedAccessorTypeNode(getter)) {
+                        error(getter, ts.Diagnostics._0_is_referenced_directly_or_indirectly_in_its_own_type_annotation, symbolToString(symbol));
                     }
-                    else if (noImplicitAny) {
+                    else if (getAnnotatedAccessorTypeNode(setter)) {
+                        error(setter, ts.Diagnostics._0_is_referenced_directly_or_indirectly_in_its_own_type_annotation, symbolToString(symbol));
+                    }
+                    else if (getter && noImplicitAny) {
                         error(getter, ts.Diagnostics._0_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_referenced_directly_or_indirectly_in_one_of_its_return_expressions, symbolToString(symbol));
                     }
+                    type = anyType;
                 }
-                type = anyType;
+                links.type = type;
             }
-            return type;
+            return links.type;
         }
-        function resolveTypeOfAccessors(symbol, writing) {
-            if (writing === void 0) { writing = false; }
-            var getter = ts.getDeclarationOfKind(symbol, 172 /* GetAccessor */);
-            var setter = ts.getDeclarationOfKind(symbol, 173 /* SetAccessor */);
-            // For write operations, prioritize type annotations on the setter
-            if (writing) {
-                var setterType_1 = getAnnotatedAccessorType(setter);
-                if (setterType_1) {
-                    return instantiateTypeIfNeeded(setterType_1, symbol);
-                }
-            }
-            // Else defer to the getter type
-            if (getter && ts.isInJSFile(getter)) {
-                var jsDocType = getTypeForDeclarationFromJSDocComment(getter);
-                if (jsDocType) {
-                    return instantiateTypeIfNeeded(jsDocType, symbol);
-                }
-            }
-            // Try to see if the user specified a return type on the get-accessor.
-            var getterType = getAnnotatedAccessorType(getter);
-            if (getterType) {
-                return instantiateTypeIfNeeded(getterType, symbol);
-            }
-            // If the user didn't specify a return type, try to use the set-accessor's parameter type.
-            var setterType = getAnnotatedAccessorType(setter);
-            if (setterType) {
-                return setterType;
-            }
-            // If there are no specified types, try to infer it from the body of the get accessor if it exists.
-            if (getter && getter.body) {
-                var returnTypeFromBody = getReturnTypeFromBody(getter);
-                return instantiateTypeIfNeeded(returnTypeFromBody, symbol);
-            }
-            // Otherwise, fall back to 'any'.
-            if (setter) {
-                if (!isPrivateWithinAmbient(setter)) {
-                    errorOrSuggestion(noImplicitAny, setter, ts.Diagnostics.Property_0_implicitly_has_type_any_because_its_set_accessor_lacks_a_parameter_type_annotation, symbolToString(symbol));
-                }
-                return anyType;
-            }
-            else if (getter) {
-                ts.Debug.assert(!!getter, "there must exist a getter as we are current checking either setter or getter in this function");
-                if (!isPrivateWithinAmbient(getter)) {
-                    errorOrSuggestion(noImplicitAny, getter, ts.Diagnostics.Property_0_implicitly_has_type_any_because_its_get_accessor_lacks_a_return_type_annotation, symbolToString(symbol));
+        function getWriteTypeOfAccessors(symbol) {
+            var links = getSymbolLinks(symbol);
+            if (!links.writeType) {
+                if (!pushTypeResolution(symbol, 8 /* WriteType */)) {
+                    return errorType;
                 }
-                return anyType;
-            }
-            return undefined;
-            function instantiateTypeIfNeeded(type, symbol) {
-                if (ts.getCheckFlags(symbol) & 1 /* Instantiated */) {
-                    var links = getSymbolLinks(symbol);
-                    return instantiateType(type, links.mapper);
+                var setter = ts.getDeclarationOfKind(symbol, 173 /* SetAccessor */);
+                var writeType = getAnnotatedAccessorType(setter);
+                if (!popTypeResolution()) {
+                    if (getAnnotatedAccessorTypeNode(setter)) {
+                        error(setter, ts.Diagnostics._0_is_referenced_directly_or_indirectly_in_its_own_type_annotation, symbolToString(symbol));
+                    }
+                    writeType = anyType;
                 }
-                return type;
+                // Absent an explicit setter type annotation we use the read type of the accessor.
+                links.writeType = writeType || getTypeOfAccessors(symbol);
             }
+            return links.writeType;
         }
         function getBaseTypeVariableOfClass(symbol) {
             var baseConstructorType = getBaseConstructorTypeOfClass(getDeclaredTypeOfClassOrInterface(symbol));
@@ -56053,17 +56043,11 @@ var ts;
         }
         function getTypeOfInstantiatedSymbol(symbol) {
             var links = getSymbolLinks(symbol);
-            if (!links.type) {
-                if (!pushTypeResolution(symbol, 0 /* Type */)) {
-                    return links.type = errorType;
-                }
-                var type = instantiateType(getTypeOfSymbol(links.target), links.mapper);
-                if (!popTypeResolution()) {
-                    type = reportCircularityError(symbol);
-                }
-                links.type = type;
-            }
-            return links.type;
+            return links.type || (links.type = instantiateType(getTypeOfSymbol(links.target), links.mapper));
+        }
+        function getWriteTypeOfInstantiatedSymbol(symbol) {
+            var links = getSymbolLinks(symbol);
+            return links.writeType || (links.writeType = instantiateType(getWriteTypeOfSymbol(links.target), links.mapper));
         }
         function reportCircularityError(symbol) {
             var declaration = symbol.valueDeclaration;
@@ -56100,35 +56084,23 @@ var ts;
             return links.writeType;
         }
         /**
-         * Distinct write types come only from set accessors, but union and intersection
-         * properties deriving from set accessors will either pre-compute or defer the
-         * union or intersection of the writeTypes of their constituents. To account for
-         * this, we will assume that any deferred type or transient symbol may have a
-         * `writeType` (or a deferred write type ready to be computed) that should be
-         * used before looking for set accessor declarations.
+         * Distinct write types come only from set accessors, but synthetic union and intersection
+         * properties deriving from set accessors will either pre-compute or defer the union or
+         * intersection of the writeTypes of their constituents.
          */
         function getWriteTypeOfSymbol(symbol) {
             var checkFlags = ts.getCheckFlags(symbol);
-            if (checkFlags & 65536 /* DeferredType */) {
-                var writeType = getWriteTypeOfSymbolWithDeferredType(symbol);
-                if (writeType) {
-                    return writeType;
-                }
+            if (symbol.flags & 4 /* Property */) {
+                return checkFlags & 2 /* SyntheticProperty */ ?
+                    checkFlags & 65536 /* DeferredType */ ?
+                        getWriteTypeOfSymbolWithDeferredType(symbol) || getTypeOfSymbolWithDeferredType(symbol) :
+                        symbol.writeType || symbol.type :
+                    getTypeOfSymbol(symbol);
             }
-            if (symbol.flags & 33554432 /* Transient */) {
-                var writeType = symbol.writeType;
-                if (writeType) {
-                    return writeType;
-                }
-            }
-            return getSetAccessorTypeOfSymbol(symbol);
-        }
-        function getSetAccessorTypeOfSymbol(symbol) {
             if (symbol.flags & 98304 /* Accessor */) {
-                var type = getTypeOfSetAccessor(symbol);
-                if (type) {
-                    return type;
-                }
+                return checkFlags & 1 /* Instantiated */ ?
+                    getWriteTypeOfInstantiatedSymbol(symbol) :
+                    getWriteTypeOfAccessors(symbol);
             }
             return getTypeOfSymbol(symbol);
         }
@@ -70599,7 +70571,7 @@ var ts;
                 }
             }
             if (ts.isDeclarationName(location) && ts.isSetAccessor(location.parent) && getAnnotatedAccessorTypeNode(location.parent)) {
-                return resolveTypeOfAccessors(location.parent.symbol, /*writing*/ true);
+                return getWriteTypeOfAccessors(location.parent.symbol);
             }
             // The location isn't a reference to the given symbol, meaning we're being asked
             // a hypothetical question of what type the symbol would have if there was a reference
@@ -81802,6 +81774,8 @@ var ts;
                     (condExpr.operatorToken.kind === 56 /* BarBarToken */ || condExpr.operatorToken.kind === 55 /* AmpersandAmpersandToken */)
                     ? condExpr.right
                     : condExpr;
+                if (ts.isModuleExportsAccessExpression(location))
+                    return;
                 var type = checkTruthinessExpression(location);
                 var isPropertyExpressionCast = ts.isPropertyAccessExpression(location) && isTypeAssertion(location.expression);
                 if (getFalsyFlags(type) || isPropertyExpressionCast)