@zzzen/pyright-internal 1.2.0-dev.20230402 → 1.2.0-dev.20230409

package/dist/analyzer/typeUtils.d.ts

@@ -52,6 +52,16 @@ export interface InferenceContext {
     isTypeIncomplete?: boolean;
     typeVarContext?: TypeVarContext;
 }
+export interface SignatureWithCount {
+    type: FunctionType;
+    count: number;
+}
+export declare class UniqueSignatureTracker {
+    signaturesSeen: SignatureWithCount[];
+    constructor();
+    findSignature(signature: FunctionType): SignatureWithCount | undefined;
+    addSignature(signature: FunctionType): void;
+}
 export declare function isOptionalType(type: Type): boolean;
 export declare function isIncompleteUnknown(type: Type): boolean;
 export declare function isTypeVarSame(type1: TypeVarType, type2: Type): boolean;
@@ -88,6 +98,7 @@ export declare function isTupleClass(type: ClassType): boolean;
 export declare function isUnboundedTupleClass(type: ClassType): boolean | undefined;
 export declare function partiallySpecializeType(type: Type, contextClassType: ClassType, selfClass?: ClassType, typeClassType?: Type): Type;
 export declare function populateTypeVarContextForSelfType(typeVarContext: TypeVarContext, contextClassType: ClassType, selfClass: ClassType): void;
+export declare function ensureFunctionSignaturesAreUnique(type: Type, signatureTracker: UniqueSignatureTracker): Type;
 export declare function applySolvedTypeVars(type: Type, typeVarContext: TypeVarContext, options?: ApplyTypeVarOptions): Type;
 export declare function validateTypeVarDefault(typeVar: TypeVarType, liveTypeParams: TypeVarType[], invalidTypeVars: Set<string>): void;
 export declare function transformExpectedTypeForConstructor(expectedType: Type, liveTypeVarScopes: TypeVarScopeId[]): Type | undefined;

package/dist/analyzer/typeUtils.js

@@ -8,8 +8,8 @@
  * Functions that operate on Type objects.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.specializeClassType = exports.isTypeVarLimitedToCallable = exports.getTypeVarArgumentsRecursive = exports.addTypeVarsToListIfUnique = exports.getClassFieldsRecursive = exports.getClassIterator = exports.getClassMemberIterator = exports.lookUpClassMember = exports.lookUpObjectMember = exports.getContainerDepth = exports.getProtocolSymbols = exports.transformExpectedTypeForConstructor = exports.validateTypeVarDefault = exports.applySolvedTypeVars = exports.populateTypeVarContextForSelfType = exports.partiallySpecializeType = exports.isUnboundedTupleClass = exports.isTupleClass = exports.isMaybeDescriptorInstance = exports.isDescriptorInstance = exports.isProperty = exports.isEllipsisType = exports.getUnionSubtypeCount = exports.getLiteralTypeClassName = exports.containsLiteralType = exports.containsType = exports.isLiteralTypeOrUnion = exports.isLiteralType = exports.getSpecializedTupleType = exports.getTypeVarScopeId = exports.transformPossibleRecursiveTypeAlias = exports.isTypeAliasRecursive = exports.isTypeAliasPlaceholder = exports.getTypeCondition = exports.addConditionToType = exports.getFullNameOfType = exports.derivesFromAnyOrUnknown = exports.isUnionableType = exports.preserveUnknown = exports.areTypesSame = exports.doForEachSubtype = exports.sortTypes = exports.mapSubtypes = exports.makeInferenceContext = exports.isTypeVarSame = exports.isIncompleteUnknown = exports.isOptionalType = exports.AssignTypeFlags = exports.ClassIteratorFlags = exports.ClassMemberLookupFlags = void 0;
-exports.convertParamSpecValueToType = exports.convertTypeToParamSpecValue = exports.getDeclaringModulesForType = exports.computeMroLinearization = exports.isVarianceOfTypeArgumentCompatible = exports.combineVariances = exports.requiresSpecialization = exports.requiresTypeArguments = exports.getGeneratorTypeArgs = exports.removeParamSpecVariadicsFromFunction = exports.removeParamSpecVariadicsFromSignature = exports.specializeTupleClass = exports.combineSameSizedTuples = exports.explodeGenericClass = exports.isPartlyUnknown = exports.containsUnknown = exports.getMembersForModule = exports.getMembersForClass = exports.convertToInstantiable = exports.convertToInstance = exports.isEffectivelyInstantiable = exports.isMetaclassInstance = exports.getGeneratorYieldType = exports.getDeclaredGeneratorReturnType = exports.synthesizeTypeVarForSelfCls = exports.derivesFromClassRecursive = exports.specializeForBaseClass = exports.buildTypeVarContext = exports.buildTypeVarContextFromSpecializedClass = exports.setTypeArgumentsRecursive = void 0;
+exports.getTypeVarArgumentsRecursive = exports.addTypeVarsToListIfUnique = exports.getClassFieldsRecursive = exports.getClassIterator = exports.getClassMemberIterator = exports.lookUpClassMember = exports.lookUpObjectMember = exports.getContainerDepth = exports.getProtocolSymbols = exports.transformExpectedTypeForConstructor = exports.validateTypeVarDefault = exports.applySolvedTypeVars = exports.ensureFunctionSignaturesAreUnique = exports.populateTypeVarContextForSelfType = exports.partiallySpecializeType = exports.isUnboundedTupleClass = exports.isTupleClass = exports.isMaybeDescriptorInstance = exports.isDescriptorInstance = exports.isProperty = exports.isEllipsisType = exports.getUnionSubtypeCount = exports.getLiteralTypeClassName = exports.containsLiteralType = exports.containsType = exports.isLiteralTypeOrUnion = exports.isLiteralType = exports.getSpecializedTupleType = exports.getTypeVarScopeId = exports.transformPossibleRecursiveTypeAlias = exports.isTypeAliasRecursive = exports.isTypeAliasPlaceholder = exports.getTypeCondition = exports.addConditionToType = exports.getFullNameOfType = exports.derivesFromAnyOrUnknown = exports.isUnionableType = exports.preserveUnknown = exports.areTypesSame = exports.doForEachSubtype = exports.sortTypes = exports.mapSubtypes = exports.makeInferenceContext = exports.isTypeVarSame = exports.isIncompleteUnknown = exports.isOptionalType = exports.UniqueSignatureTracker = exports.AssignTypeFlags = exports.ClassIteratorFlags = exports.ClassMemberLookupFlags = void 0;
+exports.convertParamSpecValueToType = exports.convertTypeToParamSpecValue = exports.getDeclaringModulesForType = exports.computeMroLinearization = exports.isVarianceOfTypeArgumentCompatible = exports.combineVariances = exports.requiresSpecialization = exports.requiresTypeArguments = exports.getGeneratorTypeArgs = exports.removeParamSpecVariadicsFromFunction = exports.removeParamSpecVariadicsFromSignature = exports.specializeTupleClass = exports.combineSameSizedTuples = exports.explodeGenericClass = exports.isPartlyUnknown = exports.containsUnknown = exports.getMembersForModule = exports.getMembersForClass = exports.convertToInstantiable = exports.convertToInstance = exports.isEffectivelyInstantiable = exports.isMetaclassInstance = exports.getGeneratorYieldType = exports.getDeclaredGeneratorReturnType = exports.synthesizeTypeVarForSelfCls = exports.derivesFromClassRecursive = exports.specializeForBaseClass = exports.buildTypeVarContext = exports.buildTypeVarContextFromSpecializedClass = exports.setTypeArgumentsRecursive = exports.specializeClassType = exports.isTypeVarLimitedToCallable = void 0;
 const collectionUtils_1 = require("../common/collectionUtils");
 const debug_1 = require("../common/debug");
 const symbol_1 = require("./symbol");
@@ -99,6 +99,26 @@ var AssignTypeFlags;
     // employing narrowing or widening, and don't strip literals.
     AssignTypeFlags[AssignTypeFlags["PopulatingExpectedType"] = 1024] = "PopulatingExpectedType";
 })(AssignTypeFlags = exports.AssignTypeFlags || (exports.AssignTypeFlags = {}));
+class UniqueSignatureTracker {
+    constructor() {
+        this.signaturesSeen = [];
+    }
+    findSignature(signature) {
+        return this.signaturesSeen.find((s) => {
+            return (0, types_1.isTypeSame)(signature, s.type);
+        });
+    }
+    addSignature(signature) {
+        const existingSignature = this.findSignature(signature);
+        if (existingSignature) {
+            existingSignature.count++;
+        }
+        else {
+            this.signaturesSeen.push({ type: signature, count: 1 });
+        }
+    }
+}
+exports.UniqueSignatureTracker = UniqueSignatureTracker;
 function isOptionalType(type) {
     if ((0, types_1.isUnion)(type)) {
         return (0, types_1.findSubtype)(type, (subtype) => (0, types_1.isNoneInstance)(subtype)) !== undefined;
@@ -687,6 +707,13 @@ function populateTypeVarContextForSelfType(typeVarContext, contextClassType, sel
     typeVarContext.setTypeVarType(synthesizedSelfTypeVar, convertToInstance(selfClass));
 }
 exports.populateTypeVarContextForSelfType = populateTypeVarContextForSelfType;
+// Looks for duplicate function types within the type and ensures that
+// if they are generic, they have unique type variables.
+function ensureFunctionSignaturesAreUnique(type, signatureTracker) {
+    const transformer = new UniqueFunctionSignatureTransformer(signatureTracker);
+    return transformer.apply(type, 0);
+}
+exports.ensureFunctionSignaturesAreUnique = ensureFunctionSignaturesAreUnique;
 // Specializes a (potentially generic) type by substituting
 // type variables from a type var map.
 function applySolvedTypeVars(type, typeVarContext, options = {}) {
@@ -2175,7 +2202,7 @@ class TypeVarTransformer {
             return type;
         }
         recursionCount++;
-        type = this._transformGenericTypeAlias(type, recursionCount);
+        type = this.transformGenericTypeAlias(type, recursionCount);
         // Shortcut the operation if possible.
         if (!requiresSpecialization(type)) {
             return type;
@@ -2257,7 +2284,7 @@ class TypeVarTransformer {
             return !(0, types_1.isNever)(newUnionType) ? newUnionType : types_1.UnknownType.create();
         }
         if ((0, types_1.isClass)(type)) {
-            return this._transformTypeVarsInClassType(type, recursionCount);
+            return this.transformTypeVarsInClassType(type, recursionCount);
         }
         if ((0, types_1.isFunction)(type)) {
             // Prevent recursion.
@@ -2265,7 +2292,7 @@ class TypeVarTransformer {
                 return type;
             }
             this._pendingFunctionTransformations.push(type);
-            const result = this._transformTypeVarsInFunctionType(type, recursionCount);
+            const result = this.transformTypeVarsInFunctionType(type, recursionCount);
             this._pendingFunctionTransformations.pop();
             return result;
         }
@@ -2279,7 +2306,7 @@ class TypeVarTransformer {
             // Specialize each of the functions in the overload.
             const newOverloads = [];
             type.overloads.forEach((entry) => {
-                const replacementType = this._transformTypeVarsInFunctionType(entry, recursionCount);
+                const replacementType = this.transformTypeVarsInFunctionType(entry, recursionCount);
                 if ((0, types_1.isFunction)(replacementType)) {
                     newOverloads.push(replacementType);
                 }
@@ -2297,7 +2324,7 @@ class TypeVarTransformer {
         return type;
     }
     transformTypeVar(typeVar, recursionCount) {
-        return typeVar;
+        return undefined;
     }
     transformTupleTypeVar(paramSpec, recursionCount) {
         return undefined;
@@ -2313,7 +2340,7 @@ class TypeVarTransformer {
         // can override this method as they see fit.
         return callback();
     }
-    _transformGenericTypeAlias(type, recursionCount) {
+    transformGenericTypeAlias(type, recursionCount) {
         if (!type.typeAliasInfo || !type.typeAliasInfo.typeParameters || !type.typeAliasInfo.typeArguments) {
             return type;
         }
@@ -2329,12 +2356,12 @@ class TypeVarTransformer {
             ? types_1.TypeBase.cloneForTypeAlias(type, type.typeAliasInfo.name, type.typeAliasInfo.fullName, type.typeAliasInfo.typeVarScopeId, type.typeAliasInfo.typeParameters, newTypeArgs)
             : type;
     }
-    _transformTypeVarsInClassType(classType, recursionCount) {
+    transformTypeVarsInClassType(classType, recursionCount) {
         // Handle the common case where the class has no type parameters.
         if (types_1.ClassType.getTypeParameters(classType).length === 0 && !types_1.ClassType.isSpecialBuiltIn(classType)) {
             return classType;
         }
-        let newTypeArgs = [];
+        let newTypeArgs;
         let newTupleTypeArgs;
         let specializationNeeded = false;
         const typeParams = types_1.ClassType.getTypeParameters(classType);
@@ -2351,50 +2378,7 @@ class TypeVarTransformer {
         const wasTransformingTypeArg = this._isTransformingTypeArg;
         this._isTransformingTypeArg = true;
         // If type args were previously provided, specialize them.
-        if (classType.typeArguments) {
-            newTypeArgs = classType.typeArguments.map((oldTypeArgType) => {
-                if ((0, types_1.isTypeVar)(oldTypeArgType) && oldTypeArgType.details.isParamSpec) {
-                    return transformParamSpec(oldTypeArgType);
-                }
-                let newTypeArgType = this.apply(oldTypeArgType, recursionCount);
-                if (newTypeArgType !== oldTypeArgType) {
-                    specializationNeeded = true;
-                    // If this was a variadic type variable that was part of a union
-                    // (e.g. Union[Unpack[Vs]]), expand the subtypes into a union here.
-                    if ((0, types_1.isTypeVar)(oldTypeArgType) &&
-                        (0, types_1.isVariadicTypeVar)(oldTypeArgType) &&
-                        oldTypeArgType.isVariadicInUnion) {
-                        newTypeArgType = _expandVariadicUnpackedUnion(newTypeArgType);
-                    }
-                }
-                return newTypeArgType;
-            });
-        }
-        else {
-            typeParams.forEach((typeParam) => {
-                let replacementType = typeParam;
-                if (typeParam.details.isParamSpec) {
-                    replacementType = transformParamSpec(typeParam);
-                    if (replacementType !== typeParam) {
-                        specializationNeeded = true;
-                    }
-                }
-                else {
-                    const typeParamName = types_1.TypeVarType.getNameWithScope(typeParam);
-                    if (!this._pendingTypeVarTransformations.has(typeParamName)) {
-                        const transformedType = this.transformTypeVar(typeParam, recursionCount);
-                        replacementType = transformedType !== null && transformedType !== void 0 ? transformedType : typeParam;
-                        if (replacementType !== typeParam) {
-                            specializationNeeded = true;
-                        }
-                        else if (transformedType !== undefined && !classType.typeArguments) {
-                            specializationNeeded = true;
-                        }
-                    }
-                }
-                newTypeArgs.push(replacementType);
-            });
-        }
+        // Handle tuples specially.
         if (types_1.ClassType.isTupleClass(classType)) {
             if (classType.tupleTypeArguments) {
                 newTupleTypeArgs = [];
@@ -2420,6 +2404,66 @@ class TypeVarTransformer {
                     specializationNeeded = true;
                 }
             }
+            // If this is an empty tuple, don't recompute the non-tuple type argument.
+            if (newTupleTypeArgs && newTupleTypeArgs.length > 0) {
+                // Combine the tuple type args into a single non-tuple type argument.
+                newTypeArgs = [
+                    (0, types_1.combineTypes)(newTupleTypeArgs.map((t) => {
+                        if ((0, types_1.isTypeVar)(t.type) && (0, types_1.isUnpackedVariadicTypeVar)(t.type)) {
+                            // Treat the unpacked TypeVarTuple as a union.
+                            return types_1.TypeVarType.cloneForUnpacked(t.type, /* isInUnion */ true);
+                        }
+                        return t.type;
+                    })),
+                ];
+            }
+        }
+        if (!newTypeArgs) {
+            if (classType.typeArguments) {
+                newTypeArgs = classType.typeArguments.map((oldTypeArgType) => {
+                    if ((0, types_1.isTypeVar)(oldTypeArgType) && oldTypeArgType.details.isParamSpec) {
+                        return transformParamSpec(oldTypeArgType);
+                    }
+                    let newTypeArgType = this.apply(oldTypeArgType, recursionCount);
+                    if (newTypeArgType !== oldTypeArgType) {
+                        specializationNeeded = true;
+                        // If this was a variadic type variable that was part of a union
+                        // (e.g. Union[Unpack[Vs]]), expand the subtypes into a union here.
+                        if ((0, types_1.isTypeVar)(oldTypeArgType) &&
+                            (0, types_1.isVariadicTypeVar)(oldTypeArgType) &&
+                            oldTypeArgType.isVariadicInUnion) {
+                            newTypeArgType = _expandVariadicUnpackedUnion(newTypeArgType);
+                        }
+                    }
+                    return newTypeArgType;
+                });
+            }
+            else {
+                newTypeArgs = [];
+                typeParams.forEach((typeParam) => {
+                    let replacementType = typeParam;
+                    if (typeParam.details.isParamSpec) {
+                        replacementType = transformParamSpec(typeParam);
+                        if (replacementType !== typeParam) {
+                            specializationNeeded = true;
+                        }
+                    }
+                    else {
+                        const typeParamName = types_1.TypeVarType.getNameWithScope(typeParam);
+                        if (!this._pendingTypeVarTransformations.has(typeParamName)) {
+                            const transformedType = this.transformTypeVar(typeParam, recursionCount);
+                            replacementType = transformedType !== null && transformedType !== void 0 ? transformedType : typeParam;
+                            if (replacementType !== typeParam) {
+                                specializationNeeded = true;
+                            }
+                            else if (transformedType !== undefined && !classType.typeArguments) {
+                                specializationNeeded = true;
+                            }
+                        }
+                    }
+                    newTypeArgs.push(replacementType);
+                });
+            }
         }
         this._isTransformingTypeArg = wasTransformingTypeArg;
         // If specialization wasn't needed, don't allocate a new class.
@@ -2430,7 +2474,7 @@ class TypeVarTransformer {
         /* isTypeArgumentExplicit */ true, 
         /* includeSubclasses */ undefined, newTupleTypeArgs);
     }
-    _transformTypeVarsInFunctionType(sourceType, recursionCount) {
+    transformTypeVarsInFunctionType(sourceType, recursionCount) {
         return this.doForEachSignatureContext(() => {
             let functionType = sourceType;
             // Handle functions with a parameter specification in a special manner.
@@ -2606,6 +2650,32 @@ class TypeVarDefaultValidator extends TypeVarTransformer {
         return undefined;
     }
 }
+class UniqueFunctionSignatureTransformer extends TypeVarTransformer {
+    constructor(_signatureTracker) {
+        super();
+        this._signatureTracker = _signatureTracker;
+    }
+    transformTypeVarsInFunctionType(sourceType, recursionCount) {
+        // If this function is not generic, there's no need to check for uniqueness.
+        if (sourceType.details.typeParameters.length === 0) {
+            return super.transformTypeVarsInFunctionType(sourceType, recursionCount);
+        }
+        let updatedSourceType = sourceType;
+        const existingSignature = this._signatureTracker.findSignature(sourceType);
+        if (existingSignature) {
+            const typeVarContext = new typeVarContext_1.TypeVarContext(getTypeVarScopeId(sourceType));
+            // Create new type variables with the same scope but with
+            // different (unique) names.
+            sourceType.details.typeParameters.forEach((typeParam) => {
+                const replacement = types_1.TypeVarType.cloneForNewName(typeParam, `${typeParam.details.name}(${existingSignature.count})`);
+                typeVarContext.setTypeVarType(typeParam, replacement);
+                updatedSourceType = applySolvedTypeVars(sourceType, typeVarContext);
+            });
+        }
+        this._signatureTracker.addSignature(sourceType);
+        return updatedSourceType;
+    }
+}
 // Specializes a (potentially generic) type by substituting
 // type variables from a type var map.
 class ApplySolvedTypeVarsTransformer extends TypeVarTransformer {