Skip to content

Only use resolutionStart when pushing resolution stack #58824

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

Only use resolutionStart when pushing resolution stack #58824

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
40200fc
Only use resolutionStart when pushing resolution stack
jakebailey Jun 10, 2024
3087697
Refactor into func for clarity
jakebailey Jun 10, 2024
c16d449
Merge branch 'main' into fix-58805
jakebailey Jun 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions src/compiler/checker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10948,7 +10948,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
* @param propertyName The property name that should be used to query the target for its type
*/
function pushTypeResolution(target: TypeSystemEntity, propertyName: TypeSystemPropertyName): boolean {
const resolutionCycleStartIndex = findResolutionCycleStartIndex(target, propertyName);
const resolutionCycleStartIndex = findResolutionCycleStartIndex(target, propertyName, resolutionStart);
if (resolutionCycleStartIndex >= 0) {
// A cycle was found
const { length } = resolutionTargets;
Expand All @@ -10963,8 +10963,12 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
return true;
}

function findResolutionCycleStartIndex(target: TypeSystemEntity, propertyName: TypeSystemPropertyName): number {
for (let i = resolutionTargets.length - 1; i >= resolutionStart; i--) {
function isInResolutionStack(target: TypeSystemEntity, propertyName: TypeSystemPropertyName): boolean {
return findResolutionCycleStartIndex(target, propertyName, 0) >= 0;
}

function findResolutionCycleStartIndex(target: TypeSystemEntity, propertyName: TypeSystemPropertyName, start: number): number {
for (let i = resolutionTargets.length - 1; i >= start; i--) {
if (resolutionTargetHasProperty(resolutionTargets[i], resolutionPropertyNames[i])) {
return -1;
}
Expand Down Expand Up @@ -15922,7 +15926,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {

function isResolvingReturnTypeOfSignature(signature: Signature): boolean {
return signature.compositeSignatures && some(signature.compositeSignatures, isResolvingReturnTypeOfSignature) ||
!signature.resolvedReturnType && findResolutionCycleStartIndex(signature, TypeSystemPropertyName.ResolvedReturnType) >= 0;
!signature.resolvedReturnType && isInResolutionStack(signature, TypeSystemPropertyName.ResolvedReturnType);
}

function getRestTypeOfSignature(signature: Signature): Type {
Expand Down Expand Up @@ -20199,7 +20203,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
if (!type.declaration.nameType) {
let constraint;
if (
isArrayType(t) || t.flags & TypeFlags.Any && findResolutionCycleStartIndex(typeVariable!, TypeSystemPropertyName.ImmediateBaseConstraint) < 0 &&
isArrayType(t) || t.flags & TypeFlags.Any && !isInResolutionStack(typeVariable!, TypeSystemPropertyName.ImmediateBaseConstraint) &&
(constraint = getConstraintOfTypeParameter(typeVariable!)) && everyType(constraint, isArrayOrTupleType)
) {
return instantiateMappedArrayType(t, type, prependTypeMapping(typeVariable!, t, mapper));
Expand Down Expand Up @@ -31497,7 +31501,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
}

function isCircularMappedProperty(symbol: Symbol) {
return !!(getCheckFlags(symbol) & CheckFlags.Mapped && !(symbol as MappedSymbol).links.type && findResolutionCycleStartIndex(symbol, TypeSystemPropertyName.Type) >= 0);
return !!(getCheckFlags(symbol) & CheckFlags.Mapped && !(symbol as MappedSymbol).links.type && isInResolutionStack(symbol, TypeSystemPropertyName.Type));
}

function getTypeOfPropertyOfContextualType(type: Type, name: __String, nameType?: Type) {
Expand Down