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

package/dist/analyzer/typeEvaluator.js

@@ -152,15 +152,6 @@ const maxOverloadUnionExpansionCount = 64;
 // Maximum number of recursive function return type inference attempts
 // that can be concurrently pending before we give up.
 const maxInferFunctionReturnRecursionCount = 12;
-// In certain loops, it's possible to construct arbitrarily-deep containers
-// (tuples, lists, sets, or dicts) which can lead to infinite type analysis.
-// This limits the depth.
-const maxInferredContainerDepth = 8;
-// If a tuple expression with no declared type contains a large number
-// of elements, it can cause performance issues. This value limits the
-// number of elements that will be included in the tuple type before
-// we default to tuple[Unknown, ...].
-const maxInferredTupleEntryCount = 256;
 // Maximum recursion amount when comparing two recursive type aliases.
 // Increasing this can greatly increase the time required to evaluate
 // two recursive type aliases that have the same definition. Decreasing
@@ -391,7 +382,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 +397,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);
                     }
                 }
             }
@@ -627,7 +630,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 break;
             }
             case 52 /* ParseNodeType.Tuple */: {
-                typeResult = getTypeOfTuple(node, flags, inferenceContext);
+                typeResult = (0, tuples_1.getTypeOfTuple)(evaluatorInterface, node, flags, inferenceContext);
                 break;
             }
             case 14 /* ParseNodeType.Constant */: {
@@ -851,8 +854,14 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             typeResult = { type: types_1.AnyType.create(/* isEllipsis */ true) };
         }
         else {
-            const ellipsisType = (_b = (_a = getBuiltInObject(node, 'EllipsisType')) !== null && _a !== void 0 ? _a : getBuiltInObject(node, 'ellipsis')) !== null && _b !== void 0 ? _b : types_1.AnyType.create();
-            typeResult = { type: ellipsisType };
+            if ((flags & 256 /* EvalFlags.TypeExpression */) !== 0 && (flags & 65536 /* EvalFlags.AllowEllipsis */) === 0) {
+                addDiagnostic(diagnosticRules_1.DiagnosticRule.reportInvalidTypeForm, localize_1.LocMessage.ellipsisContext(), node);
+                typeResult = { type: types_1.UnknownType.create() };
+            }
+            else {
+                const ellipsisType = (_b = (_a = getBuiltInObject(node, 'EllipsisType')) !== null && _a !== void 0 ? _a : getBuiltInObject(node, 'ellipsis')) !== null && _b !== void 0 ? _b : types_1.AnyType.create();
+                typeResult = { type: ellipsisType };
+            }
         }
         return typeResult;
     }
@@ -994,7 +1003,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) {
@@ -2633,7 +2642,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             var _a;
             if ((0, types_1.isParamSpec)(subtype)) {
                 if (subtype.priv.paramSpecAccess === 'args') {
-                    return makeTupleObject([{ type: getObjectType(), isUnbounded: true }]);
+                    return (0, tuples_1.makeTupleObject)(evaluatorInterface, [{ type: getObjectType(), isUnbounded: true }]);
                 }
                 else if (subtype.priv.paramSpecAccess === 'kwargs') {
                     if (dictClass && (0, types_1.isInstantiableClass)(dictClass) && strClass && (0, types_1.isInstantiableClass)(strClass)) {
@@ -2664,7 +2673,8 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                     return types_1.AnyType.create();
                 }
                 // Fall back to "*tuple[object, ...]".
-                return makeTupleObject([{ type: getObjectType(), isUnbounded: true }], /* isUnpacked */ true);
+                return (0, tuples_1.makeTupleObject)(evaluatorInterface, [{ type: getObjectType(), isUnbounded: true }], 
+                /* isUnpacked */ true);
             }
             if ((0, types_1.isTypeVar)(subtype)) {
                 // If this is a recursive type alias placeholder
@@ -3259,7 +3269,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 +3617,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,
                     };
@@ -4781,7 +4791,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                             }
                         });
                     }
-                    const tupleObject = makeTupleObject(variadicTypes, /* isUnpacked */ true);
+                    const tupleObject = (0, tuples_1.makeTupleObject)(evaluatorInterface, variadicTypes, /* isUnpacked */ true);
                     typeArgs = [
                         ...typeArgs.slice(0, variadicIndex),
                         { node: typeArgs[variadicIndex].node, type: tupleObject },
@@ -4793,7 +4803,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 // Add an empty tuple that maps to the TypeVarTuple type parameter.
                 typeArgs.push({
                     node: errorNode,
-                    type: makeTupleObject([], /* isUnpacked */ true),
+                    type: (0, tuples_1.makeTupleObject)(evaluatorInterface, [], /* isUnpacked */ true),
                 });
             }
         }
@@ -4821,13 +4831,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,13 +4845,13 @@ 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(),
                     },
                 });
             }
             else if ((0, types_1.isTypeVarTuple)(param) && tupleClass && (0, types_1.isInstantiableClass)(tupleClass)) {
-                defaultType = makeTupleObject([{ type: types_1.UnknownType.create(), isUnbounded: true }], 
+                defaultType = (0, tuples_1.makeTupleObject)(evaluatorInterface, [{ type: types_1.UnknownType.create(), isUnbounded: true }], 
                 /* isUnpacked */ true);
             }
             else {
@@ -4852,12 +4862,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 +4883,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,23 +4894,15 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         if (aliasInfo.typeArgs) {
             return undefined;
         }
-        const typeParams = aliasInfo.typeParams;
-        let typeArgs = adjustTypeArgsForTypeVarTuple(getTypeArgs(node, flags), typeParams, node);
+        inferVarianceForTypeAlias(baseType);
+        const typeParams = aliasInfo.shared.typeParams;
+        let typeArgs;
+        typeArgs = adjustTypeArgsForTypeVarTuple(getTypeArgs(node, flags), typeParams, node);
         let reportedError = false;
-        // PEP 612 says that if the class has only one type parameter consisting
-        // of a ParamSpec, the list of arguments does not need to be enclosed in
-        // a list. We'll handle that case specially here. Presumably this applies to
-        // type aliases as well.
-        if (typeParams.length === 1 && (0, types_1.isParamSpec)(typeParams[0]) && typeArgs) {
-            if (typeArgs.every((typeArg) => !(0, typeUtils_1.isEllipsisType)(typeArg.type) && !typeArg.typeList && !(0, types_1.isParamSpec)(typeArg.type))) {
-                typeArgs = [
-                    {
-                        type: types_1.UnknownType.create(),
-                        node: typeArgs.length > 0 ? typeArgs[0].node : node,
-                        typeList: typeArgs,
-                    },
-                ];
-            }
+        typeArgs = transformTypeArgsForParamSpec(typeParams, typeArgs, node);
+        if (!typeArgs) {
+            typeArgs = [];
+            reportedError = true;
         }
         let minTypeArgCount = typeParams.length;
         const firstDefaultParamIndex = typeParams.findIndex((param) => !!param.shared.isDefaultExplicit);
@@ -4937,8 +4939,12 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 const typeList = typeArgs[index].typeList;
                 if (typeList) {
                     const functionType = types_1.FunctionType.createSynthesizedInstance('', 65536 /* FunctionTypeFlags.ParamSpecValue */);
-                    typeList.forEach((paramType, paramIndex) => {
-                        types_1.FunctionType.addParam(functionType, types_1.FunctionParam.create(0 /* ParamCategory.Simple */, (0, typeUtils_1.convertToInstance)(paramType.type), types_1.FunctionParamFlags.NameSynthesized | types_1.FunctionParamFlags.TypeDeclared, `__p${paramIndex}`));
+                    typeList.forEach((paramTypeResult, paramIndex) => {
+                        let paramType = paramTypeResult.type;
+                        if (!validateTypeArg(paramTypeResult)) {
+                            paramType = types_1.UnknownType.create();
+                        }
+                        types_1.FunctionType.addParam(functionType, types_1.FunctionParam.create(0 /* ParamCategory.Simple */, (0, typeUtils_1.convertToInstance)(paramType), types_1.FunctionParamFlags.NameSynthesized | types_1.FunctionParamFlags.TypeDeclared, `__p${paramIndex}`));
                     });
                     if (typeList.length > 0) {
                         types_1.FunctionType.addPositionOnlyParamSeparator(functionType);
@@ -4992,7 +4998,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 +5035,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 +5074,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 +5087,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 +5255,41 @@ 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, pendingTypes = [], recursionCount = 0) {
         if (recursionCount > types_1.maxTypeRecursionCount) {
             return;
         }
+        const transformedType = (0, typeUtils_1.transformPossibleRecursiveTypeAlias)(type);
+        // If this is a recursive type alias, see if we've already recursed
+        // seen it once before in the recursion stack. If so, don't recurse
+        // further.
+        if (transformedType !== type) {
+            const pendingOverlaps = pendingTypes.filter((pendingType) => (0, types_1.isTypeSame)(pendingType, type));
+            if (pendingOverlaps.length > 1) {
+                return;
+            }
+        }
         recursionCount++;
         // Define a helper function that performs the actual usage variant update.
         function updateUsageVarianceForType(type, variance) {
@@ -5290,20 +5299,21 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                     usageVariances[typeParamIndex] = (0, typeUtils_1.combineVariances)(usageVariances[typeParamIndex], variance);
                 }
                 else {
-                    updateUsageVariancesRecursive(subtype, typeAliasTypeParams, usageVariances, recursionCount);
+                    pendingTypes.push(type);
+                    updateUsageVariancesRecursive(subtype, typeAliasTypeParams, usageVariances, variance, pendingTypes, recursionCount);
+                    pendingTypes.pop();
                 }
             });
         }
-        (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 +5326,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 +5336,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);
                             }
                         }
                     });
@@ -5334,12 +5347,6 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             }
         });
     }
-    function makeTupleObject(typeArgs, isUnpacked = false) {
-        if (tupleClass && (0, types_1.isInstantiableClass)(tupleClass)) {
-            return (0, typeUtils_1.convertToInstance)((0, typeUtils_1.specializeTupleClass)(tupleClass, typeArgs, /* isTypeArgExplicit */ true, isUnpacked));
-        }
-        return types_1.UnknownType.create();
-    }
     function getIndexAccessMagicMethodName(usage) {
         if (usage.method === 'get') {
             return '__getitem__';
@@ -5428,7 +5435,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         }
         else if (positionalArgs.length === 0 && unpackedListArgs.length === 0) {
             // Handle the case where there are no positionals provided but there are keywords.
-            positionalIndexType = makeTupleObject([]);
+            positionalIndexType = (0, tuples_1.makeTupleObject)(evaluatorInterface, []);
         }
         else {
             // Package up all of the positionals into a tuple.
@@ -5449,7 +5456,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 const iterableType = (_b = (_a = getTypeOfIterator(typeResult, /* isAsync */ false, arg.d.valueExpr)) === null || _a === void 0 ? void 0 : _a.type) !== null && _b !== void 0 ? _b : types_1.UnknownType.create();
                 tupleTypeArgs.push({ type: iterableType, isUnbounded: true });
             });
-            positionalIndexType = makeTupleObject(tupleTypeArgs);
+            positionalIndexType = (0, tuples_1.makeTupleObject)(evaluatorInterface, tupleTypeArgs);
         }
         const argList = [
             {
@@ -5578,38 +5585,73 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             });
             // Set the node's type so it isn't reevaluated later.
             setTypeResultForNode(node.d.items[0].d.valueExpr, { type: types_1.UnknownType.create() });
-        }
-        else {
-            node.d.items.forEach((arg, index) => {
-                const typeResult = getTypeArgTypeResult(arg.d.valueExpr, index);
-                if (arg.d.argCategory !== 0 /* ArgCategory.Simple */) {
-                    if (arg.d.argCategory === 1 /* ArgCategory.UnpackedList */) {
-                        if (!(options === null || options === void 0 ? void 0 : options.isAnnotatedClass) || index === 0) {
-                            if ((0, types_1.isTypeVarTuple)(typeResult.type) && !typeResult.type.priv.isUnpacked) {
-                                typeResult.type = types_1.TypeVarType.cloneForUnpacked(typeResult.type);
-                            }
-                            else if ((0, types_1.isInstantiableClass)(typeResult.type) &&
-                                !typeResult.type.priv.includeSubclasses &&
-                                (0, typeUtils_1.isTupleClass)(typeResult.type)) {
-                                typeResult.type = types_1.ClassType.cloneForUnpacked(typeResult.type);
+            return typeArgs;
+        }
+        node.d.items.forEach((arg, index) => {
+            const typeResult = getTypeArgTypeResult(arg.d.valueExpr, index);
+            if (arg.d.argCategory !== 0 /* ArgCategory.Simple */) {
+                if (arg.d.argCategory === 1 /* ArgCategory.UnpackedList */) {
+                    if (!(options === null || options === void 0 ? void 0 : options.isAnnotatedClass) || index === 0) {
+                        const unpackedType = applyUnpackToTupleLike(typeResult.type);
+                        if (unpackedType) {
+                            typeResult.type = unpackedType;
+                        }
+                        else {
+                            if ((flags & 256 /* EvalFlags.TypeExpression */) !== 0) {
+                                addDiagnostic(diagnosticRules_1.DiagnosticRule.reportInvalidTypeForm, localize_1.LocMessage.unpackNotAllowed(), arg.d.valueExpr);
+                                typeResult.typeErrors = true;
                             }
                             else {
-                                addDiagnostic(diagnosticRules_1.DiagnosticRule.reportInvalidTypeForm, localize_1.LocMessage.unpackNotAllowed(), arg.d.valueExpr);
+                                typeResult.type = types_1.UnknownType.create();
                             }
                         }
                     }
                 }
-                if (arg.d.name) {
+            }
+            if (arg.d.name) {
+                if ((flags & 256 /* EvalFlags.TypeExpression */) !== 0) {
                     addDiagnostic(diagnosticRules_1.DiagnosticRule.reportInvalidTypeForm, localize_1.LocMessage.keywordArgInTypeArgument(), arg.d.valueExpr);
+                    typeResult.typeErrors = true;
                 }
-                if (arg.d.valueExpr.nodeType !== 0 /* ParseNodeType.Error */ ||
-                    arg.d.valueExpr.d.category !== 3 /* ErrorExpressionCategory.MissingIndexOrSlice */) {
-                    typeArgs.push(typeResult);
+                else {
+                    typeResult.type = types_1.UnknownType.create();
                 }
-            });
-        }
+            }
+            if (arg.d.valueExpr.nodeType !== 0 /* ParseNodeType.Error */ ||
+                arg.d.valueExpr.d.category !== 3 /* ErrorExpressionCategory.MissingIndexOrSlice */) {
+                typeArgs.push(typeResult);
+            }
+        });
         return typeArgs;
     }
+    function applyUnpackToTupleLike(type) {
+        if ((0, types_1.isTypeVarTuple)(type)) {
+            if (!type.priv.isUnpacked) {
+                return types_1.TypeVarType.cloneForUnpacked(type);
+            }
+            return undefined;
+        }
+        if ((0, types_1.isParamSpec)(type)) {
+            return undefined;
+        }
+        // Is this a TypeVar that has a tuple upper bound?
+        if ((0, types_1.isTypeVar)(type)) {
+            const upperBound = type.shared.boundType;
+            if (upperBound && (0, types_1.isClassInstance)(upperBound) && (0, typeUtils_1.isTupleClass)(upperBound)) {
+                const concrete = makeTopLevelTypeVarsConcrete(type);
+                if ((0, types_1.isInstantiableClass)(concrete)) {
+                    return types_1.ClassType.cloneForUnpacked(concrete);
+                }
+            }
+            return undefined;
+        }
+        if ((0, types_1.isInstantiableClass)(type) && !type.priv.includeSubclasses) {
+            if ((0, typeUtils_1.isTupleClass)(type)) {
+                return types_1.ClassType.cloneForUnpacked(type);
+            }
+        }
+        return undefined;
+    }
     function getTypeArg(node, flags) {
         let typeResult;
         let adjustedFlags = flags | 128 /* EvalFlags.InstantiableType */ | 1 /* EvalFlags.ConvertEllipsisToAny */ | 8 /* EvalFlags.StrLiteralAsType */;
@@ -5642,138 +5684,6 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         }
         return typeResult;
     }
-    function getTypeOfTuple(node, flags, inferenceContext) {
-        var _a;
-        if ((flags & 256 /* EvalFlags.TypeExpression */) !== 0 && ((_a = node.parent) === null || _a === void 0 ? void 0 : _a.nodeType) !== 1 /* ParseNodeType.Argument */) {
-            // This is allowed inside of an index trailer, specifically
-            // to support Tuple[()], which is the documented way to annotate
-            // a zero-length tuple.
-            const diag = new diagnostic_1.DiagnosticAddendum();
-            diag.addMessage(localize_1.LocAddendum.useTupleInstead());
-            addDiagnostic(diagnosticRules_1.DiagnosticRule.reportInvalidTypeForm, localize_1.LocMessage.tupleInAnnotation() + diag.getString(), node);
-            return { type: types_1.UnknownType.create() };
-        }
-        if ((flags & 128 /* EvalFlags.InstantiableType */) !== 0 && node.d.items.length === 0 && !inferenceContext) {
-            return { type: makeTupleObject([]), isEmptyTupleShorthand: true };
-        }
-        flags &= ~(256 /* EvalFlags.TypeExpression */ | 8 /* EvalFlags.StrLiteralAsType */ | 128 /* EvalFlags.InstantiableType */);
-        // If the expected type is a union, recursively call for each of the subtypes
-        // to find one that matches.
-        let expectedType = inferenceContext === null || inferenceContext === void 0 ? void 0 : inferenceContext.expectedType;
-        let expectedTypeContainsAny = inferenceContext && (0, types_1.isAny)(inferenceContext.expectedType);
-        if (inferenceContext && (0, types_1.isUnion)(inferenceContext.expectedType)) {
-            let matchingSubtype;
-            (0, typeUtils_1.doForEachSubtype)(inferenceContext.expectedType, (subtype) => {
-                if ((0, types_1.isAny)(subtype)) {
-                    expectedTypeContainsAny = true;
-                }
-                if (!matchingSubtype) {
-                    const subtypeResult = useSpeculativeMode(node, () => {
-                        return getTypeOfTupleWithContext(node, flags, (0, typeUtils_1.makeInferenceContext)(subtype));
-                    });
-                    if (subtypeResult && assignType(subtype, subtypeResult.type)) {
-                        matchingSubtype = subtype;
-                    }
-                }
-            }, 
-            /* sortSubtypes */ true);
-            expectedType = matchingSubtype;
-        }
-        let expectedTypeDiagAddendum;
-        if (expectedType) {
-            const result = getTypeOfTupleWithContext(node, flags, (0, typeUtils_1.makeInferenceContext)(expectedType));
-            if (result && !result.typeErrors) {
-                return result;
-            }
-            expectedTypeDiagAddendum = result === null || result === void 0 ? void 0 : result.expectedTypeDiagAddendum;
-        }
-        const typeResult = getTypeOfTupleInferred(node, flags);
-        // If there was an expected type of Any, replace the resulting type
-        // with Any rather than return a type with unknowns.
-        if (expectedTypeContainsAny) {
-            typeResult.type = types_1.AnyType.create();
-        }
-        return { ...typeResult, expectedTypeDiagAddendum };
-    }
-    function getTypeOfTupleWithContext(node, flags, inferenceContext) {
-        inferenceContext.expectedType = (0, typeUtils_1.transformPossibleRecursiveTypeAlias)(inferenceContext.expectedType);
-        if (!(0, types_1.isClassInstance)(inferenceContext.expectedType)) {
-            return undefined;
-        }
-        if (!tupleClass || !(0, types_1.isInstantiableClass)(tupleClass)) {
-            return undefined;
-        }
-        // Build an array of expected types.
-        let expectedTypes = [];
-        if ((0, typeUtils_1.isTupleClass)(inferenceContext.expectedType) && inferenceContext.expectedType.priv.tupleTypeArgs) {
-            expectedTypes = inferenceContext.expectedType.priv.tupleTypeArgs.map((t) => (0, typeUtils_1.transformPossibleRecursiveTypeAlias)(t.type));
-            const unboundedIndex = inferenceContext.expectedType.priv.tupleTypeArgs.findIndex((t) => t.isUnbounded);
-            if (unboundedIndex >= 0) {
-                if (expectedTypes.length > node.d.items.length) {
-                    expectedTypes.splice(unboundedIndex, 1);
-                }
-                else {
-                    while (expectedTypes.length < node.d.items.length) {
-                        expectedTypes.splice(unboundedIndex, 0, expectedTypes[unboundedIndex]);
-                    }
-                }
-            }
-        }
-        else {
-            const tupleConstraints = new constraintTracker_1.ConstraintTracker();
-            if (!(0, constraintSolver_1.addConstraintsForExpectedType)(evaluatorInterface, types_1.ClassType.cloneAsInstance(tupleClass), inferenceContext.expectedType, tupleConstraints, ParseTreeUtils.getTypeVarScopesForNode(node), node.start)) {
-                return undefined;
-            }
-            const specializedTuple = solveAndApplyConstraints(tupleClass, tupleConstraints);
-            if (!specializedTuple.priv.typeArgs || specializedTuple.priv.typeArgs.length !== 1) {
-                return undefined;
-            }
-            const homogenousType = (0, typeUtils_1.transformPossibleRecursiveTypeAlias)(specializedTuple.priv.typeArgs[0]);
-            for (let i = 0; i < node.d.items.length; i++) {
-                expectedTypes.push(homogenousType);
-            }
-        }
-        const entryTypeResults = node.d.items.map((expr, index) => getTypeOfExpression(expr, flags | 268435456 /* EvalFlags.StripTupleLiterals */, (0, typeUtils_1.makeInferenceContext)(index < expectedTypes.length ? expectedTypes[index] : undefined, inferenceContext.isTypeIncomplete)));
-        const isIncomplete = entryTypeResults.some((result) => result.isIncomplete);
-        // Copy any expected type diag addenda for precision error reporting.
-        let expectedTypeDiagAddendum;
-        if (entryTypeResults.some((result) => result.expectedTypeDiagAddendum)) {
-            expectedTypeDiagAddendum = new diagnostic_1.DiagnosticAddendum();
-            entryTypeResults.forEach((result) => {
-                if (result.expectedTypeDiagAddendum) {
-                    expectedTypeDiagAddendum.addAddendum(result.expectedTypeDiagAddendum);
-                }
-            });
-        }
-        // If the tuple contains a very large number of entries, it's probably
-        // generated code. If we encounter type errors, don't bother building
-        // the full tuple type.
-        let type;
-        if (node.d.items.length > maxInferredTupleEntryCount && entryTypeResults.some((result) => result.typeErrors)) {
-            type = makeTupleObject([{ type: types_1.UnknownType.create(), isUnbounded: true }]);
-        }
-        else {
-            type = makeTupleObject(buildTupleTypesList(entryTypeResults, /* stripLiterals */ false));
-        }
-        return { type, expectedTypeDiagAddendum, isIncomplete };
-    }
-    function getTypeOfTupleInferred(node, flags) {
-        const entryTypeResults = node.d.items.map((expr) => getTypeOfExpression(expr, flags | 268435456 /* EvalFlags.StripTupleLiterals */));
-        const isIncomplete = entryTypeResults.some((result) => result.isIncomplete);
-        // If the tuple contains a very large number of entries, it's probably
-        // generated code. Rather than taking the time to evaluate every entry,
-        // simply return an unknown type in this case.
-        if (node.d.items.length > maxInferredTupleEntryCount) {
-            return { type: makeTupleObject([{ type: types_1.UnknownType.create(), isUnbounded: true }]) };
-        }
-        const type = makeTupleObject(buildTupleTypesList(entryTypeResults, (flags & 268435456 /* EvalFlags.StripTupleLiterals */) !== 0));
-        if (isIncomplete) {
-            if ((0, typeUtils_1.getContainerDepth)(type) > maxInferredContainerDepth) {
-                return { type: types_1.UnknownType.create() };
-            }
-        }
-        return { type, isIncomplete };
-    }
     function buildTupleTypesList(entryTypeResults, stripLiterals) {
         const entryTypes = [];
         for (const typeResult of entryTypeResults) {
@@ -5984,7 +5894,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             addDiagnostic(diagnosticRules_1.DiagnosticRule.reportCallIssue, localize_1.LocMessage.typeFormArgs(), node);
             return { type: types_1.UnknownType.create() };
         }
-        const typeFormResult = getTypeOfArgExpectingType((0, typeUtils_1.convertNodeToArg)(node.d.args[0]), {
+        const typeFormResult = getTypeOfArgExpectingType(convertNodeToArg(node.d.args[0]), {
             typeFormArg: isTypeFormSupported(node),
             noNonTypeSpecialForms: true,
             typeExpression: true,
@@ -6007,7 +5917,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         if (arg0TypeResult.isIncomplete) {
             return { type: types_1.UnknownType.create(/* isIncomplete */ true), isIncomplete: true };
         }
-        const assertedType = (0, typeUtils_1.convertToInstance)(getTypeOfArgExpectingType((0, typeUtils_1.convertNodeToArg)(node.d.args[1]), {
+        const assertedType = (0, typeUtils_1.convertToInstance)(getTypeOfArgExpectingType(convertNodeToArg(node.d.args[1]), {
             typeExpression: true,
         }).type);
         // We'll replace TypeGuard and TypeIs with bool for purposes of assert_type testing.
@@ -6026,6 +5936,13 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         }
         return { type: arg0TypeResult.type };
     }
+    function convertNodeToArg(node) {
+        return {
+            argCategory: node.d.argCategory,
+            name: node.d.name,
+            valueExpression: node.d.valueExpr,
+        };
+    }
     function getTypeOfRevealType(node, inferenceContext) {
         let arg0Value;
         let expectedRevealTypeNode;
@@ -6056,7 +5973,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             }
             else if (arg.d.name.d.value === 'expected_type') {
                 expectedRevealTypeNode = arg.d.valueExpr;
-                expectedRevealType = (0, typeUtils_1.convertToInstance)(getTypeOfArgExpectingType((0, typeUtils_1.convertNodeToArg)(arg), {
+                expectedRevealType = (0, typeUtils_1.convertToInstance)(getTypeOfArgExpectingType(convertNodeToArg(arg), {
                     typeExpression: true,
                 }).type);
             }
@@ -7336,7 +7253,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                                     argCategory: 1 /* ArgCategory.UnpackedList */,
                                     valueExpression: undefined,
                                     typeResult: {
-                                        type: makeTupleObject([tupleTypeArg]),
+                                        type: (0, tuples_1.makeTupleObject)(evaluatorInterface, [tupleTypeArg]),
                                     },
                                 });
                             }
@@ -7380,11 +7297,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 +7612,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 +7703,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 +7742,6 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                                 paramMap.set(name, {
                                     argsNeeded: 1,
                                     argsReceived: 1,
-                                    isPositionalOnly: false,
                                 });
                             }
                             else {
@@ -7944,7 +7860,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 +7869,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 +7908,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 +8021,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) &&
@@ -8177,7 +8093,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                         specializedTuple = tupleTypeArgs[0].type;
                     }
                     else {
-                        specializedTuple = makeTupleObject(tupleTypeArgs, /* isUnpacked */ true);
+                        specializedTuple = (0, tuples_1.makeTupleObject)(evaluatorInterface, tupleTypeArgs, /* isUnpacked */ true);
                     }
                     const combinedArg = {
                         paramCategory: 1 /* ParamCategory.ArgsList */,
@@ -9086,7 +9002,9 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             addDiagnostic(diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.LocMessage.typeVarFirstArg(), firstArg.valueExpression || errorNode);
         }
         const typeVar = types_1.TypeBase.cloneAsSpecialForm(types_1.TypeVarType.createInstantiable(typeVarName, types_1.TypeVarKind.TypeVarTuple), types_1.ClassType.cloneAsInstance(classType));
-        typeVar.shared.defaultType = makeTupleObject([{ type: types_1.UnknownType.create(), isUnbounded: true }]);
+        typeVar.shared.defaultType = (0, tuples_1.makeTupleObject)(evaluatorInterface, [
+            { type: types_1.UnknownType.create(), isUnbounded: true },
+        ]);
         // Parse the remaining parameters.
         for (let i = 1; i < argList.length; i++) {
             const paramNameNode = argList[i].name;
@@ -9208,6 +9126,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             const typeResult = getTypeOfExpressionExpectingType(node, {
                 allowParamSpec: true,
                 allowTypeVarsWithoutScopeId: true,
+                allowEllipsis: true,
                 typeExpression: true,
             });
             if (typeResult.typeErrors) {
@@ -9738,7 +9657,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             /* tupleTypeArgs */ undefined, isEmptyContainer))
             : types_1.UnknownType.create();
         if (isIncomplete) {
-            if ((0, typeUtils_1.getContainerDepth)(type) > maxInferredContainerDepth) {
+            if ((0, typeUtils_1.getContainerDepth)(type) > typeEvaluatorTypes_1.maxInferredContainerDepth) {
                 return { type: types_1.UnknownType.create() };
             }
         }
@@ -10105,7 +10024,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             /* tupleTypeArgs */ undefined, isEmptyContainer))
             : types_1.UnknownType.create();
         if (isIncomplete) {
-            if ((0, typeUtils_1.getContainerDepth)(type) > maxInferredContainerDepth) {
+            if ((0, typeUtils_1.getContainerDepth)(type) > typeEvaluatorTypes_1.maxInferredContainerDepth) {
                 return { type: types_1.UnknownType.create() };
             }
         }
@@ -10505,7 +10424,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             if (!expectedValueOrElementType || !(0, typeUtils_1.containsLiteralType)(expectedValueOrElementType)) {
                 valueType = stripLiteralValue(valueType);
             }
-            type = makeTupleObject([
+            type = (0, tuples_1.makeTupleObject)(evaluatorInterface, [
                 { type: keyType, isUnbounded: false },
                 { type: valueType, isUnbounded: false },
             ]);
@@ -11073,16 +10992,11 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             }
             return classType;
         }
-        let typeArgType = typeArgs[0].type;
-        if ((0, types_1.isUnion)(typeArgType) && typeArgType.priv.subtypes.length === 1) {
-            typeArgType = typeArgType.priv.subtypes[0];
-        }
+        const typeArgType = typeArgs[0].type;
         if ((flags & 2097152 /* EvalFlags.AllowUnpackedTuple */) !== 0) {
-            if ((0, types_1.isInstantiableClass)(typeArgType) && !typeArgType.priv.includeSubclasses && (0, typeUtils_1.isTupleClass)(typeArgType)) {
-                return types_1.ClassType.cloneForUnpacked(typeArgType);
-            }
-            if ((0, types_1.isTypeVarTuple)(typeArgType) && !typeArgType.priv.isUnpacked) {
-                return types_1.TypeVarType.cloneForUnpacked(typeArgType);
+            const unpackedType = applyUnpackToTupleLike(typeArgType);
+            if (unpackedType) {
+                return unpackedType;
             }
             if ((flags & 256 /* EvalFlags.TypeExpression */) === 0) {
                 return classType;
@@ -11196,44 +11110,9 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
     }
     // Determines whether the metadata object is compatible with the base type.
     function validateTypeMetadata(errorNode, baseType, metaArg) {
-        var _a;
-        // This is an experimental feature because PEP 746 hasn't been accepted.
-        if (!AnalyzerNodeInfo.getFileInfo(errorNode).diagnosticRuleSet.enableExperimentalFeatures) {
-            return true;
-        }
-        if (!(0, types_1.isClass)(metaArg.type)) {
-            return true;
-        }
-        const supportsTypeMethod = (_a = getTypeOfBoundMember(
-        /* errorNode */ undefined, metaArg.type, '__supports_type__')) === null || _a === void 0 ? void 0 : _a.type;
-        if (!supportsTypeMethod) {
-            return true;
-        }
-        // "Call" the __supports_type__ method to determine if the type is supported.
-        const callResult = useSpeculativeMode(errorNode, () => validateCallArgs(errorNode, [
-            {
-                argCategory: 0 /* ArgCategory.Simple */,
-                typeResult: { type: (0, typeUtils_1.convertToInstance)(baseType) },
-            },
-        ], { type: supportsTypeMethod }, 
-        /* constraints */ undefined, 
-        /* skipUnknownArgCheck */ true, 
-        /* inferenceContext */ undefined));
-        if (!callResult.returnType) {
-            return true;
-        }
-        // If there are no errors and the return type is potentially truthy,
-        // we know that the type is supported by this metadata object.
-        if (!callResult.argumentErrors && canBeTruthy(callResult.returnType)) {
-            return true;
-        }
-        if (!callResult.isTypeIncomplete) {
-            addDiagnostic(diagnosticRules_1.DiagnosticRule.reportInvalidTypeArguments, localize_1.LocMessage.annotatedMetadataInconsistent().format({
-                metadataType: printType(metaArg.type),
-                type: printType((0, typeUtils_1.convertToInstance)(baseType)),
-            }), metaArg.node);
-        }
-        return false;
+        // This function was added for draft PEP 746, but the functionality
+        // has been removed for now while the PEP is being revised.
+        return true;
     }
     // Creates one of several "special" types that are defined in typing.pyi
     // but not declared in their entirety. This includes the likes of "Tuple",
@@ -11395,7 +11274,9 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         // is allowed if it's an unpacked TypeVarTuple or tuple. None is also allowed
         // since it is used to define NoReturn in typeshed stubs).
         if (types.length === 1 && !allowSingleTypeArg && !(0, typeUtils_1.isNoneInstance)(types[0])) {
-            addDiagnostic(diagnosticRules_1.DiagnosticRule.reportInvalidTypeArguments, localize_1.LocMessage.unionTypeArgCount(), errorNode);
+            if ((flags & 256 /* EvalFlags.TypeExpression */) !== 0) {
+                addDiagnostic(diagnosticRules_1.DiagnosticRule.reportInvalidTypeArguments, localize_1.LocMessage.unionTypeArgCount(), errorNode);
+            }
             isValidTypeForm = false;
         }
         let unionType = (0, types_1.combineTypes)(types, { skipElideRedundantLiterals: true });
@@ -11446,16 +11327,16 @@ 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;
-        }
         // If this is a recursive type alias that hasn't yet been fully resolved
         // (i.e. there is no boundType associated with it), don't apply the transform.
         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 +11361,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 +11372,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 +11381,26 @@ 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);
+        if (!types_1.TypeBase.isInstantiable(type)) {
+            return type;
+        }
+        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 +11531,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 +11679,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 +11700,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 +11713,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 +11734,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 +11774,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 +11797,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 +12695,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);
                         }
                     }
@@ -13437,7 +13330,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 if ((0, types_1.isUnpackedClass)(type)) {
                     return types_1.ClassType.cloneForUnpacked(type, /* isUnpacked */ false);
                 }
-                return makeTupleObject([{ type, isUnbounded: !(0, types_1.isTypeVarTuple)(type) }]);
+                return (0, tuples_1.makeTupleObject)(evaluatorInterface, [{ type, isUnbounded: !(0, types_1.isTypeVarTuple)(type) }]);
             }
             case 2 /* ParamCategory.KwargsDict */: {
                 // Leave a ParamSpec alone.
@@ -13467,7 +13360,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             awaitableFunctionType.shared.declaredReturnType = createAwaitableReturnType(node, functionType.shared.declaredReturnType, types_1.FunctionType.isGenerator(functionType));
         }
         else {
-            awaitableFunctionType.priv.inferredReturnType = createAwaitableReturnType(node, getFunctionInferredReturnType(functionType), types_1.FunctionType.isGenerator(functionType));
+            awaitableFunctionType.priv.inferredReturnType = createAwaitableReturnType(node, getInferredReturnType(functionType), types_1.FunctionType.isGenerator(functionType));
         }
         return awaitableFunctionType;
     }
@@ -14857,39 +14750,9 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         // Handle ParamSpec arguments and fill in any missing type arguments with Unknown.
         let typeArgTypes = [];
         const fullTypeParams = types_1.ClassType.getTypeParams(classType);
-        // PEP 612 says that if the class has only one type parameter consisting
-        // of a ParamSpec, the list of arguments does not need to be enclosed in
-        // a list. We'll handle that case specially here.
-        if (fullTypeParams.length === 1 && (0, types_1.isParamSpec)(fullTypeParams[0]) && typeArgs) {
-            if (typeArgs.every((typeArg) => !(0, typeUtils_1.isEllipsisType)(typeArg.type) && !typeArg.typeList && !(0, types_1.isParamSpec)(typeArg.type))) {
-                if (typeArgs.length !== 1 ||
-                    !(0, types_1.isInstantiableClass)(typeArgs[0].type) ||
-                    !types_1.ClassType.isBuiltIn(typeArgs[0].type, 'Concatenate')) {
-                    // Package up the type arguments into a typeList.
-                    typeArgs =
-                        typeArgs.length > 0
-                            ? [
-                                {
-                                    type: types_1.UnknownType.create(),
-                                    node: typeArgs[0].node,
-                                    typeList: typeArgs,
-                                },
-                            ]
-                            : [];
-                }
-            }
-            else if (typeArgs.length > 1) {
-                const paramSpecTypeArg = typeArgs.find((typeArg) => (0, types_1.isParamSpec)(typeArg.type));
-                if (paramSpecTypeArg) {
-                    isValidTypeForm = false;
-                    addDiagnostic(diagnosticRules_1.DiagnosticRule.reportInvalidTypeForm, localize_1.LocMessage.paramSpecContext(), paramSpecTypeArg.node);
-                }
-                const listTypeArg = typeArgs.find((typeArg) => !!typeArg.typeList);
-                if (listTypeArg) {
-                    isValidTypeForm = false;
-                    addDiagnostic(diagnosticRules_1.DiagnosticRule.reportInvalidTypeForm, localize_1.LocMessage.typeArgListNotAllowed(), listTypeArg.node);
-                }
-            }
+        typeArgs = transformTypeArgsForParamSpec(fullTypeParams, typeArgs, errorNode);
+        if (!typeArgs) {
+            isValidTypeForm = false;
         }
         const constraints = new constraintTracker_1.ConstraintTracker();
         fullTypeParams.forEach((typeParam, index) => {
@@ -14996,6 +14859,57 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         }
         return { type: specializedClass };
     }
+    // PEP 612 says that if the class has only one type parameter consisting
+    // of a ParamSpec, the list of arguments does not need to be enclosed in
+    // a list. We'll handle that case specially here.
+    function transformTypeArgsForParamSpec(typeParams, typeArgs, errorNode) {
+        if (typeParams.length !== 1 || !(0, types_1.isParamSpec)(typeParams[0]) || !typeArgs) {
+            return typeArgs;
+        }
+        if (typeArgs.length > 1) {
+            for (const typeArg of typeArgs) {
+                if ((0, types_1.isParamSpec)(typeArg.type)) {
+                    addDiagnostic(diagnosticRules_1.DiagnosticRule.reportInvalidTypeForm, localize_1.LocMessage.paramSpecContext(), typeArg.node);
+                    return undefined;
+                }
+                if ((0, typeUtils_1.isEllipsisType)(typeArg.type)) {
+                    addDiagnostic(diagnosticRules_1.DiagnosticRule.reportInvalidTypeForm, localize_1.LocMessage.ellipsisContext(), typeArg.node);
+                    return undefined;
+                }
+                if ((0, types_1.isInstantiableClass)(typeArg.type) && types_1.ClassType.isBuiltIn(typeArg.type, 'Concatenate')) {
+                    addDiagnostic(diagnosticRules_1.DiagnosticRule.reportInvalidTypeForm, localize_1.LocMessage.concatenateContext(), typeArg.node);
+                    return undefined;
+                }
+                if (typeArg.typeList) {
+                    addDiagnostic(diagnosticRules_1.DiagnosticRule.reportInvalidTypeForm, localize_1.LocMessage.typeArgListNotAllowed(), typeArg.node);
+                    return undefined;
+                }
+            }
+        }
+        if (typeArgs.length === 1) {
+            // Don't transform a type list.
+            if (typeArgs[0].typeList) {
+                return typeArgs;
+            }
+            const typeArgType = typeArgs[0].type;
+            // Don't transform a single ParamSpec or ellipsis.
+            if ((0, types_1.isParamSpec)(typeArgType) || (0, typeUtils_1.isEllipsisType)(typeArgType)) {
+                return typeArgs;
+            }
+            // Don't transform a Concatenate.
+            if ((0, types_1.isInstantiableClass)(typeArgType) && types_1.ClassType.isBuiltIn(typeArgType, 'Concatenate')) {
+                return typeArgs;
+            }
+        }
+        // Package up the type arguments into a type list.
+        return [
+            {
+                type: types_1.UnknownType.create(),
+                node: typeArgs.length > 0 ? typeArgs[0].node : errorNode,
+                typeList: typeArgs,
+            },
+        ];
+    }
     function getTypeOfArg(arg, inferenceContext) {
         var _a, _b;
         if (arg.typeResult) {
@@ -15065,6 +14979,9 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         if (options === null || options === void 0 ? void 0 : options.convertEllipsisToAny) {
             flags |= 1 /* EvalFlags.ConvertEllipsisToAny */;
         }
+        if (options === null || options === void 0 ? void 0 : options.allowEllipsis) {
+            flags |= 65536 /* EvalFlags.AllowEllipsis */;
+        }
         if (options === null || options === void 0 ? void 0 : options.noNonTypeSpecialForms) {
             flags |= 67108864 /* EvalFlags.NoNonTypeSpecialForms */;
         }
@@ -15757,7 +15674,9 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 typeVar.shared.isDefaultExplicit = true;
             }
             else {
-                typeVar.shared.defaultType = makeTupleObject([{ type: types_1.UnknownType.create(), isUnbounded: true }]);
+                typeVar.shared.defaultType = (0, tuples_1.makeTupleObject)(evaluatorInterface, [
+                    { type: types_1.UnknownType.create(), isUnbounded: true },
+                ]);
             }
         }
         else {
@@ -15787,7 +15706,8 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             if (scopeNode.nodeType === 10 /* ParseNodeType.Class */) {
                 scopeType = 0 /* TypeVarScopeType.Class */;
                 // Set the variance to "auto" for class-scoped TypeVars.
-                typeVar.shared.declaredVariance = 0 /* Variance.Auto */;
+                typeVar.shared.declaredVariance =
+                    (0, types_1.isParamSpec)(typeVar) || (0, types_1.isTypeVarTuple)(typeVar) ? 2 /* Variance.Invariant */ : 0 /* Variance.Auto */;
             }
             else if (scopeNode.nodeType === 31 /* ParseNodeType.Function */) {
                 scopeType = 1 /* TypeVarScopeType.Function */;
@@ -15795,6 +15715,8 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             else {
                 (0, debug_1.assert)(scopeNode.nodeType === 77 /* ParseNodeType.TypeAlias */);
                 scopeType = 2 /* TypeVarScopeType.TypeAlias */;
+                typeVar.shared.declaredVariance =
+                    (0, types_1.isParamSpec)(typeVar) || (0, types_1.isTypeVarTuple)(typeVar) ? 2 /* Variance.Invariant */ : 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 +15853,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;
                 }
@@ -16398,7 +16321,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             return specializedReturnType;
         }
         if (!(options === null || options === void 0 ? void 0 : options.skipInferReturnType)) {
-            return getFunctionInferredReturnType(type, options === null || options === void 0 ? void 0 : options.callSiteInfo);
+            return getInferredReturnType(type, options === null || options === void 0 ? void 0 : options.callSiteInfo);
         }
         return types_1.UnknownType.create();
     }
@@ -17015,7 +16938,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 const typeParam = destType.shared.typeParams[i];
                 const variance = types_1.TypeVarType.getVariance(typeParam);
                 if (curSrcType.priv.tupleTypeArgs) {
-                    typeArgType = (0, typeUtils_1.convertToInstance)(makeTupleObject(curSrcType.priv.tupleTypeArgs, /* isUnpacked */ true));
+                    typeArgType = (0, typeUtils_1.convertToInstance)((0, tuples_1.makeTupleObject)(evaluatorInterface, curSrcType.priv.tupleTypeArgs, /* isUnpacked */ true));
                 }
                 else {
                     typeArgType = i < srcTypeArgs.length ? srcTypeArgs[i] : types_1.UnknownType.create();
@@ -17179,16 +17102,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 +17619,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.
@@ -18315,7 +18255,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             }
         });
         if (srcTupleTypes.length !== 1 || !(0, types_1.isTypeVarTuple)(srcTupleTypes[0].type)) {
-            const srcPositionalsType = makeTupleObject(srcTupleTypes, /* isUnpacked */ true);
+            const srcPositionalsType = (0, tuples_1.makeTupleObject)(evaluatorInterface, srcTupleTypes, /* isUnpacked */ true);
             // Snip out the portion of the source positionals that map to the variadic
             // dest parameter and replace it with a single parameter that is typed as a
             // tuple containing the individual types of the replaced parameters.
@@ -18571,10 +18511,12 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             let destArgsType = destParamDetails.params[destParamDetails.argsIndex].type;
             let srcArgsType = srcParamDetails.params[srcParamDetails.argsIndex].type;
             if (!(0, types_1.isUnpacked)(destArgsType)) {
-                destArgsType = makeTupleObject([{ type: destArgsType, isUnbounded: true }], /* isUnpacked */ true);
+                destArgsType = (0, tuples_1.makeTupleObject)(evaluatorInterface, [{ type: destArgsType, isUnbounded: true }], 
+                /* isUnpacked */ true);
             }
             if (!(0, types_1.isUnpacked)(srcArgsType)) {
-                srcArgsType = makeTupleObject([{ type: srcArgsType, isUnbounded: true }], /* isUnpacked */ true);
+                srcArgsType = (0, tuples_1.makeTupleObject)(evaluatorInterface, [{ type: srcArgsType, isUnbounded: true }], 
+                /* isUnpacked */ true);
             }
             if (!assignParam(destArgsType, srcArgsType, destParamDetails.params[destParamDetails.argsIndex].index, diag === null || diag === void 0 ? void 0 : diag.createAddendum(), constraints, flags, recursionCount)) {
                 canAssign = false;
@@ -18599,7 +18541,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);
                         }
                     }
@@ -18926,7 +18870,9 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                         }
                         return assignedSubtype;
                     }
-                    if (!(0, types_1.isTypeVar)(declaredSubtype) && (0, types_1.isTypeVar)(assignedSubtype)) {
+                    if (!(0, types_1.isTypeVar)(declaredSubtype) &&
+                        (0, types_1.isTypeVar)(assignedSubtype) &&
+                        !types_1.TypeVarType.isBound(assignedSubtype)) {
                         // If the source is an unsolved TypeVar but the declared type is concrete,
                         // use the concrete type.
                         return declaredSubtype;
@@ -19821,7 +19767,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         return codeFlowEngine.printControlFlowGraph(flowNode, reference, callName, logger);
     }
     // Track these apis internal usages when logging is on. otherwise, it should be noop.
-    const getFunctionInferredReturnType = wrapWithLogger(_getInferredReturnType);
+    const getInferredReturnType = wrapWithLogger(_getInferredReturnType);
     const evaluatorInterface = {
         runWithCancellationToken,
         getType,
@@ -19839,7 +19785,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         evaluateTypesForStatement,
         evaluateTypesForMatchStatement,
         evaluateTypesForCaseStatement,
-        evaluateTypeOfParam: evaluateTypeOfParam,
+        evaluateTypeOfParam,
         canBeTruthy,
         canBeFalsy,
         stripLiteralValue,
@@ -19866,7 +19812,9 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         getTypeOfIterable,
         getTypeOfIterator,
         getGetterTypeFromProperty,
-        getTypeOfArg: getTypeOfArg,
+        getTypeOfArg,
+        convertNodeToArg,
+        buildTupleTypesList,
         markNamesAccessed,
         expandPromotionTypes,
         makeTopLevelTypeVarsConcrete,
@@ -19878,8 +19826,8 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         getEffectiveTypeOfSymbolForUsage,
         getInferredTypeOfDeclaration,
         getDeclaredTypeForExpression,
-        getFunctionDeclaredReturnType: getDeclaredReturnType,
-        getFunctionInferredReturnType,
+        getDeclaredReturnType,
+        getInferredReturnType,
         getBestOverloadForArgs,
         getBuiltInType,
         getTypeOfMember,