@zzzen/pyright-internal 1.2.0-dev.20231029 → 1.2.0-dev.20231105

package/dist/analyzer/types.js

@@ -8,8 +8,8 @@
  * Representation of types used during type analysis within Python.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.removeUnbound = exports.removeUnknownFromUnion = exports.isTypeSame = exports.getTypeAliasInfo = exports.isOverloadedFunction = exports.isFunction = exports.isParamSpec = exports.isUnpacked = exports.isUnpackedClass = exports.isUnpackedVariadicTypeVar = exports.isVariadicTypeVar = exports.isTypeVar = exports.isModule = exports.isClassInstance = exports.isInstantiableClass = exports.isClass = exports.isPossiblyUnbound = exports.isUnion = exports.isUnbound = exports.isAnyOrUnknown = exports.isUnknown = exports.isAny = exports.isNoneTypeClass = exports.isNoneInstance = exports.isNever = exports.TypeVarType = exports.TypeVarScopeType = exports.Variance = exports.UnionType = exports.TypeCondition = exports.AnyType = exports.NeverType = exports.NoneType = exports.OverloadedFunctionType = exports.FunctionType = exports.FunctionTypeFlags = exports.isKeywordOnlySeparator = exports.isPositionOnlySeparator = exports.ClassType = exports.ClassTypeFlags = exports.ModuleType = exports.UnknownType = exports.UnboundType = exports.TypeBase = exports.maxTypeRecursionCount = exports.EnumLiteral = exports.InScopePlaceholderScopeId = exports.WildcardTypeVarScopeId = exports.TypeFlags = exports.TypeCategory = void 0;
-exports.isSameWithoutLiteralValue = exports.combineTypes = exports.findSubtype = exports.removeFromUnion = exports.removeNoneFromUnion = void 0;
+exports.combineTypes = exports.findSubtype = exports.removeFromUnion = exports.removeUnbound = exports.removeUnknownFromUnion = exports.isTypeSame = exports.getTypeAliasInfo = exports.isOverloadedFunction = exports.isFunction = exports.isParamSpec = exports.isUnpacked = exports.isUnpackedClass = exports.isUnpackedVariadicTypeVar = exports.isVariadicTypeVar = exports.isTypeVar = exports.isModule = exports.isClassInstance = exports.isInstantiableClass = exports.isClass = exports.isPossiblyUnbound = exports.isUnion = exports.isUnbound = exports.isAnyOrUnknown = exports.isUnknown = exports.isAny = exports.isNever = exports.TypeVarType = exports.TypeVarScopeType = exports.Variance = exports.UnionType = exports.TypeCondition = exports.AnyType = exports.NeverType = exports.OverloadedFunctionType = exports.FunctionType = exports.FunctionTypeFlags = exports.isKeywordOnlySeparator = exports.isPositionOnlySeparator = exports.ClassType = exports.ClassTypeFlags = exports.ModuleType = exports.UnknownType = exports.UnboundType = exports.TypeBase = exports.maxTypeRecursionCount = exports.EnumLiteral = exports.InScopePlaceholderScopeId = exports.WildcardTypeVarScopeId = exports.TypeFlags = exports.TypeCategory = void 0;
+exports.isSameWithoutLiteralValue = void 0;
 const debug_1 = require("../common/debug");
 var TypeCategory;
 (function (TypeCategory) {
@@ -21,26 +21,24 @@ var TypeCategory;
     TypeCategory[TypeCategory["Unknown"] = 1] = "Unknown";
     // Type can be anything.
     TypeCategory[TypeCategory["Any"] = 2] = "Any";
-    // Special "None" type defined in Python.
-    TypeCategory[TypeCategory["None"] = 3] = "None";
     // Used in type narrowing to indicate that all possible
     // subtypes in a union have been eliminated, and execution
     // should never get to this point.
-    TypeCategory[TypeCategory["Never"] = 4] = "Never";
+    TypeCategory[TypeCategory["Never"] = 3] = "Never";
     // Callable type with typed input parameters and return parameter.
-    TypeCategory[TypeCategory["Function"] = 5] = "Function";
+    TypeCategory[TypeCategory["Function"] = 4] = "Function";
     // Functions defined with @overload decorator in stub files that
     // have multiple function declarations for a common implementation.
-    TypeCategory[TypeCategory["OverloadedFunction"] = 6] = "OverloadedFunction";
+    TypeCategory[TypeCategory["OverloadedFunction"] = 5] = "OverloadedFunction";
     // Class definition, including associated instance methods,
     // class methods, static methods, properties, and variables.
-    TypeCategory[TypeCategory["Class"] = 7] = "Class";
+    TypeCategory[TypeCategory["Class"] = 6] = "Class";
     // Module instance.
-    TypeCategory[TypeCategory["Module"] = 8] = "Module";
-    // Composite type (e.g. Number OR String OR None).
-    TypeCategory[TypeCategory["Union"] = 9] = "Union";
+    TypeCategory[TypeCategory["Module"] = 7] = "Module";
+    // Composite type (e.g. Number OR String).
+    TypeCategory[TypeCategory["Union"] = 8] = "Union";
     // Type variable (defined with TypeVar)
-    TypeCategory[TypeCategory["TypeVar"] = 10] = "TypeVar";
+    TypeCategory[TypeCategory["TypeVar"] = 9] = "TypeVar";
 })(TypeCategory = exports.TypeCategory || (exports.TypeCategory = {}));
 var TypeFlags;
 (function (TypeFlags) {
@@ -235,7 +233,7 @@ var ModuleType;
 (function (ModuleType) {
     function create(moduleName, filePath, symbolTable) {
         const newModuleType = {
-            category: 8 /* Module */,
+            category: 7 /* Module */,
             fields: symbolTable || new Map(),
             loaderFields: new Map(),
             flags: 1 /* Instantiable */ | 1 /* Instantiable */,
@@ -353,7 +351,7 @@ var ClassType;
 (function (ClassType) {
     function createInstantiable(name, fullName, moduleName, filePath, flags, typeSourceId, declaredMetaclass, effectiveMetaclass, docString) {
         const newClass = {
-            category: 7 /* Class */,
+            category: 6 /* Class */,
             details: {
                 name,
                 fullName,
@@ -405,7 +403,7 @@ var ClassType;
     ClassType.cloneAsInstantiable = cloneAsInstantiable;
     function cloneForSpecialization(classType, typeArguments, isTypeArgumentExplicit, includeSubclasses = false, tupleTypeArguments, isEmptyContainer) {
         const newClassType = TypeBase.cloneType(classType);
-        newClassType.typeArguments = typeArguments;
+        newClassType.typeArguments = (typeArguments === null || typeArguments === void 0 ? void 0 : typeArguments.length) === 0 ? undefined : typeArguments;
         newClassType.isTypeArgumentExplicit = isTypeArgumentExplicit;
         if (includeSubclasses) {
             newClassType.includeSubclasses = true;
@@ -910,7 +908,7 @@ var FunctionType;
     FunctionType.createSynthesizedInstance = createSynthesizedInstance;
     function create(name, fullName, moduleName, functionFlags, typeFlags, docString) {
         const newFunctionType = {
-            category: 5 /* Function */,
+            category: 4 /* Function */,
             details: {
                 name,
                 fullName,
@@ -1329,6 +1327,9 @@ var FunctionType;
     FunctionType.getEffectiveParameterDefaultArgType = getEffectiveParameterDefaultArgType;
     function addParameter(type, param) {
         type.details.parameters.push(param);
+        if (type.specializedTypes) {
+            type.specializedTypes.parameterTypes.push(param.type);
+        }
     }
     FunctionType.addParameter = addParameter;
     function getSpecializedReturnType(type) {
@@ -1342,7 +1343,7 @@ var OverloadedFunctionType;
 (function (OverloadedFunctionType) {
     function create(overloads) {
         const newType = {
-            category: 6 /* OverloadedFunction */,
+            category: 5 /* OverloadedFunction */,
             overloads: [],
             flags: 2 /* Instance */,
         };
@@ -1367,34 +1368,15 @@ var OverloadedFunctionType;
     }
     OverloadedFunctionType.getImplementation = getImplementation;
 })(OverloadedFunctionType = exports.OverloadedFunctionType || (exports.OverloadedFunctionType = {}));
-var NoneType;
-(function (NoneType) {
-    const _noneInstance = {
-        category: 3 /* None */,
-        flags: 2 /* Instance */,
-    };
-    const _noneType = {
-        category: 3 /* None */,
-        flags: 1 /* Instantiable */,
-    };
-    function createInstance() {
-        return _noneInstance;
-    }
-    NoneType.createInstance = createInstance;
-    function createType() {
-        return _noneType;
-    }
-    NoneType.createType = createType;
-})(NoneType = exports.NoneType || (exports.NoneType = {}));
 var NeverType;
 (function (NeverType) {
     const _neverInstance = {
-        category: 4 /* Never */,
+        category: 3 /* Never */,
         flags: 2 /* Instance */ | 1 /* Instantiable */,
         isNoReturn: false,
     };
     const _noReturnInstance = {
-        category: 4 /* Never */,
+        category: 3 /* Never */,
         flags: 2 /* Instance */ | 1 /* Instantiable */,
         isNoReturn: true,
     };
@@ -1519,7 +1501,7 @@ var UnionType;
 (function (UnionType) {
     function create() {
         const newUnionType = {
-            category: 9 /* Union */,
+            category: 8 /* Union */,
             subtypes: [],
             flags: 2 /* Instance */ | 1 /* Instantiable */,
         };
@@ -1592,7 +1574,7 @@ var UnionType;
     }
     UnionType.containsType = containsType;
     function addTypeAliasSource(unionType, typeAliasSource) {
-        if (typeAliasSource.category === 9 /* Union */) {
+        if (typeAliasSource.category === 8 /* Union */) {
             const sourcesToAdd = typeAliasSource.typeAliasInfo ? [typeAliasSource] : typeAliasSource.typeAliasSources;
             if (sourcesToAdd) {
                 if (!unionType.typeAliasSources) {
@@ -1748,7 +1730,7 @@ var TypeVarType;
     TypeVarType.makeNameWithScope = makeNameWithScope;
     function create(name, isParamSpec, typeFlags, runtimeClass) {
         const newTypeVarType = {
-            category: 10 /* TypeVar */,
+            category: 9 /* TypeVar */,
             details: {
                 name,
                 constraints: [],
@@ -1799,17 +1781,9 @@ var TypeVarType;
     TypeVarType.isTypeAliasPlaceholder = isTypeAliasPlaceholder;
 })(TypeVarType = exports.TypeVarType || (exports.TypeVarType = {}));
 function isNever(type) {
-    return type.category === 4 /* Never */;
+    return type.category === 3 /* Never */;
 }
 exports.isNever = isNever;
-function isNoneInstance(type) {
-    return type.category === 3 /* None */ && TypeBase.isInstance(type);
-}
-exports.isNoneInstance = isNoneInstance;
-function isNoneTypeClass(type) {
-    return type.category === 3 /* None */ && TypeBase.isInstantiable(type);
-}
-exports.isNoneTypeClass = isNoneTypeClass;
 function isAny(type) {
     return type.category === 2 /* Any */;
 }
@@ -1833,7 +1807,7 @@ function isUnbound(type) {
 }
 exports.isUnbound = isUnbound;
 function isUnion(type) {
-    return type.category === 9 /* Union */;
+    return type.category === 8 /* Union */;
 }
 exports.isUnion = isUnion;
 function isPossiblyUnbound(type) {
@@ -1847,31 +1821,31 @@ function isPossiblyUnbound(type) {
 }
 exports.isPossiblyUnbound = isPossiblyUnbound;
 function isClass(type) {
-    return type.category === 7 /* Class */;
+    return type.category === 6 /* Class */;
 }
 exports.isClass = isClass;
 function isInstantiableClass(type) {
-    return type.category === 7 /* Class */ && TypeBase.isInstantiable(type);
+    return type.category === 6 /* Class */ && TypeBase.isInstantiable(type);
 }
 exports.isInstantiableClass = isInstantiableClass;
 function isClassInstance(type) {
-    return type.category === 7 /* Class */ && TypeBase.isInstance(type);
+    return type.category === 6 /* Class */ && TypeBase.isInstance(type);
 }
 exports.isClassInstance = isClassInstance;
 function isModule(type) {
-    return type.category === 8 /* Module */;
+    return type.category === 7 /* Module */;
 }
 exports.isModule = isModule;
 function isTypeVar(type) {
-    return type.category === 10 /* TypeVar */;
+    return type.category === 9 /* TypeVar */;
 }
 exports.isTypeVar = isTypeVar;
 function isVariadicTypeVar(type) {
-    return type.category === 10 /* TypeVar */ && type.details.isVariadic;
+    return type.category === 9 /* TypeVar */ && type.details.isVariadic;
 }
 exports.isVariadicTypeVar = isVariadicTypeVar;
 function isUnpackedVariadicTypeVar(type) {
-    return (type.category === 10 /* TypeVar */ &&
+    return (type.category === 9 /* TypeVar */ &&
         type.details.isVariadic &&
         !!type.isVariadicUnpacked &&
         !type.isVariadicInUnion);
@@ -1889,15 +1863,15 @@ function isUnpacked(type) {
 }
 exports.isUnpacked = isUnpacked;
 function isParamSpec(type) {
-    return type.category === 10 /* TypeVar */ && type.details.isParamSpec;
+    return type.category === 9 /* TypeVar */ && type.details.isParamSpec;
 }
 exports.isParamSpec = isParamSpec;
 function isFunction(type) {
-    return type.category === 5 /* Function */;
+    return type.category === 4 /* Function */;
 }
 exports.isFunction = isFunction;
 function isOverloadedFunction(type) {
-    return type.category === 6 /* OverloadedFunction */;
+    return type.category === 5 /* OverloadedFunction */;
 }
 exports.isOverloadedFunction = isOverloadedFunction;
 function getTypeAliasInfo(type) {
@@ -1954,7 +1928,7 @@ function isTypeSame(type1, type2, options = {}, recursionCount = 0) {
     }
     recursionCount++;
     switch (type1.category) {
-        case 7 /* Class */: {
+        case 6 /* Class */: {
             const classType2 = type2;
             // If the details are not the same it's not the same class.
             if (!ClassType.isSameGenericClass(type1, classType2, recursionCount)) {
@@ -2005,7 +1979,7 @@ function isTypeSame(type1, type2, options = {}, recursionCount = 0) {
             }
             return true;
         }
-        case 5 /* Function */: {
+        case 4 /* Function */: {
             // Make sure the parameter counts match.
             const functionType2 = type2;
             const params1 = type1.details.parameters;
@@ -2076,7 +2050,7 @@ function isTypeSame(type1, type2, options = {}, recursionCount = 0) {
             }
             return true;
         }
-        case 6 /* OverloadedFunction */: {
+        case 5 /* OverloadedFunction */: {
             // Make sure the overload counts match.
             const functionType2 = type2;
             if (type1.overloads.length !== functionType2.overloads.length) {
@@ -2091,7 +2065,7 @@ function isTypeSame(type1, type2, options = {}, recursionCount = 0) {
             }
             return true;
         }
-        case 9 /* Union */: {
+        case 8 /* Union */: {
             const unionType2 = type2;
             const subtypes1 = type1.subtypes;
             const subtypes2 = unionType2.subtypes;
@@ -2103,7 +2077,7 @@ function isTypeSame(type1, type2, options = {}, recursionCount = 0) {
             const exclusionSet = new Set();
             return (findSubtype(type1, (subtype) => !UnionType.containsType(unionType2, subtype, exclusionSet, recursionCount)) === undefined);
         }
-        case 10 /* TypeVar */: {
+        case 9 /* TypeVar */: {
             const type2TypeVar = type2;
             if (type1.scopeId !== type2TypeVar.scopeId) {
                 return false;
@@ -2162,7 +2136,7 @@ function isTypeSame(type1, type2, options = {}, recursionCount = 0) {
             }
             return true;
         }
-        case 8 /* Module */: {
+        case 7 /* Module */: {
             const type2Module = type2;
             // Module types are the same if they share the same
             // module symbol table.
@@ -2202,12 +2176,6 @@ function removeUnbound(type) {
     return type;
 }
 exports.removeUnbound = removeUnbound;
-// If the type is a union, remove an "None" type from the union,
-// returning only the known types.
-function removeNoneFromUnion(type) {
-    return removeFromUnion(type, (t) => isNoneInstance(t));
-}
-exports.removeNoneFromUnion = removeNoneFromUnion;
 function removeFromUnion(type, removeFilter) {
     if (isUnion(type)) {
         const remainingTypes = type.subtypes.filter((t) => !removeFilter(t));
@@ -2238,12 +2206,12 @@ exports.findSubtype = findSubtype;
 function combineTypes(subtypes, maxSubtypeCount) {
     // Filter out any "Never" and "NoReturn" types.
     let sawNoReturn = false;
-    if (subtypes.some((subtype) => subtype.category === 4 /* Never */))
+    if (subtypes.some((subtype) => subtype.category === 3 /* Never */))
         subtypes = subtypes.filter((subtype) => {
-            if (subtype.category === 4 /* Never */ && subtype.isNoReturn) {
+            if (subtype.category === 3 /* Never */ && subtype.isNoReturn) {
                 sawNoReturn = true;
             }
-            return subtype.category !== 4 /* Never */;
+            return subtype.category !== 3 /* Never */;
         });
     if (subtypes.length === 0) {
         return sawNoReturn ? NeverType.createNoReturn() : NeverType.createNever();