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

package/dist/analyzer/properties.js

@@ -28,13 +28,13 @@ function createProperty(evaluator, decoratorNode, decoratorType, fget) {
     const typeMetaclass = evaluator.getBuiltInType(decoratorNode, 'type');
     const typeSourceId = types_1.ClassType.isBuiltIn(decoratorType, 'property')
         ? (0, parseTreeUtils_1.getTypeSourceId)(decoratorNode)
-        : decoratorType.details.typeSourceId;
-    const propertyClass = types_1.ClassType.createInstantiable(decoratorType.details.name, (0, parseTreeUtils_1.getClassFullName)(decoratorNode, fileInfo.moduleName, `__property_${fget.details.name}`), fileInfo.moduleName, fileInfo.fileUri, 128 /* ClassTypeFlags.PropertyClass */ | 1 /* ClassTypeFlags.BuiltInClass */, typeSourceId, 
+        : decoratorType.shared.typeSourceId;
+    const propertyClass = types_1.ClassType.createInstantiable(decoratorType.shared.name, (0, parseTreeUtils_1.getClassFullName)(decoratorNode, fileInfo.moduleName, `__property_${fget.shared.name}`), fileInfo.moduleName, fileInfo.fileUri, 128 /* ClassTypeFlags.PropertyClass */ | 1 /* ClassTypeFlags.BuiltIn */, typeSourceId, 
     /* declaredMetaclass */ undefined, (0, types_1.isInstantiableClass)(typeMetaclass) ? typeMetaclass : types_1.UnknownType.create());
-    propertyClass.details.declaration = decoratorType.details.declaration;
-    propertyClass.details.typeVarScopeId = decoratorType.details.typeVarScopeId;
+    propertyClass.shared.declaration = decoratorType.shared.declaration;
+    propertyClass.shared.typeVarScopeId = decoratorType.shared.typeVarScopeId;
     const objectType = evaluator.getBuiltInType(decoratorNode, 'object');
-    propertyClass.details.baseClasses.push((0, types_1.isInstantiableClass)(objectType) ? objectType : types_1.UnknownType.create());
+    propertyClass.shared.baseClasses.push((0, types_1.isInstantiableClass)(objectType) ? objectType : types_1.UnknownType.create());
     (0, typeUtils_1.computeMroLinearization)(propertyClass);
     // Clone the symbol table of the old class type.
     const fields = types_1.ClassType.getSymbolTable(propertyClass);
@@ -47,16 +47,16 @@ function createProperty(evaluator, decoratorNode, decoratorType, fget) {
         }
     });
     const propertyObject = types_1.ClassType.cloneAsInstance(propertyClass);
-    propertyClass.isAsymmetricDescriptor = false;
+    propertyClass.priv.isAsymmetricDescriptor = false;
     // Update the __set__ and __delete__ methods if present.
     updateGetSetDelMethodForClonedProperty(evaluator, propertyObject);
     // Fill in the fget method.
-    propertyObject.fgetInfo = {
-        methodType: types_1.FunctionType.cloneWithNewFlags(fget, fget.details.flags | 4 /* FunctionTypeFlags.StaticMethod */),
-        classType: fget.details.methodClass,
+    propertyObject.priv.fgetInfo = {
+        methodType: types_1.FunctionType.cloneWithNewFlags(fget, fget.shared.flags | 4 /* FunctionTypeFlags.StaticMethod */),
+        classType: fget.shared.methodClass,
     };
     if (types_1.FunctionType.isClassMethod(fget)) {
-        propertyClass.details.flags |= 131072 /* ClassTypeFlags.ClassProperty */;
+        propertyClass.shared.flags |= 131072 /* ClassTypeFlags.ClassProperty */;
     }
     // Fill in the __get__ method with an overload.
     addGetMethodToPropertySymbolTable(evaluator, propertyObject, fget);
@@ -70,13 +70,13 @@ function clonePropertyWithSetter(evaluator, prop, fset, errorNode) {
         return prop;
     }
     const classType = prop;
-    const flagsToClone = classType.details.flags;
-    let isAsymmetricDescriptor = !!classType.isAsymmetricDescriptor;
+    const flagsToClone = classType.shared.flags;
+    let isAsymmetricDescriptor = !!classType.priv.isAsymmetricDescriptor;
     // Verify parameters for fset.
     // We'll skip this test if the diagnostic rule is disabled because it
     // can be somewhat expensive, especially in code that is not annotated.
     const fileInfo = (0, analyzerNodeInfo_1.getFileInfo)(errorNode);
-    if (errorNode.parameters.length >= 2) {
+    if (errorNode.d.params.length >= 2) {
         const typeAnnotation = (0, parseTreeUtils_1.getTypeAnnotationForParameter)(errorNode, 1);
         if (typeAnnotation) {
             // Verify consistency of the type.
@@ -98,15 +98,15 @@ function clonePropertyWithSetter(evaluator, prop, fset, errorNode) {
             }
         }
     }
-    const propertyClass = types_1.ClassType.createInstantiable(classType.details.name, classType.details.fullName, classType.details.moduleName, (0, analyzerNodeInfo_1.getFileInfo)(errorNode).fileUri, flagsToClone, classType.details.typeSourceId, classType.details.declaredMetaclass, classType.details.effectiveMetaclass);
-    propertyClass.details.declaration = classType.details.declaration;
-    propertyClass.details.typeVarScopeId = classType.details.typeVarScopeId;
+    const propertyClass = types_1.ClassType.createInstantiable(classType.shared.name, classType.shared.fullName, classType.shared.moduleName, (0, analyzerNodeInfo_1.getFileInfo)(errorNode).fileUri, flagsToClone, classType.shared.typeSourceId, classType.shared.declaredMetaclass, classType.shared.effectiveMetaclass);
+    propertyClass.shared.declaration = classType.shared.declaration;
+    propertyClass.shared.typeVarScopeId = classType.shared.typeVarScopeId;
     const objectType = evaluator.getBuiltInType(errorNode, 'object');
-    propertyClass.details.baseClasses.push((0, types_1.isInstantiableClass)(objectType) ? objectType : types_1.UnknownType.create());
+    propertyClass.shared.baseClasses.push((0, types_1.isInstantiableClass)(objectType) ? objectType : types_1.UnknownType.create());
     (0, typeUtils_1.computeMroLinearization)(propertyClass);
-    propertyClass.fgetInfo = classType.fgetInfo;
-    propertyClass.fdelInfo = classType.fdelInfo;
-    propertyClass.isAsymmetricDescriptor = isAsymmetricDescriptor;
+    propertyClass.priv.fgetInfo = classType.priv.fgetInfo;
+    propertyClass.priv.fdelInfo = classType.priv.fdelInfo;
+    propertyClass.priv.isAsymmetricDescriptor = isAsymmetricDescriptor;
     const propertyObject = types_1.ClassType.cloneAsInstance(propertyClass);
     // Clone the symbol table of the old class type.
     const fields = types_1.ClassType.getSymbolTable(propertyClass);
@@ -118,9 +118,9 @@ function clonePropertyWithSetter(evaluator, prop, fset, errorNode) {
     // Update the __get__ and __delete__ methods if present.
     updateGetSetDelMethodForClonedProperty(evaluator, propertyObject);
     // Fill in the new fset method.
-    propertyObject.fsetInfo = {
-        methodType: types_1.FunctionType.cloneWithNewFlags(fset, fset.details.flags | 4 /* FunctionTypeFlags.StaticMethod */),
-        classType: fset.details.methodClass,
+    propertyObject.priv.fsetInfo = {
+        methodType: types_1.FunctionType.cloneWithNewFlags(fset, fset.shared.flags | 4 /* FunctionTypeFlags.StaticMethod */),
+        classType: fset.shared.methodClass,
     };
     // Fill in the __set__ method.
     addSetMethodToPropertySymbolTable(evaluator, propertyObject, fset);
@@ -135,16 +135,16 @@ function clonePropertyWithDeleter(evaluator, prop, fdel, errorNode) {
         return prop;
     }
     const classType = prop;
-    const propertyClass = types_1.ClassType.createInstantiable(classType.details.name, classType.details.fullName, classType.details.moduleName, (0, analyzerNodeInfo_1.getFileInfo)(errorNode).fileUri, classType.details.flags, classType.details.typeSourceId, classType.details.declaredMetaclass, classType.details.effectiveMetaclass);
-    propertyClass.details.declaration = classType.details.declaration;
-    propertyClass.details.typeVarScopeId = classType.details.typeVarScopeId;
+    const propertyClass = types_1.ClassType.createInstantiable(classType.shared.name, classType.shared.fullName, classType.shared.moduleName, (0, analyzerNodeInfo_1.getFileInfo)(errorNode).fileUri, classType.shared.flags, classType.shared.typeSourceId, classType.shared.declaredMetaclass, classType.shared.effectiveMetaclass);
+    propertyClass.shared.declaration = classType.shared.declaration;
+    propertyClass.shared.typeVarScopeId = classType.shared.typeVarScopeId;
     const objectType = evaluator.getBuiltInType(errorNode, 'object');
-    propertyClass.details.baseClasses.push((0, types_1.isInstantiableClass)(objectType) ? objectType : types_1.UnknownType.create());
+    propertyClass.shared.baseClasses.push((0, types_1.isInstantiableClass)(objectType) ? objectType : types_1.UnknownType.create());
     (0, typeUtils_1.computeMroLinearization)(propertyClass);
-    propertyClass.fgetInfo = classType.fgetInfo;
-    propertyClass.fsetInfo = classType.fsetInfo;
+    propertyClass.priv.fgetInfo = classType.priv.fgetInfo;
+    propertyClass.priv.fsetInfo = classType.priv.fsetInfo;
     const propertyObject = types_1.ClassType.cloneAsInstance(propertyClass);
-    propertyClass.isAsymmetricDescriptor = (_a = classType.isAsymmetricDescriptor) !== null && _a !== void 0 ? _a : false;
+    propertyClass.priv.isAsymmetricDescriptor = (_a = classType.priv.isAsymmetricDescriptor) !== null && _a !== void 0 ? _a : false;
     // Clone the symbol table of the old class type.
     const fields = types_1.ClassType.getSymbolTable(propertyClass);
     types_1.ClassType.getSymbolTable(classType).forEach((symbol, name) => {
@@ -155,9 +155,9 @@ function clonePropertyWithDeleter(evaluator, prop, fdel, errorNode) {
     // Update the __get__ and __set__ methods if present.
     updateGetSetDelMethodForClonedProperty(evaluator, propertyObject);
     // Fill in the fdel method.
-    propertyObject.fdelInfo = {
-        methodType: types_1.FunctionType.cloneWithNewFlags(fdel, fdel.details.flags | 4 /* FunctionTypeFlags.StaticMethod */),
-        classType: fdel.details.methodClass,
+    propertyObject.priv.fdelInfo = {
+        methodType: types_1.FunctionType.cloneWithNewFlags(fdel, fdel.shared.flags | 4 /* FunctionTypeFlags.StaticMethod */),
+        classType: fdel.shared.methodClass,
     };
     // Fill in the __delete__ method.
     addDelMethodToPropertySymbolTable(evaluator, propertyObject, fdel);
@@ -171,63 +171,31 @@ function addGetMethodToPropertySymbolTable(evaluator, propertyObject, fget) {
     // The first overload is for accesses through a class object (where
     // the instance argument is None).
     const getFunction1 = types_1.FunctionType.createSynthesizedInstance('__get__', 256 /* FunctionTypeFlags.Overloaded */);
-    types_1.FunctionType.addParameter(getFunction1, {
-        category: 0 /* ParameterCategory.Simple */,
-        name: 'self',
-        type: types_1.AnyType.create(),
-        hasDeclaredType: true,
-    });
-    types_1.FunctionType.addParameter(getFunction1, {
-        category: 0 /* ParameterCategory.Simple */,
-        name: 'obj',
-        type: evaluator.getNoneType(),
-        hasDeclaredType: true,
-    });
-    types_1.FunctionType.addParameter(getFunction1, {
-        category: 0 /* ParameterCategory.Simple */,
-        name: 'objtype',
-        type: types_1.AnyType.create(),
-        hasDeclaredType: true,
-        hasDefault: true,
-        defaultType: types_1.AnyType.create(),
-    });
-    getFunction1.details.declaredReturnType = types_1.FunctionType.isClassMethod(fget)
+    types_1.FunctionType.addParameter(getFunction1, types_1.FunctionParam.create(0 /* ParameterCategory.Simple */, types_1.AnyType.create(), types_1.FunctionParamFlags.TypeDeclared, 'self'));
+    types_1.FunctionType.addParameter(getFunction1, types_1.FunctionParam.create(0 /* ParameterCategory.Simple */, evaluator.getNoneType(), types_1.FunctionParamFlags.TypeDeclared, 'obj'));
+    types_1.FunctionType.addParameter(getFunction1, types_1.FunctionParam.create(0 /* ParameterCategory.Simple */, types_1.AnyType.create(), types_1.FunctionParamFlags.TypeDeclared, 'objtype', types_1.AnyType.create(/* isEllipsis */ true)));
+    getFunction1.shared.declaredReturnType = types_1.FunctionType.isClassMethod(fget)
         ? types_1.FunctionType.getEffectiveReturnType(fget)
         : propertyObject;
-    getFunction1.details.declaration = fget.details.declaration;
-    getFunction1.details.deprecatedMessage = fget.details.deprecatedMessage;
+    getFunction1.shared.declaration = fget.shared.declaration;
+    getFunction1.shared.deprecatedMessage = fget.shared.deprecatedMessage;
+    getFunction1.shared.methodClass = fget.shared.methodClass;
     // Override the scope ID since we're using parameter types from the
     // decorated function.
-    getFunction1.details.typeVarScopeId = (0, typeUtils_1.getTypeVarScopeId)(fget);
+    getFunction1.shared.typeVarScopeId = (0, typeUtils_1.getTypeVarScopeId)(fget);
     // The second overload is for accesses through a class instance.
     const getFunction2 = types_1.FunctionType.createSynthesizedInstance('__get__', 256 /* FunctionTypeFlags.Overloaded */);
-    types_1.FunctionType.addParameter(getFunction2, {
-        category: 0 /* ParameterCategory.Simple */,
-        name: 'self',
-        type: types_1.AnyType.create(),
-        hasDeclaredType: true,
-    });
-    const objType = fget.details.parameters.length > 0 ? types_1.FunctionType.getEffectiveParameterType(fget, 0) : types_1.AnyType.create();
-    types_1.FunctionType.addParameter(getFunction2, {
-        category: 0 /* ParameterCategory.Simple */,
-        name: 'obj',
-        type: objType,
-        hasDeclaredType: true,
-    });
-    types_1.FunctionType.addParameter(getFunction2, {
-        category: 0 /* ParameterCategory.Simple */,
-        name: 'objtype',
-        type: types_1.AnyType.create(),
-        hasDeclaredType: true,
-        hasDefault: true,
-        defaultType: types_1.AnyType.create(),
-    });
-    getFunction2.details.declaredReturnType = types_1.FunctionType.getEffectiveReturnType(fget);
-    getFunction2.details.declaration = fget.details.declaration;
-    getFunction2.details.deprecatedMessage = fget.details.deprecatedMessage;
+    types_1.FunctionType.addParameter(getFunction2, types_1.FunctionParam.create(0 /* ParameterCategory.Simple */, types_1.AnyType.create(), types_1.FunctionParamFlags.TypeDeclared, 'self'));
+    const objType = fget.shared.parameters.length > 0 ? types_1.FunctionType.getEffectiveParameterType(fget, 0) : types_1.AnyType.create();
+    types_1.FunctionType.addParameter(getFunction2, types_1.FunctionParam.create(0 /* ParameterCategory.Simple */, objType, types_1.FunctionParamFlags.TypeDeclared, 'obj'));
+    types_1.FunctionType.addParameter(getFunction2, types_1.FunctionParam.create(0 /* ParameterCategory.Simple */, types_1.AnyType.create(), types_1.FunctionParamFlags.TypeDeclared, 'objtype', types_1.AnyType.create(/* isEllipsis */ true)));
+    getFunction2.shared.declaredReturnType = types_1.FunctionType.getEffectiveReturnType(fget);
+    getFunction2.shared.declaration = fget.shared.declaration;
+    getFunction2.shared.deprecatedMessage = fget.shared.deprecatedMessage;
+    getFunction2.shared.methodClass = fget.shared.methodClass;
     // Override the scope ID since we're using parameter types from the
     // decorated function.
-    getFunction2.details.typeVarScopeId = (0, typeUtils_1.getTypeVarScopeId)(fget);
+    getFunction2.shared.typeVarScopeId = (0, typeUtils_1.getTypeVarScopeId)(fget);
     // We previously placed getFunction1 before getFunction2, but this creates
     // problems specifically for the `NoneType` class because None.__class__
     // is a property, and both overloads match in this case because None
@@ -239,79 +207,56 @@ function addGetMethodToPropertySymbolTable(evaluator, propertyObject, fget) {
 function addSetMethodToPropertySymbolTable(evaluator, propertyObject, fset) {
     const fields = types_1.ClassType.getSymbolTable(propertyObject);
     const setFunction = types_1.FunctionType.createSynthesizedInstance('__set__');
-    types_1.FunctionType.addParameter(setFunction, {
-        category: 0 /* ParameterCategory.Simple */,
-        name: 'self',
-        type: types_1.AnyType.create(),
-        hasDeclaredType: true,
-    });
-    let objType = fset.details.parameters.length > 0 ? types_1.FunctionType.getEffectiveParameterType(fset, 0) : types_1.AnyType.create();
-    if ((0, types_1.isTypeVar)(objType) && objType.details.isSynthesizedSelf) {
+    types_1.FunctionType.addParameter(setFunction, types_1.FunctionParam.create(0 /* ParameterCategory.Simple */, types_1.AnyType.create(), types_1.FunctionParamFlags.TypeDeclared, 'self'));
+    let objType = fset.shared.parameters.length > 0 ? types_1.FunctionType.getEffectiveParameterType(fset, 0) : types_1.AnyType.create();
+    if ((0, types_1.isTypeVar)(objType) && objType.shared.isSynthesizedSelf) {
         objType = evaluator.makeTopLevelTypeVarsConcrete(objType);
     }
-    types_1.FunctionType.addParameter(setFunction, {
-        category: 0 /* ParameterCategory.Simple */,
-        name: 'obj',
-        type: (0, types_1.combineTypes)([objType, evaluator.getNoneType()]),
-        hasDeclaredType: true,
-    });
-    setFunction.details.declaredReturnType = evaluator.getNoneType();
+    types_1.FunctionType.addParameter(setFunction, types_1.FunctionParam.create(0 /* ParameterCategory.Simple */, (0, types_1.combineTypes)([objType, evaluator.getNoneType()]), types_1.FunctionParamFlags.TypeDeclared, 'obj'));
+    setFunction.shared.declaredReturnType = evaluator.getNoneType();
     // Adopt the TypeVarScopeId of the fset function in case it has any
     // TypeVars that need to be solved.
-    setFunction.details.typeVarScopeId = (0, typeUtils_1.getTypeVarScopeId)(fset);
-    setFunction.details.deprecatedMessage = fset.details.deprecatedMessage;
+    setFunction.shared.typeVarScopeId = (0, typeUtils_1.getTypeVarScopeId)(fset);
+    setFunction.shared.deprecatedMessage = fset.shared.deprecatedMessage;
+    setFunction.shared.methodClass = fset.shared.methodClass;
     let setParamType = types_1.UnknownType.create();
-    if (fset.details.parameters.length >= 2 &&
-        fset.details.parameters[1].category === 0 /* ParameterCategory.Simple */ &&
-        fset.details.parameters[1].name) {
-        setParamType = fset.details.parameters[1].type;
+    if (fset.shared.parameters.length >= 2 &&
+        fset.shared.parameters[1].category === 0 /* ParameterCategory.Simple */ &&
+        fset.shared.parameters[1].name) {
+        setParamType = fset.shared.parameters[1].type;
     }
-    types_1.FunctionType.addParameter(setFunction, {
-        category: 0 /* ParameterCategory.Simple */,
-        name: 'value',
-        type: setParamType,
-        hasDeclaredType: true,
-    });
+    types_1.FunctionType.addParameter(setFunction, types_1.FunctionParam.create(0 /* ParameterCategory.Simple */, setParamType, types_1.FunctionParamFlags.TypeDeclared, 'value'));
     const setSymbol = symbol_1.Symbol.createWithType(4 /* SymbolFlags.ClassMember */, setFunction);
     fields.set('__set__', setSymbol);
 }
 function addDelMethodToPropertySymbolTable(evaluator, propertyObject, fdel) {
     const fields = types_1.ClassType.getSymbolTable(propertyObject);
     const delFunction = types_1.FunctionType.createSynthesizedInstance('__delete__');
-    types_1.FunctionType.addParameter(delFunction, {
-        category: 0 /* ParameterCategory.Simple */,
-        name: 'self',
-        type: types_1.AnyType.create(),
-        hasDeclaredType: true,
-    });
+    types_1.FunctionType.addParameter(delFunction, types_1.FunctionParam.create(0 /* ParameterCategory.Simple */, types_1.AnyType.create(), types_1.FunctionParamFlags.TypeDeclared, 'self'));
     // Adopt the TypeVarScopeId of the fdel function in case it has any
     // TypeVars that need to be solved.
-    delFunction.details.typeVarScopeId = (0, typeUtils_1.getTypeVarScopeId)(fdel);
-    delFunction.details.deprecatedMessage = fdel.details.deprecatedMessage;
-    let objType = fdel.details.parameters.length > 0 ? types_1.FunctionType.getEffectiveParameterType(fdel, 0) : types_1.AnyType.create();
-    if ((0, types_1.isTypeVar)(objType) && objType.details.isSynthesizedSelf) {
+    delFunction.shared.typeVarScopeId = (0, typeUtils_1.getTypeVarScopeId)(fdel);
+    delFunction.shared.deprecatedMessage = fdel.shared.deprecatedMessage;
+    delFunction.shared.methodClass = fdel.shared.methodClass;
+    let objType = fdel.shared.parameters.length > 0 ? types_1.FunctionType.getEffectiveParameterType(fdel, 0) : types_1.AnyType.create();
+    if ((0, types_1.isTypeVar)(objType) && objType.shared.isSynthesizedSelf) {
         objType = evaluator.makeTopLevelTypeVarsConcrete(objType);
     }
-    types_1.FunctionType.addParameter(delFunction, {
-        category: 0 /* ParameterCategory.Simple */,
-        name: 'obj',
-        type: (0, types_1.combineTypes)([objType, evaluator.getNoneType()]),
-        hasDeclaredType: true,
-    });
-    delFunction.details.declaredReturnType = evaluator.getNoneType();
+    types_1.FunctionType.addParameter(delFunction, types_1.FunctionParam.create(0 /* ParameterCategory.Simple */, (0, types_1.combineTypes)([objType, evaluator.getNoneType()]), types_1.FunctionParamFlags.TypeDeclared, 'obj'));
+    delFunction.shared.declaredReturnType = evaluator.getNoneType();
     const delSymbol = symbol_1.Symbol.createWithType(4 /* SymbolFlags.ClassMember */, delFunction);
     fields.set('__delete__', delSymbol);
 }
 function updateGetSetDelMethodForClonedProperty(evaluator, propertyObject) {
-    const fgetInfo = propertyObject.fgetInfo;
+    const fgetInfo = propertyObject.priv.fgetInfo;
     if (fgetInfo && (0, types_1.isFunction)(fgetInfo.methodType)) {
         addGetMethodToPropertySymbolTable(evaluator, propertyObject, fgetInfo.methodType);
     }
-    const fsetInfo = propertyObject.fsetInfo;
+    const fsetInfo = propertyObject.priv.fsetInfo;
     if (fsetInfo && (0, types_1.isFunction)(fsetInfo.methodType)) {
         addSetMethodToPropertySymbolTable(evaluator, propertyObject, fsetInfo.methodType);
     }
-    const fdelInfo = propertyObject.fdelInfo;
+    const fdelInfo = propertyObject.priv.fdelInfo;
     if (fdelInfo && (0, types_1.isFunction)(fdelInfo.methodType)) {
         addDelMethodToPropertySymbolTable(evaluator, propertyObject, fdelInfo.methodType);
     }
@@ -321,19 +266,9 @@ function addDecoratorMethodsToPropertySymbolTable(propertyObject) {
     // Fill in the getter, setter and deleter methods.
     ['getter', 'setter', 'deleter'].forEach((accessorName) => {
         const accessorFunction = types_1.FunctionType.createSynthesizedInstance(accessorName);
-        types_1.FunctionType.addParameter(accessorFunction, {
-            category: 0 /* ParameterCategory.Simple */,
-            name: 'self',
-            type: types_1.AnyType.create(),
-            hasDeclaredType: true,
-        });
-        types_1.FunctionType.addParameter(accessorFunction, {
-            category: 0 /* ParameterCategory.Simple */,
-            name: 'accessor',
-            type: types_1.AnyType.create(),
-            hasDeclaredType: true,
-        });
-        accessorFunction.details.declaredReturnType = propertyObject;
+        types_1.FunctionType.addParameter(accessorFunction, types_1.FunctionParam.create(0 /* ParameterCategory.Simple */, types_1.AnyType.create(), types_1.FunctionParamFlags.TypeDeclared, 'self'));
+        types_1.FunctionType.addParameter(accessorFunction, types_1.FunctionParam.create(0 /* ParameterCategory.Simple */, types_1.AnyType.create(), types_1.FunctionParamFlags.TypeDeclared, 'accessor'));
+        accessorFunction.shared.declaredReturnType = propertyObject;
         const accessorSymbol = symbol_1.Symbol.createWithType(4 /* SymbolFlags.ClassMember */, accessorFunction);
         fields.set(accessorName, accessorSymbol);
     });
@@ -344,17 +279,17 @@ function assignProperty(evaluator, destPropertyType, srcPropertyType, destClass,
     let isAssignable = true;
     const accessors = [
         {
-            getFunction: (c) => { var _a; return (_a = c.fgetInfo) === null || _a === void 0 ? void 0 : _a.methodType; },
+            getFunction: (c) => { var _a; return (_a = c.priv.fgetInfo) === null || _a === void 0 ? void 0 : _a.methodType; },
             missingDiagMsg: localize_1.LocAddendum.missingGetter,
             incompatibleDiagMsg: localize_1.LocAddendum.incompatibleGetter,
         },
         {
-            getFunction: (c) => { var _a; return (_a = c.fsetInfo) === null || _a === void 0 ? void 0 : _a.methodType; },
+            getFunction: (c) => { var _a; return (_a = c.priv.fsetInfo) === null || _a === void 0 ? void 0 : _a.methodType; },
             missingDiagMsg: localize_1.LocAddendum.missingSetter,
             incompatibleDiagMsg: localize_1.LocAddendum.incompatibleSetter,
         },
         {
-            getFunction: (c) => { var _a; return (_a = c.fdelInfo) === null || _a === void 0 ? void 0 : _a.methodType; },
+            getFunction: (c) => { var _a; return (_a = c.priv.fdelInfo) === null || _a === void 0 ? void 0 : _a.methodType; },
             missingDiagMsg: localize_1.LocAddendum.missingDeleter,
             incompatibleDiagMsg: localize_1.LocAddendum.incompatibleDeleter,
         },
@@ -379,8 +314,8 @@ function assignProperty(evaluator, destPropertyType, srcPropertyType, destClass,
             // variables because they do not bind go the "property" class that
             // contains them, but we'll turn it back into a non-static method
             // here and bind them to the associated objects.
-            destAccessType = types_1.FunctionType.cloneWithNewFlags(destAccessType, destAccessType.details.flags & ~4 /* FunctionTypeFlags.StaticMethod */);
-            srcAccessType = types_1.FunctionType.cloneWithNewFlags(srcAccessType, srcAccessType.details.flags & ~4 /* FunctionTypeFlags.StaticMethod */);
+            destAccessType = types_1.FunctionType.cloneWithNewFlags(destAccessType, destAccessType.shared.flags & ~4 /* FunctionTypeFlags.StaticMethod */);
+            srcAccessType = types_1.FunctionType.cloneWithNewFlags(srcAccessType, srcAccessType.shared.flags & ~4 /* FunctionTypeFlags.StaticMethod */);
             const boundDestAccessType = evaluator.bindFunctionToClassOrObject(destObjectToBind, destAccessType, 
             /* memberClass */ undefined, 
             /* treatConstructorAsClassMethod */ undefined, 

package/dist/analyzer/properties.js.map

@@ -1 +1 @@
-{"version":3,"file":"properties.js","sourceRoot":"","sources":["../../../../../src/analyzer/properties.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"properties.js","sourceRoot":"","sources":["../../../../../src/analyzer/properties.ts"],"names":[],"mappings":"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"}

package/dist/analyzer/protocols.js

@@ -87,7 +87,7 @@ function isMethodOnlyProtocol(classType) {
         return false;
     }
     // First check for data members in any protocol base classes.
-    for (const baseClass of classType.details.baseClasses) {
+    for (const baseClass of classType.shared.baseClasses) {
         if ((0, types_1.isClass)(baseClass) && types_1.ClassType.isProtocolClass(baseClass) && !isMethodOnlyProtocol(baseClass)) {
             return false;
         }
@@ -112,7 +112,7 @@ function isProtocolUnsafeOverlap(evaluator, protocol, classType) {
         return false;
     }
     let isUnsafeOverlap = true;
-    protocol.details.mro.forEach((mroClass) => {
+    protocol.shared.mro.forEach((mroClass) => {
         if (!isUnsafeOverlap || !(0, types_1.isInstantiableClass)(mroClass) || !types_1.ClassType.isProtocolClass(mroClass)) {
             return;
         }
@@ -133,8 +133,8 @@ exports.isProtocolUnsafeOverlap = isProtocolUnsafeOverlap;
 // Looks up the protocol compatibility in the cache. If it's not found,
 // return undefined.
 function getProtocolCompatibility(destType, srcType, flags, typeVarContext) {
-    const map = srcType.details.protocolCompatibility;
-    const entries = map === null || map === void 0 ? void 0 : map.get(destType.details.fullName);
+    const map = srcType.shared.protocolCompatibility;
+    const entries = map === null || map === void 0 ? void 0 : map.get(destType.shared.fullName);
     if (entries === undefined) {
         return undefined;
     }
@@ -147,15 +147,15 @@ function getProtocolCompatibility(destType, srcType, flags, typeVarContext) {
     return entry === null || entry === void 0 ? void 0 : entry.isCompatible;
 }
 function setProtocolCompatibility(destType, srcType, flags, typeVarContext, isCompatible) {
-    let map = srcType.details.protocolCompatibility;
+    let map = srcType.shared.protocolCompatibility;
     if (!map) {
         map = new Map();
-        srcType.details.protocolCompatibility = map;
+        srcType.shared.protocolCompatibility = map;
     }
-    let entries = map.get(destType.details.fullName);
+    let entries = map.get(destType.shared.fullName);
     if (!entries) {
         entries = [];
-        map.set(destType.details.fullName, entries);
+        map.set(destType.shared.fullName, entries);
     }
     entries.push({
         destType,
@@ -175,7 +175,7 @@ function isTypeVarContextSame(context1, context2) {
     return context1.isSame(context2);
 }
 function assignClassToProtocolInternal(evaluator, destType, srcType, diag, destTypeVarContext, srcTypeVarContext, flags, recursionCount) {
-    var _a;
+    var _a, _b;
     if ((flags & 1 /* AssignTypeFlags.EnforceInvariance */) !== 0) {
         return (0, types_1.isTypeSame)(destType, srcType);
     }
@@ -187,9 +187,13 @@ function assignClassToProtocolInternal(evaluator, destType, srcType, diag, destT
     if ((0, types_1.isClass)(srcType)) {
         // If the srcType is conditioned on "self", use "Self" as the selfType.
         // Otherwise use the class type for selfType.
-        if ((_a = srcType.condition) === null || _a === void 0 ? void 0 : _a.some((c) => c.typeVar.details.isSynthesizedSelf)) {
+        const synthCond = (_b = (_a = srcType.props) === null || _a === void 0 ? void 0 : _a.condition) === null || _b === void 0 ? void 0 : _b.find((c) => c.typeVar.shared.isSynthesizedSelf);
+        if (synthCond) {
             selfType = (0, typeUtils_1.synthesizeTypeVarForSelfCls)(types_1.TypeBase.cloneForCondition(srcType, undefined), 
             /* isClsType */ false);
+            if (types_1.TypeVarType.hasInternalScopeId(synthCond.typeVar)) {
+                selfType = types_1.TypeVarType.cloneWithInternalScopeId(selfType);
+            }
         }
         else {
             selfType = srcType;
@@ -207,11 +211,11 @@ function assignClassToProtocolInternal(evaluator, destType, srcType, diag, destT
     }
     let typesAreConsistent = true;
     const checkedSymbolSet = new Set();
-    let assignTypeFlags = flags & (16 /* AssignTypeFlags.OverloadOverlapCheck */ | 32 /* AssignTypeFlags.PartialOverloadOverlapCheck */);
+    let assignTypeFlags = flags & (16 /* AssignTypeFlags.OverloadOverlap */ | 32 /* AssignTypeFlags.PartialOverloadOverlap */);
     assignTypeFlags |= (0, typeUtils_1.containsLiteralType)(srcType, /* includeTypeArgs */ true)
         ? 256 /* AssignTypeFlags.RetainLiteralsForTypeVar */
         : 0 /* AssignTypeFlags.Default */;
-    destType.details.mro.forEach((mroClass) => {
+    destType.shared.mro.forEach((mroClass) => {
         if (!(0, types_1.isInstantiableClass)(mroClass) || !types_1.ClassType.isProtocolClass(mroClass)) {
             return;
         }
@@ -255,9 +259,9 @@ function assignClassToProtocolInternal(evaluator, destType, srcType, diag, destT
             if ((0, types_1.isClass)(srcType)) {
                 // Look in the metaclass first if we're treating the source as an instantiable class.
                 if (sourceIsClassObject &&
-                    srcType.details.effectiveMetaclass &&
-                    (0, types_1.isInstantiableClass)(srcType.details.effectiveMetaclass)) {
-                    srcMemberInfo = (0, typeUtils_1.lookUpClassMember)(srcType.details.effectiveMetaclass, name);
+                    srcType.shared.effectiveMetaclass &&
+                    (0, types_1.isInstantiableClass)(srcType.shared.effectiveMetaclass)) {
+                    srcMemberInfo = (0, typeUtils_1.lookUpClassMember)(srcType.shared.effectiveMetaclass, name);
                     if (srcMemberInfo) {
                         isMemberFromMetaclass = true;
                     }
@@ -275,7 +279,7 @@ function assignClassToProtocolInternal(evaluator, destType, srcType, diag, destT
                 // We can skip this if it's the dest class because it is already
                 // specialized.
                 if (!types_1.ClassType.isSameGenericClass(mroClass, destType)) {
-                    destMemberType = (0, typeUtils_1.partiallySpecializeType)(destMemberType, mroClass, selfType);
+                    destMemberType = (0, typeUtils_1.partiallySpecializeType)(destMemberType, mroClass, evaluator.getTypeClassType(), selfType);
                 }
                 if ((0, types_1.isInstantiableClass)(srcMemberInfo.classType)) {
                     const symbolType = evaluator.getEffectiveTypeOfSymbol(srcMemberInfo.symbol);
@@ -283,7 +287,7 @@ function assignClassToProtocolInternal(evaluator, destType, srcType, diag, destT
                     if ((0, types_1.isFunction)(symbolType)) {
                         evaluator.inferReturnTypeIfNecessary(symbolType);
                     }
-                    srcMemberType = (0, typeUtils_1.partiallySpecializeType)(symbolType, srcMemberInfo.classType, selfType);
+                    srcMemberType = (0, typeUtils_1.partiallySpecializeType)(symbolType, srcMemberInfo.classType, evaluator.getTypeClassType(), selfType);
                 }
                 else {
                     srcMemberType = types_1.UnknownType.create();
@@ -324,7 +328,7 @@ function assignClassToProtocolInternal(evaluator, destType, srcType, diag, destT
                 }
             }
             else {
-                srcSymbol = srcType.fields.get(name);
+                srcSymbol = srcType.priv.fields.get(name);
                 if (!srcSymbol) {
                     diag === null || diag === void 0 ? void 0 : diag.addMessage(localize_1.LocAddendum.protocolMemberMissing().format({ name }));
                     typesAreConsistent = false;
@@ -374,7 +378,7 @@ function assignClassToProtocolInternal(evaluator, destType, srcType, diag, destT
                     // Extract the property type from the property class.
                     let getterType = evaluator.getGetterTypeFromProperty(destMemberType, /* inferTypeIfNeeded */ true);
                     if (getterType) {
-                        getterType = (0, typeUtils_1.partiallySpecializeType)(getterType, mroClass);
+                        getterType = (0, typeUtils_1.partiallySpecializeType)(getterType, mroClass, evaluator.getTypeClassType());
                     }
                     if (!getterType ||
                         !evaluator.assignType(getterType, srcMemberType, subDiag === null || subDiag === void 0 ? void 0 : subDiag.createAddendum(), protocolTypeVarContext, 
@@ -488,19 +492,19 @@ function assignClassToProtocolInternal(evaluator, destType, srcType, diag, destT
         });
     });
     // If the dest protocol has type parameters, make sure the source type arguments match.
-    if (typesAreConsistent && destType.details.typeParameters.length > 0) {
+    if (typesAreConsistent && destType.shared.typeParameters.length > 0) {
         // Create a specialized version of the protocol defined by the dest and
         // make sure the resulting type args can be assigned.
         const genericProtocolType = types_1.ClassType.cloneForSpecialization(destType, undefined, 
         /* isTypeArgumentExplicit */ false);
         const specializedProtocolType = (0, typeUtils_1.applySolvedTypeVars)(genericProtocolType, protocolTypeVarContext);
-        if (destType.typeArguments) {
+        if (destType.priv.typeArguments) {
             if (!evaluator.assignTypeArguments(destType, specializedProtocolType, diag, destTypeVarContext, srcTypeVarContext, flags, recursionCount)) {
                 typesAreConsistent = false;
             }
         }
         else if (destTypeVarContext && !destTypeVarContext.isLocked()) {
-            for (const typeParam of destType.details.typeParameters) {
+            for (const typeParam of destType.shared.typeParameters) {
                 const typeArgEntry = protocolTypeVarContext.getPrimarySignature().getTypeVar(typeParam);
                 if (typeArgEntry) {
                     destTypeVarContext.setTypeVarType(typeParam, typeArgEntry === null || typeArgEntry === void 0 ? void 0 : typeArgEntry.narrowBound, typeArgEntry === null || typeArgEntry === void 0 ? void 0 : typeArgEntry.narrowBoundNoLiterals, typeArgEntry === null || typeArgEntry === void 0 ? void 0 : typeArgEntry.wideBound);
@@ -515,13 +519,13 @@ function assignClassToProtocolInternal(evaluator, destType, srcType, diag, destT
 // the destTypeVarContext.
 function createProtocolTypeVarContext(evaluator, destType, destTypeVarContext) {
     const protocolTypeVarContext = new typeVarContext_1.TypeVarContext((0, typeUtils_1.getTypeVarScopeId)(destType));
-    destType.details.typeParameters.forEach((typeParam, index) => {
+    destType.shared.typeParameters.forEach((typeParam, index) => {
         const entry = destTypeVarContext === null || destTypeVarContext === void 0 ? void 0 : destTypeVarContext.getPrimarySignature().getTypeVar(typeParam);
         if (entry) {
             protocolTypeVarContext.setTypeVarType(typeParam, entry.narrowBound, entry.narrowBoundNoLiterals, entry.wideBound);
         }
-        else if (destType.typeArguments && index < destType.typeArguments.length) {
-            let typeArg = destType.typeArguments[index];
+        else if (destType.priv.typeArguments && index < destType.priv.typeArguments.length) {
+            let typeArg = destType.priv.typeArguments[index];
             let flags;
             let hasUnsolvedTypeVars = (0, typeUtils_1.requiresSpecialization)(typeArg);
             // If the type argument has unsolved TypeVars, see if they have