@zzzen/pyright-internal 1.2.0-dev.20220918 → 1.2.0-dev.20220925

package/dist/analyzer/typeEvaluatorTypes.d.ts

@@ -28,6 +28,7 @@ export declare const enum EvaluatorFlags {
     DisallowTypeVarsWithScopeId = 2048,
     DisallowTypeVarsWithoutScopeId = 4096,
     AssociateTypeVarsWithCurrentScope = 8192,
+    EnforceTypeVarVarianceConsistency = 16384,
     VariableTypeAnnotation = 32768,
     DisallowRecursiveTypeAliasPlaceholder = 65536,
     ClassVarDisallowed = 131072,

package/dist/analyzer/typeEvaluatorTypes.js

@@ -54,6 +54,10 @@ var EvaluatorFlags;
     // associated with an outer scope should be associated with
     // the containing function's scope.
     EvaluatorFlags[EvaluatorFlags["AssociateTypeVarsWithCurrentScope"] = 8192] = "AssociateTypeVarsWithCurrentScope";
+    // When a new class-scoped TypeVar is used within a class
+    // declaration, make sure that it is not used to parameterize
+    // a base class whose TypeVar variance is inconsistent.
+    EvaluatorFlags[EvaluatorFlags["EnforceTypeVarVarianceConsistency"] = 16384] = "EnforceTypeVarVarianceConsistency";
     // Used for PEP 526-style variable type annotations
     EvaluatorFlags[EvaluatorFlags["VariableTypeAnnotation"] = 32768] = "VariableTypeAnnotation";
     // Emit an error if an incomplete recursive type alias is

package/dist/analyzer/typeEvaluatorTypes.js.map

@@ -1 +1 @@
-{"version":3,"file":"typeEvaluatorTypes.js","sourceRoot":"","sources":["../../../src/analyzer/typeEvaluatorTypes.ts"],"names":[],"mappings":";AAAA;;;;;;;;GAQG;;;AAyCH,gEAAgE;AAChE,kDAAkD;AACrC,QAAA,0BAA0B,GAAG,EAAE,CAAC;AAE7C,IAAkB,cAqFjB;AArFD,WAAkB,cAAc;IAC5B,mDAAQ,CAAA;IAER,uDAAuD;IACvD,mFAA6B,CAAA;IAE7B,0DAA0D;IAC1D,gEAAgE;IAChE,SAAS;IACT,yEAAwB,CAAA;IAExB,yDAAyD;IACzD,uFAA+B,CAAA;IAE/B,kCAAkC;IAClC,iGAAoC,CAAA;IAEpC,0CAA0C;IAC1C,0EAAwB,CAAA;IAExB,6CAA6C;IAC7C,kFAA4B,CAAA;IAE5B,qDAAqD;IACrD,4BAA4B;IAC5B,sEAAsB,CAAA;IAEtB,gDAAgD;IAChD,yFAA+B,CAAA;IAE/B,2DAA2D;IAC3D,6FAAiC,CAAA;IAEjC,2DAA2D;IAC3D,gDAAgD;IAChD,uFAA8B,CAAA;IAE9B,gEAAgE;IAChE,6DAA6D;IAC7D,qBAAqB;IACrB,4FAAiC,CAAA;IAEjC,8DAA8D;IAC9D,+BAA+B;IAC/B,oGAAqC,CAAA;IAErC,0DAA0D;IAC1D,+BAA+B;IAC/B,0GAAwC,CAAA;IAExC,yDAAyD;IACzD,2DAA2D;IAC3D,mCAAmC;IACnC,gHAA2C,CAAA;IAE3C,mDAAmD;IACnD,2FAAgC,CAAA;IAEhC,yDAAyD;IACzD,wBAAwB;IACxB,yHAA+C,CAAA;IAE/C,6CAA6C;IAC7C,oFAA4B,CAAA;IAE5B,mEAAmE;IACnE,wFAA8B,CAAA;IAE9B,iEAAiE;IACjE,iCAAiC;IACjC,4FAAgC,CAAA;IAEhC,wDAAwD;IACxD,+EAAyB,CAAA;IAEzB,uDAAuD;IACvD,iHAA0C,CAAA;IAE1C,6DAA6D;IAC7D,2DAA2D;IAC3D,oDAAoD;IACpD,6GAAwC,CAAA;IAExC,yCAAyC;IACzC,6FAAgC,CAAA;AACpC,CAAC,EArFiB,cAAc,GAAd,sBAAc,KAAd,sBAAc,QAqF/B"}
+{"version":3,"file":"typeEvaluatorTypes.js","sourceRoot":"","sources":["../../../src/analyzer/typeEvaluatorTypes.ts"],"names":[],"mappings":";AAAA;;;;;;;;GAQG;;;AAyCH,gEAAgE;AAChE,kDAAkD;AACrC,QAAA,0BAA0B,GAAG,EAAE,CAAC;AAE7C,IAAkB,cA0FjB;AA1FD,WAAkB,cAAc;IAC5B,mDAAQ,CAAA;IAER,uDAAuD;IACvD,mFAA6B,CAAA;IAE7B,0DAA0D;IAC1D,gEAAgE;IAChE,SAAS;IACT,yEAAwB,CAAA;IAExB,yDAAyD;IACzD,uFAA+B,CAAA;IAE/B,kCAAkC;IAClC,iGAAoC,CAAA;IAEpC,0CAA0C;IAC1C,0EAAwB,CAAA;IAExB,6CAA6C;IAC7C,kFAA4B,CAAA;IAE5B,qDAAqD;IACrD,4BAA4B;IAC5B,sEAAsB,CAAA;IAEtB,gDAAgD;IAChD,yFAA+B,CAAA;IAE/B,2DAA2D;IAC3D,6FAAiC,CAAA;IAEjC,2DAA2D;IAC3D,gDAAgD;IAChD,uFAA8B,CAAA;IAE9B,gEAAgE;IAChE,6DAA6D;IAC7D,qBAAqB;IACrB,4FAAiC,CAAA;IAEjC,8DAA8D;IAC9D,+BAA+B;IAC/B,oGAAqC,CAAA;IAErC,0DAA0D;IAC1D,+BAA+B;IAC/B,0GAAwC,CAAA;IAExC,yDAAyD;IACzD,2DAA2D;IAC3D,mCAAmC;IACnC,gHAA2C,CAAA;IAE3C,yDAAyD;IACzD,6DAA6D;IAC7D,uDAAuD;IACvD,iHAA2C,CAAA;IAE3C,mDAAmD;IACnD,2FAAgC,CAAA;IAEhC,yDAAyD;IACzD,wBAAwB;IACxB,yHAA+C,CAAA;IAE/C,6CAA6C;IAC7C,oFAA4B,CAAA;IAE5B,mEAAmE;IACnE,wFAA8B,CAAA;IAE9B,iEAAiE;IACjE,iCAAiC;IACjC,4FAAgC,CAAA;IAEhC,wDAAwD;IACxD,+EAAyB,CAAA;IAEzB,uDAAuD;IACvD,iHAA0C,CAAA;IAE1C,6DAA6D;IAC7D,2DAA2D;IAC3D,oDAAoD;IACpD,6GAAwC,CAAA;IAExC,yCAAyC;IACzC,6FAAgC,CAAA;AACpC,CAAC,EA1FiB,cAAc,GAAd,sBAAc,KAAd,sBAAc,QA0F/B"}

package/dist/analyzer/typeEvaluatorWithTracker.d.ts

@@ -2,5 +2,4 @@ import { LogTracker } from '../common/logTracker';
 import { ImportLookup } from './analyzerFileInfo';
 import { TracePrinter } from './tracePrinter';
 import { EvaluatorOptions } from './typeEvaluator';
-import { TypeEvaluator } from './typeEvaluatorTypes';
-export declare function createTypeEvaluatorWithTracker(importLookup: ImportLookup, evaluatorOptions: EvaluatorOptions, logger: LogTracker, printer?: TracePrinter): TypeEvaluator;
+export declare function createTypeEvaluatorWithTracker(importLookup: ImportLookup, evaluatorOptions: EvaluatorOptions, logger: LogTracker, printer?: TracePrinter): import("./typeEvaluatorTypes").TypeEvaluator;

package/dist/analyzer/typeEvaluatorWithTracker.js

@@ -12,115 +12,51 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createTypeEvaluatorWithTracker = void 0;
+const console_1 = require("../common/console");
 const core_1 = require("../common/core");
 const timing_1 = require("../common/timing");
 const typeEvaluator_1 = require("./typeEvaluator");
 // We don't want to track calls from the type evaluator itself, but only entry points.
 function createTypeEvaluatorWithTracker(importLookup, evaluatorOptions, logger, printer) {
-    if (!evaluatorOptions.logCalls && (0, core_1.isDebugMode)()) {
-        return (0, typeEvaluator_1.createTypeEvaluator)(importLookup, evaluatorOptions);
+    function wrapWithLogger(func) {
+        // Only wrap the function if told to do so and the log level is high enough for it
+        // to actually log something.
+        if (evaluatorOptions.logCalls && logger.logLevel === console_1.LogLevel.Log) {
+            return (...args) => {
+                return logger.log(func.name, (s) => {
+                    if (func.name === 'importLookup' && args.length > 0) {
+                        // This is actually a filename, so special case it.
+                        s.add(printer === null || printer === void 0 ? void 0 : printer.printFileOrModuleName(args[0]));
+                    }
+                    else {
+                        // Print all parameters.
+                        args.forEach((a) => {
+                            s.add(printer === null || printer === void 0 ? void 0 : printer.print(a));
+                        });
+                    }
+                    return timing_1.timingStats.typeEvaluationTime.timeOperation(func, ...args);
+                }, evaluatorOptions.minimumLoggingThreshold, 
+                /* logParsingPerf */ true);
+            };
+        }
+        else if (!(0, core_1.isDebugMode)()) {
+            return timing_1.timingStats.typeEvaluationTime.timeOperation.bind(timing_1.timingStats.typeEvaluationTime, func);
+        }
+        else {
+            return func;
+        }
     }
-    function run(title, callback, value) {
-        return evaluatorOptions.logCalls
-            ? logger.log(title, (s) => {
-                s.add(printer === null || printer === void 0 ? void 0 : printer.print(value));
-                return timing_1.timingStats.typeEvaluationTime.timeOperation(callback);
-            }, evaluatorOptions.minimumLoggingThreshold, true)
-            : timing_1.timingStats.typeEvaluationTime.timeOperation(callback);
-    }
-    const lookup = evaluatorOptions.logCalls
-        ? (filePath) => logger.log('import lookup', (s) => {
-            s.add(printer === null || printer === void 0 ? void 0 : printer.printFileOrModuleName(filePath));
-            return importLookup(filePath);
-        }, evaluatorOptions.minimumLoggingThreshold, true)
-        : importLookup;
-    const typeEvaluator = (0, typeEvaluator_1.createTypeEvaluator)(lookup, evaluatorOptions);
-    const withTracker = {
-        runWithCancellationToken: typeEvaluator.runWithCancellationToken,
-        getType: (n) => run('getType', () => typeEvaluator.getType(n), n),
-        getTypeOfExpression: (n, f, e) => run('getTypeOfExpression', () => typeEvaluator.getTypeOfExpression(n, f, e), n),
-        getTypeOfAnnotation: typeEvaluator.getTypeOfAnnotation,
-        getTypeOfClass: (n) => run('getTypeOfClass', () => typeEvaluator.getTypeOfClass(n), n),
-        getTypeOfFunction: (n) => run('getTypeOfFunction', () => typeEvaluator.getTypeOfFunction(n), n),
-        getTypeOfExpressionExpectingType: typeEvaluator.getTypeOfExpressionExpectingType,
-        evaluateTypeForSubnode: typeEvaluator.evaluateTypeForSubnode,
-        evaluateTypesForStatement: (n) => run('evaluateTypesForStatement', () => typeEvaluator.evaluateTypesForStatement(n), n),
-        evaluateTypesForMatchStatement: typeEvaluator.evaluateTypesForMatchStatement,
-        evaluateTypesForCaseStatement: typeEvaluator.evaluateTypesForCaseStatement,
-        evaluateTypeOfParameter: typeEvaluator.evaluateTypeOfParameter,
-        canBeTruthy: typeEvaluator.canBeTruthy,
-        canBeFalsy: typeEvaluator.canBeFalsy,
-        stripLiteralValue: typeEvaluator.stripLiteralValue,
-        removeTruthinessFromType: typeEvaluator.removeTruthinessFromType,
-        removeFalsinessFromType: typeEvaluator.removeFalsinessFromType,
-        getExpectedType: (n) => run('getExpectedType', () => typeEvaluator.getExpectedType(n), n),
-        verifyRaiseExceptionType: (n) => run('verifyRaiseExceptionType', () => typeEvaluator.verifyRaiseExceptionType(n), n),
-        verifyDeleteExpression: (n) => run('verifyDeleteExpression', () => typeEvaluator.verifyDeleteExpression(n), n),
-        validateOverloadedFunctionArguments: typeEvaluator.validateOverloadedFunctionArguments,
-        isAfterNodeReachable: (n) => run('isAfterNodeReachable', () => typeEvaluator.isAfterNodeReachable(n), n),
-        isNodeReachable: (n, s) => run('isNodeReachable', () => typeEvaluator.isNodeReachable(n, s), n),
-        isAsymmetricDescriptorAssignment: typeEvaluator.isAsymmetricDescriptorAssignment,
-        suppressDiagnostics: (node, callback) => run('suppressDiagnostics', () => typeEvaluator.suppressDiagnostics(node, callback)),
-        getDeclarationsForStringNode: (n) => run('getDeclarationsForStringNode', () => typeEvaluator.getDeclarationsForStringNode(n), n),
-        getDeclarationsForNameNode: (n, s) => run('getDeclarationsForNameNode', () => typeEvaluator.getDeclarationsForNameNode(n, s), n),
-        getTypeForDeclaration: (n) => run('getTypeForDeclaration', () => typeEvaluator.getTypeForDeclaration(n), n),
-        resolveAliasDeclaration: (d, l, h) => run('resolveAliasDeclaration', () => typeEvaluator.resolveAliasDeclaration(d, l, h), d),
-        resolveAliasDeclarationWithInfo: (d, l, h) => run('resolveAliasDeclarationWithInfo', () => typeEvaluator.resolveAliasDeclarationWithInfo(d, l, h), d),
-        getTypeOfIterable: (t, a, e) => run('getTypeOfIterable', () => typeEvaluator.getTypeOfIterable(t, a, e), t),
-        getTypeOfIterator: (t, a, e) => run('getTypeOfIterator', () => typeEvaluator.getTypeOfIterator(t, a, e), t),
-        getGetterTypeFromProperty: (p, i) => run('getGetterTypeFromProperty', () => typeEvaluator.getGetterTypeFromProperty(p, i), p),
-        getTypeOfArgument: typeEvaluator.getTypeOfArgument,
-        markNamesAccessed: (n, a) => run('markNamesAccessed', () => typeEvaluator.markNamesAccessed(n, a), n),
-        getScopeIdForNode: typeEvaluator.getScopeIdForNode,
-        makeTopLevelTypeVarsConcrete: (t) => run('makeTopLevelTypeVarsConcrete', () => typeEvaluator.makeTopLevelTypeVarsConcrete(t), t),
-        mapSubtypesExpandTypeVars: typeEvaluator.mapSubtypesExpandTypeVars,
-        lookUpSymbolRecursive: typeEvaluator.lookUpSymbolRecursive,
-        getDeclaredTypeOfSymbol: typeEvaluator.getDeclaredTypeOfSymbol,
-        getEffectiveTypeOfSymbol: (s) => run('getEffectiveTypeOfSymbol', () => typeEvaluator.getEffectiveTypeOfSymbol(s), s),
-        getEffectiveTypeOfSymbolForUsage: (s, u, d) => run('getEffectiveTypeOfSymbolForUsage', () => typeEvaluator.getEffectiveTypeOfSymbolForUsage(s, u, d), s),
-        getInferredTypeOfDeclaration: typeEvaluator.getInferredTypeOfDeclaration,
-        getDeclaredTypeForExpression: typeEvaluator.getDeclaredTypeForExpression,
-        getFunctionDeclaredReturnType: (n) => run('getFunctionDeclaredReturnType', () => typeEvaluator.getFunctionDeclaredReturnType(n), n),
-        getFunctionInferredReturnType: (t, a) => run('getFunctionInferredReturnType', () => typeEvaluator.getFunctionInferredReturnType(t, a), t),
-        getBestOverloadForArguments: (e, t, a) => typeEvaluator.getBestOverloadForArguments(e, t, a),
-        getBuiltInType: (n, b) => run('getBuiltInType', () => typeEvaluator.getBuiltInType(n, b), n),
-        getTypeOfMember: (m) => run('getTypeOfMember', () => typeEvaluator.getTypeOfMember(m), m.symbol),
-        getTypeOfObjectMember: typeEvaluator.getTypeOfObjectMember,
-        getBoundMethod: typeEvaluator.getBoundMethod,
-        getTypeOfMagicMethodReturn: typeEvaluator.getTypeOfMagicMethodReturn,
-        bindFunctionToClassOrObject: typeEvaluator.bindFunctionToClassOrObject,
-        getCallSignatureInfo: (n, i, a) => run('getCallSignatureInfo', () => typeEvaluator.getCallSignatureInfo(n, i, a), n),
-        getAbstractMethods: (c) => run('getAbstractMethods', () => typeEvaluator.getAbstractMethods(c), c),
-        narrowConstrainedTypeVar: typeEvaluator.narrowConstrainedTypeVar,
-        assignType: (d, s, a, dc, sc, f, r) => run('assignType', () => typeEvaluator.assignType(d, s, a, dc, sc, f, r), d),
-        validateOverrideMethod: (b, o, d, e) => run('validateOverrideMethod', () => typeEvaluator.validateOverrideMethod(b, o, d, e), o),
-        assignTypeToExpression: typeEvaluator.assignTypeToExpression,
-        assignClassToSelf: typeEvaluator.assignClassToSelf,
-        getBuiltInObject: typeEvaluator.getBuiltInObject,
-        getTypedDictClassType: typeEvaluator.getTypedDictClassType,
-        getTupleClassType: typeEvaluator.getTupleClassType,
-        getObjectType: typeEvaluator.getObjectType,
-        getTypingType: typeEvaluator.getTypingType,
-        inferReturnTypeIfNecessary: typeEvaluator.inferReturnTypeIfNecessary,
-        inferTypeParameterVarianceForClass: typeEvaluator.inferTypeParameterVarianceForClass,
-        verifyTypeArgumentsAssignable: typeEvaluator.verifyTypeArgumentsAssignable,
-        addError: typeEvaluator.addError,
-        addWarning: typeEvaluator.addWarning,
-        addInformation: typeEvaluator.addInformation,
-        addUnusedCode: typeEvaluator.addUnusedCode,
-        addUnreachableCode: typeEvaluator.addUnreachableCode,
-        addDeprecated: typeEvaluator.addDeprecated,
-        addDiagnostic: typeEvaluator.addDiagnostic,
-        addDiagnosticForTextRange: typeEvaluator.addDiagnosticForTextRange,
-        printType: (t, e) => run('printType', () => typeEvaluator.printType(t, e), t),
-        printFunctionParts: (t) => run('printFunctionParts', () => typeEvaluator.printFunctionParts(t), t),
-        getTypeCacheEntryCount: typeEvaluator.getTypeCacheEntryCount,
-        disposeEvaluator: typeEvaluator.disposeEvaluator,
-        useSpeculativeMode: typeEvaluator.useSpeculativeMode,
-        setTypeForNode: typeEvaluator.setTypeForNode,
-        checkForCancellation: typeEvaluator.checkForCancellation,
-    };
-    return withTracker;
+    // Wrap all functions with either a logger or a timer.
+    importLookup = wrapWithLogger(importLookup);
+    const evaluator = (0, typeEvaluator_1.createTypeEvaluator)(importLookup, evaluatorOptions);
+    const keys = Object.keys(evaluator);
+    keys.forEach((k) => {
+        const entry = evaluator[k];
+        if (typeof entry === 'function') {
+            evaluator[k] = wrapWithLogger(entry);
+        }
+    });
+    return evaluator;
 }
 exports.createTypeEvaluatorWithTracker = createTypeEvaluatorWithTracker;
 //# sourceMappingURL=typeEvaluatorWithTracker.js.map

package/dist/analyzer/typeEvaluatorWithTracker.js.map

@@ -1 +1 @@
-{"version":3,"file":"typeEvaluatorWithTracker.js","sourceRoot":"","sources":["../../../src/analyzer/typeEvaluatorWithTracker.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"typeEvaluatorWithTracker.js","sourceRoot":"","sources":["../../../src/analyzer/typeEvaluatorWithTracker.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;GAUG;;;AAEH,+CAA6C;AAC7C,yCAA6C;AAE7C,6CAA+C;AAG/C,mDAAwE;AAExE,sFAAsF;AACtF,SAAgB,8BAA8B,CAC1C,YAA0B,EAC1B,gBAAkC,EAClC,MAAkB,EAClB,OAAsB;IAEtB,SAAS,cAAc,CAAoC,IAAO;QAC9D,kFAAkF;QAClF,6BAA6B;QAC7B,IAAI,gBAAgB,CAAC,QAAQ,IAAI,MAAM,CAAC,QAAQ,KAAK,kBAAQ,CAAC,GAAG,EAAE;YAC/D,OAAO,CAAC,GAAG,IAAmB,EAAiB,EAAE;gBAC7C,OAAO,MAAM,CAAC,GAAG,CACb,IAAI,CAAC,IAAI,EACT,CAAC,CAAC,EAAE,EAAE;oBACF,IAAI,IAAI,CAAC,IAAI,KAAK,cAAc,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;wBACjD,mDAAmD;wBACnD,CAAC,CAAC,GAAG,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,qBAAqB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;qBAClD;yBAAM;wBACH,wBAAwB;wBACxB,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;4BACf,CAAC,CAAC,GAAG,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;wBAC7B,CAAC,CAAC,CAAC;qBACN;oBACD,OAAO,oBAAW,CAAC,kBAAkB,CAAC,aAAa,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,CAAC;gBACvE,CAAC,EACD,gBAAgB,CAAC,uBAAuB;gBACxC,oBAAoB,CAAC,IAAI,CAC5B,CAAC;YACN,CAAC,CAAC;SACL;aAAM,IAAI,CAAC,IAAA,kBAAW,GAAE,EAAE;YACvB,OAAO,oBAAW,CAAC,kBAAkB,CAAC,aAAa,CAAC,IAAI,CAAC,oBAAW,CAAC,kBAAkB,EAAE,IAAI,CAAC,CAAC;SAClG;aAAM;YACH,OAAO,IAAI,CAAC;SACf;IACL,CAAC;IAED,sDAAsD;IACtD,YAAY,GAAG,cAAc,CAAC,YAAY,CAAC,CAAC;IAC5C,MAAM,SAAS,GAAG,IAAA,mCAAmB,EAAC,YAAY,EAAE,gBAAgB,CAAC,CAAC;IACtE,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACpC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QACf,MAAM,KAAK,GAAI,SAAiB,CAAC,CAAC,CAAC,CAAC;QACpC,IAAI,OAAO,KAAK,KAAK,UAAU,EAAE;YAC5B,SAAiB,CAAC,CAAC,CAAC,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC;SACjD;IACL,CAAC,CAAC,CAAC;IAEH,OAAO,SAAS,CAAC;AACrB,CAAC;AAhDD,wEAgDC"}

package/dist/analyzer/typeUtils.js

@@ -179,7 +179,8 @@ function getParameterListDetails(type) {
             // If this is an unpacked tuple, expand the entries.
             const paramType = types_1.FunctionType.getEffectiveParameterType(type, index);
             if (param.name && (0, types_1.isUnpackedClass)(paramType) && paramType.tupleTypeArguments) {
-                paramType.tupleTypeArguments.forEach((tupleArg, index) => {
+                const addToPositionalOnly = index < result.positionOnlyParamCount;
+                paramType.tupleTypeArguments.forEach((tupleArg, tupleIndex) => {
                     const category = (0, types_1.isVariadicTypeVar)(tupleArg.type) || tupleArg.isUnbounded
                         ? 1 /* VarArgList */
                         : 0 /* Simple */;
@@ -191,11 +192,14 @@ function getParameterListDetails(type) {
                     }
                     addVirtualParameter({
                         category,
-                        name: `${param.name}[${index.toString()}]`,
+                        name: `${param.name}[${tupleIndex.toString()}]`,
                         isNameSynthesized: true,
                         type: tupleArg.type,
                         hasDeclaredType: true,
-                    }, index, tupleArg.type);
+                    }, tupleIndex, tupleArg.type);
+                    if (tupleIndex > 0 && addToPositionalOnly) {
+                        result.positionOnlyParamCount++;
+                    }
                 });
             }
             else {
@@ -2057,7 +2061,7 @@ class TypeVarTransformer {
         this._pendingTypeVarTransformations = new Set();
     }
     apply(type, recursionCount = 0) {
-        var _a;
+        var _a, _b;
         if (recursionCount > types_1.maxTypeRecursionCount) {
             return type;
         }
@@ -2100,7 +2104,7 @@ class TypeVarTransformer {
             // _pendingTypeVarTransformations set.
             const typeVarName = types_1.TypeVarType.getNameWithScope(type);
             if (!this._pendingTypeVarTransformations.has(typeVarName)) {
-                replacementType = this.transformTypeVar(type);
+                replacementType = (_b = this.transformTypeVar(type)) !== null && _b !== void 0 ? _b : type;
                 if (!this._isTransformingTypeArg) {
                     this._pendingTypeVarTransformations.add(typeVarName);
                     replacementType = this.apply(replacementType, recursionCount);
@@ -2236,7 +2240,8 @@ class TypeVarTransformer {
                 else {
                     const typeParamName = types_1.TypeVarType.getNameWithScope(typeParam);
                     if (!this._pendingTypeVarTransformations.has(typeParamName)) {
-                        replacementType = this.transformTypeVar(typeParam);
+                        const transformedType = this.transformTypeVar(typeParam);
+                        replacementType = transformedType !== null && transformedType !== void 0 ? transformedType : typeParam;
                         if (replacementType !== typeParam) {
                             if (!this._isTransformingTypeArg) {
                                 this._pendingTypeVarTransformations.add(typeParamName);
@@ -2245,6 +2250,9 @@ class TypeVarTransformer {
                             }
                             specializationNeeded = true;
                         }
+                        else if (transformedType !== undefined && !classType.typeArguments) {
+                            specializationNeeded = true;
+                        }
                     }
                 }
                 newTypeArgs.push(replacementType);
@@ -2477,7 +2485,7 @@ class ApplySolvedTypeVarsTransformer extends TypeVarTransformer {
                 return types_1.UnknownType.create();
             }
         }
-        return typeVar;
+        return undefined;
     }
     transformUnionSubtype(preTransform, postTransform) {
         // If a union contains unsolved TypeVars within scope, eliminate them