typescript 4.5.0-dev.20211025 → 4.5.0-dev.20211029
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/cs/diagnosticMessages.generated.json +1 -0
- package/lib/de/diagnosticMessages.generated.json +1 -0
- package/lib/es/diagnosticMessages.generated.json +1 -0
- package/lib/fr/diagnosticMessages.generated.json +1 -0
- package/lib/ja/diagnosticMessages.generated.json +1 -0
- package/lib/ko/diagnosticMessages.generated.json +1 -0
- package/lib/lib.dom.d.ts +186 -92
- package/lib/lib.dom.iterable.d.ts +1 -7
- package/lib/lib.webworker.d.ts +60 -19
- package/lib/lib.webworker.iterable.d.ts +0 -7
- package/lib/pl/diagnosticMessages.generated.json +1 -0
- package/lib/protocol.d.ts +7 -0
- package/lib/pt-br/diagnosticMessages.generated.json +1 -0
- package/lib/ru/diagnosticMessages.generated.json +1 -0
- package/lib/tr/diagnosticMessages.generated.json +1 -0
- package/lib/tsc.js +261 -121
- package/lib/tsserver.js +572 -172
- package/lib/tsserverlibrary.d.ts +8 -0
- package/lib/tsserverlibrary.js +572 -172
- package/lib/typescript.d.ts +1 -0
- package/lib/typescript.js +572 -172
- package/lib/typescriptServices.d.ts +1 -0
- package/lib/typescriptServices.js +572 -172
- package/lib/typingsInstaller.js +316 -125
- package/lib/zh-tw/diagnosticMessages.generated.json +1 -0
- package/package.json +1 -1
package/lib/tsc.js
CHANGED
|
@@ -69,7 +69,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
69
69
|
var ts;
|
|
70
70
|
(function (ts) {
|
|
71
71
|
ts.versionMajorMinor = "4.5";
|
|
72
|
-
ts.version = ts.versionMajorMinor + ".0-dev.
|
|
72
|
+
ts.version = ts.versionMajorMinor + ".0-dev.20211029";
|
|
73
73
|
var NativeCollections;
|
|
74
74
|
(function (NativeCollections) {
|
|
75
75
|
function tryGetNativeMap() {
|
|
@@ -2129,6 +2129,10 @@ var ts;
|
|
|
2129
2129
|
return formatEnum(kind, ts.SyntaxKind, false);
|
|
2130
2130
|
}
|
|
2131
2131
|
Debug.formatSyntaxKind = formatSyntaxKind;
|
|
2132
|
+
function formatSnippetKind(kind) {
|
|
2133
|
+
return formatEnum(kind, ts.SnippetKind, false);
|
|
2134
|
+
}
|
|
2135
|
+
Debug.formatSnippetKind = formatSnippetKind;
|
|
2132
2136
|
function formatNodeFlags(flags) {
|
|
2133
2137
|
return formatEnum(flags, ts.NodeFlags, true);
|
|
2134
2138
|
}
|
|
@@ -6565,6 +6569,7 @@ var ts;
|
|
|
6565
6569
|
This_syntax_is_reserved_in_files_with_the_mts_or_cts_extension_Use_an_as_expression_instead: diag(7059, ts.DiagnosticCategory.Error, "This_syntax_is_reserved_in_files_with_the_mts_or_cts_extension_Use_an_as_expression_instead_7059", "This syntax is reserved in files with the .mts or .cts extension. Use an `as` expression instead."),
|
|
6566
6570
|
This_syntax_is_reserved_in_files_with_the_mts_or_cts_extension_Add_a_trailing_comma_or_explicit_constraint: diag(7060, ts.DiagnosticCategory.Error, "This_syntax_is_reserved_in_files_with_the_mts_or_cts_extension_Add_a_trailing_comma_or_explicit_cons_7060", "This syntax is reserved in files with the .mts or .cts extension. Add a trailing comma or explicit constraint."),
|
|
6567
6571
|
A_mapped_type_may_not_declare_properties_or_methods: diag(7061, ts.DiagnosticCategory.Error, "A_mapped_type_may_not_declare_properties_or_methods_7061", "A mapped type may not declare properties or methods."),
|
|
6572
|
+
JSON_imports_are_experimental_in_ES_module_mode_imports: diag(7062, ts.DiagnosticCategory.Error, "JSON_imports_are_experimental_in_ES_module_mode_imports_7062", "JSON imports are experimental in ES module mode imports."),
|
|
6568
6573
|
You_cannot_rename_this_element: diag(8000, ts.DiagnosticCategory.Error, "You_cannot_rename_this_element_8000", "You cannot rename this element."),
|
|
6569
6574
|
You_cannot_rename_elements_that_are_defined_in_the_standard_TypeScript_library: diag(8001, ts.DiagnosticCategory.Error, "You_cannot_rename_elements_that_are_defined_in_the_standard_TypeScript_library_8001", "You cannot rename elements that are defined in the standard TypeScript library."),
|
|
6570
6575
|
import_can_only_be_used_in_TypeScript_files: diag(8002, ts.DiagnosticCategory.Error, "import_can_only_be_used_in_TypeScript_files_8002", "'import ... =' can only be used in TypeScript files."),
|
|
@@ -15532,6 +15537,8 @@ var ts;
|
|
|
15532
15537
|
case ts.ModuleKind.ES2020:
|
|
15533
15538
|
case ts.ModuleKind.ES2022:
|
|
15534
15539
|
case ts.ModuleKind.ESNext:
|
|
15540
|
+
case ts.ModuleKind.Node12:
|
|
15541
|
+
case ts.ModuleKind.NodeNext:
|
|
15535
15542
|
return true;
|
|
15536
15543
|
default:
|
|
15537
15544
|
return false;
|
|
@@ -16508,6 +16515,10 @@ var ts;
|
|
|
16508
16515
|
return node.kind === 212 || node.kind === 213;
|
|
16509
16516
|
}
|
|
16510
16517
|
ts.isFunctionExpressionOrArrowFunction = isFunctionExpressionOrArrowFunction;
|
|
16518
|
+
function escapeSnippetText(text) {
|
|
16519
|
+
return text.replace(/\$/gm, "\\$");
|
|
16520
|
+
}
|
|
16521
|
+
ts.escapeSnippetText = escapeSnippetText;
|
|
16511
16522
|
})(ts || (ts = {}));
|
|
16512
16523
|
var ts;
|
|
16513
16524
|
(function (ts) {
|
|
@@ -21699,6 +21710,17 @@ var ts;
|
|
|
21699
21710
|
}
|
|
21700
21711
|
}
|
|
21701
21712
|
ts.moveEmitHelpers = moveEmitHelpers;
|
|
21713
|
+
function getSnippetElement(node) {
|
|
21714
|
+
var _a;
|
|
21715
|
+
return (_a = node.emitNode) === null || _a === void 0 ? void 0 : _a.snippetElement;
|
|
21716
|
+
}
|
|
21717
|
+
ts.getSnippetElement = getSnippetElement;
|
|
21718
|
+
function setSnippetElement(node, snippet) {
|
|
21719
|
+
var emitNode = getOrCreateEmitNode(node);
|
|
21720
|
+
emitNode.snippetElement = snippet;
|
|
21721
|
+
return node;
|
|
21722
|
+
}
|
|
21723
|
+
ts.setSnippetElement = setSnippetElement;
|
|
21702
21724
|
function ignoreSourceNewlines(node) {
|
|
21703
21725
|
getOrCreateEmitNode(node).flags |= 134217728;
|
|
21704
21726
|
return node;
|
|
@@ -38537,6 +38559,7 @@ var ts;
|
|
|
38537
38559
|
isDeclarationVisible: isDeclarationVisible,
|
|
38538
38560
|
isPropertyAccessible: isPropertyAccessible,
|
|
38539
38561
|
getTypeOnlyAliasDeclaration: getTypeOnlyAliasDeclaration,
|
|
38562
|
+
getMemberOverrideModifierStatus: getMemberOverrideModifierStatus,
|
|
38540
38563
|
};
|
|
38541
38564
|
function getResolvedSignatureWorker(nodeIn, candidatesOutArray, argumentCount, checkMode) {
|
|
38542
38565
|
var node = ts.getParseTreeNode(nodeIn, ts.isCallLikeExpression);
|
|
@@ -40055,6 +40078,10 @@ var ts;
|
|
|
40055
40078
|
function isESMFormatImportImportingCommonjsFormatFile(usageMode, targetMode) {
|
|
40056
40079
|
return usageMode === ts.ModuleKind.ESNext && targetMode === ts.ModuleKind.CommonJS;
|
|
40057
40080
|
}
|
|
40081
|
+
function isOnlyImportedAsDefault(usage) {
|
|
40082
|
+
var usageMode = getUsageModeForExpression(usage);
|
|
40083
|
+
return usageMode === ts.ModuleKind.ESNext && ts.endsWith(usage.text, ".json");
|
|
40084
|
+
}
|
|
40058
40085
|
function canHaveSyntheticDefault(file, moduleSymbol, dontResolveAlias, usage) {
|
|
40059
40086
|
var usageMode = file && getUsageModeForExpression(usage);
|
|
40060
40087
|
if (file && usageMode !== undefined) {
|
|
@@ -40093,8 +40120,9 @@ var ts;
|
|
|
40093
40120
|
exportDefaultSymbol = resolveExportByName(moduleSymbol, "default", node, dontResolveAlias);
|
|
40094
40121
|
}
|
|
40095
40122
|
var file = (_a = moduleSymbol.declarations) === null || _a === void 0 ? void 0 : _a.find(ts.isSourceFile);
|
|
40123
|
+
var hasDefaultOnly = isOnlyImportedAsDefault(node.parent.moduleSpecifier);
|
|
40096
40124
|
var hasSyntheticDefault = canHaveSyntheticDefault(file, moduleSymbol, dontResolveAlias, node.parent.moduleSpecifier);
|
|
40097
|
-
if (!exportDefaultSymbol && !hasSyntheticDefault) {
|
|
40125
|
+
if (!exportDefaultSymbol && !hasSyntheticDefault && !hasDefaultOnly) {
|
|
40098
40126
|
if (hasExportAssignmentSymbol(moduleSymbol)) {
|
|
40099
40127
|
var compilerOptionName = moduleKind >= ts.ModuleKind.ES2015 ? "allowSyntheticDefaultImports" : "esModuleInterop";
|
|
40100
40128
|
var exportEqualsSymbol = moduleSymbol.exports.get("export=");
|
|
@@ -40108,7 +40136,7 @@ var ts;
|
|
|
40108
40136
|
reportNonDefaultExport(moduleSymbol, node);
|
|
40109
40137
|
}
|
|
40110
40138
|
}
|
|
40111
|
-
else if (hasSyntheticDefault) {
|
|
40139
|
+
else if (hasSyntheticDefault || hasDefaultOnly) {
|
|
40112
40140
|
var resolved = resolveExternalModuleSymbol(moduleSymbol, dontResolveAlias) || resolveSymbol(moduleSymbol, dontResolveAlias);
|
|
40113
40141
|
markSymbolOfAliasDeclarationIfTypeOnly(node, moduleSymbol, resolved, false);
|
|
40114
40142
|
return resolved;
|
|
@@ -40212,7 +40240,7 @@ var ts;
|
|
|
40212
40240
|
var symbolFromModule = getExportOfModule(targetSymbol, name, specifier, dontResolveAlias);
|
|
40213
40241
|
if (symbolFromModule === undefined && name.escapedText === "default") {
|
|
40214
40242
|
var file = (_a = moduleSymbol.declarations) === null || _a === void 0 ? void 0 : _a.find(ts.isSourceFile);
|
|
40215
|
-
if (canHaveSyntheticDefault(file, moduleSymbol, dontResolveAlias, moduleSpecifier)) {
|
|
40243
|
+
if (isOnlyImportedAsDefault(moduleSpecifier) || canHaveSyntheticDefault(file, moduleSymbol, dontResolveAlias, moduleSpecifier)) {
|
|
40216
40244
|
symbolFromModule = resolveExternalModuleSymbol(moduleSymbol, dontResolveAlias) || resolveSymbol(moduleSymbol, dontResolveAlias);
|
|
40217
40245
|
}
|
|
40218
40246
|
}
|
|
@@ -40557,21 +40585,28 @@ var ts;
|
|
|
40557
40585
|
var namespaceName = getFullyQualifiedName(namespace);
|
|
40558
40586
|
var declarationName = ts.declarationNameToString(right);
|
|
40559
40587
|
var suggestionForNonexistentModule = getSuggestedSymbolForNonexistentModule(right, namespace);
|
|
40560
|
-
var exportedTypeSymbol = getMergedSymbol(getSymbol(getExportsOfSymbol(namespace), right.escapedText, 788968));
|
|
40561
|
-
var containingQualifiedName = ts.isQualifiedName(name) && getContainingQualifiedNameNode(name);
|
|
40562
|
-
var canSuggestTypeof = containingQualifiedName && !ts.isTypeOfExpression(containingQualifiedName.parent) && tryGetQualifiedNameAsValue(containingQualifiedName);
|
|
40563
40588
|
if (suggestionForNonexistentModule) {
|
|
40564
40589
|
error(right, ts.Diagnostics._0_has_no_exported_member_named_1_Did_you_mean_2, namespaceName, declarationName, symbolToString(suggestionForNonexistentModule));
|
|
40590
|
+
return undefined;
|
|
40565
40591
|
}
|
|
40566
|
-
|
|
40592
|
+
var containingQualifiedName = ts.isQualifiedName(name) && getContainingQualifiedNameNode(name);
|
|
40593
|
+
var canSuggestTypeof = globalObjectType
|
|
40594
|
+
&& (meaning & 788968)
|
|
40595
|
+
&& containingQualifiedName
|
|
40596
|
+
&& !ts.isTypeOfExpression(containingQualifiedName.parent)
|
|
40597
|
+
&& tryGetQualifiedNameAsValue(containingQualifiedName);
|
|
40598
|
+
if (canSuggestTypeof) {
|
|
40567
40599
|
error(containingQualifiedName, ts.Diagnostics._0_refers_to_a_value_but_is_being_used_as_a_type_here_Did_you_mean_typeof_0, ts.entityNameToString(containingQualifiedName));
|
|
40600
|
+
return undefined;
|
|
40568
40601
|
}
|
|
40569
|
-
|
|
40570
|
-
|
|
40571
|
-
|
|
40572
|
-
|
|
40573
|
-
|
|
40602
|
+
if (meaning & 1920 && ts.isQualifiedName(name.parent)) {
|
|
40603
|
+
var exportedTypeSymbol = getMergedSymbol(getSymbol(getExportsOfSymbol(namespace), right.escapedText, 788968));
|
|
40604
|
+
if (exportedTypeSymbol) {
|
|
40605
|
+
error(name.parent.right, ts.Diagnostics.Cannot_access_0_1_because_0_is_a_type_but_not_a_namespace_Did_you_mean_to_retrieve_the_type_of_the_property_1_in_0_with_0_1, symbolToString(exportedTypeSymbol), ts.unescapeLeadingUnderscores(name.parent.right.escapedText));
|
|
40606
|
+
return undefined;
|
|
40607
|
+
}
|
|
40574
40608
|
}
|
|
40609
|
+
error(right, ts.Diagnostics.Namespace_0_has_no_exported_member_1, namespaceName, declarationName);
|
|
40575
40610
|
}
|
|
40576
40611
|
return undefined;
|
|
40577
40612
|
}
|
|
@@ -40693,6 +40728,9 @@ var ts;
|
|
|
40693
40728
|
if (isSyncImport && sourceFile.impliedNodeFormat === ts.ModuleKind.ESNext) {
|
|
40694
40729
|
error(errorNode, ts.Diagnostics.Module_0_cannot_be_imported_using_this_construct_The_specifier_only_resolves_to_an_ES_module_which_cannot_be_imported_synchronously_Use_dynamic_import_instead, moduleReference);
|
|
40695
40730
|
}
|
|
40731
|
+
if (mode === ts.ModuleKind.ESNext && compilerOptions.resolveJsonModule && resolvedModule.extension === ".json") {
|
|
40732
|
+
error(errorNode, ts.Diagnostics.JSON_imports_are_experimental_in_ES_module_mode_imports);
|
|
40733
|
+
}
|
|
40696
40734
|
}
|
|
40697
40735
|
return getMergedSymbol(sourceFile.symbol);
|
|
40698
40736
|
}
|
|
@@ -40812,39 +40850,47 @@ var ts;
|
|
|
40812
40850
|
error(referencingLocation, ts.Diagnostics.This_module_can_only_be_referenced_with_ECMAScript_imports_Slashexports_by_turning_on_the_0_flag_and_referencing_its_default_export, compilerOptionName);
|
|
40813
40851
|
return symbol;
|
|
40814
40852
|
}
|
|
40815
|
-
|
|
40816
|
-
|
|
40817
|
-
|
|
40818
|
-
|
|
40819
|
-
|
|
40853
|
+
var referenceParent = referencingLocation.parent;
|
|
40854
|
+
if ((ts.isImportDeclaration(referenceParent) && ts.getNamespaceDeclarationNode(referenceParent)) ||
|
|
40855
|
+
ts.isImportCall(referenceParent)) {
|
|
40856
|
+
var reference = ts.isImportCall(referenceParent) ? referenceParent.arguments[0] : referenceParent.moduleSpecifier;
|
|
40857
|
+
var type = getTypeOfSymbol(symbol);
|
|
40858
|
+
var defaultOnlyType = getTypeWithSyntheticDefaultOnly(type, symbol, moduleSymbol, reference);
|
|
40859
|
+
if (defaultOnlyType) {
|
|
40860
|
+
return cloneTypeAsModuleType(symbol, defaultOnlyType, referenceParent);
|
|
40861
|
+
}
|
|
40862
|
+
if (ts.getESModuleInterop(compilerOptions)) {
|
|
40820
40863
|
var sigs = getSignaturesOfStructuredType(type, 0);
|
|
40821
40864
|
if (!sigs || !sigs.length) {
|
|
40822
40865
|
sigs = getSignaturesOfStructuredType(type, 1);
|
|
40823
40866
|
}
|
|
40824
|
-
if (sigs && sigs.length) {
|
|
40825
|
-
var moduleType = getTypeWithSyntheticDefaultImportType(type, symbol, moduleSymbol,
|
|
40826
|
-
|
|
40827
|
-
result.declarations = symbol.declarations ? symbol.declarations.slice() : [];
|
|
40828
|
-
result.parent = symbol.parent;
|
|
40829
|
-
result.target = symbol;
|
|
40830
|
-
result.originatingImport = referenceParent;
|
|
40831
|
-
if (symbol.valueDeclaration)
|
|
40832
|
-
result.valueDeclaration = symbol.valueDeclaration;
|
|
40833
|
-
if (symbol.constEnumOnlyModule)
|
|
40834
|
-
result.constEnumOnlyModule = true;
|
|
40835
|
-
if (symbol.members)
|
|
40836
|
-
result.members = new ts.Map(symbol.members);
|
|
40837
|
-
if (symbol.exports)
|
|
40838
|
-
result.exports = new ts.Map(symbol.exports);
|
|
40839
|
-
var resolvedModuleType = resolveStructuredTypeMembers(moduleType);
|
|
40840
|
-
result.type = createAnonymousType(result, resolvedModuleType.members, ts.emptyArray, ts.emptyArray, resolvedModuleType.indexInfos);
|
|
40841
|
-
return result;
|
|
40867
|
+
if ((sigs && sigs.length) || getPropertyOfType(type, "default")) {
|
|
40868
|
+
var moduleType = getTypeWithSyntheticDefaultImportType(type, symbol, moduleSymbol, reference);
|
|
40869
|
+
return cloneTypeAsModuleType(symbol, moduleType, referenceParent);
|
|
40842
40870
|
}
|
|
40843
40871
|
}
|
|
40844
40872
|
}
|
|
40845
40873
|
}
|
|
40846
40874
|
return symbol;
|
|
40847
40875
|
}
|
|
40876
|
+
function cloneTypeAsModuleType(symbol, moduleType, referenceParent) {
|
|
40877
|
+
var result = createSymbol(symbol.flags, symbol.escapedName);
|
|
40878
|
+
result.declarations = symbol.declarations ? symbol.declarations.slice() : [];
|
|
40879
|
+
result.parent = symbol.parent;
|
|
40880
|
+
result.target = symbol;
|
|
40881
|
+
result.originatingImport = referenceParent;
|
|
40882
|
+
if (symbol.valueDeclaration)
|
|
40883
|
+
result.valueDeclaration = symbol.valueDeclaration;
|
|
40884
|
+
if (symbol.constEnumOnlyModule)
|
|
40885
|
+
result.constEnumOnlyModule = true;
|
|
40886
|
+
if (symbol.members)
|
|
40887
|
+
result.members = new ts.Map(symbol.members);
|
|
40888
|
+
if (symbol.exports)
|
|
40889
|
+
result.exports = new ts.Map(symbol.exports);
|
|
40890
|
+
var resolvedModuleType = resolveStructuredTypeMembers(moduleType);
|
|
40891
|
+
result.type = createAnonymousType(result, resolvedModuleType.members, ts.emptyArray, ts.emptyArray, resolvedModuleType.indexInfos);
|
|
40892
|
+
return result;
|
|
40893
|
+
}
|
|
40848
40894
|
function hasExportAssignmentSymbol(moduleSymbol) {
|
|
40849
40895
|
return moduleSymbol.exports.get("export=") !== undefined;
|
|
40850
40896
|
}
|
|
@@ -49226,7 +49272,7 @@ var ts;
|
|
|
49226
49272
|
var _loop_16 = function () {
|
|
49227
49273
|
i--;
|
|
49228
49274
|
var t = types[i];
|
|
49229
|
-
if (t.flags & 128 && ts.some(templates, function (template) { return
|
|
49275
|
+
if (t.flags & 128 && ts.some(templates, function (template) { return isTypeMatchedByTemplateLiteralType(t, template); })) {
|
|
49230
49276
|
ts.orderedRemoveItemAt(types, i);
|
|
49231
49277
|
}
|
|
49232
49278
|
};
|
|
@@ -51178,7 +51224,8 @@ var ts;
|
|
|
51178
51224
|
return mapTypeWithAlias(getReducedType(mappedTypeVariable), function (t) {
|
|
51179
51225
|
if (t.flags & (3 | 58982400 | 524288 | 2097152) && t !== wildcardType && !isErrorType(t)) {
|
|
51180
51226
|
if (!type.declaration.nameType) {
|
|
51181
|
-
|
|
51227
|
+
var constraint = void 0;
|
|
51228
|
+
if (isArrayType(t) || (t.flags & 1) && (constraint = getConstraintOfTypeParameter(typeVariable)) && everyType(constraint, ts.or(isArrayType, isTupleType))) {
|
|
51182
51229
|
return instantiateMappedArrayType(t, type, prependTypeMapping(typeVariable, t, mapper));
|
|
51183
51230
|
}
|
|
51184
51231
|
if (isGenericTupleType(t)) {
|
|
@@ -52551,10 +52598,11 @@ var ts;
|
|
|
52551
52598
|
traceUnionsOrIntersectionsTooLarge(source, target);
|
|
52552
52599
|
var result = 0;
|
|
52553
52600
|
var saveErrorInfo = captureErrorCalculationState();
|
|
52554
|
-
if (source.flags &
|
|
52555
|
-
result =
|
|
52556
|
-
|
|
52557
|
-
|
|
52601
|
+
if ((source.flags & 1048576 || target.flags & 1048576) && getConstituentCount(source) * getConstituentCount(target) < 4) {
|
|
52602
|
+
result = structuredTypeRelatedTo(source, target, reportErrors, intersectionState | 8);
|
|
52603
|
+
}
|
|
52604
|
+
else if (source.flags & 3145728 || target.flags & 3145728) {
|
|
52605
|
+
result = recursiveTypeRelatedTo(source, target, reportErrors, intersectionState | 8, recursionFlags);
|
|
52558
52606
|
}
|
|
52559
52607
|
if (!result && !(source.flags & 1048576) && (source.flags & (469499904) || target.flags & 469499904)) {
|
|
52560
52608
|
if (result = recursiveTypeRelatedTo(source, target, reportErrors, intersectionState, recursionFlags)) {
|
|
@@ -52934,19 +52982,19 @@ var ts;
|
|
|
52934
52982
|
var maybeStart = maybeCount;
|
|
52935
52983
|
maybeKeys[maybeCount] = id;
|
|
52936
52984
|
maybeCount++;
|
|
52985
|
+
var saveExpandingFlags = expandingFlags;
|
|
52937
52986
|
if (recursionFlags & 1) {
|
|
52938
52987
|
sourceStack[sourceDepth] = source;
|
|
52939
52988
|
sourceDepth++;
|
|
52989
|
+
if (!(expandingFlags & 1) && isDeeplyNestedType(source, sourceStack, sourceDepth))
|
|
52990
|
+
expandingFlags |= 1;
|
|
52940
52991
|
}
|
|
52941
52992
|
if (recursionFlags & 2) {
|
|
52942
52993
|
targetStack[targetDepth] = target;
|
|
52943
52994
|
targetDepth++;
|
|
52995
|
+
if (!(expandingFlags & 2) && isDeeplyNestedType(target, targetStack, targetDepth))
|
|
52996
|
+
expandingFlags |= 2;
|
|
52944
52997
|
}
|
|
52945
|
-
var saveExpandingFlags = expandingFlags;
|
|
52946
|
-
if (!(expandingFlags & 1) && isDeeplyNestedType(source, sourceStack, sourceDepth))
|
|
52947
|
-
expandingFlags |= 1;
|
|
52948
|
-
if (!(expandingFlags & 2) && isDeeplyNestedType(target, targetStack, targetDepth))
|
|
52949
|
-
expandingFlags |= 2;
|
|
52950
52998
|
var originalHandler;
|
|
52951
52999
|
var propagatingVarianceFlags = 0;
|
|
52952
53000
|
if (outofbandVarianceMarkerHandler) {
|
|
@@ -52970,13 +53018,13 @@ var ts;
|
|
|
52970
53018
|
if (outofbandVarianceMarkerHandler) {
|
|
52971
53019
|
outofbandVarianceMarkerHandler = originalHandler;
|
|
52972
53020
|
}
|
|
52973
|
-
expandingFlags = saveExpandingFlags;
|
|
52974
53021
|
if (recursionFlags & 1) {
|
|
52975
53022
|
sourceDepth--;
|
|
52976
53023
|
}
|
|
52977
53024
|
if (recursionFlags & 2) {
|
|
52978
53025
|
targetDepth--;
|
|
52979
53026
|
}
|
|
53027
|
+
expandingFlags = saveExpandingFlags;
|
|
52980
53028
|
if (result) {
|
|
52981
53029
|
if (result === -1 || (sourceDepth === 0 && targetDepth === 0)) {
|
|
52982
53030
|
if (result === -1 || result === 3) {
|
|
@@ -53231,8 +53279,7 @@ var ts;
|
|
|
53231
53279
|
}
|
|
53232
53280
|
instantiateType(source, makeFunctionTypeMapper(reportUnreliableMarkers));
|
|
53233
53281
|
}
|
|
53234
|
-
|
|
53235
|
-
if (result_9 && ts.every(result_9, function (r, i) { return isValidTypeForTemplateLiteralPlaceholder(r, target.types[i]); })) {
|
|
53282
|
+
if (isTypeMatchedByTemplateLiteralType(source, target)) {
|
|
53236
53283
|
return -1;
|
|
53237
53284
|
}
|
|
53238
53285
|
}
|
|
@@ -53392,9 +53439,9 @@ var ts;
|
|
|
53392
53439
|
if (source.flags & (524288 | 2097152) && target.flags & 1048576) {
|
|
53393
53440
|
var objectOnlyTarget = extractTypesOfKind(target, 524288 | 2097152 | 33554432);
|
|
53394
53441
|
if (objectOnlyTarget.flags & 1048576) {
|
|
53395
|
-
var
|
|
53396
|
-
if (
|
|
53397
|
-
return
|
|
53442
|
+
var result_9 = typeRelatedToDiscriminatedType(source, objectOnlyTarget);
|
|
53443
|
+
if (result_9) {
|
|
53444
|
+
return result_9;
|
|
53398
53445
|
}
|
|
53399
53446
|
}
|
|
53400
53447
|
}
|
|
@@ -53441,13 +53488,13 @@ var ts;
|
|
|
53441
53488
|
var modifiersRelated = relation === comparableRelation || (relation === identityRelation ? getMappedTypeModifiers(source) === getMappedTypeModifiers(target) :
|
|
53442
53489
|
getCombinedMappedTypeOptionality(source) <= getCombinedMappedTypeOptionality(target));
|
|
53443
53490
|
if (modifiersRelated) {
|
|
53444
|
-
var
|
|
53491
|
+
var result_10;
|
|
53445
53492
|
var targetConstraint = getConstraintTypeFromMappedType(target);
|
|
53446
53493
|
var sourceConstraint = instantiateType(getConstraintTypeFromMappedType(source), makeFunctionTypeMapper(getCombinedMappedTypeOptionality(source) < 0 ? reportUnmeasurableMarkers : reportUnreliableMarkers));
|
|
53447
|
-
if (
|
|
53494
|
+
if (result_10 = isRelatedTo(targetConstraint, sourceConstraint, 3, reportErrors)) {
|
|
53448
53495
|
var mapper = createTypeMapper([getTypeParameterFromMappedType(source)], [getTypeParameterFromMappedType(target)]);
|
|
53449
53496
|
if (instantiateType(getNameTypeFromMappedType(source), mapper) === instantiateType(getNameTypeFromMappedType(target), mapper)) {
|
|
53450
|
-
return
|
|
53497
|
+
return result_10 & isRelatedTo(instantiateType(getTemplateTypeFromMappedType(source), mapper), getTemplateTypeFromMappedType(target), 3, reportErrors);
|
|
53451
53498
|
}
|
|
53452
53499
|
}
|
|
53453
53500
|
}
|
|
@@ -55281,6 +55328,10 @@ var ts;
|
|
|
55281
55328
|
inferFromLiteralPartsToTemplateLiteral(source.texts, source.types, target) :
|
|
55282
55329
|
undefined;
|
|
55283
55330
|
}
|
|
55331
|
+
function isTypeMatchedByTemplateLiteralType(source, target) {
|
|
55332
|
+
var inferences = inferTypesFromTemplateLiteralType(source, target);
|
|
55333
|
+
return !!inferences && ts.every(inferences, function (r, i) { return isValidTypeForTemplateLiteralPlaceholder(r, target.types[i]); });
|
|
55334
|
+
}
|
|
55284
55335
|
function getStringLikeTypeForType(type) {
|
|
55285
55336
|
return type.flags & (1 | 402653316) ? type : getTemplateLiteralType(["", ""], [type]);
|
|
55286
55337
|
}
|
|
@@ -56034,8 +56085,10 @@ var ts;
|
|
|
56034
56085
|
function getFlowCacheKey(node, declaredType, initialType, flowContainer) {
|
|
56035
56086
|
switch (node.kind) {
|
|
56036
56087
|
case 79:
|
|
56037
|
-
|
|
56038
|
-
|
|
56088
|
+
if (!ts.isThisInTypeQuery(node)) {
|
|
56089
|
+
var symbol = getResolvedSymbol(node);
|
|
56090
|
+
return symbol !== unknownSymbol ? (flowContainer ? getNodeId(flowContainer) : "-1") + "|" + getTypeId(declaredType) + "|" + getTypeId(initialType) + "|" + getSymbolId(symbol) : undefined;
|
|
56091
|
+
}
|
|
56039
56092
|
case 108:
|
|
56040
56093
|
return "0|" + (flowContainer ? getNodeId(flowContainer) : "-1") + "|" + getTypeId(declaredType) + "|" + getTypeId(initialType);
|
|
56041
56094
|
case 229:
|
|
@@ -56634,7 +56687,7 @@ var ts;
|
|
|
56634
56687
|
mapType(type, mapper);
|
|
56635
56688
|
}
|
|
56636
56689
|
function getConstituentCount(type) {
|
|
56637
|
-
return type.flags &
|
|
56690
|
+
return type.flags & 1048576 ? type.types.length : 1;
|
|
56638
56691
|
}
|
|
56639
56692
|
function extractTypesOfKind(type, kind) {
|
|
56640
56693
|
return filterType(type, function (t) { return (t.flags & kind) !== 0; });
|
|
@@ -57920,7 +57973,7 @@ var ts;
|
|
|
57920
57973
|
return parent.kind === 205 ||
|
|
57921
57974
|
parent.kind === 207 && parent.expression === node ||
|
|
57922
57975
|
parent.kind === 206 && parent.expression === node &&
|
|
57923
|
-
!(
|
|
57976
|
+
!(someType(type, isGenericTypeWithoutNullableConstraint) && isGenericIndexType(getTypeOfExpression(parent.argumentExpression)));
|
|
57924
57977
|
}
|
|
57925
57978
|
function isGenericTypeWithUnionConstraint(type) {
|
|
57926
57979
|
return !!(type.flags & 465829888 && getBaseConstraintOrType(type).flags & (98304 | 1048576));
|
|
@@ -62621,11 +62674,33 @@ var ts;
|
|
|
62621
62674
|
if (moduleSymbol) {
|
|
62622
62675
|
var esModuleSymbol = resolveESModuleSymbol(moduleSymbol, specifier, true, false);
|
|
62623
62676
|
if (esModuleSymbol) {
|
|
62624
|
-
return createPromiseReturnType(node,
|
|
62677
|
+
return createPromiseReturnType(node, getTypeWithSyntheticDefaultOnly(getTypeOfSymbol(esModuleSymbol), esModuleSymbol, moduleSymbol, specifier) ||
|
|
62678
|
+
getTypeWithSyntheticDefaultImportType(getTypeOfSymbol(esModuleSymbol), esModuleSymbol, moduleSymbol, specifier));
|
|
62625
62679
|
}
|
|
62626
62680
|
}
|
|
62627
62681
|
return createPromiseReturnType(node, anyType);
|
|
62628
62682
|
}
|
|
62683
|
+
function createDefaultPropertyWrapperForModule(symbol, originalSymbol, anonymousSymbol) {
|
|
62684
|
+
var memberTable = ts.createSymbolTable();
|
|
62685
|
+
var newSymbol = createSymbol(2097152, "default");
|
|
62686
|
+
newSymbol.parent = originalSymbol;
|
|
62687
|
+
newSymbol.nameType = getStringLiteralType("default");
|
|
62688
|
+
newSymbol.target = resolveSymbol(symbol);
|
|
62689
|
+
memberTable.set("default", newSymbol);
|
|
62690
|
+
return createAnonymousType(anonymousSymbol, memberTable, ts.emptyArray, ts.emptyArray, ts.emptyArray);
|
|
62691
|
+
}
|
|
62692
|
+
function getTypeWithSyntheticDefaultOnly(type, symbol, originalSymbol, moduleSpecifier) {
|
|
62693
|
+
var hasDefaultOnly = isOnlyImportedAsDefault(moduleSpecifier);
|
|
62694
|
+
if (hasDefaultOnly && type && !isErrorType(type)) {
|
|
62695
|
+
var synthType = type;
|
|
62696
|
+
if (!synthType.defaultOnlyType) {
|
|
62697
|
+
var type_4 = createDefaultPropertyWrapperForModule(symbol, originalSymbol);
|
|
62698
|
+
synthType.defaultOnlyType = type_4;
|
|
62699
|
+
}
|
|
62700
|
+
return synthType.defaultOnlyType;
|
|
62701
|
+
}
|
|
62702
|
+
return undefined;
|
|
62703
|
+
}
|
|
62629
62704
|
function getTypeWithSyntheticDefaultImportType(type, symbol, originalSymbol, moduleSpecifier) {
|
|
62630
62705
|
var _a;
|
|
62631
62706
|
if (allowSyntheticDefaultImports && type && !isErrorType(type)) {
|
|
@@ -62634,14 +62709,8 @@ var ts;
|
|
|
62634
62709
|
var file = (_a = originalSymbol.declarations) === null || _a === void 0 ? void 0 : _a.find(ts.isSourceFile);
|
|
62635
62710
|
var hasSyntheticDefault = canHaveSyntheticDefault(file, originalSymbol, false, moduleSpecifier);
|
|
62636
62711
|
if (hasSyntheticDefault) {
|
|
62637
|
-
var memberTable = ts.createSymbolTable();
|
|
62638
|
-
var newSymbol = createSymbol(2097152, "default");
|
|
62639
|
-
newSymbol.parent = originalSymbol;
|
|
62640
|
-
newSymbol.nameType = getStringLiteralType("default");
|
|
62641
|
-
newSymbol.target = resolveSymbol(symbol);
|
|
62642
|
-
memberTable.set("default", newSymbol);
|
|
62643
62712
|
var anonymousSymbol = createSymbol(2048, "__type");
|
|
62644
|
-
var defaultContainingObject =
|
|
62713
|
+
var defaultContainingObject = createDefaultPropertyWrapperForModule(symbol, originalSymbol, anonymousSymbol);
|
|
62645
62714
|
anonymousSymbol.type = defaultContainingObject;
|
|
62646
62715
|
synthType.syntheticType = isValidSpreadType(type) ? getSpreadType(type, defaultContainingObject, anonymousSymbol, 0, false) : defaultContainingObject;
|
|
62647
62716
|
}
|
|
@@ -63288,11 +63357,11 @@ var ts;
|
|
|
63288
63357
|
var operandType = getTypeOfExpression(node.expression.expression);
|
|
63289
63358
|
var witnesses = getSwitchClauseTypeOfWitnesses(node, false);
|
|
63290
63359
|
var notEqualFacts_1 = getFactsFromTypeofSwitch(0, 0, witnesses, true);
|
|
63291
|
-
var
|
|
63292
|
-
if (
|
|
63360
|
+
var type_5 = getBaseConstraintOfType(operandType) || operandType;
|
|
63361
|
+
if (type_5.flags & 3) {
|
|
63293
63362
|
return (556800 & notEqualFacts_1) === 556800;
|
|
63294
63363
|
}
|
|
63295
|
-
return !!(filterType(
|
|
63364
|
+
return !!(filterType(type_5, function (t) { return (getTypeFacts(t) & notEqualFacts_1) === notEqualFacts_1; }).flags & 131072);
|
|
63296
63365
|
}
|
|
63297
63366
|
var type = getTypeOfExpression(node.expression);
|
|
63298
63367
|
if (!isLiteralType(type)) {
|
|
@@ -66049,12 +66118,12 @@ var ts;
|
|
|
66049
66118
|
case 264:
|
|
66050
66119
|
case 267:
|
|
66051
66120
|
case 266:
|
|
66052
|
-
var
|
|
66121
|
+
var result_11 = 0;
|
|
66053
66122
|
var target = resolveAlias(getSymbolOfNode(d));
|
|
66054
66123
|
ts.forEach(target.declarations, function (d) {
|
|
66055
|
-
|
|
66124
|
+
result_11 |= getDeclarationSpaces(d);
|
|
66056
66125
|
});
|
|
66057
|
-
return
|
|
66126
|
+
return result_11;
|
|
66058
66127
|
case 253:
|
|
66059
66128
|
case 202:
|
|
66060
66129
|
case 255:
|
|
@@ -68325,7 +68394,7 @@ var ts;
|
|
|
68325
68394
|
checkKindsOfPropertyMemberOverrides(type, baseType_1);
|
|
68326
68395
|
}
|
|
68327
68396
|
}
|
|
68328
|
-
|
|
68397
|
+
checkMembersForOverrideModifier(node, type, typeWithThis, staticType);
|
|
68329
68398
|
var implementedTypeNodes = ts.getEffectiveImplementsTypeNodes(node);
|
|
68330
68399
|
if (implementedTypeNodes) {
|
|
68331
68400
|
for (var _b = 0, implementedTypeNodes_1 = implementedTypeNodes; _b < implementedTypeNodes_1.length; _b++) {
|
|
@@ -68360,8 +68429,7 @@ var ts;
|
|
|
68360
68429
|
checkPropertyInitialization(node);
|
|
68361
68430
|
}
|
|
68362
68431
|
}
|
|
68363
|
-
function
|
|
68364
|
-
var nodeInAmbientContext = !!(node.flags & 8388608);
|
|
68432
|
+
function checkMembersForOverrideModifier(node, type, typeWithThis, staticType) {
|
|
68365
68433
|
var baseTypeNode = ts.getEffectiveBaseTypeNode(node);
|
|
68366
68434
|
var baseTypes = baseTypeNode && getBaseTypes(type);
|
|
68367
68435
|
var baseWithThis = (baseTypes === null || baseTypes === void 0 ? void 0 : baseTypes.length) ? getTypeWithThisArgument(ts.first(baseTypes), type.thisType) : undefined;
|
|
@@ -68373,46 +68441,57 @@ var ts;
|
|
|
68373
68441
|
if (ts.isConstructorDeclaration(member)) {
|
|
68374
68442
|
ts.forEach(member.parameters, function (param) {
|
|
68375
68443
|
if (ts.isParameterPropertyDeclaration(param, member)) {
|
|
68376
|
-
|
|
68444
|
+
checkExistingMemberForOverrideModifier(node, staticType, baseStaticType, baseWithThis, type, typeWithThis, param, true);
|
|
68377
68445
|
}
|
|
68378
68446
|
});
|
|
68379
68447
|
}
|
|
68380
|
-
|
|
68448
|
+
checkExistingMemberForOverrideModifier(node, staticType, baseStaticType, baseWithThis, type, typeWithThis, member, false);
|
|
68381
68449
|
};
|
|
68382
68450
|
for (var _i = 0, _a = node.members; _i < _a.length; _i++) {
|
|
68383
68451
|
var member = _a[_i];
|
|
68384
68452
|
_loop_29(member);
|
|
68385
68453
|
}
|
|
68386
|
-
|
|
68387
|
-
|
|
68388
|
-
|
|
68389
|
-
|
|
68390
|
-
|
|
68391
|
-
|
|
68392
|
-
|
|
68393
|
-
|
|
68394
|
-
|
|
68395
|
-
|
|
68396
|
-
|
|
68397
|
-
|
|
68398
|
-
|
|
68399
|
-
|
|
68400
|
-
|
|
68401
|
-
|
|
68454
|
+
}
|
|
68455
|
+
function checkExistingMemberForOverrideModifier(node, staticType, baseStaticType, baseWithThis, type, typeWithThis, member, memberIsParameterProperty, reportErrors) {
|
|
68456
|
+
if (reportErrors === void 0) { reportErrors = true; }
|
|
68457
|
+
var declaredProp = member.name
|
|
68458
|
+
&& getSymbolAtLocation(member.name)
|
|
68459
|
+
|| getSymbolAtLocation(member);
|
|
68460
|
+
if (!declaredProp) {
|
|
68461
|
+
return 0;
|
|
68462
|
+
}
|
|
68463
|
+
return checkMemberForOverrideModifier(node, staticType, baseStaticType, baseWithThis, type, typeWithThis, ts.hasOverrideModifier(member), ts.hasAbstractModifier(member), ts.isStatic(member), memberIsParameterProperty, ts.symbolName(declaredProp), reportErrors ? member : undefined);
|
|
68464
|
+
}
|
|
68465
|
+
function checkMemberForOverrideModifier(node, staticType, baseStaticType, baseWithThis, type, typeWithThis, memberHasOverrideModifier, memberHasAbstractModifier, memberIsStatic, memberIsParameterProperty, memberName, errorNode) {
|
|
68466
|
+
var isJs = ts.isInJSFile(node);
|
|
68467
|
+
var nodeInAmbientContext = !!(node.flags & 8388608);
|
|
68468
|
+
if (baseWithThis && (memberHasOverrideModifier || compilerOptions.noImplicitOverride)) {
|
|
68469
|
+
var memberEscapedName = ts.escapeLeadingUnderscores(memberName);
|
|
68470
|
+
var thisType = memberIsStatic ? staticType : typeWithThis;
|
|
68471
|
+
var baseType = memberIsStatic ? baseStaticType : baseWithThis;
|
|
68472
|
+
var prop = getPropertyOfType(thisType, memberEscapedName);
|
|
68473
|
+
var baseProp = getPropertyOfType(baseType, memberEscapedName);
|
|
68474
|
+
var baseClassName = typeToString(baseWithThis);
|
|
68475
|
+
if (prop && !baseProp && memberHasOverrideModifier) {
|
|
68476
|
+
if (errorNode) {
|
|
68477
|
+
var suggestion = getSuggestedSymbolForNonexistentClassMember(memberName, baseType);
|
|
68402
68478
|
suggestion ?
|
|
68403
|
-
error(
|
|
68479
|
+
error(errorNode, isJs ?
|
|
68404
68480
|
ts.Diagnostics.This_member_cannot_have_a_JSDoc_comment_with_an_override_tag_because_it_is_not_declared_in_the_base_class_0_Did_you_mean_1 :
|
|
68405
68481
|
ts.Diagnostics.This_member_cannot_have_an_override_modifier_because_it_is_not_declared_in_the_base_class_0_Did_you_mean_1, baseClassName, symbolToString(suggestion)) :
|
|
68406
|
-
error(
|
|
68482
|
+
error(errorNode, isJs ?
|
|
68407
68483
|
ts.Diagnostics.This_member_cannot_have_a_JSDoc_comment_with_an_override_tag_because_it_is_not_declared_in_the_base_class_0 :
|
|
68408
68484
|
ts.Diagnostics.This_member_cannot_have_an_override_modifier_because_it_is_not_declared_in_the_base_class_0, baseClassName);
|
|
68409
68485
|
}
|
|
68410
|
-
|
|
68411
|
-
|
|
68412
|
-
|
|
68413
|
-
|
|
68414
|
-
|
|
68415
|
-
|
|
68486
|
+
return 2;
|
|
68487
|
+
}
|
|
68488
|
+
else if (prop && (baseProp === null || baseProp === void 0 ? void 0 : baseProp.declarations) && compilerOptions.noImplicitOverride && !nodeInAmbientContext) {
|
|
68489
|
+
var baseHasAbstract = ts.some(baseProp.declarations, ts.hasAbstractModifier);
|
|
68490
|
+
if (memberHasOverrideModifier) {
|
|
68491
|
+
return 0;
|
|
68492
|
+
}
|
|
68493
|
+
if (!baseHasAbstract) {
|
|
68494
|
+
if (errorNode) {
|
|
68416
68495
|
var diag = memberIsParameterProperty ?
|
|
68417
68496
|
isJs ?
|
|
68418
68497
|
ts.Diagnostics.This_parameter_property_must_have_a_JSDoc_comment_with_an_override_tag_because_it_overrides_a_member_in_the_base_class_0 :
|
|
@@ -68420,20 +68499,28 @@ var ts;
|
|
|
68420
68499
|
isJs ?
|
|
68421
68500
|
ts.Diagnostics.This_member_must_have_a_JSDoc_comment_with_an_override_tag_because_it_overrides_a_member_in_the_base_class_0 :
|
|
68422
68501
|
ts.Diagnostics.This_member_must_have_an_override_modifier_because_it_overrides_a_member_in_the_base_class_0;
|
|
68423
|
-
error(
|
|
68502
|
+
error(errorNode, diag, baseClassName);
|
|
68424
68503
|
}
|
|
68425
|
-
|
|
68426
|
-
|
|
68504
|
+
return 1;
|
|
68505
|
+
}
|
|
68506
|
+
else if (memberHasAbstractModifier && baseHasAbstract) {
|
|
68507
|
+
if (errorNode) {
|
|
68508
|
+
error(errorNode, ts.Diagnostics.This_member_must_have_an_override_modifier_because_it_overrides_an_abstract_method_that_is_declared_in_the_base_class_0, baseClassName);
|
|
68427
68509
|
}
|
|
68510
|
+
return 1;
|
|
68428
68511
|
}
|
|
68429
68512
|
}
|
|
68430
|
-
|
|
68513
|
+
}
|
|
68514
|
+
else if (memberHasOverrideModifier) {
|
|
68515
|
+
if (errorNode) {
|
|
68431
68516
|
var className = typeToString(type);
|
|
68432
|
-
error(
|
|
68517
|
+
error(errorNode, isJs ?
|
|
68433
68518
|
ts.Diagnostics.This_member_cannot_have_a_JSDoc_comment_with_an_override_tag_because_its_containing_class_0_does_not_extend_another_class :
|
|
68434
68519
|
ts.Diagnostics.This_member_cannot_have_an_override_modifier_because_its_containing_class_0_does_not_extend_another_class, className);
|
|
68435
68520
|
}
|
|
68521
|
+
return 2;
|
|
68436
68522
|
}
|
|
68523
|
+
return 0;
|
|
68437
68524
|
}
|
|
68438
68525
|
function issueMemberSpecificError(node, typeWithThis, baseWithThis, broadDiag) {
|
|
68439
68526
|
var issuedMemberError = false;
|
|
@@ -68473,6 +68560,24 @@ var ts;
|
|
|
68473
68560
|
}
|
|
68474
68561
|
}
|
|
68475
68562
|
}
|
|
68563
|
+
function getMemberOverrideModifierStatus(node, member) {
|
|
68564
|
+
if (!member.name) {
|
|
68565
|
+
return 0;
|
|
68566
|
+
}
|
|
68567
|
+
var symbol = getSymbolOfNode(node);
|
|
68568
|
+
var type = getDeclaredTypeOfSymbol(symbol);
|
|
68569
|
+
var typeWithThis = getTypeWithThisArgument(type);
|
|
68570
|
+
var staticType = getTypeOfSymbol(symbol);
|
|
68571
|
+
var baseTypeNode = ts.getEffectiveBaseTypeNode(node);
|
|
68572
|
+
var baseTypes = baseTypeNode && getBaseTypes(type);
|
|
68573
|
+
var baseWithThis = (baseTypes === null || baseTypes === void 0 ? void 0 : baseTypes.length) ? getTypeWithThisArgument(ts.first(baseTypes), type.thisType) : undefined;
|
|
68574
|
+
var baseStaticType = getBaseConstructorTypeOfClass(type);
|
|
68575
|
+
var memberHasOverrideModifier = member.parent
|
|
68576
|
+
? ts.hasOverrideModifier(member)
|
|
68577
|
+
: ts.hasSyntacticModifier(member, 16384);
|
|
68578
|
+
var memberName = ts.unescapeLeadingUnderscores(ts.getTextOfPropertyName(member.name));
|
|
68579
|
+
return checkMemberForOverrideModifier(node, staticType, baseStaticType, baseWithThis, type, typeWithThis, memberHasOverrideModifier, ts.hasAbstractModifier(member), ts.isStatic(member), false, memberName);
|
|
68580
|
+
}
|
|
68476
68581
|
function getTargetSymbol(s) {
|
|
68477
68582
|
return ts.getCheckFlags(s) & 1 ? s.target : s;
|
|
68478
68583
|
}
|
|
@@ -79294,8 +79399,8 @@ var ts;
|
|
|
79294
79399
|
function convertJsxChildrenToChildrenPropAssignment(children) {
|
|
79295
79400
|
var nonWhitespaceChildren = ts.getSemanticJsxChildren(children);
|
|
79296
79401
|
if (ts.length(nonWhitespaceChildren) === 1) {
|
|
79297
|
-
var
|
|
79298
|
-
return
|
|
79402
|
+
var result_12 = transformJsxChildToExpression(nonWhitespaceChildren[0]);
|
|
79403
|
+
return result_12 && factory.createPropertyAssignment("children", result_12);
|
|
79299
79404
|
}
|
|
79300
79405
|
var result = ts.mapDefined(children, transformJsxChildToExpression);
|
|
79301
79406
|
return ts.length(result) ? factory.createPropertyAssignment("children", factory.createArrayLiteralExpression(result)) : undefined;
|
|
@@ -88712,7 +88817,14 @@ var ts;
|
|
|
88712
88817
|
onAfterEmitNode === null || onAfterEmitNode === void 0 ? void 0 : onAfterEmitNode(node);
|
|
88713
88818
|
currentParenthesizerRule = undefined;
|
|
88714
88819
|
}
|
|
88715
|
-
function pipelineEmitWithHintWorker(hint, node) {
|
|
88820
|
+
function pipelineEmitWithHintWorker(hint, node, allowSnippets) {
|
|
88821
|
+
if (allowSnippets === void 0) { allowSnippets = true; }
|
|
88822
|
+
if (allowSnippets) {
|
|
88823
|
+
var snippet = ts.getSnippetElement(node);
|
|
88824
|
+
if (snippet) {
|
|
88825
|
+
return emitSnippetNode(hint, node, snippet);
|
|
88826
|
+
}
|
|
88827
|
+
}
|
|
88716
88828
|
if (hint === 0)
|
|
88717
88829
|
return emitSourceFile(ts.cast(node, ts.isSourceFile));
|
|
88718
88830
|
if (hint === 2)
|
|
@@ -89261,6 +89373,24 @@ var ts;
|
|
|
89261
89373
|
bundleFileInfo.sections.push(section);
|
|
89262
89374
|
}
|
|
89263
89375
|
}
|
|
89376
|
+
function emitSnippetNode(hint, node, snippet) {
|
|
89377
|
+
switch (snippet.kind) {
|
|
89378
|
+
case 1:
|
|
89379
|
+
emitPlaceholder(hint, node, snippet);
|
|
89380
|
+
break;
|
|
89381
|
+
case 0:
|
|
89382
|
+
emitTabStop(snippet);
|
|
89383
|
+
break;
|
|
89384
|
+
}
|
|
89385
|
+
}
|
|
89386
|
+
function emitPlaceholder(hint, node, snippet) {
|
|
89387
|
+
nonEscapingWrite("${" + snippet.order + ":");
|
|
89388
|
+
pipelineEmitWithHintWorker(hint, node, false);
|
|
89389
|
+
nonEscapingWrite("}");
|
|
89390
|
+
}
|
|
89391
|
+
function emitTabStop(snippet) {
|
|
89392
|
+
nonEscapingWrite("$" + snippet.order);
|
|
89393
|
+
}
|
|
89264
89394
|
function emitIdentifier(node) {
|
|
89265
89395
|
var writeText = node.symbol ? writeSymbol : write;
|
|
89266
89396
|
writeText(getTextOfNode(node, false), node.symbol);
|
|
@@ -91370,6 +91500,14 @@ var ts;
|
|
|
91370
91500
|
function writeProperty(s) {
|
|
91371
91501
|
writer.writeProperty(s);
|
|
91372
91502
|
}
|
|
91503
|
+
function nonEscapingWrite(s) {
|
|
91504
|
+
if (writer.nonEscapingWrite) {
|
|
91505
|
+
writer.nonEscapingWrite(s);
|
|
91506
|
+
}
|
|
91507
|
+
else {
|
|
91508
|
+
writer.write(s);
|
|
91509
|
+
}
|
|
91510
|
+
}
|
|
91373
91511
|
function writeLine(count) {
|
|
91374
91512
|
if (count === void 0) { count = 1; }
|
|
91375
91513
|
for (var i = 0; i < count; i++) {
|
|
@@ -93799,15 +93937,15 @@ var ts;
|
|
|
93799
93937
|
}
|
|
93800
93938
|
var oldSourceFile = oldProgram && oldProgram.getSourceFile(file.fileName);
|
|
93801
93939
|
if (oldSourceFile !== file && file.resolvedModules) {
|
|
93802
|
-
var
|
|
93940
|
+
var result_13 = [];
|
|
93803
93941
|
var i = 0;
|
|
93804
93942
|
for (var _i = 0, moduleNames_1 = moduleNames; _i < moduleNames_1.length; _i++) {
|
|
93805
93943
|
var moduleName = moduleNames_1[_i];
|
|
93806
93944
|
var resolvedModule = file.resolvedModules.get(moduleName, getModeForResolutionAtIndex(file, i));
|
|
93807
93945
|
i++;
|
|
93808
|
-
|
|
93946
|
+
result_13.push(resolvedModule);
|
|
93809
93947
|
}
|
|
93810
|
-
return
|
|
93948
|
+
return result_13;
|
|
93811
93949
|
}
|
|
93812
93950
|
var unknownModuleNames;
|
|
93813
93951
|
var result;
|
|
@@ -95308,7 +95446,9 @@ var ts;
|
|
|
95308
95446
|
}
|
|
95309
95447
|
}
|
|
95310
95448
|
if (options.resolveJsonModule) {
|
|
95311
|
-
if (ts.getEmitModuleResolutionKind(options) !== ts.ModuleResolutionKind.NodeJs
|
|
95449
|
+
if (ts.getEmitModuleResolutionKind(options) !== ts.ModuleResolutionKind.NodeJs &&
|
|
95450
|
+
ts.getEmitModuleResolutionKind(options) !== ts.ModuleResolutionKind.Node12 &&
|
|
95451
|
+
ts.getEmitModuleResolutionKind(options) !== ts.ModuleResolutionKind.NodeNext) {
|
|
95312
95452
|
createDiagnosticForOptionName(ts.Diagnostics.Option_resolveJsonModule_cannot_be_specified_without_node_module_resolution_strategy, "resolveJsonModule");
|
|
95313
95453
|
}
|
|
95314
95454
|
else if (!ts.hasJsonModuleEmitEnabled(options)) {
|
|
@@ -98137,9 +98277,9 @@ var ts;
|
|
|
98137
98277
|
var targets = importedFileNames.map(function (f) { return ts.getNormalizedAbsolutePath(f, cwd); });
|
|
98138
98278
|
var shouldFilterIgnoredPaths = !ts.every(targets, ts.containsIgnoredPath);
|
|
98139
98279
|
if (!preferSymlinks) {
|
|
98140
|
-
var
|
|
98141
|
-
if (
|
|
98142
|
-
return
|
|
98280
|
+
var result_14 = ts.forEach(targets, function (p) { return !(shouldFilterIgnoredPaths && ts.containsIgnoredPath(p)) && cb(p, referenceRedirect === p); });
|
|
98281
|
+
if (result_14)
|
|
98282
|
+
return result_14;
|
|
98143
98283
|
}
|
|
98144
98284
|
var symlinkedDirectories = (_a = host.getSymlinkCache) === null || _a === void 0 ? void 0 : _a.call(host).getSymlinkedDirectoriesByRealpath();
|
|
98145
98285
|
var fullImportedFileName = ts.getNormalizedAbsolutePath(importedFileName, cwd);
|
|
@@ -98158,10 +98298,10 @@ var ts;
|
|
|
98158
98298
|
for (var _i = 0, symlinkDirectories_1 = symlinkDirectories; _i < symlinkDirectories_1.length; _i++) {
|
|
98159
98299
|
var symlinkDirectory = symlinkDirectories_1[_i];
|
|
98160
98300
|
var option = ts.resolvePath(symlinkDirectory, relative);
|
|
98161
|
-
var
|
|
98301
|
+
var result_15 = cb(option, target === referenceRedirect);
|
|
98162
98302
|
shouldFilterIgnoredPaths = true;
|
|
98163
|
-
if (
|
|
98164
|
-
return
|
|
98303
|
+
if (result_15)
|
|
98304
|
+
return result_15;
|
|
98165
98305
|
}
|
|
98166
98306
|
});
|
|
98167
98307
|
});
|