coc-pyright 1.1.301 → 1.1.303

package/lib/index.js

@@ -3454,20 +3454,30 @@ var require_fs = __commonJS({
         });
       });
     };
-    if (typeof fs6.writev === "function") {
-      exports.writev = function(fd, buffers, ...args) {
-        if (typeof args[args.length - 1] === "function") {
-          return fs6.writev(fd, buffers, ...args);
-        }
-        return new Promise((resolve, reject) => {
-          fs6.writev(fd, buffers, ...args, (err, bytesWritten, buffers2) => {
-            if (err)
-              return reject(err);
-            resolve({ bytesWritten, buffers: buffers2 });
-          });
+    exports.readv = function(fd, buffers, ...args) {
+      if (typeof args[args.length - 1] === "function") {
+        return fs6.readv(fd, buffers, ...args);
+      }
+      return new Promise((resolve, reject) => {
+        fs6.readv(fd, buffers, ...args, (err, bytesRead, buffers2) => {
+          if (err)
+            return reject(err);
+          resolve({ bytesRead, buffers: buffers2 });
         });
-      };
-    }
+      });
+    };
+    exports.writev = function(fd, buffers, ...args) {
+      if (typeof args[args.length - 1] === "function") {
+        return fs6.writev(fd, buffers, ...args);
+      }
+      return new Promise((resolve, reject) => {
+        fs6.writev(fd, buffers, ...args, (err, bytesWritten, buffers2) => {
+          if (err)
+            return reject(err);
+          resolve({ bytesWritten, buffers: buffers2 });
+        });
+      });
+    };
     if (typeof fs6.realpath.native === "function") {
       exports.realpath.native = u(fs6.realpath.native);
     } else {
@@ -3765,9 +3775,13 @@ var require_copy = __commonJS({
         stat.checkParentPaths(src, srcStat, dest, "copy", (err2) => {
           if (err2)
             return cb(err2);
-          if (opts.filter)
-            return handleFilter(checkParentDir, destStat, src, dest, opts, cb);
-          return checkParentDir(destStat, src, dest, opts, cb);
+          runFilter(src, dest, opts, (err3, include) => {
+            if (err3)
+              return cb(err3);
+            if (!include)
+              return cb();
+            checkParentDir(destStat, src, dest, opts, cb);
+          });
         });
       });
     }
@@ -3785,17 +3799,10 @@ var require_copy = __commonJS({
         });
       });
     }
-    function handleFilter(onInclude, destStat, src, dest, opts, cb) {
-      Promise.resolve(opts.filter(src, dest)).then((include) => {
-        if (include)
-          return onInclude(destStat, src, dest, opts, cb);
-        return cb();
-      }, (error) => cb(error));
-    }
-    function startCopy(destStat, src, dest, opts, cb) {
-      if (opts.filter)
-        return handleFilter(getStats, destStat, src, dest, opts, cb);
-      return getStats(destStat, src, dest, opts, cb);
+    function runFilter(src, dest, opts, cb) {
+      if (!opts.filter)
+        return cb(null, true);
+      Promise.resolve(opts.filter(src, dest)).then((include) => cb(null, include), (error) => cb(error));
     }
     function getStats(destStat, src, dest, opts, cb) {
       const stat2 = opts.dereference ? fs6.stat : fs6.lstat;
@@ -3906,14 +3913,20 @@ var require_copy = __commonJS({
     function copyDirItem(items, item, src, dest, opts, cb) {
       const srcItem = path12.join(src, item);
       const destItem = path12.join(dest, item);
-      stat.checkPaths(srcItem, destItem, "copy", opts, (err, stats) => {
+      runFilter(srcItem, destItem, opts, (err, include) => {
         if (err)
           return cb(err);
-        const { destStat } = stats;
-        startCopy(destStat, srcItem, destItem, opts, (err2) => {
+        if (!include)
+          return copyDirItems(items, src, dest, opts, cb);
+        stat.checkPaths(srcItem, destItem, "copy", opts, (err2, stats) => {
           if (err2)
             return cb(err2);
-          return copyDirItems(items, src, dest, opts, cb);
+          const { destStat } = stats;
+          getStats(destStat, srcItem, destItem, opts, (err3) => {
+            if (err3)
+              return cb(err3);
+            return copyDirItems(items, src, dest, opts, cb);
+          });
         });
       });
     }
@@ -3939,7 +3952,7 @@ var require_copy = __commonJS({
             if (stat.isSrcSubdir(resolvedSrc, resolvedDest)) {
               return cb(new Error(`Cannot copy '${resolvedSrc}' to a subdirectory of itself, '${resolvedDest}'.`));
             }
-            if (destStat.isDirectory() && stat.isSrcSubdir(resolvedDest, resolvedSrc)) {
+            if (stat.isSrcSubdir(resolvedDest, resolvedSrc)) {
               return cb(new Error(`Cannot overwrite '${resolvedDest}' with '${resolvedSrc}'.`));
             }
             return copyLink(resolvedSrc, dest, cb);
@@ -3983,9 +3996,6 @@ var require_copy_sync = __commonJS({
       }
       const { srcStat, destStat } = stat.checkPathsSync(src, dest, "copy", opts);
       stat.checkParentPathsSync(src, srcStat, dest, "copy");
-      return handleFilterAndCopy(destStat, src, dest, opts);
-    }
-    function handleFilterAndCopy(destStat, src, dest, opts) {
       if (opts.filter && !opts.filter(src, dest))
         return;
       const destParent = path12.dirname(dest);
@@ -3993,11 +4003,6 @@ var require_copy_sync = __commonJS({
         mkdirsSync(destParent);
       return getStats(destStat, src, dest, opts);
     }
-    function startCopy(destStat, src, dest, opts) {
-      if (opts.filter && !opts.filter(src, dest))
-        return;
-      return getStats(destStat, src, dest, opts);
-    }
     function getStats(destStat, src, dest, opts) {
       const statSync = opts.dereference ? fs6.statSync : fs6.lstatSync;
       const srcStat = statSync(src);
@@ -4066,8 +4071,10 @@ var require_copy_sync = __commonJS({
     function copyDirItem(item, src, dest, opts) {
       const srcItem = path12.join(src, item);
       const destItem = path12.join(dest, item);
+      if (opts.filter && !opts.filter(srcItem, destItem))
+        return;
       const { destStat } = stat.checkPathsSync(srcItem, destItem, "copy", opts);
-      return startCopy(destStat, srcItem, destItem, opts);
+      return getStats(destStat, srcItem, destItem, opts);
     }
     function onLink(destStat, src, dest, opts) {
       let resolvedSrc = fs6.readlinkSync(src);
@@ -4091,7 +4098,7 @@ var require_copy_sync = __commonJS({
         if (stat.isSrcSubdir(resolvedSrc, resolvedDest)) {
           throw new Error(`Cannot copy '${resolvedSrc}' to a subdirectory of itself, '${resolvedDest}'.`);
         }
-        if (fs6.statSync(dest).isDirectory() && stat.isSrcSubdir(resolvedDest, resolvedSrc)) {
+        if (stat.isSrcSubdir(resolvedDest, resolvedSrc)) {
           throw new Error(`Cannot overwrite '${resolvedDest}' with '${resolvedSrc}'.`);
         }
         return copyLink(resolvedSrc, dest);
@@ -4117,261 +4124,17 @@ var require_copy2 = __commonJS({
   }
 });
 
-// node_modules/fs-extra/lib/remove/rimraf.js
-var require_rimraf = __commonJS({
-  "node_modules/fs-extra/lib/remove/rimraf.js"(exports, module2) {
-    "use strict";
-    var fs6 = require_graceful_fs();
-    var path12 = require("path");
-    var assert = require("assert");
-    var isWindows = process.platform === "win32";
-    function defaults(options) {
-      const methods = [
-        "unlink",
-        "chmod",
-        "stat",
-        "lstat",
-        "rmdir",
-        "readdir"
-      ];
-      methods.forEach((m) => {
-        options[m] = options[m] || fs6[m];
-        m = m + "Sync";
-        options[m] = options[m] || fs6[m];
-      });
-      options.maxBusyTries = options.maxBusyTries || 3;
-    }
-    function rimraf(p, options, cb) {
-      let busyTries = 0;
-      if (typeof options === "function") {
-        cb = options;
-        options = {};
-      }
-      assert(p, "rimraf: missing path");
-      assert.strictEqual(typeof p, "string", "rimraf: path should be a string");
-      assert.strictEqual(typeof cb, "function", "rimraf: callback function required");
-      assert(options, "rimraf: invalid options argument provided");
-      assert.strictEqual(typeof options, "object", "rimraf: options should be object");
-      defaults(options);
-      rimraf_(p, options, function CB(er) {
-        if (er) {
-          if ((er.code === "EBUSY" || er.code === "ENOTEMPTY" || er.code === "EPERM") && busyTries < options.maxBusyTries) {
-            busyTries++;
-            const time = busyTries * 100;
-            return setTimeout(() => rimraf_(p, options, CB), time);
-          }
-          if (er.code === "ENOENT")
-            er = null;
-        }
-        cb(er);
-      });
-    }
-    function rimraf_(p, options, cb) {
-      assert(p);
-      assert(options);
-      assert(typeof cb === "function");
-      options.lstat(p, (er, st) => {
-        if (er && er.code === "ENOENT") {
-          return cb(null);
-        }
-        if (er && er.code === "EPERM" && isWindows) {
-          return fixWinEPERM(p, options, er, cb);
-        }
-        if (st && st.isDirectory()) {
-          return rmdir(p, options, er, cb);
-        }
-        options.unlink(p, (er2) => {
-          if (er2) {
-            if (er2.code === "ENOENT") {
-              return cb(null);
-            }
-            if (er2.code === "EPERM") {
-              return isWindows ? fixWinEPERM(p, options, er2, cb) : rmdir(p, options, er2, cb);
-            }
-            if (er2.code === "EISDIR") {
-              return rmdir(p, options, er2, cb);
-            }
-          }
-          return cb(er2);
-        });
-      });
-    }
-    function fixWinEPERM(p, options, er, cb) {
-      assert(p);
-      assert(options);
-      assert(typeof cb === "function");
-      options.chmod(p, 438, (er2) => {
-        if (er2) {
-          cb(er2.code === "ENOENT" ? null : er);
-        } else {
-          options.stat(p, (er3, stats) => {
-            if (er3) {
-              cb(er3.code === "ENOENT" ? null : er);
-            } else if (stats.isDirectory()) {
-              rmdir(p, options, er, cb);
-            } else {
-              options.unlink(p, cb);
-            }
-          });
-        }
-      });
-    }
-    function fixWinEPERMSync(p, options, er) {
-      let stats;
-      assert(p);
-      assert(options);
-      try {
-        options.chmodSync(p, 438);
-      } catch (er2) {
-        if (er2.code === "ENOENT") {
-          return;
-        } else {
-          throw er;
-        }
-      }
-      try {
-        stats = options.statSync(p);
-      } catch (er3) {
-        if (er3.code === "ENOENT") {
-          return;
-        } else {
-          throw er;
-        }
-      }
-      if (stats.isDirectory()) {
-        rmdirSync(p, options, er);
-      } else {
-        options.unlinkSync(p);
-      }
-    }
-    function rmdir(p, options, originalEr, cb) {
-      assert(p);
-      assert(options);
-      assert(typeof cb === "function");
-      options.rmdir(p, (er) => {
-        if (er && (er.code === "ENOTEMPTY" || er.code === "EEXIST" || er.code === "EPERM")) {
-          rmkids(p, options, cb);
-        } else if (er && er.code === "ENOTDIR") {
-          cb(originalEr);
-        } else {
-          cb(er);
-        }
-      });
-    }
-    function rmkids(p, options, cb) {
-      assert(p);
-      assert(options);
-      assert(typeof cb === "function");
-      options.readdir(p, (er, files) => {
-        if (er)
-          return cb(er);
-        let n = files.length;
-        let errState;
-        if (n === 0)
-          return options.rmdir(p, cb);
-        files.forEach((f) => {
-          rimraf(path12.join(p, f), options, (er2) => {
-            if (errState) {
-              return;
-            }
-            if (er2)
-              return cb(errState = er2);
-            if (--n === 0) {
-              options.rmdir(p, cb);
-            }
-          });
-        });
-      });
-    }
-    function rimrafSync(p, options) {
-      let st;
-      options = options || {};
-      defaults(options);
-      assert(p, "rimraf: missing path");
-      assert.strictEqual(typeof p, "string", "rimraf: path should be a string");
-      assert(options, "rimraf: missing options");
-      assert.strictEqual(typeof options, "object", "rimraf: options should be object");
-      try {
-        st = options.lstatSync(p);
-      } catch (er) {
-        if (er.code === "ENOENT") {
-          return;
-        }
-        if (er.code === "EPERM" && isWindows) {
-          fixWinEPERMSync(p, options, er);
-        }
-      }
-      try {
-        if (st && st.isDirectory()) {
-          rmdirSync(p, options, null);
-        } else {
-          options.unlinkSync(p);
-        }
-      } catch (er) {
-        if (er.code === "ENOENT") {
-          return;
-        } else if (er.code === "EPERM") {
-          return isWindows ? fixWinEPERMSync(p, options, er) : rmdirSync(p, options, er);
-        } else if (er.code !== "EISDIR") {
-          throw er;
-        }
-        rmdirSync(p, options, er);
-      }
-    }
-    function rmdirSync(p, options, originalEr) {
-      assert(p);
-      assert(options);
-      try {
-        options.rmdirSync(p);
-      } catch (er) {
-        if (er.code === "ENOTDIR") {
-          throw originalEr;
-        } else if (er.code === "ENOTEMPTY" || er.code === "EEXIST" || er.code === "EPERM") {
-          rmkidsSync(p, options);
-        } else if (er.code !== "ENOENT") {
-          throw er;
-        }
-      }
-    }
-    function rmkidsSync(p, options) {
-      assert(p);
-      assert(options);
-      options.readdirSync(p).forEach((f) => rimrafSync(path12.join(p, f), options));
-      if (isWindows) {
-        const startTime = Date.now();
-        do {
-          try {
-            const ret = options.rmdirSync(p, options);
-            return ret;
-          } catch {
-          }
-        } while (Date.now() - startTime < 500);
-      } else {
-        const ret = options.rmdirSync(p, options);
-        return ret;
-      }
-    }
-    module2.exports = rimraf;
-    rimraf.sync = rimrafSync;
-  }
-});
-
 // node_modules/fs-extra/lib/remove/index.js
 var require_remove = __commonJS({
   "node_modules/fs-extra/lib/remove/index.js"(exports, module2) {
     "use strict";
     var fs6 = require_graceful_fs();
     var u = require_universalify().fromCallback;
-    var rimraf = require_rimraf();
     function remove(path12, callback) {
-      if (fs6.rm)
-        return fs6.rm(path12, { recursive: true, force: true }, callback);
-      rimraf(path12, callback);
+      fs6.rm(path12, { recursive: true, force: true }, callback);
     }
     function removeSync(path12) {
-      if (fs6.rmSync)
-        return fs6.rmSync(path12, { recursive: true, force: true });
-      rimraf.sync(path12);
+      fs6.rmSync(path12, { recursive: true, force: true });
     }
     module2.exports = {
       remove: u(remove),
@@ -5082,7 +4845,8 @@ var require_move = __commonJS({
     function moveAcrossDevice(src, dest, overwrite, cb) {
       const opts = {
         overwrite,
-        errorOnExist: true
+        errorOnExist: true,
+        preserveTimestamps: true
       };
       copy(src, dest, opts, (err) => {
         if (err)
@@ -5141,7 +4905,8 @@ var require_move_sync = __commonJS({
     function moveAcrossDevice(src, dest, overwrite) {
       const opts = {
         overwrite,
-        errorOnExist: true
+        errorOnExist: true,
+        preserveTimestamps: true
       };
       copySync(src, dest, opts);
       return removeSync(src);
@@ -6128,7 +5893,7 @@ var require_positionUtils = __commonJS({
   "node_modules/@zzzen/pyright-internal/dist/common/positionUtils.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
-    exports.getLineEndPosition = exports.convertTextRangeToRange = exports.convertRangeToTextRange = exports.convertPositionToOffset = exports.convertOffsetsToRange = exports.convertOffsetToPosition = void 0;
+    exports.getLineEndOffset = exports.getLineEndPosition = exports.convertTextRangeToRange = exports.convertRangeToTextRange = exports.convertPositionToOffset = exports.convertOffsetsToRange = exports.convertOffsetToPosition = void 0;
     var debug_1 = require_debug2();
     var textRange_1 = require_textRange();
     function convertOffsetToPosition(offset, lines) {
@@ -6177,16 +5942,24 @@ var require_positionUtils = __commonJS({
       return convertOffsetsToRange(range.start, textRange_1.TextRange.getEnd(range), lines);
     }
     exports.convertTextRangeToRange = convertTextRangeToRange;
-    function getLineEndPosition(tokenizerOutput, line) {
-      const lines = tokenizerOutput.lines;
-      const lineRange = lines.getItemAt(line);
-      const char = line < lines.count - 1 ? lineRange.length - tokenizerOutput.predominantEndOfLineSequence.length : lineRange.length;
-      return {
-        line,
-        character: char
-      };
+    function getLineEndPosition(tokenizerOutput, text, line) {
+      return convertOffsetToPosition(getLineEndOffset(tokenizerOutput, text, line), tokenizerOutput.lines);
     }
     exports.getLineEndPosition = getLineEndPosition;
+    function getLineEndOffset(tokenizerOutput, text, line) {
+      const lineRange = tokenizerOutput.lines.getItemAt(line);
+      const lineEndOffset = textRange_1.TextRange.getEnd(lineRange);
+      let newLineLength = 0;
+      for (let i = lineEndOffset - 1; i >= lineRange.start; i--) {
+        const char = text[i];
+        if (char !== "\r" && char !== "\n") {
+          break;
+        }
+        newLineLength++;
+      }
+      return lineEndOffset - newLineLength;
+    }
+    exports.getLineEndOffset = getLineEndOffset;
   }
 });
 
@@ -20549,7 +20322,7 @@ var require_pathConsts = __commonJS({
   "node_modules/@zzzen/pyright-internal/dist/common/pathConsts.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
-    exports.stubsSuffix = exports.src = exports.distPackages = exports.sitePackages = exports.lib64 = exports.libAlternate = exports.lib = exports.typeshedFallback = void 0;
+    exports.defaultStubsDirectory = exports.stubsSuffix = exports.src = exports.distPackages = exports.sitePackages = exports.lib64 = exports.libAlternate = exports.lib = exports.typeshedFallback = void 0;
     exports.typeshedFallback = "typeshed-fallback";
     exports.lib = "lib";
     exports.libAlternate = "Lib";
@@ -20558,6 +20331,7 @@ var require_pathConsts = __commonJS({
     exports.distPackages = "dist-packages";
     exports.src = "src";
     exports.stubsSuffix = "-stubs";
+    exports.defaultStubsDirectory = "typings";
   }
 });
 
@@ -22410,7 +22184,7 @@ var require_configOptions = __commonJS({
         reportMissingImports: "error",
         reportMissingModuleSource: "warning",
         reportMissingTypeStubs: "error",
-        reportImportCycles: "error",
+        reportImportCycles: "none",
         reportUnusedImport: "error",
         reportUnusedClass: "error",
         reportUnusedFunction: "error",
@@ -23505,7 +23279,7 @@ var require_declarationUtils = __commonJS({
   "node_modules/@zzzen/pyright-internal/dist/analyzer/declarationUtils.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
-    exports.createSynthesizedAliasDeclaration = exports.getDeclarationsWithUsesLocalNameRemoved = exports.isDefinedInFile = exports.getNameNodeForDeclaration = exports.getNameFromDeclaration = exports.areDeclarationsSame = exports.hasTypeForDeclaration = void 0;
+    exports.resolveAliasDeclaration = exports.createSynthesizedAliasDeclaration = exports.getDeclarationsWithUsesLocalNameRemoved = exports.isDefinedInFile = exports.getNameNodeForDeclaration = exports.getNameFromDeclaration = exports.areDeclarationsSame = exports.hasTypeForDeclaration = void 0;
     var textRange_1 = require_textRange();
     var declaration_1 = require_declaration();
     var parseTreeUtils_1 = require_parseTreeUtils();
@@ -23645,6 +23419,106 @@ var require_declarationUtils = __commonJS({
       };
     }
     exports.createSynthesizedAliasDeclaration = createSynthesizedAliasDeclaration;
+    function resolveAliasDeclaration(importLookup, declaration, resolveLocalNames, allowExternallyHiddenAccess) {
+      let curDeclaration = declaration;
+      const alreadyVisited = [];
+      let isPrivate = false;
+      let sawPyTypedTransition = false;
+      let privatePyTypedImported;
+      let privatePyTypedImporter;
+      while (true) {
+        if (curDeclaration.type !== 8 || !curDeclaration.symbolName) {
+          return {
+            declaration: curDeclaration,
+            isPrivate,
+            privatePyTypedImported,
+            privatePyTypedImporter
+          };
+        }
+        if (!resolveLocalNames && curDeclaration.usesLocalName) {
+          return {
+            declaration: curDeclaration,
+            isPrivate,
+            privatePyTypedImported,
+            privatePyTypedImporter
+          };
+        }
+        let lookupResult;
+        if (curDeclaration.path && curDeclaration.loadSymbolsFromPath) {
+          lookupResult = importLookup(curDeclaration.path);
+        }
+        const symbol = lookupResult ? lookupResult.symbolTable.get(curDeclaration.symbolName) : void 0;
+        if (!symbol) {
+          if (curDeclaration.submoduleFallback) {
+            if (curDeclaration.symbolName) {
+              if (curDeclaration.submoduleFallback.type === 8 && curDeclaration.submoduleFallback.path) {
+                const lookupResult2 = importLookup(curDeclaration.submoduleFallback.path);
+                if (!lookupResult2) {
+                  return void 0;
+                }
+              }
+            }
+            return resolveAliasDeclaration(importLookup, curDeclaration.submoduleFallback, resolveLocalNames, allowExternallyHiddenAccess);
+          }
+          if (curDeclaration.isNativeLib) {
+            return {
+              declaration: void 0,
+              isPrivate
+            };
+          }
+          return void 0;
+        }
+        if (symbol.isPrivateMember()) {
+          isPrivate = true;
+        }
+        if (symbol.isExternallyHidden() && !allowExternallyHiddenAccess) {
+          return void 0;
+        }
+        let declarations = symbol.getTypedDeclarations();
+        declarations = declarations.filter((decl) => !decl.isInExceptSuite);
+        if (declarations.length === 0) {
+          declarations = symbol.getDeclarations();
+          declarations = declarations.filter((decl) => !decl.isInExceptSuite);
+        }
+        if (declarations.length === 0) {
+          declarations = symbol.getDeclarations();
+        }
+        if (declarations.length === 0) {
+          return void 0;
+        }
+        const unvisitedDecls = declarations.filter((decl) => !alreadyVisited.includes(decl));
+        if (unvisitedDecls.length > 0) {
+          curDeclaration = unvisitedDecls[unvisitedDecls.length - 1];
+        } else {
+          curDeclaration = declarations[declarations.length - 1];
+        }
+        if (lookupResult === null || lookupResult === void 0 ? void 0 : lookupResult.isInPyTypedPackage) {
+          if (!sawPyTypedTransition) {
+            if (symbol.isPrivatePyTypedImport()) {
+              privatePyTypedImporter = curDeclaration === null || curDeclaration === void 0 ? void 0 : curDeclaration.moduleName;
+            }
+            sawPyTypedTransition = true;
+          } else {
+            if (!symbol.isPrivatePyTypedImport()) {
+              privatePyTypedImported = privatePyTypedImported !== null && privatePyTypedImported !== void 0 ? privatePyTypedImported : curDeclaration === null || curDeclaration === void 0 ? void 0 : curDeclaration.moduleName;
+            }
+          }
+        }
+        if (alreadyVisited.find((decl) => decl === curDeclaration)) {
+          if (curDeclaration.path === declaration.path && curDeclaration.type === 8 && curDeclaration.submoduleFallback) {
+            return resolveAliasDeclaration(importLookup, curDeclaration.submoduleFallback, resolveLocalNames, allowExternallyHiddenAccess);
+          }
+          return {
+            declaration,
+            isPrivate,
+            privatePyTypedImported,
+            privatePyTypedImporter
+          };
+        }
+        alreadyVisited.push(curDeclaration);
+      }
+    }
+    exports.resolveAliasDeclaration = resolveAliasDeclaration;
   }
 });
 
@@ -25615,6 +25489,16 @@ var require_types = __commonJS({
         return newInstance;
       }
       TypeVarType2.cloneAsInstantiable = cloneAsInstantiable;
+      function cloneForNewName(type, name) {
+        const newInstance = TypeBase.cloneType(type);
+        newInstance.details = { ...type.details };
+        newInstance.details.name = name;
+        if (newInstance.scopeId) {
+          newInstance.nameWithScope = makeNameWithScope(name, newInstance.scopeId);
+        }
+        return newInstance;
+      }
+      TypeVarType2.cloneForNewName = cloneForNewName;
       function cloneForScopeId(type, scopeId, scopeName, scopeType) {
         const newInstance = TypeBase.cloneType(type);
         newInstance.nameWithScope = makeNameWithScope(type.details.name, scopeId);
@@ -26287,148 +26171,6 @@ var require_types = __commonJS({
   }
 });
 
-// node_modules/@zzzen/pyright-internal/dist/analyzer/parameterUtils.js
-var require_parameterUtils = __commonJS({
-  "node_modules/@zzzen/pyright-internal/dist/analyzer/parameterUtils.js"(exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    exports.isTypedKwargs = void 0;
-    var types_1 = require_types();
-    function isTypedKwargs(param) {
-      return param.category === 2 && (0, types_1.isClassInstance)(param.type) && (0, types_1.isUnpackedClass)(param.type) && types_1.ClassType.isTypedDictClass(param.type) && !!param.type.details.typedDictEntries;
-    }
-    exports.isTypedKwargs = isTypedKwargs;
-  }
-});
-
-// node_modules/@zzzen/pyright-internal/dist/analyzer/scopeUtils.js
-var require_scopeUtils = __commonJS({
-  "node_modules/@zzzen/pyright-internal/dist/analyzer/scopeUtils.js"(exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    exports.findTopNodeInScope = exports.getScopeHierarchy = exports.getScopeForNode = exports.getBuiltInScope = void 0;
-    var analyzerNodeInfo_1 = require_analyzerNodeInfo();
-    var parseTreeUtils_1 = require_parseTreeUtils();
-    function getBuiltInScope(currentScope) {
-      let builtInScope = currentScope;
-      while (builtInScope.type !== 4) {
-        builtInScope = builtInScope.parent;
-      }
-      return builtInScope;
-    }
-    exports.getBuiltInScope = getBuiltInScope;
-    function getScopeForNode(node) {
-      const scopeNode = (0, parseTreeUtils_1.getEvaluationScopeNode)(node);
-      return (0, analyzerNodeInfo_1.getScope)(scopeNode);
-    }
-    exports.getScopeForNode = getScopeForNode;
-    function getScopeHierarchy(node, stopScope) {
-      const scopeHierarchy = [];
-      let curNode = node;
-      while (curNode) {
-        const curScope = getScopeForNode(curNode);
-        if (!curScope) {
-          return void 0;
-        }
-        if (scopeHierarchy.length === 0 || scopeHierarchy[scopeHierarchy.length - 1] !== curScope) {
-          scopeHierarchy.push(curScope);
-        }
-        if (curScope === stopScope) {
-          return scopeHierarchy;
-        }
-        curNode = curNode.parent;
-      }
-      return stopScope ? void 0 : scopeHierarchy;
-    }
-    exports.getScopeHierarchy = getScopeHierarchy;
-    function findTopNodeInScope(node, scope) {
-      let curNode = node;
-      let prevNode;
-      let foundScope = false;
-      while (curNode) {
-        if ((0, analyzerNodeInfo_1.getScope)(curNode) === scope) {
-          foundScope = true;
-        } else if (foundScope) {
-          return prevNode;
-        }
-        prevNode = curNode;
-        curNode = curNode.parent;
-      }
-      return void 0;
-    }
-    exports.findTopNodeInScope = findTopNodeInScope;
-  }
-});
-
-// node_modules/@zzzen/pyright-internal/dist/analyzer/sourceFileInfoUtils.js
-var require_sourceFileInfoUtils = __commonJS({
-  "node_modules/@zzzen/pyright-internal/dist/analyzer/sourceFileInfoUtils.js"(exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    exports.collectImportedByFiles = exports.isUserCode = void 0;
-    function isUserCode(fileInfo) {
-      return !!fileInfo && fileInfo.isTracked && !fileInfo.isThirdPartyImport && !fileInfo.isTypeshedFile;
-    }
-    exports.isUserCode = isUserCode;
-    function collectImportedByFiles(fileInfo) {
-      const importedByFiles = /* @__PURE__ */ new Set();
-      _collectImportedByFiles(fileInfo, importedByFiles);
-      return importedByFiles;
-    }
-    exports.collectImportedByFiles = collectImportedByFiles;
-    function _collectImportedByFiles(fileInfo, importedByFiles) {
-      fileInfo.importedBy.forEach((dep) => {
-        if (importedByFiles.has(dep)) {
-          return;
-        }
-        importedByFiles.add(dep);
-        _collectImportedByFiles(dep, importedByFiles);
-      });
-    }
-  }
-});
-
-// node_modules/@zzzen/pyright-internal/dist/analyzer/sourceMapperUtils.js
-var require_sourceMapperUtils = __commonJS({
-  "node_modules/@zzzen/pyright-internal/dist/analyzer/sourceMapperUtils.js"(exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    exports.buildImportTree = void 0;
-    var MAX_TREE_SEARCH_COUNT = 1e3;
-    var NumberReference = class {
-      constructor() {
-        this.value = 0;
-      }
-    };
-    function _buildImportTreeImpl(to, from, next, previous, totalSearched, token) {
-      if (totalSearched.value > MAX_TREE_SEARCH_COUNT || token.isCancellationRequested) {
-        return [];
-      }
-      totalSearched.value += 1;
-      if (from === to) {
-        return previous.length ? previous : [from];
-      } else if (previous.length > 1 && previous.find((s) => s === from)) {
-        return [];
-      } else {
-        const nextEntries = next(from);
-        for (let i = 0; i < nextEntries.length && !token.isCancellationRequested; i++) {
-          const subentries = _buildImportTreeImpl(to, nextEntries[i], next, [...previous, from], totalSearched, token);
-          if (subentries.length > 0) {
-            return subentries;
-          }
-        }
-      }
-      return [];
-    }
-    function buildImportTree(to, from, next, token) {
-      const totalCountRef = new NumberReference();
-      const results = _buildImportTreeImpl(to, from, next, [], totalCountRef, token);
-      return results.length > 0 ? results : [from];
-    }
-    exports.buildImportTree = buildImportTree;
-  }
-});
-
 // node_modules/@zzzen/pyright-internal/dist/analyzer/symbol.js
 var require_symbol = __commonJS({
   "node_modules/@zzzen/pyright-internal/dist/analyzer/symbol.js"(exports) {
@@ -26750,11 +26492,13 @@ var require_typeVarContext = __commonJS({
           case 1:
           case 2:
           case 3:
-          case 5:
-          case 6:
           case 10: {
             return 0.5;
           }
+          case 5:
+          case 6: {
+            return 0.8;
+          }
           case 0:
           case 4:
             return 1;
@@ -26932,12 +26676,11 @@ var require_typeUtils = __commonJS({
   "node_modules/@zzzen/pyright-internal/dist/analyzer/typeUtils.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
-    exports.isTypeVarLimitedToCallable = exports.getTypeVarArgumentsRecursive = exports.addTypeVarsToListIfUnique = exports.getClassFieldsRecursive = exports.getClassIterator = exports.getClassMemberIterator = exports.lookUpClassMember = exports.lookUpObjectMember = exports.getContainerDepth = exports.getProtocolSymbols = exports.transformExpectedTypeForConstructor = exports.validateTypeVarDefault = exports.applySolvedTypeVars = exports.populateTypeVarContextForSelfType = exports.partiallySpecializeType = exports.isUnboundedTupleClass = exports.isTupleClass = exports.isMaybeDescriptorInstance = exports.isDescriptorInstance = exports.isProperty = exports.isEllipsisType = exports.getUnionSubtypeCount = exports.getLiteralTypeClassName = exports.containsLiteralType = exports.containsType = exports.isLiteralTypeOrUnion = exports.isLiteralType = exports.getSpecializedTupleType = exports.getTypeVarScopeId = exports.transformPossibleRecursiveTypeAlias = exports.isTypeAliasRecursive = exports.isTypeAliasPlaceholder = exports.getTypeCondition = exports.addConditionToType = exports.getFullNameOfType = exports.derivesFromAnyOrUnknown = exports.isUnionableType = exports.preserveUnknown = exports.areTypesSame = exports.doForEachSubtype = exports.sortTypes = exports.mapSubtypes = exports.makeInferenceContext = exports.isIncompleteUnknown = exports.isOptionalType = exports.getParameterListDetails = exports.ParameterSource = exports.AssignTypeFlags = exports.ClassIteratorFlags = exports.ClassMemberLookupFlags = void 0;
-    exports.convertParamSpecValueToType = exports.convertTypeToParamSpecValue = exports.getDeclaringModulesForType = exports.computeMroLinearization = exports.isVarianceOfTypeArgumentCompatible = exports.combineVariances = exports.requiresSpecialization = exports.requiresTypeArguments = exports.getGeneratorTypeArgs = exports.removeParamSpecVariadicsFromFunction = exports.removeParamSpecVariadicsFromSignature = exports.specializeTupleClass = exports.combineSameSizedTuples = exports.explodeGenericClass = exports.isPartlyUnknown = exports.containsUnknown = exports.getMembersForModule = exports.getMembersForClass = exports.convertToInstantiable = exports.convertToInstance = exports.isEffectivelyInstantiable = exports.isMetaclassInstance = exports.getGeneratorYieldType = exports.getDeclaredGeneratorReturnType = exports.synthesizeTypeVarForSelfCls = exports.derivesFromClassRecursive = exports.specializeForBaseClass = exports.buildTypeVarContext = exports.buildTypeVarContextFromSpecializedClass = exports.setTypeArgumentsRecursive = exports.specializeClassType = void 0;
+    exports.getTypeVarArgumentsRecursive = exports.addTypeVarsToListIfUnique = exports.getClassFieldsRecursive = exports.getClassIterator = exports.getClassMemberIterator = exports.lookUpClassMember = exports.lookUpObjectMember = exports.getContainerDepth = exports.getProtocolSymbols = exports.transformExpectedTypeForConstructor = exports.validateTypeVarDefault = exports.applySolvedTypeVars = exports.ensureFunctionSignaturesAreUnique = exports.populateTypeVarContextForSelfType = exports.partiallySpecializeType = exports.isUnboundedTupleClass = exports.isTupleClass = exports.isMaybeDescriptorInstance = exports.isDescriptorInstance = exports.isProperty = exports.isEllipsisType = exports.getUnionSubtypeCount = exports.getLiteralTypeClassName = exports.containsLiteralType = exports.containsType = exports.isLiteralTypeOrUnion = exports.isLiteralType = exports.getSpecializedTupleType = exports.getTypeVarScopeId = exports.transformPossibleRecursiveTypeAlias = exports.isTypeAliasRecursive = exports.isTypeAliasPlaceholder = exports.getTypeCondition = exports.addConditionToType = exports.getFullNameOfType = exports.derivesFromAnyOrUnknown = exports.isUnionableType = exports.preserveUnknown = exports.areTypesSame = exports.doForEachSubtype = exports.sortTypes = exports.mapSubtypes = exports.makeInferenceContext = exports.isTypeVarSame = exports.isIncompleteUnknown = exports.isOptionalType = exports.UniqueSignatureTracker = exports.AssignTypeFlags = exports.ClassIteratorFlags = exports.ClassMemberLookupFlags = void 0;
+    exports.convertParamSpecValueToType = exports.convertTypeToParamSpecValue = exports.getDeclaringModulesForType = exports.computeMroLinearization = exports.isVarianceOfTypeArgumentCompatible = exports.combineVariances = exports.requiresSpecialization = exports.requiresTypeArguments = exports.getGeneratorTypeArgs = exports.removeParamSpecVariadicsFromFunction = exports.removeParamSpecVariadicsFromSignature = exports.specializeTupleClass = exports.combineSameSizedTuples = exports.explodeGenericClass = exports.isPartlyUnknown = exports.containsUnknown = exports.getMembersForModule = exports.getMembersForClass = exports.convertToInstantiable = exports.convertToInstance = exports.isEffectivelyInstantiable = exports.isMetaclassInstance = exports.getGeneratorYieldType = exports.getDeclaredGeneratorReturnType = exports.synthesizeTypeVarForSelfCls = exports.derivesFromClassRecursive = exports.specializeForBaseClass = exports.buildTypeVarContext = exports.buildTypeVarContextFromSpecializedClass = exports.setTypeArgumentsRecursive = exports.specializeClassType = exports.isTypeVarLimitedToCallable = void 0;
     var collectionUtils_1 = require_collectionUtils();
     var debug_1 = require_debug2();
     var symbol_1 = require_symbol();
-    var symbolNameUtils_1 = require_symbolNameUtils();
     var symbolUtils_1 = require_symbolUtils();
     var types_1 = require_types();
     var typeVarContext_1 = require_typeVarContext();
@@ -26974,169 +26717,25 @@ var require_typeUtils = __commonJS({
       AssignTypeFlags2[AssignTypeFlags2["IgnoreTypeVarScope"] = 512] = "IgnoreTypeVarScope";
       AssignTypeFlags2[AssignTypeFlags2["PopulatingExpectedType"] = 1024] = "PopulatingExpectedType";
     })(AssignTypeFlags = exports.AssignTypeFlags || (exports.AssignTypeFlags = {}));
-    var ParameterSource;
-    (function(ParameterSource2) {
-      ParameterSource2[ParameterSource2["PositionOnly"] = 0] = "PositionOnly";
-      ParameterSource2[ParameterSource2["PositionOrKeyword"] = 1] = "PositionOrKeyword";
-      ParameterSource2[ParameterSource2["KeywordOnly"] = 2] = "KeywordOnly";
-    })(ParameterSource = exports.ParameterSource || (exports.ParameterSource = {}));
-    function getParameterListDetails(type) {
-      const result = {
-        firstPositionOrKeywordIndex: 0,
-        positionParamCount: 0,
-        positionOnlyParamCount: 0,
-        params: [],
-        hasUnpackedVariadicTypeVar: false,
-        hasUnpackedTypedDict: false
-      };
-      let positionOnlyIndex = type.details.parameters.findIndex((p) => p.category === 0 && !p.name);
-      if (positionOnlyIndex < 0) {
-        for (let i = 0; i < type.details.parameters.length; i++) {
-          const p = type.details.parameters[i];
-          if (p.category !== 0) {
-            break;
-          }
-          if (!p.name) {
-            break;
-          }
-          if ((0, symbolNameUtils_1.isDunderName)(p.name) || !p.name.startsWith("__")) {
-            break;
-          }
-          positionOnlyIndex = i + 1;
-        }
+    var UniqueSignatureTracker = class {
+      constructor() {
+        this.signaturesSeen = [];
       }
-      if (positionOnlyIndex >= 0) {
-        result.firstPositionOrKeywordIndex = positionOnlyIndex;
+      findSignature(signature) {
+        return this.signaturesSeen.find((s) => {
+          return (0, types_1.isTypeSame)(signature, s.type);
+        });
       }
-      for (let i = 0; i < positionOnlyIndex; i++) {
-        if (type.details.parameters[i].hasDefault) {
-          break;
+      addSignature(signature) {
+        const existingSignature = this.findSignature(signature);
+        if (existingSignature) {
+          existingSignature.count++;
+        } else {
+          this.signaturesSeen.push({ type: signature, count: 1 });
         }
-        result.positionOnlyParamCount++;
       }
-      let sawKeywordOnlySeparator = false;
-      const addVirtualParameter = (param, index, typeOverride, defaultArgTypeOverride, sourceOverride) => {
-        if (param.name) {
-          let source;
-          if (sourceOverride !== void 0) {
-            source = sourceOverride;
-          } else if (param.category === 1) {
-            source = ParameterSource.PositionOnly;
-          } else if (sawKeywordOnlySeparator) {
-            source = ParameterSource.KeywordOnly;
-          } else if (positionOnlyIndex >= 0 && index < positionOnlyIndex) {
-            source = ParameterSource.PositionOnly;
-          } else {
-            source = ParameterSource.PositionOrKeyword;
-          }
-          result.params.push({
-            param,
-            index,
-            type: typeOverride !== null && typeOverride !== void 0 ? typeOverride : types_1.FunctionType.getEffectiveParameterType(type, index),
-            defaultArgType: defaultArgTypeOverride,
-            source
-          });
-        }
-      };
-      type.details.parameters.forEach((param, index) => {
-        var _a, _b;
-        if (param.category === 1) {
-          const paramType = types_1.FunctionType.getEffectiveParameterType(type, index);
-          if (param.name && (0, types_1.isUnpackedClass)(paramType) && paramType.tupleTypeArguments) {
-            const addToPositionalOnly = index < result.positionOnlyParamCount;
-            paramType.tupleTypeArguments.forEach((tupleArg, tupleIndex) => {
-              const category = (0, types_1.isVariadicTypeVar)(tupleArg.type) || tupleArg.isUnbounded ? 1 : 0;
-              if (category === 1) {
-                result.argsIndex = result.params.length;
-              }
-              if ((0, types_1.isVariadicTypeVar)(param.type)) {
-                result.hasUnpackedVariadicTypeVar = true;
-              }
-              addVirtualParameter(
-                {
-                  category,
-                  name: `${param.name}[${tupleIndex.toString()}]`,
-                  isNameSynthesized: true,
-                  type: tupleArg.type,
-                  hasDeclaredType: true
-                },
-                index,
-                tupleArg.type,
-                /* defaultArgTypeOverride */
-                void 0,
-                ParameterSource.PositionOnly
-              );
-              if (category === 0) {
-                result.positionParamCount++;
-              }
-              if (tupleIndex > 0 && addToPositionalOnly) {
-                result.positionOnlyParamCount++;
-              }
-            });
-            if (!sawKeywordOnlySeparator && (positionOnlyIndex < 0 || index >= positionOnlyIndex)) {
-              result.firstKeywordOnlyIndex = result.params.length;
-              sawKeywordOnlySeparator = true;
-            }
-          } else {
-            if (param.name && result.argsIndex === void 0) {
-              result.argsIndex = result.params.length;
-              if ((0, types_1.isVariadicTypeVar)(param.type)) {
-                result.hasUnpackedVariadicTypeVar = true;
-              }
-            }
-            if (!sawKeywordOnlySeparator && (positionOnlyIndex < 0 || index >= positionOnlyIndex)) {
-              result.firstKeywordOnlyIndex = result.params.length;
-              if (param.name) {
-                result.firstKeywordOnlyIndex++;
-              }
-              sawKeywordOnlySeparator = true;
-            }
-            addVirtualParameter(param, index);
-          }
-        } else if (param.category === 2) {
-          sawKeywordOnlySeparator = true;
-          const paramType = types_1.FunctionType.getEffectiveParameterType(type, index);
-          if ((0, types_1.isClassInstance)(paramType) && (0, types_1.isUnpackedClass)(paramType) && paramType.details.typedDictEntries) {
-            if (result.firstKeywordOnlyIndex === void 0) {
-              result.firstKeywordOnlyIndex = result.params.length;
-            }
-            const typedDictType = paramType;
-            paramType.details.typedDictEntries.forEach((entry, name) => {
-              const specializedParamType = partiallySpecializeType(entry.valueType, typedDictType);
-              addVirtualParameter({
-                category: 0,
-                name,
-                type: specializedParamType,
-                hasDeclaredType: true,
-                hasDefault: !entry.isRequired
-              }, index, specializedParamType);
-            });
-            result.hasUnpackedTypedDict = true;
-          } else if (param.name) {
-            if (result.kwargsIndex === void 0) {
-              result.kwargsIndex = result.params.length;
-            }
-            if (result.firstKeywordOnlyIndex === void 0) {
-              result.firstKeywordOnlyIndex = result.params.length;
-            }
-            addVirtualParameter(param, index);
-          }
-        } else if (param.category === 0) {
-          if (param.name && !sawKeywordOnlySeparator) {
-            result.positionParamCount++;
-          }
-          addVirtualParameter(
-            param,
-            index,
-            /* typeOverride */
-            void 0,
-            ((_a = type.specializedTypes) === null || _a === void 0 ? void 0 : _a.parameterDefaultArgs) ? (_b = type.specializedTypes) === null || _b === void 0 ? void 0 : _b.parameterDefaultArgs[index] : void 0
-          );
-        }
-      });
-      return result;
-    }
-    exports.getParameterListDetails = getParameterListDetails;
+    };
+    exports.UniqueSignatureTracker = UniqueSignatureTracker;
     function isOptionalType(type) {
       if ((0, types_1.isUnion)(type)) {
         return (0, types_1.findSubtype)(type, (subtype) => (0, types_1.isNoneInstance)(subtype)) !== void 0;
@@ -27148,6 +26747,31 @@ var require_typeUtils = __commonJS({
       return (0, types_1.isUnknown)(type) && type.isIncomplete;
     }
     exports.isIncompleteUnknown = isIncompleteUnknown;
+    function isTypeVarSame(type1, type2) {
+      if ((0, types_1.isTypeSame)(type1, type2)) {
+        return true;
+      }
+      if (type1.details.isParamSpec || type1.details.isVariadic || !type1.details.boundType) {
+        return false;
+      }
+      if (!(0, types_1.isUnion)(type2)) {
+        return false;
+      }
+      let isCompatible = true;
+      doForEachSubtype(type2, (subtype) => {
+        if (!isCompatible) {
+          return;
+        }
+        if (!(0, types_1.isTypeSame)(type1, subtype)) {
+          const conditions = getTypeCondition(subtype);
+          if (!conditions || !conditions.some((condition) => condition.typeVarName === type1.nameWithScope)) {
+            isCompatible = false;
+          }
+        }
+      });
+      return isCompatible;
+    }
+    exports.isTypeVarSame = isTypeVarSame;
     function makeInferenceContext(expectedType, typeVarContext, isTypeIncomplete) {
       if (!expectedType) {
         return void 0;
@@ -27640,6 +27264,11 @@ var require_typeUtils = __commonJS({
       typeVarContext.setTypeVarType(synthesizedSelfTypeVar, convertToInstance(selfClass));
     }
     exports.populateTypeVarContextForSelfType = populateTypeVarContextForSelfType;
+    function ensureFunctionSignaturesAreUnique(type, signatureTracker) {
+      const transformer = new UniqueFunctionSignatureTransformer(signatureTracker);
+      return transformer.apply(type, 0);
+    }
+    exports.ensureFunctionSignaturesAreUnique = ensureFunctionSignaturesAreUnique;
     function applySolvedTypeVars(type, typeVarContext, options = {}) {
       if (typeVarContext.isEmpty() && !options.unknownIfNotFound && !options.eliminateUnsolvedInUnions) {
         return type;
@@ -28306,10 +27935,12 @@ var require_typeUtils = __commonJS({
       if (type.typeAliasInfo && type !== result) {
         result = types_1.TypeBase.cloneForTypeAlias(result, type.typeAliasInfo.name, type.typeAliasInfo.fullName, type.typeAliasInfo.typeVarScopeId, type.typeAliasInfo.typeParameters, type.typeAliasInfo.typeArguments);
       }
-      if (!type.cached) {
-        type.cached = {};
+      if (type !== result) {
+        if (!type.cached) {
+          type.cached = {};
+        }
+        type.cached.instanceType = result;
       }
-      type.cached.instanceType = result;
       return result;
     }
     exports.convertToInstance = convertToInstance;
@@ -28963,7 +28594,7 @@ var require_typeUtils = __commonJS({
           return type;
         }
         recursionCount++;
-        type = this._transformGenericTypeAlias(type, recursionCount);
+        type = this.transformGenericTypeAlias(type, recursionCount);
         if (!requiresSpecialization(type)) {
           return type;
         }
@@ -29033,14 +28664,14 @@ var require_typeUtils = __commonJS({
           return !(0, types_1.isNever)(newUnionType) ? newUnionType : types_1.UnknownType.create();
         }
         if ((0, types_1.isClass)(type)) {
-          return this._transformTypeVarsInClassType(type, recursionCount);
+          return this.transformTypeVarsInClassType(type, recursionCount);
         }
         if ((0, types_1.isFunction)(type)) {
           if (this._pendingFunctionTransformations.some((t) => t === type)) {
             return type;
           }
           this._pendingFunctionTransformations.push(type);
-          const result = this._transformTypeVarsInFunctionType(type, recursionCount);
+          const result = this.transformTypeVarsInFunctionType(type, recursionCount);
           this._pendingFunctionTransformations.pop();
           return result;
         }
@@ -29052,7 +28683,7 @@ var require_typeUtils = __commonJS({
           let requiresUpdate = false;
           const newOverloads = [];
           type.overloads.forEach((entry) => {
-            const replacementType = this._transformTypeVarsInFunctionType(entry, recursionCount);
+            const replacementType = this.transformTypeVarsInFunctionType(entry, recursionCount);
             if ((0, types_1.isFunction)(replacementType)) {
               newOverloads.push(replacementType);
             } else {
@@ -29068,7 +28699,7 @@ var require_typeUtils = __commonJS({
         return type;
       }
       transformTypeVar(typeVar, recursionCount) {
-        return typeVar;
+        return void 0;
       }
       transformTupleTypeVar(paramSpec, recursionCount) {
         return void 0;
@@ -29082,7 +28713,7 @@ var require_typeUtils = __commonJS({
       doForEachSignatureContext(callback) {
         return callback();
       }
-      _transformGenericTypeAlias(type, recursionCount) {
+      transformGenericTypeAlias(type, recursionCount) {
         if (!type.typeAliasInfo || !type.typeAliasInfo.typeParameters || !type.typeAliasInfo.typeArguments) {
           return type;
         }
@@ -29096,11 +28727,11 @@ var require_typeUtils = __commonJS({
         });
         return requiresUpdate ? types_1.TypeBase.cloneForTypeAlias(type, type.typeAliasInfo.name, type.typeAliasInfo.fullName, type.typeAliasInfo.typeVarScopeId, type.typeAliasInfo.typeParameters, newTypeArgs) : type;
       }
-      _transformTypeVarsInClassType(classType, recursionCount) {
+      transformTypeVarsInClassType(classType, recursionCount) {
         if (types_1.ClassType.getTypeParameters(classType).length === 0 && !types_1.ClassType.isSpecialBuiltIn(classType)) {
           return classType;
         }
-        let newTypeArgs = [];
+        let newTypeArgs;
         let newTupleTypeArgs;
         let specializationNeeded = false;
         const typeParams = types_1.ClassType.getTypeParameters(classType);
@@ -29115,43 +28746,6 @@ var require_typeUtils = __commonJS({
         };
         const wasTransformingTypeArg = this._isTransformingTypeArg;
         this._isTransformingTypeArg = true;
-        if (classType.typeArguments) {
-          newTypeArgs = classType.typeArguments.map((oldTypeArgType) => {
-            if ((0, types_1.isTypeVar)(oldTypeArgType) && oldTypeArgType.details.isParamSpec) {
-              return transformParamSpec(oldTypeArgType);
-            }
-            let newTypeArgType = this.apply(oldTypeArgType, recursionCount);
-            if (newTypeArgType !== oldTypeArgType) {
-              specializationNeeded = true;
-              if ((0, types_1.isTypeVar)(oldTypeArgType) && (0, types_1.isVariadicTypeVar)(oldTypeArgType) && oldTypeArgType.isVariadicInUnion) {
-                newTypeArgType = _expandVariadicUnpackedUnion(newTypeArgType);
-              }
-            }
-            return newTypeArgType;
-          });
-        } else {
-          typeParams.forEach((typeParam) => {
-            let replacementType = typeParam;
-            if (typeParam.details.isParamSpec) {
-              replacementType = transformParamSpec(typeParam);
-              if (replacementType !== typeParam) {
-                specializationNeeded = true;
-              }
-            } else {
-              const typeParamName = types_1.TypeVarType.getNameWithScope(typeParam);
-              if (!this._pendingTypeVarTransformations.has(typeParamName)) {
-                const transformedType = this.transformTypeVar(typeParam, recursionCount);
-                replacementType = transformedType !== null && transformedType !== void 0 ? transformedType : typeParam;
-                if (replacementType !== typeParam) {
-                  specializationNeeded = true;
-                } else if (transformedType !== void 0 && !classType.typeArguments) {
-                  specializationNeeded = true;
-                }
-              }
-            }
-            newTypeArgs.push(replacementType);
-          });
-        }
         if (types_1.ClassType.isTupleClass(classType)) {
           if (classType.tupleTypeArguments) {
             newTupleTypeArgs = [];
@@ -29172,6 +28766,60 @@ var require_typeUtils = __commonJS({
               specializationNeeded = true;
             }
           }
+          if (newTupleTypeArgs && newTupleTypeArgs.length > 0) {
+            newTypeArgs = [
+              (0, types_1.combineTypes)(newTupleTypeArgs.map((t) => {
+                if ((0, types_1.isTypeVar)(t.type) && (0, types_1.isUnpackedVariadicTypeVar)(t.type)) {
+                  return types_1.TypeVarType.cloneForUnpacked(
+                    t.type,
+                    /* isInUnion */
+                    true
+                  );
+                }
+                return t.type;
+              }))
+            ];
+          }
+        }
+        if (!newTypeArgs) {
+          if (classType.typeArguments) {
+            newTypeArgs = classType.typeArguments.map((oldTypeArgType) => {
+              if ((0, types_1.isTypeVar)(oldTypeArgType) && oldTypeArgType.details.isParamSpec) {
+                return transformParamSpec(oldTypeArgType);
+              }
+              let newTypeArgType = this.apply(oldTypeArgType, recursionCount);
+              if (newTypeArgType !== oldTypeArgType) {
+                specializationNeeded = true;
+                if ((0, types_1.isTypeVar)(oldTypeArgType) && (0, types_1.isVariadicTypeVar)(oldTypeArgType) && oldTypeArgType.isVariadicInUnion) {
+                  newTypeArgType = _expandVariadicUnpackedUnion(newTypeArgType);
+                }
+              }
+              return newTypeArgType;
+            });
+          } else {
+            newTypeArgs = [];
+            typeParams.forEach((typeParam) => {
+              let replacementType = typeParam;
+              if (typeParam.details.isParamSpec) {
+                replacementType = transformParamSpec(typeParam);
+                if (replacementType !== typeParam) {
+                  specializationNeeded = true;
+                }
+              } else {
+                const typeParamName = types_1.TypeVarType.getNameWithScope(typeParam);
+                if (!this._pendingTypeVarTransformations.has(typeParamName)) {
+                  const transformedType = this.transformTypeVar(typeParam, recursionCount);
+                  replacementType = transformedType !== null && transformedType !== void 0 ? transformedType : typeParam;
+                  if (replacementType !== typeParam) {
+                    specializationNeeded = true;
+                  } else if (transformedType !== void 0 && !classType.typeArguments) {
+                    specializationNeeded = true;
+                  }
+                }
+              }
+              newTypeArgs.push(replacementType);
+            });
+          }
         }
         this._isTransformingTypeArg = wasTransformingTypeArg;
         if (!specializationNeeded) {
@@ -29187,7 +28835,7 @@ var require_typeUtils = __commonJS({
           newTupleTypeArgs
         );
       }
-      _transformTypeVarsInFunctionType(sourceType, recursionCount) {
+      transformTypeVarsInFunctionType(sourceType, recursionCount) {
         return this.doForEachSignatureContext(() => {
           let functionType = sourceType;
           if (functionType.details.paramSpec) {
@@ -29334,6 +28982,29 @@ var require_typeUtils = __commonJS({
         return void 0;
       }
     };
+    var UniqueFunctionSignatureTransformer = class extends TypeVarTransformer {
+      constructor(_signatureTracker) {
+        super();
+        this._signatureTracker = _signatureTracker;
+      }
+      transformTypeVarsInFunctionType(sourceType, recursionCount) {
+        if (sourceType.details.typeParameters.length === 0) {
+          return super.transformTypeVarsInFunctionType(sourceType, recursionCount);
+        }
+        let updatedSourceType = sourceType;
+        const existingSignature = this._signatureTracker.findSignature(sourceType);
+        if (existingSignature) {
+          const typeVarContext = new typeVarContext_1.TypeVarContext(getTypeVarScopeId(sourceType));
+          sourceType.details.typeParameters.forEach((typeParam) => {
+            const replacement = types_1.TypeVarType.cloneForNewName(typeParam, `${typeParam.details.name}(${existingSignature.count})`);
+            typeVarContext.setTypeVarType(typeParam, replacement);
+            updatedSourceType = applySolvedTypeVars(sourceType, typeVarContext);
+          });
+        }
+        this._signatureTracker.addSignature(sourceType);
+        return updatedSourceType;
+      }
+    };
     var ApplySolvedTypeVarsTransformer = class extends TypeVarTransformer {
       constructor(_typeVarContext, _options) {
         super();
@@ -29512,6 +29183,313 @@ var require_typeUtils = __commonJS({
   }
 });
 
+// node_modules/@zzzen/pyright-internal/dist/analyzer/parameterUtils.js
+var require_parameterUtils = __commonJS({
+  "node_modules/@zzzen/pyright-internal/dist/analyzer/parameterUtils.js"(exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.getParameterListDetails = exports.ParameterSource = exports.isTypedKwargs = void 0;
+    var symbolNameUtils_1 = require_symbolNameUtils();
+    var types_1 = require_types();
+    var typeUtils_1 = require_typeUtils();
+    function isTypedKwargs(param) {
+      return param.category === 2 && (0, types_1.isClassInstance)(param.type) && (0, types_1.isUnpackedClass)(param.type) && types_1.ClassType.isTypedDictClass(param.type) && !!param.type.details.typedDictEntries;
+    }
+    exports.isTypedKwargs = isTypedKwargs;
+    var ParameterSource;
+    (function(ParameterSource2) {
+      ParameterSource2[ParameterSource2["PositionOnly"] = 0] = "PositionOnly";
+      ParameterSource2[ParameterSource2["PositionOrKeyword"] = 1] = "PositionOrKeyword";
+      ParameterSource2[ParameterSource2["KeywordOnly"] = 2] = "KeywordOnly";
+    })(ParameterSource = exports.ParameterSource || (exports.ParameterSource = {}));
+    function getParameterListDetails(type) {
+      const result = {
+        firstPositionOrKeywordIndex: 0,
+        positionParamCount: 0,
+        positionOnlyParamCount: 0,
+        params: [],
+        hasUnpackedVariadicTypeVar: false,
+        hasUnpackedTypedDict: false
+      };
+      let positionOnlyIndex = type.details.parameters.findIndex((p) => p.category === 0 && !p.name);
+      if (positionOnlyIndex < 0) {
+        for (let i = 0; i < type.details.parameters.length; i++) {
+          const p = type.details.parameters[i];
+          if (p.category !== 0) {
+            break;
+          }
+          if (!p.name) {
+            break;
+          }
+          if ((0, symbolNameUtils_1.isDunderName)(p.name) || !p.name.startsWith("__")) {
+            break;
+          }
+          positionOnlyIndex = i + 1;
+        }
+      }
+      if (positionOnlyIndex >= 0) {
+        result.firstPositionOrKeywordIndex = positionOnlyIndex;
+      }
+      for (let i = 0; i < positionOnlyIndex; i++) {
+        if (type.details.parameters[i].hasDefault) {
+          break;
+        }
+        result.positionOnlyParamCount++;
+      }
+      let sawKeywordOnlySeparator = false;
+      const addVirtualParameter = (param, index, typeOverride, defaultArgTypeOverride, sourceOverride) => {
+        if (param.name) {
+          let source;
+          if (sourceOverride !== void 0) {
+            source = sourceOverride;
+          } else if (param.category === 1) {
+            source = ParameterSource.PositionOnly;
+          } else if (sawKeywordOnlySeparator) {
+            source = ParameterSource.KeywordOnly;
+          } else if (positionOnlyIndex >= 0 && index < positionOnlyIndex) {
+            source = ParameterSource.PositionOnly;
+          } else {
+            source = ParameterSource.PositionOrKeyword;
+          }
+          result.params.push({
+            param,
+            index,
+            type: typeOverride !== null && typeOverride !== void 0 ? typeOverride : types_1.FunctionType.getEffectiveParameterType(type, index),
+            defaultArgType: defaultArgTypeOverride,
+            source
+          });
+        }
+      };
+      type.details.parameters.forEach((param, index) => {
+        var _a, _b;
+        if (param.category === 1) {
+          const paramType = types_1.FunctionType.getEffectiveParameterType(type, index);
+          if (param.name && (0, types_1.isUnpackedClass)(paramType) && paramType.tupleTypeArguments) {
+            const addToPositionalOnly = index < result.positionOnlyParamCount;
+            paramType.tupleTypeArguments.forEach((tupleArg, tupleIndex) => {
+              const category = (0, types_1.isVariadicTypeVar)(tupleArg.type) || tupleArg.isUnbounded ? 1 : 0;
+              if (category === 1) {
+                result.argsIndex = result.params.length;
+              }
+              if ((0, types_1.isVariadicTypeVar)(param.type)) {
+                result.hasUnpackedVariadicTypeVar = true;
+              }
+              addVirtualParameter(
+                {
+                  category,
+                  name: `${param.name}[${tupleIndex.toString()}]`,
+                  isNameSynthesized: true,
+                  type: tupleArg.type,
+                  hasDeclaredType: true
+                },
+                index,
+                tupleArg.type,
+                /* defaultArgTypeOverride */
+                void 0,
+                ParameterSource.PositionOnly
+              );
+              if (category === 0) {
+                result.positionParamCount++;
+              }
+              if (tupleIndex > 0 && addToPositionalOnly) {
+                result.positionOnlyParamCount++;
+              }
+            });
+            if (!sawKeywordOnlySeparator && (positionOnlyIndex < 0 || index >= positionOnlyIndex)) {
+              result.firstKeywordOnlyIndex = result.params.length;
+              sawKeywordOnlySeparator = true;
+            }
+          } else {
+            if (param.name && result.argsIndex === void 0) {
+              result.argsIndex = result.params.length;
+              if ((0, types_1.isVariadicTypeVar)(param.type)) {
+                result.hasUnpackedVariadicTypeVar = true;
+              }
+            }
+            if (!sawKeywordOnlySeparator && (positionOnlyIndex < 0 || index >= positionOnlyIndex)) {
+              result.firstKeywordOnlyIndex = result.params.length;
+              if (param.name) {
+                result.firstKeywordOnlyIndex++;
+              }
+              sawKeywordOnlySeparator = true;
+            }
+            addVirtualParameter(param, index);
+          }
+        } else if (param.category === 2) {
+          sawKeywordOnlySeparator = true;
+          const paramType = types_1.FunctionType.getEffectiveParameterType(type, index);
+          if ((0, types_1.isClassInstance)(paramType) && (0, types_1.isUnpackedClass)(paramType) && paramType.details.typedDictEntries) {
+            if (result.firstKeywordOnlyIndex === void 0) {
+              result.firstKeywordOnlyIndex = result.params.length;
+            }
+            const typedDictType = paramType;
+            paramType.details.typedDictEntries.forEach((entry, name) => {
+              const specializedParamType = (0, typeUtils_1.partiallySpecializeType)(entry.valueType, typedDictType);
+              addVirtualParameter({
+                category: 0,
+                name,
+                type: specializedParamType,
+                hasDeclaredType: true,
+                hasDefault: !entry.isRequired
+              }, index, specializedParamType);
+            });
+            result.hasUnpackedTypedDict = true;
+          } else if (param.name) {
+            if (result.kwargsIndex === void 0) {
+              result.kwargsIndex = result.params.length;
+            }
+            if (result.firstKeywordOnlyIndex === void 0) {
+              result.firstKeywordOnlyIndex = result.params.length;
+            }
+            addVirtualParameter(param, index);
+          }
+        } else if (param.category === 0) {
+          if (param.name && !sawKeywordOnlySeparator) {
+            result.positionParamCount++;
+          }
+          addVirtualParameter(
+            param,
+            index,
+            /* typeOverride */
+            void 0,
+            ((_a = type.specializedTypes) === null || _a === void 0 ? void 0 : _a.parameterDefaultArgs) ? (_b = type.specializedTypes) === null || _b === void 0 ? void 0 : _b.parameterDefaultArgs[index] : void 0
+          );
+        }
+      });
+      return result;
+    }
+    exports.getParameterListDetails = getParameterListDetails;
+  }
+});
+
+// node_modules/@zzzen/pyright-internal/dist/analyzer/scopeUtils.js
+var require_scopeUtils = __commonJS({
+  "node_modules/@zzzen/pyright-internal/dist/analyzer/scopeUtils.js"(exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.findTopNodeInScope = exports.getScopeHierarchy = exports.getScopeForNode = exports.getBuiltInScope = void 0;
+    var analyzerNodeInfo_1 = require_analyzerNodeInfo();
+    var parseTreeUtils_1 = require_parseTreeUtils();
+    function getBuiltInScope(currentScope) {
+      let builtInScope = currentScope;
+      while (builtInScope.type !== 4) {
+        builtInScope = builtInScope.parent;
+      }
+      return builtInScope;
+    }
+    exports.getBuiltInScope = getBuiltInScope;
+    function getScopeForNode(node) {
+      const scopeNode = (0, parseTreeUtils_1.getEvaluationScopeNode)(node);
+      return (0, analyzerNodeInfo_1.getScope)(scopeNode);
+    }
+    exports.getScopeForNode = getScopeForNode;
+    function getScopeHierarchy(node, stopScope) {
+      const scopeHierarchy = [];
+      let curNode = node;
+      while (curNode) {
+        const curScope = getScopeForNode(curNode);
+        if (!curScope) {
+          return void 0;
+        }
+        if (scopeHierarchy.length === 0 || scopeHierarchy[scopeHierarchy.length - 1] !== curScope) {
+          scopeHierarchy.push(curScope);
+        }
+        if (curScope === stopScope) {
+          return scopeHierarchy;
+        }
+        curNode = curNode.parent;
+      }
+      return stopScope ? void 0 : scopeHierarchy;
+    }
+    exports.getScopeHierarchy = getScopeHierarchy;
+    function findTopNodeInScope(node, scope) {
+      let curNode = node;
+      let prevNode;
+      let foundScope = false;
+      while (curNode) {
+        if ((0, analyzerNodeInfo_1.getScope)(curNode) === scope) {
+          foundScope = true;
+        } else if (foundScope) {
+          return prevNode;
+        }
+        prevNode = curNode;
+        curNode = curNode.parent;
+      }
+      return void 0;
+    }
+    exports.findTopNodeInScope = findTopNodeInScope;
+  }
+});
+
+// node_modules/@zzzen/pyright-internal/dist/analyzer/sourceFileInfoUtils.js
+var require_sourceFileInfoUtils = __commonJS({
+  "node_modules/@zzzen/pyright-internal/dist/analyzer/sourceFileInfoUtils.js"(exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.collectImportedByFiles = exports.isUserCode = void 0;
+    function isUserCode(fileInfo) {
+      return !!fileInfo && fileInfo.isTracked && !fileInfo.isThirdPartyImport && !fileInfo.isTypeshedFile;
+    }
+    exports.isUserCode = isUserCode;
+    function collectImportedByFiles(fileInfo) {
+      const importedByFiles = /* @__PURE__ */ new Set();
+      _collectImportedByFiles(fileInfo, importedByFiles);
+      return importedByFiles;
+    }
+    exports.collectImportedByFiles = collectImportedByFiles;
+    function _collectImportedByFiles(fileInfo, importedByFiles) {
+      fileInfo.importedBy.forEach((dep) => {
+        if (importedByFiles.has(dep)) {
+          return;
+        }
+        importedByFiles.add(dep);
+        _collectImportedByFiles(dep, importedByFiles);
+      });
+    }
+  }
+});
+
+// node_modules/@zzzen/pyright-internal/dist/analyzer/sourceMapperUtils.js
+var require_sourceMapperUtils = __commonJS({
+  "node_modules/@zzzen/pyright-internal/dist/analyzer/sourceMapperUtils.js"(exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.buildImportTree = void 0;
+    var MAX_TREE_SEARCH_COUNT = 1e3;
+    var NumberReference = class {
+      constructor() {
+        this.value = 0;
+      }
+    };
+    function buildImportTree(to, from, next, token) {
+      const totalCountRef = new NumberReference();
+      const results = _buildImportTreeImpl(to, from, next, [], totalCountRef, token);
+      return results.length > 0 ? results : [from];
+    }
+    exports.buildImportTree = buildImportTree;
+    function _buildImportTreeImpl(to, from, next, previous, totalSearched, token) {
+      if (totalSearched.value > MAX_TREE_SEARCH_COUNT || token.isCancellationRequested) {
+        return [];
+      }
+      totalSearched.value += 1;
+      if (from === to) {
+        return previous.length ? previous : [from];
+      }
+      if (previous.length > 1 && previous.find((s) => s === from)) {
+        return [];
+      }
+      const nextEntries = next(from);
+      for (let i = 0; i < nextEntries.length && !token.isCancellationRequested; i++) {
+        const subentries = _buildImportTreeImpl(to, nextEntries[i], next, [...previous, from], totalSearched, token);
+        if (subentries.length > 0) {
+          return subentries;
+        }
+      }
+      return [];
+    }
+  }
+});
+
 // node_modules/@zzzen/pyright-internal/dist/analyzer/sourceMapper.js
 var require_sourceMapper = __commonJS({
   "node_modules/@zzzen/pyright-internal/dist/analyzer/sourceMapper.js"(exports) {
@@ -30712,7 +30690,6 @@ var require_package_nls_en_us = __commonJS({
         tupleEntryTypeMismatch: "Tuple entry {entry} is incorrect type",
         tupleAssignmentMismatch: 'Type "{type}" is incompatible with target tuple',
         tupleSizeMismatch: "Element size mismatch; expected {expected} but received {received}",
-        tupleSizeMismatchIndeterminate: "Tuple size mismatch; expected {expected} but received indeterminate number",
         typeAssignmentMismatch: 'Type "{sourceType}" cannot be assigned to type "{destType}"',
         typeBound: 'Type "{sourceType}" is incompatible with bound type "{destType}" for type variable "{name}"',
         typeConstrainedTypeVar: 'Type "{type}" is incompatible with constrained type variable "{name}"',
@@ -31595,7 +31572,6 @@ var require_localize = __commonJS({
         DiagnosticAddendum2.tupleEntryTypeMismatch = () => new ParameterizedString(getRawString("DiagnosticAddendum.tupleEntryTypeMismatch"));
         DiagnosticAddendum2.tupleAssignmentMismatch = () => new ParameterizedString(getRawString("DiagnosticAddendum.tupleAssignmentMismatch"));
         DiagnosticAddendum2.tupleSizeMismatch = () => new ParameterizedString(getRawString("DiagnosticAddendum.tupleSizeMismatch"));
-        DiagnosticAddendum2.tupleSizeMismatchIndeterminate = () => new ParameterizedString(getRawString("DiagnosticAddendum.tupleSizeMismatchIndeterminate"));
         DiagnosticAddendum2.typeAssignmentMismatch = () => new ParameterizedString(getRawString("DiagnosticAddendum.typeAssignmentMismatch"));
         DiagnosticAddendum2.typeBound = () => new ParameterizedString(getRawString("DiagnosticAddendum.typeBound"));
         DiagnosticAddendum2.typeConstrainedTypeVar = () => new ParameterizedString(getRawString("DiagnosticAddendum.typeConstrainedTypeVar"));
@@ -31834,15 +31810,47 @@ var require_typedDicts = __commonJS({
       });
       types_1.FunctionType.addDefaultParameters(newType);
       newType.details.declaredReturnType = types_1.ClassType.cloneAsInstance(classType);
-      const initType = types_1.FunctionType.createSynthesizedInstance("__init__");
-      types_1.FunctionType.addParameter(initType, {
+      const initOverride1 = types_1.FunctionType.createSynthesizedInstance(
+        "__init__",
+        256
+        /* Overloaded */
+      );
+      types_1.FunctionType.addParameter(initOverride1, {
         category: 0,
         name: "self",
         type: types_1.ClassType.cloneAsInstance(classType),
         hasDeclaredType: true
       });
-      initType.details.declaredReturnType = types_1.NoneType.createInstance();
-      types_1.FunctionType.addParameter(initType, {
+      initOverride1.details.declaredReturnType = types_1.NoneType.createInstance();
+      types_1.FunctionType.addParameter(initOverride1, {
+        category: 0,
+        name: "__map",
+        type: types_1.ClassType.cloneAsInstance(classType),
+        hasDeclaredType: true
+      });
+      types_1.FunctionType.addParameter(initOverride1, {
+        category: 0,
+        name: "",
+        type: types_1.UnknownType.create()
+      });
+      types_1.FunctionType.addParameter(initOverride1, {
+        category: 1,
+        type: types_1.AnyType.create(),
+        hasDeclaredType: true
+      });
+      const initOverride2 = types_1.FunctionType.createSynthesizedInstance(
+        "__init__",
+        256
+        /* Overloaded */
+      );
+      types_1.FunctionType.addParameter(initOverride2, {
+        category: 0,
+        name: "self",
+        type: types_1.ClassType.cloneAsInstance(classType),
+        hasDeclaredType: true
+      });
+      initOverride2.details.declaredReturnType = types_1.NoneType.createInstance();
+      types_1.FunctionType.addParameter(initOverride2, {
         category: 1,
         type: types_1.AnyType.create(),
         hasDeclaredType: true
@@ -31850,7 +31858,14 @@ var require_typedDicts = __commonJS({
       const entries = getTypedDictMembersForClass(evaluator, classType);
       let allEntriesAreNotRequired = true;
       entries.forEach((entry, name) => {
-        types_1.FunctionType.addParameter(initType, {
+        types_1.FunctionType.addParameter(initOverride1, {
+          category: 0,
+          name,
+          hasDefault: true,
+          type: entry.valueType,
+          hasDeclaredType: true
+        });
+        types_1.FunctionType.addParameter(initOverride2, {
           category: 0,
           name,
           hasDefault: !entry.isRequired,
@@ -31862,6 +31877,7 @@ var require_typedDicts = __commonJS({
         }
       });
       const symbolTable = classType.details.fields;
+      const initType = types_1.OverloadedFunctionType.create([initOverride1, initOverride2]);
       symbolTable.set("__init__", symbol_1.Symbol.createWithType(4, initType));
       symbolTable.set("__new__", symbol_1.Symbol.createWithType(4, newType));
       const strClass = evaluator.getBuiltInType(node, "str");
@@ -32387,6 +32403,7 @@ var require_typedDicts = __commonJS({
       let diag = new diagnostic_1.DiagnosticAddendum();
       let allDiagsInvolveNotRequiredKeys = true;
       const resultingType = (0, typeUtils_1.mapSubtypes)(indexType, (subtype) => {
+        var _a, _b;
         if ((0, types_1.isAnyOrUnknown)(subtype)) {
           return subtype;
         }
@@ -32416,7 +32433,7 @@ var require_typedDicts = __commonJS({
             }
           }
           if (usage.method === "set") {
-            if (!evaluator.assignType(entry.valueType, usage.setType || types_1.AnyType.create(), diag)) {
+            if (!evaluator.assignType(entry.valueType, (_b = (_a = usage.setType) === null || _a === void 0 ? void 0 : _a.type) !== null && _b !== void 0 ? _b : types_1.AnyType.create(), diag)) {
               allDiagsInvolveNotRequiredKeys = false;
             }
           } else if (usage.method === "del" && entry.isRequired) {
@@ -35527,7 +35544,7 @@ var require_documentSymbolCollector = __commonJS({
           if (index === 0) {
             const decls = [];
             decls.push(...((_d = evaluator.getDeclarationsForNameNode(moduleName.nameParts[0])) === null || _d === void 0 ? void 0 : _d.filter((d) => (0, declaration_1.isAliasDeclaration)(d))) || []);
-            if (decls.length === 0) {
+            if (decls.length === 0 || moduleName.parent.nodeType !== 21) {
               return decls;
             }
             const isImportAsWithAlias = moduleName.nameParts.length === 1 && moduleName.parent.nodeType === 21 && !!moduleName.parent.alias;
@@ -36450,12 +36467,17 @@ ${methodBody}`;
         return sb + `super().${decl.node.name.value}(${parameters.map(convertToString).join(", ")})`;
         function getParameters(parameters2) {
           const results = [];
-          let keywordOnly = false;
+          let sawKeywordOnlySeparator = false;
           for (const parameter of parameters2) {
             if (parameter.name) {
-              results.push([parameter, keywordOnly]);
+              results.push([
+                parameter,
+                parameter.category === 0 && !!parameter.name && sawKeywordOnlySeparator
+              ]);
+            }
+            if (parameter.category === 1) {
+              sawKeywordOnlySeparator = true;
             }
-            keywordOnly = parameter.category === 1 || parameter.category === 2;
           }
           return results;
         }
@@ -37269,7 +37291,7 @@ ${methodBody}`;
           const hidden = !(0, symbolUtils_1.isVisibleExternally)(symbol) && !symbol.getDeclarations().some((d) => (0, declarationUtils_1.isDefinedInFile)(d, this._filePath));
           if (!hidden && includeSymbolCallback(symbol, name)) {
             if (!completionMap.has(name)) {
-              const skipForClass = symbol.getDeclarations().some((d) => d.type === 6 && d.moduleName !== "builtins");
+              const skipForClass = !this._shouldShowAutoParensForClass(symbol, node);
               this._addSymbol(name, symbol, priorWord, completionMap, {
                 boundObjectOrClass,
                 funcParensDisabled: isInImport || insideTypeAnnotation || skipForClass,
@@ -37279,6 +37301,21 @@ ${methodBody}`;
           }
         });
       }
+      _shouldShowAutoParensForClass(symbol, node) {
+        var _a;
+        if (symbol.getDeclarations().every(
+          (d) => d.type !== 6
+          /* Class */
+        )) {
+          return true;
+        }
+        if (((_a = node.parent) === null || _a === void 0 ? void 0 : _a.nodeType) === 1) {
+          return true;
+        }
+        const nodeIndex = ParseTreeUtils.getTokenIndexAtLeft(this._parseResults.tokenizerOutput.tokens, node.start);
+        const prevToken = ParseTreeUtils.getTokenAtIndex(this._parseResults.tokenizerOutput.tokens, nodeIndex);
+        return prevToken && prevToken.type === 9 && prevToken.operatorType === 2;
+      }
       _addSymbol(name, symbol, priorWord, completionMap, detail) {
         var _a, _b, _c, _d;
         let primaryDecl = (0, symbolUtils_1.getLastTypedDeclaredForSymbol)(symbol);
@@ -37980,115 +38017,6 @@ var require_documentHighlightProvider = __commonJS({
   }
 });
 
-// node_modules/@zzzen/pyright-internal/dist/analyzer/aliasDeclarationUtils.js
-var require_aliasDeclarationUtils = __commonJS({
-  "node_modules/@zzzen/pyright-internal/dist/analyzer/aliasDeclarationUtils.js"(exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    exports.resolveAliasDeclaration = void 0;
-    function resolveAliasDeclaration(importLookup, declaration, resolveLocalNames, allowExternallyHiddenAccess) {
-      let curDeclaration = declaration;
-      const alreadyVisited = [];
-      let isPrivate = false;
-      let sawPyTypedTransition = false;
-      let privatePyTypedImported;
-      let privatePyTypedImporter;
-      while (true) {
-        if (curDeclaration.type !== 8 || !curDeclaration.symbolName) {
-          return {
-            declaration: curDeclaration,
-            isPrivate,
-            privatePyTypedImported,
-            privatePyTypedImporter
-          };
-        }
-        if (!resolveLocalNames && curDeclaration.usesLocalName) {
-          return {
-            declaration: curDeclaration,
-            isPrivate,
-            privatePyTypedImported,
-            privatePyTypedImporter
-          };
-        }
-        let lookupResult;
-        if (curDeclaration.path && curDeclaration.loadSymbolsFromPath) {
-          lookupResult = importLookup(curDeclaration.path);
-        }
-        const symbol = lookupResult ? lookupResult.symbolTable.get(curDeclaration.symbolName) : void 0;
-        if (!symbol) {
-          if (curDeclaration.submoduleFallback) {
-            if (curDeclaration.symbolName) {
-              if (curDeclaration.submoduleFallback.type === 8 && curDeclaration.submoduleFallback.path) {
-                const lookupResult2 = importLookup(curDeclaration.submoduleFallback.path);
-                if (!lookupResult2) {
-                  return void 0;
-                }
-              }
-            }
-            return resolveAliasDeclaration(importLookup, curDeclaration.submoduleFallback, resolveLocalNames, allowExternallyHiddenAccess);
-          }
-          if (curDeclaration.isNativeLib) {
-            return {
-              declaration: void 0,
-              isPrivate
-            };
-          }
-          return void 0;
-        }
-        if (symbol.isPrivateMember()) {
-          isPrivate = true;
-        }
-        if (symbol.isExternallyHidden() && !allowExternallyHiddenAccess) {
-          return void 0;
-        }
-        let declarations = symbol.getTypedDeclarations();
-        declarations = declarations.filter((decl) => !decl.isInExceptSuite);
-        if (declarations.length === 0) {
-          declarations = symbol.getDeclarations();
-          declarations = declarations.filter((decl) => !decl.isInExceptSuite);
-        }
-        if (declarations.length === 0) {
-          declarations = symbol.getDeclarations();
-        }
-        if (declarations.length === 0) {
-          return void 0;
-        }
-        const unvisitedDecls = declarations.filter((decl) => !alreadyVisited.includes(decl));
-        if (unvisitedDecls.length > 0) {
-          curDeclaration = unvisitedDecls[unvisitedDecls.length - 1];
-        } else {
-          curDeclaration = declarations[declarations.length - 1];
-        }
-        if (lookupResult === null || lookupResult === void 0 ? void 0 : lookupResult.isInPyTypedPackage) {
-          if (!sawPyTypedTransition) {
-            if (symbol.isPrivatePyTypedImport()) {
-              privatePyTypedImporter = curDeclaration === null || curDeclaration === void 0 ? void 0 : curDeclaration.moduleName;
-            }
-            sawPyTypedTransition = true;
-          } else {
-            if (!symbol.isPrivatePyTypedImport()) {
-              privatePyTypedImported = privatePyTypedImported !== null && privatePyTypedImported !== void 0 ? privatePyTypedImported : curDeclaration === null || curDeclaration === void 0 ? void 0 : curDeclaration.moduleName;
-            }
-          }
-        }
-        if (alreadyVisited.find((decl) => decl === curDeclaration)) {
-          if (curDeclaration.path === declaration.path && curDeclaration.type === 8 && curDeclaration.submoduleFallback) {
-            return resolveAliasDeclaration(importLookup, curDeclaration.submoduleFallback, resolveLocalNames, allowExternallyHiddenAccess);
-          }
-          return {
-            declaration,
-            isPrivate,
-            privatePyTypedImported,
-            privatePyTypedImporter
-          };
-        }
-        alreadyVisited.push(curDeclaration);
-      }
-    }
-    exports.resolveAliasDeclaration = resolveAliasDeclaration;
-  }
-});
-
 // node_modules/@zzzen/pyright-internal/dist/languageService/documentSymbolProvider.js
 var require_documentSymbolProvider = __commonJS({
   "node_modules/@zzzen/pyright-internal/dist/languageService/documentSymbolProvider.js"(exports) {
@@ -38125,7 +38053,6 @@ var require_documentSymbolProvider = __commonJS({
     exports.DocumentSymbolProvider = exports.convertToFlatSymbols = exports.getIndexAliasData = void 0;
     var vscode_languageserver_1 = require_main3();
     var vscode_uri_1 = (init_esm(), __toCommonJS(esm_exports));
-    var aliasDeclarationUtils_1 = require_aliasDeclarationUtils();
     var AnalyzerNodeInfo = __importStar(require_analyzerNodeInfo());
     var declarationUtils_1 = require_declarationUtils();
     var symbolUtils_1 = require_symbolUtils();
@@ -38139,7 +38066,7 @@ var require_documentSymbolProvider = __commonJS({
       if (!declaration.symbolName) {
         return void 0;
       }
-      const resolvedInfo = (0, aliasDeclarationUtils_1.resolveAliasDeclaration)(
+      const resolvedInfo = (0, declarationUtils_1.resolveAliasDeclaration)(
         importLookup,
         declaration,
         /* resolveLocalNames */
@@ -38480,12 +38407,11 @@ var require_hoverProvider = __commonJS({
             results.lastKnownModule = primaryDeclaration.moduleName;
           } else if (!node.parent || node.parent.nodeType !== 37) {
             if (results.parts.length === 0) {
-              let type = evaluator.getType(node) || types_1.UnknownType.create();
+              const type = this._getType(evaluator, node);
               let typeText;
               if ((0, types_1.isModule)(type)) {
                 typeText = "(module) " + node.value;
               } else {
-                type = this._limitOverloadBasedOnCall(node, evaluator, type);
                 let label = "function";
                 let isProperty = false;
                 if ((0, typeUtils_1.isMaybeDescriptorInstance)(
@@ -38564,17 +38490,17 @@ var require_hoverProvider = __commonJS({
                 typeNode = declaration.node;
               }
             }
-            let type = evaluator.getType(typeNode);
-            if ((!type || type.category === 1) && resolvedDecl.alternativeTypeNode && (0, parseNodes_1.isExpressionNode)(resolvedDecl.alternativeTypeNode)) {
-              const inferredType = evaluator.getType(resolvedDecl.alternativeTypeNode);
-              if (inferredType && inferredType.category !== 1) {
+            let type = this._getType(evaluator, typeNode);
+            if ((0, types_1.isUnknown)(type) && resolvedDecl.alternativeTypeNode && (0, parseNodes_1.isExpressionNode)(resolvedDecl.alternativeTypeNode)) {
+              const inferredType = this._getType(evaluator, resolvedDecl.alternativeTypeNode);
+              if (!(0, types_1.isUnknown)(inferredType)) {
                 type = inferredType;
                 typeNode = resolvedDecl.alternativeTypeNode;
               }
             }
             let expandTypeAlias = false;
             let typeVarName;
-            if ((type === null || type === void 0 ? void 0 : type.typeAliasInfo) && typeNode.nodeType === 38) {
+            if (type.typeAliasInfo && typeNode.nodeType === 38) {
               const typeAliasInfo = (0, types_1.getTypeAliasInfo)(type);
               if ((typeAliasInfo === null || typeAliasInfo === void 0 ? void 0 : typeAliasInfo.name) === typeNode.value) {
                 if ((0, types_1.isTypeVar)(type)) {
@@ -38655,22 +38581,19 @@ var require_hoverProvider = __commonJS({
               );
               label = isProperty ? "property" : "method";
             }
-            let type = evaluator.getType(node);
+            let type = this._getType(evaluator, node);
             const resolvedType = extensibility_1.Extensions.getProgramExtensions(resolvedDecl.node).map((e) => {
               var _a2;
               return (_a2 = e.typeProviderExtension) === null || _a2 === void 0 ? void 0 : _a2.tryGetFunctionNodeType(resolvedDecl.node, evaluator, token);
-            }).find((t) => !!t) || evaluator.getType(resolvedDecl.node.name);
-            type = type === void 0 || (0, types_1.isAnyOrUnknown)(type) ? resolvedType : type;
-            if (type) {
-              type = this._limitOverloadBasedOnCall(node, evaluator, type);
-              const signatureString = (0, tooltipUtils_1.getToolTipForType)(type, label, node.value, evaluator, isProperty, functionSignatureDisplay);
-              this._addResultsPart(
-                parts,
-                signatureString,
-                /* python */
-                true
-              );
-            }
+            }).find((t) => !!t) || this._getType(evaluator, resolvedDecl.node.name);
+            type = (0, types_1.isAnyOrUnknown)(type) ? resolvedType : type;
+            const signatureString = (0, tooltipUtils_1.getToolTipForType)(type, label, node.value, evaluator, isProperty, functionSignatureDisplay);
+            this._addResultsPart(
+              parts,
+              signatureString,
+              /* python */
+              true
+            );
             this._addDocumentationPart(format, sourceMapper, parts, node, evaluator, resolvedDecl);
             break;
           }
@@ -38742,12 +38665,12 @@ var require_hoverProvider = __commonJS({
         if (!callLeftNode || !callLeftNode.parent || callLeftNode.parent.nodeType !== 9 || callLeftNode.parent.leftExpression !== callLeftNode) {
           return false;
         }
-        const classType = evaluator.getType(node);
-        if (!classType || !(0, types_1.isInstantiableClass)(classType)) {
+        const classType = this._getType(evaluator, node);
+        if (!(0, types_1.isInstantiableClass)(classType)) {
           return false;
         }
-        const instanceType = evaluator.getType(callLeftNode.parent);
-        if (!instanceType || !(0, types_1.isClassInstance)(instanceType)) {
+        const instanceType = this._getType(evaluator, callLeftNode.parent);
+        if (!(0, types_1.isClassInstance)(instanceType)) {
           return false;
         }
         let methodType;
@@ -38760,7 +38683,7 @@ var require_hoverProvider = __commonJS({
         if (initMember) {
           const functionType = evaluator.getTypeOfMember(initMember);
           if ((0, types_1.isFunction)(functionType) || (0, types_1.isOverloadedFunction)(functionType)) {
-            methodType = evaluator.bindFunctionToClassOrObject(instanceType, functionType);
+            methodType = this._bindFunctionToClassOrObject(evaluator, node, instanceType, functionType);
           }
         }
         if (!methodType || methodType && (0, types_1.isFunction)(methodType) && (types_1.FunctionType.hasDefaultParameters(methodType) || methodType.details.parameters.length === 0)) {
@@ -38773,15 +38696,11 @@ var require_hoverProvider = __commonJS({
           if (newMember) {
             const newMemberType = evaluator.getTypeOfMember(newMember);
             if ((0, types_1.isFunction)(newMemberType) || (0, types_1.isOverloadedFunction)(newMemberType)) {
-              methodType = evaluator.bindFunctionToClassOrObject(
+              methodType = this._bindFunctionToClassOrObject(
+                evaluator,
+                node,
                 instanceType,
                 newMemberType,
-                /* memberClass */
-                void 0,
-                /* errorNode */
-                void 0,
-                /* recursiveCount */
-                void 0,
                 /* treatConstructorAsClassMember */
                 true
               );
@@ -38789,7 +38708,6 @@ var require_hoverProvider = __commonJS({
           }
         }
         if (methodType && ((0, types_1.isFunction)(methodType) || (0, types_1.isOverloadedFunction)(methodType))) {
-          methodType = this._limitOverloadBasedOnCall(node, evaluator, methodType);
           this._addResultsPart(
             parts,
             (0, tooltipUtils_1.getConstructorTooltip)(node.value, methodType, evaluator, functionSignatureDisplay),
@@ -38805,32 +38723,54 @@ var require_hoverProvider = __commonJS({
         return false;
       }
       static _getTypeText(node, evaluator, expandTypeAlias = false) {
-        let type = evaluator.getType(node) || types_1.UnknownType.create();
-        type = this._limitOverloadBasedOnCall(node, evaluator, type);
+        const type = this._getType(evaluator, node);
         return ": " + evaluator.printType(type, { expandTypeAlias });
       }
       static _getTypesText(nodes, evaluator, expandTypeAlias = false) {
         const type = (0, tooltipUtils_1.combineExpressionTypes)(nodes, evaluator);
         return ": " + evaluator.printType(type, { expandTypeAlias });
       }
-      static _limitOverloadBasedOnCall(node, evaluator, type) {
-        if ((0, types_1.isOverloadedFunction)(type) && node.nodeType === 38) {
-          const callNode = ParseTreeUtils.getCallForName(node);
-          if (callNode) {
-            const callTypeResult = evaluator.getTypeResult(callNode);
-            if ((callTypeResult === null || callTypeResult === void 0 ? void 0 : callTypeResult.overloadsUsedForCall) && callTypeResult.overloadsUsedForCall.length > 0) {
-              if (callTypeResult.overloadsUsedForCall.length === 1) {
-                type = callTypeResult.overloadsUsedForCall[0];
-              } else {
-                type = types_1.OverloadedFunctionType.create(callTypeResult.overloadsUsedForCall);
-              }
-            }
-          }
+      static _bindFunctionToClassOrObject(evaluator, node, baseType, memberType, treatConstructorAsClassMember) {
+        const methodType = evaluator.bindFunctionToClassOrObject(
+          baseType,
+          memberType,
+          /* memberClass */
+          void 0,
+          /* errorNode */
+          void 0,
+          /* recursiveCount */
+          void 0,
+          treatConstructorAsClassMember
+        );
+        if (!methodType) {
+          return void 0;
         }
-        return type;
+        return this._limitOverloadBasedOnCall(evaluator, methodType, node);
+      }
+      static _getType(evaluator, node) {
+        var _a;
+        const type = (_a = evaluator.getType(node)) !== null && _a !== void 0 ? _a : types_1.UnknownType.create();
+        return this._limitOverloadBasedOnCall(evaluator, type, node);
+      }
+      static _limitOverloadBasedOnCall(evaluator, type, node) {
+        if (!(0, types_1.isOverloadedFunction)(type) || node.nodeType !== 38) {
+          return type;
+        }
+        const callNode = ParseTreeUtils.getCallForName(node);
+        if (!callNode) {
+          return type;
+        }
+        const callTypeResult = evaluator.getTypeResult(callNode);
+        if (!callTypeResult || !callTypeResult.overloadsUsedForCall || callTypeResult.overloadsUsedForCall.length === 0) {
+          return type;
+        }
+        if (callTypeResult.overloadsUsedForCall.length === 1) {
+          return callTypeResult.overloadsUsedForCall[0];
+        }
+        return types_1.OverloadedFunctionType.create(callTypeResult.overloadsUsedForCall);
       }
       static _addDocumentationPart(format, sourceMapper, parts, node, evaluator, resolvedDecl) {
-        const type = evaluator.getType(node);
+        const type = this._getType(evaluator, node);
         this._addDocumentationPartForType(format, sourceMapper, parts, type, resolvedDecl, evaluator, node.value);
       }
       static _addDocumentationPartForType(format, sourceMapper, parts, type, resolvedDecl, evaluator, name) {
@@ -39913,7 +39853,7 @@ var require_binder = __commonJS({
       return result;
     };
     Object.defineProperty(exports, "__esModule", { value: true });
-    exports.ReturnFinder = exports.YieldFinder = exports.Binder = void 0;
+    exports.DummyScopeGenerator = exports.ReturnFinder = exports.YieldFinder = exports.Binder = void 0;
     var collectionUtils_1 = require_collectionUtils();
     var debug_1 = require_debug2();
     var diagnosticRules_1 = require_diagnosticRules();
@@ -41667,6 +41607,10 @@ var require_binder = __commonJS({
                 this._targetFunctionDeclaration.isGenerator = true;
               }
             }
+            if (!this._moduleSymbolOnly) {
+              const dummyScopeGenerator = new DummyScopeGenerator(this._currentScope);
+              dummyScopeGenerator.walk(statement);
+            }
           }
         }
         return false;
@@ -42864,6 +42808,39 @@ var require_binder = __commonJS({
       }
     };
     exports.ReturnFinder = ReturnFinder;
+    var DummyScopeGenerator = class extends parseTreeWalker_1.ParseTreeWalker {
+      constructor(currentScope) {
+        super();
+        this._currentScope = currentScope;
+      }
+      visitClass(node) {
+        const newScope = this._createNewScope(2, () => {
+          this.walk(node.suite);
+        });
+        if (!AnalyzerNodeInfo.getScope(node)) {
+          AnalyzerNodeInfo.setScope(node, newScope);
+        }
+        return false;
+      }
+      visitFunction(node) {
+        const newScope = this._createNewScope(1, () => {
+          this.walk(node.suite);
+        });
+        if (!AnalyzerNodeInfo.getScope(node)) {
+          AnalyzerNodeInfo.setScope(node, newScope);
+        }
+        return false;
+      }
+      _createNewScope(scopeType, callback) {
+        const prevScope = this._currentScope;
+        const newScope = new scope_1.Scope(scopeType, this._currentScope);
+        this._currentScope = newScope;
+        callback();
+        this._currentScope = prevScope;
+        return newScope;
+      }
+    };
+    exports.DummyScopeGenerator = DummyScopeGenerator;
   }
 });
 
@@ -48640,8 +48617,13 @@ var require_constraintSolver = __commonJS({
                 makeConcrete = false;
               }
             }
+            const adjWideTypeBound = makeConcrete ? evaluator.makeTopLevelTypeVarsConcrete(
+              curWideTypeBound,
+              /* makeParamSpecsConcrete */
+              true
+            ) : curWideTypeBound;
             if (!evaluator.assignType(
-              makeConcrete ? evaluator.makeTopLevelTypeVarsConcrete(curWideTypeBound) : curWideTypeBound,
+              adjWideTypeBound,
               newNarrowTypeBound,
               diag === null || diag === void 0 ? void 0 : diag.createAddendum(),
               /* destTypeVarContext */
@@ -49001,10 +48983,11 @@ var require_typeGuards = __commonJS({
     var symbol_1 = require_symbol();
     var typedDicts_1 = require_typedDicts();
     var types_1 = require_types();
+    var types_2 = require_types();
     var typeUtils_1 = require_typeUtils();
     var typeVarContext_1 = require_typeVarContext();
     function getTypeNarrowingCallback(evaluator, reference, testExpression, isPositiveTest, recursionCount = 0) {
-      if (recursionCount > types_1.maxTypeRecursionCount) {
+      if (recursionCount > types_2.maxTypeRecursionCount) {
         return void 0;
       }
       recursionCount++;
@@ -49061,10 +49044,10 @@ var require_typeGuards = __commonJS({
                   2
                   /* DoNotSpecialize */
                 ).type;
-                if ((0, types_1.isInstantiableClass)(callType) && types_1.ClassType.isBuiltIn(callType, "type")) {
+                if ((0, types_2.isInstantiableClass)(callType) && types_2.ClassType.isBuiltIn(callType, "type")) {
                   const classTypeResult = evaluator.getTypeOfExpression(testExpression.rightExpression);
                   const classType = evaluator.makeTopLevelTypeVarsConcrete(classTypeResult.type);
-                  if ((0, types_1.isInstantiableClass)(classType)) {
+                  if ((0, types_2.isInstantiableClass)(classType)) {
                     return (type) => {
                       return {
                         type: narrowTypeForTypeIs(evaluator, type, classType, adjIsPositiveTest),
@@ -49080,7 +49063,7 @@ var require_typeGuards = __commonJS({
             if (ParseTreeUtils.isMatchingExpression(reference, testExpression.leftExpression)) {
               const rightTypeResult = evaluator.getTypeOfExpression(testExpression.rightExpression);
               const rightType = rightTypeResult.type;
-              if ((0, types_1.isClassInstance)(rightType) && (types_1.ClassType.isEnumClass(rightType) || types_1.ClassType.isBuiltIn(rightType, "bool")) && rightType.literalValue !== void 0) {
+              if ((0, types_2.isClassInstance)(rightType) && (types_2.ClassType.isEnumClass(rightType) || types_2.ClassType.isBuiltIn(rightType, "bool")) && rightType.literalValue !== void 0) {
                 return (type) => {
                   return {
                     type: narrowTypeForLiteralComparison(
@@ -49099,10 +49082,10 @@ var require_typeGuards = __commonJS({
             if (testExpression.leftExpression.nodeType === 24 && testExpression.leftExpression.items.length === 1 && !testExpression.leftExpression.trailingComma && testExpression.leftExpression.items[0].argumentCategory === 0 && ParseTreeUtils.isMatchingExpression(reference, testExpression.leftExpression.baseExpression)) {
               const indexTypeResult = evaluator.getTypeOfExpression(testExpression.leftExpression.items[0].valueExpression);
               const indexType = indexTypeResult.type;
-              if ((0, types_1.isClassInstance)(indexType) && (0, typeUtils_1.isLiteralType)(indexType)) {
-                if (types_1.ClassType.isBuiltIn(indexType, "str")) {
+              if ((0, types_2.isClassInstance)(indexType) && (0, typeUtils_1.isLiteralType)(indexType)) {
+                if (types_2.ClassType.isBuiltIn(indexType, "str")) {
                   const rightType = evaluator.getTypeOfExpression(testExpression.rightExpression).type;
-                  if ((0, types_1.isClassInstance)(rightType) && rightType.literalValue !== void 0) {
+                  if ((0, types_2.isClassInstance)(rightType) && rightType.literalValue !== void 0) {
                     return (type) => {
                       return {
                         type: narrowTypeForDiscriminatedDictEntryComparison(evaluator, type, indexType, rightType, adjIsPositiveTest),
@@ -49110,6 +49093,25 @@ var require_typeGuards = __commonJS({
                       };
                     };
                   }
+                } else if (types_2.ClassType.isBuiltIn(indexType, "int")) {
+                  const rightTypeResult = evaluator.getTypeOfExpression(testExpression.rightExpression);
+                  const rightType = rightTypeResult.type;
+                  if ((0, types_2.isClassInstance)(rightType) && rightType.literalValue !== void 0) {
+                    let canNarrow = false;
+                    if (types_2.ClassType.isBuiltIn(rightType, "bool")) {
+                      canNarrow = true;
+                    } else if (rightType.literalValue instanceof types_1.EnumLiteral) {
+                      canNarrow = true;
+                    }
+                    if (canNarrow) {
+                      return (type) => {
+                        return {
+                          type: narrowTypeForDiscriminatedTupleComparison(evaluator, type, indexType, rightType, adjIsPositiveTest),
+                          isIncomplete: !!rightTypeResult.isIncomplete
+                        };
+                      };
+                    }
+                  }
                 }
               }
             }
@@ -49119,7 +49121,7 @@ var require_typeGuards = __commonJS({
             if (ParseTreeUtils.isMatchingExpression(reference, testExpression.leftExpression)) {
               const rightTypeResult = evaluator.getTypeOfExpression(testExpression.rightExpression);
               const rightType = rightTypeResult.type;
-              if ((0, types_1.isClassInstance)(rightType) && rightType.literalValue !== void 0) {
+              if ((0, types_2.isClassInstance)(rightType) && rightType.literalValue !== void 0) {
                 return (type) => {
                   return {
                     type: narrowTypeForLiteralComparison(
@@ -49138,10 +49140,10 @@ var require_typeGuards = __commonJS({
             if (testExpression.leftExpression.nodeType === 24 && testExpression.leftExpression.items.length === 1 && !testExpression.leftExpression.trailingComma && testExpression.leftExpression.items[0].argumentCategory === 0 && ParseTreeUtils.isMatchingExpression(reference, testExpression.leftExpression.baseExpression)) {
               const indexTypeResult = evaluator.getTypeOfExpression(testExpression.leftExpression.items[0].valueExpression);
               const indexType = indexTypeResult.type;
-              if ((0, types_1.isClassInstance)(indexType) && (0, typeUtils_1.isLiteralType)(indexType)) {
-                if (types_1.ClassType.isBuiltIn(indexType, "str")) {
+              if ((0, types_2.isClassInstance)(indexType) && (0, typeUtils_1.isLiteralType)(indexType)) {
+                if (types_2.ClassType.isBuiltIn(indexType, "str")) {
                   const rightType = evaluator.getTypeOfExpression(testExpression.rightExpression).type;
-                  if ((0, types_1.isClassInstance)(rightType) && rightType.literalValue !== void 0) {
+                  if ((0, types_2.isClassInstance)(rightType) && rightType.literalValue !== void 0) {
                     return (type) => {
                       return {
                         type: narrowTypeForDiscriminatedDictEntryComparison(evaluator, type, indexType, rightType, adjIsPositiveTest2),
@@ -49149,10 +49151,10 @@ var require_typeGuards = __commonJS({
                       };
                     };
                   }
-                } else if (types_1.ClassType.isBuiltIn(indexType, "int")) {
+                } else if (types_2.ClassType.isBuiltIn(indexType, "int")) {
                   const rightTypeResult = evaluator.getTypeOfExpression(testExpression.rightExpression);
                   const rightType = rightTypeResult.type;
-                  if ((0, types_1.isClassInstance)(rightType) && rightType.literalValue !== void 0) {
+                  if ((0, types_2.isClassInstance)(rightType) && rightType.literalValue !== void 0) {
                     return (type) => {
                       return {
                         type: narrowTypeForDiscriminatedTupleComparison(evaluator, type, indexType, rightType, adjIsPositiveTest2),
@@ -49173,7 +49175,7 @@ var require_typeGuards = __commonJS({
                 /* DoNotSpecialize */
               );
               const callType = callTypeResult.type;
-              if ((0, types_1.isFunction)(callType) && callType.details.fullName === "builtins.len") {
+              if ((0, types_2.isFunction)(callType) && callType.details.fullName === "builtins.len") {
                 const tupleLength = testExpression.rightExpression.value;
                 if (typeof tupleLength === "number") {
                   return (type) => {
@@ -49190,7 +49192,7 @@ var require_typeGuards = __commonJS({
             const rightTypeResult = evaluator.getTypeOfExpression(testExpression.rightExpression);
             const rightType = rightTypeResult.type;
             const memberName = testExpression.leftExpression.memberName;
-            if ((0, types_1.isClassInstance)(rightType) && rightType.literalValue !== void 0) {
+            if ((0, types_2.isClassInstance)(rightType) && rightType.literalValue !== void 0) {
               return (type) => {
                 return {
                   type: narrowTypeForDiscriminatedLiteralFieldComparison(evaluator, type, memberName.value, rightType, adjIsPositiveTest),
@@ -49203,7 +49205,7 @@ var require_typeGuards = __commonJS({
             const rightTypeResult = evaluator.getTypeOfExpression(testExpression.rightExpression);
             const rightType = rightTypeResult.type;
             const memberName = testExpression.leftExpression.memberName;
-            if ((0, types_1.isClassInstance)(rightType) && (types_1.ClassType.isEnumClass(rightType) || types_1.ClassType.isBuiltIn(rightType, "bool")) && rightType.literalValue !== void 0) {
+            if ((0, types_2.isClassInstance)(rightType) && (types_2.ClassType.isEnumClass(rightType) || types_2.ClassType.isBuiltIn(rightType, "bool")) && rightType.literalValue !== void 0) {
               return (type) => {
                 return {
                   type: narrowTypeForDiscriminatedLiteralFieldComparison(evaluator, type, memberName.value, rightType, adjIsPositiveTest),
@@ -49237,11 +49239,11 @@ var require_typeGuards = __commonJS({
           if (ParseTreeUtils.isMatchingExpression(reference, testExpression.rightExpression)) {
             const leftTypeResult = evaluator.getTypeOfExpression(testExpression.leftExpression);
             const leftType = leftTypeResult.type;
-            if ((0, types_1.isClassInstance)(leftType) && types_1.ClassType.isBuiltIn(leftType, "str") && (0, typeUtils_1.isLiteralType)(leftType)) {
+            if ((0, types_2.isClassInstance)(leftType) && types_2.ClassType.isBuiltIn(leftType, "str") && (0, typeUtils_1.isLiteralType)(leftType)) {
               const adjIsPositiveTest = testExpression.operator === 41 ? isPositiveTest : !isPositiveTest;
               return (type) => {
                 return {
-                  type: narrowTypeForTypedDictKey(evaluator, type, types_1.ClassType.cloneAsInstantiable(leftType), adjIsPositiveTest),
+                  type: narrowTypeForTypedDictKey(evaluator, type, types_2.ClassType.cloneAsInstantiable(leftType), adjIsPositiveTest),
                   isIncomplete: !!leftTypeResult.isIncomplete
                 };
               };
@@ -49260,7 +49262,7 @@ var require_typeGuards = __commonJS({
               /* DoNotSpecialize */
             );
             const callType = callTypeResult.type;
-            if ((0, types_1.isFunction)(callType) && (callType.details.builtInName === "isinstance" || callType.details.builtInName === "issubclass")) {
+            if ((0, types_2.isFunction)(callType) && (callType.details.builtInName === "isinstance" || callType.details.builtInName === "issubclass")) {
               const isInstanceCheck = callType.details.builtInName === "isinstance";
               const arg1TypeResult = evaluator.getTypeOfExpression(
                 arg1Expr,
@@ -49282,7 +49284,7 @@ var require_typeGuards = __commonJS({
                     false,
                     testExpression
                   );
-                  if (!(0, types_1.isNever)(narrowedType)) {
+                  if (!(0, types_2.isNever)(narrowedType)) {
                     return {
                       type: narrowedType,
                       isIncomplete
@@ -49322,7 +49324,7 @@ var require_typeGuards = __commonJS({
               /* DoNotSpecialize */
             );
             const callType = callTypeResult.type;
-            if ((0, types_1.isFunction)(callType) && callType.details.builtInName === "callable") {
+            if ((0, types_2.isFunction)(callType) && callType.details.builtInName === "callable") {
               return (type) => {
                 let narrowedType = narrowTypeForCallable(
                   evaluator,
@@ -49332,7 +49334,7 @@ var require_typeGuards = __commonJS({
                   /* allowIntersections */
                   false
                 );
-                if (isPositiveTest && (0, types_1.isNever)(narrowedType)) {
+                if (isPositiveTest && (0, types_2.isNever)(narrowedType)) {
                   narrowedType = narrowTypeForCallable(
                     evaluator,
                     type,
@@ -49355,7 +49357,7 @@ var require_typeGuards = __commonJS({
               /* DoNotSpecialize */
             );
             const callType = callTypeResult.type;
-            if ((0, types_1.isInstantiableClass)(callType) && types_1.ClassType.isBuiltIn(callType, "bool")) {
+            if ((0, types_2.isInstantiableClass)(callType) && types_2.ClassType.isBuiltIn(callType, "bool")) {
               return (type) => {
                 return {
                   type: narrowTypeForTruthiness(evaluator, type, isPositiveTest),
@@ -49370,7 +49372,7 @@ var require_typeGuards = __commonJS({
           if (ParseTreeUtils.isMatchingExpression(reference, arg0Expr)) {
             let isPossiblyTypeGuard = false;
             const isFunctionReturnTypeGuard = (type) => {
-              return type.details.declaredReturnType && (0, types_1.isClassInstance)(type.details.declaredReturnType) && types_1.ClassType.isBuiltIn(type.details.declaredReturnType, ["TypeGuard", "StrictTypeGuard"]);
+              return type.details.declaredReturnType && (0, types_2.isClassInstance)(type.details.declaredReturnType) && types_2.ClassType.isBuiltIn(type.details.declaredReturnType, ["TypeGuard", "StrictTypeGuard"]);
             };
             const callTypeResult = evaluator.getTypeOfExpression(
               testExpression.leftExpression,
@@ -49378,17 +49380,17 @@ var require_typeGuards = __commonJS({
               /* DoNotSpecialize */
             );
             const callType = callTypeResult.type;
-            if ((0, types_1.isFunction)(callType) && isFunctionReturnTypeGuard(callType)) {
+            if ((0, types_2.isFunction)(callType) && isFunctionReturnTypeGuard(callType)) {
               isPossiblyTypeGuard = true;
-            } else if ((0, types_1.isOverloadedFunction)(callType) && types_1.OverloadedFunctionType.getOverloads(callType).some((o) => isFunctionReturnTypeGuard(o))) {
+            } else if ((0, types_2.isOverloadedFunction)(callType) && types_2.OverloadedFunctionType.getOverloads(callType).some((o) => isFunctionReturnTypeGuard(o))) {
               isPossiblyTypeGuard = true;
-            } else if ((0, types_1.isClassInstance)(callType)) {
+            } else if ((0, types_2.isClassInstance)(callType)) {
               isPossiblyTypeGuard = true;
             }
             if (isPossiblyTypeGuard) {
               const functionReturnTypeResult = evaluator.getTypeOfExpression(testExpression);
               const functionReturnType = functionReturnTypeResult.type;
-              if ((0, types_1.isClassInstance)(functionReturnType) && types_1.ClassType.isBuiltIn(functionReturnType, "bool") && functionReturnType.typeGuardType) {
+              if ((0, types_2.isClassInstance)(functionReturnType) && types_2.ClassType.isBuiltIn(functionReturnType, "bool") && functionReturnType.typeGuardType) {
                 const isStrictTypeGuard = !!functionReturnType.isStrictTypeGuard;
                 const typeGuardType = functionReturnType.typeGuardType;
                 const isIncomplete = !!callTypeResult.isIncomplete || !!functionReturnTypeResult.isIncomplete;
@@ -49538,11 +49540,11 @@ var require_typeGuards = __commonJS({
           }
           const typeOfEntry = evaluator.makeTopLevelTypeVarsConcrete(tupleType.tupleTypeArguments[indexValue].type);
           if (isPositiveTest) {
-            if (!evaluator.assignType(typeOfEntry, types_1.NoneType.createInstance())) {
+            if (!evaluator.assignType(typeOfEntry, types_2.NoneType.createInstance())) {
               return void 0;
             }
           } else {
-            if ((0, types_1.isNoneInstance)(typeOfEntry)) {
+            if ((0, types_2.isNoneInstance)(typeOfEntry)) {
               return void 0;
             }
           }
@@ -49559,14 +49561,14 @@ var require_typeGuards = __commonJS({
         /* conditionFilter */
         void 0,
         (subtype, unexpandedSubtype) => {
-          if ((0, types_1.isAnyOrUnknown)(subtype)) {
+          if ((0, types_2.isAnyOrUnknown)(subtype)) {
             return subtype;
           }
-          const adjustedSubtype = (0, types_1.isTypeVar)(unexpandedSubtype) && unexpandedSubtype.details.constraints.length === 0 ? unexpandedSubtype : subtype;
-          if ((0, types_1.isClassInstance)(subtype) && types_1.ClassType.isBuiltIn(subtype, "object")) {
-            return isPositiveTest ? (0, typeUtils_1.addConditionToType)(types_1.NoneType.createInstance(), subtype.condition) : adjustedSubtype;
+          const adjustedSubtype = (0, types_2.isTypeVar)(unexpandedSubtype) && unexpandedSubtype.details.constraints.length === 0 ? unexpandedSubtype : subtype;
+          if ((0, types_2.isClassInstance)(subtype) && types_2.ClassType.isBuiltIn(subtype, "object")) {
+            return isPositiveTest ? (0, typeUtils_1.addConditionToType)(types_2.NoneType.createInstance(), subtype.condition) : adjustedSubtype;
           }
-          if ((0, types_1.isNoneInstance)(subtype) === isPositiveTest) {
+          if ((0, types_2.isNoneInstance)(subtype) === isPositiveTest) {
             return subtype;
           }
           return void 0;
@@ -49582,14 +49584,14 @@ var require_typeGuards = __commonJS({
         /* conditionFilter */
         void 0,
         (subtype, unexpandedSubtype) => {
-          if ((0, types_1.isAnyOrUnknown)(subtype)) {
+          if ((0, types_2.isAnyOrUnknown)(subtype)) {
             return subtype;
           }
-          const adjustedSubtype = (0, types_1.isTypeVar)(unexpandedSubtype) && unexpandedSubtype.details.constraints.length === 0 ? unexpandedSubtype : subtype;
-          if ((0, types_1.isClassInstance)(subtype) && types_1.ClassType.isBuiltIn(subtype, "object")) {
-            return isPositiveTest ? (0, typeUtils_1.addConditionToType)(types_1.NoneType.createInstance(), subtype.condition) : adjustedSubtype;
+          const adjustedSubtype = (0, types_2.isTypeVar)(unexpandedSubtype) && unexpandedSubtype.details.constraints.length === 0 ? unexpandedSubtype : subtype;
+          if ((0, types_2.isClassInstance)(subtype) && types_2.ClassType.isBuiltIn(subtype, "object")) {
+            return isPositiveTest ? (0, typeUtils_1.addConditionToType)(types_2.NoneType.createInstance(), subtype.condition) : adjustedSubtype;
           }
-          const isEllipsis = (0, types_1.isClassInstance)(subtype) && types_1.ClassType.isBuiltIn(subtype, "ellipsis");
+          const isEllipsis = (0, types_2.isClassInstance)(subtype) && types_2.ClassType.isBuiltIn(subtype, "ellipsis");
           if (isEllipsis === isPositiveTest) {
             return subtype;
           }
@@ -49602,11 +49604,11 @@ var require_typeGuards = __commonJS({
       const classTypeList = [];
       const addClassTypesToList = (types) => {
         types.forEach((subtype) => {
-          if ((0, types_1.isInstantiableClass)(subtype) || (0, types_1.isTypeVar)(subtype) && types_1.TypeBase.isInstantiable(subtype)) {
+          if ((0, types_2.isInstantiableClass)(subtype) || (0, types_2.isTypeVar)(subtype) && types_2.TypeBase.isInstantiable(subtype)) {
             classTypeList.push(subtype);
-          } else if ((0, types_1.isNoneTypeClass)(subtype)) {
+          } else if ((0, types_2.isNoneTypeClass)(subtype)) {
             classTypeList.push(subtype);
-          } else if ((0, types_1.isFunction)(subtype) && subtype.details.parameters.length === 2 && subtype.details.parameters[0].category === 1 && subtype.details.parameters[1].category === 2) {
+          } else if ((0, types_2.isFunction)(subtype) && subtype.details.parameters.length === 2 && subtype.details.parameters[0].category === 1 && subtype.details.parameters[1].category === 2) {
             classTypeList.push(subtype);
           } else {
             foundNonClassType = true;
@@ -49614,10 +49616,10 @@ var require_typeGuards = __commonJS({
         });
       };
       const addClassTypesRecursive = (subtype, recursionCount = 0) => {
-        if (recursionCount > types_1.maxTypeRecursionCount) {
+        if (recursionCount > types_2.maxTypeRecursionCount) {
           return;
         }
-        if ((0, types_1.isClass)(subtype) && types_1.TypeBase.isInstance(subtype) && (0, typeUtils_1.isTupleClass)(subtype)) {
+        if ((0, types_2.isClass)(subtype) && types_2.TypeBase.isInstance(subtype) && (0, typeUtils_1.isTupleClass)(subtype)) {
           if (subtype.tupleTypeArguments) {
             subtype.tupleTypeArguments.forEach((tupleEntry) => {
               addClassTypesRecursive(tupleEntry.type, recursionCount + 1);
@@ -49636,29 +49638,29 @@ var require_typeGuards = __commonJS({
       if (concreteFilterType.includeSubclasses) {
         return false;
       }
-      if ((0, types_1.isTypeVar)(filterType)) {
+      if ((0, types_2.isTypeVar)(filterType)) {
         return false;
       }
-      if (types_1.ClassType.isDerivedFrom(varType, concreteFilterType)) {
+      if (types_2.ClassType.isDerivedFrom(varType, concreteFilterType)) {
         return true;
       }
       if (isInstanceCheck) {
-        if (types_1.ClassType.isProtocolClass(concreteFilterType) && evaluator.assignType(concreteFilterType, varType)) {
+        if (types_2.ClassType.isProtocolClass(concreteFilterType) && evaluator.assignType(concreteFilterType, varType)) {
           return true;
         }
       }
-      if (types_1.ClassType.isBuiltIn(concreteFilterType, "dict") && types_1.ClassType.isTypedDictClass(varType)) {
+      if (types_2.ClassType.isBuiltIn(concreteFilterType, "dict") && types_2.ClassType.isTypedDictClass(varType)) {
         return true;
       }
       return false;
     }
     exports.isIsinstanceFilterSuperclass = isIsinstanceFilterSuperclass;
     function isIsinstanceFilterSubclass(evaluator, varType, filterType, concreteFilterType, isInstanceCheck) {
-      if (types_1.ClassType.isDerivedFrom(concreteFilterType, varType)) {
+      if (types_2.ClassType.isDerivedFrom(concreteFilterType, varType)) {
         return true;
       }
       if (isInstanceCheck) {
-        if (types_1.ClassType.isProtocolClass(varType) && evaluator.assignType(varType, concreteFilterType)) {
+        if (types_2.ClassType.isProtocolClass(varType) && evaluator.assignType(varType, concreteFilterType)) {
           return true;
         }
       }
@@ -49675,13 +49677,13 @@ var require_typeGuards = __commonJS({
         let isClassRelationshipIndeterminate = false;
         for (const filterType of classTypeList) {
           const concreteFilterType = evaluator.makeTopLevelTypeVarsConcrete(filterType);
-          if ((0, types_1.isInstantiableClass)(concreteFilterType)) {
+          if ((0, types_2.isInstantiableClass)(concreteFilterType)) {
             const filterIsSuperclass = isIsinstanceFilterSuperclass(evaluator, varType, filterType, concreteFilterType, isInstanceCheck);
             const filterIsSubclass = isIsinstanceFilterSubclass(evaluator, varType, filterType, concreteFilterType, isInstanceCheck);
             if (filterIsSuperclass) {
               foundSuperclass = true;
             }
-            if (filterIsSubclass && filterIsSuperclass && !types_1.ClassType.isSameGenericClass(varType, concreteFilterType)) {
+            if (filterIsSubclass && filterIsSuperclass && !types_2.ClassType.isSameGenericClass(varType, concreteFilterType)) {
               isClassRelationshipIndeterminate = true;
             }
             if (isPositiveTest) {
@@ -49689,10 +49691,10 @@ var require_typeGuards = __commonJS({
                 filteredTypes.push((0, typeUtils_1.addConditionToType)(varType, constraints));
               } else if (filterIsSubclass) {
                 let specializedFilterType = filterType;
-                if ((0, types_1.isClass)(filterType)) {
-                  if (types_1.ClassType.isSpecialBuiltIn(filterType) || filterType.details.typeParameters.length > 0) {
+                if ((0, types_2.isClass)(filterType)) {
+                  if (types_2.ClassType.isSpecialBuiltIn(filterType) || filterType.details.typeParameters.length > 0) {
                     const typeVarContext = new typeVarContext_1.TypeVarContext((0, typeUtils_1.getTypeVarScopeId)(filterType));
-                    const unspecializedFilterType = types_1.ClassType.cloneForSpecialization(
+                    const unspecializedFilterType = types_2.ClassType.cloneForSpecialization(
                       filterType,
                       /* typeArguments */
                       void 0,
@@ -49715,7 +49717,7 @@ var require_typeGuards = __commonJS({
               } else if (allowIntersections) {
                 const className = `<subclass of ${varType.details.name} and ${concreteFilterType.details.name}>`;
                 const fileInfo = (0, analyzerNodeInfo_1.getFileInfo)(errorNode);
-                let newClassType = types_1.ClassType.createInstantiable(
+                let newClassType = types_2.ClassType.createInstantiable(
                   className,
                   ParseTreeUtils.getClassFullName(errorNode, fileInfo.moduleName, className),
                   fileInfo.moduleName,
@@ -49727,28 +49729,28 @@ var require_typeGuards = __commonJS({
                   varType.details.effectiveMetaclass,
                   varType.details.docString
                 );
-                newClassType.details.baseClasses = [types_1.ClassType.cloneAsInstantiable(varType), concreteFilterType];
+                newClassType.details.baseClasses = [types_2.ClassType.cloneAsInstantiable(varType), concreteFilterType];
                 (0, typeUtils_1.computeMroLinearization)(newClassType);
                 newClassType = (0, typeUtils_1.addConditionToType)(newClassType, concreteFilterType.condition);
-                if ((0, types_1.isTypeVar)(unexpandedType) && !unexpandedType.details.isParamSpec && unexpandedType.details.constraints.length === 0) {
+                if ((0, types_2.isTypeVar)(unexpandedType) && !unexpandedType.details.isParamSpec && unexpandedType.details.constraints.length === 0) {
                   newClassType = (0, typeUtils_1.addConditionToType)(newClassType, [
                     {
-                      typeVarName: types_1.TypeVarType.getNameWithScope(unexpandedType),
+                      typeVarName: types_2.TypeVarType.getNameWithScope(unexpandedType),
                       constraintIndex: 0,
                       isConstrainedTypeVar: false
                     }
                   ]);
                 }
-                let newClassInstanceType = types_1.ClassType.cloneAsInstance(newClassType);
+                let newClassInstanceType = types_2.ClassType.cloneAsInstance(newClassType);
                 if (varType.condition) {
                   newClassInstanceType = (0, typeUtils_1.addConditionToType)(newClassInstanceType, varType.condition);
                 }
-                filteredTypes.push(isInstanceCheck ? newClassInstanceType : types_1.ClassType.cloneAsInstantiable(newClassInstanceType));
+                filteredTypes.push(isInstanceCheck ? newClassInstanceType : types_2.ClassType.cloneAsInstantiable(newClassInstanceType));
               }
             }
-          } else if ((0, types_1.isTypeVar)(filterType) && types_1.TypeBase.isInstantiable(filterType)) {
-            if (isInstanceCheck && types_1.TypeBase.isInstance(unexpandedType)) {
-              if ((0, types_1.isTypeVar)(unexpandedType) && (0, types_1.isTypeSame)((0, typeUtils_1.convertToInstance)(filterType), unexpandedType)) {
+          } else if ((0, types_2.isTypeVar)(filterType) && types_2.TypeBase.isInstantiable(filterType)) {
+            if (isInstanceCheck && types_2.TypeBase.isInstance(unexpandedType)) {
+              if ((0, types_2.isTypeVar)(unexpandedType) && (0, types_2.isTypeSame)((0, typeUtils_1.convertToInstance)(filterType), unexpandedType)) {
                 if (isPositiveTest) {
                   filteredTypes.push(unexpandedType);
                 }
@@ -49760,8 +49762,8 @@ var require_typeGuards = __commonJS({
                   isClassRelationshipIndeterminate = true;
                 }
               }
-            } else if (!isInstanceCheck && types_1.TypeBase.isInstantiable(unexpandedType)) {
-              if ((0, types_1.isTypeVar)(unexpandedType) && (0, types_1.isTypeSame)(filterType, unexpandedType)) {
+            } else if (!isInstanceCheck && types_2.TypeBase.isInstantiable(unexpandedType)) {
+              if ((0, types_2.isTypeVar)(unexpandedType) && (0, types_2.isTypeSame)(filterType, unexpandedType)) {
                 if (isPositiveTest) {
                   filteredTypes.push(unexpandedType);
                 }
@@ -49774,11 +49776,11 @@ var require_typeGuards = __commonJS({
                 }
               }
             }
-          } else if ((0, types_1.isFunction)(filterType)) {
+          } else if ((0, types_2.isFunction)(filterType)) {
             if (isInstanceCheck) {
               let isCallable = false;
-              if ((0, types_1.isClass)(varType)) {
-                if (types_1.TypeBase.isInstantiable(unexpandedType)) {
+              if ((0, types_2.isClass)(varType)) {
+                if (types_2.TypeBase.isInstantiable(unexpandedType)) {
                   isCallable = true;
                 } else {
                   isCallable = !!(0, typeUtils_1.lookUpClassMember)(varType, "__call__");
@@ -49800,7 +49802,7 @@ var require_typeGuards = __commonJS({
           }
         }
         if (!isInstanceCheck) {
-          return filteredTypes.map((t) => (0, types_1.isInstantiableClass)(t) ? (0, typeUtils_1.convertToInstantiable)((0, typeUtils_1.convertToInstance)(t)) : t);
+          return filteredTypes.map((t) => (0, types_2.isInstantiableClass)(t) ? (0, typeUtils_1.convertToInstantiable)((0, typeUtils_1.convertToInstance)(t)) : t);
         }
         return filteredTypes.map((t) => (0, typeUtils_1.convertToInstance)(t));
       };
@@ -49810,7 +49812,7 @@ var require_typeGuards = __commonJS({
           for (const filterType of classTypeList) {
             const concreteFilterType = evaluator.makeTopLevelTypeVarsConcrete(filterType);
             if (evaluator.assignType(varType, (0, typeUtils_1.convertToInstance)(concreteFilterType))) {
-              if ((0, types_1.isFunction)(filterType)) {
+              if ((0, types_2.isFunction)(filterType)) {
                 filteredTypes.push(unexpandedType);
               } else {
                 filteredTypes.push((0, typeUtils_1.convertToInstance)(filterType));
@@ -49819,7 +49821,7 @@ var require_typeGuards = __commonJS({
           }
         } else if (!classTypeList.some((filterType) => {
           const concreteFilterType = evaluator.makeTopLevelTypeVarsConcrete(filterType);
-          if ((0, types_1.isClass)(concreteFilterType) && !types_1.ClassType.isProtocolClass(concreteFilterType)) {
+          if ((0, types_2.isClass)(concreteFilterType) && !types_2.ClassType.isProtocolClass(concreteFilterType)) {
             return false;
           }
           return evaluator.assignType(varType, (0, typeUtils_1.convertToInstance)(concreteFilterType));
@@ -49836,23 +49838,23 @@ var require_typeGuards = __commonJS({
         void 0,
         (subtype, unexpandedSubtype) => {
           const negativeFallback = (0, typeUtils_1.getTypeCondition)(subtype) ? subtype : unexpandedSubtype;
-          const isSubtypeTypeObject = (0, types_1.isClassInstance)(subtype) && types_1.ClassType.isBuiltIn(subtype, "type");
-          if (isPositiveTest && (0, types_1.isAnyOrUnknown)(subtype)) {
+          const isSubtypeTypeObject = (0, types_2.isClassInstance)(subtype) && types_2.ClassType.isBuiltIn(subtype, "type");
+          if (isPositiveTest && (0, types_2.isAnyOrUnknown)(subtype)) {
             if (isInstanceCheck) {
-              anyOrUnknownSubstitutions.push((0, types_1.combineTypes)(classTypeList.map((classType) => (0, typeUtils_1.convertToInstance)(classType))));
+              anyOrUnknownSubstitutions.push((0, types_2.combineTypes)(classTypeList.map((classType) => (0, typeUtils_1.convertToInstance)(classType))));
             } else {
-              anyOrUnknownSubstitutions.push((0, types_1.combineTypes)(classTypeList.map((classType) => (0, typeUtils_1.convertToInstantiable)((0, typeUtils_1.convertToInstance)(classType)))));
+              anyOrUnknownSubstitutions.push((0, types_2.combineTypes)(classTypeList.map((classType) => (0, typeUtils_1.convertToInstantiable)((0, typeUtils_1.convertToInstance)(classType)))));
             }
             anyOrUnknown.push(subtype);
             return void 0;
           }
           if (isInstanceCheck) {
-            if ((0, types_1.isNoneInstance)(subtype)) {
+            if ((0, types_2.isNoneInstance)(subtype)) {
               const containsNoneType = classTypeList.some((t) => {
-                if ((0, types_1.isNoneTypeClass)(t)) {
+                if ((0, types_2.isNoneTypeClass)(t)) {
                   return true;
                 }
-                return (0, types_1.isInstantiableClass)(t) && types_1.ClassType.isBuiltIn(t, "NoneType");
+                return (0, types_2.isInstantiableClass)(t) && types_2.ClassType.isBuiltIn(t, "NoneType");
               });
               if (isPositiveTest) {
                 return containsNoneType ? subtype : void 0;
@@ -49860,25 +49862,25 @@ var require_typeGuards = __commonJS({
                 return containsNoneType ? void 0 : subtype;
               }
             }
-            if ((0, types_1.isModule)(subtype) || (0, types_1.isClassInstance)(subtype) && types_1.ClassType.isBuiltIn(subtype, "ModuleType")) {
+            if ((0, types_2.isModule)(subtype) || (0, types_2.isClassInstance)(subtype) && types_2.ClassType.isBuiltIn(subtype, "ModuleType")) {
               if (isPositiveTest) {
                 const filteredTypes = classTypeList.filter((classType) => {
                   const concreteClassType = evaluator.makeTopLevelTypeVarsConcrete(classType);
-                  return (0, types_1.isInstantiableClass)(concreteClassType) && types_1.ClassType.isProtocolClass(concreteClassType);
+                  return (0, types_2.isInstantiableClass)(concreteClassType) && types_2.ClassType.isProtocolClass(concreteClassType);
                 });
                 if (filteredTypes.length > 0) {
-                  return (0, typeUtils_1.convertToInstance)((0, types_1.combineTypes)(filteredTypes));
+                  return (0, typeUtils_1.convertToInstance)((0, types_2.combineTypes)(filteredTypes));
                 }
               }
             }
-            if ((0, types_1.isClassInstance)(subtype) && !isSubtypeTypeObject) {
-              return (0, types_1.combineTypes)(filterClassType(types_1.ClassType.cloneAsInstantiable(subtype), (0, typeUtils_1.convertToInstance)(unexpandedSubtype), (0, typeUtils_1.getTypeCondition)(subtype), negativeFallback));
+            if ((0, types_2.isClassInstance)(subtype) && !isSubtypeTypeObject) {
+              return (0, types_2.combineTypes)(filterClassType(types_2.ClassType.cloneAsInstantiable(subtype), (0, typeUtils_1.convertToInstance)(unexpandedSubtype), (0, typeUtils_1.getTypeCondition)(subtype), negativeFallback));
             }
-            if (((0, types_1.isFunction)(subtype) || (0, types_1.isOverloadedFunction)(subtype)) && isInstanceCheck) {
-              return (0, types_1.combineTypes)(filterFunctionType(subtype, (0, typeUtils_1.convertToInstance)(unexpandedSubtype)));
+            if (((0, types_2.isFunction)(subtype) || (0, types_2.isOverloadedFunction)(subtype)) && isInstanceCheck) {
+              return (0, types_2.combineTypes)(filterFunctionType(subtype, (0, typeUtils_1.convertToInstance)(unexpandedSubtype)));
             }
-            if ((0, types_1.isInstantiableClass)(subtype) || isSubtypeTypeObject) {
-              const includesTypeType = classTypeList.some((classType) => (0, types_1.isInstantiableClass)(classType) && types_1.ClassType.isBuiltIn(classType, "type"));
+            if ((0, types_2.isInstantiableClass)(subtype) || isSubtypeTypeObject) {
+              const includesTypeType = classTypeList.some((classType) => (0, types_2.isInstantiableClass)(classType) && types_2.ClassType.isBuiltIn(classType, "type"));
               if (isPositiveTest) {
                 return includesTypeType ? negativeFallback : void 0;
               } else {
@@ -49886,31 +49888,31 @@ var require_typeGuards = __commonJS({
               }
             }
           } else {
-            if ((0, types_1.isInstantiableClass)(subtype)) {
-              return (0, types_1.combineTypes)(filterClassType(subtype, unexpandedSubtype, (0, typeUtils_1.getTypeCondition)(subtype), negativeFallback));
+            if ((0, types_2.isInstantiableClass)(subtype)) {
+              return (0, types_2.combineTypes)(filterClassType(subtype, unexpandedSubtype, (0, typeUtils_1.getTypeCondition)(subtype), negativeFallback));
             }
             if (isSubtypeTypeObject) {
               const objectType = evaluator.getBuiltInObject(errorNode, "object");
-              if (objectType && (0, types_1.isClassInstance)(objectType)) {
-                return (0, types_1.combineTypes)(filterClassType(types_1.ClassType.cloneAsInstantiable(objectType), (0, typeUtils_1.convertToInstantiable)(unexpandedSubtype), (0, typeUtils_1.getTypeCondition)(subtype), negativeFallback));
+              if (objectType && (0, types_2.isClassInstance)(objectType)) {
+                return (0, types_2.combineTypes)(filterClassType(types_2.ClassType.cloneAsInstantiable(objectType), (0, typeUtils_1.convertToInstantiable)(unexpandedSubtype), (0, typeUtils_1.getTypeCondition)(subtype), negativeFallback));
               }
             }
           }
           return isPositiveTest ? void 0 : negativeFallback;
         }
       );
-      if ((0, types_1.isNever)(filteredType) && anyOrUnknownSubstitutions.length > 0) {
-        return (0, types_1.combineTypes)(anyOrUnknownSubstitutions);
+      if ((0, types_2.isNever)(filteredType) && anyOrUnknownSubstitutions.length > 0) {
+        return (0, types_2.combineTypes)(anyOrUnknownSubstitutions);
       }
-      if ((0, types_1.isNever)(filteredType) && anyOrUnknown.length > 0) {
-        return (0, types_1.combineTypes)(anyOrUnknown);
+      if ((0, types_2.isNever)(filteredType) && anyOrUnknown.length > 0) {
+        return (0, types_2.combineTypes)(anyOrUnknown);
       }
       return filteredType;
     }
     function narrowTypeForTupleLength(evaluator, referenceType, lengthValue, isPositiveTest) {
       return (0, typeUtils_1.mapSubtypes)(referenceType, (subtype) => {
         const concreteSubtype = evaluator.makeTopLevelTypeVarsConcrete(subtype);
-        if (!(0, types_1.isClassInstance)(concreteSubtype) || !(0, typeUtils_1.isTupleClass)(concreteSubtype) || (0, typeUtils_1.isUnboundedTupleClass)(concreteSubtype) || !concreteSubtype.tupleTypeArguments) {
+        if (!(0, types_2.isClassInstance)(concreteSubtype) || !(0, typeUtils_1.isTupleClass)(concreteSubtype) || (0, typeUtils_1.isUnboundedTupleClass)(concreteSubtype) || !concreteSubtype.tupleTypeArguments) {
           return subtype;
         }
         const tupleLengthMatches = concreteSubtype.tupleTypeArguments.length === lengthValue;
@@ -49925,15 +49927,15 @@ var require_typeGuards = __commonJS({
         }
         return narrowTypeForContainerElementType(evaluator, referenceType, evaluator.makeTopLevelTypeVarsConcrete(elementType));
       }
-      if (!(0, types_1.isClassInstance)(containerType) || !types_1.ClassType.isBuiltIn(containerType, "tuple") || !containerType.tupleTypeArguments) {
+      if (!(0, types_2.isClassInstance)(containerType) || !types_2.ClassType.isBuiltIn(containerType, "tuple") || !containerType.tupleTypeArguments) {
         return referenceType;
       }
       const typesToEliminate = [];
       containerType.tupleTypeArguments.forEach((tupleEntry) => {
         if (!tupleEntry.isUnbounded) {
-          if ((0, types_1.isNoneInstance)(tupleEntry.type)) {
+          if ((0, types_2.isNoneInstance)(tupleEntry.type)) {
             typesToEliminate.push(tupleEntry.type);
-          } else if ((0, types_1.isClassInstance)(tupleEntry.type) && (0, typeUtils_1.isLiteralType)(tupleEntry.type)) {
+          } else if ((0, types_2.isClassInstance)(tupleEntry.type) && (0, typeUtils_1.isLiteralType)(tupleEntry.type)) {
             typesToEliminate.push(tupleEntry.type);
           }
         }
@@ -49943,13 +49945,13 @@ var require_typeGuards = __commonJS({
       }
       return (0, typeUtils_1.mapSubtypes)(referenceType, (referenceSubtype) => {
         referenceSubtype = evaluator.makeTopLevelTypeVarsConcrete(referenceSubtype);
-        if ((0, types_1.isClassInstance)(referenceSubtype) && referenceSubtype.literalValue === void 0) {
+        if ((0, types_2.isClassInstance)(referenceSubtype) && referenceSubtype.literalValue === void 0) {
           const allLiteralTypes = enumerateLiteralsForType(evaluator, referenceSubtype);
           if (allLiteralTypes && allLiteralTypes.length > 0) {
-            return (0, types_1.combineTypes)(allLiteralTypes.filter((type) => !typesToEliminate.some((t) => (0, types_1.isTypeSame)(t, type))));
+            return (0, types_2.combineTypes)(allLiteralTypes.filter((type) => !typesToEliminate.some((t) => (0, types_2.isTypeSame)(t, type))));
           }
         }
-        if (typesToEliminate.some((t) => (0, types_1.isTypeSame)(t, referenceSubtype))) {
+        if (typesToEliminate.some((t) => (0, types_2.isTypeSame)(t, referenceSubtype))) {
           return void 0;
         }
         return referenceSubtype;
@@ -49957,7 +49959,7 @@ var require_typeGuards = __commonJS({
     }
     function getElementTypeForContainerNarrowing(containerType) {
       const supportedContainers = ["list", "set", "frozenset", "deque", "tuple", "dict", "defaultdict", "OrderedDict"];
-      if (!(0, types_1.isClassInstance)(containerType) || !types_1.ClassType.isBuiltIn(containerType, supportedContainers)) {
+      if (!(0, types_2.isClassInstance)(containerType) || !types_2.ClassType.isBuiltIn(containerType, supportedContainers)) {
         return void 0;
       }
       if (!containerType.typeArguments || containerType.typeArguments.length < 1) {
@@ -49965,7 +49967,7 @@ var require_typeGuards = __commonJS({
       }
       let elementType = containerType.typeArguments[0];
       if ((0, typeUtils_1.isTupleClass)(containerType) && containerType.tupleTypeArguments) {
-        elementType = (0, types_1.combineTypes)(containerType.tupleTypeArguments.map((t) => t.type));
+        elementType = (0, types_2.combineTypes)(containerType.tupleTypeArguments.map((t) => t.type));
       }
       return elementType;
     }
@@ -49975,11 +49977,11 @@ var require_typeGuards = __commonJS({
       const elementTypeWithoutLiteral = evaluator.stripLiteralValue(elementType);
       const narrowedSupertypes = (0, typeUtils_1.mapSubtypes)(referenceType, (referenceSubtype) => {
         const concreteReferenceType = evaluator.makeTopLevelTypeVarsConcrete(referenceSubtype);
-        if ((0, types_1.isAnyOrUnknown)(concreteReferenceType)) {
+        if ((0, types_2.isAnyOrUnknown)(concreteReferenceType)) {
           canNarrow = false;
           return referenceSubtype;
         }
-        if ((0, types_1.isClassInstance)(concreteReferenceType) && types_1.ClassType.isBuiltIn(concreteReferenceType, "type")) {
+        if ((0, types_2.isClassInstance)(concreteReferenceType) && types_2.ClassType.isBuiltIn(concreteReferenceType, "type")) {
           canNarrow = false;
           return referenceSubtype;
         }
@@ -49988,7 +49990,7 @@ var require_typeGuards = __commonJS({
         }
         if (evaluator.assignType(elementTypeWithoutLiteral, concreteReferenceType)) {
           return (0, typeUtils_1.mapSubtypes)(elementType, (elementSubtype) => {
-            if ((0, types_1.isClassInstance)(elementSubtype) && (0, types_1.isSameWithoutLiteralValue)(referenceSubtype, elementSubtype)) {
+            if ((0, types_2.isClassInstance)(elementSubtype) && (0, types_2.isSameWithoutLiteralValue)(referenceSubtype, elementSubtype)) {
               return elementSubtype;
             }
             return void 0;
@@ -49998,7 +50000,7 @@ var require_typeGuards = __commonJS({
       });
       const narrowedSubtypes = (0, typeUtils_1.mapSubtypes)(elementType, (elementSubtype) => {
         const concreteElementType = evaluator.makeTopLevelTypeVarsConcrete(elementSubtype);
-        if ((0, types_1.isAnyOrUnknown)(concreteElementType)) {
+        if ((0, types_2.isAnyOrUnknown)(concreteElementType)) {
           canNarrow = false;
           return referenceType;
         }
@@ -50007,12 +50009,12 @@ var require_typeGuards = __commonJS({
         }
         return void 0;
       });
-      return canNarrow ? (0, types_1.combineTypes)([narrowedSupertypes, narrowedSubtypes]) : referenceType;
+      return canNarrow ? (0, types_2.combineTypes)([narrowedSupertypes, narrowedSubtypes]) : referenceType;
     }
     exports.narrowTypeForContainerElementType = narrowTypeForContainerElementType;
     function narrowTypeForTypedDictKey(evaluator, referenceType, literalKey, isPositiveTest) {
       const narrowedType = (0, typeUtils_1.mapSubtypes)(referenceType, (subtype) => {
-        if ((0, types_1.isClassInstance)(subtype) && types_1.ClassType.isTypedDictClass(subtype)) {
+        if ((0, types_2.isClassInstance)(subtype) && types_2.ClassType.isTypedDictClass(subtype)) {
           const entries = (0, typedDicts_1.getTypedDictMembersForClass)(
             evaluator,
             subtype,
@@ -50022,7 +50024,7 @@ var require_typeGuards = __commonJS({
           const tdEntry = entries.get(literalKey.literalValue);
           if (isPositiveTest) {
             if (!tdEntry) {
-              return types_1.ClassType.isFinal(subtype) ? void 0 : subtype;
+              return types_2.ClassType.isFinal(subtype) ? void 0 : subtype;
             }
             if (tdEntry.isRequired || tdEntry.isProvided) {
               return subtype;
@@ -50039,7 +50041,7 @@ var require_typeGuards = __commonJS({
               isRequired: false,
               isProvided: true
             });
-            return types_1.ClassType.cloneAsInstance(types_1.ClassType.cloneForNarrowedTypedDictEntries(types_1.ClassType.cloneAsInstantiable(subtype), newNarrowedEntriesMap));
+            return types_2.ClassType.cloneAsInstance(types_2.ClassType.cloneForNarrowedTypedDictEntries(types_2.ClassType.cloneAsInstantiable(subtype), newNarrowedEntriesMap));
           } else {
             return tdEntry !== void 0 && (tdEntry.isRequired || tdEntry.isProvided) ? void 0 : subtype;
           }
@@ -50051,7 +50053,7 @@ var require_typeGuards = __commonJS({
     function narrowTypeForDiscriminatedDictEntryComparison(evaluator, referenceType, indexLiteralType, literalType, isPositiveTest) {
       let canNarrow = true;
       const narrowedType = (0, typeUtils_1.mapSubtypes)(referenceType, (subtype) => {
-        if ((0, types_1.isClassInstance)(subtype) && types_1.ClassType.isTypedDictClass(subtype)) {
+        if ((0, types_2.isClassInstance)(subtype) && types_2.ClassType.isTypedDictClass(subtype)) {
           const symbolMap = (0, typedDicts_1.getTypedDictMembersForClass)(evaluator, subtype);
           const tdEntry = symbolMap.get(indexLiteralType.literalValue);
           if (tdEntry && (0, typeUtils_1.isLiteralTypeOrUnion)(tdEntry.valueType)) {
@@ -50071,7 +50073,7 @@ var require_typeGuards = __commonJS({
       let canNarrow = true;
       const narrowedType = (0, typeUtils_1.mapSubtypes)(referenceType, (subtype) => {
         var _a;
-        if ((0, types_1.isClassInstance)(subtype) && types_1.ClassType.isTupleClass(subtype) && !(0, typeUtils_1.isUnboundedTupleClass)(subtype) && typeof indexLiteralType.literalValue === "number") {
+        if ((0, types_2.isClassInstance)(subtype) && types_2.ClassType.isTupleClass(subtype) && !(0, typeUtils_1.isUnboundedTupleClass)(subtype) && typeof indexLiteralType.literalValue === "number") {
           const indexValue = indexLiteralType.literalValue;
           if (subtype.tupleTypeArguments && indexValue >= 0 && indexValue < subtype.tupleTypeArguments.length) {
             const tupleEntryType = (_a = subtype.tupleTypeArguments[indexValue]) === null || _a === void 0 ? void 0 : _a.type;
@@ -50092,19 +50094,19 @@ var require_typeGuards = __commonJS({
     function narrowTypeForDiscriminatedLiteralFieldComparison(evaluator, referenceType, memberName, literalType, isPositiveTest) {
       const narrowedType = (0, typeUtils_1.mapSubtypes)(referenceType, (subtype) => {
         let memberInfo;
-        if ((0, types_1.isClassInstance)(subtype)) {
+        if ((0, types_2.isClassInstance)(subtype)) {
           memberInfo = (0, typeUtils_1.lookUpObjectMember)(subtype, memberName);
-        } else if ((0, types_1.isInstantiableClass)(subtype)) {
+        } else if ((0, types_2.isInstantiableClass)(subtype)) {
           memberInfo = (0, typeUtils_1.lookUpClassMember)(subtype, memberName);
         }
         if (memberInfo && memberInfo.isTypeDeclared) {
           let memberType = evaluator.getTypeOfMember(memberInfo);
-          if ((0, types_1.isClassInstance)(subtype) && (0, typeUtils_1.isProperty)(memberType)) {
+          if ((0, types_2.isClassInstance)(subtype) && (0, typeUtils_1.isProperty)(memberType)) {
             const getterInfo = (0, typeUtils_1.lookUpObjectMember)(memberType, "fget");
             if (getterInfo && getterInfo.isTypeDeclared) {
               const getterType = evaluator.getTypeOfMember(getterInfo);
-              if ((0, types_1.isFunction)(getterType) && getterType.details.declaredReturnType) {
-                const getterReturnType = types_1.FunctionType.getSpecializedReturnType(getterType);
+              if ((0, types_2.isFunction)(getterType) && getterType.details.declaredReturnType) {
+                const getterReturnType = types_2.FunctionType.getSpecializedReturnType(getterType);
                 if (getterReturnType) {
                   memberType = getterReturnType;
                 }
@@ -50126,9 +50128,9 @@ var require_typeGuards = __commonJS({
     function narrowTypeForDiscriminatedFieldNoneComparison(evaluator, referenceType, memberName, isPositiveTest) {
       return (0, typeUtils_1.mapSubtypes)(referenceType, (subtype) => {
         let memberInfo;
-        if ((0, types_1.isClassInstance)(subtype)) {
+        if ((0, types_2.isClassInstance)(subtype)) {
           memberInfo = (0, typeUtils_1.lookUpObjectMember)(subtype, memberName);
-        } else if ((0, types_1.isInstantiableClass)(subtype)) {
+        } else if ((0, types_2.isInstantiableClass)(subtype)) {
           memberInfo = (0, typeUtils_1.lookUpClassMember)(subtype, memberName);
         }
         if (memberInfo && memberInfo.isTypeDeclared) {
@@ -50140,12 +50142,12 @@ var require_typeGuards = __commonJS({
               if ((0, typeUtils_1.isProperty)(memberSubtype) || (0, typeUtils_1.isMaybeDescriptorInstance)(memberSubtype)) {
                 canNarrow = false;
               }
-              if ((0, types_1.isAnyOrUnknown)(memberSubtype) || (0, types_1.isNoneInstance)(memberSubtype) || (0, types_1.isNever)(memberSubtype)) {
+              if ((0, types_2.isAnyOrUnknown)(memberSubtype) || (0, types_2.isNoneInstance)(memberSubtype) || (0, types_2.isNever)(memberSubtype)) {
                 canNarrow = false;
               }
             });
           } else {
-            canNarrow = (0, types_1.isNoneInstance)(memberType);
+            canNarrow = (0, types_2.isNoneInstance)(memberType);
           }
           if (canNarrow) {
             return void 0;
@@ -50160,26 +50162,26 @@ var require_typeGuards = __commonJS({
         /* conditionFilter */
         void 0,
         (subtype, unexpandedSubtype) => {
-          if ((0, types_1.isClassInstance)(subtype)) {
-            const matches = types_1.ClassType.isDerivedFrom(classType, types_1.ClassType.cloneAsInstantiable(subtype));
+          if ((0, types_2.isClassInstance)(subtype)) {
+            const matches = types_2.ClassType.isDerivedFrom(classType, types_2.ClassType.cloneAsInstantiable(subtype));
             if (isPositiveTest) {
               if (matches) {
-                if (types_1.ClassType.isSameGenericClass(subtype, classType)) {
+                if (types_2.ClassType.isSameGenericClass(subtype, classType)) {
                   return subtype;
                 }
-                return (0, typeUtils_1.addConditionToType)(types_1.ClassType.cloneAsInstance(classType), subtype.condition);
+                return (0, typeUtils_1.addConditionToType)(types_2.ClassType.cloneAsInstance(classType), subtype.condition);
               }
               return void 0;
             } else {
-              if (matches && types_1.ClassType.isFinal(subtype)) {
+              if (matches && types_2.ClassType.isFinal(subtype)) {
                 return void 0;
               }
               return subtype;
             }
-          } else if ((0, types_1.isNoneInstance)(subtype)) {
+          } else if ((0, types_2.isNoneInstance)(subtype)) {
             return isPositiveTest ? void 0 : subtype;
-          } else if ((0, types_1.isAnyOrUnknown)(subtype)) {
-            return isPositiveTest ? types_1.ClassType.cloneAsInstance(classType) : subtype;
+          } else if ((0, types_2.isAnyOrUnknown)(subtype)) {
+            return isPositiveTest ? types_2.ClassType.cloneAsInstance(classType) : subtype;
           }
           return unexpandedSubtype;
         }
@@ -50188,9 +50190,9 @@ var require_typeGuards = __commonJS({
     function narrowTypeForLiteralComparison(evaluator, referenceType, literalType, isPositiveTest, isIsOperator) {
       return (0, typeUtils_1.mapSubtypes)(referenceType, (subtype) => {
         subtype = evaluator.makeTopLevelTypeVarsConcrete(subtype);
-        if ((0, types_1.isClassInstance)(subtype) && types_1.ClassType.isSameGenericClass(literalType, subtype)) {
+        if ((0, types_2.isClassInstance)(subtype) && types_2.ClassType.isSameGenericClass(literalType, subtype)) {
           if (subtype.literalValue !== void 0) {
-            const literalValueMatches = types_1.ClassType.isLiteralValueSame(subtype, literalType);
+            const literalValueMatches = types_2.ClassType.isLiteralValueSame(subtype, literalType);
             if (literalValueMatches && !isPositiveTest || !literalValueMatches && isPositiveTest) {
               return void 0;
             }
@@ -50200,11 +50202,11 @@ var require_typeGuards = __commonJS({
           } else {
             const allLiteralTypes = enumerateLiteralsForType(evaluator, subtype);
             if (allLiteralTypes && allLiteralTypes.length > 0) {
-              return (0, types_1.combineTypes)(allLiteralTypes.filter((type) => !types_1.ClassType.isLiteralValueSame(type, literalType)));
+              return (0, types_2.combineTypes)(allLiteralTypes.filter((type) => !types_2.ClassType.isLiteralValueSame(type, literalType)));
             }
           }
         } else if (isPositiveTest) {
-          if (isIsOperator || (0, types_1.isNoneInstance)(subtype)) {
+          if (isIsOperator || (0, types_2.isNoneInstance)(subtype)) {
             return void 0;
           }
         }
@@ -50212,27 +50214,27 @@ var require_typeGuards = __commonJS({
       });
     }
     function enumerateLiteralsForType(evaluator, type) {
-      if (types_1.ClassType.isBuiltIn(type, "bool")) {
+      if (types_2.ClassType.isBuiltIn(type, "bool")) {
         return [
-          types_1.ClassType.cloneWithLiteral(
+          types_2.ClassType.cloneWithLiteral(
             type,
             /* value */
             true
           ),
-          types_1.ClassType.cloneWithLiteral(
+          types_2.ClassType.cloneWithLiteral(
             type,
             /* value */
             false
           )
         ];
       }
-      if (types_1.ClassType.isEnumClass(type)) {
+      if (types_2.ClassType.isEnumClass(type)) {
         const enumList = [];
         const fields = type.details.fields;
         fields.forEach((symbol) => {
           if (!symbol.isIgnoredForProtocolMatch()) {
             const symbolType = evaluator.getEffectiveTypeOfSymbol(symbol);
-            if ((0, types_1.isClassInstance)(symbolType) && types_1.ClassType.isSameGenericClass(type, symbolType) && symbolType.literalValue !== void 0) {
+            if ((0, types_2.isClassInstance)(symbolType) && types_2.ClassType.isSameGenericClass(type, symbolType) && symbolType.literalValue !== void 0) {
               enumList.push(symbolType);
             }
           }
@@ -50258,7 +50260,7 @@ var require_typeGuards = __commonJS({
               return isPositiveTest ? void 0 : subtype;
             }
             case 7: {
-              if (types_1.TypeBase.isInstantiable(subtype)) {
+              if (types_2.TypeBase.isInstantiable(subtype)) {
                 return isPositiveTest ? subtype : void 0;
               }
               const callMemberType = (0, typeUtils_1.lookUpClassMember)(subtype, "__call__");
@@ -50269,7 +50271,7 @@ var require_typeGuards = __commonJS({
                 if (allowIntersections) {
                   const className = `<callable subtype of ${subtype.details.name}>`;
                   const fileInfo = (0, analyzerNodeInfo_1.getFileInfo)(errorNode);
-                  let newClassType = types_1.ClassType.createInstantiable(
+                  let newClassType = types_2.ClassType.createInstantiable(
                     className,
                     ParseTreeUtils.getClassFullName(errorNode, fileInfo.moduleName, className),
                     fileInfo.moduleName,
@@ -50281,21 +50283,21 @@ var require_typeGuards = __commonJS({
                     subtype.details.effectiveMetaclass,
                     subtype.details.docString
                   );
-                  newClassType.details.baseClasses = [types_1.ClassType.cloneAsInstantiable(subtype)];
+                  newClassType.details.baseClasses = [types_2.ClassType.cloneAsInstantiable(subtype)];
                   (0, typeUtils_1.computeMroLinearization)(newClassType);
                   newClassType = (0, typeUtils_1.addConditionToType)(newClassType, subtype.condition);
-                  const callMethod = types_1.FunctionType.createSynthesizedInstance("__call__");
+                  const callMethod = types_2.FunctionType.createSynthesizedInstance("__call__");
                   const selfParam = {
                     category: 0,
                     name: "self",
-                    type: types_1.ClassType.cloneAsInstance(newClassType),
+                    type: types_2.ClassType.cloneAsInstance(newClassType),
                     hasDeclaredType: true
                   };
-                  types_1.FunctionType.addParameter(callMethod, selfParam);
-                  types_1.FunctionType.addDefaultParameters(callMethod);
-                  callMethod.details.declaredReturnType = types_1.UnknownType.create();
+                  types_2.FunctionType.addParameter(callMethod, selfParam);
+                  types_2.FunctionType.addDefaultParameters(callMethod);
+                  callMethod.details.declaredReturnType = types_2.UnknownType.create();
                   newClassType.details.fields.set("__call__", symbol_1.Symbol.createWithType(4, callMethod));
-                  return types_1.ClassType.cloneAsInstance(newClassType);
+                  return types_2.ClassType.cloneAsInstance(newClassType);
                 }
                 return void 0;
               } else {
@@ -50524,8 +50526,43 @@ var require_patternMatching = __commonJS({
       return (0, types_1.combineTypes)(narrowedTypes);
     }
     function narrowTypeBasedOnMappingPattern(evaluator, type, pattern, isPositiveTest) {
+      type = (0, typeUtils_1.transformPossibleRecursiveTypeAlias)(type);
       if (!isPositiveTest) {
-        return type;
+        if (pattern.entries.length !== 1 || pattern.entries[0].nodeType !== 71) {
+          return type;
+        }
+        const keyPattern = pattern.entries[0].keyPattern;
+        const valuePattern = pattern.entries[0].valuePattern;
+        if (keyPattern.nodeType !== 67 || valuePattern.nodeType !== 66 || !valuePattern.orPatterns.every(
+          (orPattern) => orPattern.nodeType === 67
+          /* PatternLiteral */
+        )) {
+          return type;
+        }
+        const keyType = evaluator.getTypeOfExpression(keyPattern.expression).type;
+        if (!(0, types_1.isClassInstance)(keyType) || !types_1.ClassType.isBuiltIn(keyType, "str") || keyType.literalValue === void 0) {
+          return type;
+        }
+        const keyValue = keyType.literalValue;
+        const valueTypes = valuePattern.orPatterns.map((orPattern) => evaluator.getTypeOfExpression(orPattern.expression).type);
+        return (0, typeUtils_1.mapSubtypes)(type, (subtype) => {
+          if ((0, types_1.isClassInstance)(subtype) && types_1.ClassType.isTypedDictClass(subtype)) {
+            const typedDictMembers = (0, typedDicts_1.getTypedDictMembersForClass)(
+              evaluator,
+              subtype,
+              /* allowNarrowed */
+              true
+            );
+            const member = typedDictMembers.get(keyValue);
+            if (member && (member.isRequired || member.isProvided) && (0, types_1.isClassInstance)(member.valueType)) {
+              const memberValueType = member.valueType;
+              if (valueTypes.some((valueType) => (0, types_1.isClassInstance)(valueType) && types_1.ClassType.isSameGenericClass(valueType, memberValueType) && valueType.literalValue === memberValueType.literalValue)) {
+                return void 0;
+              }
+            }
+          }
+          return subtype;
+        });
       }
       let mappingInfo = getMappingPatternInfo(evaluator, type);
       mappingInfo = mappingInfo.filter((mappingSubtypeInfo) => {
@@ -50840,7 +50877,7 @@ var require_patternMatching = __commonJS({
                 if (allEnumTypes) {
                   return (0, types_1.combineTypes)(allEnumTypes.filter((enumType) => !types_1.ClassType.isLiteralValueSame(valueSubtypeExpanded, enumType)));
                 }
-              } else if ((0, types_1.isClassInstance)(subjectSubtypeExpanded) && (0, types_1.isClassInstance)(valueSubtypeExpanded) && types_1.ClassType.isLiteralValueSame(valueSubtypeExpanded, subjectSubtypeExpanded)) {
+              } else if ((0, types_1.isClassInstance)(subjectSubtypeExpanded) && (0, types_1.isClassInstance)(valueSubtypeExpanded) && (0, typeUtils_1.isLiteralType)(subjectSubtypeExpanded) && types_1.ClassType.isLiteralValueSame(valueSubtypeExpanded, subjectSubtypeExpanded)) {
                 return void 0;
               }
               return subjectSubtypeExpanded;
@@ -51323,8 +51360,8 @@ var require_regions = __commonJS({
       return comments;
     }
     exports.getRegionComments = getRegionComments;
-    var StartRegionRegx = /^\s*region\b/;
-    var EndRegionRegex = /^\s*endregion\b/;
+    var StartRegionRegEx = /^\s*region\b/;
+    var EndRegionRegEx = /^\s*endregion\b/;
     function getRegionCommentType(comment, parseResults) {
       const hashOffset = comment.start - 1;
       const hashPosition = (0, positionUtils_1.convertOffsetToPosition)(hashOffset, parseResults.tokenizerOutput.lines);
@@ -51335,8 +51372,8 @@ var require_regions = __commonJS({
           return void 0;
         }
       }
-      const startRegionMatch = StartRegionRegx.exec(comment.value);
-      const endRegionMatch = EndRegionRegex.exec(comment.value);
+      const startRegionMatch = StartRegionRegEx.exec(comment.value);
+      const endRegionMatch = EndRegionRegEx.exec(comment.value);
       if (startRegionMatch) {
         return 0;
       } else if (endRegionMatch) {
@@ -52808,6 +52845,7 @@ var require_constructorTransform = __commonJS({
     var diagnosticRules_1 = require_diagnosticRules();
     var localize_1 = require_localize();
     var analyzerNodeInfo_1 = require_analyzerNodeInfo();
+    var parameterUtils_1 = require_parameterUtils();
     var symbol_1 = require_symbol();
     var types_1 = require_types();
     var typeUtils_1 = require_typeUtils();
@@ -52854,7 +52892,7 @@ var require_constructorTransform = __commonJS({
         return result;
       }
       const paramMap = /* @__PURE__ */ new Map();
-      const paramListDetails = (0, typeUtils_1.getParameterListDetails)(origFunctionType);
+      const paramListDetails = (0, parameterUtils_1.getParameterListDetails)(origFunctionType);
       let argumentErrors = false;
       let reportedPositionalError = false;
       const typeVarContext = new typeVarContext_1.TypeVarContext((0, typeUtils_1.getTypeVarScopeId)(origFunctionType));
@@ -52865,7 +52903,7 @@ var require_constructorTransform = __commonJS({
           return;
         }
         if (!arg.name) {
-          if (argIndex >= paramListDetails.params.length || paramListDetails.params[argIndex].source === typeUtils_1.ParameterSource.KeywordOnly) {
+          if (argIndex >= paramListDetails.params.length || paramListDetails.params[argIndex].source === parameterUtils_1.ParameterSource.KeywordOnly) {
             if (paramListDetails.argsIndex !== void 0) {
               const paramType = types_1.FunctionType.getEffectiveParameterType(origFunctionType, paramListDetails.params[paramListDetails.argsIndex].index);
               const diag = new diagnostic_1.DiagnosticAddendum();
@@ -52917,7 +52955,7 @@ var require_constructorTransform = __commonJS({
         } else {
           const matchingParam = paramListDetails.params.find((paramInfo) => {
             var _a2;
-            return paramInfo.param.name === ((_a2 = arg.name) === null || _a2 === void 0 ? void 0 : _a2.value) && paramInfo.source !== typeUtils_1.ParameterSource.PositionOnly;
+            return paramInfo.param.name === ((_a2 = arg.name) === null || _a2 === void 0 ? void 0 : _a2.value) && paramInfo.source !== parameterUtils_1.ParameterSource.PositionOnly;
           });
           if (!matchingParam) {
             if (paramListDetails.kwargsIndex === void 0) {
@@ -54419,7 +54457,7 @@ var require_properties = __commonJS({
       });
       const propertyObject = types_1.ClassType.cloneAsInstance(propertyClass);
       propertyClass.isAsymmetricDescriptor = false;
-      updateGetSetDelMethodForClonedProperty(propertyObject, evaluator);
+      updateGetSetDelMethodForClonedProperty(evaluator, propertyObject);
       const fgetSymbol = symbol_1.Symbol.createWithType(4, types_1.FunctionType.cloneWithNewFlags(
         fget,
         fget.details.flags | 4
@@ -54429,7 +54467,7 @@ var require_properties = __commonJS({
       if (types_1.FunctionType.isClassMethod(fget)) {
         propertyClass.details.flags |= 4194304;
       }
-      addGetMethodToPropertySymbolTable(propertyObject, fget);
+      addGetMethodToPropertySymbolTable(evaluator, propertyObject, fget);
       addDecoratorMethodsToPropertySymbolTable(propertyObject);
       return propertyObject;
     }
@@ -54479,14 +54517,14 @@ var require_properties = __commonJS({
           fields.set(name, symbol);
         }
       });
-      updateGetSetDelMethodForClonedProperty(propertyObject, evaluator);
+      updateGetSetDelMethodForClonedProperty(evaluator, propertyObject);
       const fsetSymbol = symbol_1.Symbol.createWithType(4, types_1.FunctionType.cloneWithNewFlags(
         fset,
         fset.details.flags | 4
         /* StaticMethod */
       ));
       fields.set("fset", fsetSymbol);
-      addSetMethodToPropertySymbolTable(propertyObject, fset, evaluator);
+      addSetMethodToPropertySymbolTable(evaluator, propertyObject, fset);
       addDecoratorMethodsToPropertySymbolTable(propertyObject);
       return propertyObject;
     }
@@ -54510,19 +54548,19 @@ var require_properties = __commonJS({
           fields.set(name, symbol);
         }
       });
-      updateGetSetDelMethodForClonedProperty(propertyObject, evaluator);
+      updateGetSetDelMethodForClonedProperty(evaluator, propertyObject);
       const fdelSymbol = symbol_1.Symbol.createWithType(4, types_1.FunctionType.cloneWithNewFlags(
         fdel,
         fdel.details.flags | 4
         /* StaticMethod */
       ));
       fields.set("fdel", fdelSymbol);
-      addDelMethodToPropertySymbolTable(propertyObject, fdel, evaluator);
+      addDelMethodToPropertySymbolTable(evaluator, propertyObject, fdel);
       addDecoratorMethodsToPropertySymbolTable(propertyObject);
       return propertyObject;
     }
     exports.clonePropertyWithDeleter = clonePropertyWithDeleter;
-    function addGetMethodToPropertySymbolTable(propertyObject, fget) {
+    function addGetMethodToPropertySymbolTable(evaluator, propertyObject, fget) {
       const fields = propertyObject.details.fields;
       const getFunction1 = types_1.FunctionType.createSynthesizedInstance(
         "__get__",
@@ -54585,7 +54623,7 @@ var require_properties = __commonJS({
       const getSymbol = symbol_1.Symbol.createWithType(4, getFunctionOverload);
       fields.set("__get__", getSymbol);
     }
-    function addSetMethodToPropertySymbolTable(propertyObject, fset, evaluator) {
+    function addSetMethodToPropertySymbolTable(evaluator, propertyObject, fset) {
       const fields = propertyObject.details.fields;
       const setFunction = types_1.FunctionType.createSynthesizedInstance("__set__");
       types_1.FunctionType.addParameter(setFunction, {
@@ -54619,7 +54657,7 @@ var require_properties = __commonJS({
       const setSymbol = symbol_1.Symbol.createWithType(4, setFunction);
       fields.set("__set__", setSymbol);
     }
-    function addDelMethodToPropertySymbolTable(propertyObject, fdel, evaluator) {
+    function addDelMethodToPropertySymbolTable(evaluator, propertyObject, fdel) {
       const fields = propertyObject.details.fields;
       const delFunction = types_1.FunctionType.createSynthesizedInstance("__delete__");
       types_1.FunctionType.addParameter(delFunction, {
@@ -54643,22 +54681,22 @@ var require_properties = __commonJS({
       const delSymbol = symbol_1.Symbol.createWithType(4, delFunction);
       fields.set("__delete__", delSymbol);
     }
-    function updateGetSetDelMethodForClonedProperty(propertyObject, evaluator) {
+    function updateGetSetDelMethodForClonedProperty(evaluator, propertyObject) {
       const fields = propertyObject.details.fields;
       const fgetSymbol = fields.get("fget");
       const fgetType = fgetSymbol === null || fgetSymbol === void 0 ? void 0 : fgetSymbol.getSynthesizedType();
       if (fgetType && (0, types_1.isFunction)(fgetType)) {
-        addGetMethodToPropertySymbolTable(propertyObject, fgetType);
+        addGetMethodToPropertySymbolTable(evaluator, propertyObject, fgetType);
       }
       const fsetSymbol = fields.get("fset");
       const fsetType = fsetSymbol === null || fsetSymbol === void 0 ? void 0 : fsetSymbol.getSynthesizedType();
       if (fsetType && (0, types_1.isFunction)(fsetType)) {
-        addSetMethodToPropertySymbolTable(propertyObject, fsetType, evaluator);
+        addSetMethodToPropertySymbolTable(evaluator, propertyObject, fsetType);
       }
       const fdelSymbol = fields.get("fdel");
       const fdelType = fdelSymbol === null || fdelSymbol === void 0 ? void 0 : fdelSymbol.getSynthesizedType();
       if (fdelType && (0, types_1.isFunction)(fdelType)) {
-        addDelMethodToPropertySymbolTable(propertyObject, fdelType, evaluator);
+        addDelMethodToPropertySymbolTable(evaluator, propertyObject, fdelType);
       }
     }
     function addDecoratorMethodsToPropertySymbolTable(propertyObject) {
@@ -54827,7 +54865,8 @@ var require_protocols = __commonJS({
       );
       const genericDestTypeVarContext = new typeVarContext_1.TypeVarContext((0, typeUtils_1.getTypeVarScopeId)(destType));
       const selfTypeVarContext = new typeVarContext_1.TypeVarContext((0, typeUtils_1.getTypeVarScopeId)(destType));
-      (0, typeUtils_1.populateTypeVarContextForSelfType)(selfTypeVarContext, destType, srcType);
+      const noLiteralSrcType = evaluator.stripLiteralValue(srcType);
+      (0, typeUtils_1.populateTypeVarContextForSelfType)(selfTypeVarContext, destType, noLiteralSrcType);
       if (types_1.ClassType.isTypedDictClass(srcType)) {
         const typedDictClassType = evaluator.getTypedDictClassType();
         if (typedDictClassType && (0, types_1.isInstantiableClass)(typedDictClassType)) {
@@ -54890,7 +54929,7 @@ var require_protocols = __commonJS({
                   if ((0, types_1.isFunction)(symbolType)) {
                     evaluator.inferReturnTypeIfNecessary(symbolType);
                   }
-                  srcMemberType = (0, typeUtils_1.partiallySpecializeType)(symbolType, srcMemberInfo.classType, srcType);
+                  srcMemberType = (0, typeUtils_1.partiallySpecializeType)(symbolType, srcMemberInfo.classType, noLiteralSrcType);
                 } else {
                   srcMemberType = types_1.UnknownType.create();
                 }
@@ -55241,12 +55280,29 @@ var require_typeCacheUtils = __commonJS({
         if (this._speculativeContextStack.some((context) => !context.allowCacheRetention)) {
           return;
         }
+        const maxCacheEntriesPerNode = 8;
         let cacheEntries = this._speculativeTypeCache.get(node.id);
         if (!cacheEntries) {
           cacheEntries = [];
-          this._speculativeTypeCache.set(node.id, cacheEntries);
+        } else {
+          cacheEntries = cacheEntries.filter((entry) => {
+            if (entry.typeResult.isIncomplete && entry.incompleteGenerationCount !== incompleteGenerationCount) {
+              return false;
+            }
+            if (expectedType) {
+              if (!entry.expectedType) {
+                return true;
+              }
+              return !(0, types_1.isTypeSame)(entry.expectedType, expectedType);
+            }
+            return !!entry.expectedType;
+          });
+          if (cacheEntries.length >= maxCacheEntriesPerNode) {
+            cacheEntries.slice(1);
+          }
         }
         cacheEntries.push({ typeResult, expectedType, incompleteGenerationCount });
+        this._speculativeTypeCache.set(node.id, cacheEntries);
       }
       getSpeculativeType(node, expectedType) {
         if (this._speculativeContextStack.some((context) => ParseTreeUtils.isNodeContainedWithin(node, context.speculativeRootNode))) {
@@ -55315,7 +55371,6 @@ var require_typeEvaluator = __commonJS({
     var localize_1 = require_localize();
     var parseNodes_1 = require_parseNodes();
     var parser_1 = require_parser();
-    var DeclarationUtils = __importStar(require_aliasDeclarationUtils());
     var analyzerFileInfo_1 = require_analyzerFileInfo();
     var AnalyzerNodeInfo = __importStar(require_analyzerNodeInfo());
     var codeFlowEngine_1 = require_codeFlowEngine();
@@ -55327,6 +55382,7 @@ var require_typeEvaluator = __commonJS({
     var enums_1 = require_enums();
     var functionTransform_1 = require_functionTransform();
     var namedTuples_1 = require_namedTuples();
+    var parameterUtils_1 = require_parameterUtils();
     var ParseTreeUtils = __importStar(require_parseTreeUtils());
     var patternMatching_1 = require_patternMatching();
     var properties_1 = require_properties();
@@ -55523,6 +55579,7 @@ var require_typeEvaluator = __commonJS({
       let dictClassType;
       let typedDictClassType;
       let typedDictPrivateClassType;
+      let mappingType;
       let printExpressionSpaceCount = 0;
       let incompleteGenerationCount = 0;
       const returnTypeInferenceContextStack = [];
@@ -55736,6 +55793,10 @@ var require_typeEvaluator = __commonJS({
           dictClassType = getBuiltInType(node, "dict");
           typedDictClassType = getTypingType(node, "TypedDict");
           typedDictPrivateClassType = getTypingType(node, "_TypedDict");
+          mappingType = getTypeshedType(node, "SupportsKeysAndGetItem");
+          if (!mappingType) {
+            mappingType = getTypingType(node, "Mapping");
+          }
         }
       }
       function getTypeOfExpression(node, flags = 0, inferenceContext) {
@@ -56153,7 +56214,11 @@ var require_typeEvaluator = __commonJS({
             }
             if (types_1.ClassType.isBuiltIn(subtype, "LiteralString")) {
               if (strClassType && (0, types_1.isInstantiableClass)(strClassType)) {
-                return types_1.ClassType.cloneAsInstance(strClassType);
+                let strInstance = types_1.ClassType.cloneAsInstance(strClassType);
+                if (subtype.condition) {
+                  strInstance = types_1.TypeBase.cloneForCondition(strInstance, (0, typeUtils_1.getTypeCondition)(subtype));
+                }
+                return strInstance;
               }
             }
           }
@@ -57360,7 +57425,12 @@ var require_typeEvaluator = __commonJS({
         const setTypeResult = getTypeOfMemberAccessWithBaseType(
           target,
           baseTypeResult,
-          { method: "set", setType: type, setErrorNode: srcExpr, setExpectedTypeDiag: expectedTypeDiagAddendum },
+          {
+            method: "set",
+            setType: { type, isIncomplete: isTypeIncomplete },
+            setErrorNode: srcExpr,
+            setExpectedTypeDiag: expectedTypeDiagAddendum
+          },
           0
           /* None */
         );
@@ -57484,9 +57554,7 @@ var require_typeEvaluator = __commonJS({
             const sourceEntryTypes = tupleType.tupleTypeArguments.map((t) => (0, typeUtils_1.addConditionToType)(t.type, (0, typeUtils_1.getTypeCondition)(subtype)));
             const unboundedIndex = tupleType.tupleTypeArguments.findIndex((t) => t.isUnbounded);
             if (unboundedIndex >= 0) {
-              if (sourceEntryTypes.length > targetTypes.length) {
-                sourceEntryTypes.splice(unboundedIndex, 1);
-              } else if (sourceEntryTypes.length < targetTypes.length) {
+              if (sourceEntryTypes.length < targetTypes.length) {
                 const typeToReplicate = sourceEntryTypes.length > 0 ? sourceEntryTypes[unboundedIndex] : types_1.AnyType.create();
                 while (sourceEntryTypes.length < targetTypes.length) {
                   sourceEntryTypes.splice(unboundedIndex, 0, typeToReplicate);
@@ -57558,7 +57626,7 @@ var require_typeEvaluator = __commonJS({
           /* None */
         );
       }
-      function makeTopLevelTypeVarsConcrete(type, conditionFilter) {
+      function makeTopLevelTypeVarsConcrete(type, makeParamSpecsConcrete = false, conditionFilter) {
         return (0, typeUtils_1.mapSubtypes)(type, (subtype) => {
           if ((0, types_1.isParamSpec)(subtype)) {
             if (subtype.paramSpecAccess === "args") {
@@ -57578,6 +57646,17 @@ var require_typeEvaluator = __commonJS({
               return types_1.UnknownType.create();
             }
           }
+          if (makeParamSpecsConcrete && (0, types_1.isFunction)(subtype) && subtype.details.parameters.length === 0 && subtype.details.paramSpec) {
+            const concreteFunction = types_1.FunctionType.createInstance(
+              "",
+              "",
+              "",
+              64 | 32768
+              /* SkipArgsKwargsCompatibilityCheck */
+            );
+            types_1.FunctionType.addDefaultParameters(concreteFunction);
+            return types_1.FunctionType.cloneForParamSpec(subtype, concreteFunction);
+          }
           if ((0, types_1.isVariadicTypeVar)(subtype)) {
             if (tupleClassType && (0, types_1.isInstantiableClass)(tupleClassType)) {
               return (0, typeUtils_1.convertToInstance)((0, typeUtils_1.specializeTupleClass)(
@@ -57749,7 +57828,7 @@ var require_typeEvaluator = __commonJS({
               baseTypeResult,
               {
                 method: "set",
-                setType: type,
+                setType: { type, isIncomplete: isTypeIncomplete },
                 setErrorNode: srcExpr,
                 setExpectedTypeDiag: expectedTypeDiagAddendum
               },
@@ -58938,12 +59017,14 @@ var require_typeEvaluator = __commonJS({
           }
           type = descriptorResult.type;
           if (usage.method === "set" && usage.setType) {
-            if (!assignType(type, usage.setType, diag === null || diag === void 0 ? void 0 : diag.createAddendum())) {
-              diag === null || diag === void 0 ? void 0 : diag.addMessage(localize_1.Localizer.DiagnosticAddendum.memberAssignment().format({
-                type: printType(usage.setType),
-                name: memberName,
-                classType: printObjectTypeForClass(classType)
-              }));
+            if (!assignType(type, usage.setType.type, diag === null || diag === void 0 ? void 0 : diag.createAddendum())) {
+              if (!usage.setType.isIncomplete) {
+                diag === null || diag === void 0 ? void 0 : diag.addMessage(localize_1.Localizer.DiagnosticAddendum.memberAssignment().format({
+                  type: printType(usage.setType.type),
+                  name: memberName,
+                  classType: printObjectTypeForClass(classType)
+                }));
+              }
               return void 0;
             }
             if ((0, types_1.isInstantiableClass)(memberInfo.classType) && types_1.ClassType.isFrozenDataClass(memberInfo.classType) && isAccessedThroughObject) {
@@ -58984,7 +59065,7 @@ var require_typeEvaluator = __commonJS({
         let isTypeValid = true;
         let isAsymmetricDescriptor = false;
         type = (0, typeUtils_1.mapSubtypes)(type, (subtype) => {
-          var _a;
+          var _a, _b, _c;
           const concreteSubtype = makeTopLevelTypeVarsConcrete(subtype);
           const isClassMember = !memberInfo || memberInfo.isClassMember;
           if ((0, types_1.isClass)(concreteSubtype) && isClassMember) {
@@ -59055,7 +59136,10 @@ var require_typeEvaluator = __commonJS({
                 } else if (usage.method === "set") {
                   argList.push({
                     argumentCategory: 0,
-                    typeResult: { type: (_a = usage.setType) !== null && _a !== void 0 ? _a : types_1.UnknownType.create() }
+                    typeResult: {
+                      type: (_b = (_a = usage.setType) === null || _a === void 0 ? void 0 : _a.type) !== null && _b !== void 0 ? _b : types_1.UnknownType.create(),
+                      isIncomplete: !!((_c = usage.setType) === null || _c === void 0 ? void 0 : _c.isIncomplete)
+                    }
                   });
                 }
                 if (types_1.ClassType.isPropertyClass(lookupClass) && memberInfo && (0, types_1.isInstantiableClass)(memberInfo.classType)) {
@@ -59111,11 +59195,11 @@ var require_typeEvaluator = __commonJS({
                       );
                       if (callResult.argumentErrors) {
                         if (usage.method === "set") {
-                          if (usage.setType && (0, types_1.isFunction)(boundMethodType) && boundMethodType.details.parameters.length >= 2) {
+                          if (usage.setType && (0, types_1.isFunction)(boundMethodType) && boundMethodType.details.parameters.length >= 2 && !usage.setType.isIncomplete) {
                             const setterType = types_1.FunctionType.getEffectiveParameterType(boundMethodType, 1);
                             diag === null || diag === void 0 ? void 0 : diag.addMessage(localize_1.Localizer.DiagnosticAddendum.typeIncompatible().format({
                               destType: printType(setterType),
-                              sourceType: printType(usage.setType)
+                              sourceType: printType(usage.setType.type)
                             }));
                           } else if ((0, types_1.isOverloadedFunction)(boundMethodType)) {
                             diag === null || diag === void 0 ? void 0 : diag.addMessage(localize_1.Localizer.Diagnostic.noOverload().format({ name: accessMethodName }));
@@ -59266,7 +59350,7 @@ var require_typeEvaluator = __commonJS({
         return isAsymmetric;
       }
       function applyAttributeAccessOverride(classType, errorNode, usage, memberName) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e;
         const getAttributeAccessMember = (name) => {
           var _a2;
           return (_a2 = getTypeOfClassMember(
@@ -59310,7 +59394,10 @@ var require_typeEvaluator = __commonJS({
             argList.push({
               // Provide "value" argument.
               argumentCategory: 0,
-              typeResult: { type: (_b = usage.setType) !== null && _b !== void 0 ? _b : types_1.UnknownType.create() }
+              typeResult: {
+                type: (_c = (_b = usage.setType) === null || _b === void 0 ? void 0 : _b.type) !== null && _c !== void 0 ? _c : types_1.UnknownType.create(),
+                isIncomplete: !!((_d = usage.setType) === null || _d === void 0 ? void 0 : _d.isIncomplete)
+              }
             });
           }
           if ((0, types_1.isFunction)(accessMemberType) || (0, types_1.isOverloadedFunction)(accessMemberType)) {
@@ -59325,7 +59412,7 @@ var require_typeEvaluator = __commonJS({
                 /* skipUnknownArgCheck */
                 true
               );
-              return (_c = callResult.returnType) !== null && _c !== void 0 ? _c : types_1.UnknownType.create();
+              return (_e = callResult.returnType) !== null && _e !== void 0 ? _e : types_1.UnknownType.create();
             }
           }
         }
@@ -59909,7 +59996,7 @@ var require_typeEvaluator = __commonJS({
         }
       }
       function getTypeOfIndexedObjectOrClass(node, baseType, usage) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e, _f;
         if ((0, types_1.isClassInstance)(baseType) && types_1.ClassType.isTypedDictClass(baseType)) {
           const typeFromTypedDict = (0, typedDicts_1.getTypeOfIndexedTypedDict)(evaluatorInterface, node, baseType, usage);
           if (typeFromTypedDict) {
@@ -60043,14 +60130,22 @@ var require_typeEvaluator = __commonJS({
           }
         ];
         if (usage.method === "set") {
-          let setType = usage.setType || types_1.AnyType.create();
+          let setType = (_d = (_c = usage.setType) === null || _c === void 0 ? void 0 : _c.type) !== null && _d !== void 0 ? _d : types_1.AnyType.create();
           if ((0, types_1.isTypeVar)(setType) && setType.details.constraints.length > 0) {
             const conditionFilter = (0, types_1.isClassInstance)(baseType) ? baseType.condition : void 0;
-            setType = makeTopLevelTypeVarsConcrete(setType, conditionFilter);
+            setType = makeTopLevelTypeVarsConcrete(
+              setType,
+              /* makeParamSpecsConcrete */
+              void 0,
+              conditionFilter
+            );
           }
           argList.push({
             argumentCategory: 0,
-            typeResult: { type: setType, isIncomplete: isPositionalIndexTypeIncomplete }
+            typeResult: {
+              type: setType,
+              isIncomplete: !!((_e = usage.setType) === null || _e === void 0 ? void 0 : _e.isIncomplete)
+            }
           });
         }
         keywordArgs.forEach((arg) => {
@@ -60093,7 +60188,7 @@ var require_typeEvaluator = __commonJS({
         }
         callResult = validateCallArguments(node, argList, { type: itemMethodType });
         return {
-          type: (_c = callResult.returnType) !== null && _c !== void 0 ? _c : types_1.UnknownType.create(),
+          type: (_f = callResult.returnType) !== null && _f !== void 0 ? _f : types_1.UnknownType.create(),
           isIncomplete: !!callResult.isTypeIncomplete
         };
       }
@@ -60965,7 +61060,7 @@ var require_typeEvaluator = __commonJS({
         if (initMethodType && !skipConstructorCheck(initMethodType)) {
           if (inferenceContext) {
             const expectedCallResult = validateConstructorMethodWithExpectedType(errorNode, argList, type, skipUnknownArgCheck, inferenceContext, initMethodType);
-            if (expectedCallResult) {
+            if (expectedCallResult && !expectedCallResult.argumentErrors) {
               returnType = expectedCallResult.returnType;
               if (expectedCallResult.isTypeIncomplete) {
                 isTypeIncomplete = true;
@@ -61039,10 +61134,12 @@ var require_typeEvaluator = __commonJS({
           }
           if (constructorMethodInfo && !skipConstructorCheck(constructorMethodInfo.type)) {
             const constructorMethodType = constructorMethodInfo.type;
+            let newReturnType;
             if (inferenceContext && !returnType) {
               const expectedCallResult = validateConstructorMethodWithExpectedType(errorNode, argList, type, skipUnknownArgCheck, inferenceContext, constructorMethodType);
-              if (expectedCallResult) {
-                returnType = expectedCallResult.returnType;
+              if (expectedCallResult && !expectedCallResult.argumentErrors) {
+                newReturnType = expectedCallResult.returnType;
+                returnType = newReturnType;
                 if (expectedCallResult.isTypeIncomplete) {
                   isTypeIncomplete = true;
                 }
@@ -61066,8 +61163,8 @@ var require_typeEvaluator = __commonJS({
             }
             if (callResult.argumentErrors) {
               reportedErrors = true;
-            } else {
-              let newReturnType = callResult.returnType;
+            } else if (!newReturnType) {
+              newReturnType = callResult.returnType;
               if (newReturnType) {
                 if ((0, types_1.isClassInstance)(newReturnType) && types_1.ClassType.isSameGenericClass(newReturnType, type)) {
                   if (!(0, typeUtils_1.isPartlyUnknown)(newReturnType) && !(0, typeUtils_1.requiresSpecialization)(newReturnType) || returnType === void 0) {
@@ -61571,7 +61668,7 @@ var require_typeEvaluator = __commonJS({
       }
       function matchFunctionArgumentsToParameters(errorNode, argList, typeResult, overloadIndex) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j;
-        const paramDetails = (0, typeUtils_1.getParameterListDetails)(typeResult.type);
+        const paramDetails = (0, parameterUtils_1.getParameterListDetails)(typeResult.type);
         let argIndex = 0;
         let matchedUnpackedListOfUnknownLength = false;
         let reportedArgError = false;
@@ -61585,7 +61682,7 @@ var require_typeEvaluator = __commonJS({
             paramMap.set(param.name, {
               argsNeeded: param.category === 0 && !param.hasDefault ? 1 : 0,
               argsReceived: 0,
-              isPositionalOnly: paramInfo.source === typeUtils_1.ParameterSource.PositionOnly
+              isPositionalOnly: paramInfo.source === parameterUtils_1.ParameterSource.PositionOnly
             });
           }
         });
@@ -61927,10 +62024,6 @@ var require_typeEvaluator = __commonJS({
                   });
                 }
               } else {
-                let mappingType = getTypeshedType(errorNode, "SupportsKeysAndGetItem");
-                if (!mappingType) {
-                  mappingType = getTypingType(errorNode, "Mapping");
-                }
                 const strObjType = getBuiltInObject(errorNode, "str");
                 if (mappingType && (0, types_1.isInstantiableClass)(mappingType) && strObjType && (0, types_1.isClassInstance)(strObjType)) {
                   const mappingTypeVarContext = new typeVarContext_1.TypeVarContext((0, typeUtils_1.getTypeVarScopeId)(mappingType));
@@ -62279,26 +62372,29 @@ var require_typeEvaluator = __commonJS({
         if (typeVarMatchingCount > 0) {
           let passCount = Math.min(typeVarMatchingCount, 2);
           for (let i = 0; i < passCount; i++) {
+            const signatureTracker2 = new typeUtils_1.UniqueSignatureTracker();
             useSpeculativeMode(errorNode, () => {
               matchResults.argParams.forEach((argParam) => {
-                if (argParam.requiresTypeVarMatching) {
-                  const argResult = validateArgType(
-                    argParam,
-                    typeVarContext,
-                    { type, isIncomplete: matchResults.isTypeIncomplete },
-                    skipUnknownArgCheck,
-                    /* skipOverloadArg */
-                    i === 0,
-                    /* useNarrowBoundOnly */
-                    passCount > 1 && i === 0,
-                    typeCondition
-                  );
-                  if (argResult.isTypeIncomplete) {
-                    isTypeIncomplete = true;
-                  }
-                  if (i === 0 && argResult.skippedOverloadArg) {
-                    passCount++;
-                  }
+                if (!argParam.requiresTypeVarMatching) {
+                  return;
+                }
+                const argResult = validateArgType(
+                  argParam,
+                  typeVarContext,
+                  signatureTracker2,
+                  { type, isIncomplete: matchResults.isTypeIncomplete },
+                  skipUnknownArgCheck,
+                  /* skipOverloadArg */
+                  i === 0,
+                  /* useNarrowBoundOnly */
+                  passCount > 1 && i === 0,
+                  typeCondition
+                );
+                if (argResult.isTypeIncomplete) {
+                  isTypeIncomplete = true;
+                }
+                if (i === 0 && argResult.skippedOverloadArg) {
+                  passCount++;
                 }
               });
             });
@@ -62309,11 +62405,13 @@ var require_typeEvaluator = __commonJS({
         let sawParamSpecKwargs = false;
         let condition = [];
         const argResults = [];
+        const signatureTracker = new typeUtils_1.UniqueSignatureTracker();
         matchResults.argParams.forEach((argParam) => {
           var _a;
           const argResult = validateArgType(
             argParam,
             typeVarContext,
+            signatureTracker,
             { type, isIncomplete: matchResults.isTypeIncomplete },
             skipUnknownArgCheck,
             /* skipOverloadArg */
@@ -62505,6 +62603,7 @@ var require_typeEvaluator = __commonJS({
           (paramInfo) => paramInfo.category === 2
           /* VarArgDictionary */
         );
+        const signatureTracker = new typeUtils_1.UniqueSignatureTracker();
         argList.forEach((arg) => {
           var _a2;
           if (arg.argumentCategory === 0) {
@@ -62547,6 +62646,7 @@ var require_typeEvaluator = __commonJS({
                   errorNode: arg.valueExpression || errorNode
                 },
                 srcTypeVarContext,
+                signatureTracker,
                 /* functionType */
                 void 0,
                 /* skipUnknownArgCheck */
@@ -62582,7 +62682,7 @@ var require_typeEvaluator = __commonJS({
         }
         return !reportedArgError;
       }
-      function validateArgType(argParam, typeVarContext, typeResult, skipUnknownCheck, skipOverloadArg, useNarrowBoundOnly, conditionFilter) {
+      function validateArgType(argParam, typeVarContext, signatureTracker, typeResult, skipUnknownCheck, skipOverloadArg, useNarrowBoundOnly, conditionFilter) {
         var _a;
         let argType;
         let expectedTypeDiag;
@@ -62640,6 +62740,7 @@ var require_typeEvaluator = __commonJS({
             }
           }
         }
+        argType = (0, typeUtils_1.ensureFunctionSignaturesAreUnique)(argType, signatureTracker);
         if (argParam.paramCategory === 2 && (0, types_1.isTypeVar)(argParam.paramType)) {
           argType = stripLiteralValue(argType);
         }
@@ -64119,10 +64220,6 @@ var require_typeEvaluator = __commonJS({
             }
             addUnknown = false;
           } else if (entryNode.nodeType === 16) {
-            let mappingType = getTypeshedType(node, "SupportsKeysAndGetItem");
-            if (!mappingType) {
-              mappingType = getTypingType(node, "Mapping");
-            }
             let expectedType;
             if (expectedKeyType && expectedValueType) {
               if (mappingType && (0, types_1.isInstantiableClass)(mappingType)) {
@@ -64163,39 +64260,37 @@ var require_typeEvaluator = __commonJS({
                 });
                 addUnknown = false;
               }
-            } else {
-              if (mappingType && (0, types_1.isInstantiableClass)(mappingType)) {
-                const mappingTypeVarContext = new typeVarContext_1.TypeVarContext((0, typeUtils_1.getTypeVarScopeId)(mappingType));
-                mappingType = types_1.ClassType.cloneForSpecialization(
-                  mappingType,
-                  mappingType.details.typeParameters,
-                  /* isTypeArgumentExplicit */
-                  true
-                );
-                if (assignType(
-                  types_1.ClassType.cloneAsInstance(mappingType),
-                  unexpandedType,
-                  /* diag */
-                  void 0,
-                  mappingTypeVarContext,
-                  /* srcTypeVarContext */
-                  void 0,
-                  128
-                  /* RetainLiteralsForTypeVar */
-                )) {
-                  const specializedMapping = (0, typeUtils_1.applySolvedTypeVars)(mappingType, mappingTypeVarContext);
-                  const typeArgs = specializedMapping.typeArguments;
-                  if (typeArgs && typeArgs.length >= 2) {
-                    if (forceStrictInference || index < maxEntriesToUseForInference) {
-                      keyTypes.push({ node: entryNode, type: typeArgs[0] });
-                      valueTypes.push({ node: entryNode, type: typeArgs[1] });
-                    }
-                    addUnknown = false;
+            } else if (mappingType && (0, types_1.isInstantiableClass)(mappingType)) {
+              const mappingTypeVarContext = new typeVarContext_1.TypeVarContext((0, typeUtils_1.getTypeVarScopeId)(mappingType));
+              mappingType = types_1.ClassType.cloneForSpecialization(
+                mappingType,
+                mappingType.details.typeParameters,
+                /* isTypeArgumentExplicit */
+                true
+              );
+              if (assignType(
+                types_1.ClassType.cloneAsInstance(mappingType),
+                unexpandedType,
+                /* diag */
+                void 0,
+                mappingTypeVarContext,
+                /* srcTypeVarContext */
+                void 0,
+                128
+                /* RetainLiteralsForTypeVar */
+              )) {
+                const specializedMapping = (0, typeUtils_1.applySolvedTypeVars)(mappingType, mappingTypeVarContext);
+                const typeArgs = specializedMapping.typeArguments;
+                if (typeArgs && typeArgs.length >= 2) {
+                  if (forceStrictInference || index < maxEntriesToUseForInference) {
+                    keyTypes.push({ node: entryNode, type: typeArgs[0] });
+                    valueTypes.push({ node: entryNode, type: typeArgs[1] });
                   }
-                } else {
-                  const fileInfo = AnalyzerNodeInfo.getFileInfo(node);
-                  addDiagnostic(fileInfo.diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.dictUnpackIsNotMapping(), entryNode);
+                  addUnknown = false;
                 }
+              } else {
+                const fileInfo = AnalyzerNodeInfo.getFileInfo(node);
+                addDiagnostic(fileInfo.diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.dictUnpackIsNotMapping(), entryNode);
               }
             }
           } else if (entryNode.nodeType === 32) {
@@ -66179,7 +66274,7 @@ var require_typeEvaluator = __commonJS({
           addError(localize_1.Localizer.Diagnostic.methodOrdering(), node.name);
         }
         const innerScope = ScopeUtils.getScopeForNode(node.suite);
-        classType.details.fields = (innerScope === null || innerScope === void 0 ? void 0 : innerScope.symbolTable) || /* @__PURE__ */ new Map();
+        classType.details.fields = (innerScope === null || innerScope === void 0 ? void 0 : innerScope.symbolTable) ? new Map(innerScope.symbolTable) : /* @__PURE__ */ new Map();
         const slotsNames = innerScope === null || innerScope === void 0 ? void 0 : innerScope.getSlotsNames();
         if (slotsNames) {
           classType.details.localSlotsNames = slotsNames;
@@ -66660,7 +66755,7 @@ var require_typeEvaluator = __commonJS({
           if (newMethodMember) {
             const newMethodType = getTypeOfMember(newMethodMember);
             if ((0, types_1.isFunction)(newMethodType)) {
-              const paramListDetails = (0, typeUtils_1.getParameterListDetails)(newMethodType);
+              const paramListDetails = (0, parameterUtils_1.getParameterListDetails)(newMethodType);
               if (paramListDetails.firstKeywordOnlyIndex !== void 0) {
                 const paramMap = /* @__PURE__ */ new Map();
                 for (let i = paramListDetails.firstKeywordOnlyIndex; i < paramListDetails.params.length; i++) {
@@ -66671,6 +66766,7 @@ var require_typeEvaluator = __commonJS({
                 }
                 argList.forEach((arg) => {
                   var _a, _b, _c;
+                  const signatureTracker = new typeUtils_1.UniqueSignatureTracker();
                   if (arg.argumentCategory === 0 && arg.name) {
                     const paramIndex = (_a = paramMap.get(arg.name.value)) !== null && _a !== void 0 ? _a : paramListDetails.kwargsIndex;
                     if (paramIndex !== void 0) {
@@ -66685,6 +66781,7 @@ var require_typeEvaluator = __commonJS({
                       validateArgType(
                         argParam,
                         new typeVarContext_1.TypeVarContext(),
+                        signatureTracker,
                         { type: newMethodType },
                         /* skipUnknownCheck */
                         true,
@@ -67697,7 +67794,7 @@ var require_typeEvaluator = __commonJS({
           return getExceptionType(subType, node.typeExpression);
         });
         if (node.isExceptGroup) {
-          targetType = getBuiltInObject(node, "ExceptionGroup", [targetType]);
+          targetType = getBuiltInObject(node, "BaseExceptionGroup", [targetType]);
         }
         if (node.name) {
           assignTypeToExpression(
@@ -69584,10 +69681,10 @@ var require_typeEvaluator = __commonJS({
       }
       function resolveAliasDeclaration(declaration, resolveLocalNames, allowExternallyHiddenAccess = false) {
         var _a;
-        return (_a = DeclarationUtils.resolveAliasDeclaration(importLookup, declaration, resolveLocalNames, allowExternallyHiddenAccess)) === null || _a === void 0 ? void 0 : _a.declaration;
+        return (_a = (0, declarationUtils_1.resolveAliasDeclaration)(importLookup, declaration, resolveLocalNames, allowExternallyHiddenAccess)) === null || _a === void 0 ? void 0 : _a.declaration;
       }
       function resolveAliasDeclarationWithInfo(declaration, resolveLocalNames, allowExternallyHiddenAccess = false) {
-        return DeclarationUtils.resolveAliasDeclaration(importLookup, declaration, resolveLocalNames, allowExternallyHiddenAccess);
+        return (0, declarationUtils_1.resolveAliasDeclaration)(importLookup, declaration, resolveLocalNames, allowExternallyHiddenAccess);
       }
       function getEffectiveTypeOfSymbol(symbol) {
         return getEffectiveTypeOfSymbolForUsage(symbol).type;
@@ -69609,7 +69706,7 @@ var require_typeEvaluator = __commonJS({
               }
             }
             const typedDecls = symbol.getTypedDeclarations();
-            const result = {
+            const result2 = {
               type: declaredType !== null && declaredType !== void 0 ? declaredType : types_1.UnknownType.create(),
               isIncomplete: isIncomplete2,
               includesVariableDecl: typedDecls.some(
@@ -69619,17 +69716,17 @@ var require_typeEvaluator = __commonJS({
               includesIllegalTypeAliasDecl: !typedDecls.every((decl) => isPossibleTypeAliasDeclaration(decl)),
               isRecursiveDefinition: !declaredType
             };
-            return result;
+            return result2;
           }
         }
         let cacheEntries = effectiveTypeCache.get(symbol.id);
         const usageNodeId = usageNode ? usageNode.id : void 0;
         const effectiveTypeCacheKey = `${usageNodeId === void 0 ? "." : usageNodeId.toString()}${useLastDecl ? "*" : ""}`;
         if (cacheEntries) {
-          const result = cacheEntries.get(effectiveTypeCacheKey);
-          if (result) {
-            if (!result.isIncomplete) {
-              return result;
+          const result2 = cacheEntries.get(effectiveTypeCacheKey);
+          if (result2) {
+            if (!result2.isIncomplete) {
+              return result2;
             }
           }
         }
@@ -69641,15 +69738,15 @@ var require_typeEvaluator = __commonJS({
         let includesSpeculativeResult = false;
         let declIndexToConsider;
         if (decls.length > maxDeclarationsToUseForInference) {
-          const result = {
+          const result2 = {
             type: types_1.UnknownType.create(),
             isIncomplete: false,
             includesVariableDecl: false,
             includesIllegalTypeAliasDecl: !decls.every((decl) => isPossibleTypeAliasDeclaration(decl)),
             isRecursiveDefinition: false
           };
-          addToEffectiveTypeCache(result);
-          return result;
+          addToEffectiveTypeCache(result2);
+          return result2;
         }
         if (useLastDecl) {
           decls.forEach((decl, index) => {
@@ -69753,35 +69850,32 @@ var require_typeEvaluator = __commonJS({
             }
           }
         });
+        const evaluationAttempts = ((_b = (_a = cacheEntries === null || cacheEntries === void 0 ? void 0 : cacheEntries.get(effectiveTypeCacheKey)) === null || _a === void 0 ? void 0 : _a.evaluationAttempts) !== null && _b !== void 0 ? _b : 0) + 1;
+        let resultType;
         if (typesToCombine.length > 0) {
-          const evaluationAttempts = ((_b = (_a = cacheEntries === null || cacheEntries === void 0 ? void 0 : cacheEntries.get(effectiveTypeCacheKey)) === null || _a === void 0 ? void 0 : _a.evaluationAttempts) !== null && _b !== void 0 ? _b : 0) + 1;
           isIncomplete = sawPendingEvaluation && evaluationAttempts < maxEffectiveTypeEvaluationAttempts;
-          const result = {
-            type: (0, types_1.combineTypes)(typesToCombine),
-            isIncomplete,
-            includesVariableDecl,
-            includesIllegalTypeAliasDecl: !decls.every((decl) => isPossibleTypeAliasDeclaration(decl)),
-            isRecursiveDefinition: false,
-            evaluationAttempts
-          };
-          if (!includesSpeculativeResult) {
-            addToEffectiveTypeCache(result);
-          }
-          return result;
+          resultType = (0, types_1.combineTypes)(typesToCombine);
+        } else {
+          resultType = types_1.UnboundType.create();
         }
-        return {
-          type: types_1.UnboundType.create(),
+        const result = {
+          type: resultType,
           isIncomplete,
           includesVariableDecl,
           includesIllegalTypeAliasDecl: !decls.every((decl) => isPossibleTypeAliasDeclaration(decl)),
-          isRecursiveDefinition: false
+          isRecursiveDefinition: false,
+          evaluationAttempts
         };
-        function addToEffectiveTypeCache(result) {
+        if (!includesSpeculativeResult) {
+          addToEffectiveTypeCache(result);
+        }
+        return result;
+        function addToEffectiveTypeCache(result2) {
           if (!cacheEntries) {
             cacheEntries = /* @__PURE__ */ new Map();
             effectiveTypeCache.set(symbol.id, cacheEntries);
           }
-          cacheEntries.set(effectiveTypeCacheKey, result);
+          cacheEntries.set(effectiveTypeCacheKey, result2);
         }
       }
       function getDeclaredTypeOfSymbol(symbol, usageNode) {
@@ -69867,6 +69961,9 @@ var require_typeEvaluator = __commonJS({
         if (types_1.FunctionType.isStubDefinition(type)) {
           return types_1.UnknownType.create();
         }
+        if (types_1.FunctionType.isOverloaded(type) && !types_1.FunctionType.isSynthesizedMethod(type)) {
+          return types_1.UnknownType.create();
+        }
         if (type.inferredReturnType) {
           returnType = type.inferredReturnType;
         } else {
@@ -70219,7 +70316,7 @@ var require_typeEvaluator = __commonJS({
         });
         return isAssignable;
       }
-      function assignTupleTypeArgs(destType, srcType, diag, typeVarContext, flags, recursionCount) {
+      function assignTupleTypeArgs(destType, srcType, diag, destTypeVarContext, srcTypeVarContext, flags, recursionCount) {
         var _a, _b;
         const destTypeArgs = [...(_a = destType.tupleTypeArguments) !== null && _a !== void 0 ? _a : []];
         const srcTypeArgs = [...(_b = srcType.tupleTypeArguments) !== null && _b !== void 0 ? _b : []];
@@ -70274,16 +70371,7 @@ var require_typeEvaluator = __commonJS({
         if (srcTypeArgs.length === destTypeArgs.length) {
           for (let argIndex = 0; argIndex < srcTypeArgs.length; argIndex++) {
             const entryDiag = diag === null || diag === void 0 ? void 0 : diag.createAddendum();
-            if (!assignType(
-              destTypeArgs[argIndex].type,
-              srcTypeArgs[argIndex].type,
-              entryDiag === null || entryDiag === void 0 ? void 0 : entryDiag.createAddendum(),
-              typeVarContext,
-              /* srcTypeVarContext */
-              void 0,
-              flags,
-              recursionCount
-            )) {
+            if (!assignType(destTypeArgs[argIndex].type, srcTypeArgs[argIndex].type, entryDiag === null || entryDiag === void 0 ? void 0 : entryDiag.createAddendum(), destTypeVarContext, srcTypeVarContext, flags, recursionCount)) {
               if (entryDiag) {
                 entryDiag.addMessage(localize_1.Localizer.DiagnosticAddendum.tupleEntryTypeMismatch().format({
                   entry: argIndex + 1
@@ -70293,14 +70381,7 @@ var require_typeEvaluator = __commonJS({
             }
           }
         } else {
-          if (srcUnboundedIndex >= 0) {
-            if (!destType.isUnpacked) {
-              diag === null || diag === void 0 ? void 0 : diag.addMessage(localize_1.Localizer.DiagnosticAddendum.tupleSizeMismatchIndeterminate().format({
-                expected: destTypeArgs.length
-              }));
-              return false;
-            }
-          } else {
+          if (srcUnboundedIndex < 0) {
             diag === null || diag === void 0 ? void 0 : diag.addMessage(localize_1.Localizer.DiagnosticAddendum.tupleSizeMismatch().format({
               expected: destTypeArgs.length,
               received: srcTypeArgs.length
@@ -70335,7 +70416,7 @@ var require_typeEvaluator = __commonJS({
             curSrcType = (0, typeUtils_1.specializeForBaseClass)(curSrcType, ancestorType);
           }
           if (ancestorIndex === 0 && destType.tupleTypeArguments && curSrcType.tupleTypeArguments) {
-            return assignTupleTypeArgs(destType, curSrcType, diag, curDestTypeVarContext, flags, recursionCount);
+            return assignTupleTypeArgs(destType, curSrcType, diag, destTypeVarContext, srcTypeVarContext, flags, recursionCount);
           }
           const ancestorTypeParams = types_1.ClassType.getTypeParameters(ancestorType);
           if (ancestorTypeParams.length === 0) {
@@ -70406,6 +70487,7 @@ var require_typeEvaluator = __commonJS({
           destTypeArgs = destType.typeArguments;
           srcTypeArgs = srcType.typeArguments;
         }
+        let isCompatible = true;
         if (srcTypeArgs) {
           for (let srcArgIndex = 0; srcArgIndex < srcTypeArgs.length; srcArgIndex++) {
             const srcTypeArg = srcTypeArgs[srcArgIndex];
@@ -70426,7 +70508,7 @@ var require_typeEvaluator = __commonJS({
                     diag.addAddendum(assignmentDiag);
                   }
                 }
-                return false;
+                isCompatible = false;
               }
             } else if (types_1.TypeVarType.getVariance(destTypeParam) === 4) {
               if (!assignType(srcTypeArg, destTypeArg, assignmentDiag, srcTypeVarContext, destTypeVarContext, flags ^ 2 | 128, recursionCount)) {
@@ -70437,7 +70519,7 @@ var require_typeEvaluator = __commonJS({
                   }));
                   childDiag.addAddendum(assignmentDiag);
                 }
-                return false;
+                isCompatible = false;
               }
             } else {
               if (!assignType(destTypeArg, srcTypeArg, assignmentDiag, destTypeVarContext, srcTypeVarContext, flags | 1, recursionCount)) {
@@ -70449,13 +70531,13 @@ var require_typeEvaluator = __commonJS({
                     }));
                     childDiag.addAddendum(assignmentDiag);
                   }
-                  return false;
+                  isCompatible = false;
                 }
               }
             }
           }
         }
-        return true;
+        return isCompatible;
       }
       function assignType(destType, srcType, diag, destTypeVarContext, srcTypeVarContext, flags = 0, recursionCount = 0) {
         var _a, _b;
@@ -70502,7 +70584,7 @@ var require_typeEvaluator = __commonJS({
         const originalFlags = flags;
         flags &= ~64;
         if ((0, types_1.isTypeVar)(destType)) {
-          if ((0, types_1.isTypeSame)(destType, srcType)) {
+          if ((0, typeUtils_1.isTypeVarSame)(destType, srcType)) {
             if (destType.scopeId && (destTypeVarContext === null || destTypeVarContext === void 0 ? void 0 : destTypeVarContext.hasSolveForScope(destType.scopeId))) {
               return (0, constraintSolver_1.assignTypeToTypeVar)(evaluatorInterface, destType, srcType, diag, destTypeVarContext, flags, recursionCount);
             }
@@ -70602,6 +70684,9 @@ var require_typeEvaluator = __commonJS({
           }
         }
         if ((0, types_1.isNever)(srcType)) {
+          if ((flags & 1) !== 0) {
+            return (0, types_1.isNever)(destType);
+          }
           const targetTypeVarContext = (flags & 2) === 0 ? destTypeVarContext : srcTypeVarContext;
           if (targetTypeVarContext) {
             (0, typeUtils_1.setTypeArgumentsRecursive)(destType, types_1.UnknownType.create(), targetTypeVarContext, recursionCount);
@@ -70795,8 +70880,8 @@ var require_typeEvaluator = __commonJS({
             if (destCallbackType) {
               return assignType(destCallbackType, concreteSrcType, diag, destTypeVarContext, srcTypeVarContext, flags, recursionCount);
             }
-            if (objectType && (0, types_1.isClassInstance)(objectType)) {
-              return assignType(destType, objectType, diag, destTypeVarContext, srcTypeVarContext, flags, recursionCount);
+            if (functionObj && (0, types_1.isClassInstance)(functionObj)) {
+              return assignType(destType, functionObj, diag, destTypeVarContext, srcTypeVarContext, flags, recursionCount);
             }
           } else if ((0, types_1.isModule)(concreteSrcType)) {
             if (types_1.ClassType.isBuiltIn(destType, "ModuleType")) {
@@ -71531,7 +71616,7 @@ var require_typeEvaluator = __commonJS({
         if (srcDetails.params.length < destDetails.argsIndex) {
           return;
         }
-        let srcLastToPackIndex = srcDetails.params.findIndex((p, i) => i >= destDetails.argsIndex && p.source === typeUtils_1.ParameterSource.KeywordOnly);
+        let srcLastToPackIndex = srcDetails.params.findIndex((p, i) => i >= destDetails.argsIndex && p.source === parameterUtils_1.ParameterSource.KeywordOnly);
         if (srcLastToPackIndex < 0) {
           srcLastToPackIndex = srcDetails.params.length;
         }
@@ -71578,7 +71663,7 @@ var require_typeEvaluator = __commonJS({
               },
               type: srcPositionalsType,
               index: -1,
-              source: typeUtils_1.ParameterSource.PositionOnly
+              source: parameterUtils_1.ParameterSource.PositionOnly
             },
             ...srcDetails.params.slice(destDetails.argsIndex + srcPositionalsToPack.length, srcDetails.params.length)
           ];
@@ -71592,9 +71677,9 @@ var require_typeEvaluator = __commonJS({
             /* VarArgDictionary */
           );
           srcDetails.kwargsIndex = kwargsIndex >= 0 ? kwargsIndex : void 0;
-          const firstKeywordOnlyIndex = srcDetails.params.findIndex((param) => param.source === typeUtils_1.ParameterSource.KeywordOnly);
+          const firstKeywordOnlyIndex = srcDetails.params.findIndex((param) => param.source === parameterUtils_1.ParameterSource.KeywordOnly);
           srcDetails.firstKeywordOnlyIndex = firstKeywordOnlyIndex >= 0 ? firstKeywordOnlyIndex : void 0;
-          srcDetails.positionOnlyParamCount = Math.max(0, srcDetails.params.findIndex((p) => p.source !== typeUtils_1.ParameterSource.PositionOnly || p.param.category !== 0 || p.param.hasDefault));
+          srcDetails.positionOnlyParamCount = Math.max(0, srcDetails.params.findIndex((p) => p.source !== parameterUtils_1.ParameterSource.PositionOnly || p.param.category !== 0 || p.param.hasDefault));
         }
       }
       function assignFunction(destType, srcType, diag, destTypeVarContext, srcTypeVarContext, flags, recursionCount) {
@@ -71604,8 +71689,8 @@ var require_typeEvaluator = __commonJS({
         flags &= ~32;
         destType = (0, typeUtils_1.removeParamSpecVariadicsFromFunction)(destType);
         srcType = (0, typeUtils_1.removeParamSpecVariadicsFromFunction)(srcType);
-        const destParamDetails = (0, typeUtils_1.getParameterListDetails)(destType);
-        const srcParamDetails = (0, typeUtils_1.getParameterListDetails)(srcType);
+        const destParamDetails = (0, parameterUtils_1.getParameterListDetails)(destType);
+        const srcParamDetails = (0, parameterUtils_1.getParameterListDetails)(srcType);
         adjustSourceParamDetailsForDestVariadic(srcParamDetails, destParamDetails);
         const targetIncludesParamSpec = (flags & 2) !== 0 ? !!srcType.details.paramSpec : !!destType.details.paramSpec;
         const destPositionalCount = (_b = (_a = destParamDetails.argsIndex) !== null && _a !== void 0 ? _a : destParamDetails.firstKeywordOnlyIndex) !== null && _b !== void 0 ? _b : destParamDetails.params.length;
@@ -71619,7 +71704,7 @@ var require_typeEvaluator = __commonJS({
           const destParamName = (_e = destParam.param.name) !== null && _e !== void 0 ? _e : "";
           const srcParamName = (_f = srcParam.param.name) !== null && _f !== void 0 ? _f : "";
           if (destParamName && !(0, symbolNameUtils_1.isPrivateOrProtectedName)(destParamName) && !(0, symbolNameUtils_1.isPrivateOrProtectedName)(srcParamName)) {
-            const isDestPositionalOnly = destParam.source === typeUtils_1.ParameterSource.PositionOnly;
+            const isDestPositionalOnly = destParam.source === parameterUtils_1.ParameterSource.PositionOnly;
             if (!isDestPositionalOnly && destParam.param.category !== 1 && srcParam.param.category !== 1 && destParamName !== srcParamName) {
               diag === null || diag === void 0 ? void 0 : diag.createAddendum().addMessage(localize_1.Localizer.DiagnosticAddendum.functionParamName().format({
                 srcName: srcParamName,
@@ -71690,7 +71775,7 @@ var require_typeEvaluator = __commonJS({
                 if (!assignFunctionParameter(destParamType, srcArgsType, paramIndex, diag === null || diag === void 0 ? void 0 : diag.createAddendum(), destTypeVarContext, srcTypeVarContext, flags, recursionCount)) {
                   canAssign = false;
                 }
-                if (destParamDetails.params[paramIndex].source !== typeUtils_1.ParameterSource.PositionOnly && srcParamDetails.kwargsIndex === void 0) {
+                if (destParamDetails.params[paramIndex].source !== parameterUtils_1.ParameterSource.PositionOnly && srcParamDetails.kwargsIndex === void 0) {
                   diag === null || diag === void 0 ? void 0 : diag.addMessage(localize_1.Localizer.DiagnosticAddendum.namedParamMissingInSource().format({
                     name: (_g = destParamDetails.params[paramIndex].param.name) !== null && _g !== void 0 ? _g : ""
                   }));
@@ -72083,8 +72168,8 @@ var require_typeEvaluator = __commonJS({
       }
       function validateOverrideMethodInternal(baseMethod, overrideMethod, diag, enforceParamNames) {
         var _a, _b;
-        const baseParamDetails = (0, typeUtils_1.getParameterListDetails)(baseMethod);
-        const overrideParamDetails = (0, typeUtils_1.getParameterListDetails)(overrideMethod);
+        const baseParamDetails = (0, parameterUtils_1.getParameterListDetails)(baseMethod);
+        const overrideParamDetails = (0, parameterUtils_1.getParameterListDetails)(overrideMethod);
         let canOverride = true;
         if (types_1.FunctionType.isStaticMethod(baseMethod)) {
           if (!types_1.FunctionType.isStaticMethod(overrideMethod)) {
@@ -72152,10 +72237,10 @@ var require_typeEvaluator = __commonJS({
           }
           const baseParam = baseParamDetails.params[i].param;
           const overrideParam = overrideParamDetails.params[i].param;
-          if (i >= baseParamDetails.positionOnlyParamCount && !(0, symbolNameUtils_1.isPrivateOrProtectedName)(baseParam.name || "") && baseParamDetails.params[i].source !== typeUtils_1.ParameterSource.PositionOnly && baseParam.category === 0 && baseParam.name !== overrideParam.name) {
+          if (i >= baseParamDetails.positionOnlyParamCount && !(0, symbolNameUtils_1.isPrivateOrProtectedName)(baseParam.name || "") && baseParamDetails.params[i].source !== parameterUtils_1.ParameterSource.PositionOnly && baseParam.category === 0 && baseParam.name !== overrideParam.name) {
             if (overrideParam.category === 0) {
               if (enforceParamNames) {
-                if (overrideParamDetails.params[i].source === typeUtils_1.ParameterSource.PositionOnly) {
+                if (overrideParamDetails.params[i].source === parameterUtils_1.ParameterSource.PositionOnly) {
                   diag === null || diag === void 0 ? void 0 : diag.addMessage(localize_1.Localizer.DiagnosticAddendum.overrideParamNamePositionOnly().format({
                     index: i + 1,
                     baseName: baseParam.name || "*"
@@ -72236,11 +72321,11 @@ var require_typeEvaluator = __commonJS({
           }
         }
         const baseKwOnlyParams = baseParamDetails.params.filter(
-          (paramInfo) => paramInfo.source === typeUtils_1.ParameterSource.KeywordOnly && paramInfo.param.category === 0
+          (paramInfo) => paramInfo.source === parameterUtils_1.ParameterSource.KeywordOnly && paramInfo.param.category === 0
           /* Simple */
         );
         const overrideWkOnlyParams = overrideParamDetails.params.filter(
-          (paramInfo) => paramInfo.source === typeUtils_1.ParameterSource.KeywordOnly && paramInfo.param.category === 0
+          (paramInfo) => paramInfo.source === parameterUtils_1.ParameterSource.KeywordOnly && paramInfo.param.category === 0
           /* Simple */
         );
         baseKwOnlyParams.forEach((paramInfo) => {
@@ -72820,6 +72905,7 @@ var require_checker = __commonJS({
     var declaration_1 = require_declaration();
     var importResolver_1 = require_importResolver();
     var importStatementUtils_1 = require_importStatementUtils();
+    var parameterUtils_1 = require_parameterUtils();
     var ParseTreeUtils = __importStar(require_parseTreeUtils());
     var parseTreeWalker_1 = require_parseTreeWalker();
     var patternMatching_1 = require_patternMatching();
@@ -75578,7 +75664,7 @@ var require_checker = __commonJS({
         if (!(0, types_1.isFunction)(postInitType) || !types_1.FunctionType.isInstanceMethod(postInitType) || !postInitType.details.declaration) {
           return;
         }
-        const paramListDetails = (0, typeUtils_1.getParameterListDetails)(postInitType);
+        const paramListDetails = (0, parameterUtils_1.getParameterListDetails)(postInitType);
         if (paramListDetails.argsIndex !== void 0 || paramListDetails.kwargsIndex !== void 0 || paramListDetails.firstKeywordOnlyIndex !== void 0) {
           return;
         }
@@ -76105,6 +76191,7 @@ var require_checker = __commonJS({
         });
       }
       _validateOverrideDecoratorPresent(overrideType, baseMember) {
+        var _a;
         if (this._fileInfo.diagnosticRuleSet.reportImplicitOverride === "none") {
           return;
         }
@@ -76113,10 +76200,21 @@ var require_checker = __commonJS({
           overrideFunction = overrideType;
         } else if ((0, types_1.isOverloadedFunction)(overrideType)) {
           overrideFunction = types_1.OverloadedFunctionType.getImplementation(overrideType);
+        } else if ((0, types_1.isClassInstance)(overrideType) && types_1.ClassType.isPropertyClass(overrideType)) {
+          const fgetSymbol = overrideType.details.fields.get("fget");
+          if (fgetSymbol) {
+            const fgetType = (_a = this._evaluator.getDeclaredTypeOfSymbol(fgetSymbol)) === null || _a === void 0 ? void 0 : _a.type;
+            if (fgetType && (0, types_1.isFunction)(fgetType)) {
+              overrideFunction = fgetType;
+            }
+          }
         }
         if (!(overrideFunction === null || overrideFunction === void 0 ? void 0 : overrideFunction.details.declaration) || types_1.FunctionType.isOverridden(overrideFunction)) {
           return;
         }
+        if (overrideFunction.details.name === "__init__" || overrideFunction.details.name === "__new__") {
+          return;
+        }
         const funcNode = overrideFunction.details.declaration.node;
         this._evaluator.addDiagnostic(this._fileInfo.diagnosticRuleSet.reportImplicitOverride, diagnosticRules_1.DiagnosticRule.reportImplicitOverride, localize_1.Localizer.Diagnostic.overrideDecoratorMissing().format({
           name: funcNode.name.value,
@@ -76127,11 +76225,20 @@ var require_checker = __commonJS({
       // decorator. In this case, an error is reported because no base class has declared
       // a method of the same name.
       _validateOverrideDecoratorNotPresent(overrideType) {
+        var _a;
         let overrideFunction;
         if ((0, types_1.isFunction)(overrideType)) {
           overrideFunction = overrideType;
         } else if ((0, types_1.isOverloadedFunction)(overrideType)) {
           overrideFunction = types_1.OverloadedFunctionType.getImplementation(overrideType);
+        } else if ((0, types_1.isClassInstance)(overrideType) && types_1.ClassType.isPropertyClass(overrideType)) {
+          const fgetSymbol = overrideType.details.fields.get("fget");
+          if (fgetSymbol) {
+            const fgetType = (_a = this._evaluator.getDeclaredTypeOfSymbol(fgetSymbol)) === null || _a === void 0 ? void 0 : _a.type;
+            if (fgetType && (0, types_1.isFunction)(fgetType)) {
+              overrideFunction = fgetType;
+            }
+          }
         }
         if (!(overrideFunction === null || overrideFunction === void 0 ? void 0 : overrideFunction.details.declaration) || !types_1.FunctionType.isOverridden(overrideFunction)) {
           return;
@@ -76500,6 +76607,9 @@ var require_checker = __commonJS({
         if (types_1.FunctionType.isOverloaded(functionType)) {
           return;
         }
+        if ((0, types_1.isClassInstance)(paramType) && types_1.ClassType.isBuiltIn(paramType, "LiteralString") && types_1.ClassType.isBuiltIn(classType, "str")) {
+          return;
+        }
         const typeVarContext = new typeVarContext_1.TypeVarContext((0, typeUtils_1.getTypeVarScopeId)(functionType));
         if (!this._evaluator.assignType(
           paramType,
@@ -76669,10 +76779,11 @@ var require_checker = __commonJS({
         });
       }
       _addDiagnosticForRegionComment(regionComment, message) {
-        const range = regionComment.comment;
-        range.start -= 1;
-        range.length += 1;
-        return this._evaluator.addDiagnosticForTextRange(this._fileInfo, "error", "", message, range);
+        return this._evaluator.addDiagnosticForTextRange(this._fileInfo, "error", "", message, {
+          // extend range to include # character
+          start: regionComment.comment.start - 1,
+          length: regionComment.comment.length + 1
+        });
       }
     };
     exports.Checker = Checker;
@@ -77551,7 +77662,7 @@ var require_sourceFile = __commonJS({
             } catch (error) {
               diagSink.addError(`Source file could not be read`, (0, textRange_1.getEmptyRange)());
               fileContents = "";
-              if (!this.fileSystem.existsSync(this._filePath)) {
+              if (!this.fileSystem.existsSync(this._realFilePath)) {
                 this._isFileDeleted = true;
               }
             }