typescript 4.6.0-dev.20220125 → 4.6.0-dev.20220129

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.20220125";
+    ts.version = ts.versionMajorMinor + ".0-dev.20220129";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -7844,7 +7844,7 @@ var ts;
     }
 })(ts || (ts = {}));
 // <auto-generated />
-// generated from './diagnosticInformationMap.generated.ts' by 'src/compiler'
+// generated from './diagnosticMessages.json' in 'src/compiler'
 /* @internal */
 var ts;
 (function (ts) {
@@ -9432,9 +9432,8 @@ var ts;
         Remove_variable_statement: diag(90010, ts.DiagnosticCategory.Message, "Remove_variable_statement_90010", "Remove variable statement"),
         Remove_template_tag: diag(90011, ts.DiagnosticCategory.Message, "Remove_template_tag_90011", "Remove template tag"),
         Remove_type_parameters: diag(90012, ts.DiagnosticCategory.Message, "Remove_type_parameters_90012", "Remove type parameters"),
-        Import_0_from_module_1: diag(90013, ts.DiagnosticCategory.Message, "Import_0_from_module_1_90013", "Import '{0}' from module \"{1}\""),
+        Import_0_from_1: diag(90013, ts.DiagnosticCategory.Message, "Import_0_from_1_90013", "Import '{0}' from \"{1}\""),
         Change_0_to_1: diag(90014, ts.DiagnosticCategory.Message, "Change_0_to_1_90014", "Change '{0}' to '{1}'"),
-        Add_0_to_existing_import_declaration_from_1: diag(90015, ts.DiagnosticCategory.Message, "Add_0_to_existing_import_declaration_from_1_90015", "Add '{0}' to existing import declaration from \"{1}\""),
         Declare_property_0: diag(90016, ts.DiagnosticCategory.Message, "Declare_property_0_90016", "Declare property '{0}'"),
         Add_index_signature_for_property_0: diag(90017, ts.DiagnosticCategory.Message, "Add_index_signature_for_property_0_90017", "Add index signature for property '{0}'"),
         Disable_checking_for_this_file: diag(90018, ts.DiagnosticCategory.Message, "Disable_checking_for_this_file_90018", "Disable checking for this file"),
@@ -9451,8 +9450,6 @@ var ts;
         Add_async_modifier_to_containing_function: diag(90029, ts.DiagnosticCategory.Message, "Add_async_modifier_to_containing_function_90029", "Add async modifier to containing function"),
         Replace_infer_0_with_unknown: diag(90030, ts.DiagnosticCategory.Message, "Replace_infer_0_with_unknown_90030", "Replace 'infer {0}' with 'unknown'"),
         Replace_all_unused_infer_with_unknown: diag(90031, ts.DiagnosticCategory.Message, "Replace_all_unused_infer_with_unknown_90031", "Replace all unused 'infer' with 'unknown'"),
-        Import_default_0_from_module_1: diag(90032, ts.DiagnosticCategory.Message, "Import_default_0_from_module_1_90032", "Import default '{0}' from module \"{1}\""),
-        Add_default_import_0_to_existing_import_declaration_from_1: diag(90033, ts.DiagnosticCategory.Message, "Add_default_import_0_to_existing_import_declaration_from_1_90033", "Add default import '{0}' to existing import declaration from \"{1}\""),
         Add_parameter_name: diag(90034, ts.DiagnosticCategory.Message, "Add_parameter_name_90034", "Add parameter name"),
         Declare_private_property_0: diag(90035, ts.DiagnosticCategory.Message, "Declare_private_property_0_90035", "Declare private property '{0}'"),
         Replace_0_with_Promise_1: diag(90036, ts.DiagnosticCategory.Message, "Replace_0_with_Promise_1_90036", "Replace '{0}' with 'Promise<{1}>'"),
@@ -9462,6 +9459,10 @@ var ts;
         Remove_unused_declarations_for_Colon_0: diag(90041, ts.DiagnosticCategory.Message, "Remove_unused_declarations_for_Colon_0_90041", "Remove unused declarations for: '{0}'"),
         Declare_a_private_field_named_0: diag(90053, ts.DiagnosticCategory.Message, "Declare_a_private_field_named_0_90053", "Declare a private field named '{0}'."),
         Includes_imports_of_types_referenced_by_0: diag(90054, ts.DiagnosticCategory.Message, "Includes_imports_of_types_referenced_by_0_90054", "Includes imports of types referenced by '{0}'"),
+        Remove_type_from_import_declaration_from_0: diag(90055, ts.DiagnosticCategory.Message, "Remove_type_from_import_declaration_from_0_90055", "Remove 'type' from import declaration from \"{0}\""),
+        Remove_type_from_import_of_0_from_1: diag(90056, ts.DiagnosticCategory.Message, "Remove_type_from_import_of_0_from_1_90056", "Remove 'type' from import of '{0}' from \"{1}\""),
+        Add_import_from_0: diag(90057, ts.DiagnosticCategory.Message, "Add_import_from_0_90057", "Add import from \"{0}\""),
+        Update_import_from_0: diag(90058, ts.DiagnosticCategory.Message, "Update_import_from_0_90058", "Update import from \"{0}\""),
         Convert_function_to_an_ES2015_class: diag(95001, ts.DiagnosticCategory.Message, "Convert_function_to_an_ES2015_class_95001", "Convert function to an ES2015 class"),
         Convert_0_to_1_in_0: diag(95003, ts.DiagnosticCategory.Message, "Convert_0_to_1_in_0_95003", "Convert '{0}' to '{1} in {0}'"),
         Extract_to_0_in_1: diag(95004, ts.DiagnosticCategory.Message, "Extract_to_0_in_1_95004", "Extract to {0} in {1}"),
@@ -14052,10 +14053,13 @@ var ts;
     function packageIdIsEqual(a, b) {
         return a === b || !!a && !!b && a.name === b.name && a.subModuleName === b.subModuleName && a.version === b.version;
     }
-    function packageIdToString(_a) {
-        var name = _a.name, subModuleName = _a.subModuleName, version = _a.version;
-        var fullName = subModuleName ? name + "/" + subModuleName : name;
-        return fullName + "@" + version;
+    function packageIdToPackageName(_a) {
+        var name = _a.name, subModuleName = _a.subModuleName;
+        return subModuleName ? name + "/" + subModuleName : name;
+    }
+    ts.packageIdToPackageName = packageIdToPackageName;
+    function packageIdToString(packageId) {
+        return packageIdToPackageName(packageId) + "@" + packageId.version;
     }
     ts.packageIdToString = packageIdToString;
     function typeDirectiveIsEqualTo(oldResolution, newResolution) {
@@ -14888,6 +14892,15 @@ var ts;
         };
     }
     ts.createDiagnosticForFileFromMessageChain = createDiagnosticForFileFromMessageChain;
+    function createDiagnosticMessageChainFromDiagnostic(diagnostic) {
+        return typeof diagnostic.messageText === "string" ? {
+            code: diagnostic.code,
+            category: diagnostic.category,
+            messageText: diagnostic.messageText,
+            next: diagnostic.next,
+        } : diagnostic.messageText;
+    }
+    ts.createDiagnosticMessageChainFromDiagnostic = createDiagnosticMessageChainFromDiagnostic;
     function createDiagnosticForRange(sourceFile, range, message) {
         return {
             file: sourceFile,
@@ -15056,7 +15069,8 @@ var ts;
             node.kind === 212 /* FunctionExpression */ ||
             node.kind === 213 /* ArrowFunction */ ||
             node.kind === 211 /* ParenthesizedExpression */ ||
-            node.kind === 253 /* VariableDeclaration */) ?
+            node.kind === 253 /* VariableDeclaration */ ||
+            node.kind === 274 /* ExportSpecifier */) ?
             ts.concatenate(ts.getTrailingCommentRanges(text, node.pos), ts.getLeadingCommentRanges(text, node.pos)) :
             ts.getLeadingCommentRanges(text, node.pos);
         // True if the comment starts with '/**' but not if it is '/**/'
@@ -20847,6 +20861,59 @@ var ts;
         return !!(type.flags & 262144 /* TypeParameter */ && type.isThisType);
     }
     ts.isThisTypeParameter = isThisTypeParameter;
+    function getNodeModulePathParts(fullPath) {
+        // If fullPath can't be valid module file within node_modules, returns undefined.
+        // Example of expected pattern: /base/path/node_modules/[@scope/otherpackage/@otherscope/node_modules/]package/[subdirectory/]file.js
+        // Returns indices:                       ^            ^                                                      ^             ^
+        var topLevelNodeModulesIndex = 0;
+        var topLevelPackageNameIndex = 0;
+        var packageRootIndex = 0;
+        var fileNameIndex = 0;
+        var States;
+        (function (States) {
+            States[States["BeforeNodeModules"] = 0] = "BeforeNodeModules";
+            States[States["NodeModules"] = 1] = "NodeModules";
+            States[States["Scope"] = 2] = "Scope";
+            States[States["PackageContent"] = 3] = "PackageContent";
+        })(States || (States = {}));
+        var partStart = 0;
+        var partEnd = 0;
+        var state = 0 /* BeforeNodeModules */;
+        while (partEnd >= 0) {
+            partStart = partEnd;
+            partEnd = fullPath.indexOf("/", partStart + 1);
+            switch (state) {
+                case 0 /* BeforeNodeModules */:
+                    if (fullPath.indexOf(ts.nodeModulesPathPart, partStart) === partStart) {
+                        topLevelNodeModulesIndex = partStart;
+                        topLevelPackageNameIndex = partEnd;
+                        state = 1 /* NodeModules */;
+                    }
+                    break;
+                case 1 /* NodeModules */:
+                case 2 /* Scope */:
+                    if (state === 1 /* NodeModules */ && fullPath.charAt(partStart + 1) === "@") {
+                        state = 2 /* Scope */;
+                    }
+                    else {
+                        packageRootIndex = partEnd;
+                        state = 3 /* PackageContent */;
+                    }
+                    break;
+                case 3 /* PackageContent */:
+                    if (fullPath.indexOf(ts.nodeModulesPathPart, partStart) === partStart) {
+                        state = 1 /* NodeModules */;
+                    }
+                    else {
+                        state = 3 /* PackageContent */;
+                    }
+                    break;
+            }
+        }
+        fileNameIndex = partStart;
+        return state > 1 /* NodeModules */ ? { topLevelNodeModulesIndex: topLevelNodeModulesIndex, topLevelPackageNameIndex: topLevelPackageNameIndex, packageRootIndex: packageRootIndex, fileNameIndex: fileNameIndex } : undefined;
+    }
+    ts.getNodeModulePathParts = getNodeModulePathParts;
 })(ts || (ts = {}));
 /* @internal */
 var ts;
@@ -36207,7 +36274,8 @@ var ts;
             return finishNode(node, pos);
         }
         function parseExportSpecifier() {
-            return parseImportOrExportSpecifier(274 /* ExportSpecifier */);
+            var hasJSDoc = hasPrecedingJSDocComment();
+            return withJSDoc(parseImportOrExportSpecifier(274 /* ExportSpecifier */), hasJSDoc);
         }
         function parseImportSpecifier() {
             return parseImportOrExportSpecifier(269 /* ImportSpecifier */);
@@ -43412,14 +43480,12 @@ var ts;
     }
     var binder = createBinder();
     function bindSourceFile(file, options) {
-        ts.tracing === null || ts.tracing === void 0 ? void 0 : ts.tracing.push("bind" /* Bind */, "bindSourceFile", { path: file.path }, /*separateBeginAndEnd*/ true);
         ts.performance.mark("beforeBind");
         ts.perfLogger.logStartBindFile("" + file.fileName);
         binder(file, options);
         ts.perfLogger.logStopBindFile();
         ts.performance.mark("afterBind");
         ts.performance.measure("Bind", "beforeBind", "afterBind");
-        ts.tracing === null || ts.tracing === void 0 ? void 0 : ts.tracing.pop();
     }
     ts.bindSourceFile = bindSourceFile;
     function createBinder() {
@@ -43479,7 +43545,9 @@ var ts;
             ts.Debug.attachFlowNodeDebugInfo(unreachableFlow);
             ts.Debug.attachFlowNodeDebugInfo(reportedUnreachableFlow);
             if (!file.locals) {
+                ts.tracing === null || ts.tracing === void 0 ? void 0 : ts.tracing.push("bind" /* Bind */, "bindSourceFile", { path: file.path }, /*separateBeginAndEnd*/ true);
                 bind(file);
+                ts.tracing === null || ts.tracing === void 0 ? void 0 : ts.tracing.pop();
                 file.symbolCount = symbolCount;
                 file.classifiableNames = classifiableNames;
                 delayedBindJSDocTypedefTag();
@@ -47746,6 +47814,9 @@ var ts;
             suggestionDiagnostics.add(diagnostic);
             return diagnostic;
         }
+        function isDeprecatedSymbol(symbol) {
+            return !!(getDeclarationNodeFlagsFromSymbol(symbol) & 134217728 /* Deprecated */);
+        }
         function addDeprecatedSuggestion(location, declarations, deprecatedEntity) {
             var diagnostic = ts.createDiagnosticForNode(location, ts.Diagnostics._0_is_deprecated, deprecatedEntity);
             return addDeprecatedSuggestionWorker(declarations, diagnostic);
@@ -48737,24 +48808,19 @@ var ts;
                         error(errorLocation, ts.Diagnostics.Parameter_0_cannot_reference_identifier_1_declared_after_it, ts.declarationNameToString(associatedDeclarationForContainingInitializerOrBindingName.name), ts.declarationNameToString(errorLocation));
                     }
                 }
-                if (result && errorLocation && meaning & 111551 /* Value */ && result.flags & 2097152 /* Alias */) {
-                    checkSymbolUsageInExpressionContext(result, name, errorLocation);
+                if (result && errorLocation && meaning & 111551 /* Value */ && result.flags & 2097152 /* Alias */ && !(result.flags & 111551 /* Value */) && !ts.isValidTypeOnlyAliasUseSite(errorLocation)) {
+                    var typeOnlyDeclaration = getTypeOnlyAliasDeclaration(result);
+                    if (typeOnlyDeclaration) {
+                        var message = typeOnlyDeclaration.kind === 274 /* ExportSpecifier */
+                            ? ts.Diagnostics._0_cannot_be_used_as_a_value_because_it_was_exported_using_export_type
+                            : ts.Diagnostics._0_cannot_be_used_as_a_value_because_it_was_imported_using_import_type;
+                        var unescapedName = ts.unescapeLeadingUnderscores(name);
+                        addTypeOnlyDeclarationRelatedInfo(error(errorLocation, message, unescapedName), typeOnlyDeclaration, unescapedName);
+                    }
                 }
             }
             return result;
         }
-        function checkSymbolUsageInExpressionContext(symbol, name, useSite) {
-            if (!ts.isValidTypeOnlyAliasUseSite(useSite)) {
-                var typeOnlyDeclaration = getTypeOnlyAliasDeclaration(symbol);
-                if (typeOnlyDeclaration) {
-                    var message = typeOnlyDeclaration.kind === 274 /* ExportSpecifier */
-                        ? ts.Diagnostics._0_cannot_be_used_as_a_value_because_it_was_exported_using_export_type
-                        : ts.Diagnostics._0_cannot_be_used_as_a_value_because_it_was_imported_using_import_type;
-                    var unescapedName = ts.unescapeLeadingUnderscores(name);
-                    addTypeOnlyDeclarationRelatedInfo(error(useSite, message, unescapedName), typeOnlyDeclaration, unescapedName);
-                }
-            }
-        }
         function addTypeOnlyDeclarationRelatedInfo(diagnostic, typeOnlyDeclaration, unescapedName) {
             if (!typeOnlyDeclaration)
                 return diagnostic;
@@ -52516,7 +52582,8 @@ var ts;
                         includePrivateSymbol === null || includePrivateSymbol === void 0 ? void 0 : includePrivateSymbol(sym);
                     }
                     if (ts.isIdentifier(node)) {
-                        var name = sym.flags & 262144 /* TypeParameter */ ? typeParameterToName(getDeclaredTypeOfSymbol(sym), context) : ts.factory.cloneNode(node);
+                        var type = getDeclaredTypeOfSymbol(sym);
+                        var name = sym.flags & 262144 /* TypeParameter */ && !isTypeSymbolAccessible(type.symbol, context.enclosingDeclaration) ? typeParameterToName(type, context) : ts.factory.cloneNode(node);
                         name.symbol = sym; // for quickinfo, which uses identifier symbol information
                         return { introducesError: introducesError, node: ts.setEmitFlags(ts.setOriginalNode(name, node), 16777216 /* NoAsciiEscaping */) };
                     }
@@ -60532,7 +60599,7 @@ var ts;
                 }
                 var prop = getPropertyOfType(objectType, propName);
                 if (prop) {
-                    if (accessFlags & 64 /* ReportDeprecated */ && accessNode && prop.declarations && getDeclarationNodeFlagsFromSymbol(prop) & 134217728 /* Deprecated */ && isUncalledFunctionReference(accessNode, prop)) {
+                    if (accessFlags & 64 /* ReportDeprecated */ && accessNode && prop.declarations && isDeprecatedSymbol(prop) && isUncalledFunctionReference(accessNode, prop)) {
                         var deprecatedNode = (_a = accessExpression === null || accessExpression === void 0 ? void 0 : accessExpression.argumentExpression) !== null && _a !== void 0 ? _a : (ts.isIndexedAccessTypeNode(accessNode) ? accessNode.indexType : accessNode);
                         addDeprecatedSuggestion(deprecatedNode, prop.declarations, propName);
                     }
@@ -69935,9 +70002,9 @@ var ts;
                 markAliasReferenced(symbol, node);
             }
             var localOrExportSymbol = getExportSymbolOfValueSymbolIfExported(symbol);
-            var sourceSymbol = localOrExportSymbol.flags & 2097152 /* Alias */ ? resolveAlias(localOrExportSymbol) : localOrExportSymbol;
-            if (sourceSymbol.declarations && getDeclarationNodeFlagsFromSymbol(sourceSymbol) & 134217728 /* Deprecated */ && isUncalledFunctionReference(node, sourceSymbol)) {
-                addDeprecatedSuggestion(node, sourceSymbol.declarations, node.escapedText);
+            var targetSymbol = checkDeprecatedAliasedSymbol(localOrExportSymbol, node);
+            if (isDeprecatedSymbol(targetSymbol) && isUncalledFunctionReference(node, targetSymbol) && targetSymbol.declarations) {
+                addDeprecatedSuggestion(node, targetSymbol.declarations, node.escapedText);
             }
             var declaration = localOrExportSymbol.valueDeclaration;
             if (declaration && localOrExportSymbol.flags & 32 /* Class */) {
@@ -72949,7 +73016,7 @@ var ts;
                 }
             }
             else {
-                if (prop.declarations && getDeclarationNodeFlagsFromSymbol(prop) & 134217728 /* Deprecated */ && isUncalledFunctionReference(node, prop)) {
+                if (isDeprecatedSymbol(prop) && isUncalledFunctionReference(node, prop) && prop.declarations) {
                     addDeprecatedSuggestion(right, prop.declarations, right.escapedText);
                 }
                 checkPropertyNotUsedBeforeDeclaration(prop, node, right);
@@ -74408,7 +74475,7 @@ var ts;
                         }
                         var diags_3 = max > 1 ? allDiagnostics[minIndex] : ts.flatten(allDiagnostics);
                         ts.Debug.assert(diags_3.length > 0, "No errors reported for 3 or fewer overload signatures");
-                        var chain = ts.chainDiagnosticMessages(ts.map(diags_3, function (d) { return typeof d.messageText === "string" ? d : d.messageText; }), ts.Diagnostics.No_overload_matches_this_call);
+                        var chain = ts.chainDiagnosticMessages(ts.map(diags_3, ts.createDiagnosticMessageChainFromDiagnostic), ts.Diagnostics.No_overload_matches_this_call);
                         // The below is a spread to guarantee we get a new (mutable) array - our `flatMap` helper tries to do "smart" optimizations where it reuses input
                         // arrays and the emptyArray singleton where possible, which is decidedly not what we want while we're still constructing this diagnostic
                         var related = __spreadArray([], ts.flatMap(diags_3, function (d) { return d.relatedInformation; }), true);
@@ -82787,16 +82854,15 @@ var ts;
                         return ts.nodeIsMissing(expr) ? 0 : evaluateEnumMember(expr, getSymbolOfNode(member.parent), identifier.escapedText);
                     case 206 /* ElementAccessExpression */:
                     case 205 /* PropertyAccessExpression */:
-                        var ex = expr;
-                        if (isConstantMemberAccess(ex)) {
-                            var type = getTypeOfExpression(ex.expression);
+                        if (isConstantMemberAccess(expr)) {
+                            var type = getTypeOfExpression(expr.expression);
                             if (type.symbol && type.symbol.flags & 384 /* Enum */) {
                                 var name = void 0;
-                                if (ex.kind === 205 /* PropertyAccessExpression */) {
-                                    name = ex.name.escapedText;
+                                if (expr.kind === 205 /* PropertyAccessExpression */) {
+                                    name = expr.name.escapedText;
                                 }
                                 else {
-                                    name = ts.escapeLeadingUnderscores(ts.cast(ex.argumentExpression, ts.isLiteralExpression).text);
+                                    name = ts.escapeLeadingUnderscores(ts.cast(expr.argumentExpression, ts.isLiteralExpression).text);
                                 }
                                 return evaluateEnumMember(expr, type.symbol, name);
                             }
@@ -82824,6 +82890,10 @@ var ts;
             }
         }
         function isConstantMemberAccess(node) {
+            var type = getTypeOfExpression(node);
+            if (type === errorType) {
+                return false;
+            }
             return node.kind === 79 /* Identifier */ ||
                 node.kind === 205 /* PropertyAccessExpression */ && isConstantMemberAccess(node.expression) ||
                 node.kind === 206 /* ElementAccessExpression */ && isConstantMemberAccess(node.expression) &&
@@ -83118,7 +83188,6 @@ var ts;
             return true;
         }
         function checkAliasSymbol(node) {
-            var _a;
             var symbol = getSymbolOfNode(node);
             var target = resolveAlias(symbol);
             if (target !== unknownSymbol) {
@@ -83174,10 +83243,45 @@ var ts;
                         }
                     }
                 }
-                if (ts.isImportSpecifier(node) && ((_a = target.declarations) === null || _a === void 0 ? void 0 : _a.every(function (d) { return !!(ts.getCombinedNodeFlags(d) & 134217728 /* Deprecated */); }))) {
-                    addDeprecatedSuggestion(node.name, target.declarations, symbol.escapedName);
+                if (ts.isImportSpecifier(node)) {
+                    var targetSymbol = checkDeprecatedAliasedSymbol(symbol, node);
+                    if (isDeprecatedAliasedSymbol(targetSymbol) && targetSymbol.declarations) {
+                        addDeprecatedSuggestion(node, targetSymbol.declarations, targetSymbol.escapedName);
+                    }
+                }
+            }
+        }
+        function isDeprecatedAliasedSymbol(symbol) {
+            return !!symbol.declarations && ts.every(symbol.declarations, function (d) { return !!(ts.getCombinedNodeFlags(d) & 134217728 /* Deprecated */); });
+        }
+        function checkDeprecatedAliasedSymbol(symbol, location) {
+            if (!(symbol.flags & 2097152 /* Alias */))
+                return symbol;
+            var targetSymbol = resolveAlias(symbol);
+            if (targetSymbol === unknownSymbol)
+                return targetSymbol;
+            while (symbol.flags & 2097152 /* Alias */) {
+                var target = getImmediateAliasedSymbol(symbol);
+                if (target) {
+                    if (target === targetSymbol)
+                        break;
+                    if (target.declarations && ts.length(target.declarations)) {
+                        if (isDeprecatedAliasedSymbol(target)) {
+                            addDeprecatedSuggestion(location, target.declarations, target.escapedName);
+                            break;
+                        }
+                        else {
+                            if (symbol === targetSymbol)
+                                break;
+                            symbol = target;
+                        }
+                    }
+                }
+                else {
+                    break;
                 }
             }
+            return targetSymbol;
         }
         function checkImportBinding(node) {
             checkCollisionsForDeclarationName(node, node.name);
@@ -85613,7 +85717,7 @@ var ts;
             if (quickResult !== undefined) {
                 return quickResult;
             }
-            var lastStatic, lastDeclare, lastAsync, lastReadonly, lastOverride;
+            var lastStatic, lastDeclare, lastAsync, lastOverride;
             var flags = 0 /* None */;
             for (var _i = 0, _a = node.modifiers; _i < _a.length; _i++) {
                 var modifier = _a[_i];
@@ -85717,7 +85821,6 @@ var ts;
                             return grammarErrorOnNode(modifier, ts.Diagnostics.readonly_modifier_can_only_appear_on_a_property_declaration_or_index_signature);
                         }
                         flags |= 64 /* Readonly */;
-                        lastReadonly = modifier;
                         break;
                     case 93 /* ExportKeyword */:
                         if (flags & 1 /* Export */) {
@@ -85830,18 +85933,12 @@ var ts;
                 if (flags & 32 /* Static */) {
                     return grammarErrorOnNode(lastStatic, ts.Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "static");
                 }
-                if (flags & 128 /* Abstract */) {
-                    return grammarErrorOnNode(lastStatic, ts.Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "abstract"); // TODO: GH#18217
-                }
                 if (flags & 16384 /* Override */) {
                     return grammarErrorOnNode(lastOverride, ts.Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "override"); // TODO: GH#18217
                 }
-                else if (flags & 256 /* Async */) {
+                if (flags & 256 /* Async */) {
                     return grammarErrorOnNode(lastAsync, ts.Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "async");
                 }
-                else if (flags & 64 /* Readonly */) {
-                    return grammarErrorOnNode(lastReadonly, ts.Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "readonly");
-                }
                 return false;
             }
             else if ((node.kind === 265 /* ImportDeclaration */ || node.kind === 264 /* ImportEqualsDeclaration */) && flags & 2 /* Ambient */) {
@@ -115836,14 +115933,14 @@ var ts;
                     redirectTargetsMap.add(fileFromPackageId.path, fileName);
                     addFileToFilesByName(dupFile, path, redirectedPath);
                     addFileIncludeReason(dupFile, reason);
-                    sourceFileToPackageName.set(path, packageId.name);
+                    sourceFileToPackageName.set(path, ts.packageIdToPackageName(packageId));
                     processingOtherFiles.push(dupFile);
                     return dupFile;
                 }
                 else if (file) {
                     // This is the first source file to have this packageId.
                     packageIdToSourceFile.set(packageIdKey, file);
-                    sourceFileToPackageName.set(path, packageId.name);
+                    sourceFileToPackageName.set(path, ts.packageIdToPackageName(packageId));
                 }
             }
             addFileToFilesByName(file, path, redirectedPath);
@@ -119982,7 +120079,7 @@ var ts;
             if (!host.fileExists || !host.readFile) {
                 return undefined;
             }
-            var parts = getNodeModulePathParts(path);
+            var parts = ts.getNodeModulePathParts(path);
             if (!parts) {
                 return undefined;
             }
@@ -120105,58 +120202,6 @@ var ts;
                 }
             }
         }
-        function getNodeModulePathParts(fullPath) {
-            // If fullPath can't be valid module file within node_modules, returns undefined.
-            // Example of expected pattern: /base/path/node_modules/[@scope/otherpackage/@otherscope/node_modules/]package/[subdirectory/]file.js
-            // Returns indices:                       ^            ^                                                      ^             ^
-            var topLevelNodeModulesIndex = 0;
-            var topLevelPackageNameIndex = 0;
-            var packageRootIndex = 0;
-            var fileNameIndex = 0;
-            var States;
-            (function (States) {
-                States[States["BeforeNodeModules"] = 0] = "BeforeNodeModules";
-                States[States["NodeModules"] = 1] = "NodeModules";
-                States[States["Scope"] = 2] = "Scope";
-                States[States["PackageContent"] = 3] = "PackageContent";
-            })(States || (States = {}));
-            var partStart = 0;
-            var partEnd = 0;
-            var state = 0 /* BeforeNodeModules */;
-            while (partEnd >= 0) {
-                partStart = partEnd;
-                partEnd = fullPath.indexOf("/", partStart + 1);
-                switch (state) {
-                    case 0 /* BeforeNodeModules */:
-                        if (fullPath.indexOf(ts.nodeModulesPathPart, partStart) === partStart) {
-                            topLevelNodeModulesIndex = partStart;
-                            topLevelPackageNameIndex = partEnd;
-                            state = 1 /* NodeModules */;
-                        }
-                        break;
-                    case 1 /* NodeModules */:
-                    case 2 /* Scope */:
-                        if (state === 1 /* NodeModules */ && fullPath.charAt(partStart + 1) === "@") {
-                            state = 2 /* Scope */;
-                        }
-                        else {
-                            packageRootIndex = partEnd;
-                            state = 3 /* PackageContent */;
-                        }
-                        break;
-                    case 3 /* PackageContent */:
-                        if (fullPath.indexOf(ts.nodeModulesPathPart, partStart) === partStart) {
-                            state = 1 /* NodeModules */;
-                        }
-                        else {
-                            state = 3 /* PackageContent */;
-                        }
-                        break;
-                }
-            }
-            fileNameIndex = partStart;
-            return state > 1 /* NodeModules */ ? { topLevelNodeModulesIndex: topLevelNodeModulesIndex, topLevelPackageNameIndex: topLevelPackageNameIndex, packageRootIndex: packageRootIndex, fileNameIndex: fileNameIndex } : undefined;
-        }
         function getPathRelativeToRootDirs(path, rootDirs, getCanonicalFileName) {
             return ts.firstDefined(rootDirs, function (rootDir) {
                 var relativePath = getRelativePathIfInDirectory(path, rootDir, getCanonicalFileName);

package/lib/zh-cn/diagnosticMessages.generated.json

@@ -89,7 +89,8 @@
   "A_set_accessor_must_have_exactly_one_parameter_1049": "\"set\" 访问器必须正好具有一个参数。",
   "A_set_accessor_parameter_cannot_have_an_initializer_1052": "\"set\" 访问器参数不能包含初始化表达式。",
   "A_spread_argument_must_either_have_a_tuple_type_or_be_passed_to_a_rest_parameter_2556": "扩张参数必须具有元组类型或传递给 rest 参数。",
-  "A_super_call_must_be_the_first_statement_in_the_constructor_when_a_class_contains_initialized_proper_2376": "当类包含初始化的属性、参数属性或专用标识符时，\"super\" 调用必须是构造函数中的第一个语句。",
+  "A_super_call_must_be_a_root_level_statement_within_a_constructor_of_a_derived_class_that_contains_in_2401": "“super” 调用必须是包含初始化属性、参数属性或专用标识符的派生类的构造函数中的根级语句。",
+  "A_super_call_must_be_the_first_statement_in_the_constructor_to_refer_to_super_or_this_when_a_derived_2376": "当派生类包含初始化属性、参数属性或专用标识符时，“super” 调用必须是构造函数中用来引用 “super” 或 “this” 的第一个语句。",
   "A_this_based_type_guard_is_not_compatible_with_a_parameter_based_type_guard_2518": "基于 \"this\" 的类型防护与基于参数的类型防护不兼容。",
   "A_this_type_is_available_only_in_a_non_static_member_of_a_class_or_interface_2526": "\"this\" 类型仅在类或接口的非静态成员中可用。",
   "A_tsconfig_json_file_is_already_defined_at_Colon_0_5054": "已在“{0}”中定义了 \"tsconfig.json\" 文件。",
@@ -227,7 +228,7 @@
   "An_iterator_must_have_a_next_method_2489": "迭代器必须具有 \"next()\" 方法。",
   "An_jsxFrag_pragma_is_required_when_using_an_jsx_pragma_with_JSX_fragments_17017": "将 @jsx 杂注与 JSX 片段一起使用时，需要使用 @jsxFrag 杂注。",
   "An_object_literal_cannot_have_multiple_get_Slashset_accessors_with_the_same_name_1118": "对象文字不能具有多个具有相同名称的 get/set 访问器。",
-  "An_object_literal_cannot_have_multiple_properties_with_the_same_name_in_strict_mode_1117": "严格模式下，对象文字不能包含多个具有相同名称的属性。",
+  "An_object_literal_cannot_have_multiple_properties_with_the_same_name_1117": "对象文本不能具有多个名称相同的属性。",
   "An_object_literal_cannot_have_property_and_accessor_with_the_same_name_1119": "对象文字不能包含具有相同名称的属性和访问器。",
   "An_object_member_cannot_be_declared_optional_1162": "对象成员无法声明为可选。",
   "An_optional_chain_cannot_contain_private_identifiers_18030": "可选链不能包含专用标识符。",
@@ -314,6 +315,7 @@
   "Cannot_find_name_0_Did_you_mean_1_2552": "找不到名称“{0}”。你是否指的是“{1}”?",
   "Cannot_find_name_0_Did_you_mean_the_instance_member_this_0_2663": "找不到名称“{0}”。你的意思是实例成员“this.{0}”?",
   "Cannot_find_name_0_Did_you_mean_the_static_member_1_0_2662": "找不到名称“{0}”。你的意思是静态成员“{1}.{0}”?",
+  "Cannot_find_name_0_Did_you_mean_to_write_this_in_an_async_function_2311": "找不到名称“{0}”。你是否要在异步函数中写入此内容?",
   "Cannot_find_name_0_Do_you_need_to_change_your_target_library_Try_changing_the_lib_compiler_option_to_2583": "找不到名称“{0}”。是否需要更改目标库? 请尝试将 “lib” 编译器选项更改为“{1}”或更高版本。",
   "Cannot_find_name_0_Do_you_need_to_change_your_target_library_Try_changing_the_lib_compiler_option_to_2584": "找不到名称“{0}”。是否需要更改目标库? 请尝试更改 “lib” 编译器选项以包括 “dom”。",
   "Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_a_test_runner_Try_npm_i_save_dev_type_2582": "找不到名称 \"{0}\"。是否需要安装测试运行器的类型定义? 请尝试使用 `npm i --save-dev @types/jest` 或 `npm i --save-dev @types/mocha`。",
@@ -387,6 +389,7 @@
   "Compiler_option_0_expects_an_argument_6044": "编译器选项“{0}”需要参数。",
   "Compiler_option_0_may_not_be_used_with_build_5094": "编译器选项“--{0}”不能与 “--build” 一起使用。",
   "Compiler_option_0_may_only_be_used_with_build_5093": "编译器选项“--{0}”只能与 “--build” 一起使用。",
+  "Compiler_option_0_of_value_1_is_unstable_Use_nightly_TypeScript_to_silence_this_error_Try_updating_w_4124": "值“{1}”的编译器选项“{0}”不稳定。使用夜间 TypeScript 消除此错误。请尝试使用 “npm install -D typescript@next” 进行更新。",
   "Compiler_option_0_requires_a_value_of_type_1_5024": "编译器选项“{0}”需要类型 {1} 的值。",
   "Compiler_reserves_name_0_when_emitting_private_identifier_downlevel_18027": "当发出专用标识符下层时，编译器会预留名称“{0}”。",
   "Compiles_the_TypeScript_project_located_at_the_specified_path_6927": "编译位于指定路径的 TypeScript 项目。",
@@ -565,7 +568,7 @@
   "Dynamic_import_s_specifier_must_be_of_type_string_but_here_has_type_0_7036": "动态导入的说明符类型必须是 \"string\"，但此处类型是 \"{0}\"。",
   "Dynamic_imports_are_only_supported_when_the_module_flag_is_set_to_es2020_es2022_esnext_commonjs_amd__1323": "仅当 '--module' 标志设置为 'es2020'、'es2022'、'esnext'、 'commonjs'、'amd'、'system'、'umd'、'node12' 或 'nodenext' 时，才支持动态导入。",
   "Dynamic_imports_can_only_accept_a_module_specifier_and_an_optional_assertion_as_arguments_1450": "动态导入只能接受模块说明符和可选断言作为参数",
-  "Dynamic_imports_only_support_a_second_argument_when_the_module_option_is_set_to_esnext_1324": "只有在 \"--module\" 选项设置为 \"esnext\" 时，动态导入才支持第二个参数。",
+  "Dynamic_imports_only_support_a_second_argument_when_the_module_option_is_set_to_esnext_or_nodenext_1324": "只有当 “--module” 选项设置为 “esnext” 或 “nodenext” 时，动态导入才支持第二个参数。",
   "Each_member_of_the_union_type_0_has_construct_signatures_but_none_of_those_signatures_are_compatible_2762": "联合类型 \"{0}\" 的每个成员都有构造签名，但这些签名都不能互相兼容。",
   "Each_member_of_the_union_type_0_has_signatures_but_none_of_those_signatures_are_compatible_with_each_2758": "联合类型 \"{0}\" 的每个成员都有签名，但这些签名都不能互相兼容。",
   "Editor_Support_6249": "编辑器支持",
@@ -623,6 +626,7 @@
   "Enum_member_must_have_initializer_1061": "枚举成员必须具有初始化表达式。",
   "Enum_name_cannot_be_0_2431": "枚举名不能为“{0}”。",
   "Enum_type_0_has_members_with_initializers_that_are_not_literals_2535": "枚举类型“{0}”包含具有不是文本的初始值设定项的成员。",
+  "Errors_Files_6041": "错误文件",
   "Examples_Colon_0_6026": "示例: {0}",
   "Excessive_stack_depth_comparing_types_0_and_1_2321": "与类型“{0}”和“{1}”相比，堆栈深度过高。",
   "Expected_0_1_type_arguments_provide_these_with_an_extends_tag_8027": "应为 {0}-{1} 类型参数；请为这些参数添加 \"@extends\" 标记。",
@@ -708,8 +712,11 @@
   "For_await_loops_cannot_be_used_inside_a_class_static_block_18038": "无法在类静态块内使用 “For await 循环。",
   "Found_0_errors_6217": "找到 {0} 个错误。",
   "Found_0_errors_Watching_for_file_changes_6194": "找到 {0} 个错误。注意文件更改。",
+  "Found_0_errors_in_1_files_6261": "在 {1} 个文件中找到 {0} 个错误。",
+  "Found_0_errors_in_the_same_file_starting_at_Colon_1_6260": "在同一文件中找到 {0} 个错误，起始位置为: {1}",
   "Found_1_error_6216": "找到 1 个错误。",
   "Found_1_error_Watching_for_file_changes_6193": "找到 1 个错误。注意文件更改。",
+  "Found_1_error_in_1_6259": "在 {1} 中找到 1 个错误",
   "Found_package_json_at_0_6099": "在“{0}”处找到了 \"package.json\"。",
   "Function_declarations_are_not_allowed_inside_blocks_in_strict_mode_when_targeting_ES3_or_ES5_1250": "面向 \"ES3\" 或 \"ES5\" 时，在严格模式下，块内不允许函数声明。",
   "Function_declarations_are_not_allowed_inside_blocks_in_strict_mode_when_targeting_ES3_or_ES5_Class_d_1251": "面向 \"ES3\" 或 \"ES5\" 时，在严格模式下，块内不允许函数声明。类定义自动处于严格模式。",
@@ -764,7 +771,9 @@
   "Implements_clause_of_exported_class_0_has_or_is_using_private_name_1_4019": "导出的类“{0}”的 Implements 子句具有或正在使用专用名称“{1}”。",
   "Implicit_conversion_of_a_symbol_to_a_string_will_fail_at_runtime_Consider_wrapping_this_expression_i_2731": "\"symbol\" 到 \"string\" 的隐式转换将在运行时失败。请考虑在 \"String(...)\" 中包装此表达式。",
   "Import_0_from_module_1_90013": "从模块“{1}”导入“{0}”",
-  "Import_assertions_are_only_supported_when_the_module_option_is_set_to_esnext_2821": "只有在 \"--module\" 选项设置为 \"esnext\" 时，才支持导入断言。",
+  "Import_assertion_values_must_be_string_literal_expressions_2837": "导入断言值必须为字符串字面量表达式。",
+  "Import_assertions_are_not_allowed_on_statements_that_transpile_to_commonjs_require_calls_2836": "不允许在转译到 commonjs “require” 调用的语句导入断言。",
+  "Import_assertions_are_only_supported_when_the_module_option_is_set_to_esnext_or_nodenext_2821": "仅在将 “--module” 选项设置为 “esnext” 或 “nodenext” 时，才支持导入断言。",
   "Import_assertions_cannot_be_used_with_type_only_imports_or_exports_2822": "导入断言不能用于仅类型导入或导出。",
   "Import_assignment_cannot_be_used_when_targeting_ECMAScript_modules_Consider_using_import_Asterisk_as_1202": "面向 ECMAScript 模块时，不能使用导入分配。请考虑改用 \"import * as ns from \"mod\"\"、\"import {a} from \"mod\"\"、\"import d from \"mod\"\" 或另一种模块格式。",
   "Import_declaration_0_is_using_private_name_1_4000": "导入声明“{0}”使用的是专用名称“{1}”。",
@@ -790,6 +799,7 @@
   "Include_source_code_in_the_sourcemaps_inside_the_emitted_JavaScript_6644": "在发出的 JavaScript 内的源映射中包含源代码。",
   "Include_sourcemap_files_inside_the_emitted_JavaScript_6643": "在发出的 JavaScript 中包括源映射文件。",
   "Include_undefined_in_index_signature_results_6716": "在索引签名结果中包含“未定义”",
+  "Includes_imports_of_types_referenced_by_0_90054": "包含由“{0}”引用的类型的导入",
   "Including_watch_w_will_start_watching_the_current_project_for_the_file_changes_Once_set_you_can_conf_6914": "包括 --watch，-w 将开始监视当前项目的文件更改。设置后，可以使用以下内容配置监视模式:",
   "Index_signature_for_type_0_is_missing_in_type_1_2329": "类型“{1}”中缺少类型“{0}”的索引签名。",
   "Index_signature_in_type_0_only_permits_reading_2542": "类型“{0}”中的索引签名仅允许读取。",
@@ -1144,6 +1154,8 @@
   "Referenced_project_0_may_not_disable_emit_6310": "引用的项目“{0}”可能不会禁用发出。",
   "Referenced_project_0_must_have_setting_composite_Colon_true_6306": "引用的项目“{0}”必须拥有设置 \"composite\": true。",
   "Referenced_via_0_from_file_1_1400": "通过 \"{0}\" 从文件 \"{1}\" 引用",
+  "Relative_import_paths_need_explicit_file_extensions_in_EcmaScript_imports_when_moduleResolution_is_n_2834": "当 “--moduleResolution” 为 “node12” 或 “nodenext” 时，相对导入路径需要 EcmaScript 导入中的显式文件扩展名。请考虑将扩展名添加到导入路径中。",
+  "Relative_import_paths_need_explicit_file_extensions_in_EcmaScript_imports_when_moduleResolution_is_n_2835": "当 “--moduleResolution” 为 “node12” 或 “nodenext” 时，相对导入路径需要 EcmaScript 导入中的显式文件扩展名。你是否指的是“{0}”?",
   "Remove_a_list_of_directories_from_the_watch_process_6628": "从监视进程中删除目录列表。",
   "Remove_a_list_of_files_from_the_watch_mode_s_processing_6629": "从监视模式的处理中删除文件列表。",
   "Remove_all_unnecessary_override_modifiers_95163": "删除所有不必要的 \"override\" 修饰符",
@@ -1158,6 +1170,8 @@
   "Remove_parentheses_95126": "删除括号",
   "Remove_template_tag_90011": "删除模板标记",
   "Remove_the_20mb_cap_on_total_source_code_size_for_JavaScript_files_in_the_TypeScript_language_server_6618": "删除 TypeScript 语言服务器中 JavaScript 文件总源代码大小 20mb 的上限。",
+  "Remove_type_from_import_declaration_from_0_90055": "从“{0}”中删除导入声明中的“type”",
+  "Remove_type_from_import_of_0_from_1_90056": "从“{1}”中删除“{0}”导入中的“type”",
   "Remove_type_parameters_90012": "删除类型参数",
   "Remove_unnecessary_await_95086": "删除不必要的 \"await\"",
   "Remove_unreachable_code_95050": "删除无法访问的代码",
@@ -1706,6 +1720,7 @@
   "baseUrl_option_is_set_to_0_using_this_value_to_resolve_non_relative_module_name_1_6106": "\"baseUrl\" 选项设置为“{0}”，可使用此值解析非相关模块名称“{1}”。",
   "can_only_be_used_at_the_start_of_a_file_18026": "\"#!\" 只能用在文件的开头。",
   "case_or_default_expected_1130": "应为 \"case\" 或 \"default\"。",
+  "catch_or_finally_expected_1472": "应为 “catch” 或 “finally”。",
   "const_declarations_can_only_be_declared_inside_a_block_1156": "\"const\" 声明只能在块的内部声明。",
   "const_declarations_must_be_initialized_1155": "必须初始化 \"const\" 声明。",
   "const_enum_member_initializer_was_evaluated_to_a_non_finite_value_2477": "\"const\" 枚举成员初始化表达式的求值结果为非有限值。",