typescript 4.6.0-dev.20211213 → 4.6.0-dev.20211218

package/lib/typescriptServices.js

@@ -294,7 +294,7 @@ var ts;
     // The following is baselined as a literal template type without intervention
     /** The version of the TypeScript compiler release */
     // eslint-disable-next-line @typescript-eslint/no-inferrable-types
-    ts.version = ts.versionMajorMinor + ".0-dev.20211213";
+    ts.version = ts.versionMajorMinor + ".0-dev.20211218";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -19910,7 +19910,7 @@ var ts;
     }
     ts.getAllowJSCompilerOption = getAllowJSCompilerOption;
     function getUseDefineForClassFields(compilerOptions) {
-        return compilerOptions.useDefineForClassFields === undefined ? getEmitScriptTarget(compilerOptions) === 99 /* ESNext */ : compilerOptions.useDefineForClassFields;
+        return compilerOptions.useDefineForClassFields === undefined ? getEmitScriptTarget(compilerOptions) >= 9 /* ES2022 */ : compilerOptions.useDefineForClassFields;
     }
     ts.getUseDefineForClassFields = getUseDefineForClassFields;
     function compilerOptionsAffectSemanticDiagnostics(newOptions, oldOptions) {
@@ -33725,7 +33725,7 @@ var ts;
                                     return true;
                             }
                         }
-                        else if (third === 27 /* CommaToken */) {
+                        else if (third === 27 /* CommaToken */ || third === 63 /* EqualsToken */) {
                             return true;
                         }
                         return false;
@@ -55591,7 +55591,8 @@ var ts;
             return false;
         }
         function getBaseTypeNodeOfClass(type) {
-            return ts.getEffectiveBaseTypeNode(type.symbol.valueDeclaration);
+            var decl = ts.getClassLikeDeclarationOfSymbol(type.symbol);
+            return decl && ts.getEffectiveBaseTypeNode(decl);
         }
         function getConstructorsForTypeArguments(type, typeArgumentNodes, location) {
             var typeArgCount = ts.length(typeArgumentNodes);
@@ -55613,8 +55614,8 @@ var ts;
          */
         function getBaseConstructorTypeOfClass(type) {
             if (!type.resolvedBaseConstructorType) {
-                var decl = type.symbol.valueDeclaration;
-                var extended = ts.getEffectiveBaseTypeNode(decl);
+                var decl = ts.getClassLikeDeclarationOfSymbol(type.symbol);
+                var extended = decl && ts.getEffectiveBaseTypeNode(decl);
                 var baseTypeNode = getBaseTypeNodeOfClass(type);
                 if (!baseTypeNode) {
                     return type.resolvedBaseConstructorType = undefinedType;
@@ -57619,13 +57620,23 @@ var ts;
             }
             return type;
         }
+        function isMappedTypeGenericIndexedAccess(type) {
+            return type.flags & 8388608 /* IndexedAccess */ && ts.getObjectFlags(type.objectType) & 32 /* Mapped */ &&
+                !isGenericMappedType(type.objectType) && isGenericIndexType(type.indexType);
+        }
         /**
          * For a type parameter, return the base constraint of the type parameter. For the string, number,
          * boolean, and symbol primitive types, return the corresponding object types. Otherwise return the
          * type itself.
          */
         function getApparentType(type) {
-            var t = type.flags & 465829888 /* Instantiable */ ? getBaseConstraintOfType(type) || unknownType : type;
+            // We obtain the base constraint for all instantiable types, except indexed access types of the form
+            // { [P in K]: E }[X], where K is non-generic and X is generic. For those types, we instead substitute an
+            // instantiation of E where P is replaced with X. We do this because getBaseConstraintOfType directly
+            // lowers to an instantiation where X's constraint is substituted for X, which isn't always desirable.
+            var t = !(type.flags & 465829888 /* Instantiable */) ? type :
+                isMappedTypeGenericIndexedAccess(type) ? substituteIndexedMappedType(type.objectType, type.indexType) :
+                    getBaseConstraintOfType(type) || unknownType;
             return ts.getObjectFlags(t) & 32 /* Mapped */ ? getApparentTypeOfMappedType(t) :
                 t.flags & 2097152 /* Intersection */ ? getApparentTypeOfIntersectionType(t) :
                     t.flags & 402653316 /* StringLike */ ? globalStringType :
@@ -58241,6 +58252,8 @@ var ts;
                     case 205 /* PropertyAccessExpression */:
                     case 206 /* ElementAccessExpression */:
                         return traverse(node.expression);
+                    case 294 /* PropertyAssignment */:
+                        return traverse(node.initializer);
                     default:
                         return !ts.nodeStartsNewLexicalEnvironment(node) && !ts.isPartOfTypeNode(node) && !!ts.forEachChild(node, traverse);
                 }
@@ -65896,7 +65909,7 @@ var ts;
         // flags for the string, number, boolean, "", 0, false, void, undefined, or null types respectively. Returns
         // no flags for all other types (including non-falsy literal types).
         function getFalsyFlags(type) {
-            return type.flags & 3145728 /* UnionOrIntersection */ ? getFalsyFlagsOfTypes(type.types) :
+            return type.flags & 1048576 /* Union */ ? getFalsyFlagsOfTypes(type.types) :
                 type.flags & 128 /* StringLiteral */ ? type.value === "" ? 128 /* StringLiteral */ : 0 :
                     type.flags & 256 /* NumberLiteral */ ? type.value === 0 ? 256 /* NumberLiteral */ : 0 :
                         type.flags & 2048 /* BigIntLiteral */ ? isZeroBigInt(type) ? 2048 /* BigIntLiteral */ : 0 :
@@ -66810,12 +66823,14 @@ var ts;
                     // not contain anyFunctionType when we come back to this argument for its second round
                     // of inference. Also, we exclude inferences for silentNeverType (which is used as a wildcard
                     // when constructing types from type parameters that had no inference candidates).
-                    if (ts.getObjectFlags(source) & 524288 /* NonInferrableType */ || source === nonInferrableAnyType || source === silentNeverType ||
-                        (priority & 128 /* ReturnType */ && (source === autoType || source === autoArrayType)) || isFromInferenceBlockedSource(source)) {
+                    if (source === nonInferrableAnyType || source === silentNeverType || (priority & 128 /* ReturnType */ && (source === autoType || source === autoArrayType)) || isFromInferenceBlockedSource(source)) {
                         return;
                     }
                     var inference = getInferenceInfoForType(target);
                     if (inference) {
+                        if (ts.getObjectFlags(source) & 524288 /* NonInferrableType */) {
+                            return;
+                        }
                         if (!inference.isFixed) {
                             if (inference.priority === undefined || priority < inference.priority) {
                                 inference.candidates = undefined;
@@ -66846,21 +66861,19 @@ var ts;
                         inferencePriority = Math.min(inferencePriority, priority);
                         return;
                     }
-                    else {
-                        // Infer to the simplified version of an indexed access, if possible, to (hopefully) expose more bare type parameters to the inference engine
-                        var simplified = getSimplifiedType(target, /*writing*/ false);
-                        if (simplified !== target) {
-                            invokeOnce(source, simplified, inferFromTypes);
-                        }
-                        else if (target.flags & 8388608 /* IndexedAccess */) {
-                            var indexType = getSimplifiedType(target.indexType, /*writing*/ false);
-                            // Generally simplifications of instantiable indexes are avoided to keep relationship checking correct, however if our target is an access, we can consider
-                            // that key of that access to be "instantiated", since we're looking to find the infernce goal in any way we can.
-                            if (indexType.flags & 465829888 /* Instantiable */) {
-                                var simplified_1 = distributeIndexOverObjectType(getSimplifiedType(target.objectType, /*writing*/ false), indexType, /*writing*/ false);
-                                if (simplified_1 && simplified_1 !== target) {
-                                    invokeOnce(source, simplified_1, inferFromTypes);
-                                }
+                    // Infer to the simplified version of an indexed access, if possible, to (hopefully) expose more bare type parameters to the inference engine
+                    var simplified = getSimplifiedType(target, /*writing*/ false);
+                    if (simplified !== target) {
+                        inferFromTypes(source, simplified);
+                    }
+                    else if (target.flags & 8388608 /* IndexedAccess */) {
+                        var indexType = getSimplifiedType(target.indexType, /*writing*/ false);
+                        // Generally simplifications of instantiable indexes are avoided to keep relationship checking correct, however if our target is an access, we can consider
+                        // that key of that access to be "instantiated", since we're looking to find the infernce goal in any way we can.
+                        if (indexType.flags & 465829888 /* Instantiable */) {
+                            var simplified_1 = distributeIndexOverObjectType(getSimplifiedType(target.objectType, /*writing*/ false), indexType, /*writing*/ false);
+                            if (simplified_1 && simplified_1 !== target) {
+                                inferFromTypes(source, simplified_1);
                             }
                         }
                     }
@@ -69730,7 +69743,7 @@ var ts;
             var substituteConstraints = !(checkMode && checkMode & 2 /* Inferential */) &&
                 someType(type, isGenericTypeWithUnionConstraint) &&
                 (isConstraintPosition(type, reference) || hasNonBindingPatternContextualTypeWithNoGenericTypes(reference));
-            return substituteConstraints ? mapType(type, function (t) { return t.flags & 465829888 /* Instantiable */ ? getBaseConstraintOrType(t) : t; }) : type;
+            return substituteConstraints ? mapType(type, function (t) { return t.flags & 465829888 /* Instantiable */ && !isMappedTypeGenericIndexedAccess(t) ? getBaseConstraintOrType(t) : t; }) : type;
         }
         function isExportOrExportExpression(location) {
             return !!ts.findAncestor(location, function (n) {
@@ -72701,11 +72714,14 @@ var ts;
             if (!ts.getContainingClass(privId)) {
                 return grammarErrorOnNode(privId, ts.Diagnostics.Private_identifiers_are_not_allowed_outside_class_bodies);
             }
-            if (!ts.isExpressionNode(privId)) {
-                return grammarErrorOnNode(privId, ts.Diagnostics.Private_identifiers_are_only_allowed_in_class_bodies_and_may_only_be_used_as_part_of_a_class_member_declaration_property_access_or_on_the_left_hand_side_of_an_in_expression);
-            }
-            if (!getSymbolForPrivateIdentifierExpression(privId)) {
-                return grammarErrorOnNode(privId, ts.Diagnostics.Cannot_find_name_0, ts.idText(privId));
+            if (!ts.isForInStatement(privId.parent)) {
+                if (!ts.isExpressionNode(privId)) {
+                    return grammarErrorOnNode(privId, ts.Diagnostics.Private_identifiers_are_only_allowed_in_class_bodies_and_may_only_be_used_as_part_of_a_class_member_declaration_property_access_or_on_the_left_hand_side_of_an_in_expression);
+                }
+                var isInOperation = ts.isBinaryExpression(privId.parent) && privId.parent.operatorToken.kind === 101 /* InKeyword */;
+                if (!getSymbolForPrivateIdentifierExpression(privId) && !isInOperation) {
+                    return grammarErrorOnNode(privId, ts.Diagnostics.Cannot_find_name_0, ts.idText(privId));
+                }
             }
             return false;
         }
@@ -82719,7 +82735,7 @@ var ts;
                 if (memberSymbol) {
                     var declaration = memberSymbol.valueDeclaration;
                     if (declaration !== member) {
-                        if (declaration && isBlockScopedNameDeclaredBeforeUse(declaration, member)) {
+                        if (declaration && isBlockScopedNameDeclaredBeforeUse(declaration, member) && ts.isEnumDeclaration(declaration.parent)) {
                             return getEnumMemberValue(declaration);
                         }
                         error(expr, ts.Diagnostics.A_member_initializer_in_a_enum_declaration_cannot_reference_members_declared_after_it_including_members_defined_in_other_enums);
@@ -86092,7 +86108,7 @@ var ts;
                 if (prop.kind === 295 /* ShorthandPropertyAssignment */ && !inDestructuring && prop.objectAssignmentInitializer) {
                     // having objectAssignmentInitializer is only valid in ObjectAssignmentPattern
                     // outside of destructuring it is a syntax error
-                    return grammarErrorOnNode(prop.equalsToken, ts.Diagnostics.Did_you_mean_to_use_a_Colon_An_can_only_follow_a_property_name_when_the_containing_object_literal_is_part_of_a_destructuring_pattern);
+                    grammarErrorOnNode(prop.equalsToken, ts.Diagnostics.Did_you_mean_to_use_a_Colon_An_can_only_follow_a_property_name_when_the_containing_object_literal_is_part_of_a_destructuring_pattern);
                 }
                 if (name.kind === 80 /* PrivateIdentifier */) {
                     grammarErrorOnNode(name, ts.Diagnostics.Private_identifiers_are_not_allowed_outside_class_bodies);
@@ -92056,7 +92072,7 @@ var ts;
         var compilerOptions = context.getCompilerOptions();
         var languageVersion = ts.getEmitScriptTarget(compilerOptions);
         var useDefineForClassFields = ts.getUseDefineForClassFields(compilerOptions);
-        var shouldTransformPrivateElementsOrClassStaticBlocks = languageVersion < 99 /* ESNext */;
+        var shouldTransformPrivateElementsOrClassStaticBlocks = languageVersion < 9 /* ES2022 */;
         // We don't need to transform `super` property access when targeting ES5, ES3 because
         // the es2015 transformation handles those.
         var shouldTransformSuperInStaticInitializers = (languageVersion <= 8 /* ES2021 */ || !useDefineForClassFields) && languageVersion >= 2 /* ES2015 */;
@@ -92086,7 +92102,7 @@ var ts;
         function transformSourceFile(node) {
             var options = context.getCompilerOptions();
             if (node.isDeclarationFile
-                || useDefineForClassFields && ts.getEmitScriptTarget(options) === 99 /* ESNext */) {
+                || useDefineForClassFields && ts.getEmitScriptTarget(options) >= 9 /* ES2022 */) {
                 return node;
             }
             var visited = ts.visitEachChild(node, visitor, context);
@@ -92843,7 +92859,7 @@ var ts;
             if (useDefineForClassFields) {
                 // If we are using define semantics and targeting ESNext or higher,
                 // then we don't need to transform any class properties.
-                return languageVersion < 99 /* ESNext */;
+                return languageVersion < 9 /* ES2022 */;
             }
             return ts.isInitializedProperty(member) || shouldTransformPrivateElementsOrClassStaticBlocks && ts.isPrivateIdentifierClassElementDeclaration(member);
         }
@@ -123692,13 +123708,6 @@ var ts;
             || ts.isImportSpecifier(parent)
             || ts.isImportClause(parent)
             || ts.isImportEqualsDeclaration(parent) && node === parent.name) {
-            var decl = parent;
-            while (decl) {
-                if (ts.isImportEqualsDeclaration(decl) || ts.isImportClause(decl) || ts.isExportDeclaration(decl)) {
-                    return decl.isTypeOnly ? 2 /* Type */ : 7 /* All */;
-                }
-                decl = decl.parent;
-            }
             return 7 /* All */;
         }
         else if (isInRightSideOfInternalImportEqualsDeclaration(node)) {
@@ -157683,11 +157692,12 @@ var ts;
             var result = [];
             return visitor(selection) ? undefined : result;
             function visitor(node) {
+                var _a;
                 if (ts.isTypeReferenceNode(node)) {
                     if (ts.isIdentifier(node.typeName)) {
                         var symbol = checker.resolveName(node.typeName.text, node.typeName, 262144 /* TypeParameter */, /* excludeGlobals */ true);
-                        if (symbol === null || symbol === void 0 ? void 0 : symbol.declarations) {
-                            var declaration = ts.cast(ts.first(symbol.declarations), ts.isTypeParameterDeclaration);
+                        var declaration = ts.tryCast((_a = symbol === null || symbol === void 0 ? void 0 : symbol.declarations) === null || _a === void 0 ? void 0 : _a[0], ts.isTypeParameterDeclaration);
+                        if (declaration) {
                             if (rangeContainsSkipTrivia(statement, declaration, file) && !rangeContainsSkipTrivia(selection, declaration, file)) {
                                 ts.pushIfUnique(result, declaration);
                             }

package/lib/typingsInstaller.js

@@ -89,7 +89,7 @@ var ts;
     // The following is baselined as a literal template type without intervention
     /** The version of the TypeScript compiler release */
     // eslint-disable-next-line @typescript-eslint/no-inferrable-types
-    ts.version = ts.versionMajorMinor + ".0-dev.20211213";
+    ts.version = ts.versionMajorMinor + ".0-dev.20211218";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -19705,7 +19705,7 @@ var ts;
     }
     ts.getAllowJSCompilerOption = getAllowJSCompilerOption;
     function getUseDefineForClassFields(compilerOptions) {
-        return compilerOptions.useDefineForClassFields === undefined ? getEmitScriptTarget(compilerOptions) === 99 /* ESNext */ : compilerOptions.useDefineForClassFields;
+        return compilerOptions.useDefineForClassFields === undefined ? getEmitScriptTarget(compilerOptions) >= 9 /* ES2022 */ : compilerOptions.useDefineForClassFields;
     }
     ts.getUseDefineForClassFields = getUseDefineForClassFields;
     function compilerOptionsAffectSemanticDiagnostics(newOptions, oldOptions) {
@@ -33520,7 +33520,7 @@ var ts;
                                     return true;
                             }
                         }
-                        else if (third === 27 /* CommaToken */) {
+                        else if (third === 27 /* CommaToken */ || third === 63 /* EqualsToken */) {
                             return true;
                         }
                         return false;
@@ -55386,7 +55386,8 @@ var ts;
             return false;
         }
         function getBaseTypeNodeOfClass(type) {
-            return ts.getEffectiveBaseTypeNode(type.symbol.valueDeclaration);
+            var decl = ts.getClassLikeDeclarationOfSymbol(type.symbol);
+            return decl && ts.getEffectiveBaseTypeNode(decl);
         }
         function getConstructorsForTypeArguments(type, typeArgumentNodes, location) {
             var typeArgCount = ts.length(typeArgumentNodes);
@@ -55408,8 +55409,8 @@ var ts;
          */
         function getBaseConstructorTypeOfClass(type) {
             if (!type.resolvedBaseConstructorType) {
-                var decl = type.symbol.valueDeclaration;
-                var extended = ts.getEffectiveBaseTypeNode(decl);
+                var decl = ts.getClassLikeDeclarationOfSymbol(type.symbol);
+                var extended = decl && ts.getEffectiveBaseTypeNode(decl);
                 var baseTypeNode = getBaseTypeNodeOfClass(type);
                 if (!baseTypeNode) {
                     return type.resolvedBaseConstructorType = undefinedType;
@@ -57414,13 +57415,23 @@ var ts;
             }
             return type;
         }
+        function isMappedTypeGenericIndexedAccess(type) {
+            return type.flags & 8388608 /* IndexedAccess */ && ts.getObjectFlags(type.objectType) & 32 /* Mapped */ &&
+                !isGenericMappedType(type.objectType) && isGenericIndexType(type.indexType);
+        }
         /**
          * For a type parameter, return the base constraint of the type parameter. For the string, number,
          * boolean, and symbol primitive types, return the corresponding object types. Otherwise return the
          * type itself.
          */
         function getApparentType(type) {
-            var t = type.flags & 465829888 /* Instantiable */ ? getBaseConstraintOfType(type) || unknownType : type;
+            // We obtain the base constraint for all instantiable types, except indexed access types of the form
+            // { [P in K]: E }[X], where K is non-generic and X is generic. For those types, we instead substitute an
+            // instantiation of E where P is replaced with X. We do this because getBaseConstraintOfType directly
+            // lowers to an instantiation where X's constraint is substituted for X, which isn't always desirable.
+            var t = !(type.flags & 465829888 /* Instantiable */) ? type :
+                isMappedTypeGenericIndexedAccess(type) ? substituteIndexedMappedType(type.objectType, type.indexType) :
+                    getBaseConstraintOfType(type) || unknownType;
             return ts.getObjectFlags(t) & 32 /* Mapped */ ? getApparentTypeOfMappedType(t) :
                 t.flags & 2097152 /* Intersection */ ? getApparentTypeOfIntersectionType(t) :
                     t.flags & 402653316 /* StringLike */ ? globalStringType :
@@ -58036,6 +58047,8 @@ var ts;
                     case 205 /* PropertyAccessExpression */:
                     case 206 /* ElementAccessExpression */:
                         return traverse(node.expression);
+                    case 294 /* PropertyAssignment */:
+                        return traverse(node.initializer);
                     default:
                         return !ts.nodeStartsNewLexicalEnvironment(node) && !ts.isPartOfTypeNode(node) && !!ts.forEachChild(node, traverse);
                 }
@@ -65691,7 +65704,7 @@ var ts;
         // flags for the string, number, boolean, "", 0, false, void, undefined, or null types respectively. Returns
         // no flags for all other types (including non-falsy literal types).
         function getFalsyFlags(type) {
-            return type.flags & 3145728 /* UnionOrIntersection */ ? getFalsyFlagsOfTypes(type.types) :
+            return type.flags & 1048576 /* Union */ ? getFalsyFlagsOfTypes(type.types) :
                 type.flags & 128 /* StringLiteral */ ? type.value === "" ? 128 /* StringLiteral */ : 0 :
                     type.flags & 256 /* NumberLiteral */ ? type.value === 0 ? 256 /* NumberLiteral */ : 0 :
                         type.flags & 2048 /* BigIntLiteral */ ? isZeroBigInt(type) ? 2048 /* BigIntLiteral */ : 0 :
@@ -66605,12 +66618,14 @@ var ts;
                     // not contain anyFunctionType when we come back to this argument for its second round
                     // of inference. Also, we exclude inferences for silentNeverType (which is used as a wildcard
                     // when constructing types from type parameters that had no inference candidates).
-                    if (ts.getObjectFlags(source) & 524288 /* NonInferrableType */ || source === nonInferrableAnyType || source === silentNeverType ||
-                        (priority & 128 /* ReturnType */ && (source === autoType || source === autoArrayType)) || isFromInferenceBlockedSource(source)) {
+                    if (source === nonInferrableAnyType || source === silentNeverType || (priority & 128 /* ReturnType */ && (source === autoType || source === autoArrayType)) || isFromInferenceBlockedSource(source)) {
                         return;
                     }
                     var inference = getInferenceInfoForType(target);
                     if (inference) {
+                        if (ts.getObjectFlags(source) & 524288 /* NonInferrableType */) {
+                            return;
+                        }
                         if (!inference.isFixed) {
                             if (inference.priority === undefined || priority < inference.priority) {
                                 inference.candidates = undefined;
@@ -66641,21 +66656,19 @@ var ts;
                         inferencePriority = Math.min(inferencePriority, priority);
                         return;
                     }
-                    else {
-                        // Infer to the simplified version of an indexed access, if possible, to (hopefully) expose more bare type parameters to the inference engine
-                        var simplified = getSimplifiedType(target, /*writing*/ false);
-                        if (simplified !== target) {
-                            invokeOnce(source, simplified, inferFromTypes);
-                        }
-                        else if (target.flags & 8388608 /* IndexedAccess */) {
-                            var indexType = getSimplifiedType(target.indexType, /*writing*/ false);
-                            // Generally simplifications of instantiable indexes are avoided to keep relationship checking correct, however if our target is an access, we can consider
-                            // that key of that access to be "instantiated", since we're looking to find the infernce goal in any way we can.
-                            if (indexType.flags & 465829888 /* Instantiable */) {
-                                var simplified_1 = distributeIndexOverObjectType(getSimplifiedType(target.objectType, /*writing*/ false), indexType, /*writing*/ false);
-                                if (simplified_1 && simplified_1 !== target) {
-                                    invokeOnce(source, simplified_1, inferFromTypes);
-                                }
+                    // Infer to the simplified version of an indexed access, if possible, to (hopefully) expose more bare type parameters to the inference engine
+                    var simplified = getSimplifiedType(target, /*writing*/ false);
+                    if (simplified !== target) {
+                        inferFromTypes(source, simplified);
+                    }
+                    else if (target.flags & 8388608 /* IndexedAccess */) {
+                        var indexType = getSimplifiedType(target.indexType, /*writing*/ false);
+                        // Generally simplifications of instantiable indexes are avoided to keep relationship checking correct, however if our target is an access, we can consider
+                        // that key of that access to be "instantiated", since we're looking to find the infernce goal in any way we can.
+                        if (indexType.flags & 465829888 /* Instantiable */) {
+                            var simplified_1 = distributeIndexOverObjectType(getSimplifiedType(target.objectType, /*writing*/ false), indexType, /*writing*/ false);
+                            if (simplified_1 && simplified_1 !== target) {
+                                inferFromTypes(source, simplified_1);
                             }
                         }
                     }
@@ -69525,7 +69538,7 @@ var ts;
             var substituteConstraints = !(checkMode && checkMode & 2 /* Inferential */) &&
                 someType(type, isGenericTypeWithUnionConstraint) &&
                 (isConstraintPosition(type, reference) || hasNonBindingPatternContextualTypeWithNoGenericTypes(reference));
-            return substituteConstraints ? mapType(type, function (t) { return t.flags & 465829888 /* Instantiable */ ? getBaseConstraintOrType(t) : t; }) : type;
+            return substituteConstraints ? mapType(type, function (t) { return t.flags & 465829888 /* Instantiable */ && !isMappedTypeGenericIndexedAccess(t) ? getBaseConstraintOrType(t) : t; }) : type;
         }
         function isExportOrExportExpression(location) {
             return !!ts.findAncestor(location, function (n) {
@@ -72496,11 +72509,14 @@ var ts;
             if (!ts.getContainingClass(privId)) {
                 return grammarErrorOnNode(privId, ts.Diagnostics.Private_identifiers_are_not_allowed_outside_class_bodies);
             }
-            if (!ts.isExpressionNode(privId)) {
-                return grammarErrorOnNode(privId, ts.Diagnostics.Private_identifiers_are_only_allowed_in_class_bodies_and_may_only_be_used_as_part_of_a_class_member_declaration_property_access_or_on_the_left_hand_side_of_an_in_expression);
-            }
-            if (!getSymbolForPrivateIdentifierExpression(privId)) {
-                return grammarErrorOnNode(privId, ts.Diagnostics.Cannot_find_name_0, ts.idText(privId));
+            if (!ts.isForInStatement(privId.parent)) {
+                if (!ts.isExpressionNode(privId)) {
+                    return grammarErrorOnNode(privId, ts.Diagnostics.Private_identifiers_are_only_allowed_in_class_bodies_and_may_only_be_used_as_part_of_a_class_member_declaration_property_access_or_on_the_left_hand_side_of_an_in_expression);
+                }
+                var isInOperation = ts.isBinaryExpression(privId.parent) && privId.parent.operatorToken.kind === 101 /* InKeyword */;
+                if (!getSymbolForPrivateIdentifierExpression(privId) && !isInOperation) {
+                    return grammarErrorOnNode(privId, ts.Diagnostics.Cannot_find_name_0, ts.idText(privId));
+                }
             }
             return false;
         }
@@ -82514,7 +82530,7 @@ var ts;
                 if (memberSymbol) {
                     var declaration = memberSymbol.valueDeclaration;
                     if (declaration !== member) {
-                        if (declaration && isBlockScopedNameDeclaredBeforeUse(declaration, member)) {
+                        if (declaration && isBlockScopedNameDeclaredBeforeUse(declaration, member) && ts.isEnumDeclaration(declaration.parent)) {
                             return getEnumMemberValue(declaration);
                         }
                         error(expr, ts.Diagnostics.A_member_initializer_in_a_enum_declaration_cannot_reference_members_declared_after_it_including_members_defined_in_other_enums);
@@ -85887,7 +85903,7 @@ var ts;
                 if (prop.kind === 295 /* ShorthandPropertyAssignment */ && !inDestructuring && prop.objectAssignmentInitializer) {
                     // having objectAssignmentInitializer is only valid in ObjectAssignmentPattern
                     // outside of destructuring it is a syntax error
-                    return grammarErrorOnNode(prop.equalsToken, ts.Diagnostics.Did_you_mean_to_use_a_Colon_An_can_only_follow_a_property_name_when_the_containing_object_literal_is_part_of_a_destructuring_pattern);
+                    grammarErrorOnNode(prop.equalsToken, ts.Diagnostics.Did_you_mean_to_use_a_Colon_An_can_only_follow_a_property_name_when_the_containing_object_literal_is_part_of_a_destructuring_pattern);
                 }
                 if (name.kind === 80 /* PrivateIdentifier */) {
                     grammarErrorOnNode(name, ts.Diagnostics.Private_identifiers_are_not_allowed_outside_class_bodies);
@@ -91851,7 +91867,7 @@ var ts;
         var compilerOptions = context.getCompilerOptions();
         var languageVersion = ts.getEmitScriptTarget(compilerOptions);
         var useDefineForClassFields = ts.getUseDefineForClassFields(compilerOptions);
-        var shouldTransformPrivateElementsOrClassStaticBlocks = languageVersion < 99 /* ESNext */;
+        var shouldTransformPrivateElementsOrClassStaticBlocks = languageVersion < 9 /* ES2022 */;
         // We don't need to transform `super` property access when targeting ES5, ES3 because
         // the es2015 transformation handles those.
         var shouldTransformSuperInStaticInitializers = (languageVersion <= 8 /* ES2021 */ || !useDefineForClassFields) && languageVersion >= 2 /* ES2015 */;
@@ -91881,7 +91897,7 @@ var ts;
         function transformSourceFile(node) {
             var options = context.getCompilerOptions();
             if (node.isDeclarationFile
-                || useDefineForClassFields && ts.getEmitScriptTarget(options) === 99 /* ESNext */) {
+                || useDefineForClassFields && ts.getEmitScriptTarget(options) >= 9 /* ES2022 */) {
                 return node;
             }
             var visited = ts.visitEachChild(node, visitor, context);
@@ -92638,7 +92654,7 @@ var ts;
             if (useDefineForClassFields) {
                 // If we are using define semantics and targeting ESNext or higher,
                 // then we don't need to transform any class properties.
-                return languageVersion < 99 /* ESNext */;
+                return languageVersion < 9 /* ES2022 */;
             }
             return ts.isInitializedProperty(member) || shouldTransformPrivateElementsOrClassStaticBlocks && ts.isPrivateIdentifierClassElementDeclaration(member);
         }

package/package.json

@@ -2,7 +2,7 @@
     "name": "typescript",
     "author": "Microsoft Corp.",
     "homepage": "https://www.typescriptlang.org/",
-    "version": "4.6.0-dev.20211213",
+    "version": "4.6.0-dev.20211218",
     "license": "Apache-2.0",
     "description": "TypeScript is a language for application scale JavaScript development",
     "keywords": [