typescript 4.6.0-dev.20211214 → 4.6.0-dev.20211219

package/lib/lib.es2020.intl.d.ts

@@ -319,7 +319,7 @@ declare namespace Intl {
          *
          * [MDN](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/DisplayNames/of).
          */
-        of(code: string): string;
+        of(code: string): string | undefined;
         /**
          * Returns a new object with properties reflecting the locale and style formatting options computed during the construction of the current
          * [`Intl/DisplayNames`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/DisplayNames) object.

package/lib/tsc.js

@@ -69,7 +69,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 var ts;
 (function (ts) {
     ts.versionMajorMinor = "4.6";
-    ts.version = ts.versionMajorMinor + ".0-dev.20211214";
+    ts.version = ts.versionMajorMinor + ".0-dev.20211219";
     var NativeCollections;
     (function (NativeCollections) {
         function tryGetNativeMap() {
@@ -15608,7 +15608,7 @@ var ts;
     }
     ts.getAllowJSCompilerOption = getAllowJSCompilerOption;
     function getUseDefineForClassFields(compilerOptions) {
-        return compilerOptions.useDefineForClassFields === undefined ? getEmitScriptTarget(compilerOptions) === 99 : compilerOptions.useDefineForClassFields;
+        return compilerOptions.useDefineForClassFields === undefined ? getEmitScriptTarget(compilerOptions) >= 9 : compilerOptions.useDefineForClassFields;
     }
     ts.getUseDefineForClassFields = getUseDefineForClassFields;
     function compilerOptionsAffectSemanticDiagnostics(newOptions, oldOptions) {
@@ -27016,7 +27016,7 @@ var ts;
                                     return true;
                             }
                         }
-                        else if (third === 27) {
+                        else if (third === 27 || third === 63) {
                             return true;
                         }
                         return false;
@@ -45769,7 +45769,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);
@@ -45783,8 +45784,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;
@@ -47518,8 +47519,14 @@ var ts;
             }
             return type;
         }
+        function isMappedTypeGenericIndexedAccess(type) {
+            return type.flags & 8388608 && ts.getObjectFlags(type.objectType) & 32 &&
+                !isGenericMappedType(type.objectType) && isGenericIndexType(type.indexType);
+        }
         function getApparentType(type) {
-            var t = type.flags & 465829888 ? getBaseConstraintOfType(type) || unknownType : type;
+            var t = !(type.flags & 465829888) ? type :
+                isMappedTypeGenericIndexedAccess(type) ? substituteIndexedMappedType(type.objectType, type.indexType) :
+                    getBaseConstraintOfType(type) || unknownType;
             return ts.getObjectFlags(t) & 32 ? getApparentTypeOfMappedType(t) :
                 t.flags & 2097152 ? getApparentTypeOfIntersectionType(t) :
                     t.flags & 402653316 ? globalStringType :
@@ -48052,6 +48059,8 @@ var ts;
                     case 205:
                     case 206:
                         return traverse(node.expression);
+                    case 294:
+                        return traverse(node.initializer);
                     default:
                         return !ts.nodeStartsNewLexicalEnvironment(node) && !ts.isPartOfTypeNode(node) && !!ts.forEachChild(node, traverse);
                 }
@@ -55554,12 +55563,14 @@ var ts;
                     target = getActualTypeVariable(target);
                 }
                 if (target.flags & 8650752) {
-                    if (ts.getObjectFlags(source) & 524288 || source === nonInferrableAnyType || source === silentNeverType ||
-                        (priority & 128 && (source === autoType || source === autoArrayType)) || isFromInferenceBlockedSource(source)) {
+                    if (source === nonInferrableAnyType || source === silentNeverType || (priority & 128 && (source === autoType || source === autoArrayType)) || isFromInferenceBlockedSource(source)) {
                         return;
                     }
                     var inference = getInferenceInfoForType(target);
                     if (inference) {
+                        if (ts.getObjectFlags(source) & 524288) {
+                            return;
+                        }
                         if (!inference.isFixed) {
                             if (inference.priority === undefined || priority < inference.priority) {
                                 inference.candidates = undefined;
@@ -55588,18 +55599,16 @@ var ts;
                         inferencePriority = Math.min(inferencePriority, priority);
                         return;
                     }
-                    else {
-                        var simplified = getSimplifiedType(target, false);
-                        if (simplified !== target) {
-                            invokeOnce(source, simplified, inferFromTypes);
-                        }
-                        else if (target.flags & 8388608) {
-                            var indexType = getSimplifiedType(target.indexType, false);
-                            if (indexType.flags & 465829888) {
-                                var simplified_1 = distributeIndexOverObjectType(getSimplifiedType(target.objectType, false), indexType, false);
-                                if (simplified_1 && simplified_1 !== target) {
-                                    invokeOnce(source, simplified_1, inferFromTypes);
-                                }
+                    var simplified = getSimplifiedType(target, false);
+                    if (simplified !== target) {
+                        inferFromTypes(source, simplified);
+                    }
+                    else if (target.flags & 8388608) {
+                        var indexType = getSimplifiedType(target.indexType, false);
+                        if (indexType.flags & 465829888) {
+                            var simplified_1 = distributeIndexOverObjectType(getSimplifiedType(target.objectType, false), indexType, false);
+                            if (simplified_1 && simplified_1 !== target) {
+                                inferFromTypes(source, simplified_1);
                             }
                         }
                     }
@@ -58116,7 +58125,7 @@ var ts;
             var substituteConstraints = !(checkMode && checkMode & 2) &&
                 someType(type, isGenericTypeWithUnionConstraint) &&
                 (isConstraintPosition(type, reference) || hasNonBindingPatternContextualTypeWithNoGenericTypes(reference));
-            return substituteConstraints ? mapType(type, function (t) { return t.flags & 465829888 ? getBaseConstraintOrType(t) : t; }) : type;
+            return substituteConstraints ? mapType(type, function (t) { return t.flags & 465829888 && !isMappedTypeGenericIndexedAccess(t) ? getBaseConstraintOrType(t) : t; }) : type;
         }
         function isExportOrExportExpression(location) {
             return !!ts.findAncestor(location, function (n) {
@@ -60563,11 +60572,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;
+                if (!getSymbolForPrivateIdentifierExpression(privId) && !isInOperation) {
+                    return grammarErrorOnNode(privId, ts.Diagnostics.Cannot_find_name_0, ts.idText(privId));
+                }
             }
             return false;
         }
@@ -72182,7 +72194,7 @@ var ts;
                     checkGrammarComputedPropertyName(name);
                 }
                 if (prop.kind === 295 && !inDestructuring && prop.objectAssignmentInitializer) {
-                    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) {
                     grammarErrorOnNode(name, ts.Diagnostics.Private_identifiers_are_not_allowed_outside_class_bodies);
@@ -76686,7 +76698,7 @@ var ts;
         var compilerOptions = context.getCompilerOptions();
         var languageVersion = ts.getEmitScriptTarget(compilerOptions);
         var useDefineForClassFields = ts.getUseDefineForClassFields(compilerOptions);
-        var shouldTransformPrivateElementsOrClassStaticBlocks = languageVersion < 99;
+        var shouldTransformPrivateElementsOrClassStaticBlocks = languageVersion < 9;
         var shouldTransformSuperInStaticInitializers = (languageVersion <= 8 || !useDefineForClassFields) && languageVersion >= 2;
         var shouldTransformThisInStaticInitializers = languageVersion <= 8 || !useDefineForClassFields;
         var previousOnSubstituteNode = context.onSubstituteNode;
@@ -76706,7 +76718,7 @@ var ts;
         function transformSourceFile(node) {
             var options = context.getCompilerOptions();
             if (node.isDeclarationFile
-                || useDefineForClassFields && ts.getEmitScriptTarget(options) === 99) {
+                || useDefineForClassFields && ts.getEmitScriptTarget(options) >= 9) {
                 return node;
             }
             var visited = ts.visitEachChild(node, visitor, context);
@@ -77376,7 +77388,7 @@ var ts;
                 return false;
             }
             if (useDefineForClassFields) {
-                return languageVersion < 99;
+                return languageVersion < 9;
             }
             return ts.isInitializedProperty(member) || shouldTransformPrivateElementsOrClassStaticBlocks && ts.isPrivateIdentifierClassElementDeclaration(member);
         }

package/lib/tsserver.js

@@ -100,7 +100,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.20211214";
+    ts.version = ts.versionMajorMinor + ".0-dev.20211219";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -19716,7 +19716,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) {
@@ -33531,7 +33531,7 @@ var ts;
                                     return true;
                             }
                         }
-                        else if (third === 27 /* CommaToken */) {
+                        else if (third === 27 /* CommaToken */ || third === 63 /* EqualsToken */) {
                             return true;
                         }
                         return false;
@@ -55397,7 +55397,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);
@@ -55419,8 +55420,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;
@@ -57425,13 +57426,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 :
@@ -58047,6 +58058,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);
                 }
@@ -66616,12 +66629,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;
@@ -66652,21 +66667,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);
                             }
                         }
                     }
@@ -69536,7 +69549,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) {
@@ -72507,11 +72520,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;
         }
@@ -85898,7 +85914,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);
@@ -91862,7 +91878,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 */;
@@ -91892,7 +91908,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);
@@ -92649,7 +92665,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);
         }
@@ -123110,13 +123126,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)) {

package/lib/tsserverlibrary.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.20211214";
+    ts.version = ts.versionMajorMinor + ".0-dev.20211219";
     /* @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);
                 }
@@ -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;
         }
@@ -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)) {