typescript 4.6.0-dev.20220211 → 4.6.2
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/cancellationToken.js +1 -1
- package/lib/tsc.js +513 -499
- package/lib/tsserver.js +865 -861
- package/lib/tsserverlibrary.js +840 -836
- package/lib/typescript.js +745 -741
- package/lib/typescriptServices.js +745 -741
- package/lib/typingsInstaller.js +631 -627
- package/package.json +2 -2
package/lib/tsc.js
CHANGED
|
@@ -22,7 +22,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
|
22
22
|
ar[i] = from[i];
|
|
23
23
|
}
|
|
24
24
|
}
|
|
25
|
-
return to.concat(ar || from);
|
|
25
|
+
return to.concat(ar || Array.prototype.slice.call(from));
|
|
26
26
|
};
|
|
27
27
|
var __assign = (this && this.__assign) || function () {
|
|
28
28
|
__assign = Object.assign || function(t) {
|
|
@@ -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.6";
|
|
72
|
-
ts.version =
|
|
72
|
+
ts.version = "4.6.2";
|
|
73
73
|
var NativeCollections;
|
|
74
74
|
(function (NativeCollections) {
|
|
75
75
|
var globals = typeof globalThis !== "undefined" ? globalThis :
|
|
@@ -94,7 +94,7 @@ var ts;
|
|
|
94
94
|
var constructor = (_a = NativeCollections[nativeFactory]()) !== null && _a !== void 0 ? _a : ts.ShimCollections === null || ts.ShimCollections === void 0 ? void 0 : ts.ShimCollections[shimFactory](ts.getIterator);
|
|
95
95
|
if (constructor)
|
|
96
96
|
return constructor;
|
|
97
|
-
throw new Error("TypeScript requires an environment that provides a compatible native "
|
|
97
|
+
throw new Error("TypeScript requires an environment that provides a compatible native ".concat(name, " implementation."));
|
|
98
98
|
}
|
|
99
99
|
})(ts || (ts = {}));
|
|
100
100
|
var ts;
|
|
@@ -1293,7 +1293,7 @@ var ts;
|
|
|
1293
1293
|
function cast(value, test) {
|
|
1294
1294
|
if (value !== undefined && test(value))
|
|
1295
1295
|
return value;
|
|
1296
|
-
return ts.Debug.fail("Invalid cast. The supplied value "
|
|
1296
|
+
return ts.Debug.fail("Invalid cast. The supplied value ".concat(value, " did not pass the test '").concat(ts.Debug.getFunctionName(test), "'."));
|
|
1297
1297
|
}
|
|
1298
1298
|
ts.cast = cast;
|
|
1299
1299
|
function noop(_) { }
|
|
@@ -1343,7 +1343,7 @@ var ts;
|
|
|
1343
1343
|
function memoizeOne(callback) {
|
|
1344
1344
|
var map = new ts.Map();
|
|
1345
1345
|
return function (arg) {
|
|
1346
|
-
var key = typeof arg
|
|
1346
|
+
var key = "".concat(typeof arg, ":").concat(arg);
|
|
1347
1347
|
var value = map.get(key);
|
|
1348
1348
|
if (value === undefined && !map.has(key)) {
|
|
1349
1349
|
value = callback(arg);
|
|
@@ -1678,7 +1678,7 @@ var ts;
|
|
|
1678
1678
|
ts.createGetCanonicalFileName = createGetCanonicalFileName;
|
|
1679
1679
|
function patternText(_a) {
|
|
1680
1680
|
var prefix = _a.prefix, suffix = _a.suffix;
|
|
1681
|
-
return prefix
|
|
1681
|
+
return "".concat(prefix, "*").concat(suffix);
|
|
1682
1682
|
}
|
|
1683
1683
|
ts.patternText = patternText;
|
|
1684
1684
|
function matchedText(pattern, candidate) {
|
|
@@ -1947,7 +1947,7 @@ var ts;
|
|
|
1947
1947
|
}
|
|
1948
1948
|
function fail(message, stackCrawlMark) {
|
|
1949
1949
|
debugger;
|
|
1950
|
-
var e = new Error(message ? "Debug Failure. "
|
|
1950
|
+
var e = new Error(message ? "Debug Failure. ".concat(message) : "Debug Failure.");
|
|
1951
1951
|
if (Error.captureStackTrace) {
|
|
1952
1952
|
Error.captureStackTrace(e, stackCrawlMark || fail);
|
|
1953
1953
|
}
|
|
@@ -1955,12 +1955,12 @@ var ts;
|
|
|
1955
1955
|
}
|
|
1956
1956
|
Debug.fail = fail;
|
|
1957
1957
|
function failBadSyntaxKind(node, message, stackCrawlMark) {
|
|
1958
|
-
return fail((message || "Unexpected node."
|
|
1958
|
+
return fail("".concat(message || "Unexpected node.", "\r\nNode ").concat(formatSyntaxKind(node.kind), " was unexpected."), stackCrawlMark || failBadSyntaxKind);
|
|
1959
1959
|
}
|
|
1960
1960
|
Debug.failBadSyntaxKind = failBadSyntaxKind;
|
|
1961
1961
|
function assert(expression, message, verboseDebugInfo, stackCrawlMark) {
|
|
1962
1962
|
if (!expression) {
|
|
1963
|
-
message = message ? "False expression: "
|
|
1963
|
+
message = message ? "False expression: ".concat(message) : "False expression.";
|
|
1964
1964
|
if (verboseDebugInfo) {
|
|
1965
1965
|
message += "\r\nVerbose Debug Information: " + (typeof verboseDebugInfo === "string" ? verboseDebugInfo : verboseDebugInfo());
|
|
1966
1966
|
}
|
|
@@ -1970,26 +1970,26 @@ var ts;
|
|
|
1970
1970
|
Debug.assert = assert;
|
|
1971
1971
|
function assertEqual(a, b, msg, msg2, stackCrawlMark) {
|
|
1972
1972
|
if (a !== b) {
|
|
1973
|
-
var message = msg ? msg2 ? msg
|
|
1974
|
-
fail("Expected "
|
|
1973
|
+
var message = msg ? msg2 ? "".concat(msg, " ").concat(msg2) : msg : "";
|
|
1974
|
+
fail("Expected ".concat(a, " === ").concat(b, ". ").concat(message), stackCrawlMark || assertEqual);
|
|
1975
1975
|
}
|
|
1976
1976
|
}
|
|
1977
1977
|
Debug.assertEqual = assertEqual;
|
|
1978
1978
|
function assertLessThan(a, b, msg, stackCrawlMark) {
|
|
1979
1979
|
if (a >= b) {
|
|
1980
|
-
fail("Expected "
|
|
1980
|
+
fail("Expected ".concat(a, " < ").concat(b, ". ").concat(msg || ""), stackCrawlMark || assertLessThan);
|
|
1981
1981
|
}
|
|
1982
1982
|
}
|
|
1983
1983
|
Debug.assertLessThan = assertLessThan;
|
|
1984
1984
|
function assertLessThanOrEqual(a, b, stackCrawlMark) {
|
|
1985
1985
|
if (a > b) {
|
|
1986
|
-
fail("Expected "
|
|
1986
|
+
fail("Expected ".concat(a, " <= ").concat(b), stackCrawlMark || assertLessThanOrEqual);
|
|
1987
1987
|
}
|
|
1988
1988
|
}
|
|
1989
1989
|
Debug.assertLessThanOrEqual = assertLessThanOrEqual;
|
|
1990
1990
|
function assertGreaterThanOrEqual(a, b, stackCrawlMark) {
|
|
1991
1991
|
if (a < b) {
|
|
1992
|
-
fail("Expected "
|
|
1992
|
+
fail("Expected ".concat(a, " >= ").concat(b), stackCrawlMark || assertGreaterThanOrEqual);
|
|
1993
1993
|
}
|
|
1994
1994
|
}
|
|
1995
1995
|
Debug.assertGreaterThanOrEqual = assertGreaterThanOrEqual;
|
|
@@ -2019,42 +2019,42 @@ var ts;
|
|
|
2019
2019
|
function assertNever(member, message, stackCrawlMark) {
|
|
2020
2020
|
if (message === void 0) { message = "Illegal value:"; }
|
|
2021
2021
|
var detail = typeof member === "object" && ts.hasProperty(member, "kind") && ts.hasProperty(member, "pos") && formatSyntaxKind ? "SyntaxKind: " + formatSyntaxKind(member.kind) : JSON.stringify(member);
|
|
2022
|
-
return fail(message
|
|
2022
|
+
return fail("".concat(message, " ").concat(detail), stackCrawlMark || assertNever);
|
|
2023
2023
|
}
|
|
2024
2024
|
Debug.assertNever = assertNever;
|
|
2025
2025
|
function assertEachNode(nodes, test, message, stackCrawlMark) {
|
|
2026
2026
|
if (shouldAssertFunction(1, "assertEachNode")) {
|
|
2027
|
-
assert(test === undefined || ts.every(nodes, test), message || "Unexpected node.", function () { return "Node array did not pass test '"
|
|
2027
|
+
assert(test === undefined || ts.every(nodes, test), message || "Unexpected node.", function () { return "Node array did not pass test '".concat(getFunctionName(test), "'."); }, stackCrawlMark || assertEachNode);
|
|
2028
2028
|
}
|
|
2029
2029
|
}
|
|
2030
2030
|
Debug.assertEachNode = assertEachNode;
|
|
2031
2031
|
function assertNode(node, test, message, stackCrawlMark) {
|
|
2032
2032
|
if (shouldAssertFunction(1, "assertNode")) {
|
|
2033
|
-
assert(node !== undefined && (test === undefined || test(node)), message || "Unexpected node.", function () { return "Node "
|
|
2033
|
+
assert(node !== undefined && (test === undefined || test(node)), message || "Unexpected node.", function () { return "Node ".concat(formatSyntaxKind(node === null || node === void 0 ? void 0 : node.kind), " did not pass test '").concat(getFunctionName(test), "'."); }, stackCrawlMark || assertNode);
|
|
2034
2034
|
}
|
|
2035
2035
|
}
|
|
2036
2036
|
Debug.assertNode = assertNode;
|
|
2037
2037
|
function assertNotNode(node, test, message, stackCrawlMark) {
|
|
2038
2038
|
if (shouldAssertFunction(1, "assertNotNode")) {
|
|
2039
|
-
assert(node === undefined || test === undefined || !test(node), message || "Unexpected node.", function () { return "Node "
|
|
2039
|
+
assert(node === undefined || test === undefined || !test(node), message || "Unexpected node.", function () { return "Node ".concat(formatSyntaxKind(node.kind), " should not have passed test '").concat(getFunctionName(test), "'."); }, stackCrawlMark || assertNotNode);
|
|
2040
2040
|
}
|
|
2041
2041
|
}
|
|
2042
2042
|
Debug.assertNotNode = assertNotNode;
|
|
2043
2043
|
function assertOptionalNode(node, test, message, stackCrawlMark) {
|
|
2044
2044
|
if (shouldAssertFunction(1, "assertOptionalNode")) {
|
|
2045
|
-
assert(test === undefined || node === undefined || test(node), message || "Unexpected node.", function () { return "Node "
|
|
2045
|
+
assert(test === undefined || node === undefined || test(node), message || "Unexpected node.", function () { return "Node ".concat(formatSyntaxKind(node === null || node === void 0 ? void 0 : node.kind), " did not pass test '").concat(getFunctionName(test), "'."); }, stackCrawlMark || assertOptionalNode);
|
|
2046
2046
|
}
|
|
2047
2047
|
}
|
|
2048
2048
|
Debug.assertOptionalNode = assertOptionalNode;
|
|
2049
2049
|
function assertOptionalToken(node, kind, message, stackCrawlMark) {
|
|
2050
2050
|
if (shouldAssertFunction(1, "assertOptionalToken")) {
|
|
2051
|
-
assert(kind === undefined || node === undefined || node.kind === kind, message || "Unexpected node.", function () { return "Node "
|
|
2051
|
+
assert(kind === undefined || node === undefined || node.kind === kind, message || "Unexpected node.", function () { return "Node ".concat(formatSyntaxKind(node === null || node === void 0 ? void 0 : node.kind), " was not a '").concat(formatSyntaxKind(kind), "' token."); }, stackCrawlMark || assertOptionalToken);
|
|
2052
2052
|
}
|
|
2053
2053
|
}
|
|
2054
2054
|
Debug.assertOptionalToken = assertOptionalToken;
|
|
2055
2055
|
function assertMissingNode(node, message, stackCrawlMark) {
|
|
2056
2056
|
if (shouldAssertFunction(1, "assertMissingNode")) {
|
|
2057
|
-
assert(node === undefined, message || "Unexpected node.", function () { return "Node "
|
|
2057
|
+
assert(node === undefined, message || "Unexpected node.", function () { return "Node ".concat(formatSyntaxKind(node.kind), " was unexpected'."); }, stackCrawlMark || assertMissingNode);
|
|
2058
2058
|
}
|
|
2059
2059
|
}
|
|
2060
2060
|
Debug.assertMissingNode = assertMissingNode;
|
|
@@ -2075,7 +2075,7 @@ var ts;
|
|
|
2075
2075
|
}
|
|
2076
2076
|
Debug.getFunctionName = getFunctionName;
|
|
2077
2077
|
function formatSymbol(symbol) {
|
|
2078
|
-
return "{ name: "
|
|
2078
|
+
return "{ name: ".concat(ts.unescapeLeadingUnderscores(symbol.escapedName), "; flags: ").concat(formatSymbolFlags(symbol.flags), "; declarations: ").concat(ts.map(symbol.declarations, function (node) { return formatSyntaxKind(node.kind); }), " }");
|
|
2079
2079
|
}
|
|
2080
2080
|
Debug.formatSymbol = formatSymbol;
|
|
2081
2081
|
function formatEnum(value, enumObject, isFlags) {
|
|
@@ -2093,7 +2093,7 @@ var ts;
|
|
|
2093
2093
|
break;
|
|
2094
2094
|
}
|
|
2095
2095
|
if (enumValue !== 0 && enumValue & value) {
|
|
2096
|
-
result = ""
|
|
2096
|
+
result = "".concat(result).concat(result ? "|" : "").concat(enumName);
|
|
2097
2097
|
remainingFlags &= ~enumValue;
|
|
2098
2098
|
}
|
|
2099
2099
|
}
|
|
@@ -2202,7 +2202,7 @@ var ts;
|
|
|
2202
2202
|
this.flags & 1 ? "FlowUnreachable" :
|
|
2203
2203
|
"UnknownFlow";
|
|
2204
2204
|
var remainingFlags = this.flags & ~(2048 - 1);
|
|
2205
|
-
return ""
|
|
2205
|
+
return "".concat(flowHeader).concat(remainingFlags ? " (".concat(formatFlowFlags(remainingFlags), ")") : "");
|
|
2206
2206
|
}
|
|
2207
2207
|
},
|
|
2208
2208
|
__debugFlowFlags: { get: function () { return formatEnum(this.flags, ts.FlowFlags, true); } },
|
|
@@ -2232,7 +2232,7 @@ var ts;
|
|
|
2232
2232
|
__tsDebuggerDisplay: {
|
|
2233
2233
|
value: function (defaultValue) {
|
|
2234
2234
|
defaultValue = String(defaultValue).replace(/(?:,[\s\w\d_]+:[^,]+)+\]$/, "]");
|
|
2235
|
-
return "NodeArray "
|
|
2235
|
+
return "NodeArray ".concat(defaultValue);
|
|
2236
2236
|
}
|
|
2237
2237
|
}
|
|
2238
2238
|
});
|
|
@@ -2278,7 +2278,7 @@ var ts;
|
|
|
2278
2278
|
var symbolHeader = this.flags & 33554432 ? "TransientSymbol" :
|
|
2279
2279
|
"Symbol";
|
|
2280
2280
|
var remainingSymbolFlags = this.flags & ~33554432;
|
|
2281
|
-
return symbolHeader
|
|
2281
|
+
return "".concat(symbolHeader, " '").concat(ts.symbolName(this), "'").concat(remainingSymbolFlags ? " (".concat(formatSymbolFlags(remainingSymbolFlags), ")") : "");
|
|
2282
2282
|
}
|
|
2283
2283
|
},
|
|
2284
2284
|
__debugFlags: { get: function () { return formatSymbolFlags(this.flags); } }
|
|
@@ -2287,11 +2287,11 @@ var ts;
|
|
|
2287
2287
|
__tsDebuggerDisplay: {
|
|
2288
2288
|
value: function () {
|
|
2289
2289
|
var typeHeader = this.flags & 98304 ? "NullableType" :
|
|
2290
|
-
this.flags & 384 ? "LiteralType "
|
|
2291
|
-
this.flags & 2048 ? "LiteralType "
|
|
2290
|
+
this.flags & 384 ? "LiteralType ".concat(JSON.stringify(this.value)) :
|
|
2291
|
+
this.flags & 2048 ? "LiteralType ".concat(this.value.negative ? "-" : "").concat(this.value.base10Value, "n") :
|
|
2292
2292
|
this.flags & 8192 ? "UniqueESSymbolType" :
|
|
2293
2293
|
this.flags & 32 ? "EnumType" :
|
|
2294
|
-
this.flags & 67359327 ? "IntrinsicType "
|
|
2294
|
+
this.flags & 67359327 ? "IntrinsicType ".concat(this.intrinsicName) :
|
|
2295
2295
|
this.flags & 1048576 ? "UnionType" :
|
|
2296
2296
|
this.flags & 2097152 ? "IntersectionType" :
|
|
2297
2297
|
this.flags & 4194304 ? "IndexType" :
|
|
@@ -2310,7 +2310,7 @@ var ts;
|
|
|
2310
2310
|
"ObjectType" :
|
|
2311
2311
|
"Type";
|
|
2312
2312
|
var remainingObjectFlags = this.flags & 524288 ? this.objectFlags & ~1343 : 0;
|
|
2313
|
-
return ""
|
|
2313
|
+
return "".concat(typeHeader).concat(this.symbol ? " '".concat(ts.symbolName(this.symbol), "'") : "").concat(remainingObjectFlags ? " (".concat(formatObjectFlags(remainingObjectFlags), ")") : "");
|
|
2314
2314
|
}
|
|
2315
2315
|
},
|
|
2316
2316
|
__debugFlags: { get: function () { return formatTypeFlags(this.flags); } },
|
|
@@ -2344,11 +2344,11 @@ var ts;
|
|
|
2344
2344
|
__tsDebuggerDisplay: {
|
|
2345
2345
|
value: function () {
|
|
2346
2346
|
var nodeHeader = ts.isGeneratedIdentifier(this) ? "GeneratedIdentifier" :
|
|
2347
|
-
ts.isIdentifier(this) ? "Identifier '"
|
|
2348
|
-
ts.isPrivateIdentifier(this) ? "PrivateIdentifier '"
|
|
2349
|
-
ts.isStringLiteral(this) ? "StringLiteral "
|
|
2350
|
-
ts.isNumericLiteral(this) ? "NumericLiteral "
|
|
2351
|
-
ts.isBigIntLiteral(this) ? "BigIntLiteral "
|
|
2347
|
+
ts.isIdentifier(this) ? "Identifier '".concat(ts.idText(this), "'") :
|
|
2348
|
+
ts.isPrivateIdentifier(this) ? "PrivateIdentifier '".concat(ts.idText(this), "'") :
|
|
2349
|
+
ts.isStringLiteral(this) ? "StringLiteral ".concat(JSON.stringify(this.text.length < 10 ? this.text : this.text.slice(10) + "...")) :
|
|
2350
|
+
ts.isNumericLiteral(this) ? "NumericLiteral ".concat(this.text) :
|
|
2351
|
+
ts.isBigIntLiteral(this) ? "BigIntLiteral ".concat(this.text, "n") :
|
|
2352
2352
|
ts.isTypeParameterDeclaration(this) ? "TypeParameterDeclaration" :
|
|
2353
2353
|
ts.isParameter(this) ? "ParameterDeclaration" :
|
|
2354
2354
|
ts.isConstructorDeclaration(this) ? "ConstructorDeclaration" :
|
|
@@ -2380,7 +2380,7 @@ var ts;
|
|
|
2380
2380
|
ts.isNamedTupleMember(this) ? "NamedTupleMember" :
|
|
2381
2381
|
ts.isImportTypeNode(this) ? "ImportTypeNode" :
|
|
2382
2382
|
formatSyntaxKind(this.kind);
|
|
2383
|
-
return ""
|
|
2383
|
+
return "".concat(nodeHeader).concat(this.flags ? " (".concat(formatNodeFlags(this.flags), ")") : "");
|
|
2384
2384
|
}
|
|
2385
2385
|
},
|
|
2386
2386
|
__debugKind: { get: function () { return formatSyntaxKind(this.kind); } },
|
|
@@ -2424,10 +2424,10 @@ var ts;
|
|
|
2424
2424
|
Debug.enableDebugInfo = enableDebugInfo;
|
|
2425
2425
|
function formatDeprecationMessage(name, error, errorAfter, since, message) {
|
|
2426
2426
|
var deprecationMessage = error ? "DeprecationError: " : "DeprecationWarning: ";
|
|
2427
|
-
deprecationMessage += "'"
|
|
2428
|
-
deprecationMessage += since ? "has been deprecated since v"
|
|
2429
|
-
deprecationMessage += error ? " and can no longer be used." : errorAfter ? " and will no longer be usable after v"
|
|
2430
|
-
deprecationMessage += message ? " "
|
|
2427
|
+
deprecationMessage += "'".concat(name, "' ");
|
|
2428
|
+
deprecationMessage += since ? "has been deprecated since v".concat(since) : "is deprecated";
|
|
2429
|
+
deprecationMessage += error ? " and can no longer be used." : errorAfter ? " and will no longer be usable after v".concat(errorAfter, ".") : ".";
|
|
2430
|
+
deprecationMessage += message ? " ".concat(ts.formatStringFromArgs(message, [name], 0)) : "";
|
|
2431
2431
|
return deprecationMessage;
|
|
2432
2432
|
}
|
|
2433
2433
|
function createErrorDeprecation(name, errorAfter, since, message) {
|
|
@@ -2524,11 +2524,11 @@ var ts;
|
|
|
2524
2524
|
}
|
|
2525
2525
|
};
|
|
2526
2526
|
Version.prototype.toString = function () {
|
|
2527
|
-
var result = this.major
|
|
2527
|
+
var result = "".concat(this.major, ".").concat(this.minor, ".").concat(this.patch);
|
|
2528
2528
|
if (ts.some(this.prerelease))
|
|
2529
|
-
result += "-"
|
|
2529
|
+
result += "-".concat(this.prerelease.join("."));
|
|
2530
2530
|
if (ts.some(this.build))
|
|
2531
|
-
result += "+"
|
|
2531
|
+
result += "+".concat(this.build.join("."));
|
|
2532
2532
|
return result;
|
|
2533
2533
|
};
|
|
2534
2534
|
Version.zero = new Version(0, 0, 0);
|
|
@@ -2750,7 +2750,7 @@ var ts;
|
|
|
2750
2750
|
return ts.map(comparators, formatComparator).join(" ");
|
|
2751
2751
|
}
|
|
2752
2752
|
function formatComparator(comparator) {
|
|
2753
|
-
return ""
|
|
2753
|
+
return "".concat(comparator.operator).concat(comparator.operand);
|
|
2754
2754
|
}
|
|
2755
2755
|
})(ts || (ts = {}));
|
|
2756
2756
|
var ts;
|
|
@@ -2979,7 +2979,7 @@ var ts;
|
|
|
2979
2979
|
fs = require("fs");
|
|
2980
2980
|
}
|
|
2981
2981
|
catch (e) {
|
|
2982
|
-
throw new Error("tracing requires having fs\n(original error: "
|
|
2982
|
+
throw new Error("tracing requires having fs\n(original error: ".concat(e.message || e, ")"));
|
|
2983
2983
|
}
|
|
2984
2984
|
}
|
|
2985
2985
|
mode = tracingMode;
|
|
@@ -2990,11 +2990,11 @@ var ts;
|
|
|
2990
2990
|
if (!fs.existsSync(traceDir)) {
|
|
2991
2991
|
fs.mkdirSync(traceDir, { recursive: true });
|
|
2992
2992
|
}
|
|
2993
|
-
var countPart = mode === "build" ? "."
|
|
2994
|
-
: mode === "server" ? "."
|
|
2993
|
+
var countPart = mode === "build" ? ".".concat(process.pid, "-").concat(++traceCount)
|
|
2994
|
+
: mode === "server" ? ".".concat(process.pid)
|
|
2995
2995
|
: "";
|
|
2996
|
-
var tracePath = ts.combinePaths(traceDir, "trace"
|
|
2997
|
-
var typesPath = ts.combinePaths(traceDir, "types"
|
|
2996
|
+
var tracePath = ts.combinePaths(traceDir, "trace".concat(countPart, ".json"));
|
|
2997
|
+
var typesPath = ts.combinePaths(traceDir, "types".concat(countPart, ".json"));
|
|
2998
2998
|
legend.push({
|
|
2999
2999
|
configFilePath: configFilePath,
|
|
3000
3000
|
tracePath: tracePath,
|
|
@@ -3062,7 +3062,7 @@ var ts;
|
|
|
3062
3062
|
writeEvent("E", phase, name, args, undefined, endTime);
|
|
3063
3063
|
}
|
|
3064
3064
|
else if (sampleInterval - (time % sampleInterval) <= endTime - time) {
|
|
3065
|
-
writeEvent("X", phase, name, args, "\"dur\":"
|
|
3065
|
+
writeEvent("X", phase, name, args, "\"dur\":".concat(endTime - time), time);
|
|
3066
3066
|
}
|
|
3067
3067
|
}
|
|
3068
3068
|
function writeEvent(eventType, phase, name, args, extras, time) {
|
|
@@ -3070,11 +3070,11 @@ var ts;
|
|
|
3070
3070
|
if (mode === "server" && phase === "checkTypes")
|
|
3071
3071
|
return;
|
|
3072
3072
|
ts.performance.mark("beginTracing");
|
|
3073
|
-
fs.writeSync(traceFd, ",\n{\"pid\":1,\"tid\":1,\"ph\":\""
|
|
3073
|
+
fs.writeSync(traceFd, ",\n{\"pid\":1,\"tid\":1,\"ph\":\"".concat(eventType, "\",\"cat\":\"").concat(phase, "\",\"ts\":").concat(time, ",\"name\":\"").concat(name, "\""));
|
|
3074
3074
|
if (extras)
|
|
3075
|
-
fs.writeSync(traceFd, ","
|
|
3075
|
+
fs.writeSync(traceFd, ",".concat(extras));
|
|
3076
3076
|
if (args)
|
|
3077
|
-
fs.writeSync(traceFd, ",\"args\":"
|
|
3077
|
+
fs.writeSync(traceFd, ",\"args\":".concat(JSON.stringify(args)));
|
|
3078
3078
|
fs.writeSync(traceFd, "}");
|
|
3079
3079
|
ts.performance.mark("endTracing");
|
|
3080
3080
|
ts.performance.measure("Tracing", "beginTracing", "endTracing");
|
|
@@ -3394,7 +3394,7 @@ var ts;
|
|
|
3394
3394
|
pollingChunkSize = getCustomPollingBasedLevels("TSC_WATCH_POLLINGCHUNKSIZE", defaultChunkLevels) || pollingChunkSize;
|
|
3395
3395
|
ts.unchangedPollThresholds = getCustomPollingBasedLevels("TSC_WATCH_UNCHANGEDPOLLTHRESHOLDS", defaultChunkLevels) || ts.unchangedPollThresholds;
|
|
3396
3396
|
function getLevel(envVar, level) {
|
|
3397
|
-
return system.getEnvironmentVariable(envVar
|
|
3397
|
+
return system.getEnvironmentVariable("".concat(envVar, "_").concat(level.toUpperCase()));
|
|
3398
3398
|
}
|
|
3399
3399
|
function getCustomLevels(baseVariable) {
|
|
3400
3400
|
var customLevels;
|
|
@@ -3818,7 +3818,7 @@ var ts;
|
|
|
3818
3818
|
}
|
|
3819
3819
|
function onTimerToUpdateChildWatches() {
|
|
3820
3820
|
timerToUpdateChildWatches = undefined;
|
|
3821
|
-
sysLog("sysLog:: onTimerToUpdateChildWatches:: "
|
|
3821
|
+
sysLog("sysLog:: onTimerToUpdateChildWatches:: ".concat(cacheToUpdateChildWatches.size));
|
|
3822
3822
|
var start = ts.timestamp();
|
|
3823
3823
|
var invokeMap = new ts.Map();
|
|
3824
3824
|
while (!timerToUpdateChildWatches && cacheToUpdateChildWatches.size) {
|
|
@@ -3829,7 +3829,7 @@ var ts;
|
|
|
3829
3829
|
var hasChanges = updateChildWatches(dirName, dirPath, options);
|
|
3830
3830
|
invokeCallbacks(dirPath, invokeMap, hasChanges ? undefined : fileNames);
|
|
3831
3831
|
}
|
|
3832
|
-
sysLog("sysLog:: invokingWatchers:: Elapsed:: "
|
|
3832
|
+
sysLog("sysLog:: invokingWatchers:: Elapsed:: ".concat(ts.timestamp() - start, "ms:: ").concat(cacheToUpdateChildWatches.size));
|
|
3833
3833
|
callbackCache.forEach(function (callbacks, rootDirName) {
|
|
3834
3834
|
var existing = invokeMap.get(rootDirName);
|
|
3835
3835
|
if (existing) {
|
|
@@ -3845,7 +3845,7 @@ var ts;
|
|
|
3845
3845
|
}
|
|
3846
3846
|
});
|
|
3847
3847
|
var elapsed = ts.timestamp() - start;
|
|
3848
|
-
sysLog("sysLog:: Elapsed:: "
|
|
3848
|
+
sysLog("sysLog:: Elapsed:: ".concat(elapsed, "ms:: onTimerToUpdateChildWatches:: ").concat(cacheToUpdateChildWatches.size, " ").concat(timerToUpdateChildWatches));
|
|
3849
3849
|
}
|
|
3850
3850
|
function removeChildWatches(parentWatcher) {
|
|
3851
3851
|
if (!parentWatcher)
|
|
@@ -4237,7 +4237,7 @@ var ts;
|
|
|
4237
4237
|
var externalFileCounter = 0;
|
|
4238
4238
|
var remappedPaths = new ts.Map();
|
|
4239
4239
|
var normalizedDir = ts.normalizeSlashes(__dirname);
|
|
4240
|
-
var fileUrlRoot = "file://"
|
|
4240
|
+
var fileUrlRoot = "file://".concat(ts.getRootLength(normalizedDir) === 1 ? "" : "/").concat(normalizedDir);
|
|
4241
4241
|
for (var _i = 0, _a = profile.nodes; _i < _a.length; _i++) {
|
|
4242
4242
|
var node = _a[_i];
|
|
4243
4243
|
if (node.callFrame.url) {
|
|
@@ -4246,7 +4246,7 @@ var ts;
|
|
|
4246
4246
|
node.callFrame.url = ts.getRelativePathToDirectoryOrUrl(fileUrlRoot, url, fileUrlRoot, ts.createGetCanonicalFileName(useCaseSensitiveFileNames), true);
|
|
4247
4247
|
}
|
|
4248
4248
|
else if (!nativePattern.test(url)) {
|
|
4249
|
-
node.callFrame.url = (remappedPaths.has(url) ? remappedPaths : remappedPaths.set(url, "external"
|
|
4249
|
+
node.callFrame.url = (remappedPaths.has(url) ? remappedPaths : remappedPaths.set(url, "external".concat(externalFileCounter, ".js"))).get(url);
|
|
4250
4250
|
externalFileCounter++;
|
|
4251
4251
|
}
|
|
4252
4252
|
}
|
|
@@ -4262,7 +4262,7 @@ var ts;
|
|
|
4262
4262
|
if (!err) {
|
|
4263
4263
|
try {
|
|
4264
4264
|
if ((_b = statSync(profilePath)) === null || _b === void 0 ? void 0 : _b.isDirectory()) {
|
|
4265
|
-
profilePath = _path.join(profilePath, (new Date()).toISOString().replace(/:/g, "-")
|
|
4265
|
+
profilePath = _path.join(profilePath, "".concat((new Date()).toISOString().replace(/:/g, "-"), "+P").concat(process.pid, ".cpuprofile"));
|
|
4266
4266
|
}
|
|
4267
4267
|
}
|
|
4268
4268
|
catch (_c) {
|
|
@@ -4347,7 +4347,7 @@ var ts;
|
|
|
4347
4347
|
}
|
|
4348
4348
|
};
|
|
4349
4349
|
function invokeCallbackAndUpdateWatcher(createWatcher) {
|
|
4350
|
-
sysLog("sysLog:: "
|
|
4350
|
+
sysLog("sysLog:: ".concat(fileOrDirectory, ":: Changing watcher to ").concat(createWatcher === watchPresentFileSystemEntry ? "Present" : "Missing", "FileSystemEntryWatcher"));
|
|
4351
4351
|
callback("rename", "");
|
|
4352
4352
|
if (watcher) {
|
|
4353
4353
|
watcher.close();
|
|
@@ -4364,7 +4364,7 @@ var ts;
|
|
|
4364
4364
|
}
|
|
4365
4365
|
}
|
|
4366
4366
|
if (hitSystemWatcherLimit) {
|
|
4367
|
-
sysLog("sysLog:: "
|
|
4367
|
+
sysLog("sysLog:: ".concat(fileOrDirectory, ":: Defaulting to fsWatchFile"));
|
|
4368
4368
|
return watchPresentFileSystemEntryWithFsWatchFile();
|
|
4369
4369
|
}
|
|
4370
4370
|
try {
|
|
@@ -4376,7 +4376,7 @@ var ts;
|
|
|
4376
4376
|
}
|
|
4377
4377
|
catch (e) {
|
|
4378
4378
|
hitSystemWatcherLimit || (hitSystemWatcherLimit = e.code === "ENOSPC");
|
|
4379
|
-
sysLog("sysLog:: "
|
|
4379
|
+
sysLog("sysLog:: ".concat(fileOrDirectory, ":: Changing to fsWatchFile"));
|
|
4380
4380
|
return watchPresentFileSystemEntryWithFsWatchFile();
|
|
4381
4381
|
}
|
|
4382
4382
|
}
|
|
@@ -5295,6 +5295,8 @@ var ts;
|
|
|
5295
5295
|
Property_0_cannot_have_an_initializer_because_it_is_marked_abstract: diag(1267, ts.DiagnosticCategory.Error, "Property_0_cannot_have_an_initializer_because_it_is_marked_abstract_1267", "Property '{0}' cannot have an initializer because it is marked abstract."),
|
|
5296
5296
|
An_index_signature_parameter_type_must_be_string_number_symbol_or_a_template_literal_type: diag(1268, ts.DiagnosticCategory.Error, "An_index_signature_parameter_type_must_be_string_number_symbol_or_a_template_literal_type_1268", "An index signature parameter type must be 'string', 'number', 'symbol', or a template literal type."),
|
|
5297
5297
|
Cannot_use_export_import_on_a_type_or_type_only_namespace_when_the_isolatedModules_flag_is_provided: diag(1269, ts.DiagnosticCategory.Error, "Cannot_use_export_import_on_a_type_or_type_only_namespace_when_the_isolatedModules_flag_is_provided_1269", "Cannot use 'export import' on a type or type-only namespace when the '--isolatedModules' flag is provided."),
|
|
5298
|
+
Decorator_function_return_type_0_is_not_assignable_to_type_1: diag(1270, ts.DiagnosticCategory.Error, "Decorator_function_return_type_0_is_not_assignable_to_type_1_1270", "Decorator function return type '{0}' is not assignable to type '{1}'."),
|
|
5299
|
+
Decorator_function_return_type_is_0_but_is_expected_to_be_void_or_any: diag(1271, ts.DiagnosticCategory.Error, "Decorator_function_return_type_is_0_but_is_expected_to_be_void_or_any_1271", "Decorator function return type is '{0}' but is expected to be 'void' or 'any'."),
|
|
5298
5300
|
with_statements_are_not_allowed_in_an_async_function_block: diag(1300, ts.DiagnosticCategory.Error, "with_statements_are_not_allowed_in_an_async_function_block_1300", "'with' statements are not allowed in an async function block."),
|
|
5299
5301
|
await_expressions_are_only_allowed_within_async_functions_and_at_the_top_levels_of_modules: diag(1308, ts.DiagnosticCategory.Error, "await_expressions_are_only_allowed_within_async_functions_and_at_the_top_levels_of_modules_1308", "'await' expressions are only allowed within async functions and at the top levels of modules."),
|
|
5300
5302
|
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: diag(1312, ts.DiagnosticCategory.Error, "Did_you_mean_to_use_a_Colon_An_can_only_follow_a_property_name_when_the_containing_object_literal_is_1312", "Did you mean to use a ':'? An '=' can only follow a property name when the containing object literal is part of a destructuring pattern."),
|
|
@@ -7082,7 +7084,7 @@ var ts;
|
|
|
7082
7084
|
line = line < 0 ? 0 : line >= lineStarts.length ? lineStarts.length - 1 : line;
|
|
7083
7085
|
}
|
|
7084
7086
|
else {
|
|
7085
|
-
ts.Debug.fail("Bad line number. Line: "
|
|
7087
|
+
ts.Debug.fail("Bad line number. Line: ".concat(line, ", lineStarts.length: ").concat(lineStarts.length, " , line map is correct? ").concat(debugText !== undefined ? ts.arraysEqual(lineStarts, computeLineStarts(debugText)) : "unknown"));
|
|
7086
7088
|
}
|
|
7087
7089
|
}
|
|
7088
7090
|
var res = lineStarts[line] + character;
|
|
@@ -9597,7 +9599,7 @@ var ts;
|
|
|
9597
9599
|
: "linkplain";
|
|
9598
9600
|
var name = link.name ? ts.entityNameToString(link.name) : "";
|
|
9599
9601
|
var space = link.name && link.text.startsWith("://") ? "" : " ";
|
|
9600
|
-
return "{@"
|
|
9602
|
+
return "{@".concat(kind, " ").concat(name).concat(space).concat(link.text, "}");
|
|
9601
9603
|
}
|
|
9602
9604
|
function getEffectiveTypeParameterDeclarations(node) {
|
|
9603
9605
|
if (ts.isJSDocSignature(node)) {
|
|
@@ -10691,11 +10693,11 @@ var ts;
|
|
|
10691
10693
|
}
|
|
10692
10694
|
function packageIdToPackageName(_a) {
|
|
10693
10695
|
var name = _a.name, subModuleName = _a.subModuleName;
|
|
10694
|
-
return subModuleName ? name
|
|
10696
|
+
return subModuleName ? "".concat(name, "/").concat(subModuleName) : name;
|
|
10695
10697
|
}
|
|
10696
10698
|
ts.packageIdToPackageName = packageIdToPackageName;
|
|
10697
10699
|
function packageIdToString(packageId) {
|
|
10698
|
-
return packageIdToPackageName(packageId)
|
|
10700
|
+
return "".concat(packageIdToPackageName(packageId), "@").concat(packageId.version);
|
|
10699
10701
|
}
|
|
10700
10702
|
ts.packageIdToString = packageIdToString;
|
|
10701
10703
|
function typeDirectiveIsEqualTo(oldResolution, newResolution) {
|
|
@@ -10769,7 +10771,7 @@ var ts;
|
|
|
10769
10771
|
function nodePosToString(node) {
|
|
10770
10772
|
var file = getSourceFileOfNode(node);
|
|
10771
10773
|
var loc = ts.getLineAndCharacterOfPosition(file, node.pos);
|
|
10772
|
-
return file.fileName
|
|
10774
|
+
return "".concat(file.fileName, "(").concat(loc.line + 1, ",").concat(loc.character + 1, ")");
|
|
10773
10775
|
}
|
|
10774
10776
|
ts.nodePosToString = nodePosToString;
|
|
10775
10777
|
function getEndLinePosition(line, sourceFile) {
|
|
@@ -10870,7 +10872,7 @@ var ts;
|
|
|
10870
10872
|
ts.isPinnedComment = isPinnedComment;
|
|
10871
10873
|
function createCommentDirectivesMap(sourceFile, commentDirectives) {
|
|
10872
10874
|
var directivesByLine = new ts.Map(commentDirectives.map(function (commentDirective) { return ([
|
|
10873
|
-
""
|
|
10875
|
+
"".concat(ts.getLineAndCharacterOfPosition(sourceFile, commentDirective.range.end).line),
|
|
10874
10876
|
commentDirective,
|
|
10875
10877
|
]); }));
|
|
10876
10878
|
var usedLines = new ts.Map();
|
|
@@ -10887,10 +10889,10 @@ var ts;
|
|
|
10887
10889
|
});
|
|
10888
10890
|
}
|
|
10889
10891
|
function markUsed(line) {
|
|
10890
|
-
if (!directivesByLine.has(""
|
|
10892
|
+
if (!directivesByLine.has("".concat(line))) {
|
|
10891
10893
|
return false;
|
|
10892
10894
|
}
|
|
10893
|
-
usedLines.set(""
|
|
10895
|
+
usedLines.set("".concat(line), true);
|
|
10894
10896
|
return true;
|
|
10895
10897
|
}
|
|
10896
10898
|
}
|
|
@@ -11089,7 +11091,7 @@ var ts;
|
|
|
11089
11091
|
}
|
|
11090
11092
|
return node.text;
|
|
11091
11093
|
}
|
|
11092
|
-
return ts.Debug.fail("Literal kind '"
|
|
11094
|
+
return ts.Debug.fail("Literal kind '".concat(node.kind, "' not accounted for."));
|
|
11093
11095
|
}
|
|
11094
11096
|
ts.getLiteralText = getLiteralText;
|
|
11095
11097
|
function canUseOriginalText(node, flags) {
|
|
@@ -13424,11 +13426,11 @@ var ts;
|
|
|
13424
13426
|
}
|
|
13425
13427
|
ts.getEscapedTextOfIdentifierOrLiteral = getEscapedTextOfIdentifierOrLiteral;
|
|
13426
13428
|
function getPropertyNameForUniqueESSymbol(symbol) {
|
|
13427
|
-
return "__@"
|
|
13429
|
+
return "__@".concat(ts.getSymbolId(symbol), "@").concat(symbol.escapedName);
|
|
13428
13430
|
}
|
|
13429
13431
|
ts.getPropertyNameForUniqueESSymbol = getPropertyNameForUniqueESSymbol;
|
|
13430
13432
|
function getSymbolNameForPrivateIdentifier(containingClassSymbol, description) {
|
|
13431
|
-
return "__#"
|
|
13433
|
+
return "__#".concat(ts.getSymbolId(containingClassSymbol), "@").concat(description);
|
|
13432
13434
|
}
|
|
13433
13435
|
ts.getSymbolNameForPrivateIdentifier = getSymbolNameForPrivateIdentifier;
|
|
13434
13436
|
function isKnownSymbol(symbol) {
|
|
@@ -15725,7 +15727,7 @@ var ts;
|
|
|
15725
15727
|
}
|
|
15726
15728
|
ts.getJSXImplicitImportBase = getJSXImplicitImportBase;
|
|
15727
15729
|
function getJSXRuntimeImport(base, options) {
|
|
15728
|
-
return base ? base
|
|
15730
|
+
return base ? "".concat(base, "/").concat(options.jsx === 5 ? "jsx-dev-runtime" : "jsx-runtime") : undefined;
|
|
15729
15731
|
}
|
|
15730
15732
|
ts.getJSXRuntimeImport = getJSXRuntimeImport;
|
|
15731
15733
|
function hasZeroOrOneAsteriskCharacter(str) {
|
|
@@ -15823,15 +15825,15 @@ var ts;
|
|
|
15823
15825
|
}
|
|
15824
15826
|
var wildcardCharCodes = [42, 63];
|
|
15825
15827
|
ts.commonPackageFolders = ["node_modules", "bower_components", "jspm_packages"];
|
|
15826
|
-
var implicitExcludePathRegexPattern = "(?!("
|
|
15828
|
+
var implicitExcludePathRegexPattern = "(?!(".concat(ts.commonPackageFolders.join("|"), ")(/|$))");
|
|
15827
15829
|
var filesMatcher = {
|
|
15828
15830
|
singleAsteriskRegexFragment: "([^./]|(\\.(?!min\\.js$))?)*",
|
|
15829
|
-
doubleAsteriskRegexFragment: "(/"
|
|
15831
|
+
doubleAsteriskRegexFragment: "(/".concat(implicitExcludePathRegexPattern, "[^/.][^/]*)*?"),
|
|
15830
15832
|
replaceWildcardCharacter: function (match) { return replaceWildcardCharacter(match, filesMatcher.singleAsteriskRegexFragment); }
|
|
15831
15833
|
};
|
|
15832
15834
|
var directoriesMatcher = {
|
|
15833
15835
|
singleAsteriskRegexFragment: "[^/]*",
|
|
15834
|
-
doubleAsteriskRegexFragment: "(/"
|
|
15836
|
+
doubleAsteriskRegexFragment: "(/".concat(implicitExcludePathRegexPattern, "[^/.][^/]*)*?"),
|
|
15835
15837
|
replaceWildcardCharacter: function (match) { return replaceWildcardCharacter(match, directoriesMatcher.singleAsteriskRegexFragment); }
|
|
15836
15838
|
};
|
|
15837
15839
|
var excludeMatcher = {
|
|
@@ -15849,9 +15851,9 @@ var ts;
|
|
|
15849
15851
|
if (!patterns || !patterns.length) {
|
|
15850
15852
|
return undefined;
|
|
15851
15853
|
}
|
|
15852
|
-
var pattern = patterns.map(function (pattern) { return "("
|
|
15854
|
+
var pattern = patterns.map(function (pattern) { return "(".concat(pattern, ")"); }).join("|");
|
|
15853
15855
|
var terminator = usage === "exclude" ? "($|/)" : "$";
|
|
15854
|
-
return "^("
|
|
15856
|
+
return "^(".concat(pattern, ")").concat(terminator);
|
|
15855
15857
|
}
|
|
15856
15858
|
ts.getRegularExpressionForWildcard = getRegularExpressionForWildcard;
|
|
15857
15859
|
function getRegularExpressionsForWildcards(specs, basePath, usage) {
|
|
@@ -15869,7 +15871,7 @@ var ts;
|
|
|
15869
15871
|
ts.isImplicitGlob = isImplicitGlob;
|
|
15870
15872
|
function getPatternFromSpec(spec, basePath, usage) {
|
|
15871
15873
|
var pattern = spec && getSubPatternFromSpec(spec, basePath, usage, wildcardMatchers[usage]);
|
|
15872
|
-
return pattern && "^("
|
|
15874
|
+
return pattern && "^(".concat(pattern, ")").concat(usage === "exclude" ? "($|/)" : "$");
|
|
15873
15875
|
}
|
|
15874
15876
|
ts.getPatternFromSpec = getPatternFromSpec;
|
|
15875
15877
|
function getSubPatternFromSpec(spec, basePath, usage, _a) {
|
|
@@ -15935,7 +15937,7 @@ var ts;
|
|
|
15935
15937
|
currentDirectory = ts.normalizePath(currentDirectory);
|
|
15936
15938
|
var absolutePath = ts.combinePaths(currentDirectory, path);
|
|
15937
15939
|
return {
|
|
15938
|
-
includeFilePatterns: ts.map(getRegularExpressionsForWildcards(includes, absolutePath, "files"), function (pattern) { return "^"
|
|
15940
|
+
includeFilePatterns: ts.map(getRegularExpressionsForWildcards(includes, absolutePath, "files"), function (pattern) { return "^".concat(pattern, "$"); }),
|
|
15939
15941
|
includeFilePattern: getRegularExpressionForWildcard(includes, absolutePath, "files"),
|
|
15940
15942
|
includeDirectoryPattern: getRegularExpressionForWildcard(includes, absolutePath, "directories"),
|
|
15941
15943
|
excludePattern: getRegularExpressionForWildcard(excludes, absolutePath, "exclude"),
|
|
@@ -16180,7 +16182,7 @@ var ts;
|
|
|
16180
16182
|
ts.resolutionExtensionIsTSOrJson = resolutionExtensionIsTSOrJson;
|
|
16181
16183
|
function extensionFromPath(path) {
|
|
16182
16184
|
var ext = tryGetExtensionFromPath(path);
|
|
16183
|
-
return ext !== undefined ? ext : ts.Debug.fail("File "
|
|
16185
|
+
return ext !== undefined ? ext : ts.Debug.fail("File ".concat(path, " has unknown extension."));
|
|
16184
16186
|
}
|
|
16185
16187
|
ts.extensionFromPath = extensionFromPath;
|
|
16186
16188
|
function isAnySupportedFileExtension(path) {
|
|
@@ -21251,7 +21253,7 @@ var ts;
|
|
|
21251
21253
|
case 326: return "augments";
|
|
21252
21254
|
case 327: return "implements";
|
|
21253
21255
|
default:
|
|
21254
|
-
return ts.Debug.fail("Unsupported kind: "
|
|
21256
|
+
return ts.Debug.fail("Unsupported kind: ".concat(ts.Debug.formatSyntaxKind(kind)));
|
|
21255
21257
|
}
|
|
21256
21258
|
}
|
|
21257
21259
|
var rawTextScanner;
|
|
@@ -21570,7 +21572,7 @@ var ts;
|
|
|
21570
21572
|
};
|
|
21571
21573
|
var definedTextGetter_1 = function (path) {
|
|
21572
21574
|
var result = textGetter_1(path);
|
|
21573
|
-
return result !== undefined ? result : "/* Input file "
|
|
21575
|
+
return result !== undefined ? result : "/* Input file ".concat(path, " was missing */\r\n");
|
|
21574
21576
|
};
|
|
21575
21577
|
var buildInfo_1;
|
|
21576
21578
|
var getAndCacheBuildInfo_1 = function (getText) {
|
|
@@ -25232,7 +25234,7 @@ var ts;
|
|
|
25232
25234
|
for (var _i = 0, viableKeywordSuggestions_1 = viableKeywordSuggestions; _i < viableKeywordSuggestions_1.length; _i++) {
|
|
25233
25235
|
var keyword = viableKeywordSuggestions_1[_i];
|
|
25234
25236
|
if (expressionText.length > keyword.length + 2 && ts.startsWith(expressionText, keyword)) {
|
|
25235
|
-
return keyword
|
|
25237
|
+
return "".concat(keyword, " ").concat(expressionText.slice(keyword.length));
|
|
25236
25238
|
}
|
|
25237
25239
|
}
|
|
25238
25240
|
return undefined;
|
|
@@ -30741,7 +30743,7 @@ var ts;
|
|
|
30741
30743
|
if (namedArgRegExCache.has(name)) {
|
|
30742
30744
|
return namedArgRegExCache.get(name);
|
|
30743
30745
|
}
|
|
30744
|
-
var result = new RegExp("(\\s"
|
|
30746
|
+
var result = new RegExp("(\\s".concat(name, "\\s*=\\s*)(?:(?:'([^']*)')|(?:\"([^\"]*)\"))"), "im");
|
|
30745
30747
|
namedArgRegExCache.set(name, result);
|
|
30746
30748
|
return result;
|
|
30747
30749
|
}
|
|
@@ -32151,8 +32153,8 @@ var ts;
|
|
|
32151
32153
|
}
|
|
32152
32154
|
ts.createCompilerDiagnosticForInvalidCustomType = createCompilerDiagnosticForInvalidCustomType;
|
|
32153
32155
|
function createDiagnosticForInvalidCustomType(opt, createDiagnostic) {
|
|
32154
|
-
var namesOfType = ts.arrayFrom(opt.type.keys()).map(function (key) { return "'"
|
|
32155
|
-
return createDiagnostic(ts.Diagnostics.Argument_for_0_option_must_be_Colon_1, "--"
|
|
32156
|
+
var namesOfType = ts.arrayFrom(opt.type.keys()).map(function (key) { return "'".concat(key, "'"); }).join(", ");
|
|
32157
|
+
return createDiagnostic(ts.Diagnostics.Argument_for_0_option_must_be_Colon_1, "--".concat(opt.name), namesOfType);
|
|
32156
32158
|
}
|
|
32157
32159
|
function parseCustomTypeOption(opt, value, errors) {
|
|
32158
32160
|
return convertJsonOptionOfCustomType(opt, ts.trimString(value || ""), errors);
|
|
@@ -32869,10 +32871,10 @@ var ts;
|
|
|
32869
32871
|
var newValue = compilerOptionsMap.get(cmd.name);
|
|
32870
32872
|
var defaultValue = getDefaultValueForOption(cmd);
|
|
32871
32873
|
if (newValue !== defaultValue) {
|
|
32872
|
-
result.push(""
|
|
32874
|
+
result.push("".concat(tab).concat(cmd.name, ": ").concat(newValue));
|
|
32873
32875
|
}
|
|
32874
32876
|
else if (ts.hasProperty(ts.defaultInitCompilerOptions, cmd.name)) {
|
|
32875
|
-
result.push(""
|
|
32877
|
+
result.push("".concat(tab).concat(cmd.name, ": ").concat(defaultValue));
|
|
32876
32878
|
}
|
|
32877
32879
|
});
|
|
32878
32880
|
return result.join(newLine) + newLine;
|
|
@@ -32910,19 +32912,19 @@ var ts;
|
|
|
32910
32912
|
if (entries.length !== 0) {
|
|
32911
32913
|
entries.push({ value: "" });
|
|
32912
32914
|
}
|
|
32913
|
-
entries.push({ value: "/* "
|
|
32915
|
+
entries.push({ value: "/* ".concat(category, " */") });
|
|
32914
32916
|
for (var _i = 0, options_1 = options; _i < options_1.length; _i++) {
|
|
32915
32917
|
var option = options_1[_i];
|
|
32916
32918
|
var optionName = void 0;
|
|
32917
32919
|
if (compilerOptionsMap.has(option.name)) {
|
|
32918
|
-
optionName = "\""
|
|
32920
|
+
optionName = "\"".concat(option.name, "\": ").concat(JSON.stringify(compilerOptionsMap.get(option.name))).concat((seenKnownKeys += 1) === compilerOptionsMap.size ? "" : ",");
|
|
32919
32921
|
}
|
|
32920
32922
|
else {
|
|
32921
|
-
optionName = "// \""
|
|
32923
|
+
optionName = "// \"".concat(option.name, "\": ").concat(JSON.stringify(getDefaultValueForOption(option)), ",");
|
|
32922
32924
|
}
|
|
32923
32925
|
entries.push({
|
|
32924
32926
|
value: optionName,
|
|
32925
|
-
description: "/* "
|
|
32927
|
+
description: "/* ".concat(option.description && ts.getLocaleSpecificMessage(option.description) || option.name, " */")
|
|
32926
32928
|
});
|
|
32927
32929
|
marginLength = Math.max(optionName.length, marginLength);
|
|
32928
32930
|
}
|
|
@@ -32930,24 +32932,24 @@ var ts;
|
|
|
32930
32932
|
var tab = makePadding(2);
|
|
32931
32933
|
var result = [];
|
|
32932
32934
|
result.push("{");
|
|
32933
|
-
result.push(tab
|
|
32934
|
-
result.push(""
|
|
32935
|
+
result.push("".concat(tab, "\"compilerOptions\": {"));
|
|
32936
|
+
result.push("".concat(tab).concat(tab, "/* ").concat(ts.getLocaleSpecificMessage(ts.Diagnostics.Visit_https_Colon_Slash_Slashaka_ms_Slashtsconfig_json_to_read_more_about_this_file), " */"));
|
|
32935
32937
|
result.push("");
|
|
32936
32938
|
for (var _a = 0, entries_2 = entries; _a < entries_2.length; _a++) {
|
|
32937
32939
|
var entry = entries_2[_a];
|
|
32938
32940
|
var value = entry.value, _b = entry.description, description = _b === void 0 ? "" : _b;
|
|
32939
|
-
result.push(value && ""
|
|
32941
|
+
result.push(value && "".concat(tab).concat(tab).concat(value).concat(description && (makePadding(marginLength - value.length + 2) + description)));
|
|
32940
32942
|
}
|
|
32941
32943
|
if (fileNames.length) {
|
|
32942
|
-
result.push(tab
|
|
32943
|
-
result.push(tab
|
|
32944
|
+
result.push("".concat(tab, "},"));
|
|
32945
|
+
result.push("".concat(tab, "\"files\": ["));
|
|
32944
32946
|
for (var i = 0; i < fileNames.length; i++) {
|
|
32945
|
-
result.push(""
|
|
32947
|
+
result.push("".concat(tab).concat(tab).concat(JSON.stringify(fileNames[i])).concat(i === fileNames.length - 1 ? "" : ","));
|
|
32946
32948
|
}
|
|
32947
|
-
result.push(tab
|
|
32949
|
+
result.push("".concat(tab, "]"));
|
|
32948
32950
|
}
|
|
32949
32951
|
else {
|
|
32950
|
-
result.push(tab
|
|
32952
|
+
result.push("".concat(tab, "}"));
|
|
32951
32953
|
}
|
|
32952
32954
|
result.push("}");
|
|
32953
32955
|
return result.join(newLine) + newLine;
|
|
@@ -33297,7 +33299,7 @@ var ts;
|
|
|
33297
33299
|
if (ts.isRootedDiskPath(extendedConfig) || ts.startsWith(extendedConfig, "./") || ts.startsWith(extendedConfig, "../")) {
|
|
33298
33300
|
var extendedConfigPath = ts.getNormalizedAbsolutePath(extendedConfig, basePath);
|
|
33299
33301
|
if (!host.fileExists(extendedConfigPath) && !ts.endsWith(extendedConfigPath, ".json")) {
|
|
33300
|
-
extendedConfigPath = extendedConfigPath
|
|
33302
|
+
extendedConfigPath = "".concat(extendedConfigPath, ".json");
|
|
33301
33303
|
if (!host.fileExists(extendedConfigPath)) {
|
|
33302
33304
|
errors.push(createDiagnostic(ts.Diagnostics.File_0_not_found, extendedConfig));
|
|
33303
33305
|
return undefined;
|
|
@@ -33493,7 +33495,7 @@ var ts;
|
|
|
33493
33495
|
if (ts.fileExtensionIs(file, ".json")) {
|
|
33494
33496
|
if (!jsonOnlyIncludeRegexes) {
|
|
33495
33497
|
var includes = validatedIncludeSpecs.filter(function (s) { return ts.endsWith(s, ".json"); });
|
|
33496
|
-
var includeFilePatterns = ts.map(ts.getRegularExpressionsForWildcards(includes, basePath, "files"), function (pattern) { return "^"
|
|
33498
|
+
var includeFilePatterns = ts.map(ts.getRegularExpressionsForWildcards(includes, basePath, "files"), function (pattern) { return "^".concat(pattern, "$"); });
|
|
33497
33499
|
jsonOnlyIncludeRegexes = includeFilePatterns ? includeFilePatterns.map(function (pattern) { return ts.getRegexFromPattern(pattern, host.useCaseSensitiveFileNames); }) : ts.emptyArray;
|
|
33498
33500
|
}
|
|
33499
33501
|
var includeIndex = ts.findIndex(jsonOnlyIncludeRegexes, function (re) { return re.test(file); });
|
|
@@ -33865,7 +33867,7 @@ var ts;
|
|
|
33865
33867
|
var bestVersionKey = result.version, bestVersionPaths = result.paths;
|
|
33866
33868
|
if (typeof bestVersionPaths !== "object") {
|
|
33867
33869
|
if (state.traceEnabled) {
|
|
33868
|
-
trace(state.host, ts.Diagnostics.Expected_type_of_0_field_in_package_json_to_be_1_got_2, "typesVersions['"
|
|
33870
|
+
trace(state.host, ts.Diagnostics.Expected_type_of_0_field_in_package_json_to_be_1_got_2, "typesVersions['".concat(bestVersionKey, "']"), "object", typeof bestVersionPaths);
|
|
33869
33871
|
}
|
|
33870
33872
|
return;
|
|
33871
33873
|
}
|
|
@@ -34234,7 +34236,7 @@ var ts;
|
|
|
34234
34236
|
};
|
|
34235
34237
|
return cache;
|
|
34236
34238
|
function getUnderlyingCacheKey(specifier, mode) {
|
|
34237
|
-
var result = mode === undefined ? specifier : mode
|
|
34239
|
+
var result = mode === undefined ? specifier : "".concat(mode, "|").concat(specifier);
|
|
34238
34240
|
memoizedReverseKeys.set(result, [specifier, mode]);
|
|
34239
34241
|
return result;
|
|
34240
34242
|
}
|
|
@@ -34264,7 +34266,7 @@ var ts;
|
|
|
34264
34266
|
}
|
|
34265
34267
|
function getOrCreateCacheForModuleName(nonRelativeModuleName, mode, redirectedReference) {
|
|
34266
34268
|
ts.Debug.assert(!ts.isExternalModuleNameRelative(nonRelativeModuleName));
|
|
34267
|
-
return getOrCreateCache(moduleNameToDirectoryMap, redirectedReference, mode === undefined ? nonRelativeModuleName : mode
|
|
34269
|
+
return getOrCreateCache(moduleNameToDirectoryMap, redirectedReference, mode === undefined ? nonRelativeModuleName : "".concat(mode, "|").concat(nonRelativeModuleName), createPerModuleNameCache);
|
|
34268
34270
|
}
|
|
34269
34271
|
function createPerModuleNameCache() {
|
|
34270
34272
|
var directoryPathMap = new ts.Map();
|
|
@@ -34392,10 +34394,10 @@ var ts;
|
|
|
34392
34394
|
result = classicNameResolver(moduleName, containingFile, compilerOptions, host, cache, redirectedReference);
|
|
34393
34395
|
break;
|
|
34394
34396
|
default:
|
|
34395
|
-
return ts.Debug.fail("Unexpected moduleResolution: "
|
|
34397
|
+
return ts.Debug.fail("Unexpected moduleResolution: ".concat(moduleResolution));
|
|
34396
34398
|
}
|
|
34397
34399
|
if (result && result.resolvedModule)
|
|
34398
|
-
ts.perfLogger.logInfoEvent("Module \""
|
|
34400
|
+
ts.perfLogger.logInfoEvent("Module \"".concat(moduleName, "\" resolved to \"").concat(result.resolvedModule.resolvedFileName, "\""));
|
|
34399
34401
|
ts.perfLogger.logStopResolveModule((result && result.resolvedModule) ? "" + result.resolvedModule.resolvedFileName : "null");
|
|
34400
34402
|
if (perFolderCache) {
|
|
34401
34403
|
perFolderCache.set(moduleName, resolutionMode, result);
|
|
@@ -34525,7 +34527,7 @@ var ts;
|
|
|
34525
34527
|
function resolveJSModule(moduleName, initialDir, host) {
|
|
34526
34528
|
var _a = tryResolveJSModuleWorker(moduleName, initialDir, host), resolvedModule = _a.resolvedModule, failedLookupLocations = _a.failedLookupLocations;
|
|
34527
34529
|
if (!resolvedModule) {
|
|
34528
|
-
throw new Error("Could not resolve JS module '"
|
|
34530
|
+
throw new Error("Could not resolve JS module '".concat(moduleName, "' starting at '").concat(initialDir, "'. Looked in: ").concat(failedLookupLocations.join(", ")));
|
|
34529
34531
|
}
|
|
34530
34532
|
return resolvedModule.resolvedFileName;
|
|
34531
34533
|
}
|
|
@@ -34624,7 +34626,7 @@ var ts;
|
|
|
34624
34626
|
if (traceEnabled) {
|
|
34625
34627
|
trace(host, ts.Diagnostics.Resolving_real_path_for_0_result_1, path, real);
|
|
34626
34628
|
}
|
|
34627
|
-
ts.Debug.assert(host.fileExists(real), path
|
|
34629
|
+
ts.Debug.assert(host.fileExists(real), "".concat(path, " linked to nonexistent file ").concat(real));
|
|
34628
34630
|
return real;
|
|
34629
34631
|
}
|
|
34630
34632
|
function nodeLoadModuleByRelativeName(extensions, candidate, onlyRecordFailures, state, considerPackageJson) {
|
|
@@ -35056,7 +35058,7 @@ var ts;
|
|
|
35056
35058
|
return undefined;
|
|
35057
35059
|
}
|
|
35058
35060
|
var trailingParts = parts.slice(nameParts.length);
|
|
35059
|
-
return loadModuleFromExports(scope, extensions, !ts.length(trailingParts) ? "." : "."
|
|
35061
|
+
return loadModuleFromExports(scope, extensions, !ts.length(trailingParts) ? "." : ".".concat(ts.directorySeparator).concat(trailingParts.join(ts.directorySeparator)), state, cache, redirectedReference);
|
|
35060
35062
|
}
|
|
35061
35063
|
function loadModuleFromExports(scope, extensions, subpath, state, cache, redirectedReference) {
|
|
35062
35064
|
if (!scope.packageJsonContent.exports) {
|
|
@@ -35368,7 +35370,7 @@ var ts;
|
|
|
35368
35370
|
return mangled;
|
|
35369
35371
|
}
|
|
35370
35372
|
function getTypesPackageName(packageName) {
|
|
35371
|
-
return "@types/"
|
|
35373
|
+
return "@types/".concat(mangleScopedPackageName(packageName));
|
|
35372
35374
|
}
|
|
35373
35375
|
ts.getTypesPackageName = getTypesPackageName;
|
|
35374
35376
|
function mangleScopedPackageName(packageName) {
|
|
@@ -35694,7 +35696,7 @@ var ts;
|
|
|
35694
35696
|
if (name) {
|
|
35695
35697
|
if (ts.isAmbientModule(node)) {
|
|
35696
35698
|
var moduleName = ts.getTextOfIdentifierOrLiteral(name);
|
|
35697
|
-
return (ts.isGlobalScopeAugmentation(node) ? "__global" : "\""
|
|
35699
|
+
return (ts.isGlobalScopeAugmentation(node) ? "__global" : "\"".concat(moduleName, "\""));
|
|
35698
35700
|
}
|
|
35699
35701
|
if (name.kind === 161) {
|
|
35700
35702
|
var nameExpression = name.expression;
|
|
@@ -35743,7 +35745,7 @@ var ts;
|
|
|
35743
35745
|
case 315:
|
|
35744
35746
|
return (ts.isJSDocConstructSignature(node) ? "__new" : "__call");
|
|
35745
35747
|
case 163:
|
|
35746
|
-
ts.Debug.assert(node.parent.kind === 315, "Impossible parameter parent kind", function () { return "parent is: "
|
|
35748
|
+
ts.Debug.assert(node.parent.kind === 315, "Impossible parameter parent kind", function () { return "parent is: ".concat(ts.SyntaxKind ? ts.SyntaxKind[node.parent.kind] : node.parent.kind, ", expected JSDocFunctionType"); });
|
|
35747
35749
|
var functionType = node.parent;
|
|
35748
35750
|
var index = functionType.parameters.indexOf(node);
|
|
35749
35751
|
return "arg" + index;
|
|
@@ -35809,7 +35811,7 @@ var ts;
|
|
|
35809
35811
|
}
|
|
35810
35812
|
var relatedInformation_1 = [];
|
|
35811
35813
|
if (ts.isTypeAliasDeclaration(node) && ts.nodeIsMissing(node.type) && ts.hasSyntacticModifier(node, 1) && symbol.flags & (2097152 | 788968 | 1920)) {
|
|
35812
|
-
relatedInformation_1.push(createDiagnosticForNode(node, ts.Diagnostics.Did_you_mean_0, "export type { "
|
|
35814
|
+
relatedInformation_1.push(createDiagnosticForNode(node, ts.Diagnostics.Did_you_mean_0, "export type { ".concat(ts.unescapeLeadingUnderscores(node.name.escapedText), " }")));
|
|
35813
35815
|
}
|
|
35814
35816
|
var declarationName_1 = ts.getNameOfDeclaration(node) || node;
|
|
35815
35817
|
ts.forEach(symbol.declarations, function (declaration, index) {
|
|
@@ -37631,7 +37633,7 @@ var ts;
|
|
|
37631
37633
|
}
|
|
37632
37634
|
}
|
|
37633
37635
|
function bindSourceFileAsExternalModule() {
|
|
37634
|
-
bindAnonymousDeclaration(file, 512, "\""
|
|
37636
|
+
bindAnonymousDeclaration(file, 512, "\"".concat(ts.removeFileExtension(file.fileName), "\""));
|
|
37635
37637
|
}
|
|
37636
37638
|
function bindExportAssignment(node) {
|
|
37637
37639
|
if (!container.symbol || !container.symbol.exports) {
|
|
@@ -39350,7 +39352,7 @@ var ts;
|
|
|
39350
39352
|
if (sourceSymbolFile && targetSymbolFile && amalgamatedDuplicates && !isEitherEnum && sourceSymbolFile !== targetSymbolFile) {
|
|
39351
39353
|
var firstFile_1 = ts.comparePaths(sourceSymbolFile.path, targetSymbolFile.path) === -1 ? sourceSymbolFile : targetSymbolFile;
|
|
39352
39354
|
var secondFile_1 = firstFile_1 === sourceSymbolFile ? targetSymbolFile : sourceSymbolFile;
|
|
39353
|
-
var filesDuplicates = ts.getOrUpdate(amalgamatedDuplicates, firstFile_1.path
|
|
39355
|
+
var filesDuplicates = ts.getOrUpdate(amalgamatedDuplicates, "".concat(firstFile_1.path, "|").concat(secondFile_1.path), function () {
|
|
39354
39356
|
return ({ firstFile: firstFile_1, secondFile: secondFile_1, conflictingSymbols: new ts.Map() });
|
|
39355
39357
|
});
|
|
39356
39358
|
var conflictingSymbolInfo = ts.getOrUpdate(filesDuplicates.conflictingSymbols, symbolName_1, function () {
|
|
@@ -41634,7 +41636,7 @@ var ts;
|
|
|
41634
41636
|
var links = getSymbolLinks(symbol);
|
|
41635
41637
|
var cache = (links.accessibleChainCache || (links.accessibleChainCache = new ts.Map()));
|
|
41636
41638
|
var firstRelevantLocation = forEachSymbolTableInScope(enclosingDeclaration, function (_, __, ___, node) { return node; });
|
|
41637
|
-
var key = (useOnlyExternalAliasing ? 0 : 1
|
|
41639
|
+
var key = "".concat(useOnlyExternalAliasing ? 0 : 1, "|").concat(firstRelevantLocation && getNodeId(firstRelevantLocation), "|").concat(meaning);
|
|
41638
41640
|
if (cache.has(key)) {
|
|
41639
41641
|
return cache.get(key);
|
|
41640
41642
|
}
|
|
@@ -42402,7 +42404,7 @@ var ts;
|
|
|
42402
42404
|
context.symbolDepth = new ts.Map();
|
|
42403
42405
|
}
|
|
42404
42406
|
var links = context.enclosingDeclaration && getNodeLinks(context.enclosingDeclaration);
|
|
42405
|
-
var key = getTypeId(type)
|
|
42407
|
+
var key = "".concat(getTypeId(type), "|").concat(context.flags);
|
|
42406
42408
|
if (links) {
|
|
42407
42409
|
links.serializedTypes || (links.serializedTypes = new ts.Map());
|
|
42408
42410
|
}
|
|
@@ -42657,7 +42659,7 @@ var ts;
|
|
|
42657
42659
|
}
|
|
42658
42660
|
}
|
|
42659
42661
|
if (checkTruncationLength(context) && (i + 2 < properties.length - 1)) {
|
|
42660
|
-
typeElements.push(ts.factory.createPropertySignature(undefined, "... "
|
|
42662
|
+
typeElements.push(ts.factory.createPropertySignature(undefined, "... ".concat(properties.length - i, " more ..."), undefined, undefined));
|
|
42661
42663
|
addPropertyToElementList(properties[properties.length - 1], context, typeElements);
|
|
42662
42664
|
break;
|
|
42663
42665
|
}
|
|
@@ -42765,7 +42767,7 @@ var ts;
|
|
|
42765
42767
|
else if (types.length > 2) {
|
|
42766
42768
|
return [
|
|
42767
42769
|
typeToTypeNodeHelper(types[0], context),
|
|
42768
|
-
ts.factory.createTypeReferenceNode("... "
|
|
42770
|
+
ts.factory.createTypeReferenceNode("... ".concat(types.length - 2, " more ..."), undefined),
|
|
42769
42771
|
typeToTypeNodeHelper(types[types.length - 1], context)
|
|
42770
42772
|
];
|
|
42771
42773
|
}
|
|
@@ -42778,7 +42780,7 @@ var ts;
|
|
|
42778
42780
|
var type = types_2[_i];
|
|
42779
42781
|
i++;
|
|
42780
42782
|
if (checkTruncationLength(context) && (i + 2 < types.length - 1)) {
|
|
42781
|
-
result_5.push(ts.factory.createTypeReferenceNode("... "
|
|
42783
|
+
result_5.push(ts.factory.createTypeReferenceNode("... ".concat(types.length - i, " more ..."), undefined));
|
|
42782
42784
|
var typeNode_1 = typeToTypeNodeHelper(types[types.length - 1], context);
|
|
42783
42785
|
if (typeNode_1) {
|
|
42784
42786
|
result_5.push(typeNode_1);
|
|
@@ -43254,7 +43256,7 @@ var ts;
|
|
|
43254
43256
|
var text = rawtext;
|
|
43255
43257
|
while (((_b = context.typeParameterNamesByText) === null || _b === void 0 ? void 0 : _b.has(text)) || typeParameterShadowsNameInScope(text, context, type)) {
|
|
43256
43258
|
i++;
|
|
43257
|
-
text = rawtext
|
|
43259
|
+
text = "".concat(rawtext, "_").concat(i);
|
|
43258
43260
|
}
|
|
43259
43261
|
if (text !== rawtext) {
|
|
43260
43262
|
result = ts.factory.createIdentifier(text, result.typeArguments);
|
|
@@ -43536,7 +43538,7 @@ var ts;
|
|
|
43536
43538
|
function getNameForJSDocFunctionParameter(p, index) {
|
|
43537
43539
|
return p.name && ts.isIdentifier(p.name) && p.name.escapedText === "this" ? "this"
|
|
43538
43540
|
: getEffectiveDotDotDotForParameter(p) ? "args"
|
|
43539
|
-
: "arg"
|
|
43541
|
+
: "arg".concat(index);
|
|
43540
43542
|
}
|
|
43541
43543
|
function rewriteModuleSpecifier(parent, lit) {
|
|
43542
43544
|
if (bundled) {
|
|
@@ -44345,7 +44347,7 @@ var ts;
|
|
|
44345
44347
|
}
|
|
44346
44348
|
return results_1;
|
|
44347
44349
|
}
|
|
44348
|
-
return ts.Debug.fail("Unhandled class member kind! "
|
|
44350
|
+
return ts.Debug.fail("Unhandled class member kind! ".concat(p.__debugFlags || p.flags));
|
|
44349
44351
|
};
|
|
44350
44352
|
}
|
|
44351
44353
|
function serializePropertySymbolForInterface(p, baseType) {
|
|
@@ -44415,7 +44417,7 @@ var ts;
|
|
|
44415
44417
|
if (ref) {
|
|
44416
44418
|
return ref;
|
|
44417
44419
|
}
|
|
44418
|
-
var tempName = getUnusedName(rootName
|
|
44420
|
+
var tempName = getUnusedName("".concat(rootName, "_base"));
|
|
44419
44421
|
var statement = ts.factory.createVariableStatement(undefined, ts.factory.createVariableDeclarationList([
|
|
44420
44422
|
ts.factory.createVariableDeclaration(tempName, undefined, typeToTypeNodeHelper(staticType, context))
|
|
44421
44423
|
], 2));
|
|
@@ -44460,7 +44462,7 @@ var ts;
|
|
|
44460
44462
|
var original = input;
|
|
44461
44463
|
while ((_a = context.usedSymbolNames) === null || _a === void 0 ? void 0 : _a.has(input)) {
|
|
44462
44464
|
i++;
|
|
44463
|
-
input = original
|
|
44465
|
+
input = "".concat(original, "_").concat(i);
|
|
44464
44466
|
}
|
|
44465
44467
|
(_b = context.usedSymbolNames) === null || _b === void 0 ? void 0 : _b.add(input);
|
|
44466
44468
|
if (id) {
|
|
@@ -44566,15 +44568,15 @@ var ts;
|
|
|
44566
44568
|
if (nameType.flags & 384) {
|
|
44567
44569
|
var name = "" + nameType.value;
|
|
44568
44570
|
if (!ts.isIdentifierText(name, ts.getEmitScriptTarget(compilerOptions)) && !ts.isNumericLiteralName(name)) {
|
|
44569
|
-
return "\""
|
|
44571
|
+
return "\"".concat(ts.escapeString(name, 34), "\"");
|
|
44570
44572
|
}
|
|
44571
44573
|
if (ts.isNumericLiteralName(name) && ts.startsWith(name, "-")) {
|
|
44572
|
-
return "["
|
|
44574
|
+
return "[".concat(name, "]");
|
|
44573
44575
|
}
|
|
44574
44576
|
return name;
|
|
44575
44577
|
}
|
|
44576
44578
|
if (nameType.flags & 8192) {
|
|
44577
|
-
return "["
|
|
44579
|
+
return "[".concat(getNameOfSymbolAsWritten(nameType.symbol, context), "]");
|
|
44578
44580
|
}
|
|
44579
44581
|
}
|
|
44580
44582
|
}
|
|
@@ -47019,7 +47021,7 @@ var ts;
|
|
|
47019
47021
|
!leftName ? rightName :
|
|
47020
47022
|
!rightName ? leftName :
|
|
47021
47023
|
undefined;
|
|
47022
|
-
var paramSymbol = createSymbol(1 | (isOptional && !isRestParam ? 16777216 : 0), paramName || "arg"
|
|
47024
|
+
var paramSymbol = createSymbol(1 | (isOptional && !isRestParam ? 16777216 : 0), paramName || "arg".concat(i));
|
|
47023
47025
|
paramSymbol.type = isRestParam ? createArrayType(unionParamType) : unionParamType;
|
|
47024
47026
|
params[i] = paramSymbol;
|
|
47025
47027
|
}
|
|
@@ -48732,7 +48734,7 @@ var ts;
|
|
|
48732
48734
|
return result;
|
|
48733
48735
|
}
|
|
48734
48736
|
function getAliasId(aliasSymbol, aliasTypeArguments) {
|
|
48735
|
-
return aliasSymbol ? "@"
|
|
48737
|
+
return aliasSymbol ? "@".concat(getSymbolId(aliasSymbol)) + (aliasTypeArguments ? ":".concat(getTypeListId(aliasTypeArguments)) : "") : "";
|
|
48736
48738
|
}
|
|
48737
48739
|
function getPropagatingFlagsOfTypes(types, excludeKinds) {
|
|
48738
48740
|
var result = 0;
|
|
@@ -48895,7 +48897,7 @@ var ts;
|
|
|
48895
48897
|
return undefined;
|
|
48896
48898
|
}
|
|
48897
48899
|
function getSymbolPath(symbol) {
|
|
48898
|
-
return symbol.parent ? getSymbolPath(symbol.parent)
|
|
48900
|
+
return symbol.parent ? "".concat(getSymbolPath(symbol.parent), ".").concat(symbol.escapedName) : symbol.escapedName;
|
|
48899
48901
|
}
|
|
48900
48902
|
function getUnresolvedSymbolForEntityName(name) {
|
|
48901
48903
|
var identifier = name.kind === 160 ? name.right :
|
|
@@ -48906,7 +48908,7 @@ var ts;
|
|
|
48906
48908
|
var parentSymbol = name.kind === 160 ? getUnresolvedSymbolForEntityName(name.left) :
|
|
48907
48909
|
name.kind === 205 ? getUnresolvedSymbolForEntityName(name.expression) :
|
|
48908
48910
|
undefined;
|
|
48909
|
-
var path = parentSymbol ? getSymbolPath(parentSymbol)
|
|
48911
|
+
var path = parentSymbol ? "".concat(getSymbolPath(parentSymbol), ".").concat(text) : text;
|
|
48910
48912
|
var result = unresolvedSymbols.get(path);
|
|
48911
48913
|
if (!result) {
|
|
48912
48914
|
unresolvedSymbols.set(path, result = createSymbol(524288, text, 1048576));
|
|
@@ -48972,7 +48974,7 @@ var ts;
|
|
|
48972
48974
|
if (substitute.flags & 3 || substitute === baseType) {
|
|
48973
48975
|
return baseType;
|
|
48974
48976
|
}
|
|
48975
|
-
var id = getTypeId(baseType)
|
|
48977
|
+
var id = "".concat(getTypeId(baseType), ">").concat(getTypeId(substitute));
|
|
48976
48978
|
var cached = substitutionTypes.get(id);
|
|
48977
48979
|
if (cached) {
|
|
48978
48980
|
return cached;
|
|
@@ -49816,9 +49818,9 @@ var ts;
|
|
|
49816
49818
|
return types[0];
|
|
49817
49819
|
}
|
|
49818
49820
|
var typeKey = !origin ? getTypeListId(types) :
|
|
49819
|
-
origin.flags & 1048576 ? "|"
|
|
49820
|
-
origin.flags & 2097152 ? "&"
|
|
49821
|
-
"#"
|
|
49821
|
+
origin.flags & 1048576 ? "|".concat(getTypeListId(origin.types)) :
|
|
49822
|
+
origin.flags & 2097152 ? "&".concat(getTypeListId(origin.types)) :
|
|
49823
|
+
"#".concat(origin.type.id, "|").concat(getTypeListId(types));
|
|
49822
49824
|
var id = typeKey + getAliasId(aliasSymbol, aliasTypeArguments);
|
|
49823
49825
|
var type = unionTypes.get(id);
|
|
49824
49826
|
if (!type) {
|
|
@@ -50268,7 +50270,7 @@ var ts;
|
|
|
50268
50270
|
if (ts.every(newTexts, function (t) { return t === ""; }) && ts.every(newTypes, function (t) { return !!(t.flags & 4); })) {
|
|
50269
50271
|
return stringType;
|
|
50270
50272
|
}
|
|
50271
|
-
var id = getTypeListId(newTypes)
|
|
50273
|
+
var id = "".concat(getTypeListId(newTypes), "|").concat(ts.map(newTexts, function (t) { return t.length; }).join(","), "|").concat(newTexts.join(""));
|
|
50272
50274
|
var type = templateLiteralTypes.get(id);
|
|
50273
50275
|
if (!type) {
|
|
50274
50276
|
templateLiteralTypes.set(id, type = createTemplateLiteralType(newTexts, newTypes));
|
|
@@ -50328,7 +50330,7 @@ var ts;
|
|
|
50328
50330
|
return str;
|
|
50329
50331
|
}
|
|
50330
50332
|
function getStringMappingTypeForGenericType(symbol, type) {
|
|
50331
|
-
var id = getSymbolId(symbol)
|
|
50333
|
+
var id = "".concat(getSymbolId(symbol), ",").concat(getTypeId(type));
|
|
50332
50334
|
var result = stringMappingTypes.get(id);
|
|
50333
50335
|
if (!result) {
|
|
50334
50336
|
stringMappingTypes.set(id, result = createStringMappingType(symbol, type));
|
|
@@ -51236,7 +51238,7 @@ var ts;
|
|
|
51236
51238
|
function createUniqueESSymbolType(symbol) {
|
|
51237
51239
|
var type = createType(8192);
|
|
51238
51240
|
type.symbol = symbol;
|
|
51239
|
-
type.escapedName = "__@"
|
|
51241
|
+
type.escapedName = "__@".concat(type.symbol.escapedName, "@").concat(getSymbolId(type.symbol));
|
|
51240
51242
|
return type;
|
|
51241
51243
|
}
|
|
51242
51244
|
function getESSymbolLikeTypeForNode(node) {
|
|
@@ -52669,11 +52671,11 @@ var ts;
|
|
|
52669
52671
|
var overflow = false;
|
|
52670
52672
|
var overrideNextErrorInfo = 0;
|
|
52671
52673
|
var lastSkippedInfo;
|
|
52672
|
-
var incompatibleStack
|
|
52674
|
+
var incompatibleStack;
|
|
52673
52675
|
var inPropertyCheck = false;
|
|
52674
52676
|
ts.Debug.assert(relation !== identityRelation || !errorNode, "no error reporting in identity checking");
|
|
52675
52677
|
var result = isRelatedTo(source, target, 3, !!errorNode, headMessage);
|
|
52676
|
-
if (incompatibleStack
|
|
52678
|
+
if (incompatibleStack) {
|
|
52677
52679
|
reportIncompatibleStack();
|
|
52678
52680
|
}
|
|
52679
52681
|
if (overflow) {
|
|
@@ -52728,19 +52730,19 @@ var ts;
|
|
|
52728
52730
|
return {
|
|
52729
52731
|
errorInfo: errorInfo,
|
|
52730
52732
|
lastSkippedInfo: lastSkippedInfo,
|
|
52731
|
-
incompatibleStack: incompatibleStack.slice(),
|
|
52733
|
+
incompatibleStack: incompatibleStack === null || incompatibleStack === void 0 ? void 0 : incompatibleStack.slice(),
|
|
52732
52734
|
overrideNextErrorInfo: overrideNextErrorInfo,
|
|
52733
|
-
relatedInfo:
|
|
52735
|
+
relatedInfo: relatedInfo === null || relatedInfo === void 0 ? void 0 : relatedInfo.slice(),
|
|
52734
52736
|
};
|
|
52735
52737
|
}
|
|
52736
52738
|
function reportIncompatibleError(message, arg0, arg1, arg2, arg3) {
|
|
52737
52739
|
overrideNextErrorInfo++;
|
|
52738
52740
|
lastSkippedInfo = undefined;
|
|
52739
|
-
incompatibleStack.push([message, arg0, arg1, arg2, arg3]);
|
|
52741
|
+
(incompatibleStack || (incompatibleStack = [])).push([message, arg0, arg1, arg2, arg3]);
|
|
52740
52742
|
}
|
|
52741
52743
|
function reportIncompatibleStack() {
|
|
52742
|
-
var stack = incompatibleStack;
|
|
52743
|
-
incompatibleStack =
|
|
52744
|
+
var stack = incompatibleStack || [];
|
|
52745
|
+
incompatibleStack = undefined;
|
|
52744
52746
|
var info = lastSkippedInfo;
|
|
52745
52747
|
lastSkippedInfo = undefined;
|
|
52746
52748
|
if (stack.length === 1) {
|
|
@@ -52757,20 +52759,20 @@ var ts;
|
|
|
52757
52759
|
switch (msg.code) {
|
|
52758
52760
|
case ts.Diagnostics.Types_of_property_0_are_incompatible.code: {
|
|
52759
52761
|
if (path.indexOf("new ") === 0) {
|
|
52760
|
-
path = "("
|
|
52762
|
+
path = "(".concat(path, ")");
|
|
52761
52763
|
}
|
|
52762
52764
|
var str = "" + args[0];
|
|
52763
52765
|
if (path.length === 0) {
|
|
52764
|
-
path = ""
|
|
52766
|
+
path = "".concat(str);
|
|
52765
52767
|
}
|
|
52766
52768
|
else if (ts.isIdentifierText(str, ts.getEmitScriptTarget(compilerOptions))) {
|
|
52767
|
-
path = path
|
|
52769
|
+
path = "".concat(path, ".").concat(str);
|
|
52768
52770
|
}
|
|
52769
52771
|
else if (str[0] === "[" && str[str.length - 1] === "]") {
|
|
52770
|
-
path = ""
|
|
52772
|
+
path = "".concat(path).concat(str);
|
|
52771
52773
|
}
|
|
52772
52774
|
else {
|
|
52773
|
-
path = path
|
|
52775
|
+
path = "".concat(path, "[").concat(str, "]");
|
|
52774
52776
|
}
|
|
52775
52777
|
break;
|
|
52776
52778
|
}
|
|
@@ -52797,7 +52799,7 @@ var ts;
|
|
|
52797
52799
|
msg.code === ts.Diagnostics.Construct_signatures_with_no_arguments_have_incompatible_return_types_0_and_1.code)
|
|
52798
52800
|
? ""
|
|
52799
52801
|
: "...";
|
|
52800
|
-
path = ""
|
|
52802
|
+
path = "".concat(prefix).concat(path, "(").concat(params, ")");
|
|
52801
52803
|
}
|
|
52802
52804
|
break;
|
|
52803
52805
|
}
|
|
@@ -52810,7 +52812,7 @@ var ts;
|
|
|
52810
52812
|
break;
|
|
52811
52813
|
}
|
|
52812
52814
|
default:
|
|
52813
|
-
return ts.Debug.fail("Unhandled Diagnostic: "
|
|
52815
|
+
return ts.Debug.fail("Unhandled Diagnostic: ".concat(msg.code));
|
|
52814
52816
|
}
|
|
52815
52817
|
}
|
|
52816
52818
|
if (path) {
|
|
@@ -52834,7 +52836,7 @@ var ts;
|
|
|
52834
52836
|
}
|
|
52835
52837
|
function reportError(message, arg0, arg1, arg2, arg3) {
|
|
52836
52838
|
ts.Debug.assert(!!errorNode);
|
|
52837
|
-
if (incompatibleStack
|
|
52839
|
+
if (incompatibleStack)
|
|
52838
52840
|
reportIncompatibleStack();
|
|
52839
52841
|
if (message.elidedInCompatabilityPyramid)
|
|
52840
52842
|
return;
|
|
@@ -52850,7 +52852,7 @@ var ts;
|
|
|
52850
52852
|
}
|
|
52851
52853
|
}
|
|
52852
52854
|
function reportRelationError(message, source, target) {
|
|
52853
|
-
if (incompatibleStack
|
|
52855
|
+
if (incompatibleStack)
|
|
52854
52856
|
reportIncompatibleStack();
|
|
52855
52857
|
var _a = getTypeNamesForErrorDisplay(source, target), sourceType = _a[0], targetType = _a[1];
|
|
52856
52858
|
var generalizedSource = source;
|
|
@@ -52941,7 +52943,9 @@ var ts;
|
|
|
52941
52943
|
if (isSimpleTypeRelatedTo(originalSource, originalTarget, relation, reportErrors ? reportError : undefined)) {
|
|
52942
52944
|
return -1;
|
|
52943
52945
|
}
|
|
52944
|
-
|
|
52946
|
+
if (reportErrors) {
|
|
52947
|
+
reportErrorResults(originalSource, originalTarget, originalSource, originalTarget, headMessage);
|
|
52948
|
+
}
|
|
52945
52949
|
return 0;
|
|
52946
52950
|
}
|
|
52947
52951
|
var source = getNormalizedType(originalSource, false);
|
|
@@ -52949,127 +52953,121 @@ var ts;
|
|
|
52949
52953
|
if (source === target)
|
|
52950
52954
|
return -1;
|
|
52951
52955
|
if (relation === identityRelation) {
|
|
52952
|
-
|
|
52956
|
+
if (source.flags !== target.flags)
|
|
52957
|
+
return 0;
|
|
52958
|
+
if (source.flags & 67358815)
|
|
52959
|
+
return -1;
|
|
52960
|
+
traceUnionsOrIntersectionsTooLarge(source, target);
|
|
52961
|
+
return recursiveTypeRelatedTo(source, target, false, 0, recursionFlags);
|
|
52953
52962
|
}
|
|
52954
52963
|
if (source.flags & 262144 && getConstraintOfType(source) === target) {
|
|
52955
52964
|
return -1;
|
|
52956
52965
|
}
|
|
52957
|
-
if (
|
|
52958
|
-
|
|
52959
|
-
var
|
|
52960
|
-
|
|
52961
|
-
|
|
52966
|
+
if (source.flags & 470302716 && target.flags & 1048576) {
|
|
52967
|
+
var types = target.types;
|
|
52968
|
+
var candidate = types.length === 2 && types[0].flags & 98304 ? types[1] :
|
|
52969
|
+
types.length === 3 && types[0].flags & 98304 && types[1].flags & 98304 ? types[2] :
|
|
52970
|
+
undefined;
|
|
52971
|
+
if (candidate && !(candidate.flags & 98304)) {
|
|
52972
|
+
target = getNormalizedType(candidate, true);
|
|
52973
|
+
if (source === target)
|
|
52974
|
+
return -1;
|
|
52962
52975
|
}
|
|
52963
|
-
if (source === nullStrippedTarget)
|
|
52964
|
-
return -1;
|
|
52965
52976
|
}
|
|
52966
52977
|
if (relation === comparableRelation && !(target.flags & 131072) && isSimpleTypeRelatedTo(target, source, relation) ||
|
|
52967
52978
|
isSimpleTypeRelatedTo(source, target, relation, reportErrors ? reportError : undefined))
|
|
52968
52979
|
return -1;
|
|
52969
|
-
|
|
52970
|
-
|
|
52971
|
-
|
|
52972
|
-
|
|
52980
|
+
if (source.flags & 469499904 || target.flags & 469499904) {
|
|
52981
|
+
var isPerformingExcessPropertyChecks = !(intersectionState & 2) && (isObjectLiteralType(source) && ts.getObjectFlags(source) & 16384);
|
|
52982
|
+
if (isPerformingExcessPropertyChecks) {
|
|
52983
|
+
if (hasExcessProperties(source, target, reportErrors)) {
|
|
52984
|
+
if (reportErrors) {
|
|
52985
|
+
reportRelationError(headMessage, source, originalTarget.aliasSymbol ? originalTarget : target);
|
|
52986
|
+
}
|
|
52987
|
+
return 0;
|
|
52988
|
+
}
|
|
52989
|
+
}
|
|
52990
|
+
var isPerformingCommonPropertyChecks = relation !== comparableRelation && !(intersectionState & 2) &&
|
|
52991
|
+
source.flags & (131068 | 524288 | 2097152) && source !== globalObjectType &&
|
|
52992
|
+
target.flags & (524288 | 2097152) && isWeakType(target) &&
|
|
52993
|
+
(getPropertiesOfType(source).length > 0 || typeHasCallOrConstructSignatures(source));
|
|
52994
|
+
var isComparingJsxAttributes = !!(ts.getObjectFlags(source) & 2048);
|
|
52995
|
+
if (isPerformingCommonPropertyChecks && !hasCommonProperties(source, target, isComparingJsxAttributes)) {
|
|
52973
52996
|
if (reportErrors) {
|
|
52974
|
-
|
|
52997
|
+
var sourceString = typeToString(originalSource.aliasSymbol ? originalSource : source);
|
|
52998
|
+
var targetString = typeToString(originalTarget.aliasSymbol ? originalTarget : target);
|
|
52999
|
+
var calls = getSignaturesOfType(source, 0);
|
|
53000
|
+
var constructs = getSignaturesOfType(source, 1);
|
|
53001
|
+
if (calls.length > 0 && isRelatedTo(getReturnTypeOfSignature(calls[0]), target, 1, false) ||
|
|
53002
|
+
constructs.length > 0 && isRelatedTo(getReturnTypeOfSignature(constructs[0]), target, 1, false)) {
|
|
53003
|
+
reportError(ts.Diagnostics.Value_of_type_0_has_no_properties_in_common_with_type_1_Did_you_mean_to_call_it, sourceString, targetString);
|
|
53004
|
+
}
|
|
53005
|
+
else {
|
|
53006
|
+
reportError(ts.Diagnostics.Type_0_has_no_properties_in_common_with_type_1, sourceString, targetString);
|
|
53007
|
+
}
|
|
52975
53008
|
}
|
|
52976
53009
|
return 0;
|
|
52977
53010
|
}
|
|
52978
|
-
|
|
52979
|
-
|
|
52980
|
-
|
|
52981
|
-
|
|
52982
|
-
|
|
52983
|
-
|
|
52984
|
-
if (
|
|
52985
|
-
|
|
52986
|
-
|
|
52987
|
-
|
|
52988
|
-
|
|
52989
|
-
if (calls.length > 0 && isRelatedTo(getReturnTypeOfSignature(calls[0]), target, 1, false) ||
|
|
52990
|
-
constructs.length > 0 && isRelatedTo(getReturnTypeOfSignature(constructs[0]), target, 1, false)) {
|
|
52991
|
-
reportError(ts.Diagnostics.Value_of_type_0_has_no_properties_in_common_with_type_1_Did_you_mean_to_call_it, sourceString, targetString);
|
|
52992
|
-
}
|
|
52993
|
-
else {
|
|
52994
|
-
reportError(ts.Diagnostics.Type_0_has_no_properties_in_common_with_type_1, sourceString, targetString);
|
|
52995
|
-
}
|
|
53011
|
+
traceUnionsOrIntersectionsTooLarge(source, target);
|
|
53012
|
+
var skipCaching = source.flags & 1048576 && source.types.length < 4 && !(target.flags & 1048576) ||
|
|
53013
|
+
target.flags & 1048576 && target.types.length < 4 && !(source.flags & 469499904);
|
|
53014
|
+
var result_7 = skipCaching ?
|
|
53015
|
+
unionOrIntersectionRelatedTo(source, target, reportErrors, intersectionState) :
|
|
53016
|
+
recursiveTypeRelatedTo(source, target, reportErrors, intersectionState, recursionFlags);
|
|
53017
|
+
if (result_7 && !inPropertyCheck && (target.flags & 2097152 && (isPerformingExcessPropertyChecks || isPerformingCommonPropertyChecks) ||
|
|
53018
|
+
isNonGenericObjectType(target) && !isArrayType(target) && !isTupleType(target) && source.flags & 2097152 && getApparentType(source).flags & 3670016 && !ts.some(source.types, function (t) { return !!(ts.getObjectFlags(t) & 524288); }))) {
|
|
53019
|
+
inPropertyCheck = true;
|
|
53020
|
+
result_7 &= recursiveTypeRelatedTo(source, target, reportErrors, 4, recursionFlags);
|
|
53021
|
+
inPropertyCheck = false;
|
|
52996
53022
|
}
|
|
52997
|
-
|
|
52998
|
-
|
|
52999
|
-
traceUnionsOrIntersectionsTooLarge(source, target);
|
|
53000
|
-
var result = 0;
|
|
53001
|
-
var saveErrorInfo = captureErrorCalculationState();
|
|
53002
|
-
if ((source.flags & 1048576 || target.flags & 1048576) && getConstituentCount(source) * getConstituentCount(target) < 4) {
|
|
53003
|
-
result = structuredTypeRelatedTo(source, target, reportErrors, intersectionState | 8);
|
|
53004
|
-
}
|
|
53005
|
-
else if (source.flags & 3145728 || target.flags & 3145728) {
|
|
53006
|
-
result = recursiveTypeRelatedTo(source, target, reportErrors, intersectionState | 8, recursionFlags);
|
|
53007
|
-
}
|
|
53008
|
-
if (!result && !(source.flags & 1048576) && (source.flags & (469499904) || target.flags & 469499904)) {
|
|
53009
|
-
if (result = recursiveTypeRelatedTo(source, target, reportErrors, intersectionState, recursionFlags)) {
|
|
53010
|
-
resetErrorInfo(saveErrorInfo);
|
|
53023
|
+
if (result_7) {
|
|
53024
|
+
return result_7;
|
|
53011
53025
|
}
|
|
53012
53026
|
}
|
|
53013
|
-
if (
|
|
53014
|
-
|
|
53015
|
-
|
|
53016
|
-
|
|
53017
|
-
|
|
53018
|
-
|
|
53019
|
-
|
|
53020
|
-
|
|
53027
|
+
if (reportErrors) {
|
|
53028
|
+
reportErrorResults(originalSource, originalTarget, source, target, headMessage);
|
|
53029
|
+
}
|
|
53030
|
+
return 0;
|
|
53031
|
+
}
|
|
53032
|
+
function reportErrorResults(originalSource, originalTarget, source, target, headMessage) {
|
|
53033
|
+
var sourceHasBase = !!getSingleBaseForNonAugmentingSubtype(originalSource);
|
|
53034
|
+
var targetHasBase = !!getSingleBaseForNonAugmentingSubtype(originalTarget);
|
|
53035
|
+
source = (originalSource.aliasSymbol || sourceHasBase) ? originalSource : source;
|
|
53036
|
+
target = (originalTarget.aliasSymbol || targetHasBase) ? originalTarget : target;
|
|
53037
|
+
var maybeSuppress = overrideNextErrorInfo > 0;
|
|
53038
|
+
if (maybeSuppress) {
|
|
53039
|
+
overrideNextErrorInfo--;
|
|
53040
|
+
}
|
|
53041
|
+
if (source.flags & 524288 && target.flags & 524288) {
|
|
53042
|
+
var currentError = errorInfo;
|
|
53043
|
+
tryElaborateArrayLikeErrors(source, target, true);
|
|
53044
|
+
if (errorInfo !== currentError) {
|
|
53045
|
+
maybeSuppress = !!errorInfo;
|
|
53046
|
+
}
|
|
53047
|
+
}
|
|
53048
|
+
if (source.flags & 524288 && target.flags & 131068) {
|
|
53049
|
+
tryElaborateErrorsForPrimitivesAndObjects(source, target);
|
|
53050
|
+
}
|
|
53051
|
+
else if (source.symbol && source.flags & 524288 && globalObjectType === source) {
|
|
53052
|
+
reportError(ts.Diagnostics.The_Object_type_is_assignable_to_very_few_other_types_Did_you_mean_to_use_the_any_type_instead);
|
|
53053
|
+
}
|
|
53054
|
+
else if (ts.getObjectFlags(source) & 2048 && target.flags & 2097152) {
|
|
53055
|
+
var targetTypes = target.types;
|
|
53056
|
+
var intrinsicAttributes = getJsxType(JsxNames.IntrinsicAttributes, errorNode);
|
|
53057
|
+
var intrinsicClassAttributes = getJsxType(JsxNames.IntrinsicClassAttributes, errorNode);
|
|
53058
|
+
if (!isErrorType(intrinsicAttributes) && !isErrorType(intrinsicClassAttributes) &&
|
|
53059
|
+
(ts.contains(targetTypes, intrinsicAttributes) || ts.contains(targetTypes, intrinsicClassAttributes))) {
|
|
53060
|
+
return;
|
|
53021
53061
|
}
|
|
53022
53062
|
}
|
|
53023
|
-
|
|
53024
|
-
|
|
53025
|
-
inPropertyCheck = true;
|
|
53026
|
-
result &= recursiveTypeRelatedTo(source, target, reportErrors, 4, recursionFlags);
|
|
53027
|
-
inPropertyCheck = false;
|
|
53063
|
+
else {
|
|
53064
|
+
errorInfo = elaborateNeverIntersection(errorInfo, originalTarget);
|
|
53028
53065
|
}
|
|
53029
|
-
|
|
53030
|
-
|
|
53031
|
-
|
|
53032
|
-
if (!result && reportErrors) {
|
|
53033
|
-
var sourceHasBase = !!getSingleBaseForNonAugmentingSubtype(originalSource);
|
|
53034
|
-
var targetHasBase = !!getSingleBaseForNonAugmentingSubtype(originalTarget);
|
|
53035
|
-
source = (originalSource.aliasSymbol || sourceHasBase) ? originalSource : source;
|
|
53036
|
-
target = (originalTarget.aliasSymbol || targetHasBase) ? originalTarget : target;
|
|
53037
|
-
var maybeSuppress = overrideNextErrorInfo > 0;
|
|
53038
|
-
if (maybeSuppress) {
|
|
53039
|
-
overrideNextErrorInfo--;
|
|
53040
|
-
}
|
|
53041
|
-
if (source.flags & 524288 && target.flags & 524288) {
|
|
53042
|
-
var currentError = errorInfo;
|
|
53043
|
-
tryElaborateArrayLikeErrors(source, target, reportErrors);
|
|
53044
|
-
if (errorInfo !== currentError) {
|
|
53045
|
-
maybeSuppress = !!errorInfo;
|
|
53046
|
-
}
|
|
53047
|
-
}
|
|
53048
|
-
if (source.flags & 524288 && target.flags & 131068) {
|
|
53049
|
-
tryElaborateErrorsForPrimitivesAndObjects(source, target);
|
|
53050
|
-
}
|
|
53051
|
-
else if (source.symbol && source.flags & 524288 && globalObjectType === source) {
|
|
53052
|
-
reportError(ts.Diagnostics.The_Object_type_is_assignable_to_very_few_other_types_Did_you_mean_to_use_the_any_type_instead);
|
|
53053
|
-
}
|
|
53054
|
-
else if (isComparingJsxAttributes && target.flags & 2097152) {
|
|
53055
|
-
var targetTypes = target.types;
|
|
53056
|
-
var intrinsicAttributes = getJsxType(JsxNames.IntrinsicAttributes, errorNode);
|
|
53057
|
-
var intrinsicClassAttributes = getJsxType(JsxNames.IntrinsicClassAttributes, errorNode);
|
|
53058
|
-
if (!isErrorType(intrinsicAttributes) && !isErrorType(intrinsicClassAttributes) &&
|
|
53059
|
-
(ts.contains(targetTypes, intrinsicAttributes) || ts.contains(targetTypes, intrinsicClassAttributes))) {
|
|
53060
|
-
return result;
|
|
53061
|
-
}
|
|
53062
|
-
}
|
|
53063
|
-
else {
|
|
53064
|
-
errorInfo = elaborateNeverIntersection(errorInfo, originalTarget);
|
|
53065
|
-
}
|
|
53066
|
-
if (!headMessage && maybeSuppress) {
|
|
53067
|
-
lastSkippedInfo = [source, target];
|
|
53068
|
-
return result;
|
|
53069
|
-
}
|
|
53070
|
-
reportRelationError(headMessage, source, target);
|
|
53071
|
-
}
|
|
53066
|
+
if (!headMessage && maybeSuppress) {
|
|
53067
|
+
lastSkippedInfo = [source, target];
|
|
53068
|
+
return;
|
|
53072
53069
|
}
|
|
53070
|
+
reportRelationError(headMessage, source, target);
|
|
53073
53071
|
}
|
|
53074
53072
|
function traceUnionsOrIntersectionsTooLarge(source, target) {
|
|
53075
53073
|
if (!ts.tracing) {
|
|
@@ -53095,21 +53093,6 @@ var ts;
|
|
|
53095
53093
|
}
|
|
53096
53094
|
}
|
|
53097
53095
|
}
|
|
53098
|
-
function isIdenticalTo(source, target, recursionFlags) {
|
|
53099
|
-
if (source.flags !== target.flags)
|
|
53100
|
-
return 0;
|
|
53101
|
-
if (source.flags & 67358815)
|
|
53102
|
-
return -1;
|
|
53103
|
-
traceUnionsOrIntersectionsTooLarge(source, target);
|
|
53104
|
-
if (source.flags & 3145728) {
|
|
53105
|
-
var result_7 = eachTypeRelatedToSomeType(source, target);
|
|
53106
|
-
if (result_7) {
|
|
53107
|
-
result_7 &= eachTypeRelatedToSomeType(target, source);
|
|
53108
|
-
}
|
|
53109
|
-
return result_7;
|
|
53110
|
-
}
|
|
53111
|
-
return recursiveTypeRelatedTo(source, target, false, 0, recursionFlags);
|
|
53112
|
-
}
|
|
53113
53096
|
function getTypeOfPropertyInTypes(types, name) {
|
|
53114
53097
|
var appendPropType = function (propTypes, type) {
|
|
53115
53098
|
var _a;
|
|
@@ -53198,6 +53181,29 @@ var ts;
|
|
|
53198
53181
|
function shouldCheckAsExcessProperty(prop, container) {
|
|
53199
53182
|
return prop.valueDeclaration && container.valueDeclaration && prop.valueDeclaration.parent === container.valueDeclaration;
|
|
53200
53183
|
}
|
|
53184
|
+
function unionOrIntersectionRelatedTo(source, target, reportErrors, intersectionState) {
|
|
53185
|
+
if (source.flags & 1048576) {
|
|
53186
|
+
return relation === comparableRelation ?
|
|
53187
|
+
someTypeRelatedToType(source, target, reportErrors && !(source.flags & 131068), intersectionState) :
|
|
53188
|
+
eachTypeRelatedToType(source, target, reportErrors && !(source.flags & 131068), intersectionState);
|
|
53189
|
+
}
|
|
53190
|
+
if (target.flags & 1048576) {
|
|
53191
|
+
return typeRelatedToSomeType(getRegularTypeOfObjectLiteral(source), target, reportErrors && !(source.flags & 131068) && !(target.flags & 131068));
|
|
53192
|
+
}
|
|
53193
|
+
if (target.flags & 2097152) {
|
|
53194
|
+
return typeRelatedToEachType(getRegularTypeOfObjectLiteral(source), target, reportErrors, 2);
|
|
53195
|
+
}
|
|
53196
|
+
if (relation === comparableRelation && target.flags & 131068) {
|
|
53197
|
+
var constraints = ts.sameMap(source.types, getBaseConstraintOrType);
|
|
53198
|
+
if (constraints !== source.types) {
|
|
53199
|
+
source = getIntersectionType(constraints);
|
|
53200
|
+
if (!(source.flags & 2097152)) {
|
|
53201
|
+
return isRelatedTo(source, target, 1, false);
|
|
53202
|
+
}
|
|
53203
|
+
}
|
|
53204
|
+
}
|
|
53205
|
+
return someTypeRelatedToType(source, target, false, 1);
|
|
53206
|
+
}
|
|
53201
53207
|
function eachTypeRelatedToSomeType(source, target) {
|
|
53202
53208
|
var result = -1;
|
|
53203
53209
|
var sourceTypes = source.types;
|
|
@@ -53234,7 +53240,9 @@ var ts;
|
|
|
53234
53240
|
}
|
|
53235
53241
|
if (reportErrors) {
|
|
53236
53242
|
var bestMatchingType = getBestMatchingType(source, target, isRelatedTo);
|
|
53237
|
-
|
|
53243
|
+
if (bestMatchingType) {
|
|
53244
|
+
isRelatedTo(source, bestMatchingType, 2, true);
|
|
53245
|
+
}
|
|
53238
53246
|
}
|
|
53239
53247
|
return 0;
|
|
53240
53248
|
}
|
|
@@ -53342,7 +53350,7 @@ var ts;
|
|
|
53342
53350
|
if (overflow) {
|
|
53343
53351
|
return 0;
|
|
53344
53352
|
}
|
|
53345
|
-
var keyIntersectionState = intersectionState | (inPropertyCheck ?
|
|
53353
|
+
var keyIntersectionState = intersectionState | (inPropertyCheck ? 8 : 0);
|
|
53346
53354
|
var id = getRelationKey(source, target, keyIntersectionState, relation, false);
|
|
53347
53355
|
var entry = relation.get(id);
|
|
53348
53356
|
if (entry !== undefined) {
|
|
@@ -53403,6 +53411,7 @@ var ts;
|
|
|
53403
53411
|
return originalHandler(onlyUnreliable);
|
|
53404
53412
|
};
|
|
53405
53413
|
}
|
|
53414
|
+
var result;
|
|
53406
53415
|
if (expandingFlags === 3) {
|
|
53407
53416
|
ts.tracing === null || ts.tracing === void 0 ? void 0 : ts.tracing.instant("checkTypes", "recursiveTypeRelatedTo_DepthLimit", {
|
|
53408
53417
|
sourceId: source.id,
|
|
@@ -53412,8 +53421,13 @@ var ts;
|
|
|
53412
53421
|
depth: sourceDepth,
|
|
53413
53422
|
targetDepth: targetDepth
|
|
53414
53423
|
});
|
|
53424
|
+
result = 3;
|
|
53425
|
+
}
|
|
53426
|
+
else {
|
|
53427
|
+
ts.tracing === null || ts.tracing === void 0 ? void 0 : ts.tracing.push("checkTypes", "structuredTypeRelatedTo", { sourceId: source.id, targetId: target.id });
|
|
53428
|
+
result = structuredTypeRelatedTo(source, target, reportErrors, intersectionState);
|
|
53429
|
+
ts.tracing === null || ts.tracing === void 0 ? void 0 : ts.tracing.pop();
|
|
53415
53430
|
}
|
|
53416
|
-
var result = expandingFlags !== 3 ? structuredTypeRelatedTo(source, target, reportErrors, intersectionState) : 3;
|
|
53417
53431
|
if (outofbandVarianceMarkerHandler) {
|
|
53418
53432
|
outofbandVarianceMarkerHandler = originalHandler;
|
|
53419
53433
|
}
|
|
@@ -53441,74 +53455,73 @@ var ts;
|
|
|
53441
53455
|
return result;
|
|
53442
53456
|
}
|
|
53443
53457
|
function structuredTypeRelatedTo(source, target, reportErrors, intersectionState) {
|
|
53444
|
-
ts.tracing === null || ts.tracing === void 0 ? void 0 : ts.tracing.push("checkTypes", "structuredTypeRelatedTo", { sourceId: source.id, targetId: target.id });
|
|
53445
|
-
var result = structuredTypeRelatedToWorker(source, target, reportErrors, intersectionState);
|
|
53446
|
-
ts.tracing === null || ts.tracing === void 0 ? void 0 : ts.tracing.pop();
|
|
53447
|
-
return result;
|
|
53448
|
-
}
|
|
53449
|
-
function structuredTypeRelatedToWorker(source, target, reportErrors, intersectionState) {
|
|
53450
53458
|
if (intersectionState & 4) {
|
|
53451
53459
|
return propertiesRelatedTo(source, target, reportErrors, undefined, 0);
|
|
53452
53460
|
}
|
|
53453
|
-
|
|
53454
|
-
|
|
53455
|
-
|
|
53456
|
-
|
|
53457
|
-
|
|
53458
|
-
|
|
53459
|
-
|
|
53460
|
-
|
|
53461
|
-
|
|
53462
|
-
|
|
53463
|
-
|
|
53464
|
-
}
|
|
53465
|
-
if (relation === comparableRelation && target.flags & 131068) {
|
|
53466
|
-
var constraints = ts.sameMap(source.types, getBaseConstraintOrType);
|
|
53467
|
-
if (constraints !== source.types) {
|
|
53468
|
-
source = getIntersectionType(constraints);
|
|
53469
|
-
if (!(source.flags & 2097152)) {
|
|
53470
|
-
return isRelatedTo(source, target, 1, false);
|
|
53471
|
-
}
|
|
53461
|
+
var result;
|
|
53462
|
+
var originalErrorInfo;
|
|
53463
|
+
var varianceCheckFailed = false;
|
|
53464
|
+
var saveErrorInfo = captureErrorCalculationState();
|
|
53465
|
+
var sourceFlags = source.flags;
|
|
53466
|
+
var targetFlags = target.flags;
|
|
53467
|
+
if (relation === identityRelation) {
|
|
53468
|
+
if (sourceFlags & 3145728) {
|
|
53469
|
+
var result_8 = eachTypeRelatedToSomeType(source, target);
|
|
53470
|
+
if (result_8) {
|
|
53471
|
+
result_8 &= eachTypeRelatedToSomeType(target, source);
|
|
53472
53472
|
}
|
|
53473
|
+
return result_8;
|
|
53473
53474
|
}
|
|
53474
|
-
|
|
53475
|
-
}
|
|
53476
|
-
var flags = source.flags & target.flags;
|
|
53477
|
-
if (relation === identityRelation && !(flags & 524288)) {
|
|
53478
|
-
if (flags & 4194304) {
|
|
53475
|
+
if (sourceFlags & 4194304) {
|
|
53479
53476
|
return isRelatedTo(source.type, target.type, 3, false);
|
|
53480
53477
|
}
|
|
53481
|
-
|
|
53482
|
-
|
|
53483
|
-
|
|
53484
|
-
|
|
53485
|
-
return result_8;
|
|
53478
|
+
if (sourceFlags & 8388608) {
|
|
53479
|
+
if (result = isRelatedTo(source.objectType, target.objectType, 3, false)) {
|
|
53480
|
+
if (result &= isRelatedTo(source.indexType, target.indexType, 3, false)) {
|
|
53481
|
+
return result;
|
|
53486
53482
|
}
|
|
53487
53483
|
}
|
|
53488
53484
|
}
|
|
53489
|
-
if (
|
|
53485
|
+
if (sourceFlags & 16777216) {
|
|
53490
53486
|
if (source.root.isDistributive === target.root.isDistributive) {
|
|
53491
|
-
if (
|
|
53492
|
-
if (
|
|
53493
|
-
if (
|
|
53494
|
-
if (
|
|
53495
|
-
return
|
|
53487
|
+
if (result = isRelatedTo(source.checkType, target.checkType, 3, false)) {
|
|
53488
|
+
if (result &= isRelatedTo(source.extendsType, target.extendsType, 3, false)) {
|
|
53489
|
+
if (result &= isRelatedTo(getTrueTypeFromConditionalType(source), getTrueTypeFromConditionalType(target), 3, false)) {
|
|
53490
|
+
if (result &= isRelatedTo(getFalseTypeFromConditionalType(source), getFalseTypeFromConditionalType(target), 3, false)) {
|
|
53491
|
+
return result;
|
|
53496
53492
|
}
|
|
53497
53493
|
}
|
|
53498
53494
|
}
|
|
53499
53495
|
}
|
|
53500
53496
|
}
|
|
53501
53497
|
}
|
|
53502
|
-
if (
|
|
53498
|
+
if (sourceFlags & 33554432) {
|
|
53503
53499
|
return isRelatedTo(source.substitute, target.substitute, 3, false);
|
|
53504
53500
|
}
|
|
53505
|
-
|
|
53501
|
+
if (!(sourceFlags & 524288)) {
|
|
53502
|
+
return 0;
|
|
53503
|
+
}
|
|
53506
53504
|
}
|
|
53507
|
-
|
|
53508
|
-
|
|
53509
|
-
|
|
53510
|
-
|
|
53511
|
-
|
|
53505
|
+
else if (sourceFlags & 3145728 || targetFlags & 3145728) {
|
|
53506
|
+
if (result = unionOrIntersectionRelatedTo(source, target, reportErrors, intersectionState)) {
|
|
53507
|
+
return result;
|
|
53508
|
+
}
|
|
53509
|
+
if (source.flags & 2097152 || source.flags & 262144 && target.flags & 1048576) {
|
|
53510
|
+
var constraint = getEffectiveConstraintOfIntersection(source.flags & 2097152 ? source.types : [source], !!(target.flags & 1048576));
|
|
53511
|
+
if (constraint && everyType(constraint, function (c) { return c !== source; })) {
|
|
53512
|
+
if (result = isRelatedTo(constraint, target, 1, false, undefined, intersectionState)) {
|
|
53513
|
+
resetErrorInfo(saveErrorInfo);
|
|
53514
|
+
return result;
|
|
53515
|
+
}
|
|
53516
|
+
}
|
|
53517
|
+
}
|
|
53518
|
+
if (!(sourceFlags & 465829888 ||
|
|
53519
|
+
sourceFlags & 524288 && targetFlags & 1048576 ||
|
|
53520
|
+
sourceFlags & 2097152 && targetFlags & (524288 | 1048576 | 465829888))) {
|
|
53521
|
+
return 0;
|
|
53522
|
+
}
|
|
53523
|
+
}
|
|
53524
|
+
if (sourceFlags & (524288 | 16777216) && source.aliasSymbol &&
|
|
53512
53525
|
source.aliasTypeArguments && source.aliasSymbol === target.aliasSymbol &&
|
|
53513
53526
|
!(source.aliasTypeArgumentsContainsMarker || target.aliasTypeArgumentsContainsMarker)) {
|
|
53514
53527
|
var variances = getAliasVariances(source.aliasSymbol);
|
|
@@ -53524,7 +53537,7 @@ var ts;
|
|
|
53524
53537
|
isSingleElementGenericTupleType(target) && (target.target.readonly || isMutableArrayOrTuple(getBaseConstraintOfType(source) || source)) && (result = isRelatedTo(source, getTypeArguments(target)[0], 2))) {
|
|
53525
53538
|
return result;
|
|
53526
53539
|
}
|
|
53527
|
-
if (
|
|
53540
|
+
if (targetFlags & 262144) {
|
|
53528
53541
|
if (ts.getObjectFlags(source) & 32 && !source.declaration.nameType && isRelatedTo(getIndexType(target), getConstraintTypeFromMappedType(source), 3)) {
|
|
53529
53542
|
if (!(getMappedTypeModifiers(source) & 4)) {
|
|
53530
53543
|
var templateType = getTemplateTypeFromMappedType(source);
|
|
@@ -53535,9 +53548,9 @@ var ts;
|
|
|
53535
53548
|
}
|
|
53536
53549
|
}
|
|
53537
53550
|
}
|
|
53538
|
-
else if (
|
|
53551
|
+
else if (targetFlags & 4194304) {
|
|
53539
53552
|
var targetType_1 = target.type;
|
|
53540
|
-
if (
|
|
53553
|
+
if (sourceFlags & 4194304) {
|
|
53541
53554
|
if (result = isRelatedTo(targetType_1, source.type, 3, false)) {
|
|
53542
53555
|
return result;
|
|
53543
53556
|
}
|
|
@@ -53573,8 +53586,8 @@ var ts;
|
|
|
53573
53586
|
}
|
|
53574
53587
|
}
|
|
53575
53588
|
}
|
|
53576
|
-
else if (
|
|
53577
|
-
if (
|
|
53589
|
+
else if (targetFlags & 8388608) {
|
|
53590
|
+
if (sourceFlags & 8388608) {
|
|
53578
53591
|
if (result = isRelatedTo(source.objectType, target.objectType, 3, reportErrors)) {
|
|
53579
53592
|
result &= isRelatedTo(source.indexType, target.indexType, 3, reportErrors);
|
|
53580
53593
|
}
|
|
@@ -53653,7 +53666,7 @@ var ts;
|
|
|
53653
53666
|
}
|
|
53654
53667
|
}
|
|
53655
53668
|
}
|
|
53656
|
-
else if (
|
|
53669
|
+
else if (targetFlags & 16777216) {
|
|
53657
53670
|
if (isDeeplyNestedType(target, targetStack, targetDepth, 10)) {
|
|
53658
53671
|
resetErrorInfo(saveErrorInfo);
|
|
53659
53672
|
return 3;
|
|
@@ -53671,8 +53684,8 @@ var ts;
|
|
|
53671
53684
|
}
|
|
53672
53685
|
}
|
|
53673
53686
|
}
|
|
53674
|
-
else if (
|
|
53675
|
-
if (
|
|
53687
|
+
else if (targetFlags & 134217728) {
|
|
53688
|
+
if (sourceFlags & 134217728) {
|
|
53676
53689
|
if (relation === comparableRelation) {
|
|
53677
53690
|
return templateLiteralTypesDefinitelyUnrelated(source, target) ? 0 : -1;
|
|
53678
53691
|
}
|
|
@@ -53682,10 +53695,10 @@ var ts;
|
|
|
53682
53695
|
return -1;
|
|
53683
53696
|
}
|
|
53684
53697
|
}
|
|
53685
|
-
if (
|
|
53686
|
-
if (!(
|
|
53698
|
+
if (sourceFlags & 8650752) {
|
|
53699
|
+
if (!(sourceFlags & 8388608 && targetFlags & 8388608)) {
|
|
53687
53700
|
var constraint = getConstraintOfType(source);
|
|
53688
|
-
if (!constraint || (
|
|
53701
|
+
if (!constraint || (sourceFlags & 262144 && constraint.flags & 1)) {
|
|
53689
53702
|
if (result = isRelatedTo(emptyObjectType, extractTypesOfKind(target, ~67108864), 3)) {
|
|
53690
53703
|
resetErrorInfo(saveErrorInfo);
|
|
53691
53704
|
return result;
|
|
@@ -53695,7 +53708,7 @@ var ts;
|
|
|
53695
53708
|
resetErrorInfo(saveErrorInfo);
|
|
53696
53709
|
return result;
|
|
53697
53710
|
}
|
|
53698
|
-
else if (result = isRelatedTo(getTypeWithThisArgument(constraint, source), target, 1, reportErrors && !(
|
|
53711
|
+
else if (result = isRelatedTo(getTypeWithThisArgument(constraint, source), target, 1, reportErrors && !(targetFlags & sourceFlags & 262144), undefined, intersectionState)) {
|
|
53699
53712
|
resetErrorInfo(saveErrorInfo);
|
|
53700
53713
|
return result;
|
|
53701
53714
|
}
|
|
@@ -53710,14 +53723,14 @@ var ts;
|
|
|
53710
53723
|
}
|
|
53711
53724
|
}
|
|
53712
53725
|
}
|
|
53713
|
-
else if (
|
|
53726
|
+
else if (sourceFlags & 4194304) {
|
|
53714
53727
|
if (result = isRelatedTo(keyofConstraintType, target, 1, reportErrors)) {
|
|
53715
53728
|
resetErrorInfo(saveErrorInfo);
|
|
53716
53729
|
return result;
|
|
53717
53730
|
}
|
|
53718
53731
|
}
|
|
53719
|
-
else if (
|
|
53720
|
-
if (!(
|
|
53732
|
+
else if (sourceFlags & 134217728 && !(targetFlags & 524288)) {
|
|
53733
|
+
if (!(targetFlags & 134217728)) {
|
|
53721
53734
|
var constraint = getBaseConstraintOfType(source);
|
|
53722
53735
|
if (constraint && constraint !== source && (result = isRelatedTo(constraint, target, 1, reportErrors))) {
|
|
53723
53736
|
resetErrorInfo(saveErrorInfo);
|
|
@@ -53725,8 +53738,8 @@ var ts;
|
|
|
53725
53738
|
}
|
|
53726
53739
|
}
|
|
53727
53740
|
}
|
|
53728
|
-
else if (
|
|
53729
|
-
if (
|
|
53741
|
+
else if (sourceFlags & 268435456) {
|
|
53742
|
+
if (targetFlags & 268435456 && source.symbol === target.symbol) {
|
|
53730
53743
|
if (result = isRelatedTo(source.type, target.type, 3, reportErrors)) {
|
|
53731
53744
|
resetErrorInfo(saveErrorInfo);
|
|
53732
53745
|
return result;
|
|
@@ -53740,12 +53753,12 @@ var ts;
|
|
|
53740
53753
|
}
|
|
53741
53754
|
}
|
|
53742
53755
|
}
|
|
53743
|
-
else if (
|
|
53756
|
+
else if (sourceFlags & 16777216) {
|
|
53744
53757
|
if (isDeeplyNestedType(source, sourceStack, sourceDepth, 10)) {
|
|
53745
53758
|
resetErrorInfo(saveErrorInfo);
|
|
53746
53759
|
return 3;
|
|
53747
53760
|
}
|
|
53748
|
-
if (
|
|
53761
|
+
if (targetFlags & 16777216) {
|
|
53749
53762
|
var sourceParams = source.root.inferTypeParameters;
|
|
53750
53763
|
var sourceExtends = source.extendsType;
|
|
53751
53764
|
var mapper = void 0;
|
|
@@ -53796,9 +53809,10 @@ var ts;
|
|
|
53796
53809
|
}
|
|
53797
53810
|
return 0;
|
|
53798
53811
|
}
|
|
53799
|
-
var sourceIsPrimitive = !!(
|
|
53812
|
+
var sourceIsPrimitive = !!(sourceFlags & 131068);
|
|
53800
53813
|
if (relation !== identityRelation) {
|
|
53801
53814
|
source = getApparentType(source);
|
|
53815
|
+
sourceFlags = source.flags;
|
|
53802
53816
|
}
|
|
53803
53817
|
else if (isGenericMappedType(source)) {
|
|
53804
53818
|
return 0;
|
|
@@ -53825,7 +53839,7 @@ var ts;
|
|
|
53825
53839
|
else if ((relation === subtypeRelation || relation === strictSubtypeRelation) && isEmptyObjectType(target) && ts.getObjectFlags(target) & 16384 && !isEmptyObjectType(source)) {
|
|
53826
53840
|
return 0;
|
|
53827
53841
|
}
|
|
53828
|
-
if (
|
|
53842
|
+
if (sourceFlags & (524288 | 2097152) && targetFlags & 524288) {
|
|
53829
53843
|
var reportStructuralErrors = reportErrors && errorInfo === saveErrorInfo.errorInfo && !sourceIsPrimitive;
|
|
53830
53844
|
result = propertiesRelatedTo(source, target, reportStructuralErrors, undefined, intersectionState);
|
|
53831
53845
|
if (result) {
|
|
@@ -53844,7 +53858,7 @@ var ts;
|
|
|
53844
53858
|
return result;
|
|
53845
53859
|
}
|
|
53846
53860
|
}
|
|
53847
|
-
if (
|
|
53861
|
+
if (sourceFlags & (524288 | 2097152) && targetFlags & 1048576) {
|
|
53848
53862
|
var objectOnlyTarget = extractTypesOfKind(target, 524288 | 2097152 | 33554432);
|
|
53849
53863
|
if (objectOnlyTarget.flags & 1048576) {
|
|
53850
53864
|
var result_9 = typeRelatedToDiscriminatedType(source, objectOnlyTarget);
|
|
@@ -54290,7 +54304,6 @@ var ts;
|
|
|
54290
54304
|
}
|
|
54291
54305
|
}
|
|
54292
54306
|
var result = -1;
|
|
54293
|
-
var saveErrorInfo = captureErrorCalculationState();
|
|
54294
54307
|
var incompatibleReporter = kind === 1 ? reportIncompatibleConstructSignatureReturn : reportIncompatibleCallSignatureReturn;
|
|
54295
54308
|
var sourceObjectFlags = ts.getObjectFlags(source);
|
|
54296
54309
|
var targetObjectFlags = ts.getObjectFlags(target);
|
|
@@ -54322,6 +54335,7 @@ var ts;
|
|
|
54322
54335
|
else {
|
|
54323
54336
|
outer: for (var _i = 0, targetSignatures_1 = targetSignatures; _i < targetSignatures_1.length; _i++) {
|
|
54324
54337
|
var t = targetSignatures_1[_i];
|
|
54338
|
+
var saveErrorInfo = captureErrorCalculationState();
|
|
54325
54339
|
var shouldElaborateErrors = reportErrors;
|
|
54326
54340
|
for (var _c = 0, sourceSignatures_1 = sourceSignatures; _c < sourceSignatures_1.length; _c++) {
|
|
54327
54341
|
var s = sourceSignatures_1[_c];
|
|
@@ -54658,7 +54672,7 @@ var ts;
|
|
|
54658
54672
|
var constraintMarker = "";
|
|
54659
54673
|
var sourceId = getTypeReferenceId(source, 0);
|
|
54660
54674
|
var targetId = getTypeReferenceId(target, 0);
|
|
54661
|
-
return ""
|
|
54675
|
+
return "".concat(constraintMarker).concat(sourceId, ",").concat(targetId).concat(postFix);
|
|
54662
54676
|
function getTypeReferenceId(type, depth) {
|
|
54663
54677
|
if (depth === void 0) { depth = 0; }
|
|
54664
54678
|
var result = "" + type.target.id;
|
|
@@ -54694,7 +54708,7 @@ var ts;
|
|
|
54694
54708
|
var postFix = intersectionState ? ":" + intersectionState : "";
|
|
54695
54709
|
return isTypeReferenceWithGenericArguments(source) && isTypeReferenceWithGenericArguments(target) ?
|
|
54696
54710
|
getGenericTypeReferenceRelationKey(source, target, postFix, ignoreConstraints) :
|
|
54697
|
-
source.id
|
|
54711
|
+
"".concat(source.id, ",").concat(target.id).concat(postFix);
|
|
54698
54712
|
}
|
|
54699
54713
|
function forEachProperty(prop, callback) {
|
|
54700
54714
|
if (ts.getCheckFlags(prop) & 6) {
|
|
@@ -56517,10 +56531,10 @@ var ts;
|
|
|
56517
56531
|
case 79:
|
|
56518
56532
|
if (!ts.isThisInTypeQuery(node)) {
|
|
56519
56533
|
var symbol = getResolvedSymbol(node);
|
|
56520
|
-
return symbol !== unknownSymbol ? (flowContainer ? getNodeId(flowContainer) : "-1"
|
|
56534
|
+
return symbol !== unknownSymbol ? "".concat(flowContainer ? getNodeId(flowContainer) : "-1", "|").concat(getTypeId(declaredType), "|").concat(getTypeId(initialType), "|").concat(getSymbolId(symbol)) : undefined;
|
|
56521
56535
|
}
|
|
56522
56536
|
case 108:
|
|
56523
|
-
return "0|"
|
|
56537
|
+
return "0|".concat(flowContainer ? getNodeId(flowContainer) : "-1", "|").concat(getTypeId(declaredType), "|").concat(getTypeId(initialType));
|
|
56524
56538
|
case 229:
|
|
56525
56539
|
case 211:
|
|
56526
56540
|
return getFlowCacheKey(node.expression, declaredType, initialType, flowContainer);
|
|
@@ -57110,9 +57124,6 @@ var ts;
|
|
|
57110
57124
|
getUnionType(ts.map(type.types, mapper), 1, aliasSymbol, aliasTypeArguments) :
|
|
57111
57125
|
mapType(type, mapper);
|
|
57112
57126
|
}
|
|
57113
|
-
function getConstituentCount(type) {
|
|
57114
|
-
return type.flags & 1048576 ? type.types.length : 1;
|
|
57115
|
-
}
|
|
57116
57127
|
function extractTypesOfKind(type, kind) {
|
|
57117
57128
|
return filterType(type, function (t) { return (t.flags & kind) !== 0; });
|
|
57118
57129
|
}
|
|
@@ -58457,7 +58468,7 @@ var ts;
|
|
|
58457
58468
|
var substituteConstraints = !(checkMode && checkMode & 2) &&
|
|
58458
58469
|
someType(type, isGenericTypeWithUnionConstraint) &&
|
|
58459
58470
|
(isConstraintPosition(type, reference) || hasContextualTypeWithNoGenericTypes(reference, checkMode));
|
|
58460
|
-
return substituteConstraints ? mapType(type, function (t) { return t.flags & 465829888
|
|
58471
|
+
return substituteConstraints ? mapType(type, function (t) { return t.flags & 465829888 ? getBaseConstraintOrType(t) : t; }) : type;
|
|
58461
58472
|
}
|
|
58462
58473
|
function isExportOrExportExpression(location) {
|
|
58463
58474
|
return !!ts.findAncestor(location, function (n) {
|
|
@@ -58503,6 +58514,9 @@ var ts;
|
|
|
58503
58514
|
if (parentType && parentType.flags & 1048576 && !(parent.kind === 163 && isSymbolAssigned(symbol))) {
|
|
58504
58515
|
var pattern = declaration.parent;
|
|
58505
58516
|
var narrowedType = getFlowTypeOfReference(pattern, parentType, parentType, undefined, location.flowNode);
|
|
58517
|
+
if (narrowedType.flags & 131072) {
|
|
58518
|
+
return neverType;
|
|
58519
|
+
}
|
|
58506
58520
|
return getBindingElementTypeFromParentType(declaration, narrowedType);
|
|
58507
58521
|
}
|
|
58508
58522
|
}
|
|
@@ -59837,7 +59851,7 @@ var ts;
|
|
|
59837
59851
|
!leftName ? rightName :
|
|
59838
59852
|
!rightName ? leftName :
|
|
59839
59853
|
undefined;
|
|
59840
|
-
var paramSymbol = createSymbol(1 | (isOptional && !isRestParam ? 16777216 : 0), paramName || "arg"
|
|
59854
|
+
var paramSymbol = createSymbol(1 | (isOptional && !isRestParam ? 16777216 : 0), paramName || "arg".concat(i));
|
|
59841
59855
|
paramSymbol.type = isRestParam ? createArrayType(unionParamType) : unionParamType;
|
|
59842
59856
|
params[i] = paramSymbol;
|
|
59843
59857
|
}
|
|
@@ -63621,19 +63635,20 @@ var ts;
|
|
|
63621
63635
|
if (links.type === unknownType) {
|
|
63622
63636
|
links.type = getTypeFromBindingPattern(declaration.name);
|
|
63623
63637
|
}
|
|
63624
|
-
assignBindingElementTypes(declaration.name);
|
|
63638
|
+
assignBindingElementTypes(declaration.name, links.type);
|
|
63625
63639
|
}
|
|
63626
63640
|
}
|
|
63627
63641
|
}
|
|
63628
|
-
function assignBindingElementTypes(pattern) {
|
|
63642
|
+
function assignBindingElementTypes(pattern, parentType) {
|
|
63629
63643
|
for (var _i = 0, _a = pattern.elements; _i < _a.length; _i++) {
|
|
63630
63644
|
var element = _a[_i];
|
|
63631
63645
|
if (!ts.isOmittedExpression(element)) {
|
|
63646
|
+
var type = getBindingElementTypeFromParentType(element, parentType);
|
|
63632
63647
|
if (element.name.kind === 79) {
|
|
63633
|
-
getSymbolLinks(getSymbolOfNode(element)).type =
|
|
63648
|
+
getSymbolLinks(getSymbolOfNode(element)).type = type;
|
|
63634
63649
|
}
|
|
63635
63650
|
else {
|
|
63636
|
-
assignBindingElementTypes(element.name);
|
|
63651
|
+
assignBindingElementTypes(element.name, type);
|
|
63637
63652
|
}
|
|
63638
63653
|
}
|
|
63639
63654
|
}
|
|
@@ -66828,26 +66843,24 @@ var ts;
|
|
|
66828
66843
|
if (returnType.flags & 1) {
|
|
66829
66844
|
return;
|
|
66830
66845
|
}
|
|
66846
|
+
var headMessage;
|
|
66831
66847
|
var expectedReturnType;
|
|
66832
|
-
var headMessage = getDiagnosticHeadMessageForDecoratorResolution(node);
|
|
66833
|
-
var errorInfo;
|
|
66834
66848
|
switch (node.parent.kind) {
|
|
66835
66849
|
case 256:
|
|
66850
|
+
headMessage = ts.Diagnostics.Decorator_function_return_type_0_is_not_assignable_to_type_1;
|
|
66836
66851
|
var classSymbol = getSymbolOfNode(node.parent);
|
|
66837
66852
|
var classConstructorType = getTypeOfSymbol(classSymbol);
|
|
66838
66853
|
expectedReturnType = getUnionType([classConstructorType, voidType]);
|
|
66839
66854
|
break;
|
|
66840
|
-
case 163:
|
|
66841
|
-
expectedReturnType = voidType;
|
|
66842
|
-
errorInfo = ts.chainDiagnosticMessages(undefined, ts.Diagnostics.The_return_type_of_a_parameter_decorator_function_must_be_either_void_or_any);
|
|
66843
|
-
break;
|
|
66844
66855
|
case 166:
|
|
66856
|
+
case 163:
|
|
66857
|
+
headMessage = ts.Diagnostics.Decorator_function_return_type_is_0_but_is_expected_to_be_void_or_any;
|
|
66845
66858
|
expectedReturnType = voidType;
|
|
66846
|
-
errorInfo = ts.chainDiagnosticMessages(undefined, ts.Diagnostics.The_return_type_of_a_property_decorator_function_must_be_either_void_or_any);
|
|
66847
66859
|
break;
|
|
66848
66860
|
case 168:
|
|
66849
66861
|
case 171:
|
|
66850
66862
|
case 172:
|
|
66863
|
+
headMessage = ts.Diagnostics.Decorator_function_return_type_0_is_not_assignable_to_type_1;
|
|
66851
66864
|
var methodType = getTypeOfNode(node.parent);
|
|
66852
66865
|
var descriptorType = createTypedPropertyDescriptorType(methodType);
|
|
66853
66866
|
expectedReturnType = getUnionType([descriptorType, voidType]);
|
|
@@ -66855,7 +66868,7 @@ var ts;
|
|
|
66855
66868
|
default:
|
|
66856
66869
|
return ts.Debug.fail();
|
|
66857
66870
|
}
|
|
66858
|
-
checkTypeAssignableTo(returnType, expectedReturnType, node, headMessage
|
|
66871
|
+
checkTypeAssignableTo(returnType, expectedReturnType, node, headMessage);
|
|
66859
66872
|
}
|
|
66860
66873
|
function markTypeNodeAsReferenced(node) {
|
|
66861
66874
|
markEntityNameOrEntityExpressionAsReference(node && ts.getEntityNameFromTypeNode(node));
|
|
@@ -68256,7 +68269,7 @@ var ts;
|
|
|
68256
68269
|
function getPropertyNameForKnownSymbolName(symbolName) {
|
|
68257
68270
|
var ctorType = getGlobalESSymbolConstructorSymbol(false);
|
|
68258
68271
|
var uniqueType = ctorType && getTypeOfPropertyOfType(getTypeOfSymbol(ctorType), ts.escapeLeadingUnderscores(symbolName));
|
|
68259
|
-
return uniqueType && isTypeUsableAsPropertyName(uniqueType) ? getPropertyNameFromType(uniqueType) : "__@"
|
|
68272
|
+
return uniqueType && isTypeUsableAsPropertyName(uniqueType) ? getPropertyNameFromType(uniqueType) : "__@".concat(symbolName);
|
|
68260
68273
|
}
|
|
68261
68274
|
function getIterationTypesOfIterableSlow(type, resolver, errorNode) {
|
|
68262
68275
|
var _a;
|
|
@@ -68716,9 +68729,9 @@ var ts;
|
|
|
68716
68729
|
var containsArguments = containsArgumentsReference(node);
|
|
68717
68730
|
if (containsArguments) {
|
|
68718
68731
|
var lastJSDocParam = ts.lastOrUndefined(jsdocParameters);
|
|
68719
|
-
if (lastJSDocParam && ts.isIdentifier(lastJSDocParam.name) && lastJSDocParam.typeExpression &&
|
|
68732
|
+
if (isJs && lastJSDocParam && ts.isIdentifier(lastJSDocParam.name) && lastJSDocParam.typeExpression &&
|
|
68720
68733
|
lastJSDocParam.typeExpression.type && !parameters.has(lastJSDocParam.name.escapedText) && !isArrayType(getTypeFromTypeNode(lastJSDocParam.typeExpression.type))) {
|
|
68721
|
-
|
|
68734
|
+
error(lastJSDocParam.name, ts.Diagnostics.JSDoc_param_tag_has_name_0_but_there_is_no_parameter_with_that_name_It_would_match_arguments_if_it_had_an_array_type, ts.idText(lastJSDocParam.name));
|
|
68722
68735
|
}
|
|
68723
68736
|
}
|
|
68724
68737
|
else {
|
|
@@ -68728,7 +68741,9 @@ var ts;
|
|
|
68728
68741
|
return;
|
|
68729
68742
|
}
|
|
68730
68743
|
if (ts.isQualifiedName(name)) {
|
|
68731
|
-
|
|
68744
|
+
if (isJs) {
|
|
68745
|
+
error(name, ts.Diagnostics.Qualified_name_0_is_not_allowed_without_a_leading_param_object_1, ts.entityNameToString(name), ts.entityNameToString(name.left));
|
|
68746
|
+
}
|
|
68732
68747
|
}
|
|
68733
68748
|
else {
|
|
68734
68749
|
errorOrSuggestion(isJs, name, ts.Diagnostics.JSDoc_param_tag_has_name_0_but_there_is_no_parameter_with_that_name, ts.idText(name));
|
|
@@ -73424,25 +73439,24 @@ var ts;
|
|
|
73424
73439
|
}
|
|
73425
73440
|
function findMostOverlappyType(source, unionTarget) {
|
|
73426
73441
|
var bestMatch;
|
|
73427
|
-
|
|
73428
|
-
|
|
73429
|
-
var
|
|
73430
|
-
|
|
73431
|
-
|
|
73432
|
-
|
|
73433
|
-
|
|
73434
|
-
|
|
73435
|
-
|
|
73436
|
-
|
|
73437
|
-
|
|
73438
|
-
|
|
73439
|
-
|
|
73442
|
+
if (!(source.flags & (131068 | 406847488))) {
|
|
73443
|
+
var matchingCount = 0;
|
|
73444
|
+
for (var _i = 0, _a = unionTarget.types; _i < _a.length; _i++) {
|
|
73445
|
+
var target = _a[_i];
|
|
73446
|
+
if (!(target.flags & (131068 | 406847488))) {
|
|
73447
|
+
var overlap = getIntersectionType([getIndexType(source), getIndexType(target)]);
|
|
73448
|
+
if (overlap.flags & 4194304) {
|
|
73449
|
+
return target;
|
|
73450
|
+
}
|
|
73451
|
+
else if (isUnitType(overlap) || overlap.flags & 1048576) {
|
|
73452
|
+
var len = overlap.flags & 1048576 ? ts.countWhere(overlap.types, isUnitType) : 1;
|
|
73453
|
+
if (len >= matchingCount) {
|
|
73454
|
+
bestMatch = target;
|
|
73455
|
+
matchingCount = len;
|
|
73456
|
+
}
|
|
73457
|
+
}
|
|
73440
73458
|
}
|
|
73441
73459
|
}
|
|
73442
|
-
else if (isUnitType(overlap) && 1 >= matchingCount) {
|
|
73443
|
-
bestMatch = target;
|
|
73444
|
-
matchingCount = 1;
|
|
73445
|
-
}
|
|
73446
73460
|
}
|
|
73447
73461
|
return bestMatch;
|
|
73448
73462
|
}
|
|
@@ -74582,7 +74596,7 @@ var ts;
|
|
|
74582
74596
|
value >= 52 && value < 62 ? 48 + value - 52 :
|
|
74583
74597
|
value === 62 ? 43 :
|
|
74584
74598
|
value === 63 ? 47 :
|
|
74585
|
-
ts.Debug.fail(value
|
|
74599
|
+
ts.Debug.fail("".concat(value, ": not a base64 value"));
|
|
74586
74600
|
}
|
|
74587
74601
|
function base64FormatDecode(ch) {
|
|
74588
74602
|
return ch >= 65 && ch <= 90 ? ch - 65 :
|
|
@@ -74655,7 +74669,7 @@ var ts;
|
|
|
74655
74669
|
var mappings = ts.arrayFrom(decoder, processMapping);
|
|
74656
74670
|
if (decoder.error !== undefined) {
|
|
74657
74671
|
if (host.log) {
|
|
74658
|
-
host.log("Encountered error while decoding sourcemap: "
|
|
74672
|
+
host.log("Encountered error while decoding sourcemap: ".concat(decoder.error));
|
|
74659
74673
|
}
|
|
74660
74674
|
decodedMappings = ts.emptyArray;
|
|
74661
74675
|
}
|
|
@@ -77098,7 +77112,7 @@ var ts;
|
|
|
77098
77112
|
var propertyName = ts.isPropertyAccessExpression(originalNode)
|
|
77099
77113
|
? ts.declarationNameToString(originalNode.name)
|
|
77100
77114
|
: ts.getTextOfNode(originalNode.argumentExpression);
|
|
77101
|
-
ts.addSyntheticTrailingComment(substitute, 3, " "
|
|
77115
|
+
ts.addSyntheticTrailingComment(substitute, 3, " ".concat(propertyName, " "));
|
|
77102
77116
|
}
|
|
77103
77117
|
return substitute;
|
|
77104
77118
|
}
|
|
@@ -78348,8 +78362,8 @@ var ts;
|
|
|
78348
78362
|
}
|
|
78349
78363
|
function createHoistedVariableForClass(name, node) {
|
|
78350
78364
|
var className = getPrivateIdentifierEnvironment().className;
|
|
78351
|
-
var prefix = className ? "_"
|
|
78352
|
-
var identifier = factory.createUniqueName(prefix
|
|
78365
|
+
var prefix = className ? "_".concat(className) : "";
|
|
78366
|
+
var identifier = factory.createUniqueName("".concat(prefix, "_").concat(name), 16);
|
|
78353
78367
|
if (resolver.getNodeCheckFlags(node) & 524288) {
|
|
78354
78368
|
addBlockScopedVariable(identifier);
|
|
78355
78369
|
}
|
|
@@ -80007,7 +80021,7 @@ var ts;
|
|
|
80007
80021
|
specifierSourceImports = new ts.Map();
|
|
80008
80022
|
currentFileState.utilizedImplicitRuntimeImports.set(importSource, specifierSourceImports);
|
|
80009
80023
|
}
|
|
80010
|
-
var generatedName = factory.createUniqueName("_"
|
|
80024
|
+
var generatedName = factory.createUniqueName("_".concat(name), 16 | 32 | 64);
|
|
80011
80025
|
var specifier = factory.createImportSpecifier(false, factory.createIdentifier(name), generatedName);
|
|
80012
80026
|
generatedName.generatedImportReference = specifier;
|
|
80013
80027
|
specifierSourceImports.set(name, specifier);
|
|
@@ -80948,11 +80962,11 @@ var ts;
|
|
|
80948
80962
|
}
|
|
80949
80963
|
else {
|
|
80950
80964
|
if (node.kind === 245) {
|
|
80951
|
-
labelMarker = "break-"
|
|
80965
|
+
labelMarker = "break-".concat(label.escapedText);
|
|
80952
80966
|
setLabeledJump(convertedLoopState, true, ts.idText(label), labelMarker);
|
|
80953
80967
|
}
|
|
80954
80968
|
else {
|
|
80955
|
-
labelMarker = "continue-"
|
|
80969
|
+
labelMarker = "continue-".concat(label.escapedText);
|
|
80956
80970
|
setLabeledJump(convertedLoopState, false, ts.idText(label), labelMarker);
|
|
80957
80971
|
}
|
|
80958
80972
|
}
|
|
@@ -86607,7 +86621,7 @@ var ts;
|
|
|
86607
86621
|
return getTypeAliasDeclarationVisibilityError;
|
|
86608
86622
|
}
|
|
86609
86623
|
else {
|
|
86610
|
-
return ts.Debug.assertNever(node, "Attempted to set a declaration diagnostic context for unhandled node kind: "
|
|
86624
|
+
return ts.Debug.assertNever(node, "Attempted to set a declaration diagnostic context for unhandled node kind: ".concat(ts.SyntaxKind[node.kind]));
|
|
86611
86625
|
}
|
|
86612
86626
|
function getVariableDeclarationTypeVisibilityDiagnosticMessage(symbolAccessibilityResult) {
|
|
86613
86627
|
if (node.kind === 253 || node.kind === 202) {
|
|
@@ -86804,7 +86818,7 @@ var ts;
|
|
|
86804
86818
|
ts.Diagnostics.Parameter_0_of_accessor_has_or_is_using_name_1_from_private_module_2 :
|
|
86805
86819
|
ts.Diagnostics.Parameter_0_of_accessor_has_or_is_using_private_name_1;
|
|
86806
86820
|
default:
|
|
86807
|
-
return ts.Debug.fail("Unknown parent for parameter: "
|
|
86821
|
+
return ts.Debug.fail("Unknown parent for parameter: ".concat(ts.SyntaxKind[node.parent.kind]));
|
|
86808
86822
|
}
|
|
86809
86823
|
}
|
|
86810
86824
|
function getTypeParameterConstraintVisibilityError() {
|
|
@@ -87491,7 +87505,7 @@ var ts;
|
|
|
87491
87505
|
while (ts.length(lateMarkedStatements)) {
|
|
87492
87506
|
var i = lateMarkedStatements.shift();
|
|
87493
87507
|
if (!ts.isLateVisibilityPaintedStatement(i)) {
|
|
87494
|
-
return ts.Debug.fail("Late replaced statement was found which is not handled by the declaration transformer!: "
|
|
87508
|
+
return ts.Debug.fail("Late replaced statement was found which is not handled by the declaration transformer!: ".concat(ts.SyntaxKind ? ts.SyntaxKind[i.kind] : i.kind));
|
|
87495
87509
|
}
|
|
87496
87510
|
var priorNeedsDeclare = needsDeclare;
|
|
87497
87511
|
needsDeclare = i.parent && ts.isSourceFile(i.parent) && !(ts.isExternalModule(i.parent) && isBundledEmit);
|
|
@@ -87656,7 +87670,7 @@ var ts;
|
|
|
87656
87670
|
return cleanup(input);
|
|
87657
87671
|
return cleanup(factory.updateImportTypeNode(input, factory.updateLiteralTypeNode(input.argument, rewriteModuleSpecifier(input, input.argument.literal)), input.qualifier, ts.visitNodes(input.typeArguments, visitDeclarationSubtree, ts.isTypeNode), input.isTypeOf));
|
|
87658
87672
|
}
|
|
87659
|
-
default: ts.Debug.assertNever(input, "Attempted to process unhandled node kind: "
|
|
87673
|
+
default: ts.Debug.assertNever(input, "Attempted to process unhandled node kind: ".concat(ts.SyntaxKind[input.kind]));
|
|
87660
87674
|
}
|
|
87661
87675
|
}
|
|
87662
87676
|
if (ts.isTupleTypeNode(input) && (ts.getLineAndCharacterOfPosition(currentSourceFile, input.pos).line === ts.getLineAndCharacterOfPosition(currentSourceFile, input.end).line)) {
|
|
@@ -87900,7 +87914,7 @@ var ts;
|
|
|
87900
87914
|
var extendsClause_1 = ts.getEffectiveBaseTypeNode(input);
|
|
87901
87915
|
if (extendsClause_1 && !ts.isEntityNameExpression(extendsClause_1.expression) && extendsClause_1.expression.kind !== 104) {
|
|
87902
87916
|
var oldId = input.name ? ts.unescapeLeadingUnderscores(input.name.escapedText) : "default";
|
|
87903
|
-
var newId_1 = factory.createUniqueName(oldId
|
|
87917
|
+
var newId_1 = factory.createUniqueName("".concat(oldId, "_base"), 16);
|
|
87904
87918
|
getSymbolAccessibilityDiagnostic = function () { return ({
|
|
87905
87919
|
diagnosticMessage: ts.Diagnostics.extends_clause_of_exported_class_0_has_or_is_using_private_name_1,
|
|
87906
87920
|
errorNode: extendsClause_1,
|
|
@@ -87937,7 +87951,7 @@ var ts;
|
|
|
87937
87951
|
}))));
|
|
87938
87952
|
}
|
|
87939
87953
|
}
|
|
87940
|
-
return ts.Debug.assertNever(input, "Unhandled top-level node in declaration emit: "
|
|
87954
|
+
return ts.Debug.assertNever(input, "Unhandled top-level node in declaration emit: ".concat(ts.SyntaxKind[input.kind]));
|
|
87941
87955
|
function cleanup(node) {
|
|
87942
87956
|
if (isEnclosingDeclaration(input)) {
|
|
87943
87957
|
enclosingDeclaration = previousEnclosingDeclaration;
|
|
@@ -88706,13 +88720,13 @@ var ts;
|
|
|
88706
88720
|
if (ts.fileExtensionIs(inputFileName, ".json"))
|
|
88707
88721
|
return;
|
|
88708
88722
|
if (js && configFile.options.sourceMap) {
|
|
88709
|
-
addOutput(js
|
|
88723
|
+
addOutput("".concat(js, ".map"));
|
|
88710
88724
|
}
|
|
88711
88725
|
if (ts.getEmitDeclarations(configFile.options)) {
|
|
88712
88726
|
var dts = getOutputDeclarationFileName(inputFileName, configFile, ignoreCase, getCommonSourceDirectory);
|
|
88713
88727
|
addOutput(dts);
|
|
88714
88728
|
if (configFile.options.declarationMap) {
|
|
88715
|
-
addOutput(dts
|
|
88729
|
+
addOutput("".concat(dts, ".map"));
|
|
88716
88730
|
}
|
|
88717
88731
|
}
|
|
88718
88732
|
}
|
|
@@ -88772,7 +88786,7 @@ var ts;
|
|
|
88772
88786
|
function getFirstProjectOutput(configFile, ignoreCase) {
|
|
88773
88787
|
if (ts.outFile(configFile.options)) {
|
|
88774
88788
|
var jsFilePath = getOutputPathsForBundle(configFile.options, false).jsFilePath;
|
|
88775
|
-
return ts.Debug.checkDefined(jsFilePath, "project "
|
|
88789
|
+
return ts.Debug.checkDefined(jsFilePath, "project ".concat(configFile.options.configFilePath, " expected to have at least one output"));
|
|
88776
88790
|
}
|
|
88777
88791
|
var getCommonSourceDirectory = ts.memoize(function () { return getCommonSourceDirectoryOfConfig(configFile, ignoreCase); });
|
|
88778
88792
|
for (var _a = 0, _b = configFile.fileNames; _a < _b.length; _a++) {
|
|
@@ -88791,7 +88805,7 @@ var ts;
|
|
|
88791
88805
|
var buildInfoPath = getTsBuildInfoEmitOutputFilePath(configFile.options);
|
|
88792
88806
|
if (buildInfoPath)
|
|
88793
88807
|
return buildInfoPath;
|
|
88794
|
-
return ts.Debug.fail("project "
|
|
88808
|
+
return ts.Debug.fail("project ".concat(configFile.options.configFilePath, " expected to have at least one output"));
|
|
88795
88809
|
}
|
|
88796
88810
|
ts.getFirstProjectOutput = getFirstProjectOutput;
|
|
88797
88811
|
function emitFiles(resolver, host, targetSourceFile, _a, emitOnlyDtsFiles, onlyBuildInfo, forceDtsEmit) {
|
|
@@ -89001,7 +89015,7 @@ var ts;
|
|
|
89001
89015
|
if (sourceMappingURL) {
|
|
89002
89016
|
if (!writer.isAtStartOfLine())
|
|
89003
89017
|
writer.rawWrite(newLine);
|
|
89004
|
-
writer.writeComment("//# "
|
|
89018
|
+
writer.writeComment("//# ".concat("sourceMappingURL", "=").concat(sourceMappingURL));
|
|
89005
89019
|
}
|
|
89006
89020
|
if (sourceMapFilePath) {
|
|
89007
89021
|
var sourceMap = sourceMapGenerator.toString();
|
|
@@ -89041,7 +89055,7 @@ var ts;
|
|
|
89041
89055
|
if (mapOptions.inlineSourceMap) {
|
|
89042
89056
|
var sourceMapText = sourceMapGenerator.toString();
|
|
89043
89057
|
var base64SourceMapText = ts.base64encode(ts.sys, sourceMapText);
|
|
89044
|
-
return "data:application/json;base64,"
|
|
89058
|
+
return "data:application/json;base64,".concat(base64SourceMapText);
|
|
89045
89059
|
}
|
|
89046
89060
|
var sourceMapFile = ts.getBaseFileName(ts.normalizeSlashes(ts.Debug.checkDefined(sourceMapFilePath)));
|
|
89047
89061
|
if (mapOptions.mapRoot) {
|
|
@@ -89205,7 +89219,7 @@ var ts;
|
|
|
89205
89219
|
return;
|
|
89206
89220
|
break;
|
|
89207
89221
|
default:
|
|
89208
|
-
ts.Debug.fail("Unexpected path: "
|
|
89222
|
+
ts.Debug.fail("Unexpected path: ".concat(name));
|
|
89209
89223
|
}
|
|
89210
89224
|
outputFiles.push({ name: name, text: text, writeByteOrderMark: writeByteOrderMark });
|
|
89211
89225
|
},
|
|
@@ -90013,7 +90027,7 @@ var ts;
|
|
|
90013
90027
|
return writeTokenNode(node, writeKeyword);
|
|
90014
90028
|
if (ts.isTokenKind(node.kind))
|
|
90015
90029
|
return writeTokenNode(node, writePunctuation);
|
|
90016
|
-
ts.Debug.fail("Unhandled SyntaxKind: "
|
|
90030
|
+
ts.Debug.fail("Unhandled SyntaxKind: ".concat(ts.Debug.formatSyntaxKind(node.kind), "."));
|
|
90017
90031
|
}
|
|
90018
90032
|
function emitMappedTypeParameter(node) {
|
|
90019
90033
|
emit(node.name);
|
|
@@ -90153,14 +90167,14 @@ var ts;
|
|
|
90153
90167
|
}
|
|
90154
90168
|
}
|
|
90155
90169
|
function emitPlaceholder(hint, node, snippet) {
|
|
90156
|
-
nonEscapingWrite("${"
|
|
90170
|
+
nonEscapingWrite("${".concat(snippet.order, ":"));
|
|
90157
90171
|
pipelineEmitWithHintWorker(hint, node, false);
|
|
90158
90172
|
nonEscapingWrite("}");
|
|
90159
90173
|
}
|
|
90160
90174
|
function emitTabStop(hint, node, snippet) {
|
|
90161
|
-
ts.Debug.assert(node.kind === 235, "A tab stop cannot be attached to a node of kind "
|
|
90175
|
+
ts.Debug.assert(node.kind === 235, "A tab stop cannot be attached to a node of kind ".concat(ts.Debug.formatSyntaxKind(node.kind), "."));
|
|
90162
90176
|
ts.Debug.assert(hint !== 5, "A tab stop cannot be attached to an embedded statement.");
|
|
90163
|
-
nonEscapingWrite("$"
|
|
90177
|
+
nonEscapingWrite("$".concat(snippet.order));
|
|
90164
90178
|
}
|
|
90165
90179
|
function emitIdentifier(node) {
|
|
90166
90180
|
var writeText = node.symbol ? writeSymbol : write;
|
|
@@ -91823,17 +91837,17 @@ var ts;
|
|
|
91823
91837
|
writeLine();
|
|
91824
91838
|
}
|
|
91825
91839
|
if (currentSourceFile && currentSourceFile.moduleName) {
|
|
91826
|
-
writeComment("/// <amd-module name=\""
|
|
91840
|
+
writeComment("/// <amd-module name=\"".concat(currentSourceFile.moduleName, "\" />"));
|
|
91827
91841
|
writeLine();
|
|
91828
91842
|
}
|
|
91829
91843
|
if (currentSourceFile && currentSourceFile.amdDependencies) {
|
|
91830
91844
|
for (var _a = 0, _b = currentSourceFile.amdDependencies; _a < _b.length; _a++) {
|
|
91831
91845
|
var dep = _b[_a];
|
|
91832
91846
|
if (dep.name) {
|
|
91833
|
-
writeComment("/// <amd-dependency name=\""
|
|
91847
|
+
writeComment("/// <amd-dependency name=\"".concat(dep.name, "\" path=\"").concat(dep.path, "\" />"));
|
|
91834
91848
|
}
|
|
91835
91849
|
else {
|
|
91836
|
-
writeComment("/// <amd-dependency path=\""
|
|
91850
|
+
writeComment("/// <amd-dependency path=\"".concat(dep.path, "\" />"));
|
|
91837
91851
|
}
|
|
91838
91852
|
writeLine();
|
|
91839
91853
|
}
|
|
@@ -91841,7 +91855,7 @@ var ts;
|
|
|
91841
91855
|
for (var _c = 0, files_2 = files; _c < files_2.length; _c++) {
|
|
91842
91856
|
var directive = files_2[_c];
|
|
91843
91857
|
var pos = writer.getTextPos();
|
|
91844
|
-
writeComment("/// <reference path=\""
|
|
91858
|
+
writeComment("/// <reference path=\"".concat(directive.fileName, "\" />"));
|
|
91845
91859
|
if (bundleFileInfo)
|
|
91846
91860
|
bundleFileInfo.sections.push({ pos: pos, end: writer.getTextPos(), kind: "reference", data: directive.fileName });
|
|
91847
91861
|
writeLine();
|
|
@@ -91849,7 +91863,7 @@ var ts;
|
|
|
91849
91863
|
for (var _d = 0, types_24 = types; _d < types_24.length; _d++) {
|
|
91850
91864
|
var directive = types_24[_d];
|
|
91851
91865
|
var pos = writer.getTextPos();
|
|
91852
|
-
writeComment("/// <reference types=\""
|
|
91866
|
+
writeComment("/// <reference types=\"".concat(directive.fileName, "\" />"));
|
|
91853
91867
|
if (bundleFileInfo)
|
|
91854
91868
|
bundleFileInfo.sections.push({ pos: pos, end: writer.getTextPos(), kind: "type", data: directive.fileName });
|
|
91855
91869
|
writeLine();
|
|
@@ -91857,7 +91871,7 @@ var ts;
|
|
|
91857
91871
|
for (var _e = 0, libs_1 = libs; _e < libs_1.length; _e++) {
|
|
91858
91872
|
var directive = libs_1[_e];
|
|
91859
91873
|
var pos = writer.getTextPos();
|
|
91860
|
-
writeComment("/// <reference lib=\""
|
|
91874
|
+
writeComment("/// <reference lib=\"".concat(directive.fileName, "\" />"));
|
|
91861
91875
|
if (bundleFileInfo)
|
|
91862
91876
|
bundleFileInfo.sections.push({ pos: pos, end: writer.getTextPos(), kind: "lib", data: directive.fileName });
|
|
91863
91877
|
writeLine();
|
|
@@ -92556,9 +92570,9 @@ var ts;
|
|
|
92556
92570
|
var textSourceNode = node.textSourceNode;
|
|
92557
92571
|
if (ts.isIdentifier(textSourceNode) || ts.isNumericLiteral(textSourceNode)) {
|
|
92558
92572
|
var text = ts.isNumericLiteral(textSourceNode) ? textSourceNode.text : getTextOfNode(textSourceNode);
|
|
92559
|
-
return jsxAttributeEscape ? "\""
|
|
92560
|
-
neverAsciiEscape || (ts.getEmitFlags(node) & 16777216) ? "\""
|
|
92561
|
-
"\""
|
|
92573
|
+
return jsxAttributeEscape ? "\"".concat(ts.escapeJsxAttributeString(text), "\"") :
|
|
92574
|
+
neverAsciiEscape || (ts.getEmitFlags(node) & 16777216) ? "\"".concat(ts.escapeString(text), "\"") :
|
|
92575
|
+
"\"".concat(ts.escapeNonAsciiString(text), "\"");
|
|
92562
92576
|
}
|
|
92563
92577
|
else {
|
|
92564
92578
|
return getLiteralTextOfNode(textSourceNode, neverAsciiEscape, jsxAttributeEscape);
|
|
@@ -92957,8 +92971,8 @@ var ts;
|
|
|
92957
92971
|
}
|
|
92958
92972
|
function formatSynthesizedComment(comment) {
|
|
92959
92973
|
return comment.kind === 3
|
|
92960
|
-
? "/*"
|
|
92961
|
-
: "//"
|
|
92974
|
+
? "/*".concat(comment.text, "*/")
|
|
92975
|
+
: "//".concat(comment.text);
|
|
92962
92976
|
}
|
|
92963
92977
|
function emitBodyWithDetachedComments(node, detachedRange, emitCallback) {
|
|
92964
92978
|
enterComment();
|
|
@@ -93572,18 +93586,18 @@ var ts;
|
|
|
93572
93586
|
var watchedDirPath = _a.watchedDirPath, fileOrDirectory = _a.fileOrDirectory, fileOrDirectoryPath = _a.fileOrDirectoryPath, configFileName = _a.configFileName, options = _a.options, program = _a.program, extraFileExtensions = _a.extraFileExtensions, currentDirectory = _a.currentDirectory, useCaseSensitiveFileNames = _a.useCaseSensitiveFileNames, writeLog = _a.writeLog, toPath = _a.toPath;
|
|
93573
93587
|
var newPath = ts.removeIgnoredPath(fileOrDirectoryPath);
|
|
93574
93588
|
if (!newPath) {
|
|
93575
|
-
writeLog("Project: "
|
|
93589
|
+
writeLog("Project: ".concat(configFileName, " Detected ignored path: ").concat(fileOrDirectory));
|
|
93576
93590
|
return true;
|
|
93577
93591
|
}
|
|
93578
93592
|
fileOrDirectoryPath = newPath;
|
|
93579
93593
|
if (fileOrDirectoryPath === watchedDirPath)
|
|
93580
93594
|
return false;
|
|
93581
93595
|
if (ts.hasExtension(fileOrDirectoryPath) && !ts.isSupportedSourceFileName(fileOrDirectory, options, extraFileExtensions)) {
|
|
93582
|
-
writeLog("Project: "
|
|
93596
|
+
writeLog("Project: ".concat(configFileName, " Detected file add/remove of non supported extension: ").concat(fileOrDirectory));
|
|
93583
93597
|
return true;
|
|
93584
93598
|
}
|
|
93585
93599
|
if (ts.isExcludedFile(fileOrDirectory, options.configFile.configFileSpecs, ts.getNormalizedAbsolutePath(ts.getDirectoryPath(configFileName), currentDirectory), useCaseSensitiveFileNames, currentDirectory)) {
|
|
93586
|
-
writeLog("Project: "
|
|
93600
|
+
writeLog("Project: ".concat(configFileName, " Detected excluded file: ").concat(fileOrDirectory));
|
|
93587
93601
|
return true;
|
|
93588
93602
|
}
|
|
93589
93603
|
if (!program)
|
|
@@ -93602,7 +93616,7 @@ var ts;
|
|
|
93602
93616
|
var builderProgram = !realProgram && !ts.isArray(program) ? program : undefined;
|
|
93603
93617
|
if (hasSourceFile((filePathWithoutExtension + ".ts")) ||
|
|
93604
93618
|
hasSourceFile((filePathWithoutExtension + ".tsx"))) {
|
|
93605
|
-
writeLog("Project: "
|
|
93619
|
+
writeLog("Project: ".concat(configFileName, " Detected output file: ").concat(fileOrDirectory));
|
|
93606
93620
|
return true;
|
|
93607
93621
|
}
|
|
93608
93622
|
return false;
|
|
@@ -93670,36 +93684,36 @@ var ts;
|
|
|
93670
93684
|
host.useCaseSensitiveFileNames();
|
|
93671
93685
|
}
|
|
93672
93686
|
function createExcludeWatcherWithLogging(file, flags, options, detailInfo1, detailInfo2) {
|
|
93673
|
-
log("ExcludeWatcher:: Added:: "
|
|
93687
|
+
log("ExcludeWatcher:: Added:: ".concat(getWatchInfo(file, flags, options, detailInfo1, detailInfo2, getDetailWatchInfo)));
|
|
93674
93688
|
return {
|
|
93675
|
-
close: function () { return log("ExcludeWatcher:: Close:: "
|
|
93689
|
+
close: function () { return log("ExcludeWatcher:: Close:: ".concat(getWatchInfo(file, flags, options, detailInfo1, detailInfo2, getDetailWatchInfo))); }
|
|
93676
93690
|
};
|
|
93677
93691
|
}
|
|
93678
93692
|
function createFileWatcherWithLogging(file, cb, flags, options, detailInfo1, detailInfo2) {
|
|
93679
|
-
log("FileWatcher:: Added:: "
|
|
93693
|
+
log("FileWatcher:: Added:: ".concat(getWatchInfo(file, flags, options, detailInfo1, detailInfo2, getDetailWatchInfo)));
|
|
93680
93694
|
var watcher = triggerInvokingFactory.watchFile(file, cb, flags, options, detailInfo1, detailInfo2);
|
|
93681
93695
|
return {
|
|
93682
93696
|
close: function () {
|
|
93683
|
-
log("FileWatcher:: Close:: "
|
|
93697
|
+
log("FileWatcher:: Close:: ".concat(getWatchInfo(file, flags, options, detailInfo1, detailInfo2, getDetailWatchInfo)));
|
|
93684
93698
|
watcher.close();
|
|
93685
93699
|
}
|
|
93686
93700
|
};
|
|
93687
93701
|
}
|
|
93688
93702
|
function createDirectoryWatcherWithLogging(file, cb, flags, options, detailInfo1, detailInfo2) {
|
|
93689
|
-
var watchInfo = "DirectoryWatcher:: Added:: "
|
|
93703
|
+
var watchInfo = "DirectoryWatcher:: Added:: ".concat(getWatchInfo(file, flags, options, detailInfo1, detailInfo2, getDetailWatchInfo));
|
|
93690
93704
|
log(watchInfo);
|
|
93691
93705
|
var start = ts.timestamp();
|
|
93692
93706
|
var watcher = triggerInvokingFactory.watchDirectory(file, cb, flags, options, detailInfo1, detailInfo2);
|
|
93693
93707
|
var elapsed = ts.timestamp() - start;
|
|
93694
|
-
log("Elapsed:: "
|
|
93708
|
+
log("Elapsed:: ".concat(elapsed, "ms ").concat(watchInfo));
|
|
93695
93709
|
return {
|
|
93696
93710
|
close: function () {
|
|
93697
|
-
var watchInfo = "DirectoryWatcher:: Close:: "
|
|
93711
|
+
var watchInfo = "DirectoryWatcher:: Close:: ".concat(getWatchInfo(file, flags, options, detailInfo1, detailInfo2, getDetailWatchInfo));
|
|
93698
93712
|
log(watchInfo);
|
|
93699
93713
|
var start = ts.timestamp();
|
|
93700
93714
|
watcher.close();
|
|
93701
93715
|
var elapsed = ts.timestamp() - start;
|
|
93702
|
-
log("Elapsed:: "
|
|
93716
|
+
log("Elapsed:: ".concat(elapsed, "ms ").concat(watchInfo));
|
|
93703
93717
|
}
|
|
93704
93718
|
};
|
|
93705
93719
|
}
|
|
@@ -93709,16 +93723,16 @@ var ts;
|
|
|
93709
93723
|
for (var _i = 0; _i < arguments.length; _i++) {
|
|
93710
93724
|
args[_i] = arguments[_i];
|
|
93711
93725
|
}
|
|
93712
|
-
var triggerredInfo = (key === "watchFile" ? "FileWatcher" : "DirectoryWatcher"
|
|
93726
|
+
var triggerredInfo = "".concat(key === "watchFile" ? "FileWatcher" : "DirectoryWatcher", ":: Triggered with ").concat(args[0], " ").concat(args[1] !== undefined ? args[1] : "", ":: ").concat(getWatchInfo(file, flags, options, detailInfo1, detailInfo2, getDetailWatchInfo));
|
|
93713
93727
|
log(triggerredInfo);
|
|
93714
93728
|
var start = ts.timestamp();
|
|
93715
93729
|
cb.call.apply(cb, __spreadArray([undefined], args, false));
|
|
93716
93730
|
var elapsed = ts.timestamp() - start;
|
|
93717
|
-
log("Elapsed:: "
|
|
93731
|
+
log("Elapsed:: ".concat(elapsed, "ms ").concat(triggerredInfo));
|
|
93718
93732
|
}, flags, options, detailInfo1, detailInfo2); };
|
|
93719
93733
|
}
|
|
93720
93734
|
function getWatchInfo(file, flags, options, detailInfo1, detailInfo2, getDetailWatchInfo) {
|
|
93721
|
-
return "WatchInfo: "
|
|
93735
|
+
return "WatchInfo: ".concat(file, " ").concat(flags, " ").concat(JSON.stringify(options), " ").concat(getDetailWatchInfo ? getDetailWatchInfo(detailInfo1, detailInfo2) : detailInfo2 === undefined ? detailInfo1 : "".concat(detailInfo1, " ").concat(detailInfo2));
|
|
93722
93736
|
}
|
|
93723
93737
|
}
|
|
93724
93738
|
ts.getWatchFactory = getWatchFactory;
|
|
@@ -94008,12 +94022,12 @@ var ts;
|
|
|
94008
94022
|
}
|
|
94009
94023
|
ts.formatDiagnostics = formatDiagnostics;
|
|
94010
94024
|
function formatDiagnostic(diagnostic, host) {
|
|
94011
|
-
var errorMessage = ts.diagnosticCategoryName(diagnostic)
|
|
94025
|
+
var errorMessage = "".concat(ts.diagnosticCategoryName(diagnostic), " TS").concat(diagnostic.code, ": ").concat(flattenDiagnosticMessageText(diagnostic.messageText, host.getNewLine())).concat(host.getNewLine());
|
|
94012
94026
|
if (diagnostic.file) {
|
|
94013
94027
|
var _a = ts.getLineAndCharacterOfPosition(diagnostic.file, diagnostic.start), line = _a.line, character = _a.character;
|
|
94014
94028
|
var fileName = diagnostic.file.fileName;
|
|
94015
94029
|
var relativeFileName = ts.convertToRelativePath(fileName, host.getCurrentDirectory(), function (fileName) { return host.getCanonicalFileName(fileName); });
|
|
94016
|
-
return relativeFileName
|
|
94030
|
+
return "".concat(relativeFileName, "(").concat(line + 1, ",").concat(character + 1, "): ") + errorMessage;
|
|
94017
94031
|
}
|
|
94018
94032
|
return errorMessage;
|
|
94019
94033
|
}
|
|
@@ -94091,9 +94105,9 @@ var ts;
|
|
|
94091
94105
|
var output = "";
|
|
94092
94106
|
output += color(relativeFileName, ForegroundColorEscapeSequences.Cyan);
|
|
94093
94107
|
output += ":";
|
|
94094
|
-
output += color(""
|
|
94108
|
+
output += color("".concat(firstLine + 1), ForegroundColorEscapeSequences.Yellow);
|
|
94095
94109
|
output += ":";
|
|
94096
|
-
output += color(""
|
|
94110
|
+
output += color("".concat(firstLineChar + 1), ForegroundColorEscapeSequences.Yellow);
|
|
94097
94111
|
return output;
|
|
94098
94112
|
}
|
|
94099
94113
|
ts.formatLocation = formatLocation;
|
|
@@ -94107,7 +94121,7 @@ var ts;
|
|
|
94107
94121
|
output += " - ";
|
|
94108
94122
|
}
|
|
94109
94123
|
output += formatColorAndReset(ts.diagnosticCategoryName(diagnostic), getCategoryFormat(diagnostic.category));
|
|
94110
|
-
output += formatColorAndReset(" TS"
|
|
94124
|
+
output += formatColorAndReset(" TS".concat(diagnostic.code, ": "), ForegroundColorEscapeSequences.Grey);
|
|
94111
94125
|
output += flattenDiagnosticMessageText(diagnostic.messageText, host.getNewLine());
|
|
94112
94126
|
if (diagnostic.file) {
|
|
94113
94127
|
output += host.getNewLine();
|
|
@@ -94207,7 +94221,7 @@ var ts;
|
|
|
94207
94221
|
var result = void 0;
|
|
94208
94222
|
var mode = getModeForResolutionAtIndex(containingFile, i);
|
|
94209
94223
|
i++;
|
|
94210
|
-
var cacheKey = mode !== undefined ? mode
|
|
94224
|
+
var cacheKey = mode !== undefined ? "".concat(mode, "|").concat(name) : name;
|
|
94211
94225
|
if (cache.has(cacheKey)) {
|
|
94212
94226
|
result = cache.get(cacheKey);
|
|
94213
94227
|
}
|
|
@@ -96078,7 +96092,7 @@ var ts;
|
|
|
96078
96092
|
path += (i === 2 ? "/" : "-") + components[i];
|
|
96079
96093
|
i++;
|
|
96080
96094
|
}
|
|
96081
|
-
var resolveFrom = ts.combinePaths(currentDirectory, "__lib_node_modules_lookup_"
|
|
96095
|
+
var resolveFrom = ts.combinePaths(currentDirectory, "__lib_node_modules_lookup_".concat(libFileName, "__.ts"));
|
|
96082
96096
|
var localOverrideModuleResult = ts.resolveModuleName("@typescript/lib-" + path, resolveFrom, { moduleResolution: ts.ModuleResolutionKind.NodeJs }, host, moduleResolutionCache);
|
|
96083
96097
|
if (localOverrideModuleResult === null || localOverrideModuleResult === void 0 ? void 0 : localOverrideModuleResult.resolvedModule) {
|
|
96084
96098
|
return localOverrideModuleResult.resolvedModule.resolvedFileName;
|
|
@@ -96847,10 +96861,10 @@ var ts;
|
|
|
96847
96861
|
}
|
|
96848
96862
|
function directoryExistsIfProjectReferenceDeclDir(dir) {
|
|
96849
96863
|
var dirPath = host.toPath(dir);
|
|
96850
|
-
var dirPathWithTrailingDirectorySeparator = ""
|
|
96864
|
+
var dirPathWithTrailingDirectorySeparator = "".concat(dirPath).concat(ts.directorySeparator);
|
|
96851
96865
|
return ts.forEachKey(setOfDeclarationDirectories, function (declDirPath) { return dirPath === declDirPath ||
|
|
96852
96866
|
ts.startsWith(declDirPath, dirPathWithTrailingDirectorySeparator) ||
|
|
96853
|
-
ts.startsWith(dirPath, declDirPath
|
|
96867
|
+
ts.startsWith(dirPath, "".concat(declDirPath, "/")); });
|
|
96854
96868
|
}
|
|
96855
96869
|
function handleDirectoryCouldBeSymlink(directory) {
|
|
96856
96870
|
var _a;
|
|
@@ -96898,7 +96912,7 @@ var ts;
|
|
|
96898
96912
|
var result = fileOrDirectoryExistsUsingSource(fileOrDirectoryPath.replace(directoryPath, symlinkedDirectory.realPath));
|
|
96899
96913
|
if (isFile && result) {
|
|
96900
96914
|
var absolutePath = ts.getNormalizedAbsolutePath(fileOrDirectory, host.compilerHost.getCurrentDirectory());
|
|
96901
|
-
symlinkCache.setSymlinkedFile(fileOrDirectoryPath, ""
|
|
96915
|
+
symlinkCache.setSymlinkedFile(fileOrDirectoryPath, "".concat(symlinkedDirectory.real).concat(absolutePath.replace(new RegExp(directoryPath, "i"), "")));
|
|
96902
96916
|
}
|
|
96903
96917
|
return result;
|
|
96904
96918
|
}) || false;
|
|
@@ -97282,7 +97296,7 @@ var ts;
|
|
|
97282
97296
|
var emitOutput_1 = getFileEmitOutput(programOfThisState, sourceFile, true, cancellationToken, undefined, true);
|
|
97283
97297
|
var firstDts_1 = ts.firstOrUndefined(emitOutput_1.outputFiles);
|
|
97284
97298
|
if (firstDts_1) {
|
|
97285
|
-
ts.Debug.assert(ts.fileExtensionIsOneOf(firstDts_1.name, [".d.ts", ".d.mts", ".d.cts"]), "File extension for signature expected to be dts", function () { return "Found: "
|
|
97299
|
+
ts.Debug.assert(ts.fileExtensionIsOneOf(firstDts_1.name, [".d.ts", ".d.mts", ".d.cts"]), "File extension for signature expected to be dts", function () { return "Found: ".concat(ts.getAnyExtensionFromPath(firstDts_1.name), " for ").concat(firstDts_1.name, ":: All output files: ").concat(JSON.stringify(emitOutput_1.outputFiles.map(function (f) { return f.name; }))); });
|
|
97286
97300
|
latestSignature = (computeHash || ts.generateDjb2Hash)(firstDts_1.text);
|
|
97287
97301
|
if (exportedModulesMapCache && latestSignature !== prevSignature) {
|
|
97288
97302
|
updateExportedModules(sourceFile, emitOutput_1.exportedModulesFromDeclarationEmit, exportedModulesMapCache);
|
|
@@ -97678,7 +97692,7 @@ var ts;
|
|
|
97678
97692
|
return;
|
|
97679
97693
|
}
|
|
97680
97694
|
else {
|
|
97681
|
-
ts.Debug.assert(state.hasCalledUpdateShapeSignature.has(affectedFile.resolvedPath) || ((_a = state.currentAffectedFilesSignatures) === null || _a === void 0 ? void 0 : _a.has(affectedFile.resolvedPath)), "Signature not updated for affected file: "
|
|
97695
|
+
ts.Debug.assert(state.hasCalledUpdateShapeSignature.has(affectedFile.resolvedPath) || ((_a = state.currentAffectedFilesSignatures) === null || _a === void 0 ? void 0 : _a.has(affectedFile.resolvedPath)), "Signature not updated for affected file: ".concat(affectedFile.fileName));
|
|
97682
97696
|
}
|
|
97683
97697
|
if (!state.compilerOptions.assumeChangesOnlyAffectDirectDependencies) {
|
|
97684
97698
|
forEachReferencingModulesOfExportOfAffectedFile(state, affectedFile, function (state, path) { return handleDtsMayChangeOf(state, path, cancellationToken, computeHash); });
|
|
@@ -98650,7 +98664,7 @@ var ts;
|
|
|
98650
98664
|
failedLookupLocation = ts.isRootedDiskPath(failedLookupLocation) ? ts.normalizePath(failedLookupLocation) : ts.getNormalizedAbsolutePath(failedLookupLocation, getCurrentDirectory());
|
|
98651
98665
|
var failedLookupPathSplit = failedLookupLocationPath.split(ts.directorySeparator);
|
|
98652
98666
|
var failedLookupSplit = failedLookupLocation.split(ts.directorySeparator);
|
|
98653
|
-
ts.Debug.assert(failedLookupSplit.length === failedLookupPathSplit.length, "FailedLookup: "
|
|
98667
|
+
ts.Debug.assert(failedLookupSplit.length === failedLookupPathSplit.length, "FailedLookup: ".concat(failedLookupLocation, " failedLookupLocationPath: ").concat(failedLookupLocationPath));
|
|
98654
98668
|
if (failedLookupPathSplit.length > rootSplitLength + 1) {
|
|
98655
98669
|
return {
|
|
98656
98670
|
dir: failedLookupSplit.slice(0, rootSplitLength + 1).join(ts.directorySeparator),
|
|
@@ -99572,7 +99586,7 @@ var ts;
|
|
|
99572
99586
|
}
|
|
99573
99587
|
function getJSExtensionForFile(fileName, options) {
|
|
99574
99588
|
var _a;
|
|
99575
|
-
return (_a = tryGetJSExtensionForFile(fileName, options)) !== null && _a !== void 0 ? _a : ts.Debug.fail("Extension "
|
|
99589
|
+
return (_a = tryGetJSExtensionForFile(fileName, options)) !== null && _a !== void 0 ? _a : ts.Debug.fail("Extension ".concat(ts.extensionFromPath(fileName), " is unsupported:: FileName:: ").concat(fileName));
|
|
99576
99590
|
}
|
|
99577
99591
|
function tryGetJSExtensionForFile(fileName, options) {
|
|
99578
99592
|
var ext = ts.tryGetExtensionFromPath(fileName);
|
|
@@ -99662,8 +99676,8 @@ var ts;
|
|
|
99662
99676
|
return pretty ?
|
|
99663
99677
|
function (diagnostic, newLine, options) {
|
|
99664
99678
|
clearScreenIfNotWatchingForFileChanges(system, diagnostic, options);
|
|
99665
|
-
var output = "["
|
|
99666
|
-
output += ""
|
|
99679
|
+
var output = "[".concat(ts.formatColorAndReset(getLocaleTimeString(system), ts.ForegroundColorEscapeSequences.Grey), "] ");
|
|
99680
|
+
output += "".concat(ts.flattenDiagnosticMessageText(diagnostic.messageText, system.newLine)).concat(newLine + newLine);
|
|
99667
99681
|
system.write(output);
|
|
99668
99682
|
} :
|
|
99669
99683
|
function (diagnostic, newLine, options) {
|
|
@@ -99671,8 +99685,8 @@ var ts;
|
|
|
99671
99685
|
if (!clearScreenIfNotWatchingForFileChanges(system, diagnostic, options)) {
|
|
99672
99686
|
output += newLine;
|
|
99673
99687
|
}
|
|
99674
|
-
output += getLocaleTimeString(system)
|
|
99675
|
-
output += ""
|
|
99688
|
+
output += "".concat(getLocaleTimeString(system), " - ");
|
|
99689
|
+
output += "".concat(ts.flattenDiagnosticMessageText(diagnostic.messageText, system.newLine)).concat(getPlainDiagnosticFollowingNewLines(diagnostic, newLine));
|
|
99676
99690
|
system.write(output);
|
|
99677
99691
|
};
|
|
99678
99692
|
}
|
|
@@ -99694,7 +99708,7 @@ var ts;
|
|
|
99694
99708
|
.map(function (errorDiagnostic) {
|
|
99695
99709
|
if (errorDiagnostic.file === undefined)
|
|
99696
99710
|
return;
|
|
99697
|
-
return ""
|
|
99711
|
+
return "".concat(errorDiagnostic.file.fileName);
|
|
99698
99712
|
});
|
|
99699
99713
|
return filesInError.map(function (fileName) {
|
|
99700
99714
|
var diagnosticForFileName = ts.find(diagnostics, function (diagnostic) {
|
|
@@ -99727,7 +99741,7 @@ var ts;
|
|
|
99727
99741
|
if (errorCount === 0)
|
|
99728
99742
|
return "";
|
|
99729
99743
|
var nonNilFiles = filesInError.filter(function (fileInError) { return fileInError !== undefined; });
|
|
99730
|
-
var distinctFileNamesWithLines = nonNilFiles.map(function (fileInError) { return fileInError.fileName
|
|
99744
|
+
var distinctFileNamesWithLines = nonNilFiles.map(function (fileInError) { return "".concat(fileInError.fileName, ":").concat(fileInError.line); })
|
|
99731
99745
|
.filter(function (value, index, self) { return self.indexOf(value) === index; });
|
|
99732
99746
|
var firstFileReference = nonNilFiles[0] && prettyPathForFileError(nonNilFiles[0], host.getCurrentDirectory());
|
|
99733
99747
|
var d = errorCount === 1 ?
|
|
@@ -99740,7 +99754,7 @@ var ts;
|
|
|
99740
99754
|
ts.Diagnostics.Found_0_errors_in_the_same_file_starting_at_Colon_1 :
|
|
99741
99755
|
ts.Diagnostics.Found_0_errors_in_1_files, errorCount, distinctFileNamesWithLines.length === 1 ? firstFileReference : distinctFileNamesWithLines.length);
|
|
99742
99756
|
var suffix = distinctFileNamesWithLines.length > 1 ? createTabularErrorsDisplay(nonNilFiles, host) : "";
|
|
99743
|
-
return ""
|
|
99757
|
+
return "".concat(newLine).concat(ts.flattenDiagnosticMessageText(d.messageText, newLine)).concat(newLine).concat(newLine).concat(suffix);
|
|
99744
99758
|
}
|
|
99745
99759
|
ts.getErrorSummaryText = getErrorSummaryText;
|
|
99746
99760
|
function createTabularErrorsDisplay(filesInError, host) {
|
|
@@ -99763,7 +99777,7 @@ var ts;
|
|
|
99763
99777
|
" ".repeat(leftPaddingGoal - errorCountDigitsLength)
|
|
99764
99778
|
: "";
|
|
99765
99779
|
var fileRef = prettyPathForFileError(file, host.getCurrentDirectory());
|
|
99766
|
-
tabularData += ""
|
|
99780
|
+
tabularData += "".concat(leftPadding).concat(errorCount, " ").concat(fileRef, "\n");
|
|
99767
99781
|
});
|
|
99768
99782
|
return tabularData;
|
|
99769
99783
|
}
|
|
@@ -99790,9 +99804,9 @@ var ts;
|
|
|
99790
99804
|
var relativeFileName = function (fileName) { return ts.convertToRelativePath(fileName, program.getCurrentDirectory(), getCanonicalFileName); };
|
|
99791
99805
|
for (var _i = 0, _c = program.getSourceFiles(); _i < _c.length; _i++) {
|
|
99792
99806
|
var file = _c[_i];
|
|
99793
|
-
write(""
|
|
99794
|
-
(_a = reasons.get(file.path)) === null || _a === void 0 ? void 0 : _a.forEach(function (reason) { return write(" "
|
|
99795
|
-
(_b = explainIfFileIsRedirect(file, relativeFileName)) === null || _b === void 0 ? void 0 : _b.forEach(function (d) { return write(" "
|
|
99807
|
+
write("".concat(toFileName(file, relativeFileName)));
|
|
99808
|
+
(_a = reasons.get(file.path)) === null || _a === void 0 ? void 0 : _a.forEach(function (reason) { return write(" ".concat(fileIncludeReasonToDiagnostics(program, reason, relativeFileName).messageText)); });
|
|
99809
|
+
(_b = explainIfFileIsRedirect(file, relativeFileName)) === null || _b === void 0 ? void 0 : _b.forEach(function (d) { return write(" ".concat(d.messageText)); });
|
|
99796
99810
|
}
|
|
99797
99811
|
}
|
|
99798
99812
|
ts.explainFiles = explainFiles;
|
|
@@ -99830,7 +99844,7 @@ var ts;
|
|
|
99830
99844
|
if (isJsonFile && !ts.endsWith(includeSpec, ".json"))
|
|
99831
99845
|
return false;
|
|
99832
99846
|
var pattern = ts.getPatternFromSpec(includeSpec, basePath, "files");
|
|
99833
|
-
return !!pattern && ts.getRegexFromPattern("("
|
|
99847
|
+
return !!pattern && ts.getRegexFromPattern("(".concat(pattern, ")$"), useCaseSensitiveFileNames).test(fileName);
|
|
99834
99848
|
});
|
|
99835
99849
|
}
|
|
99836
99850
|
ts.getMatchedIncludeSpec = getMatchedIncludeSpec;
|
|
@@ -99839,7 +99853,7 @@ var ts;
|
|
|
99839
99853
|
var options = program.getCompilerOptions();
|
|
99840
99854
|
if (ts.isReferencedFile(reason)) {
|
|
99841
99855
|
var referenceLocation = ts.getReferencedFileLocation(function (path) { return program.getSourceFileByPath(path); }, reason);
|
|
99842
|
-
var referenceText = ts.isReferenceFileLocation(referenceLocation) ? referenceLocation.file.text.substring(referenceLocation.pos, referenceLocation.end) : "\""
|
|
99856
|
+
var referenceText = ts.isReferenceFileLocation(referenceLocation) ? referenceLocation.file.text.substring(referenceLocation.pos, referenceLocation.end) : "\"".concat(referenceLocation.text, "\"");
|
|
99843
99857
|
var message = void 0;
|
|
99844
99858
|
ts.Debug.assert(ts.isReferenceFileLocation(referenceLocation) || reason.kind === ts.FileIncludeKind.Import, "Only synthetic references are imports");
|
|
99845
99859
|
switch (reason.kind) {
|
|
@@ -99950,7 +99964,7 @@ var ts;
|
|
|
99950
99964
|
var currentDir_1 = program.getCurrentDirectory();
|
|
99951
99965
|
ts.forEach(emittedFiles, function (file) {
|
|
99952
99966
|
var filepath = ts.getNormalizedAbsolutePath(file, currentDir_1);
|
|
99953
|
-
write("TSFILE: "
|
|
99967
|
+
write("TSFILE: ".concat(filepath));
|
|
99954
99968
|
});
|
|
99955
99969
|
listFiles(program, write);
|
|
99956
99970
|
}
|
|
@@ -100257,7 +100271,7 @@ var ts;
|
|
|
100257
100271
|
}
|
|
100258
100272
|
var _b = ts.createWatchFactory(host, compilerOptions), watchFile = _b.watchFile, watchDirectory = _b.watchDirectory, writeLog = _b.writeLog;
|
|
100259
100273
|
var getCanonicalFileName = ts.createGetCanonicalFileName(useCaseSensitiveFileNames);
|
|
100260
|
-
writeLog("Current directory: "
|
|
100274
|
+
writeLog("Current directory: ".concat(currentDirectory, " CaseSensitiveFileNames: ").concat(useCaseSensitiveFileNames));
|
|
100261
100275
|
var configFileWatcher;
|
|
100262
100276
|
if (configFileName) {
|
|
100263
100277
|
configFileWatcher = watchFile(configFileName, scheduleProgramReload, ts.PollingInterval.High, watchOptions, ts.WatchType.ConfigFile);
|
|
@@ -100404,10 +100418,10 @@ var ts;
|
|
|
100404
100418
|
}
|
|
100405
100419
|
function createNewProgram(hasInvalidatedResolution) {
|
|
100406
100420
|
writeLog("CreatingProgramWith::");
|
|
100407
|
-
writeLog(" roots: "
|
|
100408
|
-
writeLog(" options: "
|
|
100421
|
+
writeLog(" roots: ".concat(JSON.stringify(rootFileNames)));
|
|
100422
|
+
writeLog(" options: ".concat(JSON.stringify(compilerOptions)));
|
|
100409
100423
|
if (projectReferences)
|
|
100410
|
-
writeLog(" projectReferences: "
|
|
100424
|
+
writeLog(" projectReferences: ".concat(JSON.stringify(projectReferences)));
|
|
100411
100425
|
var needsUpdateInTypeRootWatch = hasChangedCompilerOptions || !getCurrentProgram();
|
|
100412
100426
|
hasChangedCompilerOptions = false;
|
|
100413
100427
|
hasChangedConfigFileParsingErrors = false;
|
|
@@ -100549,7 +100563,7 @@ var ts;
|
|
|
100549
100563
|
return resolutionCache.invalidateResolutionsOfFailedLookupLocations();
|
|
100550
100564
|
}
|
|
100551
100565
|
var pending = clearInvalidateResolutionsOfFailedLookupLocations();
|
|
100552
|
-
writeLog("Scheduling invalidateFailedLookup"
|
|
100566
|
+
writeLog("Scheduling invalidateFailedLookup".concat(pending ? ", Cancelled earlier one" : ""));
|
|
100553
100567
|
timerToInvalidateFailedLookupResolutions = host.setTimeout(invalidateResolutionsOfFailedLookup, 250);
|
|
100554
100568
|
}
|
|
100555
100569
|
function invalidateResolutionsOfFailedLookup() {
|
|
@@ -100605,7 +100619,7 @@ var ts;
|
|
|
100605
100619
|
synchronizeProgram();
|
|
100606
100620
|
}
|
|
100607
100621
|
function reloadConfigFile() {
|
|
100608
|
-
writeLog("Reloading config file: "
|
|
100622
|
+
writeLog("Reloading config file: ".concat(configFileName));
|
|
100609
100623
|
reloadLevel = ts.ConfigFileProgramReloadLevel.None;
|
|
100610
100624
|
if (cachedDirectoryStructureHost) {
|
|
100611
100625
|
cachedDirectoryStructureHost.clearCache();
|
|
@@ -100643,7 +100657,7 @@ var ts;
|
|
|
100643
100657
|
return config.parsedCommandLine;
|
|
100644
100658
|
}
|
|
100645
100659
|
}
|
|
100646
|
-
writeLog("Loading config file: "
|
|
100660
|
+
writeLog("Loading config file: ".concat(configFileName));
|
|
100647
100661
|
var parsedCommandLine = host.getParsedCommandLine ?
|
|
100648
100662
|
host.getParsedCommandLine(configFileName) :
|
|
100649
100663
|
getParsedCommandLineFromConfigFileHost(configFileName);
|
|
@@ -100896,8 +100910,8 @@ var ts;
|
|
|
100896
100910
|
ts.getBuildOrderFromAnyBuildOrder = getBuildOrderFromAnyBuildOrder;
|
|
100897
100911
|
function createBuilderStatusReporter(system, pretty) {
|
|
100898
100912
|
return function (diagnostic) {
|
|
100899
|
-
var output = pretty ? "["
|
|
100900
|
-
output += ""
|
|
100913
|
+
var output = pretty ? "[".concat(ts.formatColorAndReset(ts.getLocaleTimeString(system), ts.ForegroundColorEscapeSequences.Grey), "] ") : "".concat(ts.getLocaleTimeString(system), " - ");
|
|
100914
|
+
output += "".concat(ts.flattenDiagnosticMessageText(diagnostic.messageText, system.newLine)).concat(system.newLine + system.newLine);
|
|
100901
100915
|
system.write(output);
|
|
100902
100916
|
};
|
|
100903
100917
|
}
|
|
@@ -101640,7 +101654,7 @@ var ts;
|
|
|
101640
101654
|
function listEmittedFile(_a, proj, file) {
|
|
101641
101655
|
var write = _a.write;
|
|
101642
101656
|
if (write && proj.options.listEmittedFiles) {
|
|
101643
|
-
write("TSFILE: "
|
|
101657
|
+
write("TSFILE: ".concat(file));
|
|
101644
101658
|
}
|
|
101645
101659
|
}
|
|
101646
101660
|
function getOldProgram(_a, proj, parsed) {
|
|
@@ -101669,7 +101683,7 @@ var ts;
|
|
|
101669
101683
|
function buildErrors(state, resolvedPath, program, config, diagnostics, buildResult, errorType) {
|
|
101670
101684
|
var canEmitBuildInfo = !(buildResult & BuildResultFlags.SyntaxErrors) && program && !ts.outFile(program.getCompilerOptions());
|
|
101671
101685
|
reportAndStoreErrors(state, resolvedPath, diagnostics);
|
|
101672
|
-
state.projectStatus.set(resolvedPath, { type: ts.UpToDateStatusType.Unbuildable, reason: errorType
|
|
101686
|
+
state.projectStatus.set(resolvedPath, { type: ts.UpToDateStatusType.Unbuildable, reason: "".concat(errorType, " errors") });
|
|
101673
101687
|
if (canEmitBuildInfo)
|
|
101674
101688
|
return { buildResult: buildResult, step: BuildStep.EmitBuildInfo };
|
|
101675
101689
|
afterProgramDone(state, program, config);
|
|
@@ -101695,7 +101709,7 @@ var ts;
|
|
|
101695
101709
|
if (!host.fileExists(inputFile)) {
|
|
101696
101710
|
return {
|
|
101697
101711
|
type: ts.UpToDateStatusType.Unbuildable,
|
|
101698
|
-
reason: inputFile
|
|
101712
|
+
reason: "".concat(inputFile, " does not exist")
|
|
101699
101713
|
};
|
|
101700
101714
|
}
|
|
101701
101715
|
if (!force) {
|
|
@@ -102020,7 +102034,7 @@ var ts;
|
|
|
102020
102034
|
}
|
|
102021
102035
|
}
|
|
102022
102036
|
if (filesToDelete) {
|
|
102023
|
-
reportStatus(state, ts.Diagnostics.A_non_dry_build_would_delete_the_following_files_Colon_0, filesToDelete.map(function (f) { return "\r\n * "
|
|
102037
|
+
reportStatus(state, ts.Diagnostics.A_non_dry_build_would_delete_the_following_files_Colon_0, filesToDelete.map(function (f) { return "\r\n * ".concat(f); }).join(""));
|
|
102024
102038
|
}
|
|
102025
102039
|
return ts.ExitStatus.Success;
|
|
102026
102040
|
}
|
|
@@ -102370,7 +102384,7 @@ var ts;
|
|
|
102370
102384
|
};
|
|
102371
102385
|
}
|
|
102372
102386
|
function bold(str) {
|
|
102373
|
-
return "\u001B[1m"
|
|
102387
|
+
return "\u001B[1m".concat(str, "\u001B[22m");
|
|
102374
102388
|
}
|
|
102375
102389
|
var isWindows = sys.getEnvironmentVariable("OS") && ts.stringContains(sys.getEnvironmentVariable("OS").toLowerCase(), "windows");
|
|
102376
102390
|
var isWindowsTerminal = sys.getEnvironmentVariable("WT_SESSION");
|
|
@@ -102379,19 +102393,19 @@ var ts;
|
|
|
102379
102393
|
if (isWindows && !isWindowsTerminal && !isVSCode) {
|
|
102380
102394
|
return brightWhite(str);
|
|
102381
102395
|
}
|
|
102382
|
-
return "\u001B[94m"
|
|
102396
|
+
return "\u001B[94m".concat(str, "\u001B[39m");
|
|
102383
102397
|
}
|
|
102384
102398
|
var supportsRicherColors = sys.getEnvironmentVariable("COLORTERM") === "truecolor" || sys.getEnvironmentVariable("TERM") === "xterm-256color";
|
|
102385
102399
|
function blueBackground(str) {
|
|
102386
102400
|
if (supportsRicherColors) {
|
|
102387
|
-
return "\u001B[48;5;68m"
|
|
102401
|
+
return "\u001B[48;5;68m".concat(str, "\u001B[39;49m");
|
|
102388
102402
|
}
|
|
102389
102403
|
else {
|
|
102390
|
-
return "\u001B[44m"
|
|
102404
|
+
return "\u001B[44m".concat(str, "\u001B[39;49m");
|
|
102391
102405
|
}
|
|
102392
102406
|
}
|
|
102393
102407
|
function brightWhite(str) {
|
|
102394
|
-
return "\u001B[97m"
|
|
102408
|
+
return "\u001B[97m".concat(str, "\u001B[39m");
|
|
102395
102409
|
}
|
|
102396
102410
|
return {
|
|
102397
102411
|
bold: bold,
|
|
@@ -102401,7 +102415,7 @@ var ts;
|
|
|
102401
102415
|
};
|
|
102402
102416
|
}
|
|
102403
102417
|
function getDisplayNameTextOfOption(option) {
|
|
102404
|
-
return "--"
|
|
102418
|
+
return "--".concat(option.name).concat(option.shortName ? ", -".concat(option.shortName) : "");
|
|
102405
102419
|
}
|
|
102406
102420
|
function generateOptionOutput(sys, option, rightAlignOfLeft, leftAlignOfRight) {
|
|
102407
102421
|
var _a, _b;
|
|
@@ -102438,13 +102452,13 @@ var ts;
|
|
|
102438
102452
|
text.push(sys.newLine);
|
|
102439
102453
|
if (showAdditionalInfoOutput(valueCandidates, option)) {
|
|
102440
102454
|
if (valueCandidates) {
|
|
102441
|
-
text.push(valueCandidates.valueType
|
|
102455
|
+
text.push("".concat(valueCandidates.valueType, " ").concat(valueCandidates.possibleValues));
|
|
102442
102456
|
}
|
|
102443
102457
|
if (defaultValueDescription) {
|
|
102444
102458
|
if (valueCandidates)
|
|
102445
102459
|
text.push(sys.newLine);
|
|
102446
102460
|
var diagType = ts.getDiagnosticText(ts.Diagnostics.default_Colon);
|
|
102447
|
-
text.push(diagType
|
|
102461
|
+
text.push("".concat(diagType, " ").concat(defaultValueDescription));
|
|
102448
102462
|
}
|
|
102449
102463
|
text.push(sys.newLine);
|
|
102450
102464
|
}
|
|
@@ -102493,7 +102507,7 @@ var ts;
|
|
|
102493
102507
|
}
|
|
102494
102508
|
var curRight = remainRight.substr(0, rightCharacterNumber);
|
|
102495
102509
|
remainRight = remainRight.slice(rightCharacterNumber);
|
|
102496
|
-
res.push(""
|
|
102510
|
+
res.push("".concat(curLeft).concat(curRight));
|
|
102497
102511
|
isFirstLine = false;
|
|
102498
102512
|
}
|
|
102499
102513
|
return res;
|
|
@@ -102594,7 +102608,7 @@ var ts;
|
|
|
102594
102608
|
categoryMap.set(curCategory, optionsOfCurCategory);
|
|
102595
102609
|
}
|
|
102596
102610
|
categoryMap.forEach(function (value, key) {
|
|
102597
|
-
res.push("### "
|
|
102611
|
+
res.push("### ".concat(key).concat(sys.newLine).concat(sys.newLine));
|
|
102598
102612
|
res = __spreadArray(__spreadArray([], res, true), generateGroupOptionOutput(sys, value), true);
|
|
102599
102613
|
});
|
|
102600
102614
|
if (afterOptionsDescription) {
|
|
@@ -102604,7 +102618,7 @@ var ts;
|
|
|
102604
102618
|
}
|
|
102605
102619
|
function printEasyHelp(sys, simpleOptions) {
|
|
102606
102620
|
var colors = createColors(sys);
|
|
102607
|
-
var output = __spreadArray([], getHeader(sys, ts.getDiagnosticText(ts.Diagnostics.tsc_Colon_The_TypeScript_Compiler)
|
|
102621
|
+
var output = __spreadArray([], getHeader(sys, "".concat(ts.getDiagnosticText(ts.Diagnostics.tsc_Colon_The_TypeScript_Compiler), " - ").concat(ts.getDiagnosticText(ts.Diagnostics.Version_0, ts.version))), true);
|
|
102608
102622
|
output.push(colors.bold(ts.getDiagnosticText(ts.Diagnostics.COMMON_COMMANDS)) + sys.newLine + sys.newLine);
|
|
102609
102623
|
example("tsc", ts.Diagnostics.Compiles_the_current_project_tsconfig_json_in_the_working_directory);
|
|
102610
102624
|
example("tsc app.ts util.ts", ts.Diagnostics.Ignoring_tsconfig_json_compiles_the_specified_files_with_default_compiler_options);
|
|
@@ -102630,7 +102644,7 @@ var ts;
|
|
|
102630
102644
|
}
|
|
102631
102645
|
}
|
|
102632
102646
|
function printAllHelp(sys, compilerOptions, buildOptions, watchOptions) {
|
|
102633
|
-
var output = __spreadArray([], getHeader(sys, ts.getDiagnosticText(ts.Diagnostics.tsc_Colon_The_TypeScript_Compiler)
|
|
102647
|
+
var output = __spreadArray([], getHeader(sys, "".concat(ts.getDiagnosticText(ts.Diagnostics.tsc_Colon_The_TypeScript_Compiler), " - ").concat(ts.getDiagnosticText(ts.Diagnostics.Version_0, ts.version))), true);
|
|
102634
102648
|
output = __spreadArray(__spreadArray([], output, true), generateSectionOptionsOutput(sys, ts.getDiagnosticText(ts.Diagnostics.ALL_COMPILER_OPTIONS), compilerOptions, true, undefined, ts.formatMessage(undefined, ts.Diagnostics.You_can_learn_about_all_of_the_compiler_options_at_0, "https://aka.ms/tsconfig-reference")), true);
|
|
102635
102649
|
output = __spreadArray(__spreadArray([], output, true), generateSectionOptionsOutput(sys, ts.getDiagnosticText(ts.Diagnostics.WATCH_OPTIONS), watchOptions, false, ts.getDiagnosticText(ts.Diagnostics.Including_watch_w_will_start_watching_the_current_project_for_the_file_changes_Once_set_you_can_config_watch_mode_with_Colon)), true);
|
|
102636
102650
|
output = __spreadArray(__spreadArray([], output, true), generateSectionOptionsOutput(sys, ts.getDiagnosticText(ts.Diagnostics.BUILD_OPTIONS), buildOptions, false, ts.formatMessage(undefined, ts.Diagnostics.Using_build_b_will_make_tsc_behave_more_like_a_build_orchestrator_than_a_compiler_This_is_used_to_trigger_building_composite_projects_which_you_can_learn_more_about_at_0, "https://aka.ms/tsc-composite-builds")), true);
|
|
@@ -102640,7 +102654,7 @@ var ts;
|
|
|
102640
102654
|
}
|
|
102641
102655
|
}
|
|
102642
102656
|
function printBuildHelp(sys, buildOptions) {
|
|
102643
|
-
var output = __spreadArray([], getHeader(sys, ts.getDiagnosticText(ts.Diagnostics.tsc_Colon_The_TypeScript_Compiler)
|
|
102657
|
+
var output = __spreadArray([], getHeader(sys, "".concat(ts.getDiagnosticText(ts.Diagnostics.tsc_Colon_The_TypeScript_Compiler), " - ").concat(ts.getDiagnosticText(ts.Diagnostics.Version_0, ts.version))), true);
|
|
102644
102658
|
output = __spreadArray(__spreadArray([], output, true), generateSectionOptionsOutput(sys, ts.getDiagnosticText(ts.Diagnostics.BUILD_OPTIONS), buildOptions, false, ts.formatMessage(undefined, ts.Diagnostics.Using_build_b_will_make_tsc_behave_more_like_a_build_orchestrator_than_a_compiler_This_is_used_to_trigger_building_composite_projects_which_you_can_learn_more_about_at_0, "https://aka.ms/tsc-composite-builds")), true);
|
|
102645
102659
|
for (var _i = 0, output_3 = output; _i < output_3.length; _i++) {
|
|
102646
102660
|
var line = output_3[_i];
|
|
@@ -103021,7 +103035,7 @@ var ts;
|
|
|
103021
103035
|
reportCountStatistic("Subtype cache size", caches.subtype);
|
|
103022
103036
|
reportCountStatistic("Strict subtype cache size", caches.strictSubtype);
|
|
103023
103037
|
if (isPerformanceEnabled) {
|
|
103024
|
-
ts.performance.forEachMeasure(function (name, duration) { return reportTimeStatistic(name
|
|
103038
|
+
ts.performance.forEachMeasure(function (name, duration) { return reportTimeStatistic("".concat(name, " time"), duration); });
|
|
103025
103039
|
}
|
|
103026
103040
|
}
|
|
103027
103041
|
else if (isPerformanceEnabled) {
|
|
@@ -103092,7 +103106,7 @@ var ts;
|
|
|
103092
103106
|
// This file actually uses arguments passed on commandline and executes it
|
|
103093
103107
|
ts.Debug.loggingHost = {
|
|
103094
103108
|
log: function (_level, s) {
|
|
103095
|
-
ts.sys.write(""
|
|
103109
|
+
ts.sys.write("".concat(s || "").concat(ts.sys.newLine));
|
|
103096
103110
|
}
|
|
103097
103111
|
};
|
|
103098
103112
|
if (ts.Debug.isDebugging) {
|