microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-04-17 01:49:41 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

format

Browse Source
This commit is contained in:
Gabriela Araujo Britto
2025-03-05 08:08:12 -08:00
parent d6d70a0e19
commit ab0d43c8e5
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/compiler/checker.ts
View File

@@ -45981,7 +45981,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
node.id = undefined;
forEachChildRecursively(node, resetNodeId);
}
type NarrowableReference = Identifier | ElementAccessExpression | PropertyAccessExpression;
/**
* Narrowable type parameters are type parameters that:
@@ -46047,7 +46047,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
return !!forEachChild(node, isReferenced);
}
}
// Given a type node and a type parameter `T`, this function does two things:
// (1) validates all syntactic occurrences of `T`
// (2) collects a path to a valid (i.e. narrowable) occurrence to `T`
@@ -46057,17 +46057,17 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
// an array of names that corresponds to the valid reference to `T`, if exactly one valid reference was found.
// `path` is initially is empty; it's an accumulator for the path through valid property accesses.
type Name = Identifier | StringLiteral;
type Member = PropertySignature & { name: Name };
type Member = PropertySignature & { name: Name; };
function getValidTypeParameterReference(typeNode: Node, typeParam: TypeParameter, path: Member[]): Member[] | boolean {
switch (typeNode.kind) {
case SyntaxKind.TypeReference:
const type = getTypeFromTypeReference((typeNode as TypeReferenceNode));
const type = getTypeFromTypeReference(typeNode as TypeReferenceNode);
if (type === typeParam) { // `T`
return path;
}
const typeArgs = (typeNode as TypeReferenceNode).typeArguments;
// Type arguments that reference `T`
const typeArgsReferencingT = typeArgs?.filter(node => isTypeParameterReferenced(typeParam, node))
const typeArgsReferencingT = typeArgs?.filter(node => isTypeParameterReferenced(typeParam, node));
if (!typeArgsReferencingT || typeArgsReferencingT.length == 0) return true; // Type reference unrelated to `T`
if (typeArgsReferencingT && typeArgsReferencingT.length > 1) return false; // e.g. `Foo<T, T, ...>`
const typeArg = typeArgsReferencingT[0];
@@ -46078,9 +46078,11 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
if (isTypeLiteralNode(typeDeclaration)) {
aliasDeclaration = walkUpParenthesizedTypes(typeDeclaration.parent); // `type Foo = { ... }`
if (!isTypeAliasDeclaration(aliasDeclaration)) return false;
} else if (isInterfaceDeclaration(typeDeclaration)) { // `interface Foo { ... }`
}
else if (isInterfaceDeclaration(typeDeclaration)) { // `interface Foo { ... }`
aliasDeclaration = typeDeclaration;
} else {
}
else {
return false; // Unsuported case, e.g. `class Foo<...> ...`, `type Foo<...> = { [P in Foo]: ... }`, etc.
}
const typeArgIndex = typeArgs!.findIndex(arg => arg === typeArg);
@@ -46099,7 +46101,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
if (result !== true) {
return false; // e.g. `interface Foo<T> extends Bar<T> { ... otherRef: T; ...}`
}
return getValidTypeParameterReference(relevantExtendsTypes[0], typeParam, path)
return getValidTypeParameterReference(relevantExtendsTypes[0], typeParam, path);
}
return result;
case SyntaxKind.TypeLiteral:
@@ -46137,7 +46139,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
if (!isIdentifier(member.name) && !isStringLiteral(member.name)) {
return false; // Unsupported property name, e.g. `[c]: T`
}
const result = getValidTypeParameterReference(member.type!, typeParam, [...path, member as Member])
const result = getValidTypeParameterReference(member.type!, typeParam, [...path, member as Member]);
if (!result) {
return false;
}
@@ -46163,7 +46165,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
if (paramIsOptional && path.length > 0) {
return false;
}
const isOptional = paramIsOptional || path.length > 0 && path[path.length - 1].questionToken;
// `function f<T extends boolean>(obj?: T)` is not allowed under `strictNullChecks`.
if (isOptional && strictNullChecks && !containsUndefinedType(constraint)) {
@@ -46192,7 +46194,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
else if (isObjectBindingPattern(currentName)) {
const name = path[i].name;
let nameText: __String | undefined;
if (isIdentifier(name)) nameText = name.escapedText
if (isIdentifier(name)) nameText = name.escapedText;
else {
const rawText = getLiteralPropertyNameText(name);
if (rawText) nameText = escapeLeadingUnderscores(rawText);