@zzzen/pyright-internal 1.2.0-dev.20240908 → 1.2.0-dev.20240915

package/dist/analyzer/typeEvaluator.js

@@ -567,6 +567,10 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 };
             }
         }
+        if (inferenceContext) {
+            // Handle TypeForm assignments.
+            typeResult.type = convertToTypeFormType(inferenceContext.expectedType, typeResult.type);
+        }
         // Don't allow speculative caching for assignment expressions because
         // the target name node won't have a corresponding type cached speculatively.
         const allowSpeculativeCaching = node.nodeType !== 4 /* ParseNodeType.AssignmentExpression */;
@@ -2026,6 +2030,12 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
     function getTupleClassType() {
         return tupleClass && (0, types_1.isInstantiableClass)(tupleClass) ? tupleClass : undefined;
     }
+    function getDictClassType() {
+        return dictClass && (0, types_1.isInstantiableClass)(dictClass) ? dictClass : undefined;
+    }
+    function getStrClassType() {
+        return strClass && (0, types_1.isInstantiableClass)(strClass) ? strClass : undefined;
+    }
     function getObjectType() {
         return objectClass ? (0, typeUtils_1.convertToInstance)(objectClass) : types_1.UnknownType.create();
     }
@@ -3185,7 +3195,11 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             }
         }
         if (((_b = type.props) === null || _b === void 0 ? void 0 : _b.typeAliasInfo) && types_1.TypeBase.isInstantiable(type)) {
-            type = types_1.TypeBase.cloneWithTypeForm(type, (0, typeUtils_1.convertToInstance)(specializeTypeAliasWithDefaults(type, /* errorNode */ undefined)));
+            let typeFormType = type;
+            if ((flags & 2 /* EvalFlags.NoSpecialize */) === 0) {
+                typeFormType = specializeTypeAliasWithDefaults(typeFormType, /* errorNode */ undefined);
+            }
+            type = types_1.TypeBase.cloneWithTypeForm(type, (0, typeUtils_1.convertToInstance)(typeFormType));
         }
         return type;
     }
@@ -3654,6 +3668,8 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             }
             // Detect, report, and fill in missing type arguments if appropriate.
             typeResult.type = reportMissingTypeArgs(node, typeResult.type, flags);
+            // Add TypeForm details if appropriate.
+            typeResult.type = addTypeFormForSymbol(node, typeResult.type, flags, /* includesVarDecl */ false);
         }
         if (baseTypeResult.isIncomplete) {
             typeResult.isIncomplete = true;
@@ -3681,7 +3697,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         return typeResult;
     }
     function getTypeOfMemberAccessWithBaseType(node, baseTypeResult, usage, flags) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         let baseType = (0, typeUtils_1.transformPossibleRecursiveTypeAlias)(baseTypeResult.type);
         const memberName = node.d.member.d.value;
         let diag = new diagnostic_1.DiagnosticAddendum();
@@ -3694,12 +3710,15 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         const isRequired = false;
         const isNotRequired = false;
         let memberAccessDeprecationInfo;
+        if ((_a = usage === null || usage === void 0 ? void 0 : usage.setType) === null || _a === void 0 ? void 0 : _a.isIncomplete) {
+            isIncomplete = true;
+        }
         // If the base type was incomplete and unbound, don't proceed
         // because false positive errors will be generated.
         if (baseTypeResult.isIncomplete && (0, types_1.isUnbound)(baseType)) {
             return { type: types_1.UnknownType.create(/* isIncomplete */ true), isIncomplete: true };
         }
-        if (((_a = baseType.props) === null || _a === void 0 ? void 0 : _a.specialForm) && (flags & 256 /* EvalFlags.TypeExpression */) === 0) {
+        if (((_b = baseType.props) === null || _b === void 0 ? void 0 : _b.specialForm) && (flags & 256 /* EvalFlags.TypeExpression */) === 0) {
             baseType = baseType.props.specialForm;
         }
         if ((0, types_1.isParamSpec)(baseType) && baseType.priv.paramSpecAccess) {
@@ -3777,7 +3796,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                             types_1.ClassType.isSameGenericClass(enumMemberResult.type, baseType) &&
                             enumMemberResult.type.priv.literalValue !== undefined) {
                             const diagMessage = usage.method === 'set' ? localize_1.LocMessage.enumMemberSet() : localize_1.LocMessage.enumMemberDelete();
-                            addDiagnostic(diagnosticRules_1.DiagnosticRule.reportAttributeAccessIssue, diagMessage.format({ name: memberName }) + diag.getString(), node.d.member, (_b = diag.getEffectiveTextRange()) !== null && _b !== void 0 ? _b : node.d.member);
+                            addDiagnostic(diagnosticRules_1.DiagnosticRule.reportAttributeAccessIssue, diagMessage.format({ name: memberName }) + diag.getString(), node.d.member, (_c = diag.getEffectiveTextRange()) !== null && _c !== void 0 ? _c : node.d.member);
                         }
                     }
                 }
@@ -3980,7 +3999,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 const rule = isFunctionRule
                     ? diagnosticRules_1.DiagnosticRule.reportFunctionMemberAccess
                     : diagnosticRules_1.DiagnosticRule.reportAttributeAccessIssue;
-                addDiagnostic(rule, diagMessage.format({ name: memberName, type: printType(baseType) }) + diag.getString(), node.d.member, (_c = diag.getEffectiveTextRange()) !== null && _c !== void 0 ? _c : node.d.member);
+                addDiagnostic(rule, diagMessage.format({ name: memberName, type: printType(baseType) }) + diag.getString(), node.d.member, (_d = diag.getEffectiveTextRange()) !== null && _d !== void 0 ? _d : node.d.member);
             }
             // If this is member access on a function, use "Any" so if the
             // reportFunctionMemberAccess rule is disabled, we don't trigger
@@ -4830,13 +4849,18 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
     // Handles index expressions that are providing type arguments for a
     // generic type alias.
     function createSpecializedTypeAlias(node, baseType, flags) {
-        var _a, _b, _c;
-        const aliasInfo = (_a = baseType.props) === null || _a === void 0 ? void 0 : _a.typeAliasInfo;
+        var _a, _b, _c, _d, _e, _f, _g;
+        let aliasInfo = (_a = baseType.props) === null || _a === void 0 ? void 0 : _a.typeAliasInfo;
+        let aliasBaseType = baseType;
+        if (!aliasInfo && ((_b = baseType.props) === null || _b === void 0 ? void 0 : _b.typeForm)) {
+            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)) {
             return undefined;
         }
         // If this is not instantiable, then the index expression isn't a specialization.
-        if (!types_1.TypeBase.isInstantiable(baseType)) {
+        if (!types_1.TypeBase.isInstantiable(aliasBaseType)) {
             return undefined;
         }
         // If this is already specialized, the index expression isn't a specialization.
@@ -4868,7 +4892,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         }
         if (typeArgs.length > typeParams.length) {
             addDiagnostic(diagnosticRules_1.DiagnosticRule.reportInvalidTypeForm, localize_1.LocMessage.typeArgsTooMany().format({
-                name: printType(baseType),
+                name: printType(aliasBaseType),
                 expected: typeParams.length,
                 received: typeArgs.length,
             }), typeArgs[typeParams.length].node);
@@ -4876,15 +4900,15 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         }
         else if (typeArgs.length < minTypeArgCount) {
             addDiagnostic(diagnosticRules_1.DiagnosticRule.reportInvalidTypeForm, localize_1.LocMessage.typeArgsTooFew().format({
-                name: printType(baseType),
+                name: printType(aliasBaseType),
                 expected: typeParams.length,
                 received: typeArgs.length,
             }), node.d.items[node.d.items.length - 1]);
             reportedError = true;
         }
         // Handle the mypy_extensions.FlexibleAlias type specially.
-        if ((0, types_1.isInstantiableClass)(baseType) &&
-            baseType.shared.fullName === 'mypy_extensions.FlexibleAlias' &&
+        if ((0, types_1.isInstantiableClass)(aliasBaseType) &&
+            aliasBaseType.shared.fullName === 'mypy_extensions.FlexibleAlias' &&
             typeArgs.length >= 1) {
             return { node, type: typeArgs[0].type };
         }
@@ -4960,7 +4984,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                     typeArgType = types_1.UnknownType.create();
                 }
                 if ((flags & 16384 /* EvalFlags.EnforceVarianceConsistency */) !== 0) {
-                    const usageVariances = inferVarianceForTypeAlias(baseType);
+                    const usageVariances = inferVarianceForTypeAlias(aliasBaseType);
                     if (usageVariances && index < usageVariances.length) {
                         const usageVariance = usageVariances[index];
                         if (!(0, typeUtils_1.isVarianceOfTypeArgCompatible)(typeArgType, usageVariance)) {
@@ -4983,12 +5007,12 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             }
         });
         if (!diag.isEmpty()) {
-            addDiagnostic(diagnosticRules_1.DiagnosticRule.reportInvalidTypeForm, localize_1.LocMessage.typeNotSpecializable().format({ type: printType(baseType) }) + diag.getString(), node, (_b = diag.getEffectiveTextRange()) !== null && _b !== void 0 ? _b : node);
+            addDiagnostic(diagnosticRules_1.DiagnosticRule.reportInvalidTypeForm, localize_1.LocMessage.typeNotSpecializable().format({ type: printType(aliasBaseType) }) + diag.getString(), node, (_e = diag.getEffectiveTextRange()) !== null && _e !== void 0 ? _e : node);
             reportedError = true;
         }
         const solutionSet = (0, constraintSolver_1.solveConstraints)(evaluatorInterface, constraints).getMainSolutionSet();
         const aliasTypeArgs = [];
-        (_c = aliasInfo.typeParams) === null || _c === void 0 ? void 0 : _c.forEach((typeParam) => {
+        (_f = aliasInfo.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) {
@@ -4997,14 +5021,17 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             }
             aliasTypeArgs.push(typeVarType);
         });
-        let type = types_1.TypeBase.cloneForTypeAlias(solveAndApplyConstraints(baseType, constraints), {
+        let type = types_1.TypeBase.cloneForTypeAlias(solveAndApplyConstraints(aliasBaseType, constraints), {
             ...aliasInfo,
             typeArgs: aliasTypeArgs,
         });
         if (isTypeFormSupported(node)) {
             type = types_1.TypeBase.cloneWithTypeForm(type, reportedError ? undefined : (0, typeUtils_1.convertToInstance)(type));
         }
-        return { type, node };
+        if ((_g = baseType.props) === null || _g === void 0 ? void 0 : _g.typeAliasInfo) {
+            return { type, node };
+        }
+        return { type: types_1.TypeBase.cloneWithTypeForm(baseType, (0, typeUtils_1.convertToInstance)(type)), node };
     }
     function getTypeOfIndexWithBaseType(node, baseTypeResult, usage, flags) {
         var _a, _b, _c;
@@ -5826,7 +5853,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             }
             else if ((0, types_1.isClass)(baseTypeResult.type) && types_1.ClassType.isBuiltIn(baseTypeResult.type, 'TypeForm')) {
                 // Handle the "typing.TypeForm" call.
-                typeResult = getTypeOfTypeForm(node);
+                typeResult = getTypeOfTypeForm(node, baseTypeResult.type);
             }
             else if ((0, types_1.isAnyOrUnknown)(baseTypeResult.type) &&
                 node.d.leftExpr.nodeType === 38 /* ParseNodeType.Name */ &&
@@ -5931,21 +5958,25 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         }
         return typeResult;
     }
-    function getTypeOfTypeForm(node) {
+    function getTypeOfTypeForm(node, typeFormClass) {
+        var _a;
         if (node.d.args.length !== 1 ||
             node.d.args[0].d.argCategory !== 0 /* ArgCategory.Simple */ ||
             node.d.args[0].d.name !== undefined) {
             addDiagnostic(diagnosticRules_1.DiagnosticRule.reportCallIssue, localize_1.LocMessage.typeFormArgs(), node);
             return { type: types_1.UnknownType.create() };
         }
-        return getTypeOfArgExpectingType((0, typeUtils_1.convertNodeToArg)(node.d.args[0]), {
+        const typeFormResult = getTypeOfArgExpectingType((0, typeUtils_1.convertNodeToArg)(node.d.args[0]), {
             typeFormArg: isTypeFormSupported(node),
             noNonTypeSpecialForms: true,
             typeExpression: true,
         });
+        if (!typeFormResult.typeErrors && ((_a = typeFormResult.type.props) === null || _a === void 0 ? void 0 : _a.typeForm)) {
+            typeFormResult.type = (0, typeUtils_1.convertToInstance)(types_1.ClassType.specialize(typeFormClass, [(0, typeUtils_1.convertToInstance)(typeFormResult.type.props.typeForm)]));
+        }
+        return typeFormResult;
     }
     function getTypeOfAssertType(node, inferenceContext) {
-        var _a;
         if (node.d.args.length !== 2 ||
             node.d.args[0].d.argCategory !== 0 /* ArgCategory.Simple */ ||
             node.d.args[0].d.name !== undefined ||
@@ -5965,24 +5996,10 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         // The spec is unclear on whether this is the correct behavior, but it seems to be
         // what mypy does -- and what various library authors expect.
         const arg0Type = stripTypeGuard(arg0TypeResult.type);
-        let assertSuccess = (0, types_1.isTypeSame)(assertedType, arg0Type, {
+        if (!(0, types_1.isTypeSame)(assertedType, arg0Type, {
             treatAnySameAsUnknown: true,
             ignorePseudoGeneric: true,
-        });
-        // Handle TypeForm types specially.
-        if (!assertSuccess &&
-            ((_a = arg0Type.props) === null || _a === void 0 ? void 0 : _a.typeForm) &&
-            (0, types_1.isClassInstance)(assertedType) &&
-            types_1.ClassType.isBuiltIn(assertedType, 'TypeForm')) {
-            const typeFormType = assertedType.priv.typeArgs && assertedType.priv.typeArgs.length >= 1
-                ? assertedType.priv.typeArgs[0]
-                : types_1.UnknownType.create();
-            assertSuccess = (0, types_1.isTypeSame)(arg0Type.props.typeForm, typeFormType, {
-                treatAnySameAsUnknown: true,
-                ignorePseudoGeneric: true,
-            });
-        }
-        if (!assertSuccess) {
+        })) {
             const srcDestTypes = printSrcDestTypes(arg0TypeResult.type, assertedType, { expandTypeAlias: true });
             addDiagnostic(diagnosticRules_1.DiagnosticRule.reportAssertTypeFailure, localize_1.LocMessage.assertTypeTypeMismatch().format({
                 expected: srcDestTypes.destType,
@@ -7068,18 +7085,15 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 if (expandedCallType.shared.name === 'type' && argList.length === 1) {
                     const argType = getTypeOfArg(argList[0], /* inferenceContext */ undefined).type;
                     const returnType = (0, typeUtils_1.mapSubtypes)(argType, (subtype) => {
-                        if ((0, types_1.isInstantiableClass)(subtype) && subtype.shared.effectiveMetaclass) {
-                            return subtype.shared.effectiveMetaclass;
-                        }
                         if ((0, types_1.isNever)(subtype)) {
                             return subtype;
                         }
+                        if ((0, types_1.isClass)(subtype)) {
+                            return (0, typeUtils_1.convertToInstantiable)(stripLiteralValue(subtype));
+                        }
                         if (types_1.TypeBase.isInstance(subtype)) {
-                            if ((0, types_1.isClass)(subtype) || (0, types_1.isTypeVar)(subtype)) {
-                                return (0, typeUtils_1.convertToInstantiable)(stripLiteralValue(subtype));
-                            }
-                            if ((0, types_1.isFunction)(subtype)) {
-                                return types_1.FunctionType.cloneAsInstantiable(subtype);
+                            if ((0, types_1.isFunction)(subtype) || (0, types_1.isTypeVar)(subtype)) {
+                                return (0, typeUtils_1.convertToInstantiable)(subtype);
                             }
                         }
                         return types_1.ClassType.specialize(types_1.ClassType.cloneAsInstance(expandedCallType), [
@@ -17046,6 +17060,10 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 // why two types are not the same.
                 includeDiagAddendum = false;
             }
+            // Special-case TypeForm to retain literals when solving TypeVars.
+            if (types_1.ClassType.isBuiltIn(destType, 'TypeForm')) {
+                effectiveFlags |= 256 /* AssignTypeFlags.RetainLiteralsForTypeVar */;
+            }
             if (!assignType(variance === 4 /* Variance.Contravariant */ ? srcTypeArg : destTypeArg, variance === 4 /* Variance.Contravariant */ ? destTypeArg : srcTypeArg, assignmentDiag, constraints, effectiveFlags, recursionCount)) {
                 // Don't report errors with type variables in "pseudo-random"
                 // classes since these type variables are not real.
@@ -17154,6 +17172,13 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 flags |= 4 /* AssignTypeFlags.SkipRecursiveTypeCheck */;
             }
         }
+        // If one or both of the types has an instantiable depth greater than
+        // zero, convert both to instances first.
+        if (types_1.TypeBase.isInstantiable(destType) && types_1.TypeBase.isInstantiable(srcType)) {
+            if (types_1.TypeBase.getInstantiableDepth(destType) > 0 || types_1.TypeBase.getInstantiableDepth(srcType) > 0) {
+                return assignType((0, typeUtils_1.convertToInstance)(destType), (0, typeUtils_1.convertToInstance)(srcType), diag, constraints, flags, recursionCount);
+            }
+        }
         // Transform recursive type aliases if necessary.
         const transformedDestType = (0, typeUtils_1.transformPossibleRecursiveTypeAlias)(destType);
         const transformedSrcType = (0, typeUtils_1.transformPossibleRecursiveTypeAlias)(srcType);
@@ -17179,10 +17204,6 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         if ((0, types_1.isUnbound)(destType) || (0, types_1.isUnbound)(srcType)) {
             return true;
         }
-        // Handle TypeForm assignments.
-        if (assignToTypeFormType(destType, srcType, constraints, flags, recursionCount)) {
-            return true;
-        }
         if ((0, types_1.isTypeVar)(destType)) {
             if ((0, typeUtils_1.isTypeVarSame)(destType, srcType)) {
                 return true;
@@ -17327,7 +17348,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             // If both the source and dest are unions, use assignFromUnionType which has
             // special-case logic to handle this case.
             if ((0, types_1.isUnion)(srcType)) {
-                return assignFromUnionType(destType, srcType, /* diag */ undefined, constraints, flags, recursionCount);
+                return assignFromUnionType(destType, srcType, diag, constraints, flags, recursionCount);
             }
             const clonedConstraints = constraints === null || constraints === void 0 ? void 0 : constraints.clone();
             if (assignToUnionType(destType, srcType, /* diag */ undefined, clonedConstraints, flags, recursionCount)) {
@@ -17372,7 +17393,8 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 // PEP 544 says that if the dest type is a type[Proto] class,
                 // the source must be a "concrete" (non-protocol) class.
                 if (types_1.ClassType.isProtocolClass(destType)) {
-                    if (types_1.ClassType.isProtocolClass(expandedSrcType) &&
+                    if ((flags & 65536 /* AssignTypeFlags.AllowProtocolClassSource */) === 0 &&
+                        types_1.ClassType.isProtocolClass(expandedSrcType) &&
                         (0, types_1.isInstantiableClass)(srcType) &&
                         !srcType.priv.includeSubclasses) {
                         diag === null || diag === void 0 ? void 0 : diag.addMessage(localize_1.LocAddendum.protocolSourceIsNotConcrete().format({
@@ -17416,7 +17438,9 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         }
         if ((0, types_1.isClassInstance)(destType)) {
             if (types_1.ClassType.isBuiltIn(destType, 'type')) {
-                if ((0, types_1.isInstantiableClass)(srcType) && isSpecialFormClass(srcType, flags)) {
+                if ((0, types_1.isInstantiableClass)(srcType) &&
+                    isSpecialFormClass(srcType, flags) &&
+                    types_1.TypeBase.getInstantiableDepth(srcType) === 0) {
                     return false;
                 }
                 if ((0, types_1.isAnyOrUnknown)(srcType) && (flags & 16 /* AssignTypeFlags.OverloadOverlap */) !== 0) {
@@ -17652,20 +17676,18 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         diag === null || diag === void 0 ? void 0 : diag.addMessage(localize_1.LocAddendum.typeAssignmentMismatch().format(printSrcDestTypes(srcType, destType)));
         return false;
     }
-    // If the destination type is an explicit TypeForm type, see if the source
-    // type has an implicit TypeForm type that can be assigned to it. Also see
-    // of the source is a type[T] type that is assignable.
-    function assignToTypeFormType(destType, srcType, constraints, flags, recursionCount) {
-        var _a, _b;
-        if (!(0, types_1.isClassInstance)(destType) || !types_1.ClassType.isBuiltIn(destType, 'TypeForm')) {
-            return false;
+    // 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.
+    function convertToTypeFormType(expectedType, srcType) {
+        var _a, _b, _c;
+        // Is the source is a TypeForm type?
+        if (!((_a = srcType.props) === null || _a === void 0 ? void 0 : _a.typeForm)) {
+            return srcType;
         }
-        const destTypeFormType = destType.priv.typeArgs && destType.priv.typeArgs.length > 0
-            ? destType.priv.typeArgs[0]
-            : types_1.UnknownType.create();
         let srcTypeFormType;
         // Is the source is a TypeForm type?
-        if ((_a = srcType.props) === null || _a === void 0 ? void 0 : _a.typeForm) {
+        if ((_b = srcType.props) === null || _b === void 0 ? void 0 : _b.typeForm) {
             srcTypeFormType = srcType.props.typeForm;
         }
         else if ((0, types_1.isClass)(srcType)) {
@@ -17676,7 +17698,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             }
             else if (types_1.ClassType.isBuiltIn(srcType, 'type')) {
                 srcTypeFormType =
-                    ((_b = srcType.priv.typeArgs) === null || _b === void 0 ? void 0 : _b.length) && srcType.priv.typeArgs.length > 0
+                    ((_c = srcType.priv.typeArgs) === null || _c === void 0 ? void 0 : _c.length) && srcType.priv.typeArgs.length > 0
                         ? srcType.priv.typeArgs[0]
                         : types_1.UnknownType.create();
             }
@@ -17687,9 +17709,21 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             }
         }
         if (!srcTypeFormType) {
-            return false;
+            return srcType;
         }
-        return assignType(destTypeFormType, srcTypeFormType, /* diag */ undefined, constraints, flags, recursionCount);
+        let resultType;
+        (0, typeUtils_1.doForEachSubtype)(expectedType, (subtype) => {
+            if (resultType || !(0, types_1.isClassInstance)(subtype) || !types_1.ClassType.isBuiltIn(subtype, 'TypeForm')) {
+                return;
+            }
+            const destTypeFormType = subtype.priv.typeArgs && subtype.priv.typeArgs.length > 0
+                ? subtype.priv.typeArgs[0]
+                : types_1.UnknownType.create();
+            if (assignType(destTypeFormType, srcTypeFormType)) {
+                resultType = types_1.ClassType.specialize(subtype, [srcTypeFormType]);
+            }
+        });
+        return resultType !== null && resultType !== void 0 ? resultType : srcType;
     }
     function assignFromUnionType(destType, srcType, diag, constraints, flags, recursionCount) {
         // Start by checking for an exact match. This is needed to handle unions
@@ -19830,6 +19864,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         getBoundMagicMethod,
         getTypeOfMagicMethodCall,
         bindFunctionToClassOrObject,
+        getCallbackProtocolType,
         getCallSignatureInfo,
         getAbstractSymbols,
         narrowConstrainedTypeVar,
@@ -19841,6 +19876,8 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         assignClassToSelf,
         getTypedDictClassType,
         getTupleClassType,
+        getDictClassType,
+        getStrClassType,
         getObjectType,
         getNoneType,
         getUnionClassType,