typescript 4.6.0-dev.20220211 → 4.6.1-rc
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 +263 -263
- package/lib/tsserver.js +551 -551
- package/lib/tsserverlibrary.js +526 -526
- package/lib/typescript.js +431 -431
- package/lib/typescriptServices.js +431 -431
- package/lib/typingsInstaller.js +318 -318
- package/package.json +2 -2
package/lib/typingsInstaller.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) {
|
|
@@ -89,7 +89,7 @@ var ts;
|
|
|
89
89
|
// The following is baselined as a literal template type without intervention
|
|
90
90
|
/** The version of the TypeScript compiler release */
|
|
91
91
|
// eslint-disable-next-line @typescript-eslint/no-inferrable-types
|
|
92
|
-
ts.version = ts.versionMajorMinor
|
|
92
|
+
ts.version = "".concat(ts.versionMajorMinor, ".1-rc");
|
|
93
93
|
/* @internal */
|
|
94
94
|
var Comparison;
|
|
95
95
|
(function (Comparison) {
|
|
@@ -136,7 +136,7 @@ var ts;
|
|
|
136
136
|
var constructor = (_a = NativeCollections[nativeFactory]()) !== null && _a !== void 0 ? _a : ts.ShimCollections === null || ts.ShimCollections === void 0 ? void 0 : ts.ShimCollections[shimFactory](ts.getIterator);
|
|
137
137
|
if (constructor)
|
|
138
138
|
return constructor;
|
|
139
|
-
throw new Error("TypeScript requires an environment that provides a compatible native "
|
|
139
|
+
throw new Error("TypeScript requires an environment that provides a compatible native ".concat(name, " implementation."));
|
|
140
140
|
}
|
|
141
141
|
})(ts || (ts = {}));
|
|
142
142
|
/* @internal */
|
|
@@ -1486,7 +1486,7 @@ var ts;
|
|
|
1486
1486
|
function cast(value, test) {
|
|
1487
1487
|
if (value !== undefined && test(value))
|
|
1488
1488
|
return value;
|
|
1489
|
-
return ts.Debug.fail("Invalid cast. The supplied value "
|
|
1489
|
+
return ts.Debug.fail("Invalid cast. The supplied value ".concat(value, " did not pass the test '").concat(ts.Debug.getFunctionName(test), "'."));
|
|
1490
1490
|
}
|
|
1491
1491
|
ts.cast = cast;
|
|
1492
1492
|
/** Does nothing. */
|
|
@@ -1577,7 +1577,7 @@ var ts;
|
|
|
1577
1577
|
function memoizeOne(callback) {
|
|
1578
1578
|
var map = new ts.Map();
|
|
1579
1579
|
return function (arg) {
|
|
1580
|
-
var key = typeof arg
|
|
1580
|
+
var key = "".concat(typeof arg, ":").concat(arg);
|
|
1581
1581
|
var value = map.get(key);
|
|
1582
1582
|
if (value === undefined && !map.has(key)) {
|
|
1583
1583
|
value = callback(arg);
|
|
@@ -2027,7 +2027,7 @@ var ts;
|
|
|
2027
2027
|
ts.createGetCanonicalFileName = createGetCanonicalFileName;
|
|
2028
2028
|
function patternText(_a) {
|
|
2029
2029
|
var prefix = _a.prefix, suffix = _a.suffix;
|
|
2030
|
-
return prefix
|
|
2030
|
+
return "".concat(prefix, "*").concat(suffix);
|
|
2031
2031
|
}
|
|
2032
2032
|
ts.patternText = patternText;
|
|
2033
2033
|
/**
|
|
@@ -2340,7 +2340,7 @@ var ts;
|
|
|
2340
2340
|
}
|
|
2341
2341
|
function fail(message, stackCrawlMark) {
|
|
2342
2342
|
debugger;
|
|
2343
|
-
var e = new Error(message ? "Debug Failure. "
|
|
2343
|
+
var e = new Error(message ? "Debug Failure. ".concat(message) : "Debug Failure.");
|
|
2344
2344
|
if (Error.captureStackTrace) {
|
|
2345
2345
|
Error.captureStackTrace(e, stackCrawlMark || fail);
|
|
2346
2346
|
}
|
|
@@ -2348,12 +2348,12 @@ var ts;
|
|
|
2348
2348
|
}
|
|
2349
2349
|
Debug.fail = fail;
|
|
2350
2350
|
function failBadSyntaxKind(node, message, stackCrawlMark) {
|
|
2351
|
-
return fail((message || "Unexpected node."
|
|
2351
|
+
return fail("".concat(message || "Unexpected node.", "\r\nNode ").concat(formatSyntaxKind(node.kind), " was unexpected."), stackCrawlMark || failBadSyntaxKind);
|
|
2352
2352
|
}
|
|
2353
2353
|
Debug.failBadSyntaxKind = failBadSyntaxKind;
|
|
2354
2354
|
function assert(expression, message, verboseDebugInfo, stackCrawlMark) {
|
|
2355
2355
|
if (!expression) {
|
|
2356
|
-
message = message ? "False expression: "
|
|
2356
|
+
message = message ? "False expression: ".concat(message) : "False expression.";
|
|
2357
2357
|
if (verboseDebugInfo) {
|
|
2358
2358
|
message += "\r\nVerbose Debug Information: " + (typeof verboseDebugInfo === "string" ? verboseDebugInfo : verboseDebugInfo());
|
|
2359
2359
|
}
|
|
@@ -2363,26 +2363,26 @@ var ts;
|
|
|
2363
2363
|
Debug.assert = assert;
|
|
2364
2364
|
function assertEqual(a, b, msg, msg2, stackCrawlMark) {
|
|
2365
2365
|
if (a !== b) {
|
|
2366
|
-
var message = msg ? msg2 ? msg
|
|
2367
|
-
fail("Expected "
|
|
2366
|
+
var message = msg ? msg2 ? "".concat(msg, " ").concat(msg2) : msg : "";
|
|
2367
|
+
fail("Expected ".concat(a, " === ").concat(b, ". ").concat(message), stackCrawlMark || assertEqual);
|
|
2368
2368
|
}
|
|
2369
2369
|
}
|
|
2370
2370
|
Debug.assertEqual = assertEqual;
|
|
2371
2371
|
function assertLessThan(a, b, msg, stackCrawlMark) {
|
|
2372
2372
|
if (a >= b) {
|
|
2373
|
-
fail("Expected "
|
|
2373
|
+
fail("Expected ".concat(a, " < ").concat(b, ". ").concat(msg || ""), stackCrawlMark || assertLessThan);
|
|
2374
2374
|
}
|
|
2375
2375
|
}
|
|
2376
2376
|
Debug.assertLessThan = assertLessThan;
|
|
2377
2377
|
function assertLessThanOrEqual(a, b, stackCrawlMark) {
|
|
2378
2378
|
if (a > b) {
|
|
2379
|
-
fail("Expected "
|
|
2379
|
+
fail("Expected ".concat(a, " <= ").concat(b), stackCrawlMark || assertLessThanOrEqual);
|
|
2380
2380
|
}
|
|
2381
2381
|
}
|
|
2382
2382
|
Debug.assertLessThanOrEqual = assertLessThanOrEqual;
|
|
2383
2383
|
function assertGreaterThanOrEqual(a, b, stackCrawlMark) {
|
|
2384
2384
|
if (a < b) {
|
|
2385
|
-
fail("Expected "
|
|
2385
|
+
fail("Expected ".concat(a, " >= ").concat(b), stackCrawlMark || assertGreaterThanOrEqual);
|
|
2386
2386
|
}
|
|
2387
2387
|
}
|
|
2388
2388
|
Debug.assertGreaterThanOrEqual = assertGreaterThanOrEqual;
|
|
@@ -2413,42 +2413,42 @@ var ts;
|
|
|
2413
2413
|
function assertNever(member, message, stackCrawlMark) {
|
|
2414
2414
|
if (message === void 0) { message = "Illegal value:"; }
|
|
2415
2415
|
var detail = typeof member === "object" && ts.hasProperty(member, "kind") && ts.hasProperty(member, "pos") && formatSyntaxKind ? "SyntaxKind: " + formatSyntaxKind(member.kind) : JSON.stringify(member);
|
|
2416
|
-
return fail(message
|
|
2416
|
+
return fail("".concat(message, " ").concat(detail), stackCrawlMark || assertNever);
|
|
2417
2417
|
}
|
|
2418
2418
|
Debug.assertNever = assertNever;
|
|
2419
2419
|
function assertEachNode(nodes, test, message, stackCrawlMark) {
|
|
2420
2420
|
if (shouldAssertFunction(1 /* Normal */, "assertEachNode")) {
|
|
2421
|
-
assert(test === undefined || ts.every(nodes, test), message || "Unexpected node.", function () { return "Node array did not pass test '"
|
|
2421
|
+
assert(test === undefined || ts.every(nodes, test), message || "Unexpected node.", function () { return "Node array did not pass test '".concat(getFunctionName(test), "'."); }, stackCrawlMark || assertEachNode);
|
|
2422
2422
|
}
|
|
2423
2423
|
}
|
|
2424
2424
|
Debug.assertEachNode = assertEachNode;
|
|
2425
2425
|
function assertNode(node, test, message, stackCrawlMark) {
|
|
2426
2426
|
if (shouldAssertFunction(1 /* Normal */, "assertNode")) {
|
|
2427
|
-
assert(node !== undefined && (test === undefined || test(node)), message || "Unexpected node.", function () { return "Node "
|
|
2427
|
+
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);
|
|
2428
2428
|
}
|
|
2429
2429
|
}
|
|
2430
2430
|
Debug.assertNode = assertNode;
|
|
2431
2431
|
function assertNotNode(node, test, message, stackCrawlMark) {
|
|
2432
2432
|
if (shouldAssertFunction(1 /* Normal */, "assertNotNode")) {
|
|
2433
|
-
assert(node === undefined || test === undefined || !test(node), message || "Unexpected node.", function () { return "Node "
|
|
2433
|
+
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);
|
|
2434
2434
|
}
|
|
2435
2435
|
}
|
|
2436
2436
|
Debug.assertNotNode = assertNotNode;
|
|
2437
2437
|
function assertOptionalNode(node, test, message, stackCrawlMark) {
|
|
2438
2438
|
if (shouldAssertFunction(1 /* Normal */, "assertOptionalNode")) {
|
|
2439
|
-
assert(test === undefined || node === undefined || test(node), message || "Unexpected node.", function () { return "Node "
|
|
2439
|
+
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);
|
|
2440
2440
|
}
|
|
2441
2441
|
}
|
|
2442
2442
|
Debug.assertOptionalNode = assertOptionalNode;
|
|
2443
2443
|
function assertOptionalToken(node, kind, message, stackCrawlMark) {
|
|
2444
2444
|
if (shouldAssertFunction(1 /* Normal */, "assertOptionalToken")) {
|
|
2445
|
-
assert(kind === undefined || node === undefined || node.kind === kind, message || "Unexpected node.", function () { return "Node "
|
|
2445
|
+
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);
|
|
2446
2446
|
}
|
|
2447
2447
|
}
|
|
2448
2448
|
Debug.assertOptionalToken = assertOptionalToken;
|
|
2449
2449
|
function assertMissingNode(node, message, stackCrawlMark) {
|
|
2450
2450
|
if (shouldAssertFunction(1 /* Normal */, "assertMissingNode")) {
|
|
2451
|
-
assert(node === undefined, message || "Unexpected node.", function () { return "Node "
|
|
2451
|
+
assert(node === undefined, message || "Unexpected node.", function () { return "Node ".concat(formatSyntaxKind(node.kind), " was unexpected'."); }, stackCrawlMark || assertMissingNode);
|
|
2452
2452
|
}
|
|
2453
2453
|
}
|
|
2454
2454
|
Debug.assertMissingNode = assertMissingNode;
|
|
@@ -2469,7 +2469,7 @@ var ts;
|
|
|
2469
2469
|
}
|
|
2470
2470
|
Debug.getFunctionName = getFunctionName;
|
|
2471
2471
|
function formatSymbol(symbol) {
|
|
2472
|
-
return "{ name: "
|
|
2472
|
+
return "{ name: ".concat(ts.unescapeLeadingUnderscores(symbol.escapedName), "; flags: ").concat(formatSymbolFlags(symbol.flags), "; declarations: ").concat(ts.map(symbol.declarations, function (node) { return formatSyntaxKind(node.kind); }), " }");
|
|
2473
2473
|
}
|
|
2474
2474
|
Debug.formatSymbol = formatSymbol;
|
|
2475
2475
|
/**
|
|
@@ -2490,7 +2490,7 @@ var ts;
|
|
|
2490
2490
|
break;
|
|
2491
2491
|
}
|
|
2492
2492
|
if (enumValue !== 0 && enumValue & value) {
|
|
2493
|
-
result = ""
|
|
2493
|
+
result = "".concat(result).concat(result ? "|" : "").concat(enumName);
|
|
2494
2494
|
remainingFlags &= ~enumValue;
|
|
2495
2495
|
}
|
|
2496
2496
|
}
|
|
@@ -2600,7 +2600,7 @@ var ts;
|
|
|
2600
2600
|
this.flags & 1 /* Unreachable */ ? "FlowUnreachable" :
|
|
2601
2601
|
"UnknownFlow";
|
|
2602
2602
|
var remainingFlags = this.flags & ~(2048 /* Referenced */ - 1);
|
|
2603
|
-
return ""
|
|
2603
|
+
return "".concat(flowHeader).concat(remainingFlags ? " (".concat(formatFlowFlags(remainingFlags), ")") : "");
|
|
2604
2604
|
}
|
|
2605
2605
|
},
|
|
2606
2606
|
__debugFlowFlags: { get: function () { return formatEnum(this.flags, ts.FlowFlags, /*isFlags*/ true); } },
|
|
@@ -2639,7 +2639,7 @@ var ts;
|
|
|
2639
2639
|
// We don't care, this is debug code that's only enabled with a debugger attached -
|
|
2640
2640
|
// we're just taking note of it for anyone checking regex performance in the future.
|
|
2641
2641
|
defaultValue = String(defaultValue).replace(/(?:,[\s\w\d_]+:[^,]+)+\]$/, "]");
|
|
2642
|
-
return "NodeArray "
|
|
2642
|
+
return "NodeArray ".concat(defaultValue);
|
|
2643
2643
|
}
|
|
2644
2644
|
}
|
|
2645
2645
|
});
|
|
@@ -2694,7 +2694,7 @@ var ts;
|
|
|
2694
2694
|
var symbolHeader = this.flags & 33554432 /* Transient */ ? "TransientSymbol" :
|
|
2695
2695
|
"Symbol";
|
|
2696
2696
|
var remainingSymbolFlags = this.flags & ~33554432 /* Transient */;
|
|
2697
|
-
return symbolHeader
|
|
2697
|
+
return "".concat(symbolHeader, " '").concat(ts.symbolName(this), "'").concat(remainingSymbolFlags ? " (".concat(formatSymbolFlags(remainingSymbolFlags), ")") : "");
|
|
2698
2698
|
}
|
|
2699
2699
|
},
|
|
2700
2700
|
__debugFlags: { get: function () { return formatSymbolFlags(this.flags); } }
|
|
@@ -2704,11 +2704,11 @@ var ts;
|
|
|
2704
2704
|
__tsDebuggerDisplay: {
|
|
2705
2705
|
value: function () {
|
|
2706
2706
|
var typeHeader = this.flags & 98304 /* Nullable */ ? "NullableType" :
|
|
2707
|
-
this.flags & 384 /* StringOrNumberLiteral */ ? "LiteralType "
|
|
2708
|
-
this.flags & 2048 /* BigIntLiteral */ ? "LiteralType "
|
|
2707
|
+
this.flags & 384 /* StringOrNumberLiteral */ ? "LiteralType ".concat(JSON.stringify(this.value)) :
|
|
2708
|
+
this.flags & 2048 /* BigIntLiteral */ ? "LiteralType ".concat(this.value.negative ? "-" : "").concat(this.value.base10Value, "n") :
|
|
2709
2709
|
this.flags & 8192 /* UniqueESSymbol */ ? "UniqueESSymbolType" :
|
|
2710
2710
|
this.flags & 32 /* Enum */ ? "EnumType" :
|
|
2711
|
-
this.flags & 67359327 /* Intrinsic */ ? "IntrinsicType "
|
|
2711
|
+
this.flags & 67359327 /* Intrinsic */ ? "IntrinsicType ".concat(this.intrinsicName) :
|
|
2712
2712
|
this.flags & 1048576 /* Union */ ? "UnionType" :
|
|
2713
2713
|
this.flags & 2097152 /* Intersection */ ? "IntersectionType" :
|
|
2714
2714
|
this.flags & 4194304 /* Index */ ? "IndexType" :
|
|
@@ -2727,7 +2727,7 @@ var ts;
|
|
|
2727
2727
|
"ObjectType" :
|
|
2728
2728
|
"Type";
|
|
2729
2729
|
var remainingObjectFlags = this.flags & 524288 /* Object */ ? this.objectFlags & ~1343 /* ObjectTypeKindMask */ : 0;
|
|
2730
|
-
return ""
|
|
2730
|
+
return "".concat(typeHeader).concat(this.symbol ? " '".concat(ts.symbolName(this.symbol), "'") : "").concat(remainingObjectFlags ? " (".concat(formatObjectFlags(remainingObjectFlags), ")") : "");
|
|
2731
2731
|
}
|
|
2732
2732
|
},
|
|
2733
2733
|
__debugFlags: { get: function () { return formatTypeFlags(this.flags); } },
|
|
@@ -2763,11 +2763,11 @@ var ts;
|
|
|
2763
2763
|
__tsDebuggerDisplay: {
|
|
2764
2764
|
value: function () {
|
|
2765
2765
|
var nodeHeader = ts.isGeneratedIdentifier(this) ? "GeneratedIdentifier" :
|
|
2766
|
-
ts.isIdentifier(this) ? "Identifier '"
|
|
2767
|
-
ts.isPrivateIdentifier(this) ? "PrivateIdentifier '"
|
|
2768
|
-
ts.isStringLiteral(this) ? "StringLiteral "
|
|
2769
|
-
ts.isNumericLiteral(this) ? "NumericLiteral "
|
|
2770
|
-
ts.isBigIntLiteral(this) ? "BigIntLiteral "
|
|
2766
|
+
ts.isIdentifier(this) ? "Identifier '".concat(ts.idText(this), "'") :
|
|
2767
|
+
ts.isPrivateIdentifier(this) ? "PrivateIdentifier '".concat(ts.idText(this), "'") :
|
|
2768
|
+
ts.isStringLiteral(this) ? "StringLiteral ".concat(JSON.stringify(this.text.length < 10 ? this.text : this.text.slice(10) + "...")) :
|
|
2769
|
+
ts.isNumericLiteral(this) ? "NumericLiteral ".concat(this.text) :
|
|
2770
|
+
ts.isBigIntLiteral(this) ? "BigIntLiteral ".concat(this.text, "n") :
|
|
2771
2771
|
ts.isTypeParameterDeclaration(this) ? "TypeParameterDeclaration" :
|
|
2772
2772
|
ts.isParameter(this) ? "ParameterDeclaration" :
|
|
2773
2773
|
ts.isConstructorDeclaration(this) ? "ConstructorDeclaration" :
|
|
@@ -2799,7 +2799,7 @@ var ts;
|
|
|
2799
2799
|
ts.isNamedTupleMember(this) ? "NamedTupleMember" :
|
|
2800
2800
|
ts.isImportTypeNode(this) ? "ImportTypeNode" :
|
|
2801
2801
|
formatSyntaxKind(this.kind);
|
|
2802
|
-
return ""
|
|
2802
|
+
return "".concat(nodeHeader).concat(this.flags ? " (".concat(formatNodeFlags(this.flags), ")") : "");
|
|
2803
2803
|
}
|
|
2804
2804
|
},
|
|
2805
2805
|
__debugKind: { get: function () { return formatSyntaxKind(this.kind); } },
|
|
@@ -2846,10 +2846,10 @@ var ts;
|
|
|
2846
2846
|
Debug.enableDebugInfo = enableDebugInfo;
|
|
2847
2847
|
function formatDeprecationMessage(name, error, errorAfter, since, message) {
|
|
2848
2848
|
var deprecationMessage = error ? "DeprecationError: " : "DeprecationWarning: ";
|
|
2849
|
-
deprecationMessage += "'"
|
|
2850
|
-
deprecationMessage += since ? "has been deprecated since v"
|
|
2851
|
-
deprecationMessage += error ? " and can no longer be used." : errorAfter ? " and will no longer be usable after v"
|
|
2852
|
-
deprecationMessage += message ? " "
|
|
2849
|
+
deprecationMessage += "'".concat(name, "' ");
|
|
2850
|
+
deprecationMessage += since ? "has been deprecated since v".concat(since) : "is deprecated";
|
|
2851
|
+
deprecationMessage += error ? " and can no longer be used." : errorAfter ? " and will no longer be usable after v".concat(errorAfter, ".") : ".";
|
|
2852
|
+
deprecationMessage += message ? " ".concat(ts.formatStringFromArgs(message, [name], 0)) : "";
|
|
2853
2853
|
return deprecationMessage;
|
|
2854
2854
|
}
|
|
2855
2855
|
function createErrorDeprecation(name, errorAfter, since, message) {
|
|
@@ -2980,11 +2980,11 @@ var ts;
|
|
|
2980
2980
|
}
|
|
2981
2981
|
};
|
|
2982
2982
|
Version.prototype.toString = function () {
|
|
2983
|
-
var result = this.major
|
|
2983
|
+
var result = "".concat(this.major, ".").concat(this.minor, ".").concat(this.patch);
|
|
2984
2984
|
if (ts.some(this.prerelease))
|
|
2985
|
-
result += "-"
|
|
2985
|
+
result += "-".concat(this.prerelease.join("."));
|
|
2986
2986
|
if (ts.some(this.build))
|
|
2987
|
-
result += "+"
|
|
2987
|
+
result += "+".concat(this.build.join("."));
|
|
2988
2988
|
return result;
|
|
2989
2989
|
};
|
|
2990
2990
|
Version.zero = new Version(0, 0, 0);
|
|
@@ -3251,7 +3251,7 @@ var ts;
|
|
|
3251
3251
|
return ts.map(comparators, formatComparator).join(" ");
|
|
3252
3252
|
}
|
|
3253
3253
|
function formatComparator(comparator) {
|
|
3254
|
-
return ""
|
|
3254
|
+
return "".concat(comparator.operator).concat(comparator.operand);
|
|
3255
3255
|
}
|
|
3256
3256
|
})(ts || (ts = {}));
|
|
3257
3257
|
/*@internal*/
|
|
@@ -3549,7 +3549,7 @@ var ts;
|
|
|
3549
3549
|
fs = require("fs");
|
|
3550
3550
|
}
|
|
3551
3551
|
catch (e) {
|
|
3552
|
-
throw new Error("tracing requires having fs\n(original error: "
|
|
3552
|
+
throw new Error("tracing requires having fs\n(original error: ".concat(e.message || e, ")"));
|
|
3553
3553
|
}
|
|
3554
3554
|
}
|
|
3555
3555
|
mode = tracingMode;
|
|
@@ -3561,11 +3561,11 @@ var ts;
|
|
|
3561
3561
|
if (!fs.existsSync(traceDir)) {
|
|
3562
3562
|
fs.mkdirSync(traceDir, { recursive: true });
|
|
3563
3563
|
}
|
|
3564
|
-
var countPart = mode === "build" ? "."
|
|
3565
|
-
: mode === "server" ? "."
|
|
3564
|
+
var countPart = mode === "build" ? ".".concat(process.pid, "-").concat(++traceCount)
|
|
3565
|
+
: mode === "server" ? ".".concat(process.pid)
|
|
3566
3566
|
: "";
|
|
3567
|
-
var tracePath = ts.combinePaths(traceDir, "trace"
|
|
3568
|
-
var typesPath = ts.combinePaths(traceDir, "types"
|
|
3567
|
+
var tracePath = ts.combinePaths(traceDir, "trace".concat(countPart, ".json"));
|
|
3568
|
+
var typesPath = ts.combinePaths(traceDir, "types".concat(countPart, ".json"));
|
|
3569
3569
|
legend.push({
|
|
3570
3570
|
configFilePath: configFilePath,
|
|
3571
3571
|
tracePath: tracePath,
|
|
@@ -3655,7 +3655,7 @@ var ts;
|
|
|
3655
3655
|
}
|
|
3656
3656
|
// test if [time,endTime) straddles a sampling point
|
|
3657
3657
|
else if (sampleInterval - (time % sampleInterval) <= endTime - time) {
|
|
3658
|
-
writeEvent("X", phase, name, args, "\"dur\":"
|
|
3658
|
+
writeEvent("X", phase, name, args, "\"dur\":".concat(endTime - time), time);
|
|
3659
3659
|
}
|
|
3660
3660
|
}
|
|
3661
3661
|
function writeEvent(eventType, phase, name, args, extras, time) {
|
|
@@ -3664,11 +3664,11 @@ var ts;
|
|
|
3664
3664
|
if (mode === "server" && phase === "checkTypes" /* CheckTypes */)
|
|
3665
3665
|
return;
|
|
3666
3666
|
ts.performance.mark("beginTracing");
|
|
3667
|
-
fs.writeSync(traceFd, ",\n{\"pid\":1,\"tid\":1,\"ph\":\""
|
|
3667
|
+
fs.writeSync(traceFd, ",\n{\"pid\":1,\"tid\":1,\"ph\":\"".concat(eventType, "\",\"cat\":\"").concat(phase, "\",\"ts\":").concat(time, ",\"name\":\"").concat(name, "\""));
|
|
3668
3668
|
if (extras)
|
|
3669
|
-
fs.writeSync(traceFd, ","
|
|
3669
|
+
fs.writeSync(traceFd, ",".concat(extras));
|
|
3670
3670
|
if (args)
|
|
3671
|
-
fs.writeSync(traceFd, ",\"args\":"
|
|
3671
|
+
fs.writeSync(traceFd, ",\"args\":".concat(JSON.stringify(args)));
|
|
3672
3672
|
fs.writeSync(traceFd, "}");
|
|
3673
3673
|
ts.performance.mark("endTracing");
|
|
3674
3674
|
ts.performance.measure("Tracing", "beginTracing", "endTracing");
|
|
@@ -5781,7 +5781,7 @@ var ts;
|
|
|
5781
5781
|
pollingChunkSize = getCustomPollingBasedLevels("TSC_WATCH_POLLINGCHUNKSIZE", defaultChunkLevels) || pollingChunkSize;
|
|
5782
5782
|
ts.unchangedPollThresholds = getCustomPollingBasedLevels("TSC_WATCH_UNCHANGEDPOLLTHRESHOLDS", defaultChunkLevels) || ts.unchangedPollThresholds;
|
|
5783
5783
|
function getLevel(envVar, level) {
|
|
5784
|
-
return system.getEnvironmentVariable(envVar
|
|
5784
|
+
return system.getEnvironmentVariable("".concat(envVar, "_").concat(level.toUpperCase()));
|
|
5785
5785
|
}
|
|
5786
5786
|
function getCustomLevels(baseVariable) {
|
|
5787
5787
|
var customLevels;
|
|
@@ -6250,7 +6250,7 @@ var ts;
|
|
|
6250
6250
|
}
|
|
6251
6251
|
function onTimerToUpdateChildWatches() {
|
|
6252
6252
|
timerToUpdateChildWatches = undefined;
|
|
6253
|
-
sysLog("sysLog:: onTimerToUpdateChildWatches:: "
|
|
6253
|
+
sysLog("sysLog:: onTimerToUpdateChildWatches:: ".concat(cacheToUpdateChildWatches.size));
|
|
6254
6254
|
var start = ts.timestamp();
|
|
6255
6255
|
var invokeMap = new ts.Map();
|
|
6256
6256
|
while (!timerToUpdateChildWatches && cacheToUpdateChildWatches.size) {
|
|
@@ -6263,7 +6263,7 @@ var ts;
|
|
|
6263
6263
|
var hasChanges = updateChildWatches(dirName, dirPath, options);
|
|
6264
6264
|
invokeCallbacks(dirPath, invokeMap, hasChanges ? undefined : fileNames);
|
|
6265
6265
|
}
|
|
6266
|
-
sysLog("sysLog:: invokingWatchers:: Elapsed:: "
|
|
6266
|
+
sysLog("sysLog:: invokingWatchers:: Elapsed:: ".concat(ts.timestamp() - start, "ms:: ").concat(cacheToUpdateChildWatches.size));
|
|
6267
6267
|
callbackCache.forEach(function (callbacks, rootDirName) {
|
|
6268
6268
|
var existing = invokeMap.get(rootDirName);
|
|
6269
6269
|
if (existing) {
|
|
@@ -6279,7 +6279,7 @@ var ts;
|
|
|
6279
6279
|
}
|
|
6280
6280
|
});
|
|
6281
6281
|
var elapsed = ts.timestamp() - start;
|
|
6282
|
-
sysLog("sysLog:: Elapsed:: "
|
|
6282
|
+
sysLog("sysLog:: Elapsed:: ".concat(elapsed, "ms:: onTimerToUpdateChildWatches:: ").concat(cacheToUpdateChildWatches.size, " ").concat(timerToUpdateChildWatches));
|
|
6283
6283
|
}
|
|
6284
6284
|
function removeChildWatches(parentWatcher) {
|
|
6285
6285
|
if (!parentWatcher)
|
|
@@ -6739,7 +6739,7 @@ var ts;
|
|
|
6739
6739
|
var remappedPaths = new ts.Map();
|
|
6740
6740
|
var normalizedDir = ts.normalizeSlashes(__dirname);
|
|
6741
6741
|
// Windows rooted dir names need an extra `/` prepended to be valid file:/// urls
|
|
6742
|
-
var fileUrlRoot = "file://"
|
|
6742
|
+
var fileUrlRoot = "file://".concat(ts.getRootLength(normalizedDir) === 1 ? "" : "/").concat(normalizedDir);
|
|
6743
6743
|
for (var _i = 0, _a = profile.nodes; _i < _a.length; _i++) {
|
|
6744
6744
|
var node = _a[_i];
|
|
6745
6745
|
if (node.callFrame.url) {
|
|
@@ -6748,7 +6748,7 @@ var ts;
|
|
|
6748
6748
|
node.callFrame.url = ts.getRelativePathToDirectoryOrUrl(fileUrlRoot, url, fileUrlRoot, ts.createGetCanonicalFileName(useCaseSensitiveFileNames), /*isAbsolutePathAnUrl*/ true);
|
|
6749
6749
|
}
|
|
6750
6750
|
else if (!nativePattern.test(url)) {
|
|
6751
|
-
node.callFrame.url = (remappedPaths.has(url) ? remappedPaths : remappedPaths.set(url, "external"
|
|
6751
|
+
node.callFrame.url = (remappedPaths.has(url) ? remappedPaths : remappedPaths.set(url, "external".concat(externalFileCounter, ".js"))).get(url);
|
|
6752
6752
|
externalFileCounter++;
|
|
6753
6753
|
}
|
|
6754
6754
|
}
|
|
@@ -6764,7 +6764,7 @@ var ts;
|
|
|
6764
6764
|
if (!err) {
|
|
6765
6765
|
try {
|
|
6766
6766
|
if ((_b = statSync(profilePath)) === null || _b === void 0 ? void 0 : _b.isDirectory()) {
|
|
6767
|
-
profilePath = _path.join(profilePath, (new Date()).toISOString().replace(/:/g, "-")
|
|
6767
|
+
profilePath = _path.join(profilePath, "".concat((new Date()).toISOString().replace(/:/g, "-"), "+P").concat(process.pid, ".cpuprofile"));
|
|
6768
6768
|
}
|
|
6769
6769
|
}
|
|
6770
6770
|
catch (_c) {
|
|
@@ -6866,7 +6866,7 @@ var ts;
|
|
|
6866
6866
|
* @param createWatcher
|
|
6867
6867
|
*/
|
|
6868
6868
|
function invokeCallbackAndUpdateWatcher(createWatcher) {
|
|
6869
|
-
sysLog("sysLog:: "
|
|
6869
|
+
sysLog("sysLog:: ".concat(fileOrDirectory, ":: Changing watcher to ").concat(createWatcher === watchPresentFileSystemEntry ? "Present" : "Missing", "FileSystemEntryWatcher"));
|
|
6870
6870
|
// Call the callback for current directory
|
|
6871
6871
|
callback("rename", "");
|
|
6872
6872
|
// If watcher is not closed, update it
|
|
@@ -6891,7 +6891,7 @@ var ts;
|
|
|
6891
6891
|
}
|
|
6892
6892
|
}
|
|
6893
6893
|
if (hitSystemWatcherLimit) {
|
|
6894
|
-
sysLog("sysLog:: "
|
|
6894
|
+
sysLog("sysLog:: ".concat(fileOrDirectory, ":: Defaulting to fsWatchFile"));
|
|
6895
6895
|
return watchPresentFileSystemEntryWithFsWatchFile();
|
|
6896
6896
|
}
|
|
6897
6897
|
try {
|
|
@@ -6907,7 +6907,7 @@ var ts;
|
|
|
6907
6907
|
// Eg. on linux the number of watches are limited and one could easily exhaust watches and the exception ENOSPC is thrown when creating watcher at that point
|
|
6908
6908
|
// so instead of throwing error, use fs.watchFile
|
|
6909
6909
|
hitSystemWatcherLimit || (hitSystemWatcherLimit = e.code === "ENOSPC");
|
|
6910
|
-
sysLog("sysLog:: "
|
|
6910
|
+
sysLog("sysLog:: ".concat(fileOrDirectory, ":: Changing to fsWatchFile"));
|
|
6911
6911
|
return watchPresentFileSystemEntryWithFsWatchFile();
|
|
6912
6912
|
}
|
|
6913
6913
|
}
|
|
@@ -9922,7 +9922,7 @@ var ts;
|
|
|
9922
9922
|
line = line < 0 ? 0 : line >= lineStarts.length ? lineStarts.length - 1 : line;
|
|
9923
9923
|
}
|
|
9924
9924
|
else {
|
|
9925
|
-
ts.Debug.fail("Bad line number. Line: "
|
|
9925
|
+
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"));
|
|
9926
9926
|
}
|
|
9927
9927
|
}
|
|
9928
9928
|
var res = lineStarts[line] + character;
|
|
@@ -12812,7 +12812,7 @@ var ts;
|
|
|
12812
12812
|
: "linkplain";
|
|
12813
12813
|
var name = link.name ? ts.entityNameToString(link.name) : "";
|
|
12814
12814
|
var space = link.name && link.text.startsWith("://") ? "" : " ";
|
|
12815
|
-
return "{@"
|
|
12815
|
+
return "{@".concat(kind, " ").concat(name).concat(space).concat(link.text, "}");
|
|
12816
12816
|
}
|
|
12817
12817
|
/**
|
|
12818
12818
|
* Gets the effective type parameters. If the node was parsed in a
|
|
@@ -14069,11 +14069,11 @@ var ts;
|
|
|
14069
14069
|
}
|
|
14070
14070
|
function packageIdToPackageName(_a) {
|
|
14071
14071
|
var name = _a.name, subModuleName = _a.subModuleName;
|
|
14072
|
-
return subModuleName ? name
|
|
14072
|
+
return subModuleName ? "".concat(name, "/").concat(subModuleName) : name;
|
|
14073
14073
|
}
|
|
14074
14074
|
ts.packageIdToPackageName = packageIdToPackageName;
|
|
14075
14075
|
function packageIdToString(packageId) {
|
|
14076
|
-
return packageIdToPackageName(packageId)
|
|
14076
|
+
return "".concat(packageIdToPackageName(packageId), "@").concat(packageId.version);
|
|
14077
14077
|
}
|
|
14078
14078
|
ts.packageIdToString = packageIdToString;
|
|
14079
14079
|
function typeDirectiveIsEqualTo(oldResolution, newResolution) {
|
|
@@ -14156,7 +14156,7 @@ var ts;
|
|
|
14156
14156
|
function nodePosToString(node) {
|
|
14157
14157
|
var file = getSourceFileOfNode(node);
|
|
14158
14158
|
var loc = ts.getLineAndCharacterOfPosition(file, node.pos);
|
|
14159
|
-
return file.fileName
|
|
14159
|
+
return "".concat(file.fileName, "(").concat(loc.line + 1, ",").concat(loc.character + 1, ")");
|
|
14160
14160
|
}
|
|
14161
14161
|
ts.nodePosToString = nodePosToString;
|
|
14162
14162
|
function getEndLinePosition(line, sourceFile) {
|
|
@@ -14295,7 +14295,7 @@ var ts;
|
|
|
14295
14295
|
ts.isPinnedComment = isPinnedComment;
|
|
14296
14296
|
function createCommentDirectivesMap(sourceFile, commentDirectives) {
|
|
14297
14297
|
var directivesByLine = new ts.Map(commentDirectives.map(function (commentDirective) { return ([
|
|
14298
|
-
""
|
|
14298
|
+
"".concat(ts.getLineAndCharacterOfPosition(sourceFile, commentDirective.range.end).line),
|
|
14299
14299
|
commentDirective,
|
|
14300
14300
|
]); }));
|
|
14301
14301
|
var usedLines = new ts.Map();
|
|
@@ -14312,10 +14312,10 @@ var ts;
|
|
|
14312
14312
|
});
|
|
14313
14313
|
}
|
|
14314
14314
|
function markUsed(line) {
|
|
14315
|
-
if (!directivesByLine.has(""
|
|
14315
|
+
if (!directivesByLine.has("".concat(line))) {
|
|
14316
14316
|
return false;
|
|
14317
14317
|
}
|
|
14318
|
-
usedLines.set(""
|
|
14318
|
+
usedLines.set("".concat(line), true);
|
|
14319
14319
|
return true;
|
|
14320
14320
|
}
|
|
14321
14321
|
}
|
|
@@ -14545,7 +14545,7 @@ var ts;
|
|
|
14545
14545
|
}
|
|
14546
14546
|
return node.text;
|
|
14547
14547
|
}
|
|
14548
|
-
return ts.Debug.fail("Literal kind '"
|
|
14548
|
+
return ts.Debug.fail("Literal kind '".concat(node.kind, "' not accounted for."));
|
|
14549
14549
|
}
|
|
14550
14550
|
ts.getLiteralText = getLiteralText;
|
|
14551
14551
|
function canUseOriginalText(node, flags) {
|
|
@@ -17126,11 +17126,11 @@ var ts;
|
|
|
17126
17126
|
}
|
|
17127
17127
|
ts.getEscapedTextOfIdentifierOrLiteral = getEscapedTextOfIdentifierOrLiteral;
|
|
17128
17128
|
function getPropertyNameForUniqueESSymbol(symbol) {
|
|
17129
|
-
return "__@"
|
|
17129
|
+
return "__@".concat(ts.getSymbolId(symbol), "@").concat(symbol.escapedName);
|
|
17130
17130
|
}
|
|
17131
17131
|
ts.getPropertyNameForUniqueESSymbol = getPropertyNameForUniqueESSymbol;
|
|
17132
17132
|
function getSymbolNameForPrivateIdentifier(containingClassSymbol, description) {
|
|
17133
|
-
return "__#"
|
|
17133
|
+
return "__#".concat(ts.getSymbolId(containingClassSymbol), "@").concat(description);
|
|
17134
17134
|
}
|
|
17135
17135
|
ts.getSymbolNameForPrivateIdentifier = getSymbolNameForPrivateIdentifier;
|
|
17136
17136
|
function isKnownSymbol(symbol) {
|
|
@@ -19832,7 +19832,7 @@ var ts;
|
|
|
19832
19832
|
}
|
|
19833
19833
|
ts.getJSXImplicitImportBase = getJSXImplicitImportBase;
|
|
19834
19834
|
function getJSXRuntimeImport(base, options) {
|
|
19835
|
-
return base ? base
|
|
19835
|
+
return base ? "".concat(base, "/").concat(options.jsx === 5 /* ReactJSXDev */ ? "jsx-dev-runtime" : "jsx-runtime") : undefined;
|
|
19836
19836
|
}
|
|
19837
19837
|
ts.getJSXRuntimeImport = getJSXRuntimeImport;
|
|
19838
19838
|
function hasZeroOrOneAsteriskCharacter(str) {
|
|
@@ -19939,7 +19939,7 @@ var ts;
|
|
|
19939
19939
|
}
|
|
19940
19940
|
var wildcardCharCodes = [42 /* asterisk */, 63 /* question */];
|
|
19941
19941
|
ts.commonPackageFolders = ["node_modules", "bower_components", "jspm_packages"];
|
|
19942
|
-
var implicitExcludePathRegexPattern = "(?!("
|
|
19942
|
+
var implicitExcludePathRegexPattern = "(?!(".concat(ts.commonPackageFolders.join("|"), ")(/|$))");
|
|
19943
19943
|
var filesMatcher = {
|
|
19944
19944
|
/**
|
|
19945
19945
|
* Matches any single directory segment unless it is the last segment and a .min.js file
|
|
@@ -19952,7 +19952,7 @@ var ts;
|
|
|
19952
19952
|
* Regex for the ** wildcard. Matches any number of subdirectories. When used for including
|
|
19953
19953
|
* files or directories, does not match subdirectories that start with a . character
|
|
19954
19954
|
*/
|
|
19955
|
-
doubleAsteriskRegexFragment: "(/"
|
|
19955
|
+
doubleAsteriskRegexFragment: "(/".concat(implicitExcludePathRegexPattern, "[^/.][^/]*)*?"),
|
|
19956
19956
|
replaceWildcardCharacter: function (match) { return replaceWildcardCharacter(match, filesMatcher.singleAsteriskRegexFragment); }
|
|
19957
19957
|
};
|
|
19958
19958
|
var directoriesMatcher = {
|
|
@@ -19961,7 +19961,7 @@ var ts;
|
|
|
19961
19961
|
* Regex for the ** wildcard. Matches any number of subdirectories. When used for including
|
|
19962
19962
|
* files or directories, does not match subdirectories that start with a . character
|
|
19963
19963
|
*/
|
|
19964
|
-
doubleAsteriskRegexFragment: "(/"
|
|
19964
|
+
doubleAsteriskRegexFragment: "(/".concat(implicitExcludePathRegexPattern, "[^/.][^/]*)*?"),
|
|
19965
19965
|
replaceWildcardCharacter: function (match) { return replaceWildcardCharacter(match, directoriesMatcher.singleAsteriskRegexFragment); }
|
|
19966
19966
|
};
|
|
19967
19967
|
var excludeMatcher = {
|
|
@@ -19979,10 +19979,10 @@ var ts;
|
|
|
19979
19979
|
if (!patterns || !patterns.length) {
|
|
19980
19980
|
return undefined;
|
|
19981
19981
|
}
|
|
19982
|
-
var pattern = patterns.map(function (pattern) { return "("
|
|
19982
|
+
var pattern = patterns.map(function (pattern) { return "(".concat(pattern, ")"); }).join("|");
|
|
19983
19983
|
// If excluding, match "foo/bar/baz...", but if including, only allow "foo".
|
|
19984
19984
|
var terminator = usage === "exclude" ? "($|/)" : "$";
|
|
19985
|
-
return "^("
|
|
19985
|
+
return "^(".concat(pattern, ")").concat(terminator);
|
|
19986
19986
|
}
|
|
19987
19987
|
ts.getRegularExpressionForWildcard = getRegularExpressionForWildcard;
|
|
19988
19988
|
function getRegularExpressionsForWildcards(specs, basePath, usage) {
|
|
@@ -20004,7 +20004,7 @@ var ts;
|
|
|
20004
20004
|
ts.isImplicitGlob = isImplicitGlob;
|
|
20005
20005
|
function getPatternFromSpec(spec, basePath, usage) {
|
|
20006
20006
|
var pattern = spec && getSubPatternFromSpec(spec, basePath, usage, wildcardMatchers[usage]);
|
|
20007
|
-
return pattern && "^("
|
|
20007
|
+
return pattern && "^(".concat(pattern, ")").concat(usage === "exclude" ? "($|/)" : "$");
|
|
20008
20008
|
}
|
|
20009
20009
|
ts.getPatternFromSpec = getPatternFromSpec;
|
|
20010
20010
|
function getSubPatternFromSpec(spec, basePath, usage, _a) {
|
|
@@ -20082,7 +20082,7 @@ var ts;
|
|
|
20082
20082
|
currentDirectory = ts.normalizePath(currentDirectory);
|
|
20083
20083
|
var absolutePath = ts.combinePaths(currentDirectory, path);
|
|
20084
20084
|
return {
|
|
20085
|
-
includeFilePatterns: ts.map(getRegularExpressionsForWildcards(includes, absolutePath, "files"), function (pattern) { return "^"
|
|
20085
|
+
includeFilePatterns: ts.map(getRegularExpressionsForWildcards(includes, absolutePath, "files"), function (pattern) { return "^".concat(pattern, "$"); }),
|
|
20086
20086
|
includeFilePattern: getRegularExpressionForWildcard(includes, absolutePath, "files"),
|
|
20087
20087
|
includeDirectoryPattern: getRegularExpressionForWildcard(includes, absolutePath, "directories"),
|
|
20088
20088
|
excludePattern: getRegularExpressionForWildcard(excludes, absolutePath, "exclude"),
|
|
@@ -20363,7 +20363,7 @@ var ts;
|
|
|
20363
20363
|
*/
|
|
20364
20364
|
function extensionFromPath(path) {
|
|
20365
20365
|
var ext = tryGetExtensionFromPath(path);
|
|
20366
|
-
return ext !== undefined ? ext : ts.Debug.fail("File "
|
|
20366
|
+
return ext !== undefined ? ext : ts.Debug.fail("File ".concat(path, " has unknown extension."));
|
|
20367
20367
|
}
|
|
20368
20368
|
ts.extensionFromPath = extensionFromPath;
|
|
20369
20369
|
function isAnySupportedFileExtension(path) {
|
|
@@ -26446,7 +26446,7 @@ var ts;
|
|
|
26446
26446
|
case 326 /* JSDocAugmentsTag */: return "augments";
|
|
26447
26447
|
case 327 /* JSDocImplementsTag */: return "implements";
|
|
26448
26448
|
default:
|
|
26449
|
-
return ts.Debug.fail("Unsupported kind: "
|
|
26449
|
+
return ts.Debug.fail("Unsupported kind: ".concat(ts.Debug.formatSyntaxKind(kind)));
|
|
26450
26450
|
}
|
|
26451
26451
|
}
|
|
26452
26452
|
var rawTextScanner;
|
|
@@ -26774,7 +26774,7 @@ var ts;
|
|
|
26774
26774
|
};
|
|
26775
26775
|
var definedTextGetter_1 = function (path) {
|
|
26776
26776
|
var result = textGetter_1(path);
|
|
26777
|
-
return result !== undefined ? result : "/* Input file "
|
|
26777
|
+
return result !== undefined ? result : "/* Input file ".concat(path, " was missing */\r\n");
|
|
26778
26778
|
};
|
|
26779
26779
|
var buildInfo_1;
|
|
26780
26780
|
var getAndCacheBuildInfo_1 = function (getText) {
|
|
@@ -31312,7 +31312,7 @@ var ts;
|
|
|
31312
31312
|
for (var _i = 0, viableKeywordSuggestions_1 = viableKeywordSuggestions; _i < viableKeywordSuggestions_1.length; _i++) {
|
|
31313
31313
|
var keyword = viableKeywordSuggestions_1[_i];
|
|
31314
31314
|
if (expressionText.length > keyword.length + 2 && ts.startsWith(expressionText, keyword)) {
|
|
31315
|
-
return keyword
|
|
31315
|
+
return "".concat(keyword, " ").concat(expressionText.slice(keyword.length));
|
|
31316
31316
|
}
|
|
31317
31317
|
}
|
|
31318
31318
|
return undefined;
|
|
@@ -38082,7 +38082,7 @@ var ts;
|
|
|
38082
38082
|
if (namedArgRegExCache.has(name)) {
|
|
38083
38083
|
return namedArgRegExCache.get(name);
|
|
38084
38084
|
}
|
|
38085
|
-
var result = new RegExp("(\\s"
|
|
38085
|
+
var result = new RegExp("(\\s".concat(name, "\\s*=\\s*)(?:(?:'([^']*)')|(?:\"([^\"]*)\"))"), "im");
|
|
38086
38086
|
namedArgRegExCache.set(name, result);
|
|
38087
38087
|
return result;
|
|
38088
38088
|
}
|
|
@@ -39560,8 +39560,8 @@ var ts;
|
|
|
39560
39560
|
}
|
|
39561
39561
|
ts.createCompilerDiagnosticForInvalidCustomType = createCompilerDiagnosticForInvalidCustomType;
|
|
39562
39562
|
function createDiagnosticForInvalidCustomType(opt, createDiagnostic) {
|
|
39563
|
-
var namesOfType = ts.arrayFrom(opt.type.keys()).map(function (key) { return "'"
|
|
39564
|
-
return createDiagnostic(ts.Diagnostics.Argument_for_0_option_must_be_Colon_1, "--"
|
|
39563
|
+
var namesOfType = ts.arrayFrom(opt.type.keys()).map(function (key) { return "'".concat(key, "'"); }).join(", ");
|
|
39564
|
+
return createDiagnostic(ts.Diagnostics.Argument_for_0_option_must_be_Colon_1, "--".concat(opt.name), namesOfType);
|
|
39565
39565
|
}
|
|
39566
39566
|
/* @internal */
|
|
39567
39567
|
function parseCustomTypeOption(opt, value, errors) {
|
|
@@ -40355,10 +40355,10 @@ var ts;
|
|
|
40355
40355
|
var newValue = compilerOptionsMap.get(cmd.name);
|
|
40356
40356
|
var defaultValue = getDefaultValueForOption(cmd);
|
|
40357
40357
|
if (newValue !== defaultValue) {
|
|
40358
|
-
result.push(""
|
|
40358
|
+
result.push("".concat(tab).concat(cmd.name, ": ").concat(newValue));
|
|
40359
40359
|
}
|
|
40360
40360
|
else if (ts.hasProperty(ts.defaultInitCompilerOptions, cmd.name)) {
|
|
40361
|
-
result.push(""
|
|
40361
|
+
result.push("".concat(tab).concat(cmd.name, ": ").concat(defaultValue));
|
|
40362
40362
|
}
|
|
40363
40363
|
});
|
|
40364
40364
|
return result.join(newLine) + newLine;
|
|
@@ -40409,19 +40409,19 @@ var ts;
|
|
|
40409
40409
|
if (entries.length !== 0) {
|
|
40410
40410
|
entries.push({ value: "" });
|
|
40411
40411
|
}
|
|
40412
|
-
entries.push({ value: "/* "
|
|
40412
|
+
entries.push({ value: "/* ".concat(category, " */") });
|
|
40413
40413
|
for (var _i = 0, options_1 = options; _i < options_1.length; _i++) {
|
|
40414
40414
|
var option = options_1[_i];
|
|
40415
40415
|
var optionName = void 0;
|
|
40416
40416
|
if (compilerOptionsMap.has(option.name)) {
|
|
40417
|
-
optionName = "\""
|
|
40417
|
+
optionName = "\"".concat(option.name, "\": ").concat(JSON.stringify(compilerOptionsMap.get(option.name))).concat((seenKnownKeys += 1) === compilerOptionsMap.size ? "" : ",");
|
|
40418
40418
|
}
|
|
40419
40419
|
else {
|
|
40420
|
-
optionName = "// \""
|
|
40420
|
+
optionName = "// \"".concat(option.name, "\": ").concat(JSON.stringify(getDefaultValueForOption(option)), ",");
|
|
40421
40421
|
}
|
|
40422
40422
|
entries.push({
|
|
40423
40423
|
value: optionName,
|
|
40424
|
-
description: "/* "
|
|
40424
|
+
description: "/* ".concat(option.description && ts.getLocaleSpecificMessage(option.description) || option.name, " */")
|
|
40425
40425
|
});
|
|
40426
40426
|
marginLength = Math.max(optionName.length, marginLength);
|
|
40427
40427
|
}
|
|
@@ -40430,25 +40430,25 @@ var ts;
|
|
|
40430
40430
|
var tab = makePadding(2);
|
|
40431
40431
|
var result = [];
|
|
40432
40432
|
result.push("{");
|
|
40433
|
-
result.push(tab
|
|
40434
|
-
result.push(""
|
|
40433
|
+
result.push("".concat(tab, "\"compilerOptions\": {"));
|
|
40434
|
+
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), " */"));
|
|
40435
40435
|
result.push("");
|
|
40436
40436
|
// Print out each row, aligning all the descriptions on the same column.
|
|
40437
40437
|
for (var _a = 0, entries_2 = entries; _a < entries_2.length; _a++) {
|
|
40438
40438
|
var entry = entries_2[_a];
|
|
40439
40439
|
var value = entry.value, _b = entry.description, description = _b === void 0 ? "" : _b;
|
|
40440
|
-
result.push(value && ""
|
|
40440
|
+
result.push(value && "".concat(tab).concat(tab).concat(value).concat(description && (makePadding(marginLength - value.length + 2) + description)));
|
|
40441
40441
|
}
|
|
40442
40442
|
if (fileNames.length) {
|
|
40443
|
-
result.push(tab
|
|
40444
|
-
result.push(tab
|
|
40443
|
+
result.push("".concat(tab, "},"));
|
|
40444
|
+
result.push("".concat(tab, "\"files\": ["));
|
|
40445
40445
|
for (var i = 0; i < fileNames.length; i++) {
|
|
40446
|
-
result.push(""
|
|
40446
|
+
result.push("".concat(tab).concat(tab).concat(JSON.stringify(fileNames[i])).concat(i === fileNames.length - 1 ? "" : ","));
|
|
40447
40447
|
}
|
|
40448
|
-
result.push(tab
|
|
40448
|
+
result.push("".concat(tab, "]"));
|
|
40449
40449
|
}
|
|
40450
40450
|
else {
|
|
40451
|
-
result.push(tab
|
|
40451
|
+
result.push("".concat(tab, "}"));
|
|
40452
40452
|
}
|
|
40453
40453
|
result.push("}");
|
|
40454
40454
|
return result.join(newLine) + newLine;
|
|
@@ -40846,7 +40846,7 @@ var ts;
|
|
|
40846
40846
|
if (ts.isRootedDiskPath(extendedConfig) || ts.startsWith(extendedConfig, "./") || ts.startsWith(extendedConfig, "../")) {
|
|
40847
40847
|
var extendedConfigPath = ts.getNormalizedAbsolutePath(extendedConfig, basePath);
|
|
40848
40848
|
if (!host.fileExists(extendedConfigPath) && !ts.endsWith(extendedConfigPath, ".json" /* Json */)) {
|
|
40849
|
-
extendedConfigPath = extendedConfigPath
|
|
40849
|
+
extendedConfigPath = "".concat(extendedConfigPath, ".json");
|
|
40850
40850
|
if (!host.fileExists(extendedConfigPath)) {
|
|
40851
40851
|
errors.push(createDiagnostic(ts.Diagnostics.File_0_not_found, extendedConfig));
|
|
40852
40852
|
return undefined;
|
|
@@ -41091,7 +41091,7 @@ var ts;
|
|
|
41091
41091
|
// Valid only if *.json specified
|
|
41092
41092
|
if (!jsonOnlyIncludeRegexes) {
|
|
41093
41093
|
var includes = validatedIncludeSpecs.filter(function (s) { return ts.endsWith(s, ".json" /* Json */); });
|
|
41094
|
-
var includeFilePatterns = ts.map(ts.getRegularExpressionsForWildcards(includes, basePath, "files"), function (pattern) { return "^"
|
|
41094
|
+
var includeFilePatterns = ts.map(ts.getRegularExpressionsForWildcards(includes, basePath, "files"), function (pattern) { return "^".concat(pattern, "$"); });
|
|
41095
41095
|
jsonOnlyIncludeRegexes = includeFilePatterns ? includeFilePatterns.map(function (pattern) { return ts.getRegexFromPattern(pattern, host.useCaseSensitiveFileNames); }) : ts.emptyArray;
|
|
41096
41096
|
}
|
|
41097
41097
|
var includeIndex = ts.findIndex(jsonOnlyIncludeRegexes, function (re) { return re.test(file); });
|
|
@@ -41527,7 +41527,7 @@ var ts;
|
|
|
41527
41527
|
var bestVersionKey = result.version, bestVersionPaths = result.paths;
|
|
41528
41528
|
if (typeof bestVersionPaths !== "object") {
|
|
41529
41529
|
if (state.traceEnabled) {
|
|
41530
|
-
trace(state.host, ts.Diagnostics.Expected_type_of_0_field_in_package_json_to_be_1_got_2, "typesVersions['"
|
|
41530
|
+
trace(state.host, ts.Diagnostics.Expected_type_of_0_field_in_package_json_to_be_1_got_2, "typesVersions['".concat(bestVersionKey, "']"), "object", typeof bestVersionPaths);
|
|
41531
41531
|
}
|
|
41532
41532
|
return;
|
|
41533
41533
|
}
|
|
@@ -41934,7 +41934,7 @@ var ts;
|
|
|
41934
41934
|
};
|
|
41935
41935
|
return cache;
|
|
41936
41936
|
function getUnderlyingCacheKey(specifier, mode) {
|
|
41937
|
-
var result = mode === undefined ? specifier : mode
|
|
41937
|
+
var result = mode === undefined ? specifier : "".concat(mode, "|").concat(specifier);
|
|
41938
41938
|
memoizedReverseKeys.set(result, [specifier, mode]);
|
|
41939
41939
|
return result;
|
|
41940
41940
|
}
|
|
@@ -41965,7 +41965,7 @@ var ts;
|
|
|
41965
41965
|
}
|
|
41966
41966
|
function getOrCreateCacheForModuleName(nonRelativeModuleName, mode, redirectedReference) {
|
|
41967
41967
|
ts.Debug.assert(!ts.isExternalModuleNameRelative(nonRelativeModuleName));
|
|
41968
|
-
return getOrCreateCache(moduleNameToDirectoryMap, redirectedReference, mode === undefined ? nonRelativeModuleName : mode
|
|
41968
|
+
return getOrCreateCache(moduleNameToDirectoryMap, redirectedReference, mode === undefined ? nonRelativeModuleName : "".concat(mode, "|").concat(nonRelativeModuleName), createPerModuleNameCache);
|
|
41969
41969
|
}
|
|
41970
41970
|
function createPerModuleNameCache() {
|
|
41971
41971
|
var directoryPathMap = new ts.Map();
|
|
@@ -42112,10 +42112,10 @@ var ts;
|
|
|
42112
42112
|
result = classicNameResolver(moduleName, containingFile, compilerOptions, host, cache, redirectedReference);
|
|
42113
42113
|
break;
|
|
42114
42114
|
default:
|
|
42115
|
-
return ts.Debug.fail("Unexpected moduleResolution: "
|
|
42115
|
+
return ts.Debug.fail("Unexpected moduleResolution: ".concat(moduleResolution));
|
|
42116
42116
|
}
|
|
42117
42117
|
if (result && result.resolvedModule)
|
|
42118
|
-
ts.perfLogger.logInfoEvent("Module \""
|
|
42118
|
+
ts.perfLogger.logInfoEvent("Module \"".concat(moduleName, "\" resolved to \"").concat(result.resolvedModule.resolvedFileName, "\""));
|
|
42119
42119
|
ts.perfLogger.logStopResolveModule((result && result.resolvedModule) ? "" + result.resolvedModule.resolvedFileName : "null");
|
|
42120
42120
|
if (perFolderCache) {
|
|
42121
42121
|
perFolderCache.set(moduleName, resolutionMode, result);
|
|
@@ -42318,7 +42318,7 @@ var ts;
|
|
|
42318
42318
|
function resolveJSModule(moduleName, initialDir, host) {
|
|
42319
42319
|
var _a = tryResolveJSModuleWorker(moduleName, initialDir, host), resolvedModule = _a.resolvedModule, failedLookupLocations = _a.failedLookupLocations;
|
|
42320
42320
|
if (!resolvedModule) {
|
|
42321
|
-
throw new Error("Could not resolve JS module '"
|
|
42321
|
+
throw new Error("Could not resolve JS module '".concat(moduleName, "' starting at '").concat(initialDir, "'. Looked in: ").concat(failedLookupLocations.join(", ")));
|
|
42322
42322
|
}
|
|
42323
42323
|
return resolvedModule.resolvedFileName;
|
|
42324
42324
|
}
|
|
@@ -42428,7 +42428,7 @@ var ts;
|
|
|
42428
42428
|
if (traceEnabled) {
|
|
42429
42429
|
trace(host, ts.Diagnostics.Resolving_real_path_for_0_result_1, path, real);
|
|
42430
42430
|
}
|
|
42431
|
-
ts.Debug.assert(host.fileExists(real), path
|
|
42431
|
+
ts.Debug.assert(host.fileExists(real), "".concat(path, " linked to nonexistent file ").concat(real));
|
|
42432
42432
|
return real;
|
|
42433
42433
|
}
|
|
42434
42434
|
function nodeLoadModuleByRelativeName(extensions, candidate, onlyRecordFailures, state, considerPackageJson) {
|
|
@@ -42905,7 +42905,7 @@ var ts;
|
|
|
42905
42905
|
return undefined;
|
|
42906
42906
|
}
|
|
42907
42907
|
var trailingParts = parts.slice(nameParts.length);
|
|
42908
|
-
return loadModuleFromExports(scope, extensions, !ts.length(trailingParts) ? "." : "."
|
|
42908
|
+
return loadModuleFromExports(scope, extensions, !ts.length(trailingParts) ? "." : ".".concat(ts.directorySeparator).concat(trailingParts.join(ts.directorySeparator)), state, cache, redirectedReference);
|
|
42909
42909
|
}
|
|
42910
42910
|
function loadModuleFromExports(scope, extensions, subpath, state, cache, redirectedReference) {
|
|
42911
42911
|
if (!scope.packageJsonContent.exports) {
|
|
@@ -43233,7 +43233,7 @@ var ts;
|
|
|
43233
43233
|
}
|
|
43234
43234
|
/* @internal */
|
|
43235
43235
|
function getTypesPackageName(packageName) {
|
|
43236
|
-
return "@types/"
|
|
43236
|
+
return "@types/".concat(mangleScopedPackageName(packageName));
|
|
43237
43237
|
}
|
|
43238
43238
|
ts.getTypesPackageName = getTypesPackageName;
|
|
43239
43239
|
/* @internal */
|
|
@@ -43634,7 +43634,7 @@ var ts;
|
|
|
43634
43634
|
if (name) {
|
|
43635
43635
|
if (ts.isAmbientModule(node)) {
|
|
43636
43636
|
var moduleName = ts.getTextOfIdentifierOrLiteral(name);
|
|
43637
|
-
return (ts.isGlobalScopeAugmentation(node) ? "__global" : "\""
|
|
43637
|
+
return (ts.isGlobalScopeAugmentation(node) ? "__global" : "\"".concat(moduleName, "\""));
|
|
43638
43638
|
}
|
|
43639
43639
|
if (name.kind === 161 /* ComputedPropertyName */) {
|
|
43640
43640
|
var nameExpression = name.expression;
|
|
@@ -43691,7 +43691,7 @@ var ts;
|
|
|
43691
43691
|
case 163 /* Parameter */:
|
|
43692
43692
|
// Parameters with names are handled at the top of this function. Parameters
|
|
43693
43693
|
// without names can only come from JSDocFunctionTypes.
|
|
43694
|
-
ts.Debug.assert(node.parent.kind === 315 /* JSDocFunctionType */, "Impossible parameter parent kind", function () { return "parent is: "
|
|
43694
|
+
ts.Debug.assert(node.parent.kind === 315 /* JSDocFunctionType */, "Impossible parameter parent kind", function () { return "parent is: ".concat(ts.SyntaxKind ? ts.SyntaxKind[node.parent.kind] : node.parent.kind, ", expected JSDocFunctionType"); });
|
|
43695
43695
|
var functionType = node.parent;
|
|
43696
43696
|
var index = functionType.parameters.indexOf(node);
|
|
43697
43697
|
return "arg" + index;
|
|
@@ -43803,7 +43803,7 @@ var ts;
|
|
|
43803
43803
|
var relatedInformation_1 = [];
|
|
43804
43804
|
if (ts.isTypeAliasDeclaration(node) && ts.nodeIsMissing(node.type) && ts.hasSyntacticModifier(node, 1 /* Export */) && symbol.flags & (2097152 /* Alias */ | 788968 /* Type */ | 1920 /* Namespace */)) {
|
|
43805
43805
|
// export type T; - may have meant export type { T }?
|
|
43806
|
-
relatedInformation_1.push(createDiagnosticForNode(node, ts.Diagnostics.Did_you_mean_0, "export type { "
|
|
43806
|
+
relatedInformation_1.push(createDiagnosticForNode(node, ts.Diagnostics.Did_you_mean_0, "export type { ".concat(ts.unescapeLeadingUnderscores(node.name.escapedText), " }")));
|
|
43807
43807
|
}
|
|
43808
43808
|
var declarationName_1 = ts.getNameOfDeclaration(node) || node;
|
|
43809
43809
|
ts.forEach(symbol.declarations, function (declaration, index) {
|
|
@@ -45879,7 +45879,7 @@ var ts;
|
|
|
45879
45879
|
}
|
|
45880
45880
|
}
|
|
45881
45881
|
function bindSourceFileAsExternalModule() {
|
|
45882
|
-
bindAnonymousDeclaration(file, 512 /* ValueModule */, "\""
|
|
45882
|
+
bindAnonymousDeclaration(file, 512 /* ValueModule */, "\"".concat(ts.removeFileExtension(file.fileName), "\""));
|
|
45883
45883
|
}
|
|
45884
45884
|
function bindExportAssignment(node) {
|
|
45885
45885
|
if (!container.symbol || !container.symbol.exports) {
|
|
@@ -47979,7 +47979,7 @@ var ts;
|
|
|
47979
47979
|
if (sourceSymbolFile && targetSymbolFile && amalgamatedDuplicates && !isEitherEnum && sourceSymbolFile !== targetSymbolFile) {
|
|
47980
47980
|
var firstFile_1 = ts.comparePaths(sourceSymbolFile.path, targetSymbolFile.path) === -1 /* LessThan */ ? sourceSymbolFile : targetSymbolFile;
|
|
47981
47981
|
var secondFile_1 = firstFile_1 === sourceSymbolFile ? targetSymbolFile : sourceSymbolFile;
|
|
47982
|
-
var filesDuplicates = ts.getOrUpdate(amalgamatedDuplicates, firstFile_1.path
|
|
47982
|
+
var filesDuplicates = ts.getOrUpdate(amalgamatedDuplicates, "".concat(firstFile_1.path, "|").concat(secondFile_1.path), function () {
|
|
47983
47983
|
return ({ firstFile: firstFile_1, secondFile: secondFile_1, conflictingSymbols: new ts.Map() });
|
|
47984
47984
|
});
|
|
47985
47985
|
var conflictingSymbolInfo = ts.getOrUpdate(filesDuplicates.conflictingSymbols, symbolName_1, function () {
|
|
@@ -50632,7 +50632,7 @@ var ts;
|
|
|
50632
50632
|
var cache = (links.accessibleChainCache || (links.accessibleChainCache = new ts.Map()));
|
|
50633
50633
|
// Go from enclosingDeclaration to the first scope we check, so the cache is keyed off the scope and thus shared more
|
|
50634
50634
|
var firstRelevantLocation = forEachSymbolTableInScope(enclosingDeclaration, function (_, __, ___, node) { return node; });
|
|
50635
|
-
var key = (useOnlyExternalAliasing ? 0 : 1
|
|
50635
|
+
var key = "".concat(useOnlyExternalAliasing ? 0 : 1, "|").concat(firstRelevantLocation && getNodeId(firstRelevantLocation), "|").concat(meaning);
|
|
50636
50636
|
if (cache.has(key)) {
|
|
50637
50637
|
return cache.get(key);
|
|
50638
50638
|
}
|
|
@@ -51481,7 +51481,7 @@ var ts;
|
|
|
51481
51481
|
context.symbolDepth = new ts.Map();
|
|
51482
51482
|
}
|
|
51483
51483
|
var links = context.enclosingDeclaration && getNodeLinks(context.enclosingDeclaration);
|
|
51484
|
-
var key = getTypeId(type)
|
|
51484
|
+
var key = "".concat(getTypeId(type), "|").concat(context.flags);
|
|
51485
51485
|
if (links) {
|
|
51486
51486
|
links.serializedTypes || (links.serializedTypes = new ts.Map());
|
|
51487
51487
|
}
|
|
@@ -51750,7 +51750,7 @@ var ts;
|
|
|
51750
51750
|
}
|
|
51751
51751
|
}
|
|
51752
51752
|
if (checkTruncationLength(context) && (i + 2 < properties.length - 1)) {
|
|
51753
|
-
typeElements.push(ts.factory.createPropertySignature(/*modifiers*/ undefined, "... "
|
|
51753
|
+
typeElements.push(ts.factory.createPropertySignature(/*modifiers*/ undefined, "... ".concat(properties.length - i, " more ..."), /*questionToken*/ undefined, /*type*/ undefined));
|
|
51754
51754
|
addPropertyToElementList(properties[properties.length - 1], context, typeElements);
|
|
51755
51755
|
break;
|
|
51756
51756
|
}
|
|
@@ -51865,7 +51865,7 @@ var ts;
|
|
|
51865
51865
|
else if (types.length > 2) {
|
|
51866
51866
|
return [
|
|
51867
51867
|
typeToTypeNodeHelper(types[0], context),
|
|
51868
|
-
ts.factory.createTypeReferenceNode("... "
|
|
51868
|
+
ts.factory.createTypeReferenceNode("... ".concat(types.length - 2, " more ..."), /*typeArguments*/ undefined),
|
|
51869
51869
|
typeToTypeNodeHelper(types[types.length - 1], context)
|
|
51870
51870
|
];
|
|
51871
51871
|
}
|
|
@@ -51879,7 +51879,7 @@ var ts;
|
|
|
51879
51879
|
var type = types_2[_i];
|
|
51880
51880
|
i++;
|
|
51881
51881
|
if (checkTruncationLength(context) && (i + 2 < types.length - 1)) {
|
|
51882
|
-
result_5.push(ts.factory.createTypeReferenceNode("... "
|
|
51882
|
+
result_5.push(ts.factory.createTypeReferenceNode("... ".concat(types.length - i, " more ..."), /*typeArguments*/ undefined));
|
|
51883
51883
|
var typeNode_1 = typeToTypeNodeHelper(types[types.length - 1], context);
|
|
51884
51884
|
if (typeNode_1) {
|
|
51885
51885
|
result_5.push(typeNode_1);
|
|
@@ -52402,7 +52402,7 @@ var ts;
|
|
|
52402
52402
|
var text = rawtext;
|
|
52403
52403
|
while (((_b = context.typeParameterNamesByText) === null || _b === void 0 ? void 0 : _b.has(text)) || typeParameterShadowsNameInScope(text, context, type)) {
|
|
52404
52404
|
i++;
|
|
52405
|
-
text = rawtext
|
|
52405
|
+
text = "".concat(rawtext, "_").concat(i);
|
|
52406
52406
|
}
|
|
52407
52407
|
if (text !== rawtext) {
|
|
52408
52408
|
result = ts.factory.createIdentifier(text, result.typeArguments);
|
|
@@ -52722,7 +52722,7 @@ var ts;
|
|
|
52722
52722
|
function getNameForJSDocFunctionParameter(p, index) {
|
|
52723
52723
|
return p.name && ts.isIdentifier(p.name) && p.name.escapedText === "this" ? "this"
|
|
52724
52724
|
: getEffectiveDotDotDotForParameter(p) ? "args"
|
|
52725
|
-
: "arg"
|
|
52725
|
+
: "arg".concat(index);
|
|
52726
52726
|
}
|
|
52727
52727
|
function rewriteModuleSpecifier(parent, lit) {
|
|
52728
52728
|
if (bundled) {
|
|
@@ -53807,7 +53807,7 @@ var ts;
|
|
|
53807
53807
|
return results_1;
|
|
53808
53808
|
}
|
|
53809
53809
|
// The `Constructor`'s symbol isn't in the class's properties lists, obviously, since it's a signature on the static
|
|
53810
|
-
return ts.Debug.fail("Unhandled class member kind! "
|
|
53810
|
+
return ts.Debug.fail("Unhandled class member kind! ".concat(p.__debugFlags || p.flags));
|
|
53811
53811
|
};
|
|
53812
53812
|
}
|
|
53813
53813
|
function serializePropertySymbolForInterface(p, baseType) {
|
|
@@ -53882,7 +53882,7 @@ var ts;
|
|
|
53882
53882
|
if (ref) {
|
|
53883
53883
|
return ref;
|
|
53884
53884
|
}
|
|
53885
|
-
var tempName = getUnusedName(rootName
|
|
53885
|
+
var tempName = getUnusedName("".concat(rootName, "_base"));
|
|
53886
53886
|
var statement = ts.factory.createVariableStatement(/*modifiers*/ undefined, ts.factory.createVariableDeclarationList([
|
|
53887
53887
|
ts.factory.createVariableDeclaration(tempName, /*exclamationToken*/ undefined, typeToTypeNodeHelper(staticType, context))
|
|
53888
53888
|
], 2 /* Const */));
|
|
@@ -53929,7 +53929,7 @@ var ts;
|
|
|
53929
53929
|
var original = input;
|
|
53930
53930
|
while ((_a = context.usedSymbolNames) === null || _a === void 0 ? void 0 : _a.has(input)) {
|
|
53931
53931
|
i++;
|
|
53932
|
-
input = original
|
|
53932
|
+
input = "".concat(original, "_").concat(i);
|
|
53933
53933
|
}
|
|
53934
53934
|
(_b = context.usedSymbolNames) === null || _b === void 0 ? void 0 : _b.add(input);
|
|
53935
53935
|
if (id) {
|
|
@@ -54037,15 +54037,15 @@ var ts;
|
|
|
54037
54037
|
if (nameType.flags & 384 /* StringOrNumberLiteral */) {
|
|
54038
54038
|
var name = "" + nameType.value;
|
|
54039
54039
|
if (!ts.isIdentifierText(name, ts.getEmitScriptTarget(compilerOptions)) && !ts.isNumericLiteralName(name)) {
|
|
54040
|
-
return "\""
|
|
54040
|
+
return "\"".concat(ts.escapeString(name, 34 /* doubleQuote */), "\"");
|
|
54041
54041
|
}
|
|
54042
54042
|
if (ts.isNumericLiteralName(name) && ts.startsWith(name, "-")) {
|
|
54043
|
-
return "["
|
|
54043
|
+
return "[".concat(name, "]");
|
|
54044
54044
|
}
|
|
54045
54045
|
return name;
|
|
54046
54046
|
}
|
|
54047
54047
|
if (nameType.flags & 8192 /* UniqueESSymbol */) {
|
|
54048
|
-
return "["
|
|
54048
|
+
return "[".concat(getNameOfSymbolAsWritten(nameType.symbol, context), "]");
|
|
54049
54049
|
}
|
|
54050
54050
|
}
|
|
54051
54051
|
}
|
|
@@ -56876,7 +56876,7 @@ var ts;
|
|
|
56876
56876
|
!leftName ? rightName :
|
|
56877
56877
|
!rightName ? leftName :
|
|
56878
56878
|
undefined;
|
|
56879
|
-
var paramSymbol = createSymbol(1 /* FunctionScopedVariable */ | (isOptional && !isRestParam ? 16777216 /* Optional */ : 0), paramName || "arg"
|
|
56879
|
+
var paramSymbol = createSymbol(1 /* FunctionScopedVariable */ | (isOptional && !isRestParam ? 16777216 /* Optional */ : 0), paramName || "arg".concat(i));
|
|
56880
56880
|
paramSymbol.type = isRestParam ? createArrayType(unionParamType) : unionParamType;
|
|
56881
56881
|
params[i] = paramSymbol;
|
|
56882
56882
|
}
|
|
@@ -58827,7 +58827,7 @@ var ts;
|
|
|
58827
58827
|
return result;
|
|
58828
58828
|
}
|
|
58829
58829
|
function getAliasId(aliasSymbol, aliasTypeArguments) {
|
|
58830
|
-
return aliasSymbol ? "@"
|
|
58830
|
+
return aliasSymbol ? "@".concat(getSymbolId(aliasSymbol)) + (aliasTypeArguments ? ":".concat(getTypeListId(aliasTypeArguments)) : "") : "";
|
|
58831
58831
|
}
|
|
58832
58832
|
// This function is used to propagate certain flags when creating new object type references and union types.
|
|
58833
58833
|
// It is only necessary to do so if a constituent type might be the undefined type, the null type, the type
|
|
@@ -59013,7 +59013,7 @@ var ts;
|
|
|
59013
59013
|
return undefined;
|
|
59014
59014
|
}
|
|
59015
59015
|
function getSymbolPath(symbol) {
|
|
59016
|
-
return symbol.parent ? getSymbolPath(symbol.parent)
|
|
59016
|
+
return symbol.parent ? "".concat(getSymbolPath(symbol.parent), ".").concat(symbol.escapedName) : symbol.escapedName;
|
|
59017
59017
|
}
|
|
59018
59018
|
function getUnresolvedSymbolForEntityName(name) {
|
|
59019
59019
|
var identifier = name.kind === 160 /* QualifiedName */ ? name.right :
|
|
@@ -59024,7 +59024,7 @@ var ts;
|
|
|
59024
59024
|
var parentSymbol = name.kind === 160 /* QualifiedName */ ? getUnresolvedSymbolForEntityName(name.left) :
|
|
59025
59025
|
name.kind === 205 /* PropertyAccessExpression */ ? getUnresolvedSymbolForEntityName(name.expression) :
|
|
59026
59026
|
undefined;
|
|
59027
|
-
var path = parentSymbol ? getSymbolPath(parentSymbol)
|
|
59027
|
+
var path = parentSymbol ? "".concat(getSymbolPath(parentSymbol), ".").concat(text) : text;
|
|
59028
59028
|
var result = unresolvedSymbols.get(path);
|
|
59029
59029
|
if (!result) {
|
|
59030
59030
|
unresolvedSymbols.set(path, result = createSymbol(524288 /* TypeAlias */, text, 1048576 /* Unresolved */));
|
|
@@ -59097,7 +59097,7 @@ var ts;
|
|
|
59097
59097
|
if (substitute.flags & 3 /* AnyOrUnknown */ || substitute === baseType) {
|
|
59098
59098
|
return baseType;
|
|
59099
59099
|
}
|
|
59100
|
-
var id = getTypeId(baseType)
|
|
59100
|
+
var id = "".concat(getTypeId(baseType), ">").concat(getTypeId(substitute));
|
|
59101
59101
|
var cached = substitutionTypes.get(id);
|
|
59102
59102
|
if (cached) {
|
|
59103
59103
|
return cached;
|
|
@@ -60021,9 +60021,9 @@ var ts;
|
|
|
60021
60021
|
return types[0];
|
|
60022
60022
|
}
|
|
60023
60023
|
var typeKey = !origin ? getTypeListId(types) :
|
|
60024
|
-
origin.flags & 1048576 /* Union */ ? "|"
|
|
60025
|
-
origin.flags & 2097152 /* Intersection */ ? "&"
|
|
60026
|
-
"#"
|
|
60024
|
+
origin.flags & 1048576 /* Union */ ? "|".concat(getTypeListId(origin.types)) :
|
|
60025
|
+
origin.flags & 2097152 /* Intersection */ ? "&".concat(getTypeListId(origin.types)) :
|
|
60026
|
+
"#".concat(origin.type.id, "|").concat(getTypeListId(types)); // origin type id alone is insufficient, as `keyof x` may resolve to multiple WIP values while `x` is still resolving
|
|
60027
60027
|
var id = typeKey + getAliasId(aliasSymbol, aliasTypeArguments);
|
|
60028
60028
|
var type = unionTypes.get(id);
|
|
60029
60029
|
if (!type) {
|
|
@@ -60545,7 +60545,7 @@ var ts;
|
|
|
60545
60545
|
if (ts.every(newTexts, function (t) { return t === ""; }) && ts.every(newTypes, function (t) { return !!(t.flags & 4 /* String */); })) {
|
|
60546
60546
|
return stringType;
|
|
60547
60547
|
}
|
|
60548
|
-
var id = getTypeListId(newTypes)
|
|
60548
|
+
var id = "".concat(getTypeListId(newTypes), "|").concat(ts.map(newTexts, function (t) { return t.length; }).join(","), "|").concat(newTexts.join(""));
|
|
60549
60549
|
var type = templateLiteralTypes.get(id);
|
|
60550
60550
|
if (!type) {
|
|
60551
60551
|
templateLiteralTypes.set(id, type = createTemplateLiteralType(newTexts, newTypes));
|
|
@@ -60605,7 +60605,7 @@ var ts;
|
|
|
60605
60605
|
return str;
|
|
60606
60606
|
}
|
|
60607
60607
|
function getStringMappingTypeForGenericType(symbol, type) {
|
|
60608
|
-
var id = getSymbolId(symbol)
|
|
60608
|
+
var id = "".concat(getSymbolId(symbol), ",").concat(getTypeId(type));
|
|
60609
60609
|
var result = stringMappingTypes.get(id);
|
|
60610
60610
|
if (!result) {
|
|
60611
60611
|
stringMappingTypes.set(id, result = createStringMappingType(symbol, type));
|
|
@@ -61622,7 +61622,7 @@ var ts;
|
|
|
61622
61622
|
function createUniqueESSymbolType(symbol) {
|
|
61623
61623
|
var type = createType(8192 /* UniqueESSymbol */);
|
|
61624
61624
|
type.symbol = symbol;
|
|
61625
|
-
type.escapedName = "__@"
|
|
61625
|
+
type.escapedName = "__@".concat(type.symbol.escapedName, "@").concat(getSymbolId(type.symbol));
|
|
61626
61626
|
return type;
|
|
61627
61627
|
}
|
|
61628
61628
|
function getESSymbolLikeTypeForNode(node) {
|
|
@@ -63311,24 +63311,24 @@ var ts;
|
|
|
63311
63311
|
case ts.Diagnostics.Types_of_property_0_are_incompatible.code: {
|
|
63312
63312
|
// Parenthesize a `new` if there is one
|
|
63313
63313
|
if (path.indexOf("new ") === 0) {
|
|
63314
|
-
path = "("
|
|
63314
|
+
path = "(".concat(path, ")");
|
|
63315
63315
|
}
|
|
63316
63316
|
var str = "" + args[0];
|
|
63317
63317
|
// If leading, just print back the arg (irrespective of if it's a valid identifier)
|
|
63318
63318
|
if (path.length === 0) {
|
|
63319
|
-
path = ""
|
|
63319
|
+
path = "".concat(str);
|
|
63320
63320
|
}
|
|
63321
63321
|
// Otherwise write a dotted name if possible
|
|
63322
63322
|
else if (ts.isIdentifierText(str, ts.getEmitScriptTarget(compilerOptions))) {
|
|
63323
|
-
path = path
|
|
63323
|
+
path = "".concat(path, ".").concat(str);
|
|
63324
63324
|
}
|
|
63325
63325
|
// Failing that, check if the name is already a computed name
|
|
63326
63326
|
else if (str[0] === "[" && str[str.length - 1] === "]") {
|
|
63327
|
-
path = ""
|
|
63327
|
+
path = "".concat(path).concat(str);
|
|
63328
63328
|
}
|
|
63329
63329
|
// And finally write out a computed name as a last resort
|
|
63330
63330
|
else {
|
|
63331
|
-
path = path
|
|
63331
|
+
path = "".concat(path, "[").concat(str, "]");
|
|
63332
63332
|
}
|
|
63333
63333
|
break;
|
|
63334
63334
|
}
|
|
@@ -63357,7 +63357,7 @@ var ts;
|
|
|
63357
63357
|
msg.code === ts.Diagnostics.Construct_signatures_with_no_arguments_have_incompatible_return_types_0_and_1.code)
|
|
63358
63358
|
? ""
|
|
63359
63359
|
: "...";
|
|
63360
|
-
path = ""
|
|
63360
|
+
path = "".concat(prefix).concat(path, "(").concat(params, ")");
|
|
63361
63361
|
}
|
|
63362
63362
|
break;
|
|
63363
63363
|
}
|
|
@@ -63370,7 +63370,7 @@ var ts;
|
|
|
63370
63370
|
break;
|
|
63371
63371
|
}
|
|
63372
63372
|
default:
|
|
63373
|
-
return ts.Debug.fail("Unhandled Diagnostic: "
|
|
63373
|
+
return ts.Debug.fail("Unhandled Diagnostic: ".concat(msg.code));
|
|
63374
63374
|
}
|
|
63375
63375
|
}
|
|
63376
63376
|
if (path) {
|
|
@@ -65572,7 +65572,7 @@ var ts;
|
|
|
65572
65572
|
var constraintMarker = "";
|
|
65573
65573
|
var sourceId = getTypeReferenceId(source, 0);
|
|
65574
65574
|
var targetId = getTypeReferenceId(target, 0);
|
|
65575
|
-
return ""
|
|
65575
|
+
return "".concat(constraintMarker).concat(sourceId, ",").concat(targetId).concat(postFix);
|
|
65576
65576
|
// getTypeReferenceId(A<T, number, U>) returns "111=0-12=1"
|
|
65577
65577
|
// where A.id=111 and number.id=12
|
|
65578
65578
|
function getTypeReferenceId(type, depth) {
|
|
@@ -65616,7 +65616,7 @@ var ts;
|
|
|
65616
65616
|
var postFix = intersectionState ? ":" + intersectionState : "";
|
|
65617
65617
|
return isTypeReferenceWithGenericArguments(source) && isTypeReferenceWithGenericArguments(target) ?
|
|
65618
65618
|
getGenericTypeReferenceRelationKey(source, target, postFix, ignoreConstraints) :
|
|
65619
|
-
source.id
|
|
65619
|
+
"".concat(source.id, ",").concat(target.id).concat(postFix);
|
|
65620
65620
|
}
|
|
65621
65621
|
// Invoke the callback for each underlying property symbol of the given symbol and return the first
|
|
65622
65622
|
// value that isn't undefined.
|
|
@@ -67743,11 +67743,11 @@ var ts;
|
|
|
67743
67743
|
case 79 /* Identifier */:
|
|
67744
67744
|
if (!ts.isThisInTypeQuery(node)) {
|
|
67745
67745
|
var symbol = getResolvedSymbol(node);
|
|
67746
|
-
return symbol !== unknownSymbol ? (flowContainer ? getNodeId(flowContainer) : "-1"
|
|
67746
|
+
return symbol !== unknownSymbol ? "".concat(flowContainer ? getNodeId(flowContainer) : "-1", "|").concat(getTypeId(declaredType), "|").concat(getTypeId(initialType), "|").concat(getSymbolId(symbol)) : undefined;
|
|
67747
67747
|
}
|
|
67748
67748
|
// falls through
|
|
67749
67749
|
case 108 /* ThisKeyword */:
|
|
67750
|
-
return "0|"
|
|
67750
|
+
return "0|".concat(flowContainer ? getNodeId(flowContainer) : "-1", "|").concat(getTypeId(declaredType), "|").concat(getTypeId(initialType));
|
|
67751
67751
|
case 229 /* NonNullExpression */:
|
|
67752
67752
|
case 211 /* ParenthesizedExpression */:
|
|
67753
67753
|
return getFlowCacheKey(node.expression, declaredType, initialType, flowContainer);
|
|
@@ -71636,7 +71636,7 @@ var ts;
|
|
|
71636
71636
|
!leftName ? rightName :
|
|
71637
71637
|
!rightName ? leftName :
|
|
71638
71638
|
undefined;
|
|
71639
|
-
var paramSymbol = createSymbol(1 /* FunctionScopedVariable */ | (isOptional && !isRestParam ? 16777216 /* Optional */ : 0), paramName || "arg"
|
|
71639
|
+
var paramSymbol = createSymbol(1 /* FunctionScopedVariable */ | (isOptional && !isRestParam ? 16777216 /* Optional */ : 0), paramName || "arg".concat(i));
|
|
71640
71640
|
paramSymbol.type = isRestParam ? createArrayType(unionParamType) : unionParamType;
|
|
71641
71641
|
params[i] = paramSymbol;
|
|
71642
71642
|
}
|
|
@@ -81503,7 +81503,7 @@ var ts;
|
|
|
81503
81503
|
function getPropertyNameForKnownSymbolName(symbolName) {
|
|
81504
81504
|
var ctorType = getGlobalESSymbolConstructorSymbol(/*reportErrors*/ false);
|
|
81505
81505
|
var uniqueType = ctorType && getTypeOfPropertyOfType(getTypeOfSymbol(ctorType), ts.escapeLeadingUnderscores(symbolName));
|
|
81506
|
-
return uniqueType && isTypeUsableAsPropertyName(uniqueType) ? getPropertyNameFromType(uniqueType) : "__@"
|
|
81506
|
+
return uniqueType && isTypeUsableAsPropertyName(uniqueType) ? getPropertyNameFromType(uniqueType) : "__@".concat(symbolName);
|
|
81507
81507
|
}
|
|
81508
81508
|
/**
|
|
81509
81509
|
* Gets the *yield*, *return*, and *next* types of an `Iterable`-like or `AsyncIterable`-like
|
|
@@ -88555,7 +88555,7 @@ var ts;
|
|
|
88555
88555
|
value >= 52 && value < 62 ? 48 /* _0 */ + value - 52 :
|
|
88556
88556
|
value === 62 ? 43 /* plus */ :
|
|
88557
88557
|
value === 63 ? 47 /* slash */ :
|
|
88558
|
-
ts.Debug.fail(value
|
|
88558
|
+
ts.Debug.fail("".concat(value, ": not a base64 value"));
|
|
88559
88559
|
}
|
|
88560
88560
|
function base64FormatDecode(ch) {
|
|
88561
88561
|
return ch >= 65 /* A */ && ch <= 90 /* Z */ ? ch - 65 /* A */ :
|
|
@@ -88630,7 +88630,7 @@ var ts;
|
|
|
88630
88630
|
var mappings = ts.arrayFrom(decoder, processMapping);
|
|
88631
88631
|
if (decoder.error !== undefined) {
|
|
88632
88632
|
if (host.log) {
|
|
88633
|
-
host.log("Encountered error while decoding sourcemap: "
|
|
88633
|
+
host.log("Encountered error while decoding sourcemap: ".concat(decoder.error));
|
|
88634
88634
|
}
|
|
88635
88635
|
decodedMappings = ts.emptyArray;
|
|
88636
88636
|
}
|
|
@@ -92305,7 +92305,7 @@ var ts;
|
|
|
92305
92305
|
var propertyName = ts.isPropertyAccessExpression(originalNode)
|
|
92306
92306
|
? ts.declarationNameToString(originalNode.name)
|
|
92307
92307
|
: ts.getTextOfNode(originalNode.argumentExpression);
|
|
92308
|
-
ts.addSyntheticTrailingComment(substitute, 3 /* MultiLineCommentTrivia */, " "
|
|
92308
|
+
ts.addSyntheticTrailingComment(substitute, 3 /* MultiLineCommentTrivia */, " ".concat(propertyName, " "));
|
|
92309
92309
|
}
|
|
92310
92310
|
return substitute;
|
|
92311
92311
|
}
|
|
@@ -93781,8 +93781,8 @@ var ts;
|
|
|
93781
93781
|
}
|
|
93782
93782
|
function createHoistedVariableForClass(name, node) {
|
|
93783
93783
|
var className = getPrivateIdentifierEnvironment().className;
|
|
93784
|
-
var prefix = className ? "_"
|
|
93785
|
-
var identifier = factory.createUniqueName(prefix
|
|
93784
|
+
var prefix = className ? "_".concat(className) : "";
|
|
93785
|
+
var identifier = factory.createUniqueName("".concat(prefix, "_").concat(name), 16 /* Optimistic */);
|
|
93786
93786
|
if (resolver.getNodeCheckFlags(node) & 524288 /* BlockScopedBindingInLoop */) {
|
|
93787
93787
|
addBlockScopedVariable(identifier);
|
|
93788
93788
|
}
|
|
@@ -95787,7 +95787,7 @@ var ts;
|
|
|
95787
95787
|
specifierSourceImports = new ts.Map();
|
|
95788
95788
|
currentFileState.utilizedImplicitRuntimeImports.set(importSource, specifierSourceImports);
|
|
95789
95789
|
}
|
|
95790
|
-
var generatedName = factory.createUniqueName("_"
|
|
95790
|
+
var generatedName = factory.createUniqueName("_".concat(name), 16 /* Optimistic */ | 32 /* FileLevel */ | 64 /* AllowNameSubstitution */);
|
|
95791
95791
|
var specifier = factory.createImportSpecifier(/*isTypeOnly*/ false, factory.createIdentifier(name), generatedName);
|
|
95792
95792
|
generatedName.generatedImportReference = specifier;
|
|
95793
95793
|
specifierSourceImports.set(name, specifier);
|
|
@@ -96935,11 +96935,11 @@ var ts;
|
|
|
96935
96935
|
}
|
|
96936
96936
|
else {
|
|
96937
96937
|
if (node.kind === 245 /* BreakStatement */) {
|
|
96938
|
-
labelMarker = "break-"
|
|
96938
|
+
labelMarker = "break-".concat(label.escapedText);
|
|
96939
96939
|
setLabeledJump(convertedLoopState, /*isBreak*/ true, ts.idText(label), labelMarker);
|
|
96940
96940
|
}
|
|
96941
96941
|
else {
|
|
96942
|
-
labelMarker = "continue-"
|
|
96942
|
+
labelMarker = "continue-".concat(label.escapedText);
|
|
96943
96943
|
setLabeledJump(convertedLoopState, /*isBreak*/ false, ts.idText(label), labelMarker);
|
|
96944
96944
|
}
|
|
96945
96945
|
}
|
|
@@ -105796,7 +105796,7 @@ var ts;
|
|
|
105796
105796
|
return getTypeAliasDeclarationVisibilityError;
|
|
105797
105797
|
}
|
|
105798
105798
|
else {
|
|
105799
|
-
return ts.Debug.assertNever(node, "Attempted to set a declaration diagnostic context for unhandled node kind: "
|
|
105799
|
+
return ts.Debug.assertNever(node, "Attempted to set a declaration diagnostic context for unhandled node kind: ".concat(ts.SyntaxKind[node.kind]));
|
|
105800
105800
|
}
|
|
105801
105801
|
function getVariableDeclarationTypeVisibilityDiagnosticMessage(symbolAccessibilityResult) {
|
|
105802
105802
|
if (node.kind === 253 /* VariableDeclaration */ || node.kind === 202 /* BindingElement */) {
|
|
@@ -106007,7 +106007,7 @@ var ts;
|
|
|
106007
106007
|
ts.Diagnostics.Parameter_0_of_accessor_has_or_is_using_name_1_from_private_module_2 :
|
|
106008
106008
|
ts.Diagnostics.Parameter_0_of_accessor_has_or_is_using_private_name_1;
|
|
106009
106009
|
default:
|
|
106010
|
-
return ts.Debug.fail("Unknown parent for parameter: "
|
|
106010
|
+
return ts.Debug.fail("Unknown parent for parameter: ".concat(ts.SyntaxKind[node.parent.kind]));
|
|
106011
106011
|
}
|
|
106012
106012
|
}
|
|
106013
106013
|
function getTypeParameterConstraintVisibilityError() {
|
|
@@ -106765,7 +106765,7 @@ var ts;
|
|
|
106765
106765
|
while (ts.length(lateMarkedStatements)) {
|
|
106766
106766
|
var i = lateMarkedStatements.shift();
|
|
106767
106767
|
if (!ts.isLateVisibilityPaintedStatement(i)) {
|
|
106768
|
-
return ts.Debug.fail("Late replaced statement was found which is not handled by the declaration transformer!: "
|
|
106768
|
+
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));
|
|
106769
106769
|
}
|
|
106770
106770
|
var priorNeedsDeclare = needsDeclare;
|
|
106771
106771
|
needsDeclare = i.parent && ts.isSourceFile(i.parent) && !(ts.isExternalModule(i.parent) && isBundledEmit);
|
|
@@ -106954,7 +106954,7 @@ var ts;
|
|
|
106954
106954
|
return cleanup(input);
|
|
106955
106955
|
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));
|
|
106956
106956
|
}
|
|
106957
|
-
default: ts.Debug.assertNever(input, "Attempted to process unhandled node kind: "
|
|
106957
|
+
default: ts.Debug.assertNever(input, "Attempted to process unhandled node kind: ".concat(ts.SyntaxKind[input.kind]));
|
|
106958
106958
|
}
|
|
106959
106959
|
}
|
|
106960
106960
|
if (ts.isTupleTypeNode(input) && (ts.getLineAndCharacterOfPosition(currentSourceFile, input.pos).line === ts.getLineAndCharacterOfPosition(currentSourceFile, input.end).line)) {
|
|
@@ -107245,7 +107245,7 @@ var ts;
|
|
|
107245
107245
|
if (extendsClause_1 && !ts.isEntityNameExpression(extendsClause_1.expression) && extendsClause_1.expression.kind !== 104 /* NullKeyword */) {
|
|
107246
107246
|
// We must add a temporary declaration for the extends clause expression
|
|
107247
107247
|
var oldId = input.name ? ts.unescapeLeadingUnderscores(input.name.escapedText) : "default";
|
|
107248
|
-
var newId_1 = factory.createUniqueName(oldId
|
|
107248
|
+
var newId_1 = factory.createUniqueName("".concat(oldId, "_base"), 16 /* Optimistic */);
|
|
107249
107249
|
getSymbolAccessibilityDiagnostic = function () { return ({
|
|
107250
107250
|
diagnosticMessage: ts.Diagnostics.extends_clause_of_exported_class_0_has_or_is_using_private_name_1,
|
|
107251
107251
|
errorNode: extendsClause_1,
|
|
@@ -107286,7 +107286,7 @@ var ts;
|
|
|
107286
107286
|
}
|
|
107287
107287
|
}
|
|
107288
107288
|
// Anything left unhandled is an error, so this should be unreachable
|
|
107289
|
-
return ts.Debug.assertNever(input, "Unhandled top-level node in declaration emit: "
|
|
107289
|
+
return ts.Debug.assertNever(input, "Unhandled top-level node in declaration emit: ".concat(ts.SyntaxKind[input.kind]));
|
|
107290
107290
|
function cleanup(node) {
|
|
107291
107291
|
if (isEnclosingDeclaration(input)) {
|
|
107292
107292
|
enclosingDeclaration = previousEnclosingDeclaration;
|
|
@@ -108178,13 +108178,13 @@ var ts;
|
|
|
108178
108178
|
if (ts.fileExtensionIs(inputFileName, ".json" /* Json */))
|
|
108179
108179
|
return;
|
|
108180
108180
|
if (js && configFile.options.sourceMap) {
|
|
108181
|
-
addOutput(js
|
|
108181
|
+
addOutput("".concat(js, ".map"));
|
|
108182
108182
|
}
|
|
108183
108183
|
if (ts.getEmitDeclarations(configFile.options)) {
|
|
108184
108184
|
var dts = getOutputDeclarationFileName(inputFileName, configFile, ignoreCase, getCommonSourceDirectory);
|
|
108185
108185
|
addOutput(dts);
|
|
108186
108186
|
if (configFile.options.declarationMap) {
|
|
108187
|
-
addOutput(dts
|
|
108187
|
+
addOutput("".concat(dts, ".map"));
|
|
108188
108188
|
}
|
|
108189
108189
|
}
|
|
108190
108190
|
}
|
|
@@ -108253,7 +108253,7 @@ var ts;
|
|
|
108253
108253
|
function getFirstProjectOutput(configFile, ignoreCase) {
|
|
108254
108254
|
if (ts.outFile(configFile.options)) {
|
|
108255
108255
|
var jsFilePath = getOutputPathsForBundle(configFile.options, /*forceDtsPaths*/ false).jsFilePath;
|
|
108256
|
-
return ts.Debug.checkDefined(jsFilePath, "project "
|
|
108256
|
+
return ts.Debug.checkDefined(jsFilePath, "project ".concat(configFile.options.configFilePath, " expected to have at least one output"));
|
|
108257
108257
|
}
|
|
108258
108258
|
var getCommonSourceDirectory = ts.memoize(function () { return getCommonSourceDirectoryOfConfig(configFile, ignoreCase); });
|
|
108259
108259
|
for (var _a = 0, _b = configFile.fileNames; _a < _b.length; _a++) {
|
|
@@ -108272,7 +108272,7 @@ var ts;
|
|
|
108272
108272
|
var buildInfoPath = getTsBuildInfoEmitOutputFilePath(configFile.options);
|
|
108273
108273
|
if (buildInfoPath)
|
|
108274
108274
|
return buildInfoPath;
|
|
108275
|
-
return ts.Debug.fail("project "
|
|
108275
|
+
return ts.Debug.fail("project ".concat(configFile.options.configFilePath, " expected to have at least one output"));
|
|
108276
108276
|
}
|
|
108277
108277
|
ts.getFirstProjectOutput = getFirstProjectOutput;
|
|
108278
108278
|
/*@internal*/
|
|
@@ -108498,7 +108498,7 @@ var ts;
|
|
|
108498
108498
|
if (sourceMappingURL) {
|
|
108499
108499
|
if (!writer.isAtStartOfLine())
|
|
108500
108500
|
writer.rawWrite(newLine);
|
|
108501
|
-
writer.writeComment("//# "
|
|
108501
|
+
writer.writeComment("//# ".concat("sourceMappingURL", "=").concat(sourceMappingURL)); // Tools can sometimes see this line as a source mapping url comment
|
|
108502
108502
|
}
|
|
108503
108503
|
// Write the source map
|
|
108504
108504
|
if (sourceMapFilePath) {
|
|
@@ -108547,7 +108547,7 @@ var ts;
|
|
|
108547
108547
|
// Encode the sourceMap into the sourceMap url
|
|
108548
108548
|
var sourceMapText = sourceMapGenerator.toString();
|
|
108549
108549
|
var base64SourceMapText = ts.base64encode(ts.sys, sourceMapText);
|
|
108550
|
-
return "data:application/json;base64,"
|
|
108550
|
+
return "data:application/json;base64,".concat(base64SourceMapText);
|
|
108551
108551
|
}
|
|
108552
108552
|
var sourceMapFile = ts.getBaseFileName(ts.normalizeSlashes(ts.Debug.checkDefined(sourceMapFilePath)));
|
|
108553
108553
|
if (mapOptions.mapRoot) {
|
|
@@ -108727,7 +108727,7 @@ var ts;
|
|
|
108727
108727
|
return;
|
|
108728
108728
|
break;
|
|
108729
108729
|
default:
|
|
108730
|
-
ts.Debug.fail("Unexpected path: "
|
|
108730
|
+
ts.Debug.fail("Unexpected path: ".concat(name));
|
|
108731
108731
|
}
|
|
108732
108732
|
outputFiles.push({ name: name, text: text, writeByteOrderMark: writeByteOrderMark });
|
|
108733
108733
|
},
|
|
@@ -109587,7 +109587,7 @@ var ts;
|
|
|
109587
109587
|
return writeTokenNode(node, writeKeyword);
|
|
109588
109588
|
if (ts.isTokenKind(node.kind))
|
|
109589
109589
|
return writeTokenNode(node, writePunctuation);
|
|
109590
|
-
ts.Debug.fail("Unhandled SyntaxKind: "
|
|
109590
|
+
ts.Debug.fail("Unhandled SyntaxKind: ".concat(ts.Debug.formatSyntaxKind(node.kind), "."));
|
|
109591
109591
|
}
|
|
109592
109592
|
function emitMappedTypeParameter(node) {
|
|
109593
109593
|
emit(node.name);
|
|
@@ -109757,16 +109757,16 @@ var ts;
|
|
|
109757
109757
|
}
|
|
109758
109758
|
}
|
|
109759
109759
|
function emitPlaceholder(hint, node, snippet) {
|
|
109760
|
-
nonEscapingWrite("${"
|
|
109760
|
+
nonEscapingWrite("${".concat(snippet.order, ":")); // `${2:`
|
|
109761
109761
|
pipelineEmitWithHintWorker(hint, node, /*allowSnippets*/ false); // `...`
|
|
109762
109762
|
nonEscapingWrite("}"); // `}`
|
|
109763
109763
|
// `${2:...}`
|
|
109764
109764
|
}
|
|
109765
109765
|
function emitTabStop(hint, node, snippet) {
|
|
109766
109766
|
// A tab stop should only be attached to an empty node, i.e. a node that doesn't emit any text.
|
|
109767
|
-
ts.Debug.assert(node.kind === 235 /* EmptyStatement */, "A tab stop cannot be attached to a node of kind "
|
|
109767
|
+
ts.Debug.assert(node.kind === 235 /* EmptyStatement */, "A tab stop cannot be attached to a node of kind ".concat(ts.Debug.formatSyntaxKind(node.kind), "."));
|
|
109768
109768
|
ts.Debug.assert(hint !== 5 /* EmbeddedStatement */, "A tab stop cannot be attached to an embedded statement.");
|
|
109769
|
-
nonEscapingWrite("$"
|
|
109769
|
+
nonEscapingWrite("$".concat(snippet.order));
|
|
109770
109770
|
}
|
|
109771
109771
|
//
|
|
109772
109772
|
// Identifiers
|
|
@@ -111528,17 +111528,17 @@ var ts;
|
|
|
111528
111528
|
writeLine();
|
|
111529
111529
|
}
|
|
111530
111530
|
if (currentSourceFile && currentSourceFile.moduleName) {
|
|
111531
|
-
writeComment("/// <amd-module name=\""
|
|
111531
|
+
writeComment("/// <amd-module name=\"".concat(currentSourceFile.moduleName, "\" />"));
|
|
111532
111532
|
writeLine();
|
|
111533
111533
|
}
|
|
111534
111534
|
if (currentSourceFile && currentSourceFile.amdDependencies) {
|
|
111535
111535
|
for (var _a = 0, _b = currentSourceFile.amdDependencies; _a < _b.length; _a++) {
|
|
111536
111536
|
var dep = _b[_a];
|
|
111537
111537
|
if (dep.name) {
|
|
111538
|
-
writeComment("/// <amd-dependency name=\""
|
|
111538
|
+
writeComment("/// <amd-dependency name=\"".concat(dep.name, "\" path=\"").concat(dep.path, "\" />"));
|
|
111539
111539
|
}
|
|
111540
111540
|
else {
|
|
111541
|
-
writeComment("/// <amd-dependency path=\""
|
|
111541
|
+
writeComment("/// <amd-dependency path=\"".concat(dep.path, "\" />"));
|
|
111542
111542
|
}
|
|
111543
111543
|
writeLine();
|
|
111544
111544
|
}
|
|
@@ -111546,7 +111546,7 @@ var ts;
|
|
|
111546
111546
|
for (var _c = 0, files_2 = files; _c < files_2.length; _c++) {
|
|
111547
111547
|
var directive = files_2[_c];
|
|
111548
111548
|
var pos = writer.getTextPos();
|
|
111549
|
-
writeComment("/// <reference path=\""
|
|
111549
|
+
writeComment("/// <reference path=\"".concat(directive.fileName, "\" />"));
|
|
111550
111550
|
if (bundleFileInfo)
|
|
111551
111551
|
bundleFileInfo.sections.push({ pos: pos, end: writer.getTextPos(), kind: "reference" /* Reference */, data: directive.fileName });
|
|
111552
111552
|
writeLine();
|
|
@@ -111554,7 +111554,7 @@ var ts;
|
|
|
111554
111554
|
for (var _d = 0, types_24 = types; _d < types_24.length; _d++) {
|
|
111555
111555
|
var directive = types_24[_d];
|
|
111556
111556
|
var pos = writer.getTextPos();
|
|
111557
|
-
writeComment("/// <reference types=\""
|
|
111557
|
+
writeComment("/// <reference types=\"".concat(directive.fileName, "\" />"));
|
|
111558
111558
|
if (bundleFileInfo)
|
|
111559
111559
|
bundleFileInfo.sections.push({ pos: pos, end: writer.getTextPos(), kind: "type" /* Type */, data: directive.fileName });
|
|
111560
111560
|
writeLine();
|
|
@@ -111562,7 +111562,7 @@ var ts;
|
|
|
111562
111562
|
for (var _e = 0, libs_1 = libs; _e < libs_1.length; _e++) {
|
|
111563
111563
|
var directive = libs_1[_e];
|
|
111564
111564
|
var pos = writer.getTextPos();
|
|
111565
|
-
writeComment("/// <reference lib=\""
|
|
111565
|
+
writeComment("/// <reference lib=\"".concat(directive.fileName, "\" />"));
|
|
111566
111566
|
if (bundleFileInfo)
|
|
111567
111567
|
bundleFileInfo.sections.push({ pos: pos, end: writer.getTextPos(), kind: "lib" /* Lib */, data: directive.fileName });
|
|
111568
111568
|
writeLine();
|
|
@@ -112342,9 +112342,9 @@ var ts;
|
|
|
112342
112342
|
var textSourceNode = node.textSourceNode;
|
|
112343
112343
|
if (ts.isIdentifier(textSourceNode) || ts.isNumericLiteral(textSourceNode)) {
|
|
112344
112344
|
var text = ts.isNumericLiteral(textSourceNode) ? textSourceNode.text : getTextOfNode(textSourceNode);
|
|
112345
|
-
return jsxAttributeEscape ? "\""
|
|
112346
|
-
neverAsciiEscape || (ts.getEmitFlags(node) & 16777216 /* NoAsciiEscaping */) ? "\""
|
|
112347
|
-
"\""
|
|
112345
|
+
return jsxAttributeEscape ? "\"".concat(ts.escapeJsxAttributeString(text), "\"") :
|
|
112346
|
+
neverAsciiEscape || (ts.getEmitFlags(node) & 16777216 /* NoAsciiEscaping */) ? "\"".concat(ts.escapeString(text), "\"") :
|
|
112347
|
+
"\"".concat(ts.escapeNonAsciiString(text), "\"");
|
|
112348
112348
|
}
|
|
112349
112349
|
else {
|
|
112350
112350
|
return getLiteralTextOfNode(textSourceNode, neverAsciiEscape, jsxAttributeEscape);
|
|
@@ -112821,8 +112821,8 @@ var ts;
|
|
|
112821
112821
|
}
|
|
112822
112822
|
function formatSynthesizedComment(comment) {
|
|
112823
112823
|
return comment.kind === 3 /* MultiLineCommentTrivia */
|
|
112824
|
-
? "/*"
|
|
112825
|
-
: "//"
|
|
112824
|
+
? "/*".concat(comment.text, "*/")
|
|
112825
|
+
: "//".concat(comment.text);
|
|
112826
112826
|
}
|
|
112827
112827
|
function emitBodyWithDetachedComments(node, detachedRange, emitCallback) {
|
|
112828
112828
|
enterComment();
|
|
@@ -113543,7 +113543,7 @@ var ts;
|
|
|
113543
113543
|
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;
|
|
113544
113544
|
var newPath = ts.removeIgnoredPath(fileOrDirectoryPath);
|
|
113545
113545
|
if (!newPath) {
|
|
113546
|
-
writeLog("Project: "
|
|
113546
|
+
writeLog("Project: ".concat(configFileName, " Detected ignored path: ").concat(fileOrDirectory));
|
|
113547
113547
|
return true;
|
|
113548
113548
|
}
|
|
113549
113549
|
fileOrDirectoryPath = newPath;
|
|
@@ -113552,11 +113552,11 @@ var ts;
|
|
|
113552
113552
|
// If the the added or created file or directory is not supported file name, ignore the file
|
|
113553
113553
|
// But when watched directory is added/removed, we need to reload the file list
|
|
113554
113554
|
if (ts.hasExtension(fileOrDirectoryPath) && !ts.isSupportedSourceFileName(fileOrDirectory, options, extraFileExtensions)) {
|
|
113555
|
-
writeLog("Project: "
|
|
113555
|
+
writeLog("Project: ".concat(configFileName, " Detected file add/remove of non supported extension: ").concat(fileOrDirectory));
|
|
113556
113556
|
return true;
|
|
113557
113557
|
}
|
|
113558
113558
|
if (ts.isExcludedFile(fileOrDirectory, options.configFile.configFileSpecs, ts.getNormalizedAbsolutePath(ts.getDirectoryPath(configFileName), currentDirectory), useCaseSensitiveFileNames, currentDirectory)) {
|
|
113559
|
-
writeLog("Project: "
|
|
113559
|
+
writeLog("Project: ".concat(configFileName, " Detected excluded file: ").concat(fileOrDirectory));
|
|
113560
113560
|
return true;
|
|
113561
113561
|
}
|
|
113562
113562
|
if (!program)
|
|
@@ -113580,7 +113580,7 @@ var ts;
|
|
|
113580
113580
|
var builderProgram = !realProgram && !ts.isArray(program) ? program : undefined;
|
|
113581
113581
|
if (hasSourceFile((filePathWithoutExtension + ".ts" /* Ts */)) ||
|
|
113582
113582
|
hasSourceFile((filePathWithoutExtension + ".tsx" /* Tsx */))) {
|
|
113583
|
-
writeLog("Project: "
|
|
113583
|
+
writeLog("Project: ".concat(configFileName, " Detected output file: ").concat(fileOrDirectory));
|
|
113584
113584
|
return true;
|
|
113585
113585
|
}
|
|
113586
113586
|
return false;
|
|
@@ -113648,36 +113648,36 @@ var ts;
|
|
|
113648
113648
|
host.useCaseSensitiveFileNames();
|
|
113649
113649
|
}
|
|
113650
113650
|
function createExcludeWatcherWithLogging(file, flags, options, detailInfo1, detailInfo2) {
|
|
113651
|
-
log("ExcludeWatcher:: Added:: "
|
|
113651
|
+
log("ExcludeWatcher:: Added:: ".concat(getWatchInfo(file, flags, options, detailInfo1, detailInfo2, getDetailWatchInfo)));
|
|
113652
113652
|
return {
|
|
113653
|
-
close: function () { return log("ExcludeWatcher:: Close:: "
|
|
113653
|
+
close: function () { return log("ExcludeWatcher:: Close:: ".concat(getWatchInfo(file, flags, options, detailInfo1, detailInfo2, getDetailWatchInfo))); }
|
|
113654
113654
|
};
|
|
113655
113655
|
}
|
|
113656
113656
|
function createFileWatcherWithLogging(file, cb, flags, options, detailInfo1, detailInfo2) {
|
|
113657
|
-
log("FileWatcher:: Added:: "
|
|
113657
|
+
log("FileWatcher:: Added:: ".concat(getWatchInfo(file, flags, options, detailInfo1, detailInfo2, getDetailWatchInfo)));
|
|
113658
113658
|
var watcher = triggerInvokingFactory.watchFile(file, cb, flags, options, detailInfo1, detailInfo2);
|
|
113659
113659
|
return {
|
|
113660
113660
|
close: function () {
|
|
113661
|
-
log("FileWatcher:: Close:: "
|
|
113661
|
+
log("FileWatcher:: Close:: ".concat(getWatchInfo(file, flags, options, detailInfo1, detailInfo2, getDetailWatchInfo)));
|
|
113662
113662
|
watcher.close();
|
|
113663
113663
|
}
|
|
113664
113664
|
};
|
|
113665
113665
|
}
|
|
113666
113666
|
function createDirectoryWatcherWithLogging(file, cb, flags, options, detailInfo1, detailInfo2) {
|
|
113667
|
-
var watchInfo = "DirectoryWatcher:: Added:: "
|
|
113667
|
+
var watchInfo = "DirectoryWatcher:: Added:: ".concat(getWatchInfo(file, flags, options, detailInfo1, detailInfo2, getDetailWatchInfo));
|
|
113668
113668
|
log(watchInfo);
|
|
113669
113669
|
var start = ts.timestamp();
|
|
113670
113670
|
var watcher = triggerInvokingFactory.watchDirectory(file, cb, flags, options, detailInfo1, detailInfo2);
|
|
113671
113671
|
var elapsed = ts.timestamp() - start;
|
|
113672
|
-
log("Elapsed:: "
|
|
113672
|
+
log("Elapsed:: ".concat(elapsed, "ms ").concat(watchInfo));
|
|
113673
113673
|
return {
|
|
113674
113674
|
close: function () {
|
|
113675
|
-
var watchInfo = "DirectoryWatcher:: Close:: "
|
|
113675
|
+
var watchInfo = "DirectoryWatcher:: Close:: ".concat(getWatchInfo(file, flags, options, detailInfo1, detailInfo2, getDetailWatchInfo));
|
|
113676
113676
|
log(watchInfo);
|
|
113677
113677
|
var start = ts.timestamp();
|
|
113678
113678
|
watcher.close();
|
|
113679
113679
|
var elapsed = ts.timestamp() - start;
|
|
113680
|
-
log("Elapsed:: "
|
|
113680
|
+
log("Elapsed:: ".concat(elapsed, "ms ").concat(watchInfo));
|
|
113681
113681
|
}
|
|
113682
113682
|
};
|
|
113683
113683
|
}
|
|
@@ -113687,16 +113687,16 @@ var ts;
|
|
|
113687
113687
|
for (var _i = 0; _i < arguments.length; _i++) {
|
|
113688
113688
|
args[_i] = arguments[_i];
|
|
113689
113689
|
}
|
|
113690
|
-
var triggerredInfo = (key === "watchFile" ? "FileWatcher" : "DirectoryWatcher"
|
|
113690
|
+
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));
|
|
113691
113691
|
log(triggerredInfo);
|
|
113692
113692
|
var start = ts.timestamp();
|
|
113693
113693
|
cb.call.apply(cb, __spreadArray([/*thisArg*/ undefined], args, false));
|
|
113694
113694
|
var elapsed = ts.timestamp() - start;
|
|
113695
|
-
log("Elapsed:: "
|
|
113695
|
+
log("Elapsed:: ".concat(elapsed, "ms ").concat(triggerredInfo));
|
|
113696
113696
|
}, flags, options, detailInfo1, detailInfo2); };
|
|
113697
113697
|
}
|
|
113698
113698
|
function getWatchInfo(file, flags, options, detailInfo1, detailInfo2, getDetailWatchInfo) {
|
|
113699
|
-
return "WatchInfo: "
|
|
113699
|
+
return "WatchInfo: ".concat(file, " ").concat(flags, " ").concat(JSON.stringify(options), " ").concat(getDetailWatchInfo ? getDetailWatchInfo(detailInfo1, detailInfo2) : detailInfo2 === undefined ? detailInfo1 : "".concat(detailInfo1, " ").concat(detailInfo2));
|
|
113700
113700
|
}
|
|
113701
113701
|
}
|
|
113702
113702
|
ts.getWatchFactory = getWatchFactory;
|
|
@@ -114003,12 +114003,12 @@ var ts;
|
|
|
114003
114003
|
}
|
|
114004
114004
|
ts.formatDiagnostics = formatDiagnostics;
|
|
114005
114005
|
function formatDiagnostic(diagnostic, host) {
|
|
114006
|
-
var errorMessage = ts.diagnosticCategoryName(diagnostic)
|
|
114006
|
+
var errorMessage = "".concat(ts.diagnosticCategoryName(diagnostic), " TS").concat(diagnostic.code, ": ").concat(flattenDiagnosticMessageText(diagnostic.messageText, host.getNewLine())).concat(host.getNewLine());
|
|
114007
114007
|
if (diagnostic.file) {
|
|
114008
114008
|
var _a = ts.getLineAndCharacterOfPosition(diagnostic.file, diagnostic.start), line = _a.line, character = _a.character; // TODO: GH#18217
|
|
114009
114009
|
var fileName = diagnostic.file.fileName;
|
|
114010
114010
|
var relativeFileName = ts.convertToRelativePath(fileName, host.getCurrentDirectory(), function (fileName) { return host.getCanonicalFileName(fileName); });
|
|
114011
|
-
return relativeFileName
|
|
114011
|
+
return "".concat(relativeFileName, "(").concat(line + 1, ",").concat(character + 1, "): ") + errorMessage;
|
|
114012
114012
|
}
|
|
114013
114013
|
return errorMessage;
|
|
114014
114014
|
}
|
|
@@ -114096,9 +114096,9 @@ var ts;
|
|
|
114096
114096
|
var output = "";
|
|
114097
114097
|
output += color(relativeFileName, ForegroundColorEscapeSequences.Cyan);
|
|
114098
114098
|
output += ":";
|
|
114099
|
-
output += color(""
|
|
114099
|
+
output += color("".concat(firstLine + 1), ForegroundColorEscapeSequences.Yellow);
|
|
114100
114100
|
output += ":";
|
|
114101
|
-
output += color(""
|
|
114101
|
+
output += color("".concat(firstLineChar + 1), ForegroundColorEscapeSequences.Yellow);
|
|
114102
114102
|
return output;
|
|
114103
114103
|
}
|
|
114104
114104
|
ts.formatLocation = formatLocation;
|
|
@@ -114112,7 +114112,7 @@ var ts;
|
|
|
114112
114112
|
output += " - ";
|
|
114113
114113
|
}
|
|
114114
114114
|
output += formatColorAndReset(ts.diagnosticCategoryName(diagnostic), getCategoryFormat(diagnostic.category));
|
|
114115
|
-
output += formatColorAndReset(" TS"
|
|
114115
|
+
output += formatColorAndReset(" TS".concat(diagnostic.code, ": "), ForegroundColorEscapeSequences.Grey);
|
|
114116
114116
|
output += flattenDiagnosticMessageText(diagnostic.messageText, host.getNewLine());
|
|
114117
114117
|
if (diagnostic.file) {
|
|
114118
114118
|
output += host.getNewLine();
|
|
@@ -114221,7 +114221,7 @@ var ts;
|
|
|
114221
114221
|
var result = void 0;
|
|
114222
114222
|
var mode = getModeForResolutionAtIndex(containingFile, i);
|
|
114223
114223
|
i++;
|
|
114224
|
-
var cacheKey = mode !== undefined ? mode
|
|
114224
|
+
var cacheKey = mode !== undefined ? "".concat(mode, "|").concat(name) : name;
|
|
114225
114225
|
if (cache.has(cacheKey)) {
|
|
114226
114226
|
result = cache.get(cacheKey);
|
|
114227
114227
|
}
|
|
@@ -116410,7 +116410,7 @@ var ts;
|
|
|
116410
116410
|
path += (i === 2 ? "/" : "-") + components[i];
|
|
116411
116411
|
i++;
|
|
116412
116412
|
}
|
|
116413
|
-
var resolveFrom = ts.combinePaths(currentDirectory, "__lib_node_modules_lookup_"
|
|
116413
|
+
var resolveFrom = ts.combinePaths(currentDirectory, "__lib_node_modules_lookup_".concat(libFileName, "__.ts"));
|
|
116414
116414
|
var localOverrideModuleResult = ts.resolveModuleName("@typescript/lib-" + path, resolveFrom, { moduleResolution: ts.ModuleResolutionKind.NodeJs }, host, moduleResolutionCache);
|
|
116415
116415
|
if (localOverrideModuleResult === null || localOverrideModuleResult === void 0 ? void 0 : localOverrideModuleResult.resolvedModule) {
|
|
116416
116416
|
return localOverrideModuleResult.resolvedModule.resolvedFileName;
|
|
@@ -117231,12 +117231,12 @@ var ts;
|
|
|
117231
117231
|
}
|
|
117232
117232
|
function directoryExistsIfProjectReferenceDeclDir(dir) {
|
|
117233
117233
|
var dirPath = host.toPath(dir);
|
|
117234
|
-
var dirPathWithTrailingDirectorySeparator = ""
|
|
117234
|
+
var dirPathWithTrailingDirectorySeparator = "".concat(dirPath).concat(ts.directorySeparator);
|
|
117235
117235
|
return ts.forEachKey(setOfDeclarationDirectories, function (declDirPath) { return dirPath === declDirPath ||
|
|
117236
117236
|
// Any parent directory of declaration dir
|
|
117237
117237
|
ts.startsWith(declDirPath, dirPathWithTrailingDirectorySeparator) ||
|
|
117238
117238
|
// Any directory inside declaration dir
|
|
117239
|
-
ts.startsWith(dirPath, declDirPath
|
|
117239
|
+
ts.startsWith(dirPath, "".concat(declDirPath, "/")); });
|
|
117240
117240
|
}
|
|
117241
117241
|
function handleDirectoryCouldBeSymlink(directory) {
|
|
117242
117242
|
var _a;
|
|
@@ -117289,7 +117289,7 @@ var ts;
|
|
|
117289
117289
|
if (isFile && result) {
|
|
117290
117290
|
// Store the real path for the file'
|
|
117291
117291
|
var absolutePath = ts.getNormalizedAbsolutePath(fileOrDirectory, host.compilerHost.getCurrentDirectory());
|
|
117292
|
-
symlinkCache.setSymlinkedFile(fileOrDirectoryPath, ""
|
|
117292
|
+
symlinkCache.setSymlinkedFile(fileOrDirectoryPath, "".concat(symlinkedDirectory.real).concat(absolutePath.replace(new RegExp(directoryPath, "i"), "")));
|
|
117293
117293
|
}
|
|
117294
117294
|
return result;
|
|
117295
117295
|
}) || false;
|
|
@@ -117747,7 +117747,7 @@ var ts;
|
|
|
117747
117747
|
/*forceDtsEmit*/ true);
|
|
117748
117748
|
var firstDts_1 = ts.firstOrUndefined(emitOutput_1.outputFiles);
|
|
117749
117749
|
if (firstDts_1) {
|
|
117750
|
-
ts.Debug.assert(ts.fileExtensionIsOneOf(firstDts_1.name, [".d.ts" /* Dts */, ".d.mts" /* Dmts */, ".d.cts" /* Dcts */]), "File extension for signature expected to be dts", function () { return "Found: "
|
|
117750
|
+
ts.Debug.assert(ts.fileExtensionIsOneOf(firstDts_1.name, [".d.ts" /* Dts */, ".d.mts" /* Dmts */, ".d.cts" /* Dcts */]), "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; }))); });
|
|
117751
117751
|
latestSignature = (computeHash || ts.generateDjb2Hash)(firstDts_1.text);
|
|
117752
117752
|
if (exportedModulesMapCache && latestSignature !== prevSignature) {
|
|
117753
117753
|
updateExportedModules(sourceFile, emitOutput_1.exportedModulesFromDeclarationEmit, exportedModulesMapCache);
|
|
@@ -118255,7 +118255,7 @@ var ts;
|
|
|
118255
118255
|
return;
|
|
118256
118256
|
}
|
|
118257
118257
|
else {
|
|
118258
|
-
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: "
|
|
118258
|
+
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));
|
|
118259
118259
|
}
|
|
118260
118260
|
if (!state.compilerOptions.assumeChangesOnlyAffectDirectDependencies) {
|
|
118261
118261
|
forEachReferencingModulesOfExportOfAffectedFile(state, affectedFile, function (state, path) { return handleDtsMayChangeOf(state, path, cancellationToken, computeHash); });
|
|
@@ -119400,7 +119400,7 @@ var ts;
|
|
|
119400
119400
|
failedLookupLocation = ts.isRootedDiskPath(failedLookupLocation) ? ts.normalizePath(failedLookupLocation) : ts.getNormalizedAbsolutePath(failedLookupLocation, getCurrentDirectory());
|
|
119401
119401
|
var failedLookupPathSplit = failedLookupLocationPath.split(ts.directorySeparator);
|
|
119402
119402
|
var failedLookupSplit = failedLookupLocation.split(ts.directorySeparator);
|
|
119403
|
-
ts.Debug.assert(failedLookupSplit.length === failedLookupPathSplit.length, "FailedLookup: "
|
|
119403
|
+
ts.Debug.assert(failedLookupSplit.length === failedLookupPathSplit.length, "FailedLookup: ".concat(failedLookupLocation, " failedLookupLocationPath: ").concat(failedLookupLocationPath));
|
|
119404
119404
|
if (failedLookupPathSplit.length > rootSplitLength + 1) {
|
|
119405
119405
|
// Instead of watching root, watch directory in root to avoid watching excluded directories not needed for module resolution
|
|
119406
119406
|
return {
|
|
@@ -120482,7 +120482,7 @@ var ts;
|
|
|
120482
120482
|
}
|
|
120483
120483
|
function getJSExtensionForFile(fileName, options) {
|
|
120484
120484
|
var _a;
|
|
120485
|
-
return (_a = tryGetJSExtensionForFile(fileName, options)) !== null && _a !== void 0 ? _a : ts.Debug.fail("Extension "
|
|
120485
|
+
return (_a = tryGetJSExtensionForFile(fileName, options)) !== null && _a !== void 0 ? _a : ts.Debug.fail("Extension ".concat(ts.extensionFromPath(fileName), " is unsupported:: FileName:: ").concat(fileName));
|
|
120486
120486
|
}
|
|
120487
120487
|
function tryGetJSExtensionForFile(fileName, options) {
|
|
120488
120488
|
var ext = ts.tryGetExtensionFromPath(fileName);
|
|
@@ -120585,8 +120585,8 @@ var ts;
|
|
|
120585
120585
|
return pretty ?
|
|
120586
120586
|
function (diagnostic, newLine, options) {
|
|
120587
120587
|
clearScreenIfNotWatchingForFileChanges(system, diagnostic, options);
|
|
120588
|
-
var output = "["
|
|
120589
|
-
output += ""
|
|
120588
|
+
var output = "[".concat(ts.formatColorAndReset(getLocaleTimeString(system), ts.ForegroundColorEscapeSequences.Grey), "] ");
|
|
120589
|
+
output += "".concat(ts.flattenDiagnosticMessageText(diagnostic.messageText, system.newLine)).concat(newLine + newLine);
|
|
120590
120590
|
system.write(output);
|
|
120591
120591
|
} :
|
|
120592
120592
|
function (diagnostic, newLine, options) {
|
|
@@ -120594,8 +120594,8 @@ var ts;
|
|
|
120594
120594
|
if (!clearScreenIfNotWatchingForFileChanges(system, diagnostic, options)) {
|
|
120595
120595
|
output += newLine;
|
|
120596
120596
|
}
|
|
120597
|
-
output += getLocaleTimeString(system)
|
|
120598
|
-
output += ""
|
|
120597
|
+
output += "".concat(getLocaleTimeString(system), " - ");
|
|
120598
|
+
output += "".concat(ts.flattenDiagnosticMessageText(diagnostic.messageText, system.newLine)).concat(getPlainDiagnosticFollowingNewLines(diagnostic, newLine));
|
|
120599
120599
|
system.write(output);
|
|
120600
120600
|
};
|
|
120601
120601
|
}
|
|
@@ -120618,7 +120618,7 @@ var ts;
|
|
|
120618
120618
|
.map(function (errorDiagnostic) {
|
|
120619
120619
|
if (errorDiagnostic.file === undefined)
|
|
120620
120620
|
return;
|
|
120621
|
-
return ""
|
|
120621
|
+
return "".concat(errorDiagnostic.file.fileName);
|
|
120622
120622
|
});
|
|
120623
120623
|
return filesInError.map(function (fileName) {
|
|
120624
120624
|
var diagnosticForFileName = ts.find(diagnostics, function (diagnostic) {
|
|
@@ -120651,7 +120651,7 @@ var ts;
|
|
|
120651
120651
|
if (errorCount === 0)
|
|
120652
120652
|
return "";
|
|
120653
120653
|
var nonNilFiles = filesInError.filter(function (fileInError) { return fileInError !== undefined; });
|
|
120654
|
-
var distinctFileNamesWithLines = nonNilFiles.map(function (fileInError) { return fileInError.fileName
|
|
120654
|
+
var distinctFileNamesWithLines = nonNilFiles.map(function (fileInError) { return "".concat(fileInError.fileName, ":").concat(fileInError.line); })
|
|
120655
120655
|
.filter(function (value, index, self) { return self.indexOf(value) === index; });
|
|
120656
120656
|
var firstFileReference = nonNilFiles[0] && prettyPathForFileError(nonNilFiles[0], host.getCurrentDirectory());
|
|
120657
120657
|
var d = errorCount === 1 ?
|
|
@@ -120664,7 +120664,7 @@ var ts;
|
|
|
120664
120664
|
ts.Diagnostics.Found_0_errors_in_the_same_file_starting_at_Colon_1 :
|
|
120665
120665
|
ts.Diagnostics.Found_0_errors_in_1_files, errorCount, distinctFileNamesWithLines.length === 1 ? firstFileReference : distinctFileNamesWithLines.length);
|
|
120666
120666
|
var suffix = distinctFileNamesWithLines.length > 1 ? createTabularErrorsDisplay(nonNilFiles, host) : "";
|
|
120667
|
-
return ""
|
|
120667
|
+
return "".concat(newLine).concat(ts.flattenDiagnosticMessageText(d.messageText, newLine)).concat(newLine).concat(newLine).concat(suffix);
|
|
120668
120668
|
}
|
|
120669
120669
|
ts.getErrorSummaryText = getErrorSummaryText;
|
|
120670
120670
|
function createTabularErrorsDisplay(filesInError, host) {
|
|
@@ -120687,7 +120687,7 @@ var ts;
|
|
|
120687
120687
|
" ".repeat(leftPaddingGoal - errorCountDigitsLength)
|
|
120688
120688
|
: "";
|
|
120689
120689
|
var fileRef = prettyPathForFileError(file, host.getCurrentDirectory());
|
|
120690
|
-
tabularData += ""
|
|
120690
|
+
tabularData += "".concat(leftPadding).concat(errorCount, " ").concat(fileRef, "\n");
|
|
120691
120691
|
});
|
|
120692
120692
|
return tabularData;
|
|
120693
120693
|
}
|
|
@@ -120714,9 +120714,9 @@ var ts;
|
|
|
120714
120714
|
var relativeFileName = function (fileName) { return ts.convertToRelativePath(fileName, program.getCurrentDirectory(), getCanonicalFileName); };
|
|
120715
120715
|
for (var _i = 0, _c = program.getSourceFiles(); _i < _c.length; _i++) {
|
|
120716
120716
|
var file = _c[_i];
|
|
120717
|
-
write(""
|
|
120718
|
-
(_a = reasons.get(file.path)) === null || _a === void 0 ? void 0 : _a.forEach(function (reason) { return write(" "
|
|
120719
|
-
(_b = explainIfFileIsRedirect(file, relativeFileName)) === null || _b === void 0 ? void 0 : _b.forEach(function (d) { return write(" "
|
|
120717
|
+
write("".concat(toFileName(file, relativeFileName)));
|
|
120718
|
+
(_a = reasons.get(file.path)) === null || _a === void 0 ? void 0 : _a.forEach(function (reason) { return write(" ".concat(fileIncludeReasonToDiagnostics(program, reason, relativeFileName).messageText)); });
|
|
120719
|
+
(_b = explainIfFileIsRedirect(file, relativeFileName)) === null || _b === void 0 ? void 0 : _b.forEach(function (d) { return write(" ".concat(d.messageText)); });
|
|
120720
120720
|
}
|
|
120721
120721
|
}
|
|
120722
120722
|
ts.explainFiles = explainFiles;
|
|
@@ -120756,7 +120756,7 @@ var ts;
|
|
|
120756
120756
|
if (isJsonFile && !ts.endsWith(includeSpec, ".json" /* Json */))
|
|
120757
120757
|
return false;
|
|
120758
120758
|
var pattern = ts.getPatternFromSpec(includeSpec, basePath, "files");
|
|
120759
|
-
return !!pattern && ts.getRegexFromPattern("("
|
|
120759
|
+
return !!pattern && ts.getRegexFromPattern("(".concat(pattern, ")$"), useCaseSensitiveFileNames).test(fileName);
|
|
120760
120760
|
});
|
|
120761
120761
|
}
|
|
120762
120762
|
ts.getMatchedIncludeSpec = getMatchedIncludeSpec;
|
|
@@ -120765,7 +120765,7 @@ var ts;
|
|
|
120765
120765
|
var options = program.getCompilerOptions();
|
|
120766
120766
|
if (ts.isReferencedFile(reason)) {
|
|
120767
120767
|
var referenceLocation = ts.getReferencedFileLocation(function (path) { return program.getSourceFileByPath(path); }, reason);
|
|
120768
|
-
var referenceText = ts.isReferenceFileLocation(referenceLocation) ? referenceLocation.file.text.substring(referenceLocation.pos, referenceLocation.end) : "\""
|
|
120768
|
+
var referenceText = ts.isReferenceFileLocation(referenceLocation) ? referenceLocation.file.text.substring(referenceLocation.pos, referenceLocation.end) : "\"".concat(referenceLocation.text, "\"");
|
|
120769
120769
|
var message = void 0;
|
|
120770
120770
|
ts.Debug.assert(ts.isReferenceFileLocation(referenceLocation) || reason.kind === ts.FileIncludeKind.Import, "Only synthetic references are imports");
|
|
120771
120771
|
switch (reason.kind) {
|
|
@@ -120889,7 +120889,7 @@ var ts;
|
|
|
120889
120889
|
var currentDir_1 = program.getCurrentDirectory();
|
|
120890
120890
|
ts.forEach(emittedFiles, function (file) {
|
|
120891
120891
|
var filepath = ts.getNormalizedAbsolutePath(file, currentDir_1);
|
|
120892
|
-
write("TSFILE: "
|
|
120892
|
+
write("TSFILE: ".concat(filepath));
|
|
120893
120893
|
});
|
|
120894
120894
|
listFiles(program, write);
|
|
120895
120895
|
}
|
|
@@ -121218,7 +121218,7 @@ var ts;
|
|
|
121218
121218
|
}
|
|
121219
121219
|
var _b = ts.createWatchFactory(host, compilerOptions), watchFile = _b.watchFile, watchDirectory = _b.watchDirectory, writeLog = _b.writeLog;
|
|
121220
121220
|
var getCanonicalFileName = ts.createGetCanonicalFileName(useCaseSensitiveFileNames);
|
|
121221
|
-
writeLog("Current directory: "
|
|
121221
|
+
writeLog("Current directory: ".concat(currentDirectory, " CaseSensitiveFileNames: ").concat(useCaseSensitiveFileNames));
|
|
121222
121222
|
var configFileWatcher;
|
|
121223
121223
|
if (configFileName) {
|
|
121224
121224
|
configFileWatcher = watchFile(configFileName, scheduleProgramReload, ts.PollingInterval.High, watchOptions, ts.WatchType.ConfigFile);
|
|
@@ -121374,10 +121374,10 @@ var ts;
|
|
|
121374
121374
|
function createNewProgram(hasInvalidatedResolution) {
|
|
121375
121375
|
// Compile the program
|
|
121376
121376
|
writeLog("CreatingProgramWith::");
|
|
121377
|
-
writeLog(" roots: "
|
|
121378
|
-
writeLog(" options: "
|
|
121377
|
+
writeLog(" roots: ".concat(JSON.stringify(rootFileNames)));
|
|
121378
|
+
writeLog(" options: ".concat(JSON.stringify(compilerOptions)));
|
|
121379
121379
|
if (projectReferences)
|
|
121380
|
-
writeLog(" projectReferences: "
|
|
121380
|
+
writeLog(" projectReferences: ".concat(JSON.stringify(projectReferences)));
|
|
121381
121381
|
var needsUpdateInTypeRootWatch = hasChangedCompilerOptions || !getCurrentProgram();
|
|
121382
121382
|
hasChangedCompilerOptions = false;
|
|
121383
121383
|
hasChangedConfigFileParsingErrors = false;
|
|
@@ -121538,7 +121538,7 @@ var ts;
|
|
|
121538
121538
|
return resolutionCache.invalidateResolutionsOfFailedLookupLocations();
|
|
121539
121539
|
}
|
|
121540
121540
|
var pending = clearInvalidateResolutionsOfFailedLookupLocations();
|
|
121541
|
-
writeLog("Scheduling invalidateFailedLookup"
|
|
121541
|
+
writeLog("Scheduling invalidateFailedLookup".concat(pending ? ", Cancelled earlier one" : ""));
|
|
121542
121542
|
timerToInvalidateFailedLookupResolutions = host.setTimeout(invalidateResolutionsOfFailedLookup, 250);
|
|
121543
121543
|
}
|
|
121544
121544
|
function invalidateResolutionsOfFailedLookup() {
|
|
@@ -121598,7 +121598,7 @@ var ts;
|
|
|
121598
121598
|
synchronizeProgram();
|
|
121599
121599
|
}
|
|
121600
121600
|
function reloadConfigFile() {
|
|
121601
|
-
writeLog("Reloading config file: "
|
|
121601
|
+
writeLog("Reloading config file: ".concat(configFileName));
|
|
121602
121602
|
reloadLevel = ts.ConfigFileProgramReloadLevel.None;
|
|
121603
121603
|
if (cachedDirectoryStructureHost) {
|
|
121604
121604
|
cachedDirectoryStructureHost.clearCache();
|
|
@@ -121639,7 +121639,7 @@ var ts;
|
|
|
121639
121639
|
return config.parsedCommandLine;
|
|
121640
121640
|
}
|
|
121641
121641
|
}
|
|
121642
|
-
writeLog("Loading config file: "
|
|
121642
|
+
writeLog("Loading config file: ".concat(configFileName));
|
|
121643
121643
|
var parsedCommandLine = host.getParsedCommandLine ?
|
|
121644
121644
|
host.getParsedCommandLine(configFileName) :
|
|
121645
121645
|
getParsedCommandLineFromConfigFileHost(configFileName);
|
|
@@ -121943,8 +121943,8 @@ var ts;
|
|
|
121943
121943
|
*/
|
|
121944
121944
|
function createBuilderStatusReporter(system, pretty) {
|
|
121945
121945
|
return function (diagnostic) {
|
|
121946
|
-
var output = pretty ? "["
|
|
121947
|
-
output += ""
|
|
121946
|
+
var output = pretty ? "[".concat(ts.formatColorAndReset(ts.getLocaleTimeString(system), ts.ForegroundColorEscapeSequences.Grey), "] ") : "".concat(ts.getLocaleTimeString(system), " - ");
|
|
121947
|
+
output += "".concat(ts.flattenDiagnosticMessageText(diagnostic.messageText, system.newLine)).concat(system.newLine + system.newLine);
|
|
121948
121948
|
system.write(output);
|
|
121949
121949
|
};
|
|
121950
121950
|
}
|
|
@@ -122719,7 +122719,7 @@ var ts;
|
|
|
122719
122719
|
function listEmittedFile(_a, proj, file) {
|
|
122720
122720
|
var write = _a.write;
|
|
122721
122721
|
if (write && proj.options.listEmittedFiles) {
|
|
122722
|
-
write("TSFILE: "
|
|
122722
|
+
write("TSFILE: ".concat(file));
|
|
122723
122723
|
}
|
|
122724
122724
|
}
|
|
122725
122725
|
function getOldProgram(_a, proj, parsed) {
|
|
@@ -122748,7 +122748,7 @@ var ts;
|
|
|
122748
122748
|
function buildErrors(state, resolvedPath, program, config, diagnostics, buildResult, errorType) {
|
|
122749
122749
|
var canEmitBuildInfo = !(buildResult & BuildResultFlags.SyntaxErrors) && program && !ts.outFile(program.getCompilerOptions());
|
|
122750
122750
|
reportAndStoreErrors(state, resolvedPath, diagnostics);
|
|
122751
|
-
state.projectStatus.set(resolvedPath, { type: ts.UpToDateStatusType.Unbuildable, reason: errorType
|
|
122751
|
+
state.projectStatus.set(resolvedPath, { type: ts.UpToDateStatusType.Unbuildable, reason: "".concat(errorType, " errors") });
|
|
122752
122752
|
if (canEmitBuildInfo)
|
|
122753
122753
|
return { buildResult: buildResult, step: BuildStep.EmitBuildInfo };
|
|
122754
122754
|
afterProgramDone(state, program, config);
|
|
@@ -122776,7 +122776,7 @@ var ts;
|
|
|
122776
122776
|
if (!host.fileExists(inputFile)) {
|
|
122777
122777
|
return {
|
|
122778
122778
|
type: ts.UpToDateStatusType.Unbuildable,
|
|
122779
|
-
reason: inputFile
|
|
122779
|
+
reason: "".concat(inputFile, " does not exist")
|
|
122780
122780
|
};
|
|
122781
122781
|
}
|
|
122782
122782
|
if (!force) {
|
|
@@ -123135,7 +123135,7 @@ var ts;
|
|
|
123135
123135
|
}
|
|
123136
123136
|
}
|
|
123137
123137
|
if (filesToDelete) {
|
|
123138
|
-
reportStatus(state, ts.Diagnostics.A_non_dry_build_would_delete_the_following_files_Colon_0, filesToDelete.map(function (f) { return "\r\n * "
|
|
123138
|
+
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(""));
|
|
123139
123139
|
}
|
|
123140
123140
|
return ts.ExitStatus.Success;
|
|
123141
123141
|
}
|
|
@@ -123473,7 +123473,7 @@ var ts;
|
|
|
123473
123473
|
function nowString() {
|
|
123474
123474
|
// E.g. "12:34:56.789"
|
|
123475
123475
|
var d = new Date();
|
|
123476
|
-
return ts.padLeft(d.getHours().toString(), 2, "0")
|
|
123476
|
+
return "".concat(ts.padLeft(d.getHours().toString(), 2, "0"), ":").concat(ts.padLeft(d.getMinutes().toString(), 2, "0"), ":").concat(ts.padLeft(d.getSeconds().toString(), 2, "0"), ".").concat(ts.padLeft(d.getMilliseconds().toString(), 3, "0"));
|
|
123477
123477
|
}
|
|
123478
123478
|
server.nowString = nowString;
|
|
123479
123479
|
})(server = ts.server || (ts.server = {}));
|
|
@@ -123484,7 +123484,7 @@ var ts;
|
|
|
123484
123484
|
var JsTyping;
|
|
123485
123485
|
(function (JsTyping) {
|
|
123486
123486
|
function isTypingUpToDate(cachedTyping, availableTypingVersions) {
|
|
123487
|
-
var availableVersion = new ts.Version(ts.getProperty(availableTypingVersions, "ts"
|
|
123487
|
+
var availableVersion = new ts.Version(ts.getProperty(availableTypingVersions, "ts".concat(ts.versionMajorMinor)) || ts.getProperty(availableTypingVersions, "latest"));
|
|
123488
123488
|
return availableVersion.compareTo(cachedTyping.version) <= 0;
|
|
123489
123489
|
}
|
|
123490
123490
|
JsTyping.isTypingUpToDate = isTypingUpToDate;
|
|
@@ -123537,7 +123537,7 @@ var ts;
|
|
|
123537
123537
|
"worker_threads",
|
|
123538
123538
|
"zlib"
|
|
123539
123539
|
];
|
|
123540
|
-
JsTyping.prefixedNodeCoreModuleList = unprefixedNodeCoreModuleList.map(function (name) { return "node:"
|
|
123540
|
+
JsTyping.prefixedNodeCoreModuleList = unprefixedNodeCoreModuleList.map(function (name) { return "node:".concat(name); });
|
|
123541
123541
|
JsTyping.nodeCoreModuleList = __spreadArray(__spreadArray([], unprefixedNodeCoreModuleList, true), JsTyping.prefixedNodeCoreModuleList, true);
|
|
123542
123542
|
JsTyping.nodeCoreModules = new ts.Set(JsTyping.nodeCoreModuleList);
|
|
123543
123543
|
function nonRelativeModuleNameForTypingCache(moduleName) {
|
|
@@ -123610,7 +123610,7 @@ var ts;
|
|
|
123610
123610
|
var excludeTypingName = exclude_1[_i];
|
|
123611
123611
|
var didDelete = inferredTypings.delete(excludeTypingName);
|
|
123612
123612
|
if (didDelete && log)
|
|
123613
|
-
log("Typing for "
|
|
123613
|
+
log("Typing for ".concat(excludeTypingName, " is in exclude list, will be ignored."));
|
|
123614
123614
|
}
|
|
123615
123615
|
var newTypingNames = [];
|
|
123616
123616
|
var cachedTypingPaths = [];
|
|
@@ -123624,7 +123624,7 @@ var ts;
|
|
|
123624
123624
|
});
|
|
123625
123625
|
var result = { cachedTypingPaths: cachedTypingPaths, newTypingNames: newTypingNames, filesToWatch: filesToWatch };
|
|
123626
123626
|
if (log)
|
|
123627
|
-
log("Result: "
|
|
123627
|
+
log("Result: ".concat(JSON.stringify(result)));
|
|
123628
123628
|
return result;
|
|
123629
123629
|
function addInferredTyping(typingName) {
|
|
123630
123630
|
if (!inferredTypings.has(typingName)) {
|
|
@@ -123633,7 +123633,7 @@ var ts;
|
|
|
123633
123633
|
}
|
|
123634
123634
|
function addInferredTypings(typingNames, message) {
|
|
123635
123635
|
if (log)
|
|
123636
|
-
log(message
|
|
123636
|
+
log("".concat(message, ": ").concat(JSON.stringify(typingNames)));
|
|
123637
123637
|
ts.forEach(typingNames, addInferredTyping);
|
|
123638
123638
|
}
|
|
123639
123639
|
/**
|
|
@@ -123655,7 +123655,7 @@ var ts;
|
|
|
123655
123655
|
filesToWatch.push(manifestPath);
|
|
123656
123656
|
manifest = ts.readConfigFile(manifestPath, function (path) { return host.readFile(path); }).config;
|
|
123657
123657
|
manifestTypingNames = ts.flatMap([manifest.dependencies, manifest.devDependencies, manifest.optionalDependencies, manifest.peerDependencies], ts.getOwnKeys);
|
|
123658
|
-
addInferredTypings(manifestTypingNames, "Typing names in '"
|
|
123658
|
+
addInferredTypings(manifestTypingNames, "Typing names in '".concat(manifestPath, "' dependencies"));
|
|
123659
123659
|
}
|
|
123660
123660
|
// Now we scan the directories for typing information in
|
|
123661
123661
|
// already-installed dependencies (if present). Note that this
|
|
@@ -123699,7 +123699,7 @@ var ts;
|
|
|
123699
123699
|
!isScoped && pathComponents[pathComponents.length - 3].toLowerCase() === modulesDirName; // `node_modules/foo`
|
|
123700
123700
|
});
|
|
123701
123701
|
if (log)
|
|
123702
|
-
log("Searching for typing names in "
|
|
123702
|
+
log("Searching for typing names in ".concat(packagesFolderPath, "; all files: ").concat(JSON.stringify(dependencyManifestNames)));
|
|
123703
123703
|
// Once we have the names of things to look up, we iterate over
|
|
123704
123704
|
// and either collect their included typings, or add them to the
|
|
123705
123705
|
// list of typings we need to look up separately.
|
|
@@ -123718,12 +123718,12 @@ var ts;
|
|
|
123718
123718
|
var absolutePath = ts.getNormalizedAbsolutePath(ownTypes, ts.getDirectoryPath(normalizedFileName));
|
|
123719
123719
|
if (host.fileExists(absolutePath)) {
|
|
123720
123720
|
if (log)
|
|
123721
|
-
log(" Package '"
|
|
123721
|
+
log(" Package '".concat(manifest_1.name, "' provides its own types."));
|
|
123722
123722
|
inferredTypings.set(manifest_1.name, absolutePath);
|
|
123723
123723
|
}
|
|
123724
123724
|
else {
|
|
123725
123725
|
if (log)
|
|
123726
|
-
log(" Package '"
|
|
123726
|
+
log(" Package '".concat(manifest_1.name, "' provides its own types but they are missing."));
|
|
123727
123727
|
}
|
|
123728
123728
|
}
|
|
123729
123729
|
else {
|
|
@@ -123819,15 +123819,15 @@ var ts;
|
|
|
123819
123819
|
var kind = isScopeName ? "Scope" : "Package";
|
|
123820
123820
|
switch (result) {
|
|
123821
123821
|
case 1 /* EmptyName */:
|
|
123822
|
-
return "'"
|
|
123822
|
+
return "'".concat(typing, "':: ").concat(kind, " name '").concat(name, "' cannot be empty");
|
|
123823
123823
|
case 2 /* NameTooLong */:
|
|
123824
|
-
return "'"
|
|
123824
|
+
return "'".concat(typing, "':: ").concat(kind, " name '").concat(name, "' should be less than ").concat(maxPackageNameLength, " characters");
|
|
123825
123825
|
case 3 /* NameStartsWithDot */:
|
|
123826
|
-
return "'"
|
|
123826
|
+
return "'".concat(typing, "':: ").concat(kind, " name '").concat(name, "' cannot start with '.'");
|
|
123827
123827
|
case 4 /* NameStartsWithUnderscore */:
|
|
123828
|
-
return "'"
|
|
123828
|
+
return "'".concat(typing, "':: ").concat(kind, " name '").concat(name, "' cannot start with '_'");
|
|
123829
123829
|
case 5 /* NameContainsNonURISafeCharacters */:
|
|
123830
|
-
return "'"
|
|
123830
|
+
return "'".concat(typing, "':: ").concat(kind, " name '").concat(name, "' contains non URI safe characters");
|
|
123831
123831
|
case 0 /* Ok */:
|
|
123832
123832
|
return ts.Debug.fail(); // Shouldn't have called this.
|
|
123833
123833
|
default:
|
|
@@ -123853,7 +123853,7 @@ var ts;
|
|
|
123853
123853
|
}
|
|
123854
123854
|
catch (e) {
|
|
123855
123855
|
if (log.isEnabled()) {
|
|
123856
|
-
log.writeLine("Failed to resolve "
|
|
123856
|
+
log.writeLine("Failed to resolve ".concat(packageName, " in folder '").concat(cachePath, "': ").concat(e.message));
|
|
123857
123857
|
}
|
|
123858
123858
|
return undefined;
|
|
123859
123859
|
}
|
|
@@ -123874,7 +123874,7 @@ var ts;
|
|
|
123874
123874
|
var sliceStart = packageNames.length - remaining;
|
|
123875
123875
|
var command, toSlice = remaining;
|
|
123876
123876
|
while (true) {
|
|
123877
|
-
command = npmPath
|
|
123877
|
+
command = "".concat(npmPath, " install --ignore-scripts ").concat((toSlice === packageNames.length ? packageNames : packageNames.slice(sliceStart, sliceStart + toSlice)).join(" "), " --save-dev --user-agent=\"typesInstaller/").concat(tsVersion, "\"");
|
|
123878
123878
|
if (command.length < 8000) {
|
|
123879
123879
|
break;
|
|
123880
123880
|
}
|
|
@@ -123901,12 +123901,12 @@ var ts;
|
|
|
123901
123901
|
ProjectWatcherType["DirectoryWatcher"] = "DirectoryWatcher";
|
|
123902
123902
|
})(ProjectWatcherType || (ProjectWatcherType = {}));
|
|
123903
123903
|
function getDetailWatchInfo(projectName, watchers) {
|
|
123904
|
-
return "Project: "
|
|
123904
|
+
return "Project: ".concat(projectName, " watcher already invoked: ").concat(watchers.isInvoked);
|
|
123905
123905
|
}
|
|
123906
123906
|
var TypingsInstaller = /** @class */ (function () {
|
|
123907
123907
|
function TypingsInstaller(installTypingHost, globalCachePath, safeListPath, typesMapLocation, throttleLimit, log) {
|
|
123908
|
-
var _this = this;
|
|
123909
123908
|
if (log === void 0) { log = nullLog; }
|
|
123909
|
+
var _this = this;
|
|
123910
123910
|
this.installTypingHost = installTypingHost;
|
|
123911
123911
|
this.globalCachePath = globalCachePath;
|
|
123912
123912
|
this.safeListPath = safeListPath;
|
|
@@ -123925,7 +123925,7 @@ var ts;
|
|
|
123925
123925
|
this.globalCachePackageJsonPath = ts.combinePaths(globalCachePath, "package.json");
|
|
123926
123926
|
var isLoggingEnabled = this.log.isEnabled();
|
|
123927
123927
|
if (isLoggingEnabled) {
|
|
123928
|
-
this.log.writeLine("Global cache location '"
|
|
123928
|
+
this.log.writeLine("Global cache location '".concat(globalCachePath, "', safe file path '").concat(safeListPath, "', types map path ").concat(typesMapLocation));
|
|
123929
123929
|
}
|
|
123930
123930
|
this.watchFactory = ts.getWatchFactory(this.installTypingHost, isLoggingEnabled ? ts.WatchLogLevel.Verbose : ts.WatchLogLevel.None, function (s) { return _this.log.writeLine(s); }, getDetailWatchInfo);
|
|
123931
123931
|
this.processCacheLocation(this.globalCachePath);
|
|
@@ -123935,30 +123935,30 @@ var ts;
|
|
|
123935
123935
|
};
|
|
123936
123936
|
TypingsInstaller.prototype.closeWatchers = function (projectName) {
|
|
123937
123937
|
if (this.log.isEnabled()) {
|
|
123938
|
-
this.log.writeLine("Closing file watchers for project '"
|
|
123938
|
+
this.log.writeLine("Closing file watchers for project '".concat(projectName, "'"));
|
|
123939
123939
|
}
|
|
123940
123940
|
var watchers = this.projectWatchers.get(projectName);
|
|
123941
123941
|
if (!watchers) {
|
|
123942
123942
|
if (this.log.isEnabled()) {
|
|
123943
|
-
this.log.writeLine("No watchers are registered for project '"
|
|
123943
|
+
this.log.writeLine("No watchers are registered for project '".concat(projectName, "'"));
|
|
123944
123944
|
}
|
|
123945
123945
|
return;
|
|
123946
123946
|
}
|
|
123947
123947
|
ts.clearMap(watchers, ts.closeFileWatcher);
|
|
123948
123948
|
this.projectWatchers.delete(projectName);
|
|
123949
123949
|
if (this.log.isEnabled()) {
|
|
123950
|
-
this.log.writeLine("Closing file watchers for project '"
|
|
123950
|
+
this.log.writeLine("Closing file watchers for project '".concat(projectName, "' - done."));
|
|
123951
123951
|
}
|
|
123952
123952
|
};
|
|
123953
123953
|
TypingsInstaller.prototype.install = function (req) {
|
|
123954
123954
|
var _this = this;
|
|
123955
123955
|
if (this.log.isEnabled()) {
|
|
123956
|
-
this.log.writeLine("Got install request "
|
|
123956
|
+
this.log.writeLine("Got install request ".concat(JSON.stringify(req)));
|
|
123957
123957
|
}
|
|
123958
123958
|
// load existing typing information from the cache
|
|
123959
123959
|
if (req.cachePath) {
|
|
123960
123960
|
if (this.log.isEnabled()) {
|
|
123961
|
-
this.log.writeLine("Request specifies cache path '"
|
|
123961
|
+
this.log.writeLine("Request specifies cache path '".concat(req.cachePath, "', loading cached information..."));
|
|
123962
123962
|
}
|
|
123963
123963
|
this.processCacheLocation(req.cachePath);
|
|
123964
123964
|
}
|
|
@@ -123967,7 +123967,7 @@ var ts;
|
|
|
123967
123967
|
}
|
|
123968
123968
|
var discoverTypingsResult = ts.JsTyping.discoverTypings(this.installTypingHost, this.log.isEnabled() ? (function (s) { return _this.log.writeLine(s); }) : undefined, req.fileNames, req.projectRootPath, this.safeList, this.packageNameToTypingLocation, req.typeAcquisition, req.unresolvedImports, this.typesRegistry);
|
|
123969
123969
|
if (this.log.isEnabled()) {
|
|
123970
|
-
this.log.writeLine("Finished typings discovery: "
|
|
123970
|
+
this.log.writeLine("Finished typings discovery: ".concat(JSON.stringify(discoverTypingsResult)));
|
|
123971
123971
|
}
|
|
123972
123972
|
// start watching files
|
|
123973
123973
|
this.watchFiles(req.projectName, discoverTypingsResult.filesToWatch, req.projectRootPath, req.watchOptions);
|
|
@@ -123987,17 +123987,17 @@ var ts;
|
|
|
123987
123987
|
if (this.typesMapLocation) {
|
|
123988
123988
|
var safeListFromMap = ts.JsTyping.loadTypesMap(this.installTypingHost, this.typesMapLocation);
|
|
123989
123989
|
if (safeListFromMap) {
|
|
123990
|
-
this.log.writeLine("Loaded safelist from types map file '"
|
|
123990
|
+
this.log.writeLine("Loaded safelist from types map file '".concat(this.typesMapLocation, "'"));
|
|
123991
123991
|
this.safeList = safeListFromMap;
|
|
123992
123992
|
return;
|
|
123993
123993
|
}
|
|
123994
|
-
this.log.writeLine("Failed to load safelist from types map file '"
|
|
123994
|
+
this.log.writeLine("Failed to load safelist from types map file '".concat(this.typesMapLocation, "'"));
|
|
123995
123995
|
}
|
|
123996
123996
|
this.safeList = ts.JsTyping.loadSafeList(this.installTypingHost, this.safeListPath);
|
|
123997
123997
|
};
|
|
123998
123998
|
TypingsInstaller.prototype.processCacheLocation = function (cacheLocation) {
|
|
123999
123999
|
if (this.log.isEnabled()) {
|
|
124000
|
-
this.log.writeLine("Processing cache location '"
|
|
124000
|
+
this.log.writeLine("Processing cache location '".concat(cacheLocation, "'"));
|
|
124001
124001
|
}
|
|
124002
124002
|
if (this.knownCachesSet.has(cacheLocation)) {
|
|
124003
124003
|
if (this.log.isEnabled()) {
|
|
@@ -124008,14 +124008,14 @@ var ts;
|
|
|
124008
124008
|
var packageJson = ts.combinePaths(cacheLocation, "package.json");
|
|
124009
124009
|
var packageLockJson = ts.combinePaths(cacheLocation, "package-lock.json");
|
|
124010
124010
|
if (this.log.isEnabled()) {
|
|
124011
|
-
this.log.writeLine("Trying to find '"
|
|
124011
|
+
this.log.writeLine("Trying to find '".concat(packageJson, "'..."));
|
|
124012
124012
|
}
|
|
124013
124013
|
if (this.installTypingHost.fileExists(packageJson) && this.installTypingHost.fileExists(packageLockJson)) {
|
|
124014
124014
|
var npmConfig = JSON.parse(this.installTypingHost.readFile(packageJson)); // TODO: GH#18217
|
|
124015
124015
|
var npmLock = JSON.parse(this.installTypingHost.readFile(packageLockJson)); // TODO: GH#18217
|
|
124016
124016
|
if (this.log.isEnabled()) {
|
|
124017
|
-
this.log.writeLine("Loaded content of '"
|
|
124018
|
-
this.log.writeLine("Loaded content of '"
|
|
124017
|
+
this.log.writeLine("Loaded content of '".concat(packageJson, "': ").concat(JSON.stringify(npmConfig)));
|
|
124018
|
+
this.log.writeLine("Loaded content of '".concat(packageLockJson, "'"));
|
|
124019
124019
|
}
|
|
124020
124020
|
if (npmConfig.devDependencies && npmLock.dependencies) {
|
|
124021
124021
|
for (var key in npmConfig.devDependencies) {
|
|
@@ -124039,11 +124039,11 @@ var ts;
|
|
|
124039
124039
|
continue;
|
|
124040
124040
|
}
|
|
124041
124041
|
if (this.log.isEnabled()) {
|
|
124042
|
-
this.log.writeLine("New typing for package "
|
|
124042
|
+
this.log.writeLine("New typing for package ".concat(packageName, " from '").concat(typingFile, "' conflicts with existing typing file '").concat(existingTypingFile, "'"));
|
|
124043
124043
|
}
|
|
124044
124044
|
}
|
|
124045
124045
|
if (this.log.isEnabled()) {
|
|
124046
|
-
this.log.writeLine("Adding entry into typings cache: '"
|
|
124046
|
+
this.log.writeLine("Adding entry into typings cache: '".concat(packageName, "' => '").concat(typingFile, "'"));
|
|
124047
124047
|
}
|
|
124048
124048
|
var info = ts.getProperty(npmLock.dependencies, key);
|
|
124049
124049
|
var version_1 = info && info.version;
|
|
@@ -124056,7 +124056,7 @@ var ts;
|
|
|
124056
124056
|
}
|
|
124057
124057
|
}
|
|
124058
124058
|
if (this.log.isEnabled()) {
|
|
124059
|
-
this.log.writeLine("Finished processing cache location '"
|
|
124059
|
+
this.log.writeLine("Finished processing cache location '".concat(cacheLocation, "'"));
|
|
124060
124060
|
}
|
|
124061
124061
|
this.knownCachesSet.add(cacheLocation);
|
|
124062
124062
|
};
|
|
@@ -124066,7 +124066,7 @@ var ts;
|
|
|
124066
124066
|
var typingKey = ts.mangleScopedPackageName(typing);
|
|
124067
124067
|
if (_this.missingTypingsSet.has(typingKey)) {
|
|
124068
124068
|
if (_this.log.isEnabled())
|
|
124069
|
-
_this.log.writeLine("'"
|
|
124069
|
+
_this.log.writeLine("'".concat(typing, "':: '").concat(typingKey, "' is in missingTypingsSet - skipping..."));
|
|
124070
124070
|
return undefined;
|
|
124071
124071
|
}
|
|
124072
124072
|
var validationResult = ts.JsTyping.validatePackageName(typing);
|
|
@@ -124079,12 +124079,12 @@ var ts;
|
|
|
124079
124079
|
}
|
|
124080
124080
|
if (!_this.typesRegistry.has(typingKey)) {
|
|
124081
124081
|
if (_this.log.isEnabled())
|
|
124082
|
-
_this.log.writeLine("'"
|
|
124082
|
+
_this.log.writeLine("'".concat(typing, "':: Entry for package '").concat(typingKey, "' does not exist in local types registry - skipping..."));
|
|
124083
124083
|
return undefined;
|
|
124084
124084
|
}
|
|
124085
124085
|
if (_this.packageNameToTypingLocation.get(typingKey) && ts.JsTyping.isTypingUpToDate(_this.packageNameToTypingLocation.get(typingKey), _this.typesRegistry.get(typingKey))) {
|
|
124086
124086
|
if (_this.log.isEnabled())
|
|
124087
|
-
_this.log.writeLine("'"
|
|
124087
|
+
_this.log.writeLine("'".concat(typing, "':: '").concat(typingKey, "' already has an up-to-date typing - skipping..."));
|
|
124088
124088
|
return undefined;
|
|
124089
124089
|
}
|
|
124090
124090
|
return typingKey;
|
|
@@ -124093,11 +124093,11 @@ var ts;
|
|
|
124093
124093
|
TypingsInstaller.prototype.ensurePackageDirectoryExists = function (directory) {
|
|
124094
124094
|
var npmConfigPath = ts.combinePaths(directory, "package.json");
|
|
124095
124095
|
if (this.log.isEnabled()) {
|
|
124096
|
-
this.log.writeLine("Npm config file: "
|
|
124096
|
+
this.log.writeLine("Npm config file: ".concat(npmConfigPath));
|
|
124097
124097
|
}
|
|
124098
124098
|
if (!this.installTypingHost.fileExists(npmConfigPath)) {
|
|
124099
124099
|
if (this.log.isEnabled()) {
|
|
124100
|
-
this.log.writeLine("Npm config file: '"
|
|
124100
|
+
this.log.writeLine("Npm config file: '".concat(npmConfigPath, "' is missing, creating new one..."));
|
|
124101
124101
|
}
|
|
124102
124102
|
this.ensureDirectoryExists(directory, this.installTypingHost);
|
|
124103
124103
|
this.installTypingHost.writeFile(npmConfigPath, '{ "private": true }');
|
|
@@ -124106,7 +124106,7 @@ var ts;
|
|
|
124106
124106
|
TypingsInstaller.prototype.installTypings = function (req, cachePath, currentlyCachedTypings, typingsToInstall) {
|
|
124107
124107
|
var _this = this;
|
|
124108
124108
|
if (this.log.isEnabled()) {
|
|
124109
|
-
this.log.writeLine("Installing typings "
|
|
124109
|
+
this.log.writeLine("Installing typings ".concat(JSON.stringify(typingsToInstall)));
|
|
124110
124110
|
}
|
|
124111
124111
|
var filteredTypings = this.filterTypings(typingsToInstall);
|
|
124112
124112
|
if (filteredTypings.length === 0) {
|
|
@@ -124133,7 +124133,7 @@ var ts;
|
|
|
124133
124133
|
try {
|
|
124134
124134
|
if (!ok) {
|
|
124135
124135
|
if (_this.log.isEnabled()) {
|
|
124136
|
-
_this.log.writeLine("install request failed, marking packages as missing to prevent repeated requests: "
|
|
124136
|
+
_this.log.writeLine("install request failed, marking packages as missing to prevent repeated requests: ".concat(JSON.stringify(filteredTypings)));
|
|
124137
124137
|
}
|
|
124138
124138
|
for (var _i = 0, filteredTypings_1 = filteredTypings; _i < filteredTypings_1.length; _i++) {
|
|
124139
124139
|
var typing = filteredTypings_1[_i];
|
|
@@ -124143,7 +124143,7 @@ var ts;
|
|
|
124143
124143
|
}
|
|
124144
124144
|
// TODO: watch project directory
|
|
124145
124145
|
if (_this.log.isEnabled()) {
|
|
124146
|
-
_this.log.writeLine("Installed typings "
|
|
124146
|
+
_this.log.writeLine("Installed typings ".concat(JSON.stringify(scopedTypings)));
|
|
124147
124147
|
}
|
|
124148
124148
|
var installedTypingFiles = [];
|
|
124149
124149
|
for (var _a = 0, filteredTypings_2 = filteredTypings; _a < filteredTypings_2.length; _a++) {
|
|
@@ -124155,13 +124155,13 @@ var ts;
|
|
|
124155
124155
|
}
|
|
124156
124156
|
// packageName is guaranteed to exist in typesRegistry by filterTypings
|
|
124157
124157
|
var distTags = _this.typesRegistry.get(packageName);
|
|
124158
|
-
var newVersion = new ts.Version(distTags["ts"
|
|
124158
|
+
var newVersion = new ts.Version(distTags["ts".concat(ts.versionMajorMinor)] || distTags[_this.latestDistTag]);
|
|
124159
124159
|
var newTyping = { typingLocation: typingFile, version: newVersion };
|
|
124160
124160
|
_this.packageNameToTypingLocation.set(packageName, newTyping);
|
|
124161
124161
|
installedTypingFiles.push(typingFile);
|
|
124162
124162
|
}
|
|
124163
124163
|
if (_this.log.isEnabled()) {
|
|
124164
|
-
_this.log.writeLine("Installed typing files "
|
|
124164
|
+
_this.log.writeLine("Installed typing files ".concat(JSON.stringify(installedTypingFiles)));
|
|
124165
124165
|
}
|
|
124166
124166
|
_this.sendResponse(_this.createSetTypings(req, currentlyCachedTypings.concat(installedTypingFiles)));
|
|
124167
124167
|
}
|
|
@@ -124215,7 +124215,7 @@ var ts;
|
|
|
124215
124215
|
return;
|
|
124216
124216
|
}
|
|
124217
124217
|
if (isLoggingEnabled) {
|
|
124218
|
-
_this.log.writeLine(projectWatcherType
|
|
124218
|
+
_this.log.writeLine("".concat(projectWatcherType, ":: Added:: WatchInfo: ").concat(path));
|
|
124219
124219
|
}
|
|
124220
124220
|
var watcher = projectWatcherType === "FileWatcher" /* FileWatcher */ ?
|
|
124221
124221
|
_this.watchFactory.watchFile(path, function () {
|
|
@@ -124236,7 +124236,7 @@ var ts;
|
|
|
124236
124236
|
}, 1 /* Recursive */, options, projectName, watchers);
|
|
124237
124237
|
watchers.set(canonicalPath, isLoggingEnabled ? {
|
|
124238
124238
|
close: function () {
|
|
124239
|
-
_this.log.writeLine(projectWatcherType
|
|
124239
|
+
_this.log.writeLine("".concat(projectWatcherType, ":: Closed:: WatchInfo: ").concat(path));
|
|
124240
124240
|
watcher.close();
|
|
124241
124241
|
}
|
|
124242
124242
|
} : watcher);
|
|
@@ -124311,7 +124311,7 @@ var ts;
|
|
|
124311
124311
|
typingsInstaller.TypingsInstaller = TypingsInstaller;
|
|
124312
124312
|
/* @internal */
|
|
124313
124313
|
function typingsName(packageName) {
|
|
124314
|
-
return "@types/"
|
|
124314
|
+
return "@types/".concat(packageName, "@ts").concat(ts.versionMajorMinor);
|
|
124315
124315
|
}
|
|
124316
124316
|
typingsInstaller.typingsName = typingsName;
|
|
124317
124317
|
})(typingsInstaller = server.typingsInstaller || (server.typingsInstaller = {}));
|
|
@@ -124336,7 +124336,7 @@ var ts;
|
|
|
124336
124336
|
if (typeof _this.logFile !== "string")
|
|
124337
124337
|
return;
|
|
124338
124338
|
try {
|
|
124339
|
-
fs.appendFileSync(_this.logFile, "["
|
|
124339
|
+
fs.appendFileSync(_this.logFile, "[".concat(server.nowString(), "] ").concat(text).concat(ts.sys.newLine));
|
|
124340
124340
|
}
|
|
124341
124341
|
catch (e) {
|
|
124342
124342
|
_this.logFile = undefined;
|
|
@@ -124352,7 +124352,7 @@ var ts;
|
|
|
124352
124352
|
return npmPath;
|
|
124353
124353
|
}
|
|
124354
124354
|
if (host.fileExists(npmPath)) {
|
|
124355
|
-
return "\""
|
|
124355
|
+
return "\"".concat(npmPath, "\"");
|
|
124356
124356
|
}
|
|
124357
124357
|
}
|
|
124358
124358
|
return "npm";
|
|
@@ -124360,7 +124360,7 @@ var ts;
|
|
|
124360
124360
|
function loadTypesRegistryFile(typesRegistryFilePath, host, log) {
|
|
124361
124361
|
if (!host.fileExists(typesRegistryFilePath)) {
|
|
124362
124362
|
if (log.isEnabled()) {
|
|
124363
|
-
log.writeLine("Types registry file '"
|
|
124363
|
+
log.writeLine("Types registry file '".concat(typesRegistryFilePath, "' does not exist"));
|
|
124364
124364
|
}
|
|
124365
124365
|
return new ts.Map();
|
|
124366
124366
|
}
|
|
@@ -124370,14 +124370,14 @@ var ts;
|
|
|
124370
124370
|
}
|
|
124371
124371
|
catch (e) {
|
|
124372
124372
|
if (log.isEnabled()) {
|
|
124373
|
-
log.writeLine("Error when loading types registry file '"
|
|
124373
|
+
log.writeLine("Error when loading types registry file '".concat(typesRegistryFilePath, "': ").concat(e.message, ", ").concat(e.stack));
|
|
124374
124374
|
}
|
|
124375
124375
|
return new ts.Map();
|
|
124376
124376
|
}
|
|
124377
124377
|
}
|
|
124378
124378
|
var typesRegistryPackageName = "types-registry";
|
|
124379
124379
|
function getTypesRegistryFileLocation(globalTypingsCacheLocation) {
|
|
124380
|
-
return ts.combinePaths(ts.normalizeSlashes(globalTypingsCacheLocation), "node_modules/"
|
|
124380
|
+
return ts.combinePaths(ts.normalizeSlashes(globalTypingsCacheLocation), "node_modules/".concat(typesRegistryPackageName, "/index.json"));
|
|
124381
124381
|
}
|
|
124382
124382
|
var NodeTypingsInstaller = (function (_super) {
|
|
124383
124383
|
__extends(NodeTypingsInstaller, _super);
|
|
@@ -124385,27 +124385,27 @@ var ts;
|
|
|
124385
124385
|
var _this = _super.call(this, ts.sys, globalTypingsCacheLocation, typingSafeListLocation ? ts.toPath(typingSafeListLocation, "", ts.createGetCanonicalFileName(ts.sys.useCaseSensitiveFileNames)) : ts.toPath("typingSafeList.json", __dirname, ts.createGetCanonicalFileName(ts.sys.useCaseSensitiveFileNames)), typesMapLocation ? ts.toPath(typesMapLocation, "", ts.createGetCanonicalFileName(ts.sys.useCaseSensitiveFileNames)) : ts.toPath("typesMap.json", __dirname, ts.createGetCanonicalFileName(ts.sys.useCaseSensitiveFileNames)), throttleLimit, log) || this;
|
|
124386
124386
|
_this.npmPath = npmLocation !== undefined ? npmLocation : getDefaultNPMLocation(process.argv[0], validateDefaultNpmLocation, _this.installTypingHost);
|
|
124387
124387
|
if (ts.stringContains(_this.npmPath, " ") && _this.npmPath[0] !== "\"") {
|
|
124388
|
-
_this.npmPath = "\""
|
|
124388
|
+
_this.npmPath = "\"".concat(_this.npmPath, "\"");
|
|
124389
124389
|
}
|
|
124390
124390
|
if (_this.log.isEnabled()) {
|
|
124391
|
-
_this.log.writeLine("Process id: "
|
|
124392
|
-
_this.log.writeLine("NPM location: "
|
|
124393
|
-
_this.log.writeLine("validateDefaultNpmLocation: "
|
|
124391
|
+
_this.log.writeLine("Process id: ".concat(process.pid));
|
|
124392
|
+
_this.log.writeLine("NPM location: ".concat(_this.npmPath, " (explicit '").concat(server.Arguments.NpmLocation, "' ").concat(npmLocation === undefined ? "not " : "", " provided)"));
|
|
124393
|
+
_this.log.writeLine("validateDefaultNpmLocation: ".concat(validateDefaultNpmLocation));
|
|
124394
124394
|
}
|
|
124395
124395
|
(_this.nodeExecSync = require("child_process").execSync);
|
|
124396
124396
|
_this.ensurePackageDirectoryExists(globalTypingsCacheLocation);
|
|
124397
124397
|
try {
|
|
124398
124398
|
if (_this.log.isEnabled()) {
|
|
124399
|
-
_this.log.writeLine("Updating "
|
|
124399
|
+
_this.log.writeLine("Updating ".concat(typesRegistryPackageName, " npm package..."));
|
|
124400
124400
|
}
|
|
124401
|
-
_this.execSyncAndLog(_this.npmPath
|
|
124401
|
+
_this.execSyncAndLog("".concat(_this.npmPath, " install --ignore-scripts ").concat(typesRegistryPackageName, "@").concat(_this.latestDistTag), { cwd: globalTypingsCacheLocation });
|
|
124402
124402
|
if (_this.log.isEnabled()) {
|
|
124403
|
-
_this.log.writeLine("Updated "
|
|
124403
|
+
_this.log.writeLine("Updated ".concat(typesRegistryPackageName, " npm package"));
|
|
124404
124404
|
}
|
|
124405
124405
|
}
|
|
124406
124406
|
catch (e) {
|
|
124407
124407
|
if (_this.log.isEnabled()) {
|
|
124408
|
-
_this.log.writeLine("Error updating "
|
|
124408
|
+
_this.log.writeLine("Error updating ".concat(typesRegistryPackageName, " package: ").concat(e.message));
|
|
124409
124409
|
}
|
|
124410
124410
|
_this.delayedInitializationError = {
|
|
124411
124411
|
kind: "event::initializationFailed",
|
|
@@ -124444,7 +124444,7 @@ var ts;
|
|
|
124444
124444
|
var cwd = getDirectoryOfPackageJson(fileName, _this.installTypingHost) || projectRootPath;
|
|
124445
124445
|
if (cwd) {
|
|
124446
124446
|
_this.installWorker(-1, [packageName_1], cwd, function (success) {
|
|
124447
|
-
var message = success ? "Package "
|
|
124447
|
+
var message = success ? "Package ".concat(packageName_1, " installed.") : "There was an error installing ".concat(packageName_1, ".");
|
|
124448
124448
|
var response = { kind: server.ActionPackageInstalled, projectName: projectName_1, success: success, message: message };
|
|
124449
124449
|
_this.sendResponse(response);
|
|
124450
124450
|
});
|
|
@@ -124462,7 +124462,7 @@ var ts;
|
|
|
124462
124462
|
};
|
|
124463
124463
|
NodeTypingsInstaller.prototype.sendResponse = function (response) {
|
|
124464
124464
|
if (this.log.isEnabled()) {
|
|
124465
|
-
this.log.writeLine("Sending response:\n "
|
|
124465
|
+
this.log.writeLine("Sending response:\n ".concat(JSON.stringify(response)));
|
|
124466
124466
|
}
|
|
124467
124467
|
process.send(response);
|
|
124468
124468
|
if (this.log.isEnabled()) {
|
|
@@ -124472,29 +124472,29 @@ var ts;
|
|
|
124472
124472
|
NodeTypingsInstaller.prototype.installWorker = function (requestId, packageNames, cwd, onRequestCompleted) {
|
|
124473
124473
|
var _this = this;
|
|
124474
124474
|
if (this.log.isEnabled()) {
|
|
124475
|
-
this.log.writeLine("#"
|
|
124475
|
+
this.log.writeLine("#".concat(requestId, " with arguments'").concat(JSON.stringify(packageNames), "'."));
|
|
124476
124476
|
}
|
|
124477
124477
|
var start = Date.now();
|
|
124478
124478
|
var hasError = typingsInstaller.installNpmPackages(this.npmPath, ts.version, packageNames, function (command) { return _this.execSyncAndLog(command, { cwd: cwd }); });
|
|
124479
124479
|
if (this.log.isEnabled()) {
|
|
124480
|
-
this.log.writeLine("npm install #"
|
|
124480
|
+
this.log.writeLine("npm install #".concat(requestId, " took: ").concat(Date.now() - start, " ms"));
|
|
124481
124481
|
}
|
|
124482
124482
|
onRequestCompleted(!hasError);
|
|
124483
124483
|
};
|
|
124484
124484
|
NodeTypingsInstaller.prototype.execSyncAndLog = function (command, options) {
|
|
124485
124485
|
if (this.log.isEnabled()) {
|
|
124486
|
-
this.log.writeLine("Exec: "
|
|
124486
|
+
this.log.writeLine("Exec: ".concat(command));
|
|
124487
124487
|
}
|
|
124488
124488
|
try {
|
|
124489
124489
|
var stdout = this.nodeExecSync(command, __assign(__assign({}, options), { encoding: "utf-8" }));
|
|
124490
124490
|
if (this.log.isEnabled()) {
|
|
124491
|
-
this.log.writeLine(" Succeeded. stdout:"
|
|
124491
|
+
this.log.writeLine(" Succeeded. stdout:".concat(indent(ts.sys.newLine, stdout)));
|
|
124492
124492
|
}
|
|
124493
124493
|
return false;
|
|
124494
124494
|
}
|
|
124495
124495
|
catch (error) {
|
|
124496
124496
|
var stdout = error.stdout, stderr = error.stderr;
|
|
124497
|
-
this.log.writeLine(" Failed. stdout:"
|
|
124497
|
+
this.log.writeLine(" Failed. stdout:".concat(indent(ts.sys.newLine, stdout)).concat(ts.sys.newLine, " stderr:").concat(indent(ts.sys.newLine, stderr)));
|
|
124498
124498
|
return true;
|
|
124499
124499
|
}
|
|
124500
124500
|
};
|
|
@@ -124517,7 +124517,7 @@ var ts;
|
|
|
124517
124517
|
var log = new FileLog(logFilePath);
|
|
124518
124518
|
if (log.isEnabled()) {
|
|
124519
124519
|
process.on("uncaughtException", function (e) {
|
|
124520
|
-
log.writeLine("Unhandled exception: "
|
|
124520
|
+
log.writeLine("Unhandled exception: ".concat(e, " at ").concat(e.stack));
|
|
124521
124521
|
});
|
|
124522
124522
|
}
|
|
124523
124523
|
process.on("disconnect", function () {
|
|
@@ -124530,7 +124530,7 @@ var ts;
|
|
|
124530
124530
|
installer.listen();
|
|
124531
124531
|
function indent(newline, str) {
|
|
124532
124532
|
return str && str.length
|
|
124533
|
-
? newline
|
|
124533
|
+
? "".concat(newline, " ") + str.replace(/\r?\n/, "".concat(newline, " "))
|
|
124534
124534
|
: "";
|
|
124535
124535
|
}
|
|
124536
124536
|
})(typingsInstaller = server.typingsInstaller || (server.typingsInstaller = {}));
|