@zzzen/pyright-internal 1.2.0-dev.20241215 → 1.2.0-dev.20241222

package/dist/analyzer/binder.js

@@ -106,7 +106,6 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
         this._fileInfo = fileInfo;
     }
     bindModule(node) {
-        var _a;
         // We'll assume that if there is no builtins scope provided, we must be
         // binding the builtins module itself.
         const isBuiltInModule = this._fileInfo.builtinsScope === undefined;
@@ -141,8 +140,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
         // Use the __all__ list to determine whether any potential private
         // symbols should be made externally hidden or private.
         this._potentialHiddenSymbols.forEach((symbol, name) => {
-            var _a;
-            if (!((_a = this._dunderAllNames) === null || _a === void 0 ? void 0 : _a.some((sym) => sym === name))) {
+            if (!this._dunderAllNames?.some((sym) => sym === name)) {
                 if (this._fileInfo.isStubFile) {
                     symbol.setIsExternallyHidden();
                 }
@@ -152,8 +150,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
             }
         });
         this._potentialPrivateSymbols.forEach((symbol, name) => {
-            var _a;
-            if (!((_a = this._dunderAllNames) === null || _a === void 0 ? void 0 : _a.some((sym) => sym === name))) {
+            if (!this._dunderAllNames?.some((sym) => sym === name)) {
                 symbol.setIsPrivateMember();
             }
         });
@@ -171,7 +168,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
         const scope = AnalyzerNodeInfo.getScope(node);
         if (scope && this._dunderAllNames) {
             for (const name of this._dunderAllNames) {
-                (_a = scope.symbolTable.get(name)) === null || _a === void 0 ? void 0 : _a.setIsInDunderAll();
+                scope.symbolTable.get(name)?.setIsInDunderAll();
             }
         }
     }
@@ -236,7 +233,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
             typeParamScope = AnalyzerNodeInfo.getScope(node.d.typeParams);
         }
         this.walkMultiple(node.d.arguments);
-        this._createNewScope(3 /* ScopeType.Class */, typeParamScope !== null && typeParamScope !== void 0 ? typeParamScope : this._getNonClassParentScope(), 
+        this._createNewScope(3 /* ScopeType.Class */, typeParamScope ?? this._getNonClassParentScope(), 
         /* proxyScope */ undefined, () => {
             AnalyzerNodeInfo.setScope(node, this._currentScope);
             this._addImplicitSymbolToCurrentScope('__doc__', node, 'str | None');
@@ -303,7 +300,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
         }
         // Don't walk the body of the function until we're done analyzing
         // the current scope.
-        this._createNewScope(2 /* ScopeType.Function */, typeParamScope !== null && typeParamScope !== void 0 ? typeParamScope : this._getNonClassParentScope(), 
+        this._createNewScope(2 /* ScopeType.Function */, typeParamScope ?? this._getNonClassParentScope(), 
         /* proxyScope */ undefined, () => {
             AnalyzerNodeInfo.setScope(node, this._currentScope);
             const enclosingClass = ParseTreeUtils.getEnclosingClass(node);
@@ -399,7 +396,6 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
         return false;
     }
     visitCall(node) {
-        var _a, _b;
         this._disableTrueFalseTargets(() => {
             this.walk(node.d.leftExpr);
             const sortedArgs = ParseTreeUtils.getArgsByRuntimeOrder(node);
@@ -435,12 +431,11 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
                 // Is this a call to "__all__.extend([<list>])"?
                 if (argExpr.nodeType === 34 /* ParseNodeType.List */) {
                     if (argExpr.d.items.every((listEntryNode) => {
-                        var _a, _b;
                         if (listEntryNode.nodeType === 48 /* ParseNodeType.StringList */ &&
                             listEntryNode.d.strings.length === 1 &&
                             listEntryNode.d.strings[0].nodeType === 49 /* ParseNodeType.String */) {
-                            (_a = this._dunderAllNames) === null || _a === void 0 ? void 0 : _a.push(listEntryNode.d.strings[0].d.value);
-                            (_b = this._dunderAllStringNodes) === null || _b === void 0 ? void 0 : _b.push(listEntryNode.d.strings[0]);
+                            this._dunderAllNames?.push(listEntryNode.d.strings[0].d.value);
+                            this._dunderAllStringNodes?.push(listEntryNode.d.strings[0]);
                             return true;
                         }
                         return false;
@@ -455,8 +450,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
                     const namesToAdd = this._getDunderAllNamesFromImport(argExpr.d.leftExpr.d.value);
                     if (namesToAdd && namesToAdd.length > 0) {
                         namesToAdd.forEach((name) => {
-                            var _a;
-                            (_a = this._dunderAllNames) === null || _a === void 0 ? void 0 : _a.push(name);
+                            this._dunderAllNames?.push(name);
                         });
                     }
                     emitDunderAllWarning = false;
@@ -480,8 +474,8 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
                 if (argExpr.nodeType === 48 /* ParseNodeType.StringList */ &&
                     argExpr.d.strings.length === 1 &&
                     argExpr.d.strings[0].nodeType === 49 /* ParseNodeType.String */) {
-                    (_a = this._dunderAllNames) === null || _a === void 0 ? void 0 : _a.push(argExpr.d.strings[0].d.value);
-                    (_b = this._dunderAllStringNodes) === null || _b === void 0 ? void 0 : _b.push(argExpr.d.strings[0]);
+                    this._dunderAllNames?.push(argExpr.d.strings[0].d.value);
+                    this._dunderAllStringNodes?.push(argExpr.d.strings[0]);
                     emitDunderAllWarning = false;
                 }
             }
@@ -553,7 +547,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
         AnalyzerNodeInfo.setDeclaration(node, typeAliasDeclaration);
         this._createAssignmentTargetFlowNodes(node.d.name, /* walkTargets */ true, /* unbound */ false);
         const prevScope = this._currentScope;
-        this._currentScope = typeParamScope !== null && typeParamScope !== void 0 ? typeParamScope : this._currentScope;
+        this._currentScope = typeParamScope ?? this._currentScope;
         this.walk(node.d.expr);
         this._currentScope = prevScope;
         return false;
@@ -746,11 +740,10 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
             if (expr.nodeType === 34 /* ParseNodeType.List */) {
                 // Is this the form __all__ += ["a", "b"]?
                 expr.d.items.forEach((listEntryNode) => {
-                    var _a;
                     if (listEntryNode.nodeType === 48 /* ParseNodeType.StringList */ &&
                         listEntryNode.d.strings.length === 1 &&
                         listEntryNode.d.strings[0].nodeType === 49 /* ParseNodeType.String */) {
-                        (_a = this._dunderAllNames) === null || _a === void 0 ? void 0 : _a.push(listEntryNode.d.strings[0].d.value);
+                        this._dunderAllNames?.push(listEntryNode.d.strings[0].d.value);
                         this._dunderAllStringNodes.push(listEntryNode.d.strings[0]);
                     }
                 });
@@ -763,8 +756,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
                 const namesToAdd = this._getDunderAllNamesFromImport(expr.d.leftExpr.d.value);
                 if (namesToAdd) {
                     namesToAdd.forEach((name) => {
-                        var _a;
-                        (_a = this._dunderAllNames) === null || _a === void 0 ? void 0 : _a.push(name);
+                        this._dunderAllNames?.push(name);
                     });
                     emitDunderAllWarning = false;
                 }
@@ -785,13 +777,12 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
         return false;
     }
     visitTypeAnnotation(node) {
-        var _a;
         if (this._handleTypingStubAssignmentOrAnnotation(node)) {
             return false;
         }
         // If this is an annotated variable assignment within a class body,
         // we need to evaluate the type annotation first.
-        const bindVariableBeforeAnnotationEvaluation = ((_a = node.parent) === null || _a === void 0 ? void 0 : _a.nodeType) === 3 /* ParseNodeType.Assignment */ &&
+        const bindVariableBeforeAnnotationEvaluation = node.parent?.nodeType === 3 /* ParseNodeType.Assignment */ &&
             ParseTreeUtils.getEnclosingClass(node, /* stopAtFunction */ true) !== undefined;
         if (!bindVariableBeforeAnnotationEvaluation) {
             this.walk(node.d.annotation);
@@ -834,8 +825,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
             this._addAntecedent(preForLabel, this._currentFlowNode);
             // Add any target expressions since they are modified in the loop.
             targetExpressions.forEach((value) => {
-                var _a;
-                (_a = this._currentScopeCodeFlowExpressions) === null || _a === void 0 ? void 0 : _a.add(value);
+                this._currentScopeCodeFlowExpressions?.add(value);
             });
         });
         this._currentFlowNode = this._finishFlowLabel(preElseLabel);
@@ -1169,18 +1159,17 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
         return false;
     }
     visitAwait(node) {
-        var _a, _b, _c, _d, _e, _f, _g;
         // Make sure this is within an async lambda or function.
         const execScopeNode = ParseTreeUtils.getExecutionScopeNode(node);
-        if ((execScopeNode === null || execScopeNode === void 0 ? void 0 : execScopeNode.nodeType) !== 31 /* ParseNodeType.Function */ || !execScopeNode.d.isAsync) {
-            if (this._fileInfo.ipythonMode && (execScopeNode === null || execScopeNode === void 0 ? void 0 : execScopeNode.nodeType) === 36 /* ParseNodeType.Module */) {
+        if (execScopeNode?.nodeType !== 31 /* ParseNodeType.Function */ || !execScopeNode.d.isAsync) {
+            if (this._fileInfo.ipythonMode && execScopeNode?.nodeType === 36 /* ParseNodeType.Module */) {
                 // Top level await is allowed in ipython mode.
                 return true;
             }
-            const isInGenerator = ((_a = node.parent) === null || _a === void 0 ? void 0 : _a.nodeType) === 11 /* ParseNodeType.Comprehension */ &&
-                ((_c = (_b = node.parent) === null || _b === void 0 ? void 0 : _b.parent) === null || _c === void 0 ? void 0 : _c.nodeType) !== 34 /* ParseNodeType.List */ &&
-                ((_e = (_d = node.parent) === null || _d === void 0 ? void 0 : _d.parent) === null || _e === void 0 ? void 0 : _e.nodeType) !== 45 /* ParseNodeType.Set */ &&
-                ((_g = (_f = node.parent) === null || _f === void 0 ? void 0 : _f.parent) === null || _g === void 0 ? void 0 : _g.nodeType) !== 18 /* ParseNodeType.Dictionary */;
+            const isInGenerator = node.parent?.nodeType === 11 /* ParseNodeType.Comprehension */ &&
+                node.parent?.parent?.nodeType !== 34 /* ParseNodeType.List */ &&
+                node.parent?.parent?.nodeType !== 45 /* ParseNodeType.Set */ &&
+                node.parent?.parent?.nodeType !== 18 /* ParseNodeType.Dictionary */;
             // Allow if it's within a generator expression. Execution of
             // generator expressions is deferred and therefore can be
             // run within the context of an async function later.
@@ -1239,7 +1228,6 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
         return true;
     }
     visitImportAs(node) {
-        var _a, _b, _c, _d, _e, _f;
         if (node.d.module.d.nameParts.length > 0) {
             const firstNamePartValue = node.d.module.d.nameParts[0].d.value;
             let symbolName;
@@ -1277,20 +1265,19 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
             this._createFlowAssignment(node.d.alias ? node.d.alias : node.d.module.d.nameParts[0]);
             if (node.d.module.d.nameParts.length === 1) {
                 if (firstNamePartValue === 'typing' || firstNamePartValue === 'typing_extensions') {
-                    this._typingImportAliases.push((_b = (_a = node.d.alias) === null || _a === void 0 ? void 0 : _a.d.value) !== null && _b !== void 0 ? _b : firstNamePartValue);
+                    this._typingImportAliases.push(node.d.alias?.d.value ?? firstNamePartValue);
                 }
                 else if (firstNamePartValue === 'sys') {
-                    this._sysImportAliases.push((_d = (_c = node.d.alias) === null || _c === void 0 ? void 0 : _c.d.value) !== null && _d !== void 0 ? _d : firstNamePartValue);
+                    this._sysImportAliases.push(node.d.alias?.d.value ?? firstNamePartValue);
                 }
                 else if (firstNamePartValue === 'dataclasses') {
-                    this._dataclassesImportAliases.push((_f = (_e = node.d.alias) === null || _e === void 0 ? void 0 : _e.d.value) !== null && _f !== void 0 ? _f : firstNamePartValue);
+                    this._dataclassesImportAliases.push(node.d.alias?.d.value ?? firstNamePartValue);
                 }
             }
         }
         return true;
     }
     visitImportFrom(node) {
-        var _a;
         const typingSymbolsOfInterest = ['Final', 'ClassVar', 'Annotated'];
         const dataclassesSymbolsOfInterest = ['InitVar'];
         const importInfo = AnalyzerNodeInfo.getImportInfo(node.d.module);
@@ -1326,7 +1313,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
                 const names = [];
                 // Note that this scope uses a wildcard import, so we cannot shortcut
                 // any code flow checks. All expressions are potentially in play.
-                (_a = this._currentScopeCodeFlowExpressions) === null || _a === void 0 ? void 0 : _a.add(codeFlowTypes_1.wildcardImportReferenceKey);
+                this._currentScopeCodeFlowExpressions?.add(codeFlowTypes_1.wildcardImportReferenceKey);
                 const lookupInfo = this._fileInfo.importLookup(resolvedPath);
                 if (lookupInfo) {
                     const wildcardNames = this._getWildcardImportNames(lookupInfo);
@@ -1483,7 +1470,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
                         range: (0, positionUtils_1.convertTextRangeToRange)(nameNode, this._fileInfo.lines),
                         moduleName: this._formatModuleName(node.d.module),
                         isInExceptSuite: this._isInExceptSuite,
-                        isNativeLib: importInfo === null || importInfo === void 0 ? void 0 : importInfo.isNativeLib,
+                        isNativeLib: importInfo?.isNativeLib,
                     };
                     symbol.addDeclaration(aliasDecl);
                     this._createFlowAssignment(importSymbolNode.d.alias || importSymbolNode.d.name);
@@ -1646,7 +1633,6 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
         }
         this._createNewScope(1 /* ScopeType.Comprehension */, this._getNonClassParentScope(), 
         /* proxyScope */ undefined, () => {
-            var _a, _b, _c;
             AnalyzerNodeInfo.setScope(node, this._currentScope);
             const falseLabel = this._createBranchLabel();
             // We'll walk the forIfNodes list twice. The first time we'll
@@ -1665,9 +1651,9 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
                             // Allow if it's within a generator expression. Execution of
                             // generator expressions is deferred and therefore can be
                             // run within the context of an async function later.
-                            if (((_a = node.parent) === null || _a === void 0 ? void 0 : _a.nodeType) === 34 /* ParseNodeType.List */ ||
-                                ((_b = node.parent) === null || _b === void 0 ? void 0 : _b.nodeType) === 45 /* ParseNodeType.Set */ ||
-                                ((_c = node.parent) === null || _c === void 0 ? void 0 : _c.nodeType) === 18 /* ParseNodeType.Dictionary */) {
+                            if (node.parent?.nodeType === 34 /* ParseNodeType.List */ ||
+                                node.parent?.nodeType === 45 /* ParseNodeType.Set */ ||
+                                node.parent?.nodeType === 18 /* ParseNodeType.Dictionary */) {
                                 this._addSyntaxError(localize_1.LocMessage.asyncNotInAsyncFunction(), compr.d.asyncToken);
                             }
                         }
@@ -1930,16 +1916,15 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
     // Attempts to resolve the module name, import it, and return
     // its __all__ symbols.
     _getDunderAllNamesFromImport(varName) {
-        var _a, _b;
         const varSymbol = this._currentScope.lookUpSymbol(varName);
         if (!varSymbol) {
             return undefined;
         }
         // There should be only one declaration for the variable.
         const aliasDecl = varSymbol.getDeclarations().find((decl) => decl.type === 8 /* DeclarationType.Alias */);
-        const resolvedUri = (aliasDecl === null || aliasDecl === void 0 ? void 0 : aliasDecl.uri) && !aliasDecl.uri.isEmpty() && aliasDecl.loadSymbolsFromPath
+        const resolvedUri = aliasDecl?.uri && !aliasDecl.uri.isEmpty() && aliasDecl.loadSymbolsFromPath
             ? aliasDecl.uri
-            : ((_a = aliasDecl === null || aliasDecl === void 0 ? void 0 : aliasDecl.submoduleFallback) === null || _a === void 0 ? void 0 : _a.uri) &&
+            : aliasDecl?.submoduleFallback?.uri &&
                 !aliasDecl.submoduleFallback.uri.isEmpty() &&
                 aliasDecl.submoduleFallback.loadSymbolsFromPath
                 ? aliasDecl.submoduleFallback.uri
@@ -1948,12 +1933,12 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
             return undefined;
         }
         let lookupInfo = this._fileInfo.importLookup(resolvedUri);
-        if (lookupInfo === null || lookupInfo === void 0 ? void 0 : lookupInfo.dunderAllNames) {
+        if (lookupInfo?.dunderAllNames) {
             return lookupInfo.dunderAllNames;
         }
-        if (((_b = aliasDecl === null || aliasDecl === void 0 ? void 0 : aliasDecl.submoduleFallback) === null || _b === void 0 ? void 0 : _b.uri) && !aliasDecl.submoduleFallback.uri.isEmpty()) {
+        if (aliasDecl?.submoduleFallback?.uri && !aliasDecl.submoduleFallback.uri.isEmpty()) {
             lookupInfo = this._fileInfo.importLookup(aliasDecl.submoduleFallback.uri);
-            return lookupInfo === null || lookupInfo === void 0 ? void 0 : lookupInfo.dunderAllNames;
+            return lookupInfo?.dunderAllNames;
         }
         return undefined;
     }
@@ -1966,7 +1951,6 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
         this._createFlowAssignment(node.d.module.d.nameParts[0]);
     }
     _createAliasDeclarationForMultipartImportName(node, importAlias, importInfo, symbol) {
-        var _a;
         const firstNamePartValue = node.d.module.d.nameParts[0].d.value;
         AnalyzerNodeInfo.setFlowNode(node, this._currentFlowNode);
         // See if there's already a matching alias declaration for this import.
@@ -2017,7 +2001,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
                 loadSymbolsFromPath: true,
                 range: (0, textRange_1.getEmptyRange)(),
                 usesLocalName: !!importAlias,
-                moduleName: (_a = importInfo === null || importInfo === void 0 ? void 0 : importInfo.importName) !== null && _a !== void 0 ? _a : '',
+                moduleName: importInfo?.importName ?? '',
                 firstNamePart: importAlias
                     ? this._formatModuleName(node.d.module)
                     : '.'.repeat(node.d.module.d.leadingDots) + firstNamePartValue,
@@ -2910,7 +2894,6 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
         return exemptSymbols.some((name) => name === symbolName);
     }
     _addTypeDeclarationForVariable(target, typeAnnotation) {
-        var _a, _b, _c;
         let declarationHandled = false;
         switch (target.nodeType) {
             case 38 /* ParseNodeType.Name */: {
@@ -2940,8 +2923,8 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
                         const containingClass = ParseTreeUtils.getEnclosingClassOrFunction(target);
                         if (containingClass && containingClass.nodeType === 10 /* ParseNodeType.Class */) {
                             // Make sure it's part of an assignment.
-                            if (((_a = target.parent) === null || _a === void 0 ? void 0 : _a.nodeType) === 3 /* ParseNodeType.Assignment */ ||
-                                ((_c = (_b = target.parent) === null || _b === void 0 ? void 0 : _b.parent) === null || _c === void 0 ? void 0 : _c.nodeType) === 3 /* ParseNodeType.Assignment */) {
+                            if (target.parent?.nodeType === 3 /* ParseNodeType.Assignment */ ||
+                                target.parent?.parent?.nodeType === 3 /* ParseNodeType.Assignment */) {
                                 isFinalAssignedInClassBody = true;
                             }
                         }
@@ -3090,7 +3073,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
             // Allow Final to be enclosed in ClassVar. Normally, Final implies
             // ClassVar, but this combination is required in the case of dataclasses.
             const classVarInfo = this._isAnnotationClassVar(typeAnnotation);
-            if (classVarInfo === null || classVarInfo === void 0 ? void 0 : classVarInfo.classVarTypeNode) {
+            if (classVarInfo?.classVarTypeNode) {
                 typeAnnotation = classVarInfo.classVarTypeNode;
             }
             if (this._isTypingAnnotation(typeAnnotation, 'Final')) {