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

package/dist/analyzer/staticExpressions.js

@@ -16,11 +16,11 @@ const pythonVersion_1 = require("../common/pythonVersion");
 // statically as a bool value or true/false if it can.
 function evaluateStaticBoolExpression(node, execEnv, definedConstants, typingImportAliases, sysImportAliases) {
     if (node.nodeType === 4 /* ParseNodeType.AssignmentExpression */) {
-        return evaluateStaticBoolExpression(node.rightExpression, execEnv, definedConstants, typingImportAliases, sysImportAliases);
+        return evaluateStaticBoolExpression(node.d.rightExpr, execEnv, definedConstants, typingImportAliases, sysImportAliases);
     }
     if (node.nodeType === 55 /* ParseNodeType.UnaryOperation */) {
-        if (node.operator === 38 /* OperatorType.Not */) {
-            const value = evaluateStaticBoolLikeExpression(node.expression, execEnv, definedConstants, typingImportAliases, sysImportAliases);
+        if (node.d.operator === 38 /* OperatorType.Not */) {
+            const value = evaluateStaticBoolLikeExpression(node.d.expr, execEnv, definedConstants, typingImportAliases, sysImportAliases);
             if (value !== undefined) {
                 return !value;
             }
@@ -28,98 +28,97 @@ function evaluateStaticBoolExpression(node, execEnv, definedConstants, typingImp
     }
     else if (node.nodeType === 7 /* ParseNodeType.BinaryOperation */) {
         // Is it an OR or AND expression?
-        if (node.operator === 37 /* OperatorType.Or */ || node.operator === 36 /* OperatorType.And */) {
-            const leftValue = evaluateStaticBoolExpression(node.leftExpression, execEnv, definedConstants, typingImportAliases, sysImportAliases);
-            const rightValue = evaluateStaticBoolExpression(node.rightExpression, execEnv, definedConstants, typingImportAliases, sysImportAliases);
+        if (node.d.operator === 37 /* OperatorType.Or */ || node.d.operator === 36 /* OperatorType.And */) {
+            const leftValue = evaluateStaticBoolExpression(node.d.leftExpr, execEnv, definedConstants, typingImportAliases, sysImportAliases);
+            const rightValue = evaluateStaticBoolExpression(node.d.rightExpr, execEnv, definedConstants, typingImportAliases, sysImportAliases);
             if (leftValue === undefined || rightValue === undefined) {
                 return undefined;
             }
-            if (node.operator === 37 /* OperatorType.Or */) {
+            if (node.d.operator === 37 /* OperatorType.Or */) {
                 return leftValue || rightValue;
             }
             else {
                 return leftValue && rightValue;
             }
         }
-        if (_isSysVersionInfoExpression(node.leftExpression, sysImportAliases) &&
-            node.rightExpression.nodeType === 52 /* ParseNodeType.Tuple */) {
+        if (_isSysVersionInfoExpression(node.d.leftExpr, sysImportAliases) &&
+            node.d.rightExpr.nodeType === 52 /* ParseNodeType.Tuple */) {
             // Handle the special case of "sys.version_info >= (3, x)"
-            const comparisonVersion = _convertTupleToVersion(node.rightExpression);
-            return _evaluateVersionBinaryOperation(node.operator, execEnv.pythonVersion, comparisonVersion);
+            const comparisonVersion = _convertTupleToVersion(node.d.rightExpr);
+            return _evaluateVersionBinaryOperation(node.d.operator, execEnv.pythonVersion, comparisonVersion);
         }
-        if (node.leftExpression.nodeType === 27 /* ParseNodeType.Index */ &&
-            _isSysVersionInfoExpression(node.leftExpression.baseExpression, sysImportAliases) &&
-            node.leftExpression.items.length === 1 &&
-            !node.leftExpression.trailingComma &&
-            !node.leftExpression.items[0].name &&
-            node.leftExpression.items[0].argumentCategory === 0 /* ArgumentCategory.Simple */ &&
-            node.leftExpression.items[0].valueExpression.nodeType === 40 /* ParseNodeType.Number */ &&
-            !node.leftExpression.items[0].valueExpression.isImaginary &&
-            node.leftExpression.items[0].valueExpression.value === 0 &&
-            node.rightExpression.nodeType === 40 /* ParseNodeType.Number */ &&
-            node.rightExpression.isInteger &&
-            typeof node.rightExpression.value === 'number') {
+        if (node.d.leftExpr.nodeType === 27 /* ParseNodeType.Index */ &&
+            _isSysVersionInfoExpression(node.d.leftExpr.d.leftExpr, sysImportAliases) &&
+            node.d.leftExpr.d.items.length === 1 &&
+            !node.d.leftExpr.d.trailingComma &&
+            !node.d.leftExpr.d.items[0].d.name &&
+            node.d.leftExpr.d.items[0].d.argCategory === 0 /* ArgumentCategory.Simple */ &&
+            node.d.leftExpr.d.items[0].d.valueExpr.nodeType === 40 /* ParseNodeType.Number */ &&
+            !node.d.leftExpr.d.items[0].d.valueExpr.d.isImaginary &&
+            node.d.leftExpr.d.items[0].d.valueExpr.d.value === 0 &&
+            node.d.rightExpr.nodeType === 40 /* ParseNodeType.Number */ &&
+            node.d.rightExpr.d.isInteger &&
+            typeof node.d.rightExpr.d.value === 'number') {
             // Handle the special case of "sys.version_info[0] >= X"
-            return _evaluateVersionBinaryOperation(node.operator, new pythonVersion_1.PythonVersion(execEnv.pythonVersion.major, 0), new pythonVersion_1.PythonVersion(node.rightExpression.value, 0));
+            return _evaluateVersionBinaryOperation(node.d.operator, new pythonVersion_1.PythonVersion(execEnv.pythonVersion.major, 0), new pythonVersion_1.PythonVersion(node.d.rightExpr.d.value, 0));
         }
-        if (_isSysPlatformInfoExpression(node.leftExpression, sysImportAliases) &&
-            node.rightExpression.nodeType === 48 /* ParseNodeType.StringList */) {
+        if (_isSysPlatformInfoExpression(node.d.leftExpr, sysImportAliases) &&
+            node.d.rightExpr.nodeType === 48 /* ParseNodeType.StringList */) {
             // Handle the special case of "sys.platform != 'X'"
-            const comparisonPlatform = node.rightExpression.strings.map((s) => s.value).join('');
+            const comparisonPlatform = node.d.rightExpr.d.strings.map((s) => s.d.value).join('');
             const expectedPlatformName = _getExpectedPlatformNameFromPlatform(execEnv);
-            return _evaluateStringBinaryOperation(node.operator, expectedPlatformName, comparisonPlatform);
+            return _evaluateStringBinaryOperation(node.d.operator, expectedPlatformName, comparisonPlatform);
         }
-        if (_isOsNameInfoExpression(node.leftExpression) &&
-            node.rightExpression.nodeType === 48 /* ParseNodeType.StringList */) {
+        if (_isOsNameInfoExpression(node.d.leftExpr) && node.d.rightExpr.nodeType === 48 /* ParseNodeType.StringList */) {
             // Handle the special case of "os.name == 'X'"
-            const comparisonOsName = node.rightExpression.strings.map((s) => s.value).join('');
+            const comparisonOsName = node.d.rightExpr.d.strings.map((s) => s.d.value).join('');
             const expectedOsName = _getExpectedOsNameFromPlatform(execEnv);
             if (expectedOsName !== undefined) {
-                return _evaluateStringBinaryOperation(node.operator, expectedOsName, comparisonOsName);
+                return _evaluateStringBinaryOperation(node.d.operator, expectedOsName, comparisonOsName);
             }
         }
         else {
             // Handle the special case of <definedConstant> == 'X' or <definedConstant> != 'X'.
-            if (node.rightExpression.nodeType === 48 /* ParseNodeType.StringList */) {
+            if (node.d.rightExpr.nodeType === 48 /* ParseNodeType.StringList */) {
                 let constantValue;
-                if (node.leftExpression.nodeType === 38 /* ParseNodeType.Name */) {
-                    constantValue = definedConstants.get(node.leftExpression.value);
+                if (node.d.leftExpr.nodeType === 38 /* ParseNodeType.Name */) {
+                    constantValue = definedConstants.get(node.d.leftExpr.d.value);
                 }
-                else if (node.leftExpression.nodeType === 35 /* ParseNodeType.MemberAccess */) {
-                    constantValue = definedConstants.get(node.leftExpression.memberName.value);
+                else if (node.d.leftExpr.nodeType === 35 /* ParseNodeType.MemberAccess */) {
+                    constantValue = definedConstants.get(node.d.leftExpr.d.member.d.value);
                 }
                 if (constantValue !== undefined && typeof constantValue === 'string') {
-                    const comparisonStringName = node.rightExpression.strings.map((s) => s.value).join('');
-                    return _evaluateStringBinaryOperation(node.operator, constantValue, comparisonStringName);
+                    const comparisonStringName = node.d.rightExpr.d.strings.map((s) => s.d.value).join('');
+                    return _evaluateStringBinaryOperation(node.d.operator, constantValue, comparisonStringName);
                 }
             }
         }
     }
     else if (node.nodeType === 14 /* ParseNodeType.Constant */) {
-        if (node.constType === 33 /* KeywordType.True */) {
+        if (node.d.constType === 33 /* KeywordType.True */) {
             return true;
         }
-        else if (node.constType === 15 /* KeywordType.False */) {
+        else if (node.d.constType === 15 /* KeywordType.False */) {
             return false;
         }
     }
     else if (node.nodeType === 38 /* ParseNodeType.Name */) {
-        if (node.value === 'TYPE_CHECKING') {
+        if (node.d.value === 'TYPE_CHECKING') {
             return true;
         }
-        const constant = definedConstants.get(node.value);
+        const constant = definedConstants.get(node.d.value);
         if (constant !== undefined) {
             return !!constant;
         }
     }
     else if (node.nodeType === 35 /* ParseNodeType.MemberAccess */) {
         if (typingImportAliases &&
-            node.memberName.value === 'TYPE_CHECKING' &&
-            node.leftExpression.nodeType === 38 /* ParseNodeType.Name */ &&
-            typingImportAliases.some((alias) => alias === node.leftExpression.value)) {
+            node.d.member.d.value === 'TYPE_CHECKING' &&
+            node.d.leftExpr.nodeType === 38 /* ParseNodeType.Name */ &&
+            typingImportAliases.some((alias) => alias === node.d.leftExpr.d.value)) {
             return true;
         }
-        const constant = definedConstants.get(node.memberName.value);
+        const constant = definedConstants.get(node.d.member.d.value);
         if (constant !== undefined) {
             return !!constant;
         }
@@ -132,7 +131,7 @@ exports.evaluateStaticBoolExpression = evaluateStaticBoolExpression;
 // (like "None").
 function evaluateStaticBoolLikeExpression(node, execEnv, definedConstants, typingImportAliases, sysImportAliases) {
     if (node.nodeType === 14 /* ParseNodeType.Constant */) {
-        if (node.constType === 26 /* KeywordType.None */) {
+        if (node.d.constType === 26 /* KeywordType.None */) {
             return false;
         }
     }
@@ -140,46 +139,46 @@ function evaluateStaticBoolLikeExpression(node, execEnv, definedConstants, typin
 }
 exports.evaluateStaticBoolLikeExpression = evaluateStaticBoolLikeExpression;
 function _convertTupleToVersion(node) {
-    if (node.expressions.length >= 2) {
-        if (node.expressions[0].nodeType === 40 /* ParseNodeType.Number */ &&
-            !node.expressions[0].isImaginary &&
-            node.expressions[1].nodeType === 40 /* ParseNodeType.Number */ &&
-            !node.expressions[1].isImaginary) {
-            const majorNode = node.expressions[0];
-            const minorNode = node.expressions[1];
-            if (typeof majorNode.value !== 'number' || typeof minorNode.value !== 'number') {
+    if (node.d.items.length >= 2) {
+        if (node.d.items[0].nodeType === 40 /* ParseNodeType.Number */ &&
+            !node.d.items[0].d.isImaginary &&
+            node.d.items[1].nodeType === 40 /* ParseNodeType.Number */ &&
+            !node.d.items[1].d.isImaginary) {
+            const majorNode = node.d.items[0];
+            const minorNode = node.d.items[1];
+            if (typeof majorNode.d.value !== 'number' || typeof minorNode.d.value !== 'number') {
                 return undefined;
             }
-            const major = majorNode.value;
-            const minor = minorNode.value;
+            const major = majorNode.d.value;
+            const minor = minorNode.d.value;
             let micro;
-            if (node.expressions.length >= 3 &&
-                node.expressions[2].nodeType === 40 /* ParseNodeType.Number */ &&
-                !node.expressions[2].isImaginary &&
-                typeof node.expressions[2].value === 'number') {
-                micro = node.expressions[2].value;
+            if (node.d.items.length >= 3 &&
+                node.d.items[2].nodeType === 40 /* ParseNodeType.Number */ &&
+                !node.d.items[2].d.isImaginary &&
+                typeof node.d.items[2].d.value === 'number') {
+                micro = node.d.items[2].d.value;
             }
             let releaseLevel;
-            if (node.expressions.length >= 4 &&
-                node.expressions[3].nodeType === 48 /* ParseNodeType.StringList */ &&
-                node.expressions[3].strings.length === 1 &&
-                node.expressions[3].strings[0].nodeType === 49 /* ParseNodeType.String */) {
-                releaseLevel = node.expressions[3].strings[0].value;
+            if (node.d.items.length >= 4 &&
+                node.d.items[3].nodeType === 48 /* ParseNodeType.StringList */ &&
+                node.d.items[3].d.strings.length === 1 &&
+                node.d.items[3].d.strings[0].nodeType === 49 /* ParseNodeType.String */) {
+                releaseLevel = node.d.items[3].d.strings[0].d.value;
             }
             let serial;
-            if (node.expressions.length >= 5 &&
-                node.expressions[4].nodeType === 40 /* ParseNodeType.Number */ &&
-                !node.expressions[4].isImaginary &&
-                typeof node.expressions[4].value === 'number') {
-                serial = node.expressions[4].value;
+            if (node.d.items.length >= 5 &&
+                node.d.items[4].nodeType === 40 /* ParseNodeType.Number */ &&
+                !node.d.items[4].d.isImaginary &&
+                typeof node.d.items[4].d.value === 'number') {
+                serial = node.d.items[4].d.value;
             }
             return new pythonVersion_1.PythonVersion(major, minor, micro, releaseLevel, serial);
         }
     }
-    else if (node.expressions.length === 1) {
-        const major = node.expressions[0];
-        if (typeof major.value === 'number') {
-            return new pythonVersion_1.PythonVersion(major.value, 0);
+    else if (node.d.items.length === 1) {
+        const major = node.d.items[0];
+        if (typeof major.d.value === 'number') {
+            return new pythonVersion_1.PythonVersion(major.d.value, 0);
         }
     }
     return undefined;
@@ -220,8 +219,8 @@ function _evaluateStringBinaryOperation(operatorType, leftValue, rightValue) {
 }
 function _isSysVersionInfoExpression(node, sysImportAliases = ['sys']) {
     if (node.nodeType === 35 /* ParseNodeType.MemberAccess */) {
-        if (node.leftExpression.nodeType === 38 /* ParseNodeType.Name */ && node.memberName.value === 'version_info') {
-            if (sysImportAliases.some((alias) => alias === node.leftExpression.value)) {
+        if (node.d.leftExpr.nodeType === 38 /* ParseNodeType.Name */ && node.d.member.d.value === 'version_info') {
+            if (sysImportAliases.some((alias) => alias === node.d.leftExpr.d.value)) {
                 return true;
             }
         }
@@ -230,8 +229,8 @@ function _isSysVersionInfoExpression(node, sysImportAliases = ['sys']) {
 }
 function _isSysPlatformInfoExpression(node, sysImportAliases = ['sys']) {
     if (node.nodeType === 35 /* ParseNodeType.MemberAccess */) {
-        if (node.leftExpression.nodeType === 38 /* ParseNodeType.Name */ && node.memberName.value === 'platform') {
-            if (sysImportAliases.some((alias) => alias === node.leftExpression.value)) {
+        if (node.d.leftExpr.nodeType === 38 /* ParseNodeType.Name */ && node.d.member.d.value === 'platform') {
+            if (sysImportAliases.some((alias) => alias === node.d.leftExpr.d.value)) {
                 return true;
             }
         }
@@ -240,9 +239,9 @@ function _isSysPlatformInfoExpression(node, sysImportAliases = ['sys']) {
 }
 function _isOsNameInfoExpression(node) {
     if (node.nodeType === 35 /* ParseNodeType.MemberAccess */) {
-        if (node.leftExpression.nodeType === 38 /* ParseNodeType.Name */ &&
-            node.leftExpression.value === 'os' &&
-            node.memberName.value === 'name') {
+        if (node.d.leftExpr.nodeType === 38 /* ParseNodeType.Name */ &&
+            node.d.leftExpr.d.value === 'os' &&
+            node.d.member.d.value === 'name') {
             return true;
         }
     }

package/dist/analyzer/staticExpressions.js.map

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

package/dist/analyzer/testWalker.js

@@ -48,7 +48,7 @@ class TestWalker extends parseTreeWalker_1.ParseTreeWalker {
                         case 3 /* ParseNodeType.Assignment */:
                             // There are a few exceptions we need to deal with here. Comment
                             // annotations can occur outside of an assignment node's range.
-                            if (child === node.typeAnnotationComment) {
+                            if (child === node.d.annotationComment) {
                                 skipCheck = true;
                             }
                             // Portions of chained assignments can occur outside of an
@@ -58,7 +58,7 @@ class TestWalker extends parseTreeWalker_1.ParseTreeWalker {
                             }
                             break;
                         case 48 /* ParseNodeType.StringList */:
-                            if (child === node.typeAnnotation) {
+                            if (child === node.d.annotation) {
                                 skipCheck = true;
                             }
                             break;

package/dist/analyzer/testWalker.js.map

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

package/dist/analyzer/tracePrinter.js

@@ -68,34 +68,34 @@ function createTracePrinter(roots) {
         return '';
     }
     function printType(type) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         if (type) {
             switch (type.category) {
                 case 2 /* TypeCategory.Any */:
-                    return `Any ${wrap((_a = type.typeAliasInfo) === null || _a === void 0 ? void 0 : _a.fullName)}`;
+                    return `Any ${wrap((_b = (_a = type.props) === null || _a === void 0 ? void 0 : _a.typeAliasInfo) === null || _b === void 0 ? void 0 : _b.fullName)}`;
                 case 6 /* TypeCategory.Class */:
                     if (types_1.TypeBase.isInstantiable(type)) {
-                        return `Class '${type.details.name}' (${type.details.moduleName})`;
+                        return `Class '${type.shared.name}' (${type.shared.moduleName})`;
                     }
                     else {
-                        return `Object '${type.details.name}' (${type.details.moduleName})`;
+                        return `Object '${type.shared.name}' (${type.shared.moduleName})`;
                     }
                 case 4 /* TypeCategory.Function */:
-                    return `Function '${type.details.name}' (${type.details.moduleName})`;
+                    return `Function '${type.shared.name}' (${type.shared.moduleName})`;
                 case 7 /* TypeCategory.Module */:
-                    return `Module '${type.moduleName}' (${type.moduleName})`;
+                    return `Module '${type.priv.moduleName}' (${type.priv.moduleName})`;
                 case 3 /* TypeCategory.Never */:
-                    return `Never ${wrap((_b = type.typeAliasInfo) === null || _b === void 0 ? void 0 : _b.fullName)}`;
+                    return `Never ${wrap((_d = (_c = type.props) === null || _c === void 0 ? void 0 : _c.typeAliasInfo) === null || _d === void 0 ? void 0 : _d.fullName)}`;
                 case 5 /* TypeCategory.OverloadedFunction */:
-                    return `OverloadedFunction [${type.overloads.map((o) => wrap(printType(o), '"')).join(',')}]`;
+                    return `OverloadedFunction [${type.priv.overloads.map((o) => wrap(printType(o), '"')).join(',')}]`;
                 case 9 /* TypeCategory.TypeVar */:
-                    return `TypeVar '${type.details.name}' ${wrap((_c = type.typeAliasInfo) === null || _c === void 0 ? void 0 : _c.fullName)}`;
+                    return `TypeVar '${type.shared.name}' ${wrap((_f = (_e = type.props) === null || _e === void 0 ? void 0 : _e.typeAliasInfo) === null || _f === void 0 ? void 0 : _f.fullName)}`;
                 case 0 /* TypeCategory.Unbound */:
-                    return `Unbound ${wrap((_d = type.typeAliasInfo) === null || _d === void 0 ? void 0 : _d.fullName)}`;
+                    return `Unbound ${wrap((_h = (_g = type.props) === null || _g === void 0 ? void 0 : _g.typeAliasInfo) === null || _h === void 0 ? void 0 : _h.fullName)}`;
                 case 8 /* TypeCategory.Union */:
-                    return `Union [${type.subtypes.map((o) => wrap(printType(o), '"')).join(',')}]`;
+                    return `Union [${type.priv.subtypes.map((o) => wrap(printType(o), '"')).join(',')}]`;
                 case 1 /* TypeCategory.Unknown */:
-                    return `Unknown ${wrap((_e = type.typeAliasInfo) === null || _e === void 0 ? void 0 : _e.fullName)}`;
+                    return `Unknown ${wrap((_k = (_j = type.props) === null || _j === void 0 ? void 0 : _j.typeAliasInfo) === null || _k === void 0 ? void 0 : _k.fullName)}`;
                 default:
                     (0, debug_1.assertNever)(type);
             }
@@ -166,23 +166,23 @@ function createTracePrinter(roots) {
         }
         switch (node.nodeType) {
             case 24 /* ParseNodeType.ImportAs */:
-                return `importAs '${printNode(node.module)}' ${wrap(node.alias ? printNode(node.alias) : '')} ${path}`;
+                return `importAs '${printNode(node.d.module)}' ${wrap(node.d.alias ? printNode(node.d.alias) : '')} ${path}`;
             case 25 /* ParseNodeType.ImportFrom */:
-                return `importFrom [${node.imports.map((i) => wrap(printNode(i), '"')).join(',')}]`;
+                return `importFrom [${node.d.imports.map((i) => wrap(printNode(i), '"')).join(',')}]`;
             case 26 /* ParseNodeType.ImportFromAs */:
-                return `ImportFromAs '${printNode(node.name)}' ${wrap(node.alias ? printNode(node.alias) : '')} ${path}`;
+                return `ImportFromAs '${printNode(node.d.name)}' ${wrap(node.d.alias ? printNode(node.d.alias) : '')} ${path}`;
             case 36 /* ParseNodeType.Module */:
                 return `module ${path}`;
             case 10 /* ParseNodeType.Class */:
-                return `class '${printNode(node.name)}' ${path}`;
+                return `class '${printNode(node.d.name)}' ${path}`;
             case 31 /* ParseNodeType.Function */:
-                return `function '${printNode(node.name)}' ${path}`;
+                return `function '${printNode(node.d.name)}' ${path}`;
             case 37 /* ParseNodeType.ModuleName */:
-                return `moduleName '${node.nameParts.map((n) => printNode(n)).join('.')}' ${path}`;
+                return `moduleName '${node.d.nameParts.map((n) => printNode(n)).join('.')}' ${path}`;
             case 1 /* ParseNodeType.Argument */:
-                return `argument '${node.name ? printNode(node.name) : 'N/A'}' ${path}`;
+                return `argument '${node.d.name ? printNode(node.d.name) : 'N/A'}' ${path}`;
             case 41 /* ParseNodeType.Parameter */:
-                return `parameter '${node.name ? printNode(node.name) : 'N/A'}' ${path}`;
+                return `parameter '${node.d.name ? printNode(node.d.name) : 'N/A'}' ${path}`;
             default:
                 return `${ParseTreeUtils.printParseNodeType(node.nodeType)} ${path}`;
         }

package/dist/analyzer/tracePrinter.js.map

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

package/dist/analyzer/typeDocStringUtils.js

@@ -45,17 +45,17 @@ const DefaultClassIteratorFlagsForFunctions = 4 /* MemberAccessFlags.SkipObjectB
     64 /* MemberAccessFlags.DeclaredTypesOnly */;
 function isInheritedFromBuiltin(type, classType) {
     if (type.category === 5 /* TypeCategory.OverloadedFunction */) {
-        if (type.overloads.length === 0) {
+        if (type.priv.overloads.length === 0) {
             return false;
         }
-        type = type.overloads[0];
+        type = type.priv.overloads[0];
     }
     // Functions that are bound to a different type than where they
     // were declared are inherited.
-    return (!!type.details.methodClass &&
-        types_1.ClassType.isBuiltIn(type.details.methodClass) &&
-        !!type.boundToType &&
-        !types_1.ClassType.isBuiltIn(type.boundToType));
+    return (!!type.shared.methodClass &&
+        types_1.ClassType.isBuiltIn(type.shared.methodClass) &&
+        !!type.priv.boundToType &&
+        !types_1.ClassType.isBuiltIn(type.priv.boundToType));
 }
 function getFunctionDocStringInherited(type, resolvedDecl, sourceMapper, classType) {
     let docString;
@@ -67,7 +67,7 @@ function getFunctionDocStringInherited(type, resolvedDecl, sourceMapper, classTy
     }
     // Search mro
     if (!docString && classType) {
-        const funcName = type.details.name;
+        const funcName = type.shared.name;
         const memberIterator = (0, typeUtils_1.getClassMemberIterator)(classType, funcName, DefaultClassIteratorFlagsForFunctions);
         for (const classMember of memberIterator) {
             const decls = classMember.symbol.getDeclarations();
@@ -82,7 +82,7 @@ function getFunctionDocStringInherited(type, resolvedDecl, sourceMapper, classTy
             }
         }
     }
-    return docString || type.details.docString;
+    return docString || type.shared.docString;
 }
 exports.getFunctionDocStringInherited = getFunctionDocStringInherited;
 function getOverloadedFunctionDocStringsInherited(type, resolvedDecls, sourceMapper, evaluator, classType) {
@@ -100,8 +100,8 @@ function getOverloadedFunctionDocStringsInherited(type, resolvedDecls, sourceMap
         }
     }
     // Search mro
-    if (classType && type.overloads.length > 0) {
-        const funcName = type.overloads[0].details.name;
+    if (classType && type.priv.overloads.length > 0) {
+        const funcName = type.priv.overloads[0].shared.name;
         const memberIterator = (0, typeUtils_1.getClassMemberIterator)(classType, funcName, DefaultClassIteratorFlagsForFunctions);
         for (const classMember of memberIterator) {
             const inheritedDecl = classMember.symbol.getDeclarations().slice(-1)[0];
@@ -118,7 +118,7 @@ function getOverloadedFunctionDocStringsInherited(type, resolvedDecls, sourceMap
 }
 exports.getOverloadedFunctionDocStringsInherited = getOverloadedFunctionDocStringsInherited;
 function getPropertyDocStringInherited(decl, sourceMapper, evaluator) {
-    const enclosingClass = ParseTreeUtils.getEnclosingClass(decl.node.name, /* stopAtFunction */ false);
+    const enclosingClass = ParseTreeUtils.getEnclosingClass(decl.node.d.name, /* stopAtFunction */ false);
     const classResults = enclosingClass ? evaluator.getTypeOfClass(enclosingClass) : undefined;
     if (classResults) {
         return _getPropertyDocStringInherited(decl, sourceMapper, evaluator, classResults.classType);
@@ -156,8 +156,8 @@ function isBuiltInModule(uri) {
 exports.isBuiltInModule = isBuiltInModule;
 function getModuleDocStringFromModuleNodes(modules) {
     for (const module of modules) {
-        if (module.statements) {
-            const docString = ParseTreeUtils.getDocString(module.statements);
+        if (module.d.statements) {
+            const docString = ParseTreeUtils.getDocString(module.d.statements);
             if (docString) {
                 return docString;
             }
@@ -179,16 +179,16 @@ function getModuleDocStringFromUris(uris, sourceMapper) {
 exports.getModuleDocStringFromUris = getModuleDocStringFromUris;
 function getModuleDocString(type, resolvedDecl, sourceMapper) {
     var _a;
-    let docString = type.docString;
+    let docString = type.priv.docString;
     if (!docString) {
-        const uri = (_a = resolvedDecl === null || resolvedDecl === void 0 ? void 0 : resolvedDecl.uri) !== null && _a !== void 0 ? _a : type.fileUri;
+        const uri = (_a = resolvedDecl === null || resolvedDecl === void 0 ? void 0 : resolvedDecl.uri) !== null && _a !== void 0 ? _a : type.priv.fileUri;
         docString = getModuleDocStringFromUris([uri], sourceMapper);
     }
     return docString;
 }
 exports.getModuleDocString = getModuleDocString;
 function getClassDocString(classType, resolvedDecl, sourceMapper) {
-    let docString = classType.details.docString;
+    let docString = classType.shared.docString;
     if (!docString && resolvedDecl && _isAnyClassDeclaration(resolvedDecl)) {
         docString = (0, declaration_1.isClassDeclaration)(resolvedDecl) ? _getFunctionOrClassDeclsDocString([resolvedDecl]) : undefined;
         if (!docString && resolvedDecl && (0, sourceMapper_1.isStubFile)(resolvedDecl.uri)) {
@@ -216,7 +216,7 @@ function getClassDocString(classType, resolvedDecl, sourceMapper) {
 exports.getClassDocString = getClassDocString;
 function getFunctionOrClassDeclDocString(decl) {
     var _a, _b, _c;
-    return ParseTreeUtils.getDocString((_c = (_b = (_a = decl.node) === null || _a === void 0 ? void 0 : _a.suite) === null || _b === void 0 ? void 0 : _b.statements) !== null && _c !== void 0 ? _c : []);
+    return ParseTreeUtils.getDocString((_c = (_b = (_a = decl.node) === null || _a === void 0 ? void 0 : _a.d.suite) === null || _b === void 0 ? void 0 : _b.d.statements) !== null && _c !== void 0 ? _c : []);
 }
 exports.getFunctionOrClassDeclDocString = getFunctionOrClassDeclDocString;
 function getVariableDocString(decl, sourceMapper) {
@@ -236,10 +236,10 @@ function _getOverloadedFunctionDocStrings(type, resolvedDecl, sourceMapper) {
         return undefined;
     }
     const docStrings = [];
-    if (type.overloads.some((o) => o.details.docString)) {
-        type.overloads.forEach((overload) => {
-            if (overload.details.docString) {
-                docStrings.push(overload.details.docString);
+    if (type.priv.overloads.some((o) => o.shared.docString)) {
+        type.priv.overloads.forEach((overload) => {
+            if (overload.shared.docString) {
+                docStrings.push(overload.shared.docString);
             }
         });
     }
@@ -261,7 +261,7 @@ function _getPropertyDocStringInherited(decl, sourceMapper, evaluator, classType
     if (!declaredType || !(0, typeUtils_1.isMaybeDescriptorInstance)(declaredType)) {
         return;
     }
-    const fieldName = decl.node.nodeType === 31 /* ParseNodeType.Function */ ? decl.node.name.value : undefined;
+    const fieldName = decl.node.nodeType === 31 /* ParseNodeType.Function */ ? decl.node.d.name.d.value : undefined;
     if (!fieldName) {
         return;
     }
@@ -294,12 +294,12 @@ function _getFunctionDocString(type, resolvedDecl, sourceMapper) {
     if (!(0, types_1.isFunction)(type)) {
         return undefined;
     }
-    let docString = type.details.docString;
+    let docString = type.shared.docString;
     if (!docString && resolvedDecl) {
         docString = _getFunctionDocStringFromDeclaration(resolvedDecl, sourceMapper);
     }
-    if (!docString && type.details.declaration) {
-        docString = _getFunctionDocStringFromDeclaration(type.details.declaration, sourceMapper);
+    if (!docString && type.shared.declaration) {
+        docString = _getFunctionDocStringFromDeclaration(type.shared.declaration, sourceMapper);
     }
     return docString;
 }