@zzzen/pyright-internal 1.2.0-dev.20240714 → 1.2.0-dev.20240721

package/dist/analyzer/typeUtils.js

@@ -9,8 +9,8 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isTupleGradualForm = exports.isMaybeDescriptorInstance = exports.isDescriptorInstance = exports.isCallableType = exports.isProperty = exports.isEllipsisType = exports.getUnionSubtypeCount = exports.getLiteralTypeClassName = exports.containsLiteralType = exports.isLiteralTypeOrUnion = exports.isLiteralType = exports.getSpecializedTupleType = exports.selfSpecializeClass = exports.getUnknownTypeForCallable = exports.getUnknownTypeForVariadicTypeVar = exports.getUnknownTypeForParamSpec = exports.getUnknownTypeForTypeVar = exports.specializeWithUnknownTypeArgs = exports.specializeWithDefaultTypeArgs = exports.getTypeVarScopeIds = exports.getTypeVarScopeId = exports.transformPossibleRecursiveTypeAlias = exports.isTypeAliasRecursive = exports.isTypeAliasPlaceholder = exports.getTypeCondition = exports.addConditionToType = exports.getFullNameOfType = exports.derivesFromAnyOrUnknown = exports.isUnionableType = exports.preserveUnknown = exports.areTypesSame = exports.doForEachSignature = exports.allSubtypes = exports.someSubtypes = exports.doForEachSubtype = exports.sortTypes = exports.cleanIncompleteUnknown = exports.mapSignatures = exports.mapSubtypes = exports.makeInferenceContext = exports.isTypeVarSame = exports.isIncompleteUnknown = exports.removeNoneFromUnion = exports.isNoneTypeClass = exports.isNoneInstance = exports.isOptionalType = exports.UniqueSignatureTracker = exports.AssignTypeFlags = exports.ClassIteratorFlags = exports.MemberAccessFlags = void 0;
-exports.combineVariances = exports.requiresSpecialization = exports.requiresTypeArguments = exports.getGeneratorTypeArgs = exports.specializeTupleClass = exports.combineSameSizedTuples = exports.explodeGenericClass = exports.isPartlyUnknown = exports.containsAnyOrUnknown = exports.containsAnyRecursive = exports.getMembersForModule = exports.getMembersForClass = exports.convertToInstantiable = exports.convertToInstance = exports.isEffectivelyInstantiable = exports.isMetaclassInstance = exports.isInstantiableMetaclass = exports.getGeneratorYieldType = exports.getDeclaredGeneratorReturnType = exports.synthesizeTypeVarForSelfCls = exports.derivesFromClassRecursive = exports.derivesFromStdlibClass = exports.specializeForBaseClass = exports.buildTypeVarContext = exports.buildTypeVarContextFromSpecializedClass = exports.setTypeArgumentsRecursive = exports.specializeClassType = exports.getTypeVarArgumentsRecursive = exports.addTypeVarsToListIfUnique = exports.getClassFieldsRecursive = exports.getClassIterator = exports.getClassMemberIterator = exports.lookUpClassMember = exports.lookUpObjectMember = exports.getContainerDepth = exports.getProtocolSymbolsRecursive = exports.getProtocolSymbols = exports.transformExpectedType = exports.replaceTypeVarsWithAny = exports.validateTypeVarDefault = exports.applyInScopePlaceholders = exports.applySourceContextTypeVarsToSignature = exports.applySourceContextTypeVars = exports.applySolvedTypeVars = exports.ensureFunctionSignaturesAreUnique = exports.populateTypeVarContextForSelfType = exports.partiallySpecializeType = exports.isTupleIndexUnambiguous = exports.isUnboundedTupleClass = exports.isTupleClass = void 0;
-exports.convertParamSpecValueToType = exports.convertTypeToParamSpecValue = exports.convertArgumentNodeToFunctionArgument = exports.getDeclaringModulesForType = exports.computeMroLinearization = exports.isVarianceOfTypeArgumentCompatible = void 0;
+exports.requiresTypeArguments = exports.getGeneratorTypeArgs = exports.specializeTupleClass = exports.combineSameSizedTuples = exports.explodeGenericClass = exports.isPartlyUnknown = exports.containsAnyOrUnknown = exports.containsAnyRecursive = exports.getMembersForModule = exports.getMembersForClass = exports.convertToInstantiable = exports.convertToInstance = exports.isEffectivelyInstantiable = exports.isMetaclassInstance = exports.isInstantiableMetaclass = exports.getGeneratorYieldType = exports.getDeclaredGeneratorReturnType = exports.synthesizeTypeVarForSelfCls = exports.derivesFromClassRecursive = exports.derivesFromStdlibClass = exports.specializeForBaseClass = exports.buildTypeVarContext = exports.buildTypeVarContextFromSpecializedClass = exports.setTypeArgumentsRecursive = exports.specializeClassType = exports.getTypeVarArgumentsRecursive = exports.addTypeVarsToListIfUnique = exports.getClassFieldsRecursive = exports.getClassIterator = exports.getClassMemberIterator = exports.lookUpClassMember = exports.lookUpObjectMember = exports.getContainerDepth = exports.getProtocolSymbolsRecursive = exports.getProtocolSymbols = exports.transformExpectedType = exports.replaceTypeVarsWithAny = exports.validateTypeVarDefault = exports.applyInScopePlaceholders = exports.applySourceContextTypeVarsToSignature = exports.applySourceContextTypeVars = exports.applySolvedTypeVars = exports.updateTypeWithExternalTypeVars = exports.updateTypeWithInternalTypeVars = exports.ensureFunctionSignaturesAreUnique = exports.populateTypeVarContextForSelfType = exports.partiallySpecializeType = exports.isTupleIndexUnambiguous = exports.isUnboundedTupleClass = exports.isTupleClass = void 0;
+exports.convertParamSpecValueToType = exports.convertTypeToParamSpecValue = exports.convertArgumentNodeToFunctionArgument = exports.getDeclaringModulesForType = exports.computeMroLinearization = exports.isVarianceOfTypeArgumentCompatible = exports.combineVariances = exports.requiresSpecialization = void 0;
 const collectionUtils_1 = require("../common/collectionUtils");
 const debug_1 = require("../common/debug");
 const symbol_1 = require("./symbol");
@@ -96,13 +96,13 @@ var AssignTypeFlags;
     // as incompatible. Also, treat all source TypeVars as their
     // concrete counterparts. This option is used for validating
     // whether overload signatures overlap.
-    AssignTypeFlags[AssignTypeFlags["OverloadOverlapCheck"] = 16] = "OverloadOverlapCheck";
+    AssignTypeFlags[AssignTypeFlags["OverloadOverlap"] = 16] = "OverloadOverlap";
     // When used in conjunction with OverloadOverlapCheck, look
     // for partial overlaps. For example, `int | list` overlaps
     // partially with `int | str`.
-    AssignTypeFlags[AssignTypeFlags["PartialOverloadOverlapCheck"] = 32] = "PartialOverloadOverlapCheck";
+    AssignTypeFlags[AssignTypeFlags["PartialOverloadOverlap"] = 32] = "PartialOverloadOverlap";
     // For function types, skip the return type check.
-    AssignTypeFlags[AssignTypeFlags["SkipFunctionReturnTypeCheck"] = 64] = "SkipFunctionReturnTypeCheck";
+    AssignTypeFlags[AssignTypeFlags["SkipReturnTypeCheck"] = 64] = "SkipReturnTypeCheck";
     // Allow bool values to be assigned to TypeGuard[x] types.
     AssignTypeFlags[AssignTypeFlags["AllowBoolTypeGuard"] = 128] = "AllowBoolTypeGuard";
     // In most cases, literals are stripped when assigning to a
@@ -129,17 +129,13 @@ var AssignTypeFlags;
     // default type arguments (typically "Unknown"). This flag skips
     // this step.
     AssignTypeFlags[AssignTypeFlags["AllowUnspecifiedTypeArguments"] = 8192] = "AllowUnspecifiedTypeArguments";
-    // PEP 544 says that if the dest type is a type[Proto] class,
-    // the source must be a "concrete" (non-protocol) class. This
-    // flag skips this check.
-    AssignTypeFlags[AssignTypeFlags["IgnoreProtocolAssignmentCheck"] = 16384] = "IgnoreProtocolAssignmentCheck";
     // Normally all special form classes are incompatible with type[T],
     // but a few of them are allowed in the context of an isinstance
     // or issubclass call.
-    AssignTypeFlags[AssignTypeFlags["AllowIsinstanceSpecialForms"] = 32768] = "AllowIsinstanceSpecialForms";
+    AssignTypeFlags[AssignTypeFlags["AllowIsinstanceSpecialForms"] = 16384] = "AllowIsinstanceSpecialForms";
     // When comparing two methods, skip the type check for the "self" or "cls"
     // parameters. This is used for variance inference and validation.
-    AssignTypeFlags[AssignTypeFlags["IgnoreSelfClsParamCompatibility"] = 65536] = "IgnoreSelfClsParamCompatibility";
+    AssignTypeFlags[AssignTypeFlags["SkipSelfClsParamCheck"] = 32768] = "SkipSelfClsParamCheck";
 })(AssignTypeFlags || (exports.AssignTypeFlags = AssignTypeFlags = {}));
 // Tracks whether a function signature has been seen before within
 // an expression. For example, in the expression "foo(foo, foo)", the
@@ -243,17 +239,18 @@ function isTypeVarSame(type1, type2) {
     return isCompatible;
 }
 exports.isTypeVarSame = isTypeVarSame;
-function makeInferenceContext(expectedType, isTypeIncomplete) {
+function makeInferenceContext(expectedType, isTypeIncomplete, returnTypeOverride) {
     if (!expectedType) {
         return undefined;
     }
-    return { expectedType, isTypeIncomplete };
+    return { expectedType, isTypeIncomplete, returnTypeOverride };
 }
 exports.makeInferenceContext = makeInferenceContext;
 // Calls a callback for each subtype and combines the results
 // into a final type. It performs no memory allocations if the
 // transformed type is the same as the original.
 function mapSubtypes(type, callback, options) {
+    var _a;
     if ((0, types_1.isUnion)(type)) {
         const subtypes = (options === null || options === void 0 ? void 0 : options.sortSubtypes) ? sortTypes(type.priv.subtypes) : type.priv.subtypes;
         for (let i = 0; i < subtypes.length; i++) {
@@ -275,9 +272,16 @@ function mapSubtypes(type, callback, options) {
                 const newType = (0, types_1.combineTypes)(typesToCombine, {
                     skipElideRedundantLiterals: options === null || options === void 0 ? void 0 : options.skipElideRedundantLiterals,
                 });
-                // Do our best to retain type aliases.
-                if (newType.category === 8 /* TypeCategory.Union */) {
-                    types_1.UnionType.addTypeAliasSource(newType, type);
+                if (options === null || options === void 0 ? void 0 : options.retainTypeAlias) {
+                    if ((_a = type.props) === null || _a === void 0 ? void 0 : _a.typeAliasInfo) {
+                        types_1.TypeBase.setTypeAliasInfo(newType, type.props.typeAliasInfo);
+                    }
+                }
+                else {
+                    // Do our best to retain type aliases.
+                    if (newType.category === 8 /* TypeCategory.Union */) {
+                        types_1.UnionType.addTypeAliasSource(newType, type);
+                    }
                 }
                 return newType;
             }
@@ -860,7 +864,9 @@ function selfSpecializeClass(type, options) {
     if (type.priv.typeArguments && !(options === null || options === void 0 ? void 0 : options.overrideTypeArgs)) {
         return type;
     }
-    const typeParams = type.shared.typeParameters;
+    const typeParams = type.shared.typeParameters.map((typeParam) => {
+        return (options === null || options === void 0 ? void 0 : options.useInternalTypeVars) ? types_1.TypeVarType.cloneWithInternalScopeId(typeParam) : typeParam;
+    });
     return types_1.ClassType.cloneForSpecialization(type, typeParams, /* isTypeArgumentExplicit */ true);
 }
 exports.selfSpecializeClass = selfSpecializeClass;
@@ -1052,22 +1058,20 @@ function isTupleIndexUnambiguous(type, index) {
     if (!type.priv.tupleTypeArguments) {
         return false;
     }
+    const unboundedIndex = type.priv.tupleTypeArguments.findIndex((t) => t.isUnbounded || (0, types_1.isUnpackedVariadicTypeVar)(t.type));
     if (index < 0) {
-        if (isUnboundedTupleClass(type) || type.priv.tupleTypeArguments.length + index < 0) {
-            return false;
-        }
-    }
-    let unambiguousIndexLimit = type.priv.tupleTypeArguments.findIndex((t) => t.isUnbounded || (0, types_1.isUnpackedVariadicTypeVar)(t.type));
-    if (unambiguousIndexLimit < 0) {
-        unambiguousIndexLimit = type.priv.tupleTypeArguments.length;
+        const lowerIndexLimit = unboundedIndex < 0 ? 0 : unboundedIndex;
+        index += type.priv.tupleTypeArguments.length;
+        return index >= lowerIndexLimit;
     }
-    return index < unambiguousIndexLimit;
+    const upperIndexLimit = unboundedIndex < 0 ? type.priv.tupleTypeArguments.length : unboundedIndex;
+    return index < upperIndexLimit;
 }
 exports.isTupleIndexUnambiguous = isTupleIndexUnambiguous;
 // Partially specializes a type within the context of a specified
 // (presumably specialized) class. Optionally specializes the `Self`
 // type variables, replacing them with selfClass.
-function partiallySpecializeType(type, contextClassType, selfClass, typeClassType) {
+function partiallySpecializeType(type, contextClassType, typeClassType, selfClass) {
     // If the context class is not specialized (or doesn't need specialization),
     // then there's no need to do any more work.
     if (types_1.ClassType.isUnspecialized(contextClassType) && !selfClass) {
@@ -1088,7 +1092,7 @@ function partiallySpecializeType(type, contextClassType, selfClass, typeClassTyp
                     return undefined;
                 }
                 return {
-                    methodType: partiallySpecializeType(methodInfo.methodType, contextClassType, selfClass, typeClassType),
+                    methodType: partiallySpecializeType(methodInfo.methodType, contextClassType, typeClassType, selfClass),
                     classType: methodInfo.classType,
                 };
             }
@@ -1126,6 +1130,16 @@ function ensureFunctionSignaturesAreUnique(type, signatureTracker, expressionOff
     return transformer.apply(type, 0);
 }
 exports.ensureFunctionSignaturesAreUnique = ensureFunctionSignaturesAreUnique;
+function updateTypeWithInternalTypeVars(type, scopeIds) {
+    const transformer = new InternalScopeUpdateTransform(scopeIds);
+    return transformer.apply(type, 0);
+}
+exports.updateTypeWithInternalTypeVars = updateTypeWithInternalTypeVars;
+function updateTypeWithExternalTypeVars(type, scopeIds) {
+    const transformer = new ExternalScopeUpdateTransform(scopeIds);
+    return transformer.apply(type, 0);
+}
+exports.updateTypeWithExternalTypeVars = updateTypeWithExternalTypeVars;
 // Specializes a (potentially generic) type by substituting
 // type variables from a type var map.
 function applySolvedTypeVars(type, typeVarContext, options = {}) {
@@ -1487,7 +1501,7 @@ function* getClassIterator(classType, flags = 0 /* ClassIteratorFlags.Default */
             }
             // If mroClass is an ancestor of classType, partially specialize
             // it in the context of classType.
-            const specializedMroClass = partiallySpecializeType(mroClass, classType);
+            const specializedMroClass = partiallySpecializeType(mroClass, classType, /* typeClassType */ undefined);
             // Should we ignore members on the 'object' base class?
             if (flags & 2 /* ClassIteratorFlags.SkipObjectBaseClass */) {
                 if ((0, types_1.isInstantiableClass)(specializedMroClass)) {
@@ -1517,7 +1531,7 @@ function getClassFieldsRecursive(classType) {
     const memberMap = new Map();
     // Evaluate the types of members from the end of the MRO to the beginning.
     types_1.ClassType.getReverseMro(classType).forEach((mroClass) => {
-        const specializedMroClass = partiallySpecializeType(mroClass, classType);
+        const specializedMroClass = partiallySpecializeType(mroClass, classType, /* typeClassType */ undefined);
         if ((0, types_1.isClass)(specializedMroClass)) {
             types_1.ClassType.getSymbolTable(specializedMroClass).forEach((symbol, name) => {
                 if (!symbol.isIgnoredForProtocolMatch() && symbol.hasTypedDeclarations()) {
@@ -1785,7 +1799,8 @@ function synthesizeTypeVarForSelfCls(classType, isClsParam) {
     selfType.shared.isSynthesizedSelf = true;
     selfType.priv.nameWithScope = types_1.TypeVarType.makeNameWithScope(selfType.shared.name, scopeId);
     selfType.priv.scopeId = scopeId;
-    const boundType = types_1.ClassType.cloneForSpecialization(classType, types_1.ClassType.getTypeParameters(classType), 
+    const boundType = types_1.ClassType.cloneForSpecialization(classType, 
+    /* typeArguments */ undefined, 
     /* isTypeArgumentExplicit */ false, 
     /* includeSubclasses */ !!classType.priv.includeSubclasses);
     selfType.shared.boundType = types_1.ClassType.cloneAsInstance(boundType);
@@ -2821,7 +2836,7 @@ class TypeVarTransformer {
                     return this.transformUnionSubtype(subtype, transformedType, recursionCount);
                 }
                 return transformedType;
-            });
+            }, { retainTypeAlias: true });
             return !(0, types_1.isNever)(newUnionType) ? newUnionType : types_1.UnknownType.create();
         }
         if ((0, types_1.isClass)(type)) {
@@ -3236,9 +3251,6 @@ class UniqueFunctionSignatureTransformer extends TypeVarTransformer {
         return classType;
     }
     transformTypeVarsInFunctionType(sourceType, recursionCount) {
-        if (sourceType.priv.trackedSignatures) {
-            this._signatureTracker.addTrackedSignatures(sourceType.priv.trackedSignatures);
-        }
         // If this function is not generic, there's no need to check for uniqueness.
         if (sourceType.shared.typeParameters.length === 0) {
             return super.transformTypeVarsInFunctionType(sourceType, recursionCount);
@@ -3271,6 +3283,58 @@ class UniqueFunctionSignatureTransformer extends TypeVarTransformer {
         return updatedSourceType;
     }
 }
+// Replaces the TypeVars within a type with their corresponding "internal"
+// types if they are in one of the specified scopes.
+class InternalScopeUpdateTransform extends TypeVarTransformer {
+    constructor(_scopeIds) {
+        super();
+        this._scopeIds = _scopeIds;
+    }
+    transformTypeVar(typeVar) {
+        if (this._isTypeVarInScope(typeVar)) {
+            return this._replaceTypeVar(typeVar);
+        }
+        return undefined;
+    }
+    transformParamSpec(paramSpec) {
+        if (this._isTypeVarInScope(paramSpec)) {
+            return convertTypeToParamSpecValue(this._replaceTypeVar(paramSpec));
+        }
+        return undefined;
+    }
+    _isTypeVarInScope(typeVar) {
+        return typeVar.priv.scopeId !== undefined && this._scopeIds.includes(typeVar.priv.scopeId);
+    }
+    _replaceTypeVar(typeVar) {
+        return types_1.TypeVarType.cloneWithInternalScopeId(typeVar);
+    }
+}
+// Replaces the internal TypeVars within a type with their corresponding
+// "external" types.
+class ExternalScopeUpdateTransform extends TypeVarTransformer {
+    constructor(_scopeIds) {
+        super();
+        this._scopeIds = _scopeIds;
+    }
+    transformTypeVar(typeVar) {
+        if (typeVar.priv.externalTypeVar && this._isTypeVarInScope(typeVar.priv.externalTypeVar)) {
+            return typeVar.priv.externalTypeVar;
+        }
+        return undefined;
+    }
+    transformParamSpec(paramSpec) {
+        if (paramSpec.priv.externalTypeVar && this._isTypeVarInScope(paramSpec.priv.externalTypeVar)) {
+            return convertTypeToParamSpecValue(paramSpec.priv.externalTypeVar);
+        }
+        return undefined;
+    }
+    _isTypeVarInScope(typeVar) {
+        if (!typeVar.priv.scopeId) {
+            return false;
+        }
+        return this._scopeIds.includes(typeVar.priv.scopeId);
+    }
+}
 // Specializes a (potentially generic) type by substituting
 // type variables from a type var map.
 class ApplySolvedTypeVarsTransformer extends TypeVarTransformer {
@@ -3322,10 +3386,12 @@ class ApplySolvedTypeVarsTransformer extends TypeVarTransformer {
                             if (!subtype.priv.includeSubclasses) {
                                 subtype = types_1.ClassType.cloneAsInstance(types_1.ClassType.cloneAsInstantiable(subtype));
                             }
-                            if (this._options.unknownIfNotFound) {
-                                return this._options.useUnknownOverDefault
-                                    ? specializeWithUnknownTypeArgs(subtype, this._options.tupleClassType)
-                                    : specializeWithDefaultTypeArgs(subtype);
+                            if (subtype.shared.typeParameters && !subtype.priv.typeArguments) {
+                                if (this._options.unknownIfNotFound) {
+                                    return this._options.useUnknownOverDefault
+                                        ? specializeWithUnknownTypeArgs(subtype, this._options.tupleClassType)
+                                        : specializeWithDefaultTypeArgs(subtype);
+                                }
                             }
                         }
                         return subtype;
@@ -3357,7 +3423,7 @@ class ApplySolvedTypeVarsTransformer extends TypeVarTransformer {
             if (useDefaultOrUnknown) {
                 // Use the default value if there is one.
                 if (typeVar.shared.isDefaultExplicit && !this._options.useUnknownOverDefault) {
-                    return this._solveDefaultType(typeVar.shared.defaultType, recursionCount);
+                    return this._solveDefaultType(typeVar, recursionCount);
                 }
                 return getUnknownTypeForTypeVar(typeVar, this._options.tupleClassType);
             }
@@ -3457,7 +3523,7 @@ class ApplySolvedTypeVarsTransformer extends TypeVarTransformer {
         if (useDefaultOrUnknown) {
             // Use the default value if there is one.
             if (paramSpec.shared.isDefaultExplicit && !this._options.useUnknownOverDefault) {
-                return convertTypeToParamSpecValue(this._solveDefaultType(paramSpec.shared.defaultType, recursionCount));
+                return convertTypeToParamSpecValue(this._solveDefaultType(paramSpec, recursionCount));
             }
             // Convert to the ParamSpec equivalent of "Unknown".
             return getUnknownTypeForParamSpec();
@@ -3465,7 +3531,7 @@ class ApplySolvedTypeVarsTransformer extends TypeVarTransformer {
         return undefined;
     }
     transformConditionalType(type, recursionCount) {
-        var _a, _b;
+        var _a, _b, _c, _d;
         if (!((_a = type.props) === null || _a === void 0 ? void 0 : _a.condition)) {
             return type;
         }
@@ -3475,7 +3541,8 @@ class ApplySolvedTypeVarsTransformer extends TypeVarTransformer {
             if (condition.typeVar.shared.constraints.length === 0) {
                 continue;
             }
-            const typeVarEntry = signatureContext.getTypeVar(condition.typeVar);
+            const conditionTypeVar = (_d = (_c = condition.typeVar.priv) === null || _c === void 0 ? void 0 : _c.externalTypeVar) !== null && _d !== void 0 ? _d : condition.typeVar;
+            const typeVarEntry = signatureContext.getTypeVar(conditionTypeVar);
             if (!typeVarEntry || condition.constraintIndex >= typeVarEntry.typeVar.shared.constraints.length) {
                 continue;
             }
@@ -3515,7 +3582,8 @@ class ApplySolvedTypeVarsTransformer extends TypeVarTransformer {
         }
         return types_1.OverloadedFunctionType.create(filteredOverloads);
     }
-    _solveDefaultType(defaultType, recursionCount) {
+    _solveDefaultType(typeVar, recursionCount) {
+        const defaultType = typeVar.shared.defaultType;
         const wasSolvingDefaultType = this._isSolvingDefaultType;
         this._isSolvingDefaultType = true;
         const result = this.apply(defaultType, recursionCount);
@@ -3533,7 +3601,7 @@ class ExpectedTypeTransformer extends TypeVarTransformer {
         if (!this._isTypeVarLive(typeVar)) {
             return types_1.TypeVarType.cloneAsInScopePlaceholder(typeVar, this._usageOffset);
         }
-        return typeVar;
+        return undefined;
     }
     transformParamSpec(paramSpec) {
         if (!this._isTypeVarLive(paramSpec)) {
@@ -3542,7 +3610,7 @@ class ExpectedTypeTransformer extends TypeVarTransformer {
         return undefined;
     }
     _isTypeVarLive(typeVar) {
-        return this._liveTypeVarScopes.some((scopeId) => typeVar.priv.scopeId === scopeId);
+        return this._liveTypeVarScopes.some((scopeId) => { var _a; return typeVar.priv.scopeId === scopeId || ((_a = typeVar.priv.externalTypeVar) === null || _a === void 0 ? void 0 : _a.priv.scopeId) === scopeId; });
     }
 }
 class InScopePlaceholderTransformer extends TypeVarTransformer {
@@ -3555,7 +3623,7 @@ class InScopePlaceholderTransformer extends TypeVarTransformer {
         if (typeVar.priv.isInScopePlaceholder) {
             return (_a = this._signatureContext.getTypeVarType(typeVar)) !== null && _a !== void 0 ? _a : typeVar;
         }
-        return typeVar;
+        return undefined;
     }
     transformParamSpec(paramSpec) {
         if (paramSpec.priv.isInScopePlaceholder) {