@zzzen/pyright-internal 1.2.0-dev.20240922 → 1.2.0-dev.20240929

package/dist/analyzer/typeEvaluator.js

@@ -391,7 +391,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
     // context, logging any errors in the process. This may require the
     // type of surrounding statements to be evaluated.
     function getType(node) {
-        var _a, _b;
+        var _a, _b, _c, _d;
         initializePrefetchedTypes(node);
         let type = (_a = evaluateTypeForSubnode(node, () => {
             evaluateTypesForExpressionInContext(node);
@@ -406,8 +406,20 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 if (classTypeResult) {
                     inferVarianceForClass(classTypeResult.classType);
                     const typeParam = classTypeResult.classType.shared.typeParams.find((param) => (0, types_1.isTypeSame)(param, typeVarType, { ignoreTypeFlags: true }));
-                    if (typeParam) {
-                        type = types_1.TypeBase.isInstance(type) ? types_1.TypeVarType.cloneAsInstance(typeParam) : typeParam;
+                    if ((typeParam === null || typeParam === void 0 ? void 0 : typeParam.priv.computedVariance) !== undefined) {
+                        type = types_1.TypeVarType.cloneWithComputedVariance(type, typeParam.priv.computedVariance);
+                    }
+                }
+            }
+            else if (((_c = typeParamListNode === null || typeParamListNode === void 0 ? void 0 : typeParamListNode.parent) === null || _c === void 0 ? void 0 : _c.nodeType) === 77 /* ParseNodeType.TypeAlias */) {
+                const typeAliasType = getTypeOfTypeAlias(typeParamListNode.parent);
+                const typeParamIndex = typeParamListNode.d.params.findIndex((param) => param.d.name === node);
+                if (typeParamIndex >= 0) {
+                    inferVarianceForTypeAlias(typeAliasType);
+                    const typeAliasInfo = (_d = typeAliasType.props) === null || _d === void 0 ? void 0 : _d.typeAliasInfo;
+                    if (typeAliasInfo === null || typeAliasInfo === void 0 ? void 0 : typeAliasInfo.shared.computedVariance) {
+                        const computedVariance = typeAliasInfo.shared.computedVariance[typeParamIndex];
+                        type = types_1.TypeVarType.cloneWithComputedVariance(type, computedVariance);
                     }
                 }
             }
@@ -994,7 +1006,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             updatedFlags |= 524288 /* EvalFlags.NotParsed */;
         }
         updatedFlags &= ~1073741824 /* EvalFlags.TypeFormArg */;
-        if (node.d.annotation) {
+        if (node.d.annotation && (flags & 256 /* EvalFlags.TypeExpression */) !== 0) {
             return getTypeOfExpression(node.d.annotation, updatedFlags);
         }
         if (node.d.strings.length === 1) {
@@ -3259,7 +3271,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         // Isinstance treats traditional (non-PEP 695) type aliases that are unions
         // as tuples of classes rather than unions.
         if ((flags & 536870912 /* EvalFlags.IsinstanceArg */) !== 0) {
-            if ((0, types_1.isUnion)(type) && ((_a = type.props) === null || _a === void 0 ? void 0 : _a.typeAliasInfo) && !type.props.typeAliasInfo.isPep695Syntax) {
+            if ((0, types_1.isUnion)(type) && ((_a = type.props) === null || _a === void 0 ? void 0 : _a.typeAliasInfo) && !type.props.typeAliasInfo.shared.isPep695Syntax) {
                 return type;
             }
         }
@@ -3607,7 +3619,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                         }
                     }
                     return {
-                        type: types_1.TypeVarType.cloneForScopeId(type, leftType.shared.recursiveAlias.scopeId, leftType.shared.recursiveAlias.name, 2 /* TypeVarScopeType.TypeAlias */),
+                        type: types_1.TypeVarType.cloneForScopeId(type, leftType.shared.recursiveAlias.typeVarScopeId, leftType.shared.recursiveAlias.name, 2 /* TypeVarScopeType.TypeAlias */),
                         scopeNode,
                         foundInterveningClass: false,
                     };
@@ -4821,13 +4833,13 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             return type;
         }
         // Is this a generic type alias that needs specializing?
-        if (!aliasInfo.typeParams || aliasInfo.typeParams.length === 0 || aliasInfo.typeArgs) {
+        if (!aliasInfo.shared.typeParams || aliasInfo.shared.typeParams.length === 0 || aliasInfo.typeArgs) {
             return type;
         }
         let reportDiag = false;
         const defaultTypeArgs = [];
         const constraints = new constraintTracker_1.ConstraintTracker();
-        aliasInfo.typeParams.forEach((param) => {
+        aliasInfo.shared.typeParams.forEach((param) => {
             if (!param.shared.isDefaultExplicit) {
                 reportDiag = true;
             }
@@ -4835,7 +4847,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             if (param.shared.isDefaultExplicit || (0, types_1.isParamSpec)(param)) {
                 defaultType = solveAndApplyConstraints(param, constraints, {
                     replaceUnsolved: {
-                        scopeIds: [aliasInfo.typeVarScopeId],
+                        scopeIds: [aliasInfo.shared.typeVarScopeId],
                         tupleClassType: getTupleClassType(),
                     },
                 });
@@ -4852,12 +4864,12 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         });
         if (reportDiag && errorNode) {
             addDiagnostic(diagnosticRules_1.DiagnosticRule.reportMissingTypeArgument, localize_1.LocMessage.typeArgsMissingForAlias().format({
-                name: aliasInfo.name,
+                name: aliasInfo.shared.name,
             }), errorNode);
         }
         type = types_1.TypeBase.cloneForTypeAlias(solveAndApplyConstraints(type, constraints, {
             replaceUnsolved: {
-                scopeIds: [aliasInfo.typeVarScopeId],
+                scopeIds: [aliasInfo.shared.typeVarScopeId],
                 tupleClassType: getTupleClassType(),
             },
         }), { ...aliasInfo, typeArgs: defaultTypeArgs });
@@ -4873,7 +4885,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             aliasInfo = (_d = (_c = baseType.props.typeForm) === null || _c === void 0 ? void 0 : _c.props) === null || _d === void 0 ? void 0 : _d.typeAliasInfo;
             aliasBaseType = (0, typeUtils_1.convertToInstantiable)(baseType.props.typeForm);
         }
-        if (!(aliasInfo === null || aliasInfo === void 0 ? void 0 : aliasInfo.typeParams) || (aliasInfo.typeParams.length === 0 && aliasInfo.typeArgs)) {
+        if (!(aliasInfo === null || aliasInfo === void 0 ? void 0 : aliasInfo.shared.typeParams) || (aliasInfo.shared.typeParams.length === 0 && aliasInfo.typeArgs)) {
             return undefined;
         }
         // If this is not instantiable, then the index expression isn't a specialization.
@@ -4884,7 +4896,8 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         if (aliasInfo.typeArgs) {
             return undefined;
         }
-        const typeParams = aliasInfo.typeParams;
+        inferVarianceForTypeAlias(baseType);
+        const typeParams = aliasInfo.shared.typeParams;
         let typeArgs = adjustTypeArgsForTypeVarTuple(getTypeArgs(node, flags), typeParams, node);
         let reportedError = false;
         // PEP 612 says that if the class has only one type parameter consisting
@@ -4992,7 +5005,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 else if (param.shared.isDefaultExplicit) {
                     typeArgType = solveAndApplyConstraints(param, constraints, {
                         replaceUnsolved: {
-                            scopeIds: [aliasInfo.typeVarScopeId],
+                            scopeIds: [aliasInfo.shared.typeVarScopeId],
                             tupleClassType: getTupleClassType(),
                         },
                     });
@@ -5029,7 +5042,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         }
         const solutionSet = (0, constraintSolver_1.solveConstraints)(evaluatorInterface, constraints).getMainSolutionSet();
         const aliasTypeArgs = [];
-        (_f = aliasInfo.typeParams) === null || _f === void 0 ? void 0 : _f.forEach((typeParam) => {
+        (_f = aliasInfo.shared.typeParams) === null || _f === void 0 ? void 0 : _f.forEach((typeParam) => {
             let typeVarType = solutionSet.getType(typeParam);
             // Fill in any unsolved type arguments with unknown.
             if (!typeVarType) {
@@ -5068,7 +5081,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             types_1.ClassType.isBuiltIn(baseTypeResult.type, 'TypeAliasType') &&
             ((_b = baseTypeResult.type.props) === null || _b === void 0 ? void 0 : _b.typeForm)) {
             const typeAliasInfo = (_c = baseTypeResult.type.props.typeForm.props) === null || _c === void 0 ? void 0 : _c.typeAliasInfo;
-            if (typeAliasInfo && typeAliasInfo.typeParams) {
+            if (typeAliasInfo && typeAliasInfo.shared.typeParams) {
                 const origTypeAlias = types_1.TypeBase.cloneForTypeAlias((0, typeUtils_1.convertToInstantiable)(baseTypeResult.type.props.typeForm), { ...typeAliasInfo, typeArgs: undefined });
                 const typeFormType = createSpecializedTypeAlias(node, origTypeAlias, flags);
                 if (typeFormType) {
@@ -5081,14 +5094,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         if ((0, types_1.isTypeVar)(baseTypeResult.type) && (0, typeUtils_1.isTypeAliasPlaceholder)(baseTypeResult.type)) {
             const typeArgTypes = getTypeArgs(node, flags).map((t) => (0, typeUtils_1.convertToInstance)(t.type));
             const type = types_1.TypeBase.cloneForTypeAlias(baseTypeResult.type, {
-                name: baseTypeResult.type.shared.recursiveAlias.name,
-                fullName: '',
-                moduleName: '',
-                fileUri: uri_1.Uri.empty(),
-                typeVarScopeId: baseTypeResult.type.shared.recursiveAlias.scopeId,
-                isPep695Syntax: !!baseTypeResult.type.shared.recursiveAlias.isPep695Syntax,
-                typeParams: baseTypeResult.type.shared.recursiveAlias.typeParams,
-                usageVariance: undefined,
+                shared: baseTypeResult.type.shared.recursiveAlias,
                 typeArgs: typeArgTypes,
             });
             return { type };
@@ -5256,31 +5262,38 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         var _a;
         const aliasInfo = (_a = type.props) === null || _a === void 0 ? void 0 : _a.typeAliasInfo;
         // If this isn't a generic type alias, there's nothing to do.
-        if (!aliasInfo || !aliasInfo.typeParams) {
+        if (!aliasInfo || !aliasInfo.shared.typeParams) {
             return undefined;
         }
-        // Is the usage variance info already cached?
-        if (aliasInfo.usageVariance) {
-            return aliasInfo.usageVariance;
+        // Is the computed variance info already cached?
+        if (aliasInfo.shared.computedVariance) {
+            return aliasInfo.shared.computedVariance;
         }
-        const typeParams = aliasInfo.typeParams;
+        const typeParams = aliasInfo.shared.typeParams;
         // Start with all of the usage variances unknown.
         const usageVariances = typeParams.map(() => 1 /* Variance.Unknown */);
         // Prepopulate the cached value for the type alias to handle
         // recursive type aliases.
-        aliasInfo.usageVariance = usageVariances;
+        aliasInfo.shared.computedVariance = usageVariances;
         // Traverse the type alias type definition and adjust the usage
         // variances accordingly.
-        updateUsageVariancesRecursive(type, typeParams, usageVariances);
+        updateUsageVariancesRecursive(type, typeParams, usageVariances, 3 /* Variance.Covariant */);
         return usageVariances;
     }
     // Looks at uses of the type parameters within the type and adjusts the
     // variances accordingly. For example, if the type is `Mapping[T1, T2]`,
     // then T1 will be set to invariant and T2 will be set to covariant.
-    function updateUsageVariancesRecursive(type, typeAliasTypeParams, usageVariances, recursionCount = 0) {
+    function updateUsageVariancesRecursive(type, typeAliasTypeParams, usageVariances, varianceContext, recursionCount = 0) {
         if (recursionCount > types_1.maxTypeRecursionCount) {
             return;
         }
+        const transformedType = (0, typeUtils_1.transformPossibleRecursiveTypeAlias)(type);
+        // If this is a recursive type alias, use a lower recursion limit.
+        if (transformedType !== type) {
+            if (recursionCount > maxRecursiveTypeAliasRecursionCount) {
+                return;
+            }
+        }
         recursionCount++;
         // Define a helper function that performs the actual usage variant update.
         function updateUsageVarianceForType(type, variance) {
@@ -5290,20 +5303,19 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                     usageVariances[typeParamIndex] = (0, typeUtils_1.combineVariances)(usageVariances[typeParamIndex], variance);
                 }
                 else {
-                    updateUsageVariancesRecursive(subtype, typeAliasTypeParams, usageVariances, recursionCount);
+                    updateUsageVariancesRecursive(subtype, typeAliasTypeParams, usageVariances, variance, recursionCount);
                 }
             });
         }
-        (0, typeUtils_1.doForEachSubtype)(type, (subtype) => {
+        (0, typeUtils_1.doForEachSubtype)(transformedType, (subtype) => {
             if (subtype.category === 4 /* TypeCategory.Function */) {
-                if (subtype.priv.specializedTypes) {
-                    subtype.priv.specializedTypes.parameterTypes.forEach((paramType) => {
-                        updateUsageVarianceForType(paramType, 4 /* Variance.Contravariant */);
-                    });
-                    const returnType = subtype.priv.specializedTypes.returnType;
-                    if (returnType) {
-                        updateUsageVarianceForType(returnType, 3 /* Variance.Covariant */);
-                    }
+                subtype.shared.parameters.forEach((param, index) => {
+                    const paramType = types_1.FunctionType.getParamType(subtype, index);
+                    updateUsageVarianceForType(paramType, (0, typeUtils_1.invertVariance)(varianceContext));
+                });
+                const returnType = types_1.FunctionType.getEffectiveReturnType(subtype);
+                if (returnType) {
+                    updateUsageVarianceForType(returnType, varianceContext);
                 }
             }
             else if (subtype.category === 6 /* TypeCategory.Class */) {
@@ -5316,7 +5328,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                     subtype.priv.typeArgs.forEach((typeArg, classParamIndex) => {
                         var _a;
                         if ((0, typeUtils_1.isTupleClass)(subtype)) {
-                            updateUsageVarianceForType(typeArg, 3 /* Variance.Covariant */);
+                            updateUsageVarianceForType(typeArg, varianceContext);
                         }
                         else if (classParamIndex < subtype.shared.typeParams.length) {
                             const classTypeParam = subtype.shared.typeParams[classParamIndex];
@@ -5326,7 +5338,10 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                                 });
                             }
                             else {
-                                updateUsageVarianceForType(typeArg, (_a = classTypeParam.priv.computedVariance) !== null && _a !== void 0 ? _a : classTypeParam.shared.declaredVariance);
+                                const effectiveVariance = (_a = classTypeParam.priv.computedVariance) !== null && _a !== void 0 ? _a : classTypeParam.shared.declaredVariance;
+                                updateUsageVarianceForType(typeArg, varianceContext === 4 /* Variance.Contravariant */
+                                    ? (0, typeUtils_1.invertVariance)(effectiveVariance)
+                                    : effectiveVariance);
                             }
                         }
                     });
@@ -7380,11 +7395,10 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         paramDetails.params.forEach((paramInfo) => {
             (0, debug_1.assert)(paramInfo !== undefined, 'paramInfo is undefined for param name map');
             const param = paramInfo.param;
-            if (param.name && param.category === 0 /* ParamCategory.Simple */) {
+            if (param.name && param.category === 0 /* ParamCategory.Simple */ && paramInfo.kind !== parameterUtils_1.ParamKind.Positional) {
                 paramMap.set(param.name, {
                     argsNeeded: param.category === 0 /* ParamCategory.Simple */ && !paramInfo.defaultType ? 1 : 0,
                     argsReceived: 0,
-                    isPositionalOnly: paramInfo.kind === parameterUtils_1.ParamKind.Positional,
                 });
             }
         });
@@ -7696,19 +7710,20 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 }
             }
             else {
-                const paramName = paramDetails.params[paramIndex].param.name;
+                const paramInfo = paramDetails.params[paramIndex];
+                const paramName = paramInfo.param.name;
                 validateArgTypeParams.push({
-                    paramCategory: paramDetails.params[paramIndex].param.category,
+                    paramCategory: paramInfo.param.category,
                     paramType,
                     requiresTypeVarMatching: (0, typeUtils_1.requiresSpecialization)(paramType),
                     argument: argList[argIndex],
                     errorNode: argList[argIndex].valueExpression || errorNode,
                     paramName,
-                    isParamNameSynthesized: types_1.FunctionParam.isNameSynthesized(paramDetails.params[paramIndex].param),
+                    isParamNameSynthesized: types_1.FunctionParam.isNameSynthesized(paramInfo.param),
                 });
-                trySetActive(argList[argIndex], paramDetails.params[paramIndex].param);
+                trySetActive(argList[argIndex], paramInfo.param);
                 // Note that the parameter has received an argument.
-                if (paramName && paramMap.has(paramName)) {
+                if (paramName && paramMap.has(paramName) && paramInfo.kind !== parameterUtils_1.ParamKind.Positional) {
                     paramMap.get(paramName).argsReceived++;
                 }
                 argIndex++;
@@ -7786,7 +7801,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                         tdEntries.knownItems.forEach((entry, name) => {
                             var _a, _b;
                             const paramEntry = paramMap.get(name);
-                            if (paramEntry && !paramEntry.isPositionalOnly) {
+                            if (paramEntry) {
                                 if (paramEntry.argsReceived > 0) {
                                     diag.addMessage(localize_1.LocMessage.paramAlreadyAssigned().format({ name }));
                                 }
@@ -7825,7 +7840,6 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                                 paramMap.set(name, {
                                     argsNeeded: 1,
                                     argsReceived: 1,
-                                    isPositionalOnly: false,
                                 });
                             }
                             else {
@@ -7944,7 +7958,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                     if (paramName) {
                         const paramNameValue = paramName.d.value;
                         const paramEntry = paramMap.get(paramNameValue);
-                        if (paramEntry && !paramEntry.isPositionalOnly) {
+                        if (paramEntry) {
                             if (paramEntry.argsReceived > 0) {
                                 if (!canSkipDiagnosticForNode(errorNode) && !isTypeIncomplete) {
                                     addDiagnostic(diagnosticRules_1.DiagnosticRule.reportCallIssue, localize_1.LocMessage.paramAlreadyAssigned().format({ name: paramNameValue }), paramName);
@@ -7953,7 +7967,8 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                             }
                             else {
                                 paramEntry.argsReceived++;
-                                const paramInfoIndex = paramDetails.params.findIndex((paramInfo) => paramInfo.param.name === paramNameValue);
+                                const paramInfoIndex = paramDetails.params.findIndex((paramInfo) => paramInfo.param.name === paramNameValue &&
+                                    paramInfo.kind !== parameterUtils_1.ParamKind.Positional);
                                 (0, debug_1.assert)(paramInfoIndex >= 0);
                                 const paramType = paramDetails.params[paramInfoIndex].type;
                                 validateArgTypeParams.push({
@@ -7991,7 +8006,6 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                                 paramMap.set(paramNameValue, {
                                     argsNeeded: 1,
                                     argsReceived: 1,
-                                    isPositionalOnly: false,
                                 });
                                 (0, debug_1.assert)(paramDetails.params[paramDetails.kwargsIndex], 'paramDetails.kwargsIndex params entry is undefined');
                             }
@@ -8105,7 +8119,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                     const param = paramInfo.param;
                     if (param.category === 0 /* ParamCategory.Simple */ && param.name) {
                         const entry = paramMap.get(param.name);
-                        if (entry.argsNeeded === 0 && entry.argsReceived === 0) {
+                        if (entry && entry.argsNeeded === 0 && entry.argsReceived === 0) {
                             const defaultArgType = paramInfo.defaultType;
                             if (defaultArgType &&
                                 !(0, typeUtils_1.isEllipsisType)(defaultArgType) &&
@@ -11446,7 +11460,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         }
         return createSpecialType(classType, typeArgs, /* paramLimit */ undefined, /* allowParamSpec */ true);
     }
-    function transformTypeForTypeAlias(type, name, errorNode, isPep695Syntax, isPep695TypeVarType, typeParams, typeParamNodes) {
+    function transformTypeForTypeAlias(type, errorNode, typeAliasPlaceholder, isPep695TypeVarType, typeParamNodes) {
         var _a;
         if (!types_1.TypeBase.isInstantiable(type)) {
             return type;
@@ -11456,6 +11470,9 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         if ((0, typeUtils_1.isTypeAliasPlaceholder)(type)) {
             return type;
         }
+        const sharedInfo = typeAliasPlaceholder.shared.recursiveAlias;
+        (0, debug_1.assert)(sharedInfo !== undefined);
+        let typeParams = sharedInfo.typeParams;
         if (!typeParams) {
             // Determine if there are any generic type parameters associated
             // with this type alias.
@@ -11480,10 +11497,9 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 addDiagnostic(diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.LocMessage.typeVarWithDefaultFollowsVariadic().format({
                     typeVarName: typeParams[typeVarWithDefaultIndex].shared.name,
                     variadicName: typeParams[firstTypeVarTupleIndex].shared.name,
-                }), typeParamNodes ? typeParamNodes[typeVarWithDefaultIndex].d.name : name);
+                }), typeParamNodes ? typeParamNodes[typeVarWithDefaultIndex].d.name : errorNode);
             }
         }
-        const typeAliasScopeId = ParseTreeUtils.getScopeIdForNode(name);
         // Validate the default types for all type parameters.
         typeParams.forEach((typeParam, index) => {
             var _a;
@@ -11492,7 +11508,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             if (typeParamNodes && index < typeParamNodes.length) {
                 bestErrorNode = (_a = typeParamNodes[index].d.defaultExpr) !== null && _a !== void 0 ? _a : typeParamNodes[index].d.name;
             }
-            validateTypeParamDefault(bestErrorNode, typeParam, typeParams.slice(0, index), typeAliasScopeId);
+            validateTypeParamDefault(bestErrorNode, typeParam, typeParams.slice(0, index), sharedInfo.typeVarScopeId);
         });
         // Verify that we have at most one TypeVarTuple.
         const variadics = typeParams.filter((param) => (0, types_1.isTypeVarTuple)(param));
@@ -11501,29 +11517,23 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 names: variadics.map((v) => `"${v.shared.name}"`).join(', '),
             }), errorNode);
         }
-        if (!isPep695Syntax && !isPep695TypeVarType) {
-            const boundTypeVars = typeParams.filter((typeVar) => typeVar.priv.scopeId !== typeAliasScopeId && typeVar.priv.scopeType === 0 /* TypeVarScopeType.Class */);
+        if (!sharedInfo.isPep695Syntax && !isPep695TypeVarType) {
+            const boundTypeVars = typeParams.filter((typeVar) => typeVar.priv.scopeId !== sharedInfo.typeVarScopeId &&
+                typeVar.priv.scopeType === 0 /* TypeVarScopeType.Class */);
             if (boundTypeVars.length > 0) {
                 addDiagnostic(diagnosticRules_1.DiagnosticRule.reportInvalidTypeForm, localize_1.LocMessage.genericTypeAliasBoundTypeVar().format({
                     names: boundTypeVars.map((t) => `${t.shared.name}`).join(', '),
                 }), errorNode);
             }
         }
-        const fileInfo = AnalyzerNodeInfo.getFileInfo(name);
+        sharedInfo.typeParams = typeParams.length > 0 ? typeParams : undefined;
         let typeAlias = types_1.TypeBase.cloneForTypeAlias(type, {
-            name: name.d.value,
-            fullName: ParseTreeUtils.getClassFullName(name, fileInfo.moduleName, name.d.value),
-            moduleName: fileInfo.moduleName,
-            fileUri: fileInfo.fileUri,
-            typeVarScopeId: typeAliasScopeId,
-            isPep695Syntax,
-            typeParams: typeParams.length > 0 ? typeParams : undefined,
-            usageVariance: undefined,
+            shared: sharedInfo,
             typeArgs: undefined,
         });
         // All PEP 695 type aliases are special forms because they are
         // TypeAliasType objects at runtime.
-        if (isPep695Syntax || isPep695TypeVarType) {
+        if (sharedInfo.isPep695Syntax || isPep695TypeVarType) {
             const typeAliasTypeClass = getTypingType(errorNode, 'TypeAliasType');
             if (typeAliasTypeClass && (0, types_1.isInstantiableClass)(typeAliasTypeClass)) {
                 typeAlias = types_1.TypeBase.cloneAsSpecialForm(typeAlias, types_1.ClassType.cloneAsInstance(typeAliasTypeClass));
@@ -11654,7 +11664,16 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                     typeParamVariance: 2 /* Variance.Invariant */,
                 },
             ],
-            ['TypeForm', { alias: '', module: 'builtins', isSpecialForm: true, typeParamVariance: 3 /* Variance.Covariant */ }],
+            [
+                'TypeForm',
+                {
+                    alias: '',
+                    module: 'builtins',
+                    isSpecialForm: true,
+                    typeParamVariance: 3 /* Variance.Covariant */,
+                    isIllegalInIsinstance: true,
+                },
+            ],
         ]);
         const aliasMapEntry = specialTypes.get(assignedName);
         if (aliasMapEntry) {
@@ -11793,7 +11812,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 }
             }
             if (typeAliasNameNode) {
-                typeAliasPlaceholder = synthesizeTypeAliasPlaceholder(typeAliasNameNode);
+                typeAliasPlaceholder = synthesizeTypeAliasPlaceholder(typeAliasNameNode, /* isPep695Syntax */ false);
                 writeTypeCache(node, { type: typeAliasPlaceholder }, /* flags */ undefined);
                 writeTypeCache(node.d.leftExpr, { type: typeAliasPlaceholder }, /* flags */ undefined);
                 if (node.d.leftExpr.nodeType === 54 /* ParseNodeType.TypeAnnotation */) {
@@ -11814,8 +11833,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             if (typeAliasNameNode) {
                 (0, debug_1.assert)(typeAliasPlaceholder !== undefined);
                 // If this is a type alias, record its name based on the assignment target.
-                rightHandType = transformTypeForTypeAlias(rightHandType, typeAliasNameNode, typeAliasNameNode, 
-                /* isPep695Syntax */ false, 
+                rightHandType = transformTypeForTypeAlias(rightHandType, typeAliasNameNode, typeAliasPlaceholder, 
                 /* isPep695TypeVarType */ false);
                 if ((0, typeUtils_1.isTypeAliasRecursive)(typeAliasPlaceholder, rightHandType)) {
                     addDiagnostic(diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.LocMessage.typeAliasIsRecursiveDirect().format({
@@ -11828,7 +11846,8 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 typeAliasPlaceholder.shared.boundType = rightHandType;
                 // Record the type parameters within the recursive type alias so it
                 // can be specialized.
-                typeAliasPlaceholder.shared.recursiveAlias.typeParams = (_b = (_a = rightHandType.props) === null || _a === void 0 ? void 0 : _a.typeAliasInfo) === null || _b === void 0 ? void 0 : _b.typeParams;
+                typeAliasPlaceholder.shared.recursiveAlias.typeParams =
+                    (_b = (_a = rightHandType.props) === null || _a === void 0 ? void 0 : _a.typeAliasInfo) === null || _b === void 0 ? void 0 : _b.shared.typeParams;
             }
             else {
                 // If the RHS is a constant boolean expression, assign it a literal type.
@@ -11848,17 +11867,22 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
     }
     // Synthesize a TypeVar that acts as a placeholder for a type alias. This allows
     // the type alias definition to refer to itself.
-    function synthesizeTypeAliasPlaceholder(nameNode) {
+    function synthesizeTypeAliasPlaceholder(nameNode, isPep695Syntax) {
         const placeholder = types_1.TypeVarType.createInstantiable(`__type_alias_${nameNode.d.value}`);
         placeholder.shared.isSynthesized = true;
-        const scopeId = ParseTreeUtils.getScopeIdForNode(nameNode);
+        const typeVarScopeId = ParseTreeUtils.getScopeIdForNode(nameNode);
+        const fileInfo = AnalyzerNodeInfo.getFileInfo(nameNode);
         placeholder.shared.recursiveAlias = {
             name: nameNode.d.value,
-            scopeId,
-            isPep695Syntax: false,
+            fullName: ParseTreeUtils.getClassFullName(nameNode, fileInfo.moduleName, nameNode.d.value),
+            moduleName: fileInfo.moduleName,
+            fileUri: fileInfo.fileUri,
+            typeVarScopeId,
+            isPep695Syntax,
             typeParams: undefined,
+            computedVariance: undefined,
         };
-        placeholder.priv.scopeId = scopeId;
+        placeholder.priv.scopeId = typeVarScopeId;
         return placeholder;
     }
     // Evaluates the type of a type alias (i.e. "type") statement. This code
@@ -11883,7 +11907,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         }
         // Synthesize a type variable that represents the type alias while we're
         // evaluating it. This allows us to handle recursive definitions.
-        const typeAliasTypeVar = synthesizeTypeAliasPlaceholder(nameNode);
+        const typeAliasTypeVar = synthesizeTypeAliasPlaceholder(nameNode, isPep695Syntax);
         // Write the type to the type cache to support recursive type alias definitions.
         writeTypeCache(nameNode, { type: typeAliasTypeVar }, /* flags */ undefined);
         // Set a partial type to handle recursive (self-referential) type aliases.
@@ -11906,8 +11930,8 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         if (aliasTypeResult.isIncomplete) {
             isIncomplete = true;
         }
-        aliasType = transformTypeForTypeAlias(aliasType, nameNode, nameNode, isPep695Syntax, 
-        /* isPep695TypeVarType */ true, typeParams, typeParamNodes);
+        aliasType = transformTypeForTypeAlias(aliasType, nameNode, typeAliasTypeVar, 
+        /* isPep695TypeVarType */ true, typeParamNodes);
         // See if the type alias relies on itself in a way that cannot be resolved.
         if ((0, typeUtils_1.isTypeAliasRecursive)(typeAliasTypeVar, aliasType)) {
             addDiagnostic(diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.LocMessage.typeAliasIsRecursiveDirect().format({
@@ -12804,7 +12828,9 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                     const paramMap = new Map();
                     for (let i = paramListDetails.firstKeywordOnlyIndex; i < paramListDetails.params.length; i++) {
                         const paramInfo = paramListDetails.params[i];
-                        if (paramInfo.param.category === 0 /* ParamCategory.Simple */ && paramInfo.param.name) {
+                        if (paramInfo.param.category === 0 /* ParamCategory.Simple */ &&
+                            paramInfo.param.name &&
+                            paramInfo.kind !== parameterUtils_1.ParamKind.Positional) {
                             paramMap.set(paramInfo.param.name, i);
                         }
                     }
@@ -15795,6 +15821,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             else {
                 (0, debug_1.assert)(scopeNode.nodeType === 77 /* ParseNodeType.TypeAlias */);
                 scopeType = 2 /* TypeVarScopeType.TypeAlias */;
+                typeVar.shared.declaredVariance = 0 /* Variance.Auto */;
             }
             typeVar = types_1.TypeVarType.cloneForScopeId(typeVar, ParseTreeUtils.getScopeIdForNode(scopeNode.nodeType === 77 /* ParseNodeType.TypeAlias */ ? scopeNode.d.name : scopeNode), scopeNode.d.name.d.value, scopeType);
         }
@@ -15931,8 +15958,9 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 // in the event that its inferred type is instantiable or explicitly Any
                 // (but not an ellipsis).
                 if (isLegalImplicitTypeAliasType(inferredType)) {
-                    inferredType = transformTypeForTypeAlias(inferredType, resolvedDecl.typeAliasName, resolvedDecl.node, 
-                    /* isPep695Syntax */ false, 
+                    const typeAliasTypeVar = synthesizeTypeAliasPlaceholder(resolvedDecl.typeAliasName, 
+                    /* isPep695Syntax */ false);
+                    inferredType = transformTypeForTypeAlias(inferredType, resolvedDecl.node, typeAliasTypeVar, 
                     /* isPep695TypeVarType */ false);
                     isUnambiguousType = true;
                 }
@@ -17179,16 +17207,8 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             // Do the source and dest refer to the same recursive type alias?
             if ((destAliasInfo === null || destAliasInfo === void 0 ? void 0 : destAliasInfo.typeArgs) &&
                 (srcAliasInfo === null || srcAliasInfo === void 0 ? void 0 : srcAliasInfo.typeArgs) &&
-                destType.shared.recursiveAlias.scopeId === srcType.shared.recursiveAlias.scopeId) {
-                let isAssignable = true;
-                const srcTypeArgs = srcAliasInfo.typeArgs;
-                destAliasInfo.typeArgs.forEach((destTypeArg, index) => {
-                    const srcTypeArg = index < srcTypeArgs.length ? srcTypeArgs[index] : types_1.UnknownType.create();
-                    if (!assignType(destTypeArg, srcTypeArg, diag, constraints, flags, recursionCount)) {
-                        isAssignable = false;
-                    }
-                });
-                return isAssignable;
+                destType.shared.recursiveAlias.typeVarScopeId === srcType.shared.recursiveAlias.typeVarScopeId) {
+                return assignRecursiveTypeAliasToSelf(destAliasInfo, srcAliasInfo, diag, constraints, flags, recursionCount);
             }
             else {
                 // Have we already recursed once?
@@ -17704,6 +17724,31 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         diag === null || diag === void 0 ? void 0 : diag.addMessage(localize_1.LocAddendum.typeAssignmentMismatch().format(printSrcDestTypes(srcType, destType)));
         return false;
     }
+    // Determines whether a recursive type alias can be assigned to itself
+    // given the source and dest type args and computed variance for its
+    // type params.
+    function assignRecursiveTypeAliasToSelf(destAliasInfo, srcAliasInfo, diag, constraints, flags = 0 /* AssignTypeFlags.Default */, recursionCount = 0) {
+        (0, debug_1.assert)(destAliasInfo.typeArgs !== undefined);
+        (0, debug_1.assert)(srcAliasInfo.typeArgs !== undefined);
+        let isAssignable = true;
+        const srcTypeArgs = srcAliasInfo.typeArgs;
+        const variances = destAliasInfo.shared.computedVariance;
+        destAliasInfo.typeArgs.forEach((destTypeArg, index) => {
+            const srcTypeArg = index < srcTypeArgs.length ? srcTypeArgs[index] : types_1.UnknownType.create();
+            let adjFlags = flags;
+            const variance = variances && index < variances.length ? variances[index] : 3 /* Variance.Covariant */;
+            if (variance === 2 /* Variance.Invariant */) {
+                adjFlags |= 1 /* AssignTypeFlags.Invariant */;
+            }
+            else if (variance === 4 /* Variance.Contravariant */) {
+                adjFlags ^= 2 /* AssignTypeFlags.Contravariant */;
+            }
+            if (!assignType(destTypeArg, srcTypeArg, diag, constraints, adjFlags, recursionCount)) {
+                isAssignable = false;
+            }
+        });
+        return isAssignable;
+    }
     // If the expected type is an explicit TypeForm type, see if the source
     // type has an implicit TypeForm type that can be assigned to it. If so,
     // convert to an explicit TypeForm type.
@@ -18599,7 +18644,9 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             if (destParamDetails.firstKeywordOnlyIndex !== undefined) {
                 destParamDetails.params.forEach((param, index) => {
                     if (index >= destParamDetails.firstKeywordOnlyIndex) {
-                        if (param.param.name && param.param.category === 0 /* ParamCategory.Simple */) {
+                        if (param.param.name &&
+                            param.param.category === 0 /* ParamCategory.Simple */ &&
+                            param.kind !== parameterUtils_1.ParamKind.Positional) {
                             destParamMap.set(param.param.name, param);
                         }
                     }