typescript 4.5.1-rc → 4.5.2

package/lib/typescript.js

@@ -294,7 +294,7 @@ var ts;
     // The following is baselined as a literal template type without intervention
     /** The version of the TypeScript compiler release */
     // eslint-disable-next-line @typescript-eslint/no-inferrable-types
-    ts.version = ts.versionMajorMinor + ".1-rc";
+    ts.version = "4.5.2";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -335,7 +335,7 @@ var ts;
         var constructor = (_a = NativeCollections[nativeFactory]()) !== null && _a !== void 0 ? _a : ts.ShimCollections === null || ts.ShimCollections === void 0 ? void 0 : ts.ShimCollections[shimFactory](ts.getIterator);
         if (constructor)
             return constructor;
-        throw new Error("TypeScript requires an environment that provides a compatible native " + name + " implementation.");
+        throw new Error("TypeScript requires an environment that provides a compatible native ".concat(name, " implementation."));
     }
 })(ts || (ts = {}));
 /* @internal */
@@ -1698,7 +1698,7 @@ var ts;
     function cast(value, test) {
         if (value !== undefined && test(value))
             return value;
-        return ts.Debug.fail("Invalid cast. The supplied value " + value + " did not pass the test '" + ts.Debug.getFunctionName(test) + "'.");
+        return ts.Debug.fail("Invalid cast. The supplied value ".concat(value, " did not pass the test '").concat(ts.Debug.getFunctionName(test), "'."));
     }
     ts.cast = cast;
     /** Does nothing. */
@@ -1789,7 +1789,7 @@ var ts;
     function memoizeOne(callback) {
         var map = new ts.Map();
         return function (arg) {
-            var key = typeof arg + ":" + arg;
+            var key = "".concat(typeof arg, ":").concat(arg);
             var value = map.get(key);
             if (value === undefined && !map.has(key)) {
                 value = callback(arg);
@@ -2239,7 +2239,7 @@ var ts;
     ts.createGetCanonicalFileName = createGetCanonicalFileName;
     function patternText(_a) {
         var prefix = _a.prefix, suffix = _a.suffix;
-        return prefix + "*" + suffix;
+        return "".concat(prefix, "*").concat(suffix);
     }
     ts.patternText = patternText;
     /**
@@ -2552,7 +2552,7 @@ var ts;
         }
         function fail(message, stackCrawlMark) {
             debugger;
-            var e = new Error(message ? "Debug Failure. " + message : "Debug Failure.");
+            var e = new Error(message ? "Debug Failure. ".concat(message) : "Debug Failure.");
             if (Error.captureStackTrace) {
                 Error.captureStackTrace(e, stackCrawlMark || fail);
             }
@@ -2560,12 +2560,12 @@ var ts;
         }
         Debug.fail = fail;
         function failBadSyntaxKind(node, message, stackCrawlMark) {
-            return fail((message || "Unexpected node.") + "\r\nNode " + formatSyntaxKind(node.kind) + " was unexpected.", stackCrawlMark || failBadSyntaxKind);
+            return fail("".concat(message || "Unexpected node.", "\r\nNode ").concat(formatSyntaxKind(node.kind), " was unexpected."), stackCrawlMark || failBadSyntaxKind);
         }
         Debug.failBadSyntaxKind = failBadSyntaxKind;
         function assert(expression, message, verboseDebugInfo, stackCrawlMark) {
             if (!expression) {
-                message = message ? "False expression: " + message : "False expression.";
+                message = message ? "False expression: ".concat(message) : "False expression.";
                 if (verboseDebugInfo) {
                     message += "\r\nVerbose Debug Information: " + (typeof verboseDebugInfo === "string" ? verboseDebugInfo : verboseDebugInfo());
                 }
@@ -2575,26 +2575,26 @@ var ts;
         Debug.assert = assert;
         function assertEqual(a, b, msg, msg2, stackCrawlMark) {
             if (a !== b) {
-                var message = msg ? msg2 ? msg + " " + msg2 : msg : "";
-                fail("Expected " + a + " === " + b + ". " + message, stackCrawlMark || assertEqual);
+                var message = msg ? msg2 ? "".concat(msg, " ").concat(msg2) : msg : "";
+                fail("Expected ".concat(a, " === ").concat(b, ". ").concat(message), stackCrawlMark || assertEqual);
             }
         }
         Debug.assertEqual = assertEqual;
         function assertLessThan(a, b, msg, stackCrawlMark) {
             if (a >= b) {
-                fail("Expected " + a + " < " + b + ". " + (msg || ""), stackCrawlMark || assertLessThan);
+                fail("Expected ".concat(a, " < ").concat(b, ". ").concat(msg || ""), stackCrawlMark || assertLessThan);
             }
         }
         Debug.assertLessThan = assertLessThan;
         function assertLessThanOrEqual(a, b, stackCrawlMark) {
             if (a > b) {
-                fail("Expected " + a + " <= " + b, stackCrawlMark || assertLessThanOrEqual);
+                fail("Expected ".concat(a, " <= ").concat(b), stackCrawlMark || assertLessThanOrEqual);
             }
         }
         Debug.assertLessThanOrEqual = assertLessThanOrEqual;
         function assertGreaterThanOrEqual(a, b, stackCrawlMark) {
             if (a < b) {
-                fail("Expected " + a + " >= " + b, stackCrawlMark || assertGreaterThanOrEqual);
+                fail("Expected ".concat(a, " >= ").concat(b), stackCrawlMark || assertGreaterThanOrEqual);
             }
         }
         Debug.assertGreaterThanOrEqual = assertGreaterThanOrEqual;
@@ -2635,42 +2635,42 @@ var ts;
         function assertNever(member, message, stackCrawlMark) {
             if (message === void 0) { message = "Illegal value:"; }
             var detail = typeof member === "object" && ts.hasProperty(member, "kind") && ts.hasProperty(member, "pos") && formatSyntaxKind ? "SyntaxKind: " + formatSyntaxKind(member.kind) : JSON.stringify(member);
-            return fail(message + " " + detail, stackCrawlMark || assertNever);
+            return fail("".concat(message, " ").concat(detail), stackCrawlMark || assertNever);
         }
         Debug.assertNever = assertNever;
         function assertEachNode(nodes, test, message, stackCrawlMark) {
             if (shouldAssertFunction(1 /* Normal */, "assertEachNode")) {
-                assert(test === undefined || ts.every(nodes, test), message || "Unexpected node.", function () { return "Node array did not pass test '" + getFunctionName(test) + "'."; }, stackCrawlMark || assertEachNode);
+                assert(test === undefined || ts.every(nodes, test), message || "Unexpected node.", function () { return "Node array did not pass test '".concat(getFunctionName(test), "'."); }, stackCrawlMark || assertEachNode);
             }
         }
         Debug.assertEachNode = assertEachNode;
         function assertNode(node, test, message, stackCrawlMark) {
             if (shouldAssertFunction(1 /* Normal */, "assertNode")) {
-                assert(node !== undefined && (test === undefined || test(node)), message || "Unexpected node.", function () { return "Node " + formatSyntaxKind(node === null || node === void 0 ? void 0 : node.kind) + " did not pass test '" + getFunctionName(test) + "'."; }, stackCrawlMark || assertNode);
+                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);
             }
         }
         Debug.assertNode = assertNode;
         function assertNotNode(node, test, message, stackCrawlMark) {
             if (shouldAssertFunction(1 /* Normal */, "assertNotNode")) {
-                assert(node === undefined || test === undefined || !test(node), message || "Unexpected node.", function () { return "Node " + formatSyntaxKind(node.kind) + " should not have passed test '" + getFunctionName(test) + "'."; }, stackCrawlMark || assertNotNode);
+                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);
             }
         }
         Debug.assertNotNode = assertNotNode;
         function assertOptionalNode(node, test, message, stackCrawlMark) {
             if (shouldAssertFunction(1 /* Normal */, "assertOptionalNode")) {
-                assert(test === undefined || node === undefined || test(node), message || "Unexpected node.", function () { return "Node " + formatSyntaxKind(node === null || node === void 0 ? void 0 : node.kind) + " did not pass test '" + getFunctionName(test) + "'."; }, stackCrawlMark || assertOptionalNode);
+                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);
             }
         }
         Debug.assertOptionalNode = assertOptionalNode;
         function assertOptionalToken(node, kind, message, stackCrawlMark) {
             if (shouldAssertFunction(1 /* Normal */, "assertOptionalToken")) {
-                assert(kind === undefined || node === undefined || node.kind === kind, message || "Unexpected node.", function () { return "Node " + formatSyntaxKind(node === null || node === void 0 ? void 0 : node.kind) + " was not a '" + formatSyntaxKind(kind) + "' token."; }, stackCrawlMark || assertOptionalToken);
+                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);
             }
         }
         Debug.assertOptionalToken = assertOptionalToken;
         function assertMissingNode(node, message, stackCrawlMark) {
             if (shouldAssertFunction(1 /* Normal */, "assertMissingNode")) {
-                assert(node === undefined, message || "Unexpected node.", function () { return "Node " + formatSyntaxKind(node.kind) + " was unexpected'."; }, stackCrawlMark || assertMissingNode);
+                assert(node === undefined, message || "Unexpected node.", function () { return "Node ".concat(formatSyntaxKind(node.kind), " was unexpected'."); }, stackCrawlMark || assertMissingNode);
             }
         }
         Debug.assertMissingNode = assertMissingNode;
@@ -2691,7 +2691,7 @@ var ts;
         }
         Debug.getFunctionName = getFunctionName;
         function formatSymbol(symbol) {
-            return "{ name: " + ts.unescapeLeadingUnderscores(symbol.escapedName) + "; flags: " + formatSymbolFlags(symbol.flags) + "; declarations: " + ts.map(symbol.declarations, function (node) { return formatSyntaxKind(node.kind); }) + " }";
+            return "{ name: ".concat(ts.unescapeLeadingUnderscores(symbol.escapedName), "; flags: ").concat(formatSymbolFlags(symbol.flags), "; declarations: ").concat(ts.map(symbol.declarations, function (node) { return formatSyntaxKind(node.kind); }), " }");
         }
         Debug.formatSymbol = formatSymbol;
         /**
@@ -2712,7 +2712,7 @@ var ts;
                         break;
                     }
                     if (enumValue !== 0 && enumValue & value) {
-                        result = "" + result + (result ? "|" : "") + enumName;
+                        result = "".concat(result).concat(result ? "|" : "").concat(enumName);
                         remainingFlags &= ~enumValue;
                     }
                 }
@@ -2822,7 +2822,7 @@ var ts;
                                                                     this.flags & 1 /* Unreachable */ ? "FlowUnreachable" :
                                                                         "UnknownFlow";
                             var remainingFlags = this.flags & ~(2048 /* Referenced */ - 1);
-                            return "" + flowHeader + (remainingFlags ? " (" + formatFlowFlags(remainingFlags) + ")" : "");
+                            return "".concat(flowHeader).concat(remainingFlags ? " (".concat(formatFlowFlags(remainingFlags), ")") : "");
                         }
                     },
                     __debugFlowFlags: { get: function () { return formatEnum(this.flags, ts.FlowFlags, /*isFlags*/ true); } },
@@ -2861,7 +2861,7 @@ var ts;
                             // We don't care, this is debug code that's only enabled with a debugger attached -
                             // we're just taking note of it for anyone checking regex performance in the future.
                             defaultValue = String(defaultValue).replace(/(?:,[\s\w\d_]+:[^,]+)+\]$/, "]");
-                            return "NodeArray " + defaultValue;
+                            return "NodeArray ".concat(defaultValue);
                         }
                     }
                 });
@@ -2916,7 +2916,7 @@ var ts;
                         var symbolHeader = this.flags & 33554432 /* Transient */ ? "TransientSymbol" :
                             "Symbol";
                         var remainingSymbolFlags = this.flags & ~33554432 /* Transient */;
-                        return symbolHeader + " '" + ts.symbolName(this) + "'" + (remainingSymbolFlags ? " (" + formatSymbolFlags(remainingSymbolFlags) + ")" : "");
+                        return "".concat(symbolHeader, " '").concat(ts.symbolName(this), "'").concat(remainingSymbolFlags ? " (".concat(formatSymbolFlags(remainingSymbolFlags), ")") : "");
                     }
                 },
                 __debugFlags: { get: function () { return formatSymbolFlags(this.flags); } }
@@ -2926,11 +2926,11 @@ var ts;
                 __tsDebuggerDisplay: {
                     value: function () {
                         var typeHeader = this.flags & 98304 /* Nullable */ ? "NullableType" :
-                            this.flags & 384 /* StringOrNumberLiteral */ ? "LiteralType " + JSON.stringify(this.value) :
-                                this.flags & 2048 /* BigIntLiteral */ ? "LiteralType " + (this.value.negative ? "-" : "") + this.value.base10Value + "n" :
+                            this.flags & 384 /* StringOrNumberLiteral */ ? "LiteralType ".concat(JSON.stringify(this.value)) :
+                                this.flags & 2048 /* BigIntLiteral */ ? "LiteralType ".concat(this.value.negative ? "-" : "").concat(this.value.base10Value, "n") :
                                     this.flags & 8192 /* UniqueESSymbol */ ? "UniqueESSymbolType" :
                                         this.flags & 32 /* Enum */ ? "EnumType" :
-                                            this.flags & 67359327 /* Intrinsic */ ? "IntrinsicType " + this.intrinsicName :
+                                            this.flags & 67359327 /* Intrinsic */ ? "IntrinsicType ".concat(this.intrinsicName) :
                                                 this.flags & 1048576 /* Union */ ? "UnionType" :
                                                     this.flags & 2097152 /* Intersection */ ? "IntersectionType" :
                                                         this.flags & 4194304 /* Index */ ? "IndexType" :
@@ -2949,7 +2949,7 @@ var ts;
                                                                                                             "ObjectType" :
                                                                                 "Type";
                         var remainingObjectFlags = this.flags & 524288 /* Object */ ? this.objectFlags & ~1343 /* ObjectTypeKindMask */ : 0;
-                        return "" + typeHeader + (this.symbol ? " '" + ts.symbolName(this.symbol) + "'" : "") + (remainingObjectFlags ? " (" + formatObjectFlags(remainingObjectFlags) + ")" : "");
+                        return "".concat(typeHeader).concat(this.symbol ? " '".concat(ts.symbolName(this.symbol), "'") : "").concat(remainingObjectFlags ? " (".concat(formatObjectFlags(remainingObjectFlags), ")") : "");
                     }
                 },
                 __debugFlags: { get: function () { return formatTypeFlags(this.flags); } },
@@ -2985,11 +2985,11 @@ var ts;
                         __tsDebuggerDisplay: {
                             value: function () {
                                 var nodeHeader = ts.isGeneratedIdentifier(this) ? "GeneratedIdentifier" :
-                                    ts.isIdentifier(this) ? "Identifier '" + ts.idText(this) + "'" :
-                                        ts.isPrivateIdentifier(this) ? "PrivateIdentifier '" + ts.idText(this) + "'" :
-                                            ts.isStringLiteral(this) ? "StringLiteral " + JSON.stringify(this.text.length < 10 ? this.text : this.text.slice(10) + "...") :
-                                                ts.isNumericLiteral(this) ? "NumericLiteral " + this.text :
-                                                    ts.isBigIntLiteral(this) ? "BigIntLiteral " + this.text + "n" :
+                                    ts.isIdentifier(this) ? "Identifier '".concat(ts.idText(this), "'") :
+                                        ts.isPrivateIdentifier(this) ? "PrivateIdentifier '".concat(ts.idText(this), "'") :
+                                            ts.isStringLiteral(this) ? "StringLiteral ".concat(JSON.stringify(this.text.length < 10 ? this.text : this.text.slice(10) + "...")) :
+                                                ts.isNumericLiteral(this) ? "NumericLiteral ".concat(this.text) :
+                                                    ts.isBigIntLiteral(this) ? "BigIntLiteral ".concat(this.text, "n") :
                                                         ts.isTypeParameterDeclaration(this) ? "TypeParameterDeclaration" :
                                                             ts.isParameter(this) ? "ParameterDeclaration" :
                                                                 ts.isConstructorDeclaration(this) ? "ConstructorDeclaration" :
@@ -3021,7 +3021,7 @@ var ts;
                                                                                                                                                                         ts.isNamedTupleMember(this) ? "NamedTupleMember" :
                                                                                                                                                                             ts.isImportTypeNode(this) ? "ImportTypeNode" :
                                                                                                                                                                                 formatSyntaxKind(this.kind);
-                                return "" + nodeHeader + (this.flags ? " (" + formatNodeFlags(this.flags) + ")" : "");
+                                return "".concat(nodeHeader).concat(this.flags ? " (".concat(formatNodeFlags(this.flags), ")") : "");
                             }
                         },
                         __debugKind: { get: function () { return formatSyntaxKind(this.kind); } },
@@ -3068,10 +3068,10 @@ var ts;
         Debug.enableDebugInfo = enableDebugInfo;
         function formatDeprecationMessage(name, error, errorAfter, since, message) {
             var deprecationMessage = error ? "DeprecationError: " : "DeprecationWarning: ";
-            deprecationMessage += "'" + name + "' ";
-            deprecationMessage += since ? "has been deprecated since v" + since : "is deprecated";
-            deprecationMessage += error ? " and can no longer be used." : errorAfter ? " and will no longer be usable after v" + errorAfter + "." : ".";
-            deprecationMessage += message ? " " + ts.formatStringFromArgs(message, [name], 0) : "";
+            deprecationMessage += "'".concat(name, "' ");
+            deprecationMessage += since ? "has been deprecated since v".concat(since) : "is deprecated";
+            deprecationMessage += error ? " and can no longer be used." : errorAfter ? " and will no longer be usable after v".concat(errorAfter, ".") : ".";
+            deprecationMessage += message ? " ".concat(ts.formatStringFromArgs(message, [name], 0)) : "";
             return deprecationMessage;
         }
         function createErrorDeprecation(name, errorAfter, since, message) {
@@ -3202,11 +3202,11 @@ var ts;
             }
         };
         Version.prototype.toString = function () {
-            var result = this.major + "." + this.minor + "." + this.patch;
+            var result = "".concat(this.major, ".").concat(this.minor, ".").concat(this.patch);
             if (ts.some(this.prerelease))
-                result += "-" + this.prerelease.join(".");
+                result += "-".concat(this.prerelease.join("."));
             if (ts.some(this.build))
-                result += "+" + this.build.join(".");
+                result += "+".concat(this.build.join("."));
             return result;
         };
         Version.zero = new Version(0, 0, 0);
@@ -3473,7 +3473,7 @@ var ts;
         return ts.map(comparators, formatComparator).join(" ");
     }
     function formatComparator(comparator) {
-        return "" + comparator.operator + comparator.operand;
+        return "".concat(comparator.operator).concat(comparator.operand);
     }
 })(ts || (ts = {}));
 /*@internal*/
@@ -3771,7 +3771,7 @@ var ts;
                     fs = require("fs");
                 }
                 catch (e) {
-                    throw new Error("tracing requires having fs\n(original error: " + (e.message || e) + ")");
+                    throw new Error("tracing requires having fs\n(original error: ".concat(e.message || e, ")"));
                 }
             }
             mode = tracingMode;
@@ -3783,11 +3783,11 @@ var ts;
             if (!fs.existsSync(traceDir)) {
                 fs.mkdirSync(traceDir, { recursive: true });
             }
-            var countPart = mode === "build" ? "." + process.pid + "-" + ++traceCount
-                : mode === "server" ? "." + process.pid
+            var countPart = mode === "build" ? ".".concat(process.pid, "-").concat(++traceCount)
+                : mode === "server" ? ".".concat(process.pid)
                     : "";
-            var tracePath = ts.combinePaths(traceDir, "trace" + countPart + ".json");
-            var typesPath = ts.combinePaths(traceDir, "types" + countPart + ".json");
+            var tracePath = ts.combinePaths(traceDir, "trace".concat(countPart, ".json"));
+            var typesPath = ts.combinePaths(traceDir, "types".concat(countPart, ".json"));
             legend.push({
                 configFilePath: configFilePath,
                 tracePath: tracePath,
@@ -3877,7 +3877,7 @@ var ts;
             }
             // test if [time,endTime) straddles a sampling point
             else if (sampleInterval - (time % sampleInterval) <= endTime - time) {
-                writeEvent("X", phase, name, args, "\"dur\":" + (endTime - time), time);
+                writeEvent("X", phase, name, args, "\"dur\":".concat(endTime - time), time);
             }
         }
         function writeEvent(eventType, phase, name, args, extras, time) {
@@ -3886,11 +3886,11 @@ var ts;
             if (mode === "server" && phase === "checkTypes" /* CheckTypes */)
                 return;
             ts.performance.mark("beginTracing");
-            fs.writeSync(traceFd, ",\n{\"pid\":1,\"tid\":1,\"ph\":\"" + eventType + "\",\"cat\":\"" + phase + "\",\"ts\":" + time + ",\"name\":\"" + name + "\"");
+            fs.writeSync(traceFd, ",\n{\"pid\":1,\"tid\":1,\"ph\":\"".concat(eventType, "\",\"cat\":\"").concat(phase, "\",\"ts\":").concat(time, ",\"name\":\"").concat(name, "\""));
             if (extras)
-                fs.writeSync(traceFd, "," + extras);
+                fs.writeSync(traceFd, ",".concat(extras));
             if (args)
-                fs.writeSync(traceFd, ",\"args\":" + JSON.stringify(args));
+                fs.writeSync(traceFd, ",\"args\":".concat(JSON.stringify(args)));
             fs.writeSync(traceFd, "}");
             ts.performance.mark("endTracing");
             ts.performance.measure("Tracing", "beginTracing", "endTracing");
@@ -5067,8 +5067,6 @@ var ts;
         // 'Narrowable' types are types where narrowing actually narrows.
         // This *should* be every type other than null, undefined, void, and never
         TypeFlags[TypeFlags["Narrowable"] = 536624127] = "Narrowable";
-        /* @internal */
-        TypeFlags[TypeFlags["NotPrimitiveUnion"] = 468598819] = "NotPrimitiveUnion";
         // The following flags are aggregated during union and intersection type construction
         /* @internal */
         TypeFlags[TypeFlags["IncludesMask"] = 205258751] = "IncludesMask";
@@ -5081,6 +5079,10 @@ var ts;
         TypeFlags[TypeFlags["IncludesWildcard"] = 8388608] = "IncludesWildcard";
         /* @internal */
         TypeFlags[TypeFlags["IncludesEmptyObject"] = 16777216] = "IncludesEmptyObject";
+        /* @internal */
+        TypeFlags[TypeFlags["IncludesInstantiable"] = 33554432] = "IncludesInstantiable";
+        /* @internal */
+        TypeFlags[TypeFlags["NotPrimitiveUnion"] = 36323363] = "NotPrimitiveUnion";
     })(TypeFlags = ts.TypeFlags || (ts.TypeFlags = {}));
     // Types included in TypeFlags.ObjectFlagsType have an objectFlags property. Some ObjectFlags
     // are specific to certain types and reuse the same bit position. Those ObjectFlags require a check
@@ -6695,7 +6697,7 @@ var ts;
         pollingChunkSize = getCustomPollingBasedLevels("TSC_WATCH_POLLINGCHUNKSIZE", defaultChunkLevels) || pollingChunkSize;
         ts.unchangedPollThresholds = getCustomPollingBasedLevels("TSC_WATCH_UNCHANGEDPOLLTHRESHOLDS", defaultChunkLevels) || ts.unchangedPollThresholds;
         function getLevel(envVar, level) {
-            return system.getEnvironmentVariable(envVar + "_" + level.toUpperCase());
+            return system.getEnvironmentVariable("".concat(envVar, "_").concat(level.toUpperCase()));
         }
         function getCustomLevels(baseVariable) {
             var customLevels;
@@ -7160,7 +7162,7 @@ var ts;
         }
         function onTimerToUpdateChildWatches() {
             timerToUpdateChildWatches = undefined;
-            ts.sysLog("sysLog:: onTimerToUpdateChildWatches:: " + cacheToUpdateChildWatches.size);
+            ts.sysLog("sysLog:: onTimerToUpdateChildWatches:: ".concat(cacheToUpdateChildWatches.size));
             var start = ts.timestamp();
             var invokeMap = new ts.Map();
             while (!timerToUpdateChildWatches && cacheToUpdateChildWatches.size) {
@@ -7173,7 +7175,7 @@ var ts;
                 var hasChanges = updateChildWatches(dirName, dirPath, options);
                 invokeCallbacks(dirPath, invokeMap, hasChanges ? undefined : fileNames);
             }
-            ts.sysLog("sysLog:: invokingWatchers:: Elapsed:: " + (ts.timestamp() - start) + "ms:: " + cacheToUpdateChildWatches.size);
+            ts.sysLog("sysLog:: invokingWatchers:: Elapsed:: ".concat(ts.timestamp() - start, "ms:: ").concat(cacheToUpdateChildWatches.size));
             callbackCache.forEach(function (callbacks, rootDirName) {
                 var existing = invokeMap.get(rootDirName);
                 if (existing) {
@@ -7189,7 +7191,7 @@ var ts;
                 }
             });
             var elapsed = ts.timestamp() - start;
-            ts.sysLog("sysLog:: Elapsed:: " + elapsed + "ms:: onTimerToUpdateChildWatches:: " + cacheToUpdateChildWatches.size + " " + timerToUpdateChildWatches);
+            ts.sysLog("sysLog:: Elapsed:: ".concat(elapsed, "ms:: onTimerToUpdateChildWatches:: ").concat(cacheToUpdateChildWatches.size, " ").concat(timerToUpdateChildWatches));
         }
         function removeChildWatches(parentWatcher) {
             if (!parentWatcher)
@@ -7649,7 +7651,7 @@ var ts;
                 var remappedPaths = new ts.Map();
                 var normalizedDir = ts.normalizeSlashes(__dirname);
                 // Windows rooted dir names need an extra `/` prepended to be valid file:/// urls
-                var fileUrlRoot = "file://" + (ts.getRootLength(normalizedDir) === 1 ? "" : "/") + normalizedDir;
+                var fileUrlRoot = "file://".concat(ts.getRootLength(normalizedDir) === 1 ? "" : "/").concat(normalizedDir);
                 for (var _i = 0, _a = profile.nodes; _i < _a.length; _i++) {
                     var node = _a[_i];
                     if (node.callFrame.url) {
@@ -7658,7 +7660,7 @@ var ts;
                             node.callFrame.url = ts.getRelativePathToDirectoryOrUrl(fileUrlRoot, url, fileUrlRoot, ts.createGetCanonicalFileName(useCaseSensitiveFileNames), /*isAbsolutePathAnUrl*/ true);
                         }
                         else if (!nativePattern.test(url)) {
-                            node.callFrame.url = (remappedPaths.has(url) ? remappedPaths : remappedPaths.set(url, "external" + externalFileCounter + ".js")).get(url);
+                            node.callFrame.url = (remappedPaths.has(url) ? remappedPaths : remappedPaths.set(url, "external".concat(externalFileCounter, ".js"))).get(url);
                             externalFileCounter++;
                         }
                     }
@@ -7674,7 +7676,7 @@ var ts;
                         if (!err) {
                             try {
                                 if ((_b = statSync(profilePath)) === null || _b === void 0 ? void 0 : _b.isDirectory()) {
-                                    profilePath = _path.join(profilePath, (new Date()).toISOString().replace(/:/g, "-") + "+P" + process.pid + ".cpuprofile");
+                                    profilePath = _path.join(profilePath, "".concat((new Date()).toISOString().replace(/:/g, "-"), "+P").concat(process.pid, ".cpuprofile"));
                                 }
                             }
                             catch (_c) {
@@ -7776,7 +7778,7 @@ var ts;
                  * @param createWatcher
                  */
                 function invokeCallbackAndUpdateWatcher(createWatcher) {
-                    ts.sysLog("sysLog:: " + fileOrDirectory + ":: Changing watcher to " + (createWatcher === watchPresentFileSystemEntry ? "Present" : "Missing") + "FileSystemEntryWatcher");
+                    ts.sysLog("sysLog:: ".concat(fileOrDirectory, ":: Changing watcher to ").concat(createWatcher === watchPresentFileSystemEntry ? "Present" : "Missing", "FileSystemEntryWatcher"));
                     // Call the callback for current directory
                     callback("rename", "");
                     // If watcher is not closed, update it
@@ -7801,7 +7803,7 @@ var ts;
                         }
                     }
                     if (hitSystemWatcherLimit) {
-                        ts.sysLog("sysLog:: " + fileOrDirectory + ":: Defaulting to fsWatchFile");
+                        ts.sysLog("sysLog:: ".concat(fileOrDirectory, ":: Defaulting to fsWatchFile"));
                         return watchPresentFileSystemEntryWithFsWatchFile();
                     }
                     try {
@@ -7817,7 +7819,7 @@ var ts;
                         // 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
                         // so instead of throwing error, use fs.watchFile
                         hitSystemWatcherLimit || (hitSystemWatcherLimit = e.code === "ENOSPC");
-                        ts.sysLog("sysLog:: " + fileOrDirectory + ":: Changing to fsWatchFile");
+                        ts.sysLog("sysLog:: ".concat(fileOrDirectory, ":: Changing to fsWatchFile"));
                         return watchPresentFileSystemEntryWithFsWatchFile();
                     }
                 }
@@ -7955,7 +7957,7 @@ var ts;
                 }
             }
             function readDirectory(path, extensions, excludes, includes, depth) {
-                return ts.matchFiles(path, extensions, excludes, includes, useCaseSensitiveFileNames, process.cwd(), depth, getAccessibleFileSystemEntries, realpath, directoryExists);
+                return ts.matchFiles(path, extensions, excludes, includes, useCaseSensitiveFileNames, process.cwd(), depth, getAccessibleFileSystemEntries, realpath);
             }
             function fileSystemEntryExists(path, entryKind) {
                 // Since the error thrown by fs.statSync isn't used, we can avoid collecting a stack trace to improve
@@ -10119,7 +10121,7 @@ var ts;
                 line = line < 0 ? 0 : line >= lineStarts.length ? lineStarts.length - 1 : line;
             }
             else {
-                ts.Debug.fail("Bad line number. Line: " + line + ", lineStarts.length: " + lineStarts.length + " , line map is correct? " + (debugText !== undefined ? ts.arraysEqual(lineStarts, computeLineStarts(debugText)) : "unknown"));
+                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"));
             }
         }
         var res = lineStarts[line] + character;
@@ -12999,7 +13001,7 @@ var ts;
         return typeof comment === "string" ? comment
             : comment === null || comment === void 0 ? void 0 : comment.map(function (c) {
                 // TODO: Other kinds here
-                return c.kind === 319 /* JSDocText */ ? c.text : "{@link " + (c.name ? ts.entityNameToString(c.name) + " " : "") + c.text + "}";
+                return c.kind === 319 /* JSDocText */ ? c.text : "{@link ".concat(c.name ? ts.entityNameToString(c.name) + " " : "").concat(c.text, "}");
             }).join("");
     }
     ts.getTextOfJSDocComment = getTextOfJSDocComment;
@@ -14269,8 +14271,8 @@ var ts;
     }
     function packageIdToString(_a) {
         var name = _a.name, subModuleName = _a.subModuleName, version = _a.version;
-        var fullName = subModuleName ? name + "/" + subModuleName : name;
-        return fullName + "@" + version;
+        var fullName = subModuleName ? "".concat(name, "/").concat(subModuleName) : name;
+        return "".concat(fullName, "@").concat(version);
     }
     ts.packageIdToString = packageIdToString;
     function typeDirectiveIsEqualTo(oldResolution, newResolution) {
@@ -14349,7 +14351,7 @@ var ts;
     function nodePosToString(node) {
         var file = getSourceFileOfNode(node);
         var loc = ts.getLineAndCharacterOfPosition(file, node.pos);
-        return file.fileName + "(" + (loc.line + 1) + "," + (loc.character + 1) + ")";
+        return "".concat(file.fileName, "(").concat(loc.line + 1, ",").concat(loc.character + 1, ")");
     }
     ts.nodePosToString = nodePosToString;
     function getEndLinePosition(line, sourceFile) {
@@ -14488,7 +14490,7 @@ var ts;
     ts.isPinnedComment = isPinnedComment;
     function createCommentDirectivesMap(sourceFile, commentDirectives) {
         var directivesByLine = new ts.Map(commentDirectives.map(function (commentDirective) { return ([
-            "" + ts.getLineAndCharacterOfPosition(sourceFile, commentDirective.range.end).line,
+            "".concat(ts.getLineAndCharacterOfPosition(sourceFile, commentDirective.range.end).line),
             commentDirective,
         ]); }));
         var usedLines = new ts.Map();
@@ -14505,10 +14507,10 @@ var ts;
             });
         }
         function markUsed(line) {
-            if (!directivesByLine.has("" + line)) {
+            if (!directivesByLine.has("".concat(line))) {
                 return false;
             }
-            usedLines.set("" + line, true);
+            usedLines.set("".concat(line), true);
             return true;
         }
     }
@@ -14723,7 +14725,7 @@ var ts;
                 }
                 return node.text;
         }
-        return ts.Debug.fail("Literal kind '" + node.kind + "' not accounted for.");
+        return ts.Debug.fail("Literal kind '".concat(node.kind, "' not accounted for."));
     }
     ts.getLiteralText = getLiteralText;
     function canUseOriginalText(node, flags) {
@@ -17254,11 +17256,11 @@ var ts;
     }
     ts.getEscapedTextOfIdentifierOrLiteral = getEscapedTextOfIdentifierOrLiteral;
     function getPropertyNameForUniqueESSymbol(symbol) {
-        return "__@" + ts.getSymbolId(symbol) + "@" + symbol.escapedName;
+        return "__@".concat(ts.getSymbolId(symbol), "@").concat(symbol.escapedName);
     }
     ts.getPropertyNameForUniqueESSymbol = getPropertyNameForUniqueESSymbol;
     function getSymbolNameForPrivateIdentifier(containingClassSymbol, description) {
-        return "__#" + ts.getSymbolId(containingClassSymbol) + "@" + description;
+        return "__#".concat(ts.getSymbolId(containingClassSymbol), "@").concat(description);
     }
     ts.getSymbolNameForPrivateIdentifier = getSymbolNameForPrivateIdentifier;
     function isKnownSymbol(symbol) {
@@ -19951,7 +19953,7 @@ var ts;
     }
     ts.getJSXImplicitImportBase = getJSXImplicitImportBase;
     function getJSXRuntimeImport(base, options) {
-        return base ? base + "/" + (options.jsx === 5 /* ReactJSXDev */ ? "jsx-dev-runtime" : "jsx-runtime") : undefined;
+        return base ? "".concat(base, "/").concat(options.jsx === 5 /* ReactJSXDev */ ? "jsx-dev-runtime" : "jsx-runtime") : undefined;
     }
     ts.getJSXRuntimeImport = getJSXRuntimeImport;
     function hasZeroOrOneAsteriskCharacter(str) {
@@ -20068,7 +20070,7 @@ var ts;
     }
     var wildcardCharCodes = [42 /* asterisk */, 63 /* question */];
     ts.commonPackageFolders = ["node_modules", "bower_components", "jspm_packages"];
-    var implicitExcludePathRegexPattern = "(?!(" + ts.commonPackageFolders.join("|") + ")(/|$))";
+    var implicitExcludePathRegexPattern = "(?!(".concat(ts.commonPackageFolders.join("|"), ")(/|$))");
     var filesMatcher = {
         /**
          * Matches any single directory segment unless it is the last segment and a .min.js file
@@ -20081,7 +20083,7 @@ var ts;
          * Regex for the ** wildcard. Matches any number of subdirectories. When used for including
          * files or directories, does not match subdirectories that start with a . character
          */
-        doubleAsteriskRegexFragment: "(/" + implicitExcludePathRegexPattern + "[^/.][^/]*)*?",
+        doubleAsteriskRegexFragment: "(/".concat(implicitExcludePathRegexPattern, "[^/.][^/]*)*?"),
         replaceWildcardCharacter: function (match) { return replaceWildcardCharacter(match, filesMatcher.singleAsteriskRegexFragment); }
     };
     var directoriesMatcher = {
@@ -20090,7 +20092,7 @@ var ts;
          * Regex for the ** wildcard. Matches any number of subdirectories. When used for including
          * files or directories, does not match subdirectories that start with a . character
          */
-        doubleAsteriskRegexFragment: "(/" + implicitExcludePathRegexPattern + "[^/.][^/]*)*?",
+        doubleAsteriskRegexFragment: "(/".concat(implicitExcludePathRegexPattern, "[^/.][^/]*)*?"),
         replaceWildcardCharacter: function (match) { return replaceWildcardCharacter(match, directoriesMatcher.singleAsteriskRegexFragment); }
     };
     var excludeMatcher = {
@@ -20108,10 +20110,10 @@ var ts;
         if (!patterns || !patterns.length) {
             return undefined;
         }
-        var pattern = patterns.map(function (pattern) { return "(" + pattern + ")"; }).join("|");
+        var pattern = patterns.map(function (pattern) { return "(".concat(pattern, ")"); }).join("|");
         // If excluding, match "foo/bar/baz...", but if including, only allow "foo".
         var terminator = usage === "exclude" ? "($|/)" : "$";
-        return "^(" + pattern + ")" + terminator;
+        return "^(".concat(pattern, ")").concat(terminator);
     }
     ts.getRegularExpressionForWildcard = getRegularExpressionForWildcard;
     function getRegularExpressionsForWildcards(specs, basePath, usage) {
@@ -20133,7 +20135,7 @@ var ts;
     ts.isImplicitGlob = isImplicitGlob;
     function getPatternFromSpec(spec, basePath, usage) {
         var pattern = spec && getSubPatternFromSpec(spec, basePath, usage, wildcardMatchers[usage]);
-        return pattern && "^(" + pattern + ")" + (usage === "exclude" ? "($|/)" : "$");
+        return pattern && "^(".concat(pattern, ")").concat(usage === "exclude" ? "($|/)" : "$");
     }
     ts.getPatternFromSpec = getPatternFromSpec;
     function getSubPatternFromSpec(spec, basePath, usage, _a) {
@@ -20211,11 +20213,11 @@ var ts;
         currentDirectory = ts.normalizePath(currentDirectory);
         var absolutePath = ts.combinePaths(currentDirectory, path);
         return {
-            includeFilePatterns: ts.map(getRegularExpressionsForWildcards(includes, absolutePath, "files"), function (pattern) { return "^" + pattern + "$"; }),
+            includeFilePatterns: ts.map(getRegularExpressionsForWildcards(includes, absolutePath, "files"), function (pattern) { return "^".concat(pattern, "$"); }),
             includeFilePattern: getRegularExpressionForWildcard(includes, absolutePath, "files"),
             includeDirectoryPattern: getRegularExpressionForWildcard(includes, absolutePath, "directories"),
             excludePattern: getRegularExpressionForWildcard(excludes, absolutePath, "exclude"),
-            basePaths: getBasePaths(absolutePath, includes, useCaseSensitiveFileNames)
+            basePaths: getBasePaths(path, includes, useCaseSensitiveFileNames)
         };
     }
     ts.getFileMatcherPatterns = getFileMatcherPatterns;
@@ -20224,7 +20226,7 @@ var ts;
     }
     ts.getRegexFromPattern = getRegexFromPattern;
     /** @param path directory of the tsconfig.json */
-    function matchFiles(path, extensions, excludes, includes, useCaseSensitiveFileNames, currentDirectory, depth, getFileSystemEntries, realpath, directoryExists) {
+    function matchFiles(path, extensions, excludes, includes, useCaseSensitiveFileNames, currentDirectory, depth, getFileSystemEntries, realpath) {
         path = ts.normalizePath(path);
         currentDirectory = ts.normalizePath(currentDirectory);
         var patterns = getFileMatcherPatterns(path, excludes, includes, useCaseSensitiveFileNames, currentDirectory);
@@ -20237,20 +20239,18 @@ var ts;
         var visited = new ts.Map();
         var toCanonical = ts.createGetCanonicalFileName(useCaseSensitiveFileNames);
         for (var _i = 0, _a = patterns.basePaths; _i < _a.length; _i++) {
-            var absoluteBasePath = _a[_i];
-            if (directoryExists(absoluteBasePath)) {
-                visitDirectory(absoluteBasePath, depth);
-            }
+            var basePath = _a[_i];
+            visitDirectory(basePath, ts.combinePaths(currentDirectory, basePath), depth);
         }
         return ts.flatten(results);
-        function visitDirectory(absolutePath, depth) {
+        function visitDirectory(path, absolutePath, depth) {
             var canonicalPath = toCanonical(realpath(absolutePath));
             if (visited.has(canonicalPath))
                 return;
             visited.set(canonicalPath, true);
-            var _a = getFileSystemEntries(absolutePath), files = _a.files, directories = _a.directories;
+            var _a = getFileSystemEntries(path), files = _a.files, directories = _a.directories;
             var _loop_1 = function (current) {
-                var name = ts.combinePaths(absolutePath, current);
+                var name = ts.combinePaths(path, current);
                 var absoluteName = ts.combinePaths(absolutePath, current);
                 if (extensions && !ts.fileExtensionIsOneOf(name, extensions))
                     return "continue";
@@ -20278,10 +20278,11 @@ var ts;
             }
             for (var _c = 0, _d = ts.sort(directories, ts.compareStringsCaseSensitive); _c < _d.length; _c++) {
                 var current = _d[_c];
+                var name = ts.combinePaths(path, current);
                 var absoluteName = ts.combinePaths(absolutePath, current);
                 if ((!includeDirectoryRegex || includeDirectoryRegex.test(absoluteName)) &&
                     (!excludeRegex || !excludeRegex.test(absoluteName))) {
-                    visitDirectory(absoluteName, depth);
+                    visitDirectory(name, absoluteName, depth);
                 }
             }
         }
@@ -20289,11 +20290,10 @@ var ts;
     ts.matchFiles = matchFiles;
     /**
      * Computes the unique non-wildcard base paths amongst the provided include patterns.
-     * @returns Absolute directory paths
      */
-    function getBasePaths(absoluteTsconfigPath, includes, useCaseSensitiveFileNames) {
+    function getBasePaths(path, includes, useCaseSensitiveFileNames) {
         // Storage for our results in the form of literal paths (e.g. the paths as written by the user).
-        var basePaths = [absoluteTsconfigPath];
+        var basePaths = [path];
         if (includes) {
             // Storage for literal base paths amongst the include patterns.
             var includeBasePaths = [];
@@ -20301,14 +20301,14 @@ var ts;
                 var include = includes_1[_i];
                 // We also need to check the relative paths by converting them to absolute and normalizing
                 // in case they escape the base path (e.g "..\somedirectory")
-                var absoluteIncludePath = ts.isRootedDiskPath(include) ? include : ts.normalizePath(ts.combinePaths(absoluteTsconfigPath, include));
+                var absolute = ts.isRootedDiskPath(include) ? include : ts.normalizePath(ts.combinePaths(path, include));
                 // Append the literal and canonical candidate base paths.
-                includeBasePaths.push(getIncludeBasePath(absoluteIncludePath));
+                includeBasePaths.push(getIncludeBasePath(absolute));
             }
             // Sort the offsets array using either the literal or canonical path representations.
             includeBasePaths.sort(ts.getStringComparer(!useCaseSensitiveFileNames));
             var _loop_2 = function (includeBasePath) {
-                if (ts.every(basePaths, function (basePath) { return !ts.containsPath(basePath, includeBasePath, absoluteTsconfigPath, !useCaseSensitiveFileNames); })) {
+                if (ts.every(basePaths, function (basePath) { return !ts.containsPath(basePath, includeBasePath, path, !useCaseSensitiveFileNames); })) {
                     basePaths.push(includeBasePath);
                 }
             };
@@ -20494,7 +20494,7 @@ var ts;
      */
     function extensionFromPath(path) {
         var ext = tryGetExtensionFromPath(path);
-        return ext !== undefined ? ext : ts.Debug.fail("File " + path + " has unknown extension.");
+        return ext !== undefined ? ext : ts.Debug.fail("File ".concat(path, " has unknown extension."));
     }
     ts.extensionFromPath = extensionFromPath;
     function isAnySupportedFileExtension(path) {
@@ -26483,7 +26483,7 @@ var ts;
             case 326 /* JSDocAugmentsTag */: return "augments";
             case 327 /* JSDocImplementsTag */: return "implements";
             default:
-                return ts.Debug.fail("Unsupported kind: " + ts.Debug.formatSyntaxKind(kind));
+                return ts.Debug.fail("Unsupported kind: ".concat(ts.Debug.formatSyntaxKind(kind)));
         }
     }
     var rawTextScanner;
@@ -26811,7 +26811,7 @@ var ts;
             };
             var definedTextGetter_1 = function (path) {
                 var result = textGetter_1(path);
-                return result !== undefined ? result : "/* Input file " + path + " was missing */\r\n";
+                return result !== undefined ? result : "/* Input file ".concat(path, " was missing */\r\n");
             };
             var buildInfo_1;
             var getAndCacheBuildInfo_1 = function (getText) {
@@ -31349,7 +31349,7 @@ var ts;
             for (var _i = 0, viableKeywordSuggestions_1 = viableKeywordSuggestions; _i < viableKeywordSuggestions_1.length; _i++) {
                 var keyword = viableKeywordSuggestions_1[_i];
                 if (expressionText.length > keyword.length + 2 && ts.startsWith(expressionText, keyword)) {
-                    return keyword + " " + expressionText.slice(keyword.length);
+                    return "".concat(keyword, " ").concat(expressionText.slice(keyword.length));
                 }
             }
             return undefined;
@@ -38113,7 +38113,7 @@ var ts;
         if (namedArgRegExCache.has(name)) {
             return namedArgRegExCache.get(name);
         }
-        var result = new RegExp("(\\s" + name + "\\s*=\\s*)(?:(?:'([^']*)')|(?:\"([^\"]*)\"))", "im");
+        var result = new RegExp("(\\s".concat(name, "\\s*=\\s*)(?:(?:'([^']*)')|(?:\"([^\"]*)\"))"), "im");
         namedArgRegExCache.set(name, result);
         return result;
     }
@@ -39575,8 +39575,8 @@ var ts;
     }
     ts.createCompilerDiagnosticForInvalidCustomType = createCompilerDiagnosticForInvalidCustomType;
     function createDiagnosticForInvalidCustomType(opt, createDiagnostic) {
-        var namesOfType = ts.arrayFrom(opt.type.keys()).map(function (key) { return "'" + key + "'"; }).join(", ");
-        return createDiagnostic(ts.Diagnostics.Argument_for_0_option_must_be_Colon_1, "--" + opt.name, namesOfType);
+        var namesOfType = ts.arrayFrom(opt.type.keys()).map(function (key) { return "'".concat(key, "'"); }).join(", ");
+        return createDiagnostic(ts.Diagnostics.Argument_for_0_option_must_be_Colon_1, "--".concat(opt.name), namesOfType);
     }
     /* @internal */
     function parseCustomTypeOption(opt, value, errors) {
@@ -40370,10 +40370,10 @@ var ts;
                 var newValue = compilerOptionsMap.get(cmd.name);
                 var defaultValue = getDefaultValueForOption(cmd);
                 if (newValue !== defaultValue) {
-                    result.push("" + tab + cmd.name + ": " + newValue);
+                    result.push("".concat(tab).concat(cmd.name, ": ").concat(newValue));
                 }
                 else if (ts.hasProperty(ts.defaultInitCompilerOptions, cmd.name)) {
-                    result.push("" + tab + cmd.name + ": " + defaultValue);
+                    result.push("".concat(tab).concat(cmd.name, ": ").concat(defaultValue));
                 }
             });
             return result.join(newLine) + newLine;
@@ -40424,19 +40424,19 @@ var ts;
                 if (entries.length !== 0) {
                     entries.push({ value: "" });
                 }
-                entries.push({ value: "/* " + category + " */" });
+                entries.push({ value: "/* ".concat(category, " */") });
                 for (var _i = 0, options_1 = options; _i < options_1.length; _i++) {
                     var option = options_1[_i];
                     var optionName = void 0;
                     if (compilerOptionsMap.has(option.name)) {
-                        optionName = "\"" + option.name + "\": " + JSON.stringify(compilerOptionsMap.get(option.name)) + ((seenKnownKeys += 1) === compilerOptionsMap.size ? "" : ",");
+                        optionName = "\"".concat(option.name, "\": ").concat(JSON.stringify(compilerOptionsMap.get(option.name))).concat((seenKnownKeys += 1) === compilerOptionsMap.size ? "" : ",");
                     }
                     else {
-                        optionName = "// \"" + option.name + "\": " + JSON.stringify(getDefaultValueForOption(option)) + ",";
+                        optionName = "// \"".concat(option.name, "\": ").concat(JSON.stringify(getDefaultValueForOption(option)), ",");
                     }
                     entries.push({
                         value: optionName,
-                        description: "/* " + (option.description && ts.getLocaleSpecificMessage(option.description) || option.name) + " */"
+                        description: "/* ".concat(option.description && ts.getLocaleSpecificMessage(option.description) || option.name, " */")
                     });
                     marginLength = Math.max(optionName.length, marginLength);
                 }
@@ -40445,25 +40445,25 @@ var ts;
             var tab = makePadding(2);
             var result = [];
             result.push("{");
-            result.push(tab + "\"compilerOptions\": {");
-            result.push("" + tab + tab + "/* " + ts.getLocaleSpecificMessage(ts.Diagnostics.Visit_https_Colon_Slash_Slashaka_ms_Slashtsconfig_json_to_read_more_about_this_file) + " */");
+            result.push("".concat(tab, "\"compilerOptions\": {"));
+            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), " */"));
             result.push("");
             // Print out each row, aligning all the descriptions on the same column.
             for (var _a = 0, entries_2 = entries; _a < entries_2.length; _a++) {
                 var entry = entries_2[_a];
                 var value = entry.value, _b = entry.description, description = _b === void 0 ? "" : _b;
-                result.push(value && "" + tab + tab + value + (description && (makePadding(marginLength - value.length + 2) + description)));
+                result.push(value && "".concat(tab).concat(tab).concat(value).concat(description && (makePadding(marginLength - value.length + 2) + description)));
             }
             if (fileNames.length) {
-                result.push(tab + "},");
-                result.push(tab + "\"files\": [");
+                result.push("".concat(tab, "},"));
+                result.push("".concat(tab, "\"files\": ["));
                 for (var i = 0; i < fileNames.length; i++) {
-                    result.push("" + tab + tab + JSON.stringify(fileNames[i]) + (i === fileNames.length - 1 ? "" : ","));
+                    result.push("".concat(tab).concat(tab).concat(JSON.stringify(fileNames[i])).concat(i === fileNames.length - 1 ? "" : ","));
                 }
-                result.push(tab + "]");
+                result.push("".concat(tab, "]"));
             }
             else {
-                result.push(tab + "}");
+                result.push("".concat(tab, "}"));
             }
             result.push("}");
             return result.join(newLine) + newLine;
@@ -40861,7 +40861,7 @@ var ts;
         if (ts.isRootedDiskPath(extendedConfig) || ts.startsWith(extendedConfig, "./") || ts.startsWith(extendedConfig, "../")) {
             var extendedConfigPath = ts.getNormalizedAbsolutePath(extendedConfig, basePath);
             if (!host.fileExists(extendedConfigPath) && !ts.endsWith(extendedConfigPath, ".json" /* Json */)) {
-                extendedConfigPath = extendedConfigPath + ".json";
+                extendedConfigPath = "".concat(extendedConfigPath, ".json");
                 if (!host.fileExists(extendedConfigPath)) {
                     errors.push(createDiagnostic(ts.Diagnostics.File_0_not_found, extendedConfig));
                     return undefined;
@@ -41106,7 +41106,7 @@ var ts;
                     // Valid only if *.json specified
                     if (!jsonOnlyIncludeRegexes) {
                         var includes = validatedIncludeSpecs.filter(function (s) { return ts.endsWith(s, ".json" /* Json */); });
-                        var includeFilePatterns = ts.map(ts.getRegularExpressionsForWildcards(includes, basePath, "files"), function (pattern) { return "^" + pattern + "$"; });
+                        var includeFilePatterns = ts.map(ts.getRegularExpressionsForWildcards(includes, basePath, "files"), function (pattern) { return "^".concat(pattern, "$"); });
                         jsonOnlyIncludeRegexes = includeFilePatterns ? includeFilePatterns.map(function (pattern) { return ts.getRegexFromPattern(pattern, host.useCaseSensitiveFileNames); }) : ts.emptyArray;
                     }
                     var includeIndex = ts.findIndex(jsonOnlyIncludeRegexes, function (re) { return re.test(file); });
@@ -41542,7 +41542,7 @@ var ts;
         var bestVersionKey = result.version, bestVersionPaths = result.paths;
         if (typeof bestVersionPaths !== "object") {
             if (state.traceEnabled) {
-                trace(state.host, ts.Diagnostics.Expected_type_of_0_field_in_package_json_to_be_1_got_2, "typesVersions['" + bestVersionKey + "']", "object", typeof bestVersionPaths);
+                trace(state.host, ts.Diagnostics.Expected_type_of_0_field_in_package_json_to_be_1_got_2, "typesVersions['".concat(bestVersionKey, "']"), "object", typeof bestVersionPaths);
             }
             return;
         }
@@ -41920,7 +41920,7 @@ var ts;
         };
         return cache;
         function getUnderlyingCacheKey(specifier, mode) {
-            var result = mode === undefined ? specifier : mode + "|" + specifier;
+            var result = mode === undefined ? specifier : "".concat(mode, "|").concat(specifier);
             memoizedReverseKeys.set(result, [specifier, mode]);
             return result;
         }
@@ -41951,7 +41951,7 @@ var ts;
         }
         function getOrCreateCacheForModuleName(nonRelativeModuleName, mode, redirectedReference) {
             ts.Debug.assert(!ts.isExternalModuleNameRelative(nonRelativeModuleName));
-            return getOrCreateCache(moduleNameToDirectoryMap, redirectedReference, mode === undefined ? nonRelativeModuleName : mode + "|" + nonRelativeModuleName, createPerModuleNameCache);
+            return getOrCreateCache(moduleNameToDirectoryMap, redirectedReference, mode === undefined ? nonRelativeModuleName : "".concat(mode, "|").concat(nonRelativeModuleName), createPerModuleNameCache);
         }
         function createPerModuleNameCache() {
             var directoryPathMap = new ts.Map();
@@ -42098,10 +42098,10 @@ var ts;
                     result = classicNameResolver(moduleName, containingFile, compilerOptions, host, cache, redirectedReference);
                     break;
                 default:
-                    return ts.Debug.fail("Unexpected moduleResolution: " + moduleResolution);
+                    return ts.Debug.fail("Unexpected moduleResolution: ".concat(moduleResolution));
             }
             if (result && result.resolvedModule)
-                ts.perfLogger.logInfoEvent("Module \"" + moduleName + "\" resolved to \"" + result.resolvedModule.resolvedFileName + "\"");
+                ts.perfLogger.logInfoEvent("Module \"".concat(moduleName, "\" resolved to \"").concat(result.resolvedModule.resolvedFileName, "\""));
             ts.perfLogger.logStopResolveModule((result && result.resolvedModule) ? "" + result.resolvedModule.resolvedFileName : "null");
             if (perFolderCache) {
                 perFolderCache.set(moduleName, resolutionMode, result);
@@ -42304,7 +42304,7 @@ var ts;
     function resolveJSModule(moduleName, initialDir, host) {
         var _a = tryResolveJSModuleWorker(moduleName, initialDir, host), resolvedModule = _a.resolvedModule, failedLookupLocations = _a.failedLookupLocations;
         if (!resolvedModule) {
-            throw new Error("Could not resolve JS module '" + moduleName + "' starting at '" + initialDir + "'. Looked in: " + failedLookupLocations.join(", "));
+            throw new Error("Could not resolve JS module '".concat(moduleName, "' starting at '").concat(initialDir, "'. Looked in: ").concat(failedLookupLocations.join(", ")));
         }
         return resolvedModule.resolvedFileName;
     }
@@ -42417,7 +42417,7 @@ var ts;
         if (traceEnabled) {
             trace(host, ts.Diagnostics.Resolving_real_path_for_0_result_1, path, real);
         }
-        ts.Debug.assert(host.fileExists(real), path + " linked to nonexistent file " + real);
+        ts.Debug.assert(host.fileExists(real), "".concat(path, " linked to nonexistent file ").concat(real));
         return real;
     }
     function nodeLoadModuleByRelativeName(extensions, candidate, onlyRecordFailures, state, considerPackageJson) {
@@ -42803,7 +42803,7 @@ var ts;
             return undefined;
         }
         var trailingParts = parts.slice(nameParts.length);
-        return loadModuleFromExports(scope, extensions, !ts.length(trailingParts) ? "." : "." + ts.directorySeparator + trailingParts.join(ts.directorySeparator), state, cache, redirectedReference);
+        return loadModuleFromExports(scope, extensions, !ts.length(trailingParts) ? "." : ".".concat(ts.directorySeparator).concat(trailingParts.join(ts.directorySeparator)), state, cache, redirectedReference);
     }
     function loadModuleFromExports(scope, extensions, subpath, state, cache, redirectedReference) {
         if (!scope.packageJsonContent.exports) {
@@ -43131,7 +43131,7 @@ var ts;
     }
     /* @internal */
     function getTypesPackageName(packageName) {
-        return "@types/" + mangleScopedPackageName(packageName);
+        return "@types/".concat(mangleScopedPackageName(packageName));
     }
     ts.getTypesPackageName = getTypesPackageName;
     /* @internal */
@@ -43532,7 +43532,7 @@ var ts;
             if (name) {
                 if (ts.isAmbientModule(node)) {
                     var moduleName = ts.getTextOfIdentifierOrLiteral(name);
-                    return (ts.isGlobalScopeAugmentation(node) ? "__global" : "\"" + moduleName + "\"");
+                    return (ts.isGlobalScopeAugmentation(node) ? "__global" : "\"".concat(moduleName, "\""));
                 }
                 if (name.kind === 161 /* ComputedPropertyName */) {
                     var nameExpression = name.expression;
@@ -43589,7 +43589,7 @@ var ts;
                 case 163 /* Parameter */:
                     // Parameters with names are handled at the top of this function.  Parameters
                     // without names can only come from JSDocFunctionTypes.
-                    ts.Debug.assert(node.parent.kind === 315 /* JSDocFunctionType */, "Impossible parameter parent kind", function () { return "parent is: " + (ts.SyntaxKind ? ts.SyntaxKind[node.parent.kind] : node.parent.kind) + ", expected JSDocFunctionType"; });
+                    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"); });
                     var functionType = node.parent;
                     var index = functionType.parameters.indexOf(node);
                     return "arg" + index;
@@ -43701,7 +43701,7 @@ var ts;
                         var relatedInformation_1 = [];
                         if (ts.isTypeAliasDeclaration(node) && ts.nodeIsMissing(node.type) && ts.hasSyntacticModifier(node, 1 /* Export */) && symbol.flags & (2097152 /* Alias */ | 788968 /* Type */ | 1920 /* Namespace */)) {
                             // export type T; - may have meant export type { T }?
-                            relatedInformation_1.push(createDiagnosticForNode(node, ts.Diagnostics.Did_you_mean_0, "export type { " + ts.unescapeLeadingUnderscores(node.name.escapedText) + " }"));
+                            relatedInformation_1.push(createDiagnosticForNode(node, ts.Diagnostics.Did_you_mean_0, "export type { ".concat(ts.unescapeLeadingUnderscores(node.name.escapedText), " }")));
                         }
                         var declarationName_1 = ts.getNameOfDeclaration(node) || node;
                         ts.forEach(symbol.declarations, function (declaration, index) {
@@ -45774,7 +45774,7 @@ var ts;
             }
         }
         function bindSourceFileAsExternalModule() {
-            bindAnonymousDeclaration(file, 512 /* ValueModule */, "\"" + ts.removeFileExtension(file.fileName) + "\"");
+            bindAnonymousDeclaration(file, 512 /* ValueModule */, "\"".concat(ts.removeFileExtension(file.fileName), "\""));
         }
         function bindExportAssignment(node) {
             if (!container.symbol || !container.symbol.exports) {
@@ -47863,7 +47863,7 @@ var ts;
                 if (sourceSymbolFile && targetSymbolFile && amalgamatedDuplicates && !isEitherEnum && sourceSymbolFile !== targetSymbolFile) {
                     var firstFile_1 = ts.comparePaths(sourceSymbolFile.path, targetSymbolFile.path) === -1 /* LessThan */ ? sourceSymbolFile : targetSymbolFile;
                     var secondFile_1 = firstFile_1 === sourceSymbolFile ? targetSymbolFile : sourceSymbolFile;
-                    var filesDuplicates = ts.getOrUpdate(amalgamatedDuplicates, firstFile_1.path + "|" + secondFile_1.path, function () {
+                    var filesDuplicates = ts.getOrUpdate(amalgamatedDuplicates, "".concat(firstFile_1.path, "|").concat(secondFile_1.path), function () {
                         return ({ firstFile: firstFile_1, secondFile: secondFile_1, conflictingSymbols: new ts.Map() });
                     });
                     var conflictingSymbolInfo = ts.getOrUpdate(filesDuplicates.conflictingSymbols, symbolName_1, function () {
@@ -50502,7 +50502,7 @@ var ts;
             var cache = (links.accessibleChainCache || (links.accessibleChainCache = new ts.Map()));
             // Go from enclosingDeclaration to the first scope we check, so the cache is keyed off the scope and thus shared more
             var firstRelevantLocation = forEachSymbolTableInScope(enclosingDeclaration, function (_, __, ___, node) { return node; });
-            var key = (useOnlyExternalAliasing ? 0 : 1) + "|" + (firstRelevantLocation && getNodeId(firstRelevantLocation)) + "|" + meaning;
+            var key = "".concat(useOnlyExternalAliasing ? 0 : 1, "|").concat(firstRelevantLocation && getNodeId(firstRelevantLocation), "|").concat(meaning);
             if (cache.has(key)) {
                 return cache.get(key);
             }
@@ -51350,7 +51350,7 @@ var ts;
                         context.symbolDepth = new ts.Map();
                     }
                     var links = context.enclosingDeclaration && getNodeLinks(context.enclosingDeclaration);
-                    var key = getTypeId(type) + "|" + context.flags;
+                    var key = "".concat(getTypeId(type), "|").concat(context.flags);
                     if (links) {
                         links.serializedTypes || (links.serializedTypes = new ts.Map());
                     }
@@ -51619,7 +51619,7 @@ var ts;
                             }
                         }
                         if (checkTruncationLength(context) && (i + 2 < properties.length - 1)) {
-                            typeElements.push(ts.factory.createPropertySignature(/*modifiers*/ undefined, "... " + (properties.length - i) + " more ...", /*questionToken*/ undefined, /*type*/ undefined));
+                            typeElements.push(ts.factory.createPropertySignature(/*modifiers*/ undefined, "... ".concat(properties.length - i, " more ..."), /*questionToken*/ undefined, /*type*/ undefined));
                             addPropertyToElementList(properties[properties.length - 1], context, typeElements);
                             break;
                         }
@@ -51734,7 +51734,7 @@ var ts;
                         else if (types.length > 2) {
                             return [
                                 typeToTypeNodeHelper(types[0], context),
-                                ts.factory.createTypeReferenceNode("... " + (types.length - 2) + " more ...", /*typeArguments*/ undefined),
+                                ts.factory.createTypeReferenceNode("... ".concat(types.length - 2, " more ..."), /*typeArguments*/ undefined),
                                 typeToTypeNodeHelper(types[types.length - 1], context)
                             ];
                         }
@@ -51748,7 +51748,7 @@ var ts;
                         var type = types_2[_i];
                         i++;
                         if (checkTruncationLength(context) && (i + 2 < types.length - 1)) {
-                            result_5.push(ts.factory.createTypeReferenceNode("... " + (types.length - i) + " more ...", /*typeArguments*/ undefined));
+                            result_5.push(ts.factory.createTypeReferenceNode("... ".concat(types.length - i, " more ..."), /*typeArguments*/ undefined));
                             var typeNode_1 = typeToTypeNodeHelper(types[types.length - 1], context);
                             if (typeNode_1) {
                                 result_5.push(typeNode_1);
@@ -52256,7 +52256,7 @@ var ts;
                     var text = rawtext;
                     while (((_b = context.typeParameterNamesByText) === null || _b === void 0 ? void 0 : _b.has(text)) || typeParameterShadowsNameInScope(text, context, type)) {
                         i++;
-                        text = rawtext + "_" + i;
+                        text = "".concat(rawtext, "_").concat(i);
                     }
                     if (text !== rawtext) {
                         result = ts.factory.createIdentifier(text, result.typeArguments);
@@ -52582,7 +52582,7 @@ var ts;
                     function getNameForJSDocFunctionParameter(p, index) {
                         return p.name && ts.isIdentifier(p.name) && p.name.escapedText === "this" ? "this"
                             : getEffectiveDotDotDotForParameter(p) ? "args"
-                                : "arg" + index;
+                                : "arg".concat(index);
                     }
                     function rewriteModuleSpecifier(parent, lit) {
                         if (bundled) {
@@ -53667,7 +53667,7 @@ var ts;
                             return results_1;
                         }
                         // The `Constructor`'s symbol isn't in the class's properties lists, obviously, since it's a signature on the static
-                        return ts.Debug.fail("Unhandled class member kind! " + (p.__debugFlags || p.flags));
+                        return ts.Debug.fail("Unhandled class member kind! ".concat(p.__debugFlags || p.flags));
                     };
                 }
                 function serializePropertySymbolForInterface(p, baseType) {
@@ -53742,7 +53742,7 @@ var ts;
                     if (ref) {
                         return ref;
                     }
-                    var tempName = getUnusedName(rootName + "_base");
+                    var tempName = getUnusedName("".concat(rootName, "_base"));
                     var statement = ts.factory.createVariableStatement(/*modifiers*/ undefined, ts.factory.createVariableDeclarationList([
                         ts.factory.createVariableDeclaration(tempName, /*exclamationToken*/ undefined, typeToTypeNodeHelper(staticType, context))
                     ], 2 /* Const */));
@@ -53789,7 +53789,7 @@ var ts;
                     var original = input;
                     while ((_a = context.usedSymbolNames) === null || _a === void 0 ? void 0 : _a.has(input)) {
                         i++;
-                        input = original + "_" + i;
+                        input = "".concat(original, "_").concat(i);
                     }
                     (_b = context.usedSymbolNames) === null || _b === void 0 ? void 0 : _b.add(input);
                     if (id) {
@@ -53897,15 +53897,15 @@ var ts;
                 if (nameType.flags & 384 /* StringOrNumberLiteral */) {
                     var name = "" + nameType.value;
                     if (!ts.isIdentifierText(name, ts.getEmitScriptTarget(compilerOptions)) && !isNumericLiteralName(name)) {
-                        return "\"" + ts.escapeString(name, 34 /* doubleQuote */) + "\"";
+                        return "\"".concat(ts.escapeString(name, 34 /* doubleQuote */), "\"");
                     }
                     if (isNumericLiteralName(name) && ts.startsWith(name, "-")) {
-                        return "[" + name + "]";
+                        return "[".concat(name, "]");
                     }
                     return name;
                 }
                 if (nameType.flags & 8192 /* UniqueESSymbol */) {
-                    return "[" + getNameOfSymbolAsWritten(nameType.symbol, context) + "]";
+                    return "[".concat(getNameOfSymbolAsWritten(nameType.symbol, context), "]");
                 }
             }
         }
@@ -56679,7 +56679,7 @@ var ts;
                     !leftName ? rightName :
                         !rightName ? leftName :
                             undefined;
-                var paramSymbol = createSymbol(1 /* FunctionScopedVariable */ | (isOptional && !isRestParam ? 16777216 /* Optional */ : 0), paramName || "arg" + i);
+                var paramSymbol = createSymbol(1 /* FunctionScopedVariable */ | (isOptional && !isRestParam ? 16777216 /* Optional */ : 0), paramName || "arg".concat(i));
                 paramSymbol.type = isRestParam ? createArrayType(unionParamType) : unionParamType;
                 params[i] = paramSymbol;
             }
@@ -58598,7 +58598,7 @@ var ts;
             return result;
         }
         function getAliasId(aliasSymbol, aliasTypeArguments) {
-            return aliasSymbol ? "@" + getSymbolId(aliasSymbol) + (aliasTypeArguments ? ":" + getTypeListId(aliasTypeArguments) : "") : "";
+            return aliasSymbol ? "@".concat(getSymbolId(aliasSymbol)) + (aliasTypeArguments ? ":".concat(getTypeListId(aliasTypeArguments)) : "") : "";
         }
         // This function is used to propagate certain flags when creating new object type references and union types.
         // It is only necessary to do so if a constituent type might be the undefined type, the null type, the type
@@ -58784,7 +58784,7 @@ var ts;
             return undefined;
         }
         function getSymbolPath(symbol) {
-            return symbol.parent ? getSymbolPath(symbol.parent) + "." + symbol.escapedName : symbol.escapedName;
+            return symbol.parent ? "".concat(getSymbolPath(symbol.parent), ".").concat(symbol.escapedName) : symbol.escapedName;
         }
         function getUnresolvedSymbolForEntityName(name) {
             var identifier = name.kind === 160 /* QualifiedName */ ? name.right :
@@ -58795,7 +58795,7 @@ var ts;
                 var parentSymbol = name.kind === 160 /* QualifiedName */ ? getUnresolvedSymbolForEntityName(name.left) :
                     name.kind === 205 /* PropertyAccessExpression */ ? getUnresolvedSymbolForEntityName(name.expression) :
                         undefined;
-                var path = parentSymbol ? getSymbolPath(parentSymbol) + "." + text : text;
+                var path = parentSymbol ? "".concat(getSymbolPath(parentSymbol), ".").concat(text) : text;
                 var result = unresolvedSymbols.get(path);
                 if (!result) {
                     unresolvedSymbols.set(path, result = createSymbol(524288 /* TypeAlias */, text, 1048576 /* Unresolved */));
@@ -58868,7 +58868,7 @@ var ts;
             if (substitute.flags & 3 /* AnyOrUnknown */ || substitute === baseType) {
                 return baseType;
             }
-            var id = getTypeId(baseType) + ">" + getTypeId(substitute);
+            var id = "".concat(getTypeId(baseType), ">").concat(getTypeId(substitute));
             var cached = substitutionTypes.get(id);
             if (cached) {
                 return cached;
@@ -59529,6 +59529,8 @@ var ts;
             // We ignore 'never' types in unions
             if (!(flags & 131072 /* Never */)) {
                 includes |= flags & 205258751 /* IncludesMask */;
+                if (flags & 465829888 /* Instantiable */)
+                    includes |= 33554432 /* IncludesInstantiable */;
                 if (type === wildcardType)
                     includes |= 8388608 /* IncludesWildcard */;
                 if (!strictNullChecks && flags & 98304 /* Nullable */) {
@@ -59742,7 +59744,7 @@ var ts;
                     origin = createOriginUnionOrIntersectionType(1048576 /* Union */, reducedTypes);
                 }
             }
-            var objectFlags = (includes & 468598819 /* NotPrimitiveUnion */ ? 0 : 65536 /* PrimitiveUnion */) |
+            var objectFlags = (includes & 36323363 /* NotPrimitiveUnion */ ? 0 : 65536 /* PrimitiveUnion */) |
                 (includes & 2097152 /* Intersection */ ? 33554432 /* ContainsIntersections */ : 0);
             return getUnionTypeFromSortedList(typeSet, objectFlags, aliasSymbol, aliasTypeArguments, origin);
         }
@@ -59790,9 +59792,9 @@ var ts;
                 return types[0];
             }
             var typeKey = !origin ? getTypeListId(types) :
-                origin.flags & 1048576 /* Union */ ? "|" + getTypeListId(origin.types) :
-                    origin.flags & 2097152 /* Intersection */ ? "&" + getTypeListId(origin.types) :
-                        "#" + origin.type.id + "|" + getTypeListId(types); // origin type id alone is insufficient, as `keyof x` may resolve to multiple WIP values while `x` is still resolving
+                origin.flags & 1048576 /* Union */ ? "|".concat(getTypeListId(origin.types)) :
+                    origin.flags & 2097152 /* Intersection */ ? "&".concat(getTypeListId(origin.types)) :
+                        "#".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
             var id = typeKey + getAliasId(aliasSymbol, aliasTypeArguments);
             var type = unionTypes.get(id);
             if (!type) {
@@ -60314,7 +60316,7 @@ var ts;
             if (ts.every(newTexts, function (t) { return t === ""; }) && ts.every(newTypes, function (t) { return !!(t.flags & 4 /* String */); })) {
                 return stringType;
             }
-            var id = getTypeListId(newTypes) + "|" + ts.map(newTexts, function (t) { return t.length; }).join(",") + "|" + newTexts.join("");
+            var id = "".concat(getTypeListId(newTypes), "|").concat(ts.map(newTexts, function (t) { return t.length; }).join(","), "|").concat(newTexts.join(""));
             var type = templateLiteralTypes.get(id);
             if (!type) {
                 templateLiteralTypes.set(id, type = createTemplateLiteralType(newTexts, newTypes));
@@ -60374,7 +60376,7 @@ var ts;
             return str;
         }
         function getStringMappingTypeForGenericType(symbol, type) {
-            var id = getSymbolId(symbol) + "," + getTypeId(type);
+            var id = "".concat(getSymbolId(symbol), ",").concat(getTypeId(type));
             var result = stringMappingTypes.get(id);
             if (!result) {
                 stringMappingTypes.set(id, result = createStringMappingType(symbol, type));
@@ -61394,7 +61396,7 @@ var ts;
         function createUniqueESSymbolType(symbol) {
             var type = createType(8192 /* UniqueESSymbol */);
             type.symbol = symbol;
-            type.escapedName = "__@" + type.symbol.escapedName + "@" + getSymbolId(type.symbol);
+            type.escapedName = "__@".concat(type.symbol.escapedName, "@").concat(getSymbolId(type.symbol));
             return type;
         }
         function getESSymbolLikeTypeForNode(node) {
@@ -63083,24 +63085,24 @@ var ts;
                         case ts.Diagnostics.Types_of_property_0_are_incompatible.code: {
                             // Parenthesize a `new` if there is one
                             if (path.indexOf("new ") === 0) {
-                                path = "(" + path + ")";
+                                path = "(".concat(path, ")");
                             }
                             var str = "" + args[0];
                             // If leading, just print back the arg (irrespective of if it's a valid identifier)
                             if (path.length === 0) {
-                                path = "" + str;
+                                path = "".concat(str);
                             }
                             // Otherwise write a dotted name if possible
                             else if (ts.isIdentifierText(str, ts.getEmitScriptTarget(compilerOptions))) {
-                                path = path + "." + str;
+                                path = "".concat(path, ".").concat(str);
                             }
                             // Failing that, check if the name is already a computed name
                             else if (str[0] === "[" && str[str.length - 1] === "]") {
-                                path = "" + path + str;
+                                path = "".concat(path).concat(str);
                             }
                             // And finally write out a computed name as a last resort
                             else {
-                                path = path + "[" + str + "]";
+                                path = "".concat(path, "[").concat(str, "]");
                             }
                             break;
                         }
@@ -63129,7 +63131,7 @@ var ts;
                                     msg.code === ts.Diagnostics.Construct_signatures_with_no_arguments_have_incompatible_return_types_0_and_1.code)
                                     ? ""
                                     : "...";
-                                path = "" + prefix + path + "(" + params + ")";
+                                path = "".concat(prefix).concat(path, "(").concat(params, ")");
                             }
                             break;
                         }
@@ -63142,7 +63144,7 @@ var ts;
                             break;
                         }
                         default:
-                            return ts.Debug.fail("Unhandled Diagnostic: " + msg.code);
+                            return ts.Debug.fail("Unhandled Diagnostic: ".concat(msg.code));
                     }
                 }
                 if (path) {
@@ -63818,7 +63820,7 @@ var ts;
                     // prevent finding matches- but it should hit up the common cases
                     var broadestEquivalentId = id.split(",").map(function (i) { return i.replace(/-\d+/g, function (_match, offset) {
                         var index = ts.length(id.slice(0, offset).match(/[-=]/g) || undefined);
-                        return "=" + index;
+                        return "=".concat(index);
                     }); }).join(",");
                     for (var i = 0; i < maybeCount; i++) {
                         // If source and target are already being compared, consider them related with assumptions
@@ -64117,7 +64119,7 @@ var ts;
                         originalErrorInfo = undefined;
                     }
                 }
-                else if (isGenericMappedType(target)) {
+                else if (isGenericMappedType(target) && relation !== identityRelation) {
                     // Check if source type `S` is related to target type `{ [P in Q]: T }` or `{ [P in Q as R]: T}`.
                     var keysRemapped = !!target.declaration.nameType;
                     var templateType = getTemplateTypeFromMappedType(target);
@@ -66178,7 +66180,8 @@ var ts;
                         (resolveName(param, param.name.escapedText, 788968 /* Type */, undefined, param.name.escapedText, /*isUse*/ true) ||
                             param.name.originalKeywordKind && ts.isTypeNodeKind(param.name.originalKeywordKind))) {
                         var newName = "arg" + param.parent.parameters.indexOf(param);
-                        errorOrSuggestion(noImplicitAny, declaration, ts.Diagnostics.Parameter_has_a_name_but_no_type_Did_you_mean_0_Colon_1, newName, ts.declarationNameToString(param.name));
+                        var typeName = ts.declarationNameToString(param.name) + (param.dotDotDotToken ? "[]" : "");
+                        errorOrSuggestion(noImplicitAny, declaration, ts.Diagnostics.Parameter_has_a_name_but_no_type_Did_you_mean_0_Colon_1, newName, typeName);
                         return;
                     }
                     diagnostic = declaration.dotDotDotToken ?
@@ -67481,11 +67484,11 @@ var ts;
                 case 79 /* Identifier */:
                     if (!ts.isThisInTypeQuery(node)) {
                         var symbol = getResolvedSymbol(node);
-                        return symbol !== unknownSymbol ? (flowContainer ? getNodeId(flowContainer) : "-1") + "|" + getTypeId(declaredType) + "|" + getTypeId(initialType) + "|" + getSymbolId(symbol) : undefined;
+                        return symbol !== unknownSymbol ? "".concat(flowContainer ? getNodeId(flowContainer) : "-1", "|").concat(getTypeId(declaredType), "|").concat(getTypeId(initialType), "|").concat(getSymbolId(symbol)) : undefined;
                     }
                 // falls through
                 case 108 /* ThisKeyword */:
-                    return "0|" + (flowContainer ? getNodeId(flowContainer) : "-1") + "|" + getTypeId(declaredType) + "|" + getTypeId(initialType);
+                    return "0|".concat(flowContainer ? getNodeId(flowContainer) : "-1", "|").concat(getTypeId(declaredType), "|").concat(getTypeId(initialType));
                 case 229 /* NonNullExpression */:
                 case 211 /* ParenthesizedExpression */:
                     return getFlowCacheKey(node.expression, declaredType, initialType, flowContainer);
@@ -71247,7 +71250,7 @@ var ts;
                     !leftName ? rightName :
                         !rightName ? leftName :
                             undefined;
-                var paramSymbol = createSymbol(1 /* FunctionScopedVariable */ | (isOptional && !isRestParam ? 16777216 /* Optional */ : 0), paramName || "arg" + i);
+                var paramSymbol = createSymbol(1 /* FunctionScopedVariable */ | (isOptional && !isRestParam ? 16777216 /* Optional */ : 0), paramName || "arg".concat(i));
                 paramSymbol.type = isRestParam ? createArrayType(unionParamType) : unionParamType;
                 params[i] = paramSymbol;
             }
@@ -78551,7 +78554,9 @@ var ts;
             var typeReferenceNode = ts.tryCast(node.parent, ts.isTypeReferenceType);
             if (!typeReferenceNode)
                 return undefined;
-            var typeParameters = getTypeParametersForTypeReference(typeReferenceNode); // TODO: GH#18217
+            var typeParameters = getTypeParametersForTypeReference(typeReferenceNode);
+            if (!typeParameters)
+                return undefined;
             var constraint = getConstraintOfTypeParameter(typeParameters[typeReferenceNode.typeArguments.indexOf(node)]);
             return constraint && instantiateType(constraint, createTypeMapper(typeParameters, getEffectiveTypeArguments(typeReferenceNode, typeParameters)));
         }
@@ -81158,7 +81163,7 @@ var ts;
         function getPropertyNameForKnownSymbolName(symbolName) {
             var ctorType = getGlobalESSymbolConstructorSymbol(/*reportErrors*/ false);
             var uniqueType = ctorType && getTypeOfPropertyOfType(getTypeOfSymbol(ctorType), ts.escapeLeadingUnderscores(symbolName));
-            return uniqueType && isTypeUsableAsPropertyName(uniqueType) ? getPropertyNameFromType(uniqueType) : "__@" + symbolName;
+            return uniqueType && isTypeUsableAsPropertyName(uniqueType) ? getPropertyNameFromType(uniqueType) : "__@".concat(symbolName);
         }
         /**
          * Gets the *yield*, *return*, and *next* types of an `Iterable`-like or `AsyncIterable`-like
@@ -88130,7 +88135,7 @@ var ts;
                 value >= 52 && value < 62 ? 48 /* _0 */ + value - 52 :
                     value === 62 ? 43 /* plus */ :
                         value === 63 ? 47 /* slash */ :
-                            ts.Debug.fail(value + ": not a base64 value");
+                            ts.Debug.fail("".concat(value, ": not a base64 value"));
     }
     function base64FormatDecode(ch) {
         return ch >= 65 /* A */ && ch <= 90 /* Z */ ? ch - 65 /* A */ :
@@ -88205,7 +88210,7 @@ var ts;
                 var mappings = ts.arrayFrom(decoder, processMapping);
                 if (decoder.error !== undefined) {
                     if (host.log) {
-                        host.log("Encountered error while decoding sourcemap: " + decoder.error);
+                        host.log("Encountered error while decoding sourcemap: ".concat(decoder.error));
                     }
                     decodedMappings = ts.emptyArray;
                 }
@@ -91871,7 +91876,7 @@ var ts;
                     var propertyName = ts.isPropertyAccessExpression(originalNode)
                         ? ts.declarationNameToString(originalNode.name)
                         : ts.getTextOfNode(originalNode.argumentExpression);
-                    ts.addSyntheticTrailingComment(substitute, 3 /* MultiLineCommentTrivia */, " " + propertyName + " ");
+                    ts.addSyntheticTrailingComment(substitute, 3 /* MultiLineCommentTrivia */, " ".concat(propertyName, " "));
                 }
                 return substitute;
             }
@@ -93263,8 +93268,8 @@ var ts;
         }
         function createHoistedVariableForClass(name, node) {
             var className = getPrivateIdentifierEnvironment().className;
-            var prefix = className ? "_" + className : "";
-            var identifier = factory.createUniqueName(prefix + "_" + name, 16 /* Optimistic */);
+            var prefix = className ? "_".concat(className) : "";
+            var identifier = factory.createUniqueName("".concat(prefix, "_").concat(name), 16 /* Optimistic */);
             if (resolver.getNodeCheckFlags(node) & 524288 /* BlockScopedBindingInLoop */) {
                 addBlockScopedVariable(identifier);
             }
@@ -95162,7 +95167,7 @@ var ts;
                 specifierSourceImports = ts.createMap();
                 currentFileState.utilizedImplicitRuntimeImports.set(importSource, specifierSourceImports);
             }
-            var generatedName = factory.createUniqueName("_" + name, 16 /* Optimistic */ | 32 /* FileLevel */ | 64 /* AllowNameSubstitution */);
+            var generatedName = factory.createUniqueName("_".concat(name), 16 /* Optimistic */ | 32 /* FileLevel */ | 64 /* AllowNameSubstitution */);
             var specifier = factory.createImportSpecifier(/*isTypeOnly*/ false, factory.createIdentifier(name), generatedName);
             generatedName.generatedImportReference = specifier;
             specifierSourceImports.set(name, specifier);
@@ -96301,11 +96306,11 @@ var ts;
                     }
                     else {
                         if (node.kind === 245 /* BreakStatement */) {
-                            labelMarker = "break-" + label.escapedText;
+                            labelMarker = "break-".concat(label.escapedText);
                             setLabeledJump(convertedLoopState, /*isBreak*/ true, ts.idText(label), labelMarker);
                         }
                         else {
-                            labelMarker = "continue-" + label.escapedText;
+                            labelMarker = "continue-".concat(label.escapedText);
                             setLabeledJump(convertedLoopState, /*isBreak*/ false, ts.idText(label), labelMarker);
                         }
                     }
@@ -105114,7 +105119,7 @@ var ts;
             return getTypeAliasDeclarationVisibilityError;
         }
         else {
-            return ts.Debug.assertNever(node, "Attempted to set a declaration diagnostic context for unhandled node kind: " + ts.SyntaxKind[node.kind]);
+            return ts.Debug.assertNever(node, "Attempted to set a declaration diagnostic context for unhandled node kind: ".concat(ts.SyntaxKind[node.kind]));
         }
         function getVariableDeclarationTypeVisibilityDiagnosticMessage(symbolAccessibilityResult) {
             if (node.kind === 253 /* VariableDeclaration */ || node.kind === 202 /* BindingElement */) {
@@ -105325,7 +105330,7 @@ var ts;
                             ts.Diagnostics.Parameter_0_of_accessor_has_or_is_using_name_1_from_private_module_2 :
                         ts.Diagnostics.Parameter_0_of_accessor_has_or_is_using_private_name_1;
                 default:
-                    return ts.Debug.fail("Unknown parent for parameter: " + ts.SyntaxKind[node.parent.kind]);
+                    return ts.Debug.fail("Unknown parent for parameter: ".concat(ts.SyntaxKind[node.parent.kind]));
             }
         }
         function getTypeParameterConstraintVisibilityError() {
@@ -106083,7 +106088,7 @@ var ts;
             while (ts.length(lateMarkedStatements)) {
                 var i = lateMarkedStatements.shift();
                 if (!ts.isLateVisibilityPaintedStatement(i)) {
-                    return ts.Debug.fail("Late replaced statement was found which is not handled by the declaration transformer!: " + (ts.SyntaxKind ? ts.SyntaxKind[i.kind] : i.kind));
+                    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));
                 }
                 var priorNeedsDeclare = needsDeclare;
                 needsDeclare = i.parent && ts.isSourceFile(i.parent) && !(ts.isExternalModule(i.parent) && isBundledEmit);
@@ -106272,7 +106277,7 @@ var ts;
                             return cleanup(input);
                         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));
                     }
-                    default: ts.Debug.assertNever(input, "Attempted to process unhandled node kind: " + ts.SyntaxKind[input.kind]);
+                    default: ts.Debug.assertNever(input, "Attempted to process unhandled node kind: ".concat(ts.SyntaxKind[input.kind]));
                 }
             }
             if (ts.isTupleTypeNode(input) && (ts.getLineAndCharacterOfPosition(currentSourceFile, input.pos).line === ts.getLineAndCharacterOfPosition(currentSourceFile, input.end).line)) {
@@ -106563,7 +106568,7 @@ var ts;
                     if (extendsClause_1 && !ts.isEntityNameExpression(extendsClause_1.expression) && extendsClause_1.expression.kind !== 104 /* NullKeyword */) {
                         // We must add a temporary declaration for the extends clause expression
                         var oldId = input.name ? ts.unescapeLeadingUnderscores(input.name.escapedText) : "default";
-                        var newId_1 = factory.createUniqueName(oldId + "_base", 16 /* Optimistic */);
+                        var newId_1 = factory.createUniqueName("".concat(oldId, "_base"), 16 /* Optimistic */);
                         getSymbolAccessibilityDiagnostic = function () { return ({
                             diagnosticMessage: ts.Diagnostics.extends_clause_of_exported_class_0_has_or_is_using_private_name_1,
                             errorNode: extendsClause_1,
@@ -106604,7 +106609,7 @@ var ts;
                 }
             }
             // Anything left unhandled is an error, so this should be unreachable
-            return ts.Debug.assertNever(input, "Unhandled top-level node in declaration emit: " + ts.SyntaxKind[input.kind]);
+            return ts.Debug.assertNever(input, "Unhandled top-level node in declaration emit: ".concat(ts.SyntaxKind[input.kind]));
             function cleanup(node) {
                 if (isEnclosingDeclaration(input)) {
                     enclosingDeclaration = previousEnclosingDeclaration;
@@ -107496,13 +107501,13 @@ var ts;
         if (ts.fileExtensionIs(inputFileName, ".json" /* Json */))
             return;
         if (js && configFile.options.sourceMap) {
-            addOutput(js + ".map");
+            addOutput("".concat(js, ".map"));
         }
         if (ts.getEmitDeclarations(configFile.options)) {
             var dts = getOutputDeclarationFileName(inputFileName, configFile, ignoreCase, getCommonSourceDirectory);
             addOutput(dts);
             if (configFile.options.declarationMap) {
-                addOutput(dts + ".map");
+                addOutput("".concat(dts, ".map"));
             }
         }
     }
@@ -107571,7 +107576,7 @@ var ts;
     function getFirstProjectOutput(configFile, ignoreCase) {
         if (ts.outFile(configFile.options)) {
             var jsFilePath = getOutputPathsForBundle(configFile.options, /*forceDtsPaths*/ false).jsFilePath;
-            return ts.Debug.checkDefined(jsFilePath, "project " + configFile.options.configFilePath + " expected to have at least one output");
+            return ts.Debug.checkDefined(jsFilePath, "project ".concat(configFile.options.configFilePath, " expected to have at least one output"));
         }
         var getCommonSourceDirectory = ts.memoize(function () { return getCommonSourceDirectoryOfConfig(configFile, ignoreCase); });
         for (var _a = 0, _b = configFile.fileNames; _a < _b.length; _a++) {
@@ -107590,7 +107595,7 @@ var ts;
         var buildInfoPath = getTsBuildInfoEmitOutputFilePath(configFile.options);
         if (buildInfoPath)
             return buildInfoPath;
-        return ts.Debug.fail("project " + configFile.options.configFilePath + " expected to have at least one output");
+        return ts.Debug.fail("project ".concat(configFile.options.configFilePath, " expected to have at least one output"));
     }
     ts.getFirstProjectOutput = getFirstProjectOutput;
     /*@internal*/
@@ -107816,7 +107821,7 @@ var ts;
                 if (sourceMappingURL) {
                     if (!writer.isAtStartOfLine())
                         writer.rawWrite(newLine);
-                    writer.writeComment("//# " + "sourceMappingURL" + "=" + sourceMappingURL); // Tools can sometimes see this line as a source mapping url comment
+                    writer.writeComment("//# ".concat("sourceMappingURL", "=").concat(sourceMappingURL)); // Tools can sometimes see this line as a source mapping url comment
                 }
                 // Write the source map
                 if (sourceMapFilePath) {
@@ -107865,7 +107870,7 @@ var ts;
                 // Encode the sourceMap into the sourceMap url
                 var sourceMapText = sourceMapGenerator.toString();
                 var base64SourceMapText = ts.base64encode(ts.sys, sourceMapText);
-                return "data:application/json;base64," + base64SourceMapText;
+                return "data:application/json;base64,".concat(base64SourceMapText);
             }
             var sourceMapFile = ts.getBaseFileName(ts.normalizeSlashes(ts.Debug.checkDefined(sourceMapFilePath)));
             if (mapOptions.mapRoot) {
@@ -108045,7 +108050,7 @@ var ts;
                             return;
                         break;
                     default:
-                        ts.Debug.fail("Unexpected path: " + name);
+                        ts.Debug.fail("Unexpected path: ".concat(name));
                 }
                 outputFiles.push({ name: name, text: text, writeByteOrderMark: writeByteOrderMark });
             },
@@ -108905,7 +108910,7 @@ var ts;
                 return writeTokenNode(node, writeKeyword);
             if (ts.isTokenKind(node.kind))
                 return writeTokenNode(node, writePunctuation);
-            ts.Debug.fail("Unhandled SyntaxKind: " + ts.Debug.formatSyntaxKind(node.kind) + ".");
+            ts.Debug.fail("Unhandled SyntaxKind: ".concat(ts.Debug.formatSyntaxKind(node.kind), "."));
         }
         function emitMappedTypeParameter(node) {
             emit(node.name);
@@ -109075,13 +109080,13 @@ var ts;
             }
         }
         function emitPlaceholder(hint, node, snippet) {
-            nonEscapingWrite("${" + snippet.order + ":"); // `${2:`
+            nonEscapingWrite("${".concat(snippet.order, ":")); // `${2:`
             pipelineEmitWithHintWorker(hint, node, /*allowSnippets*/ false); // `...`
             nonEscapingWrite("}"); // `}`
             // `${2:...}`
         }
         function emitTabStop(snippet) {
-            nonEscapingWrite("$" + snippet.order);
+            nonEscapingWrite("$".concat(snippet.order));
         }
         //
         // Identifiers
@@ -110803,17 +110808,17 @@ var ts;
                 writeLine();
             }
             if (currentSourceFile && currentSourceFile.moduleName) {
-                writeComment("/// <amd-module name=\"" + currentSourceFile.moduleName + "\" />");
+                writeComment("/// <amd-module name=\"".concat(currentSourceFile.moduleName, "\" />"));
                 writeLine();
             }
             if (currentSourceFile && currentSourceFile.amdDependencies) {
                 for (var _a = 0, _b = currentSourceFile.amdDependencies; _a < _b.length; _a++) {
                     var dep = _b[_a];
                     if (dep.name) {
-                        writeComment("/// <amd-dependency name=\"" + dep.name + "\" path=\"" + dep.path + "\" />");
+                        writeComment("/// <amd-dependency name=\"".concat(dep.name, "\" path=\"").concat(dep.path, "\" />"));
                     }
                     else {
-                        writeComment("/// <amd-dependency path=\"" + dep.path + "\" />");
+                        writeComment("/// <amd-dependency path=\"".concat(dep.path, "\" />"));
                     }
                     writeLine();
                 }
@@ -110821,7 +110826,7 @@ var ts;
             for (var _c = 0, files_2 = files; _c < files_2.length; _c++) {
                 var directive = files_2[_c];
                 var pos = writer.getTextPos();
-                writeComment("/// <reference path=\"" + directive.fileName + "\" />");
+                writeComment("/// <reference path=\"".concat(directive.fileName, "\" />"));
                 if (bundleFileInfo)
                     bundleFileInfo.sections.push({ pos: pos, end: writer.getTextPos(), kind: "reference" /* Reference */, data: directive.fileName });
                 writeLine();
@@ -110829,7 +110834,7 @@ var ts;
             for (var _d = 0, types_24 = types; _d < types_24.length; _d++) {
                 var directive = types_24[_d];
                 var pos = writer.getTextPos();
-                writeComment("/// <reference types=\"" + directive.fileName + "\" />");
+                writeComment("/// <reference types=\"".concat(directive.fileName, "\" />"));
                 if (bundleFileInfo)
                     bundleFileInfo.sections.push({ pos: pos, end: writer.getTextPos(), kind: "type" /* Type */, data: directive.fileName });
                 writeLine();
@@ -110837,7 +110842,7 @@ var ts;
             for (var _e = 0, libs_1 = libs; _e < libs_1.length; _e++) {
                 var directive = libs_1[_e];
                 var pos = writer.getTextPos();
-                writeComment("/// <reference lib=\"" + directive.fileName + "\" />");
+                writeComment("/// <reference lib=\"".concat(directive.fileName, "\" />"));
                 if (bundleFileInfo)
                     bundleFileInfo.sections.push({ pos: pos, end: writer.getTextPos(), kind: "lib" /* Lib */, data: directive.fileName });
                 writeLine();
@@ -111612,9 +111617,9 @@ var ts;
                 var textSourceNode = node.textSourceNode;
                 if (ts.isIdentifier(textSourceNode) || ts.isNumericLiteral(textSourceNode)) {
                     var text = ts.isNumericLiteral(textSourceNode) ? textSourceNode.text : getTextOfNode(textSourceNode);
-                    return jsxAttributeEscape ? "\"" + ts.escapeJsxAttributeString(text) + "\"" :
-                        neverAsciiEscape || (ts.getEmitFlags(node) & 16777216 /* NoAsciiEscaping */) ? "\"" + ts.escapeString(text) + "\"" :
-                            "\"" + ts.escapeNonAsciiString(text) + "\"";
+                    return jsxAttributeEscape ? "\"".concat(ts.escapeJsxAttributeString(text), "\"") :
+                        neverAsciiEscape || (ts.getEmitFlags(node) & 16777216 /* NoAsciiEscaping */) ? "\"".concat(ts.escapeString(text), "\"") :
+                            "\"".concat(ts.escapeNonAsciiString(text), "\"");
                 }
                 else {
                     return getLiteralTextOfNode(textSourceNode, neverAsciiEscape, jsxAttributeEscape);
@@ -112091,8 +112096,8 @@ var ts;
         }
         function formatSynthesizedComment(comment) {
             return comment.kind === 3 /* MultiLineCommentTrivia */
-                ? "/*" + comment.text + "*/"
-                : "//" + comment.text;
+                ? "/*".concat(comment.text, "*/")
+                : "//".concat(comment.text);
         }
         function emitBodyWithDetachedComments(node, detachedRange, emitCallback) {
             enterComment();
@@ -112600,7 +112605,7 @@ var ts;
             var rootResult = tryReadDirectory(rootDir, rootDirPath);
             var rootSymLinkResult;
             if (rootResult !== undefined) {
-                return ts.matchFiles(rootDir, extensions, excludes, includes, useCaseSensitiveFileNames, currentDirectory, depth, getFileSystemEntries, realpath, directoryExists);
+                return ts.matchFiles(rootDir, extensions, excludes, includes, useCaseSensitiveFileNames, currentDirectory, depth, getFileSystemEntries, realpath);
             }
             return host.readDirectory(rootDir, extensions, excludes, includes, depth);
             function getFileSystemEntries(dir) {
@@ -112813,7 +112818,7 @@ var ts;
         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;
         var newPath = ts.removeIgnoredPath(fileOrDirectoryPath);
         if (!newPath) {
-            writeLog("Project: " + configFileName + " Detected ignored path: " + fileOrDirectory);
+            writeLog("Project: ".concat(configFileName, " Detected ignored path: ").concat(fileOrDirectory));
             return true;
         }
         fileOrDirectoryPath = newPath;
@@ -112822,11 +112827,11 @@ var ts;
         // If the the added or created file or directory is not supported file name, ignore the file
         // But when watched directory is added/removed, we need to reload the file list
         if (ts.hasExtension(fileOrDirectoryPath) && !ts.isSupportedSourceFileName(fileOrDirectory, options, extraFileExtensions)) {
-            writeLog("Project: " + configFileName + " Detected file add/remove of non supported extension: " + fileOrDirectory);
+            writeLog("Project: ".concat(configFileName, " Detected file add/remove of non supported extension: ").concat(fileOrDirectory));
             return true;
         }
         if (ts.isExcludedFile(fileOrDirectory, options.configFile.configFileSpecs, ts.getNormalizedAbsolutePath(ts.getDirectoryPath(configFileName), currentDirectory), useCaseSensitiveFileNames, currentDirectory)) {
-            writeLog("Project: " + configFileName + " Detected excluded file: " + fileOrDirectory);
+            writeLog("Project: ".concat(configFileName, " Detected excluded file: ").concat(fileOrDirectory));
             return true;
         }
         if (!program)
@@ -112850,7 +112855,7 @@ var ts;
         var builderProgram = !realProgram && !ts.isArray(program) ? program : undefined;
         if (hasSourceFile((filePathWithoutExtension + ".ts" /* Ts */)) ||
             hasSourceFile((filePathWithoutExtension + ".tsx" /* Tsx */))) {
-            writeLog("Project: " + configFileName + " Detected output file: " + fileOrDirectory);
+            writeLog("Project: ".concat(configFileName, " Detected output file: ").concat(fileOrDirectory));
             return true;
         }
         return false;
@@ -112918,36 +112923,36 @@ var ts;
                 host.useCaseSensitiveFileNames();
         }
         function createExcludeWatcherWithLogging(file, flags, options, detailInfo1, detailInfo2) {
-            log("ExcludeWatcher:: Added:: " + getWatchInfo(file, flags, options, detailInfo1, detailInfo2, getDetailWatchInfo));
+            log("ExcludeWatcher:: Added:: ".concat(getWatchInfo(file, flags, options, detailInfo1, detailInfo2, getDetailWatchInfo)));
             return {
-                close: function () { return log("ExcludeWatcher:: Close:: " + getWatchInfo(file, flags, options, detailInfo1, detailInfo2, getDetailWatchInfo)); }
+                close: function () { return log("ExcludeWatcher:: Close:: ".concat(getWatchInfo(file, flags, options, detailInfo1, detailInfo2, getDetailWatchInfo))); }
             };
         }
         function createFileWatcherWithLogging(file, cb, flags, options, detailInfo1, detailInfo2) {
-            log("FileWatcher:: Added:: " + getWatchInfo(file, flags, options, detailInfo1, detailInfo2, getDetailWatchInfo));
+            log("FileWatcher:: Added:: ".concat(getWatchInfo(file, flags, options, detailInfo1, detailInfo2, getDetailWatchInfo)));
             var watcher = triggerInvokingFactory.watchFile(file, cb, flags, options, detailInfo1, detailInfo2);
             return {
                 close: function () {
-                    log("FileWatcher:: Close:: " + getWatchInfo(file, flags, options, detailInfo1, detailInfo2, getDetailWatchInfo));
+                    log("FileWatcher:: Close:: ".concat(getWatchInfo(file, flags, options, detailInfo1, detailInfo2, getDetailWatchInfo)));
                     watcher.close();
                 }
             };
         }
         function createDirectoryWatcherWithLogging(file, cb, flags, options, detailInfo1, detailInfo2) {
-            var watchInfo = "DirectoryWatcher:: Added:: " + getWatchInfo(file, flags, options, detailInfo1, detailInfo2, getDetailWatchInfo);
+            var watchInfo = "DirectoryWatcher:: Added:: ".concat(getWatchInfo(file, flags, options, detailInfo1, detailInfo2, getDetailWatchInfo));
             log(watchInfo);
             var start = ts.timestamp();
             var watcher = triggerInvokingFactory.watchDirectory(file, cb, flags, options, detailInfo1, detailInfo2);
             var elapsed = ts.timestamp() - start;
-            log("Elapsed:: " + elapsed + "ms " + watchInfo);
+            log("Elapsed:: ".concat(elapsed, "ms ").concat(watchInfo));
             return {
                 close: function () {
-                    var watchInfo = "DirectoryWatcher:: Close:: " + getWatchInfo(file, flags, options, detailInfo1, detailInfo2, getDetailWatchInfo);
+                    var watchInfo = "DirectoryWatcher:: Close:: ".concat(getWatchInfo(file, flags, options, detailInfo1, detailInfo2, getDetailWatchInfo));
                     log(watchInfo);
                     var start = ts.timestamp();
                     watcher.close();
                     var elapsed = ts.timestamp() - start;
-                    log("Elapsed:: " + elapsed + "ms " + watchInfo);
+                    log("Elapsed:: ".concat(elapsed, "ms ").concat(watchInfo));
                 }
             };
         }
@@ -112957,16 +112962,16 @@ var ts;
                 for (var _i = 0; _i < arguments.length; _i++) {
                     args[_i] = arguments[_i];
                 }
-                var triggerredInfo = (key === "watchFile" ? "FileWatcher" : "DirectoryWatcher") + ":: Triggered with " + args[0] + " " + (args[1] !== undefined ? args[1] : "") + ":: " + getWatchInfo(file, flags, options, detailInfo1, detailInfo2, getDetailWatchInfo);
+                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));
                 log(triggerredInfo);
                 var start = ts.timestamp();
                 cb.call.apply(cb, __spreadArray([/*thisArg*/ undefined], args, false));
                 var elapsed = ts.timestamp() - start;
-                log("Elapsed:: " + elapsed + "ms " + triggerredInfo);
+                log("Elapsed:: ".concat(elapsed, "ms ").concat(triggerredInfo));
             }, flags, options, detailInfo1, detailInfo2); };
         }
         function getWatchInfo(file, flags, options, detailInfo1, detailInfo2, getDetailWatchInfo) {
-            return "WatchInfo: " + file + " " + flags + " " + JSON.stringify(options) + " " + (getDetailWatchInfo ? getDetailWatchInfo(detailInfo1, detailInfo2) : detailInfo2 === undefined ? detailInfo1 : detailInfo1 + " " + detailInfo2);
+            return "WatchInfo: ".concat(file, " ").concat(flags, " ").concat(JSON.stringify(options), " ").concat(getDetailWatchInfo ? getDetailWatchInfo(detailInfo1, detailInfo2) : detailInfo2 === undefined ? detailInfo1 : "".concat(detailInfo1, " ").concat(detailInfo2));
         }
     }
     ts.getWatchFactory = getWatchFactory;
@@ -113273,12 +113278,12 @@ var ts;
     }
     ts.formatDiagnostics = formatDiagnostics;
     function formatDiagnostic(diagnostic, host) {
-        var errorMessage = ts.diagnosticCategoryName(diagnostic) + " TS" + diagnostic.code + ": " + flattenDiagnosticMessageText(diagnostic.messageText, host.getNewLine()) + host.getNewLine();
+        var errorMessage = "".concat(ts.diagnosticCategoryName(diagnostic), " TS").concat(diagnostic.code, ": ").concat(flattenDiagnosticMessageText(diagnostic.messageText, host.getNewLine())).concat(host.getNewLine());
         if (diagnostic.file) {
             var _a = ts.getLineAndCharacterOfPosition(diagnostic.file, diagnostic.start), line = _a.line, character = _a.character; // TODO: GH#18217
             var fileName = diagnostic.file.fileName;
             var relativeFileName = ts.convertToRelativePath(fileName, host.getCurrentDirectory(), function (fileName) { return host.getCanonicalFileName(fileName); });
-            return relativeFileName + "(" + (line + 1) + "," + (character + 1) + "): " + errorMessage;
+            return "".concat(relativeFileName, "(").concat(line + 1, ",").concat(character + 1, "): ") + errorMessage;
         }
         return errorMessage;
     }
@@ -113366,9 +113371,9 @@ var ts;
         var output = "";
         output += color(relativeFileName, ForegroundColorEscapeSequences.Cyan);
         output += ":";
-        output += color("" + (firstLine + 1), ForegroundColorEscapeSequences.Yellow);
+        output += color("".concat(firstLine + 1), ForegroundColorEscapeSequences.Yellow);
         output += ":";
-        output += color("" + (firstLineChar + 1), ForegroundColorEscapeSequences.Yellow);
+        output += color("".concat(firstLineChar + 1), ForegroundColorEscapeSequences.Yellow);
         return output;
     }
     ts.formatLocation = formatLocation;
@@ -113382,7 +113387,7 @@ var ts;
                 output += " - ";
             }
             output += formatColorAndReset(ts.diagnosticCategoryName(diagnostic), getCategoryFormat(diagnostic.category));
-            output += formatColorAndReset(" TS" + diagnostic.code + ": ", ForegroundColorEscapeSequences.Grey);
+            output += formatColorAndReset(" TS".concat(diagnostic.code, ": "), ForegroundColorEscapeSequences.Grey);
             output += flattenDiagnosticMessageText(diagnostic.messageText, host.getNewLine());
             if (diagnostic.file) {
                 output += host.getNewLine();
@@ -113491,7 +113496,7 @@ var ts;
             var result = void 0;
             var mode = getModeForResolutionAtIndex(containingFile, i);
             i++;
-            var cacheKey = mode !== undefined ? mode + "|" + name : name;
+            var cacheKey = mode !== undefined ? "".concat(mode, "|").concat(name) : name;
             if (cache.has(cacheKey)) {
                 result = cache.get(cacheKey);
             }
@@ -115575,7 +115580,7 @@ var ts;
                 path += (i === 2 ? "/" : "-") + components[i];
                 i++;
             }
-            var resolveFrom = ts.combinePaths(currentDirectory, "__lib_node_modules_lookup_" + libFileName + "__.ts");
+            var resolveFrom = ts.combinePaths(currentDirectory, "__lib_node_modules_lookup_".concat(libFileName, "__.ts"));
             var localOverrideModuleResult = ts.resolveModuleName("@typescript/lib-" + path, resolveFrom, { moduleResolution: ts.ModuleResolutionKind.NodeJs }, host, moduleResolutionCache);
             if (localOverrideModuleResult === null || localOverrideModuleResult === void 0 ? void 0 : localOverrideModuleResult.resolvedModule) {
                 return localOverrideModuleResult.resolvedModule.resolvedFileName;
@@ -116396,12 +116401,12 @@ var ts;
         }
         function directoryExistsIfProjectReferenceDeclDir(dir) {
             var dirPath = host.toPath(dir);
-            var dirPathWithTrailingDirectorySeparator = "" + dirPath + ts.directorySeparator;
+            var dirPathWithTrailingDirectorySeparator = "".concat(dirPath).concat(ts.directorySeparator);
             return ts.forEachKey(setOfDeclarationDirectories, function (declDirPath) { return dirPath === declDirPath ||
                 // Any parent directory of declaration dir
                 ts.startsWith(declDirPath, dirPathWithTrailingDirectorySeparator) ||
                 // Any directory inside declaration dir
-                ts.startsWith(dirPath, declDirPath + "/"); });
+                ts.startsWith(dirPath, "".concat(declDirPath, "/")); });
         }
         function handleDirectoryCouldBeSymlink(directory) {
             var _a;
@@ -116454,7 +116459,7 @@ var ts;
                 if (isFile && result) {
                     // Store the real path for the file'
                     var absolutePath = ts.getNormalizedAbsolutePath(fileOrDirectory, host.compilerHost.getCurrentDirectory());
-                    symlinkCache.setSymlinkedFile(fileOrDirectoryPath, "" + symlinkedDirectory.real + absolutePath.replace(new RegExp(directoryPath, "i"), ""));
+                    symlinkCache.setSymlinkedFile(fileOrDirectoryPath, "".concat(symlinkedDirectory.real).concat(absolutePath.replace(new RegExp(directoryPath, "i"), "")));
                 }
                 return result;
             }) || false;
@@ -116912,7 +116917,7 @@ var ts;
                 /*forceDtsEmit*/ true);
                 var firstDts_1 = ts.firstOrUndefined(emitOutput_1.outputFiles);
                 if (firstDts_1) {
-                    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: " + ts.getAnyExtensionFromPath(firstDts_1.name) + " for " + firstDts_1.name + ":: All output files: " + JSON.stringify(emitOutput_1.outputFiles.map(function (f) { return f.name; })); });
+                    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; }))); });
                     latestSignature = (computeHash || ts.generateDjb2Hash)(firstDts_1.text);
                     if (exportedModulesMapCache && latestSignature !== prevSignature) {
                         updateExportedModules(sourceFile, emitOutput_1.exportedModulesFromDeclarationEmit, exportedModulesMapCache);
@@ -117420,7 +117425,7 @@ var ts;
             return;
         }
         else {
-            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: " + affectedFile.fileName);
+            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));
         }
         if (!state.compilerOptions.assumeChangesOnlyAffectDirectDependencies) {
             forEachReferencingModulesOfExportOfAffectedFile(state, affectedFile, function (state, path) { return handleDtsMayChangeOf(state, path, cancellationToken, computeHash); });
@@ -118565,7 +118570,7 @@ var ts;
                 failedLookupLocation = ts.isRootedDiskPath(failedLookupLocation) ? ts.normalizePath(failedLookupLocation) : ts.getNormalizedAbsolutePath(failedLookupLocation, getCurrentDirectory());
                 var failedLookupPathSplit = failedLookupLocationPath.split(ts.directorySeparator);
                 var failedLookupSplit = failedLookupLocation.split(ts.directorySeparator);
-                ts.Debug.assert(failedLookupSplit.length === failedLookupPathSplit.length, "FailedLookup: " + failedLookupLocation + " failedLookupLocationPath: " + failedLookupLocationPath);
+                ts.Debug.assert(failedLookupSplit.length === failedLookupPathSplit.length, "FailedLookup: ".concat(failedLookupLocation, " failedLookupLocationPath: ").concat(failedLookupLocationPath));
                 if (failedLookupPathSplit.length > rootSplitLength + 1) {
                     // Instead of watching root, watch directory in root to avoid watching excluded directories not needed for module resolution
                     return {
@@ -119547,13 +119552,15 @@ var ts;
                 if (host.fileExists(packageJsonPath)) {
                     var packageJsonContent = JSON.parse(host.readFile(packageJsonPath));
                     // TODO: Inject `require` or `import` condition based on the intended import mode
-                    var fromExports = packageJsonContent.exports && typeof packageJsonContent.name === "string" ? tryGetModuleNameFromExports(options, path, packageRootPath, packageJsonContent.name, packageJsonContent.exports, ["node", "types"]) : undefined;
-                    if (fromExports) {
-                        var withJsExtension = !ts.hasTSFileExtension(fromExports.moduleFileToTry) ? fromExports : { moduleFileToTry: ts.removeFileExtension(fromExports.moduleFileToTry) + tryGetJSExtensionForFile(fromExports.moduleFileToTry, options) };
-                        return __assign(__assign({}, withJsExtension), { verbatimFromExports: true });
-                    }
-                    if (packageJsonContent.exports) {
-                        return { moduleFileToTry: path, blockedByExports: true };
+                    if (ts.getEmitModuleResolutionKind(options) === ts.ModuleResolutionKind.Node12 || ts.getEmitModuleResolutionKind(options) === ts.ModuleResolutionKind.NodeNext) {
+                        var fromExports = packageJsonContent.exports && typeof packageJsonContent.name === "string" ? tryGetModuleNameFromExports(options, path, packageRootPath, packageJsonContent.name, packageJsonContent.exports, ["node", "types"]) : undefined;
+                        if (fromExports) {
+                            var withJsExtension = !ts.hasTSFileExtension(fromExports.moduleFileToTry) ? fromExports : { moduleFileToTry: ts.removeFileExtension(fromExports.moduleFileToTry) + tryGetJSExtensionForFile(fromExports.moduleFileToTry, options) };
+                            return __assign(__assign({}, withJsExtension), { verbatimFromExports: true });
+                        }
+                        if (packageJsonContent.exports) {
+                            return { moduleFileToTry: path, blockedByExports: true };
+                        }
                     }
                     var versionPaths = packageJsonContent.typesVersions
                         ? ts.getPackageJsonTypesVersionsPaths(packageJsonContent.typesVersions)
@@ -119677,7 +119684,7 @@ var ts;
         }
         function getJSExtensionForFile(fileName, options) {
             var _a;
-            return (_a = tryGetJSExtensionForFile(fileName, options)) !== null && _a !== void 0 ? _a : ts.Debug.fail("Extension " + ts.extensionFromPath(fileName) + " is unsupported:: FileName:: " + fileName);
+            return (_a = tryGetJSExtensionForFile(fileName, options)) !== null && _a !== void 0 ? _a : ts.Debug.fail("Extension ".concat(ts.extensionFromPath(fileName), " is unsupported:: FileName:: ").concat(fileName));
         }
         function tryGetJSExtensionForFile(fileName, options) {
             var ext = ts.tryGetExtensionFromPath(fileName);
@@ -119780,8 +119787,8 @@ var ts;
         return pretty ?
             function (diagnostic, newLine, options) {
                 clearScreenIfNotWatchingForFileChanges(system, diagnostic, options);
-                var output = "[" + ts.formatColorAndReset(getLocaleTimeString(system), ts.ForegroundColorEscapeSequences.Grey) + "] ";
-                output += "" + ts.flattenDiagnosticMessageText(diagnostic.messageText, system.newLine) + (newLine + newLine);
+                var output = "[".concat(ts.formatColorAndReset(getLocaleTimeString(system), ts.ForegroundColorEscapeSequences.Grey), "] ");
+                output += "".concat(ts.flattenDiagnosticMessageText(diagnostic.messageText, system.newLine)).concat(newLine + newLine);
                 system.write(output);
             } :
             function (diagnostic, newLine, options) {
@@ -119789,8 +119796,8 @@ var ts;
                 if (!clearScreenIfNotWatchingForFileChanges(system, diagnostic, options)) {
                     output += newLine;
                 }
-                output += getLocaleTimeString(system) + " - ";
-                output += "" + ts.flattenDiagnosticMessageText(diagnostic.messageText, system.newLine) + getPlainDiagnosticFollowingNewLines(diagnostic, newLine);
+                output += "".concat(getLocaleTimeString(system), " - ");
+                output += "".concat(ts.flattenDiagnosticMessageText(diagnostic.messageText, system.newLine)).concat(getPlainDiagnosticFollowingNewLines(diagnostic, newLine));
                 system.write(output);
             };
     }
@@ -119818,7 +119825,7 @@ var ts;
         if (errorCount === 0)
             return "";
         var d = ts.createCompilerDiagnostic(errorCount === 1 ? ts.Diagnostics.Found_1_error : ts.Diagnostics.Found_0_errors, errorCount);
-        return "" + newLine + ts.flattenDiagnosticMessageText(d.messageText, newLine) + newLine + newLine;
+        return "".concat(newLine).concat(ts.flattenDiagnosticMessageText(d.messageText, newLine)).concat(newLine).concat(newLine);
     }
     ts.getErrorSummaryText = getErrorSummaryText;
     function isBuilderProgram(program) {
@@ -119844,9 +119851,9 @@ var ts;
         var relativeFileName = function (fileName) { return ts.convertToRelativePath(fileName, program.getCurrentDirectory(), getCanonicalFileName); };
         for (var _i = 0, _c = program.getSourceFiles(); _i < _c.length; _i++) {
             var file = _c[_i];
-            write("" + toFileName(file, relativeFileName));
-            (_a = reasons.get(file.path)) === null || _a === void 0 ? void 0 : _a.forEach(function (reason) { return write("  " + fileIncludeReasonToDiagnostics(program, reason, relativeFileName).messageText); });
-            (_b = explainIfFileIsRedirect(file, relativeFileName)) === null || _b === void 0 ? void 0 : _b.forEach(function (d) { return write("  " + d.messageText); });
+            write("".concat(toFileName(file, relativeFileName)));
+            (_a = reasons.get(file.path)) === null || _a === void 0 ? void 0 : _a.forEach(function (reason) { return write("  ".concat(fileIncludeReasonToDiagnostics(program, reason, relativeFileName).messageText)); });
+            (_b = explainIfFileIsRedirect(file, relativeFileName)) === null || _b === void 0 ? void 0 : _b.forEach(function (d) { return write("  ".concat(d.messageText)); });
         }
     }
     ts.explainFiles = explainFiles;
@@ -119886,7 +119893,7 @@ var ts;
             if (isJsonFile && !ts.endsWith(includeSpec, ".json" /* Json */))
                 return false;
             var pattern = ts.getPatternFromSpec(includeSpec, basePath, "files");
-            return !!pattern && ts.getRegexFromPattern("(" + pattern + ")$", useCaseSensitiveFileNames).test(fileName);
+            return !!pattern && ts.getRegexFromPattern("(".concat(pattern, ")$"), useCaseSensitiveFileNames).test(fileName);
         });
     }
     ts.getMatchedIncludeSpec = getMatchedIncludeSpec;
@@ -119895,7 +119902,7 @@ var ts;
         var options = program.getCompilerOptions();
         if (ts.isReferencedFile(reason)) {
             var referenceLocation = ts.getReferencedFileLocation(function (path) { return program.getSourceFileByPath(path); }, reason);
-            var referenceText = ts.isReferenceFileLocation(referenceLocation) ? referenceLocation.file.text.substring(referenceLocation.pos, referenceLocation.end) : "\"" + referenceLocation.text + "\"";
+            var referenceText = ts.isReferenceFileLocation(referenceLocation) ? referenceLocation.file.text.substring(referenceLocation.pos, referenceLocation.end) : "\"".concat(referenceLocation.text, "\"");
             var message = void 0;
             ts.Debug.assert(ts.isReferenceFileLocation(referenceLocation) || reason.kind === ts.FileIncludeKind.Import, "Only synthetic references are imports");
             switch (reason.kind) {
@@ -120019,7 +120026,7 @@ var ts;
             var currentDir_1 = program.getCurrentDirectory();
             ts.forEach(emittedFiles, function (file) {
                 var filepath = ts.getNormalizedAbsolutePath(file, currentDir_1);
-                write("TSFILE: " + filepath);
+                write("TSFILE: ".concat(filepath));
             });
             listFiles(program, write);
         }
@@ -120347,7 +120354,7 @@ var ts;
         }
         var _b = ts.createWatchFactory(host, compilerOptions), watchFile = _b.watchFile, watchDirectory = _b.watchDirectory, writeLog = _b.writeLog;
         var getCanonicalFileName = ts.createGetCanonicalFileName(useCaseSensitiveFileNames);
-        writeLog("Current directory: " + currentDirectory + " CaseSensitiveFileNames: " + useCaseSensitiveFileNames);
+        writeLog("Current directory: ".concat(currentDirectory, " CaseSensitiveFileNames: ").concat(useCaseSensitiveFileNames));
         var configFileWatcher;
         if (configFileName) {
             configFileWatcher = watchFile(configFileName, scheduleProgramReload, ts.PollingInterval.High, watchOptions, ts.WatchType.ConfigFile);
@@ -120496,10 +120503,10 @@ var ts;
         function createNewProgram(hasInvalidatedResolution) {
             // Compile the program
             writeLog("CreatingProgramWith::");
-            writeLog("  roots: " + JSON.stringify(rootFileNames));
-            writeLog("  options: " + JSON.stringify(compilerOptions));
+            writeLog("  roots: ".concat(JSON.stringify(rootFileNames)));
+            writeLog("  options: ".concat(JSON.stringify(compilerOptions)));
             if (projectReferences)
-                writeLog("  projectReferences: " + JSON.stringify(projectReferences));
+                writeLog("  projectReferences: ".concat(JSON.stringify(projectReferences)));
             var needsUpdateInTypeRootWatch = hasChangedCompilerOptions || !getCurrentProgram();
             hasChangedCompilerOptions = false;
             hasChangedConfigFileParsingErrors = false;
@@ -120660,7 +120667,7 @@ var ts;
                 return resolutionCache.invalidateResolutionsOfFailedLookupLocations();
             }
             var pending = clearInvalidateResolutionsOfFailedLookupLocations();
-            writeLog("Scheduling invalidateFailedLookup" + (pending ? ", Cancelled earlier one" : ""));
+            writeLog("Scheduling invalidateFailedLookup".concat(pending ? ", Cancelled earlier one" : ""));
             timerToInvalidateFailedLookupResolutions = host.setTimeout(invalidateResolutionsOfFailedLookup, 250);
         }
         function invalidateResolutionsOfFailedLookup() {
@@ -120720,7 +120727,7 @@ var ts;
             synchronizeProgram();
         }
         function reloadConfigFile() {
-            writeLog("Reloading config file: " + configFileName);
+            writeLog("Reloading config file: ".concat(configFileName));
             reloadLevel = ts.ConfigFileProgramReloadLevel.None;
             if (cachedDirectoryStructureHost) {
                 cachedDirectoryStructureHost.clearCache();
@@ -120761,7 +120768,7 @@ var ts;
                     return config.parsedCommandLine;
                 }
             }
-            writeLog("Loading config file: " + configFileName);
+            writeLog("Loading config file: ".concat(configFileName));
             var parsedCommandLine = host.getParsedCommandLine ?
                 host.getParsedCommandLine(configFileName) :
                 getParsedCommandLineFromConfigFileHost(configFileName);
@@ -121065,8 +121072,8 @@ var ts;
      */
     function createBuilderStatusReporter(system, pretty) {
         return function (diagnostic) {
-            var output = pretty ? "[" + ts.formatColorAndReset(ts.getLocaleTimeString(system), ts.ForegroundColorEscapeSequences.Grey) + "] " : ts.getLocaleTimeString(system) + " - ";
-            output += "" + ts.flattenDiagnosticMessageText(diagnostic.messageText, system.newLine) + (system.newLine + system.newLine);
+            var output = pretty ? "[".concat(ts.formatColorAndReset(ts.getLocaleTimeString(system), ts.ForegroundColorEscapeSequences.Grey), "] ") : "".concat(ts.getLocaleTimeString(system), " - ");
+            output += "".concat(ts.flattenDiagnosticMessageText(diagnostic.messageText, system.newLine)).concat(system.newLine + system.newLine);
             system.write(output);
         };
     }
@@ -121841,7 +121848,7 @@ var ts;
     function listEmittedFile(_a, proj, file) {
         var write = _a.write;
         if (write && proj.options.listEmittedFiles) {
-            write("TSFILE: " + file);
+            write("TSFILE: ".concat(file));
         }
     }
     function getOldProgram(_a, proj, parsed) {
@@ -121870,7 +121877,7 @@ var ts;
     function buildErrors(state, resolvedPath, program, config, diagnostics, buildResult, errorType) {
         var canEmitBuildInfo = !(buildResult & BuildResultFlags.SyntaxErrors) && program && !ts.outFile(program.getCompilerOptions());
         reportAndStoreErrors(state, resolvedPath, diagnostics);
-        state.projectStatus.set(resolvedPath, { type: ts.UpToDateStatusType.Unbuildable, reason: errorType + " errors" });
+        state.projectStatus.set(resolvedPath, { type: ts.UpToDateStatusType.Unbuildable, reason: "".concat(errorType, " errors") });
         if (canEmitBuildInfo)
             return { buildResult: buildResult, step: BuildStep.EmitBuildInfo };
         afterProgramDone(state, program, config);
@@ -121898,7 +121905,7 @@ var ts;
             if (!host.fileExists(inputFile)) {
                 return {
                     type: ts.UpToDateStatusType.Unbuildable,
-                    reason: inputFile + " does not exist"
+                    reason: "".concat(inputFile, " does not exist")
                 };
             }
             if (!force) {
@@ -122257,7 +122264,7 @@ var ts;
             }
         }
         if (filesToDelete) {
-            reportStatus(state, ts.Diagnostics.A_non_dry_build_would_delete_the_following_files_Colon_0, filesToDelete.map(function (f) { return "\r\n * " + f; }).join(""));
+            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(""));
         }
         return ts.ExitStatus.Success;
     }
@@ -122590,7 +122597,7 @@ var ts;
         function nowString() {
             // E.g. "12:34:56.789"
             var d = new Date();
-            return ts.padLeft(d.getHours().toString(), 2, "0") + ":" + ts.padLeft(d.getMinutes().toString(), 2, "0") + ":" + ts.padLeft(d.getSeconds().toString(), 2, "0") + "." + ts.padLeft(d.getMilliseconds().toString(), 3, "0");
+            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"));
         }
         server.nowString = nowString;
     })(server = ts.server || (ts.server = {}));
@@ -122601,7 +122608,7 @@ var ts;
     var JsTyping;
     (function (JsTyping) {
         function isTypingUpToDate(cachedTyping, availableTypingVersions) {
-            var availableVersion = new ts.Version(ts.getProperty(availableTypingVersions, "ts" + ts.versionMajorMinor) || ts.getProperty(availableTypingVersions, "latest"));
+            var availableVersion = new ts.Version(ts.getProperty(availableTypingVersions, "ts".concat(ts.versionMajorMinor)) || ts.getProperty(availableTypingVersions, "latest"));
             return availableVersion.compareTo(cachedTyping.version) <= 0;
         }
         JsTyping.isTypingUpToDate = isTypingUpToDate;
@@ -122654,7 +122661,7 @@ var ts;
             "worker_threads",
             "zlib"
         ];
-        JsTyping.prefixedNodeCoreModuleList = unprefixedNodeCoreModuleList.map(function (name) { return "node:" + name; });
+        JsTyping.prefixedNodeCoreModuleList = unprefixedNodeCoreModuleList.map(function (name) { return "node:".concat(name); });
         JsTyping.nodeCoreModuleList = __spreadArray(__spreadArray([], unprefixedNodeCoreModuleList, true), JsTyping.prefixedNodeCoreModuleList, true);
         JsTyping.nodeCoreModules = new ts.Set(JsTyping.nodeCoreModuleList);
         function nonRelativeModuleNameForTypingCache(moduleName) {
@@ -122733,7 +122740,7 @@ var ts;
                 var excludeTypingName = exclude_1[_i];
                 var didDelete = inferredTypings.delete(excludeTypingName);
                 if (didDelete && log)
-                    log("Typing for " + excludeTypingName + " is in exclude list, will be ignored.");
+                    log("Typing for ".concat(excludeTypingName, " is in exclude list, will be ignored."));
             }
             var newTypingNames = [];
             var cachedTypingPaths = [];
@@ -122747,7 +122754,7 @@ var ts;
             });
             var result = { cachedTypingPaths: cachedTypingPaths, newTypingNames: newTypingNames, filesToWatch: filesToWatch };
             if (log)
-                log("Result: " + JSON.stringify(result));
+                log("Result: ".concat(JSON.stringify(result)));
             return result;
             function addInferredTyping(typingName) {
                 if (!inferredTypings.has(typingName)) {
@@ -122756,7 +122763,7 @@ var ts;
             }
             function addInferredTypings(typingNames, message) {
                 if (log)
-                    log(message + ": " + JSON.stringify(typingNames));
+                    log("".concat(message, ": ").concat(JSON.stringify(typingNames)));
                 ts.forEach(typingNames, addInferredTyping);
             }
             /**
@@ -122769,7 +122776,7 @@ var ts;
                 filesToWatch.push(jsonPath);
                 var jsonConfig = ts.readConfigFile(jsonPath, function (path) { return host.readFile(path); }).config;
                 var jsonTypingNames = ts.flatMap([jsonConfig.dependencies, jsonConfig.devDependencies, jsonConfig.optionalDependencies, jsonConfig.peerDependencies], ts.getOwnKeys);
-                addInferredTypings(jsonTypingNames, "Typing names in '" + jsonPath + "' dependencies");
+                addInferredTypings(jsonTypingNames, "Typing names in '".concat(jsonPath, "' dependencies"));
             }
             /**
              * Infer typing names from given file names. For example, the file name "jquery-min.2.3.4.js"
@@ -122808,7 +122815,7 @@ var ts;
                 // depth of 2, so we access `node_modules/foo` but not `node_modules/foo/bar`
                 var fileNames = host.readDirectory(packagesFolderPath, [".json" /* Json */], /*excludes*/ undefined, /*includes*/ undefined, /*depth*/ 2);
                 if (log)
-                    log("Searching for typing names in " + packagesFolderPath + "; all files: " + JSON.stringify(fileNames));
+                    log("Searching for typing names in ".concat(packagesFolderPath, "; all files: ").concat(JSON.stringify(fileNames)));
                 var packageNames = [];
                 for (var _i = 0, fileNames_1 = fileNames; _i < fileNames_1.length; _i++) {
                     var fileName = fileNames_1[_i];
@@ -122835,7 +122842,7 @@ var ts;
                     if (ownTypes) {
                         var absolutePath = ts.getNormalizedAbsolutePath(ownTypes, ts.getDirectoryPath(normalizedFileName));
                         if (log)
-                            log("    Package '" + packageJson.name + "' provides its own types.");
+                            log("    Package '".concat(packageJson.name, "' provides its own types."));
                         inferredTypings.set(packageJson.name, absolutePath);
                     }
                     else {
@@ -122907,15 +122914,15 @@ var ts;
             var kind = isScopeName ? "Scope" : "Package";
             switch (result) {
                 case 1 /* EmptyName */:
-                    return "'" + typing + "':: " + kind + " name '" + name + "' cannot be empty";
+                    return "'".concat(typing, "':: ").concat(kind, " name '").concat(name, "' cannot be empty");
                 case 2 /* NameTooLong */:
-                    return "'" + typing + "':: " + kind + " name '" + name + "' should be less than " + maxPackageNameLength + " characters";
+                    return "'".concat(typing, "':: ").concat(kind, " name '").concat(name, "' should be less than ").concat(maxPackageNameLength, " characters");
                 case 3 /* NameStartsWithDot */:
-                    return "'" + typing + "':: " + kind + " name '" + name + "' cannot start with '.'";
+                    return "'".concat(typing, "':: ").concat(kind, " name '").concat(name, "' cannot start with '.'");
                 case 4 /* NameStartsWithUnderscore */:
-                    return "'" + typing + "':: " + kind + " name '" + name + "' cannot start with '_'";
+                    return "'".concat(typing, "':: ").concat(kind, " name '").concat(name, "' cannot start with '_'");
                 case 5 /* NameContainsNonURISafeCharacters */:
-                    return "'" + typing + "':: " + kind + " name '" + name + "' contains non URI safe characters";
+                    return "'".concat(typing, "':: ").concat(kind, " name '").concat(name, "' contains non URI safe characters");
                 case 0 /* Ok */:
                     return ts.Debug.fail(); // Shouldn't have called this.
                 default:
@@ -125473,7 +125480,7 @@ var ts;
         var prefix = ts.isJSDocLink(link) ? "link"
             : ts.isJSDocLinkCode(link) ? "linkcode"
                 : "linkplain";
-        var parts = [linkPart("{@" + prefix + " ")];
+        var parts = [linkPart("{@".concat(prefix, " "))];
         if (!link.name) {
             if (link.text)
                 parts.push(linkTextPart(link.text));
@@ -125721,7 +125728,7 @@ var ts;
     function getUniqueName(baseName, sourceFile) {
         var nameText = baseName;
         for (var i = 1; !ts.isFileLevelUniqueName(sourceFile, nameText); i++) {
-            nameText = baseName + "_" + i;
+            nameText = "".concat(baseName, "_").concat(i);
         }
         return nameText;
     }
@@ -125831,7 +125838,7 @@ var ts;
         // Editors can pass in undefined or empty string - we want to infer the preference in those cases.
         var quotePreference = getQuotePreference(sourceFile, preferences);
         var quoted = JSON.stringify(text);
-        return quotePreference === 0 /* Single */ ? "'" + ts.stripQuotes(quoted).replace(/'/g, "\\'").replace(/\\"/g, '"') + "'" : quoted;
+        return quotePreference === 0 /* Single */ ? "'".concat(ts.stripQuotes(quoted).replace(/'/g, "\\'").replace(/\\"/g, '"'), "'") : quoted;
     }
     ts.quote = quote;
     function isEqualityOperatorKind(kind) {
@@ -126203,7 +126210,7 @@ var ts;
             var components = ts.getPathComponents(ts.getPackageNameFromTypesPackageName(fullSpecifier)).slice(1);
             // Scoped packages
             if (ts.startsWith(components[0], "@")) {
-                return components[0] + "/" + components[1];
+                return "".concat(components[0], "/").concat(components[1]);
             }
             return components[0];
         }
@@ -126310,13 +126317,13 @@ var ts;
     ts.getNameForExportedSymbol = getNameForExportedSymbol;
     function getSymbolParentOrFail(symbol) {
         var _a;
-        return ts.Debug.checkDefined(symbol.parent, "Symbol parent was undefined. Flags: " + ts.Debug.formatSymbolFlags(symbol.flags) + ". " +
-            ("Declarations: " + ((_a = symbol.declarations) === null || _a === void 0 ? void 0 : _a.map(function (d) {
+        return ts.Debug.checkDefined(symbol.parent, "Symbol parent was undefined. Flags: ".concat(ts.Debug.formatSymbolFlags(symbol.flags), ". ") +
+            "Declarations: ".concat((_a = symbol.declarations) === null || _a === void 0 ? void 0 : _a.map(function (d) {
                 var kind = ts.Debug.formatSyntaxKind(d.kind);
                 var inJS = ts.isInJSFile(d);
                 var expression = d.expression;
-                return (inJS ? "[JS]" : "") + kind + (expression ? " (expression: " + ts.Debug.formatSyntaxKind(expression.kind) + ")" : "");
-            }).join(", ")) + "."));
+                return (inJS ? "[JS]" : "") + kind + (expression ? " (expression: ".concat(ts.Debug.formatSyntaxKind(expression.kind), ")") : "");
+            }).join(", "), "."));
     }
     /**
      * Useful to check whether a string contains another string at a specific index
@@ -126524,7 +126531,7 @@ var ts;
                 : checker.tryFindAmbientModule(info.moduleName));
             var symbol = info.symbol || cachedSymbol || ts.Debug.checkDefined(exportKind === 2 /* ExportEquals */
                 ? checker.resolveExternalModuleSymbol(moduleSymbol)
-                : checker.tryGetMemberInModuleExportsAndProperties(ts.unescapeLeadingUnderscores(info.symbolTableKey), moduleSymbol), "Could not find symbol '" + info.symbolName + "' by key '" + info.symbolTableKey + "' in module " + moduleSymbol.name);
+                : checker.tryGetMemberInModuleExportsAndProperties(ts.unescapeLeadingUnderscores(info.symbolTableKey), moduleSymbol), "Could not find symbol '".concat(info.symbolName, "' by key '").concat(info.symbolTableKey, "' in module ").concat(moduleSymbol.name));
             symbols.set(id, [symbol, moduleSymbol]);
             return {
                 symbol: symbol,
@@ -126537,7 +126544,7 @@ var ts;
         }
         function key(importedName, symbol, ambientModuleName, checker) {
             var moduleKey = ambientModuleName || "";
-            return importedName + "|" + ts.getSymbolId(ts.skipAlias(symbol, checker)) + "|" + moduleKey;
+            return "".concat(importedName, "|").concat(ts.getSymbolId(ts.skipAlias(symbol, checker)), "|").concat(moduleKey);
         }
         function parseKey(key) {
             var symbolName = key.substring(0, key.indexOf("|"));
@@ -126617,7 +126624,7 @@ var ts;
         if (autoImportProvider) {
             var start = ts.timestamp();
             forEachExternalModule(autoImportProvider.getTypeChecker(), autoImportProvider.getSourceFiles(), function (module, file) { return cb(module, file, autoImportProvider, /*isFromPackageJson*/ true); });
-            (_b = host.log) === null || _b === void 0 ? void 0 : _b.call(host, "forEachExternalModuleToImportFrom autoImportProvider: " + (ts.timestamp() - start));
+            (_b = host.log) === null || _b === void 0 ? void 0 : _b.call(host, "forEachExternalModuleToImportFrom autoImportProvider: ".concat(ts.timestamp() - start));
         }
     }
     ts.forEachExternalModuleToImportFrom = forEachExternalModuleToImportFrom;
@@ -126671,7 +126678,7 @@ var ts;
                 }
             });
         });
-        (_e = host.log) === null || _e === void 0 ? void 0 : _e.call(host, "getExportInfoMap: done in " + (ts.timestamp() - start) + " ms");
+        (_e = host.log) === null || _e === void 0 ? void 0 : _e.call(host, "getExportInfoMap: done in ".concat(ts.timestamp() - start, " ms"));
         return cache;
     }
     ts.getExportInfoMap = getExportInfoMap;
@@ -127204,7 +127211,7 @@ var ts;
         return { spans: spans, endOfLineState: 0 /* None */ };
         function pushClassification(start, end, type) {
             var length = end - start;
-            ts.Debug.assert(length > 0, "Classification had non-positive length of " + length);
+            ts.Debug.assert(length > 0, "Classification had non-positive length of ".concat(length));
             spans.push(start);
             spans.push(length);
             spans.push(type);
@@ -128072,7 +128079,7 @@ var ts;
                     case ".d.cts" /* Dcts */: return ".d.cts" /* dctsModifier */;
                     case ".cjs" /* Cjs */: return ".cjs" /* cjsModifier */;
                     case ".cts" /* Cts */: return ".cts" /* ctsModifier */;
-                    case ".tsbuildinfo" /* TsBuildInfo */: return ts.Debug.fail("Extension " + ".tsbuildinfo" /* TsBuildInfo */ + " is unsupported.");
+                    case ".tsbuildinfo" /* TsBuildInfo */: return ts.Debug.fail("Extension ".concat(".tsbuildinfo" /* TsBuildInfo */, " is unsupported."));
                     case undefined: return "" /* none */;
                     default:
                         return ts.Debug.assertNever(extension);
@@ -128801,10 +128808,10 @@ var ts;
             var resolvedFromCacheCount = 0;
             var cacheAttemptCount = 0;
             var result = cb({ tryResolve: tryResolve, resolutionLimitExceeded: function () { return resolutionLimitExceeded; } });
-            var hitRateMessage = cacheAttemptCount ? " (" + (resolvedFromCacheCount / cacheAttemptCount * 100).toFixed(1) + "% hit rate)" : "";
-            (_a = host.log) === null || _a === void 0 ? void 0 : _a.call(host, logPrefix + ": resolved " + resolvedCount + " module specifiers, plus " + ambientCount + " ambient and " + resolvedFromCacheCount + " from cache" + hitRateMessage);
-            (_b = host.log) === null || _b === void 0 ? void 0 : _b.call(host, logPrefix + ": response is " + (resolutionLimitExceeded ? "incomplete" : "complete"));
-            (_c = host.log) === null || _c === void 0 ? void 0 : _c.call(host, logPrefix + ": " + (ts.timestamp() - start));
+            var hitRateMessage = cacheAttemptCount ? " (".concat((resolvedFromCacheCount / cacheAttemptCount * 100).toFixed(1), "% hit rate)") : "";
+            (_a = host.log) === null || _a === void 0 ? void 0 : _a.call(host, "".concat(logPrefix, ": resolved ").concat(resolvedCount, " module specifiers, plus ").concat(ambientCount, " ambient and ").concat(resolvedFromCacheCount, " from cache").concat(hitRateMessage));
+            (_b = host.log) === null || _b === void 0 ? void 0 : _b.call(host, "".concat(logPrefix, ": response is ").concat(resolutionLimitExceeded ? "incomplete" : "complete"));
+            (_c = host.log) === null || _c === void 0 ? void 0 : _c.call(host, "".concat(logPrefix, ": ").concat(ts.timestamp() - start));
             return result;
             function tryResolve(exportInfo, isFromAmbientModule) {
                 if (isFromAmbientModule) {
@@ -129107,15 +129114,15 @@ var ts;
             var useBraces = origin && originIsSymbolMember(origin) || needsConvertPropertyAccess;
             if (origin && originIsThisType(origin)) {
                 insertText = needsConvertPropertyAccess
-                    ? "this" + (insertQuestionDot ? "?." : "") + "[" + quotePropertyName(sourceFile, preferences, name) + "]"
-                    : "this" + (insertQuestionDot ? "?." : ".") + name;
+                    ? "this".concat(insertQuestionDot ? "?." : "", "[").concat(quotePropertyName(sourceFile, preferences, name), "]")
+                    : "this".concat(insertQuestionDot ? "?." : ".").concat(name);
             }
             // We should only have needsConvertPropertyAccess if there's a property access to convert. But see #21790.
             // Somehow there was a global with a non-identifier name. Hopefully someone will complain about getting a "foo bar" global completion and provide a repro.
             else if ((useBraces || insertQuestionDot) && propertyAccessToConvert) {
-                insertText = useBraces ? needsConvertPropertyAccess ? "[" + quotePropertyName(sourceFile, preferences, name) + "]" : "[" + name + "]" : name;
+                insertText = useBraces ? needsConvertPropertyAccess ? "[".concat(quotePropertyName(sourceFile, preferences, name), "]") : "[".concat(name, "]") : name;
                 if (insertQuestionDot || propertyAccessToConvert.questionDotToken) {
-                    insertText = "?." + insertText;
+                    insertText = "?.".concat(insertText);
                 }
                 var dot = ts.findChildOfKind(propertyAccessToConvert, 24 /* DotToken */, sourceFile) ||
                     ts.findChildOfKind(propertyAccessToConvert, 28 /* QuestionDotToken */, sourceFile);
@@ -129129,7 +129136,7 @@ var ts;
             if (isJsxInitializer) {
                 if (insertText === undefined)
                     insertText = name;
-                insertText = "{" + insertText + "}";
+                insertText = "{".concat(insertText, "}");
                 if (typeof isJsxInitializer !== "boolean") {
                     replacementSpan = ts.createTextSpanFromNode(isJsxInitializer, sourceFile);
                 }
@@ -129142,8 +129149,8 @@ var ts;
                 if (precedingToken && ts.positionIsASICandidate(precedingToken.end, precedingToken.parent, sourceFile)) {
                     awaitText = ";";
                 }
-                awaitText += "(await " + propertyAccessToConvert.expression.getText() + ")";
-                insertText = needsConvertPropertyAccess ? "" + awaitText + insertText : "" + awaitText + (insertQuestionDot ? "?." : ".") + insertText;
+                awaitText += "(await ".concat(propertyAccessToConvert.expression.getText(), ")");
+                insertText = needsConvertPropertyAccess ? "".concat(awaitText).concat(insertText) : "".concat(awaitText).concat(insertQuestionDot ? "?." : ".").concat(insertText);
                 replacementSpan = ts.createTextSpanFromBounds(propertyAccessToConvert.getStart(sourceFile), propertyAccessToConvert.end);
             }
             if (originIsResolvedExport(origin)) {
@@ -129174,7 +129181,7 @@ var ts;
                     && !(type.flags & 1048576 /* Union */ && ts.find(type.types, function (type) { return !!(type.flags & 528 /* BooleanLike */); }))) {
                     if (type.flags & 402653316 /* StringLike */ || (type.flags & 1048576 /* Union */ && ts.every(type.types, function (type) { return !!(type.flags & (402653316 /* StringLike */ | 32768 /* Undefined */)); }))) {
                         // If is string like or undefined use quotes
-                        insertText = ts.escapeSnippetText(name) + "=" + ts.quote(sourceFile, preferences, "$1");
+                        insertText = "".concat(ts.escapeSnippetText(name), "=").concat(ts.quote(sourceFile, preferences, "$1"));
                         isSnippet = true;
                     }
                     else {
@@ -129183,12 +129190,9 @@ var ts;
                     }
                 }
                 if (useBraces_1) {
-                    insertText = ts.escapeSnippetText(name) + "={$1}";
+                    insertText = "".concat(ts.escapeSnippetText(name), "={$1}");
                     isSnippet = true;
                 }
-                if (isSnippet) {
-                    replacementSpan = ts.createTextSpanFromNode(location, sourceFile);
-                }
             }
             if (insertText !== undefined && !preferences.includeCompletionsWithInsertText) {
                 return undefined;
@@ -129273,7 +129277,7 @@ var ts;
                 removeComments: true,
                 module: options.module,
                 target: options.target,
-                omitTrailingSemicolon: true,
+                omitTrailingSemicolon: false,
                 newLine: ts.getNewLineKind(ts.getNewLineCharacter(options, ts.maybeBind(host, host.getNewLine))),
             });
             var importAdder = ts.codefix.createImportAdder(sourceFile, program, preferences, host);
@@ -129329,9 +129333,9 @@ var ts;
                 }
                 node = ts.factory.updateModifiers(node, modifiers & (~presentModifiers));
                 completionNodes.push(node);
-            }, body, isAbstract);
+            }, body, 2 /* Property */, isAbstract);
             if (completionNodes.length) {
-                insertText = printer.printSnippetList(1 /* MultiLine */, ts.factory.createNodeArray(completionNodes), sourceFile);
+                insertText = printer.printSnippetList(1 /* MultiLine */ | 131072 /* NoTrailingNewLine */, ts.factory.createNodeArray(completionNodes), sourceFile);
             }
             return { insertText: insertText, isSnippet: isSnippet, importAdder: importAdder };
         }
@@ -129450,14 +129454,14 @@ var ts;
             var importKind = ts.codefix.getImportKind(sourceFile, exportKind, options, /*forceImportKeyword*/ true);
             var isTopLevelTypeOnly = ((_b = (_a = ts.tryCast(importCompletionNode, ts.isImportDeclaration)) === null || _a === void 0 ? void 0 : _a.importClause) === null || _b === void 0 ? void 0 : _b.isTypeOnly) || ((_c = ts.tryCast(importCompletionNode, ts.isImportEqualsDeclaration)) === null || _c === void 0 ? void 0 : _c.isTypeOnly);
             var isImportSpecifierTypeOnly = couldBeTypeOnlyImportSpecifier(importCompletionNode, contextToken);
-            var topLevelTypeOnlyText = isTopLevelTypeOnly ? " " + ts.tokenToString(151 /* TypeKeyword */) + " " : " ";
-            var importSpecifierTypeOnlyText = isImportSpecifierTypeOnly ? ts.tokenToString(151 /* TypeKeyword */) + " " : "";
+            var topLevelTypeOnlyText = isTopLevelTypeOnly ? " ".concat(ts.tokenToString(151 /* TypeKeyword */), " ") : " ";
+            var importSpecifierTypeOnlyText = isImportSpecifierTypeOnly ? "".concat(ts.tokenToString(151 /* TypeKeyword */), " ") : "";
             var suffix = useSemicolons ? ";" : "";
             switch (importKind) {
-                case 3 /* CommonJS */: return { replacementSpan: replacementSpan, insertText: "import" + topLevelTypeOnlyText + ts.escapeSnippetText(name) + tabStop + " = require(" + quotedModuleSpecifier + ")" + suffix };
-                case 1 /* Default */: return { replacementSpan: replacementSpan, insertText: "import" + topLevelTypeOnlyText + ts.escapeSnippetText(name) + tabStop + " from " + quotedModuleSpecifier + suffix };
-                case 2 /* Namespace */: return { replacementSpan: replacementSpan, insertText: "import" + topLevelTypeOnlyText + "* as " + ts.escapeSnippetText(name) + " from " + quotedModuleSpecifier + suffix };
-                case 0 /* Named */: return { replacementSpan: replacementSpan, insertText: "import" + topLevelTypeOnlyText + "{ " + importSpecifierTypeOnlyText + ts.escapeSnippetText(name) + tabStop + " } from " + quotedModuleSpecifier + suffix };
+                case 3 /* CommonJS */: return { replacementSpan: replacementSpan, insertText: "import".concat(topLevelTypeOnlyText).concat(ts.escapeSnippetText(name)).concat(tabStop, " = require(").concat(quotedModuleSpecifier, ")").concat(suffix) };
+                case 1 /* Default */: return { replacementSpan: replacementSpan, insertText: "import".concat(topLevelTypeOnlyText).concat(ts.escapeSnippetText(name)).concat(tabStop, " from ").concat(quotedModuleSpecifier).concat(suffix) };
+                case 2 /* Namespace */: return { replacementSpan: replacementSpan, insertText: "import".concat(topLevelTypeOnlyText, "* as ").concat(ts.escapeSnippetText(name), " from ").concat(quotedModuleSpecifier).concat(suffix) };
+                case 0 /* Named */: return { replacementSpan: replacementSpan, insertText: "import".concat(topLevelTypeOnlyText, "{ ").concat(importSpecifierTypeOnlyText).concat(ts.escapeSnippetText(name)).concat(tabStop, " } from ").concat(quotedModuleSpecifier).concat(suffix) };
             }
         }
         function quotePropertyName(sourceFile, preferences, name) {
@@ -132356,7 +132360,7 @@ var ts;
         }
         function getDocumentRegistryEntry(bucketEntry, scriptKind) {
             var entry = isDocumentRegistryEntry(bucketEntry) ? bucketEntry : bucketEntry.get(ts.Debug.checkDefined(scriptKind, "If there are more than one scriptKind's for same document the scriptKind should be provided"));
-            ts.Debug.assert(scriptKind === undefined || !entry || entry.sourceFile.scriptKind === scriptKind, "Script kind should match provided ScriptKind:" + scriptKind + " and sourceFile.scriptKind: " + (entry === null || entry === void 0 ? void 0 : entry.sourceFile.scriptKind) + ", !entry: " + !entry);
+            ts.Debug.assert(scriptKind === undefined || !entry || entry.sourceFile.scriptKind === scriptKind, "Script kind should match provided ScriptKind:".concat(scriptKind, " and sourceFile.scriptKind: ").concat(entry === null || entry === void 0 ? void 0 : entry.sourceFile.scriptKind, ", !entry: ").concat(!entry));
             return entry;
         }
         function acquireOrUpdateDocument(fileName, path, compilationSettings, key, scriptSnapshot, version, acquiring, scriptKind) {
@@ -133368,7 +133372,7 @@ var ts;
                             sourceFile: def.file,
                             name: def.reference.fileName,
                             kind: "string" /* string */,
-                            displayParts: [ts.displayPart("\"" + def.reference.fileName + "\"", ts.SymbolDisplayPartKind.stringLiteral)]
+                            displayParts: [ts.displayPart("\"".concat(def.reference.fileName, "\""), ts.SymbolDisplayPartKind.stringLiteral)]
                         };
                     }
                     default:
@@ -133948,7 +133952,7 @@ var ts;
                         if (symbol.flags & 33554432 /* Transient */)
                             return undefined;
                         // Assertions for GH#21814. We should be handling SourceFile symbols in `getReferencedSymbolsForModule` instead of getting here.
-                        ts.Debug.fail("Unexpected symbol at " + ts.Debug.formatSyntaxKind(node.kind) + ": " + ts.Debug.formatSymbol(symbol));
+                        ts.Debug.fail("Unexpected symbol at ".concat(ts.Debug.formatSyntaxKind(node.kind), ": ").concat(ts.Debug.formatSymbol(symbol)));
                     }
                     return ts.isTypeLiteralNode(decl.parent) && ts.isUnionTypeNode(decl.parent.parent)
                         ? checker.getPropertyOfType(checker.getTypeFromTypeNode(decl.parent.parent), symbol.name)
@@ -135232,8 +135236,8 @@ var ts;
                 var end = pos + 6; /* "static".length */
                 var typeChecker = program.getTypeChecker();
                 var symbol = typeChecker.getSymbolAtLocation(node.parent);
-                var prefix = symbol ? typeChecker.symbolToString(symbol, node.parent) + " " : "";
-                return { text: prefix + "static {}", pos: pos, end: end };
+                var prefix = symbol ? "".concat(typeChecker.symbolToString(symbol, node.parent), " ") : "";
+                return { text: "".concat(prefix, "static {}"), pos: pos, end: end };
             }
             var declName = isConstNamedExpression(node) ? node.parent.name :
                 ts.Debug.checkDefined(ts.getNameOfDeclaration(node), "Expected call hierarchy item to have a name");
@@ -136494,7 +136498,7 @@ var ts;
         function getJSDocTagCompletions() {
             return jsDocTagCompletionEntries || (jsDocTagCompletionEntries = ts.map(jsDocTagNames, function (tagName) {
                 return {
-                    name: "@" + tagName,
+                    name: "@".concat(tagName),
                     kind: "keyword" /* keyword */,
                     kindModifiers: "",
                     sortText: ts.Completions.SortText.LocationPriority
@@ -136626,11 +136630,11 @@ var ts;
                 var name = _a.name, dotDotDotToken = _a.dotDotDotToken;
                 var paramName = name.kind === 79 /* Identifier */ ? name.text : "param" + i;
                 var type = isJavaScriptFile ? (dotDotDotToken ? "{...any} " : "{any} ") : "";
-                return indentationStr + " * @param " + type + paramName + newLine;
+                return "".concat(indentationStr, " * @param ").concat(type).concat(paramName).concat(newLine);
             }).join("");
         }
         function returnsDocComment(indentationStr, newLine) {
-            return indentationStr + " * @returns" + newLine;
+            return "".concat(indentationStr, " * @returns").concat(newLine);
         }
         function getCommentOwnerInfo(tokenAtPos, options) {
             return ts.forEachAncestor(tokenAtPos, function (n) { return getCommentOwnerInfoWorker(n, options); });
@@ -137470,7 +137474,7 @@ var ts;
             }
             if (name) {
                 var text = ts.isIdentifier(name) ? name.text
-                    : ts.isElementAccessExpression(name) ? "[" + nodeText(name.argumentExpression) + "]"
+                    : ts.isElementAccessExpression(name) ? "[".concat(nodeText(name.argumentExpression), "]")
                         : nodeText(name);
                 if (text.length > 0) {
                     return cleanText(text);
@@ -137480,7 +137484,7 @@ var ts;
                 case 303 /* SourceFile */:
                     var sourceFile = node;
                     return ts.isExternalModule(sourceFile)
-                        ? "\"" + ts.escapeString(ts.getBaseFileName(ts.removeFileExtension(ts.normalizePath(sourceFile.fileName)))) + "\""
+                        ? "\"".concat(ts.escapeString(ts.getBaseFileName(ts.removeFileExtension(ts.normalizePath(sourceFile.fileName)))), "\"")
                         : "<global>";
                 case 270 /* ExportAssignment */:
                     return ts.isExportAssignment(node) && node.isExportEquals ? "export=" /* ExportEquals */ : "default" /* Default */;
@@ -137676,10 +137680,10 @@ var ts;
                 if (name !== undefined) {
                     name = cleanText(name);
                     if (name.length > maxLength) {
-                        return name + " callback";
+                        return "".concat(name, " callback");
                     }
                     var args = cleanText(ts.mapDefined(parent.arguments, function (a) { return ts.isStringLiteralLike(a) ? a.getText(curSourceFile) : undefined; }).join(", "));
-                    return name + "(" + args + ") callback";
+                    return "".concat(name, "(").concat(args, ") callback");
                 }
             }
             return "<function>";
@@ -137692,7 +137696,7 @@ var ts;
             else if (ts.isPropertyAccessExpression(expr)) {
                 var left = getCalledExpressionName(expr.expression);
                 var right = expr.name.text;
-                return left === undefined ? right : left + "." + right;
+                return left === undefined ? right : "".concat(left, ".").concat(right);
             }
             else {
                 return undefined;
@@ -140124,7 +140128,7 @@ var ts;
             var _loop_9 = function (n) {
                 // If the node is not a subspan of its parent, this is a big problem.
                 // There have been crashes that might be caused by this violation.
-                ts.Debug.assert(ts.rangeContainsRange(n.parent, n), "Not a subspan", function () { return "Child: " + ts.Debug.formatSyntaxKind(n.kind) + ", parent: " + ts.Debug.formatSyntaxKind(n.parent.kind); });
+                ts.Debug.assert(ts.rangeContainsRange(n.parent, n), "Not a subspan", function () { return "Child: ".concat(ts.Debug.formatSyntaxKind(n.kind), ", parent: ").concat(ts.Debug.formatSyntaxKind(n.parent.kind)); });
                 var argumentInfo = getImmediatelyContainingArgumentOrContextualParameterInfo(n, position, sourceFile, checker);
                 if (argumentInfo) {
                     return { value: argumentInfo };
@@ -140296,7 +140300,7 @@ var ts;
     (function (InlayHints) {
         var maxHintsLength = 30;
         var leadingParameterNameCommentRegexFactory = function (name) {
-            return new RegExp("^\\s?/\\*\\*?\\s?" + name + "\\s?\\*\\/\\s?$");
+            return new RegExp("^\\s?/\\*\\*?\\s?".concat(name, "\\s?\\*\\/\\s?$"));
         };
         function shouldShowParameterNameHints(preferences) {
             return preferences.includeInlayParameterNameHints === "literals" || preferences.includeInlayParameterNameHints === "all";
@@ -140360,7 +140364,7 @@ var ts;
             }
             function addParameterHints(text, position, isFirstVariadicArgument) {
                 result.push({
-                    text: "" + (isFirstVariadicArgument ? "..." : "") + truncation(text, maxHintsLength) + ":",
+                    text: "".concat(isFirstVariadicArgument ? "..." : "").concat(truncation(text, maxHintsLength), ":"),
                     position: position,
                     kind: "Parameter" /* Parameter */,
                     whitespaceAfter: true,
@@ -140368,7 +140372,7 @@ var ts;
             }
             function addTypeHints(text, position) {
                 result.push({
-                    text: ": " + truncation(text, maxHintsLength),
+                    text: ": ".concat(truncation(text, maxHintsLength)),
                     position: position,
                     kind: "Type" /* Type */,
                     whitespaceBefore: true,
@@ -140376,7 +140380,7 @@ var ts;
             }
             function addEnumMemberValueHints(text, position) {
                 result.push({
-                    text: "= " + truncation(text, maxHintsLength),
+                    text: "= ".concat(truncation(text, maxHintsLength)),
                     position: position,
                     kind: "Enum" /* Enum */,
                     whitespaceBefore: true,
@@ -140911,7 +140915,7 @@ var ts;
         }
     }
     function getKeyFromNode(exp) {
-        return exp.pos.toString() + ":" + exp.end.toString();
+        return "".concat(exp.pos.toString(), ":").concat(exp.end.toString());
     }
     function canBeConvertedToClass(node, checker) {
         var _a, _b, _c, _d;
@@ -145029,7 +145033,7 @@ var ts;
                 var insertAtLineStart = isValidLocationToAddComment(sourceFile, startPosition);
                 var token = ts.getTouchingToken(sourceFile, insertAtLineStart ? startPosition : position);
                 var indent = sourceFile.text.slice(lineStartPosition, startPosition);
-                var text = (insertAtLineStart ? "" : this.newLineCharacter) + "//" + commentText + this.newLineCharacter + indent;
+                var text = "".concat(insertAtLineStart ? "" : this.newLineCharacter, "//").concat(commentText).concat(this.newLineCharacter).concat(indent);
                 this.insertText(sourceFile, token.getStart(sourceFile), text);
             };
             ChangeTracker.prototype.insertJsdocCommentBefore = function (sourceFile, node, tag) {
@@ -145229,7 +145233,7 @@ var ts;
             };
             ChangeTracker.prototype.getInsertNodeAfterOptions = function (sourceFile, after) {
                 var options = this.getInsertNodeAfterOptionsWorker(after);
-                return __assign(__assign({}, options), { prefix: after.end === sourceFile.end && ts.isStatement(after) ? (options.prefix ? "\n" + options.prefix : "\n") : options.prefix });
+                return __assign(__assign({}, options), { prefix: after.end === sourceFile.end && ts.isStatement(after) ? (options.prefix ? "\n".concat(options.prefix) : "\n") : options.prefix });
             };
             ChangeTracker.prototype.getInsertNodeAfterOptionsWorker = function (node) {
                 switch (node.kind) {
@@ -145263,7 +145267,7 @@ var ts;
                     }
                     else {
                         // `x => {}` -> `function f(x) {}`
-                        this.insertText(sourceFile, ts.first(node.parameters).getStart(sourceFile), "function " + name + "(");
+                        this.insertText(sourceFile, ts.first(node.parameters).getStart(sourceFile), "function ".concat(name, "("));
                         // Replacing full range of arrow to get rid of the leading space -- replace ` =>` with `)`
                         this.replaceRange(sourceFile, arrow, ts.factory.createToken(21 /* CloseParenToken */));
                     }
@@ -145320,7 +145324,7 @@ var ts;
                         var nextNode = containingList[index + 1];
                         var startPos = skipWhitespacesAndLineBreaks(sourceFile.text, nextNode.getFullStart());
                         // write separator and leading trivia of the next element as suffix
-                        var suffix = "" + ts.tokenToString(nextToken.kind) + sourceFile.text.substring(nextToken.end, startPos);
+                        var suffix = "".concat(ts.tokenToString(nextToken.kind)).concat(sourceFile.text.substring(nextToken.end, startPos));
                         this.insertNodesAt(sourceFile, startPos, [newNode], { suffix: suffix });
                     }
                 }
@@ -145365,7 +145369,7 @@ var ts;
                         this.replaceRange(sourceFile, ts.createRange(insertPos), newNode, { indentation: indentation, prefix: this.newLineCharacter });
                     }
                     else {
-                        this.replaceRange(sourceFile, ts.createRange(end), newNode, { prefix: ts.tokenToString(separator) + " " });
+                        this.replaceRange(sourceFile, ts.createRange(end), newNode, { prefix: "".concat(ts.tokenToString(separator), " ") });
                     }
                 }
             };
@@ -145467,7 +145471,7 @@ var ts;
                     var normalized = ts.stableSort(changesInFile, function (a, b) { return (a.range.pos - b.range.pos) || (a.range.end - b.range.end); });
                     var _loop_12 = function (i) {
                         ts.Debug.assert(normalized[i].range.end <= normalized[i + 1].range.pos, "Changes overlap", function () {
-                            return JSON.stringify(normalized[i].range) + " and " + JSON.stringify(normalized[i + 1].range);
+                            return "".concat(JSON.stringify(normalized[i].range), " and ").concat(JSON.stringify(normalized[i + 1].range));
                         });
                     };
                     // verify that change intervals do not overlap, except possibly at end points.
@@ -145564,7 +145568,7 @@ var ts;
         function applyChanges(text, changes) {
             for (var i = changes.length - 1; i >= 0; i--) {
                 var _a = changes[i], span = _a.span, newText = _a.newText;
-                text = "" + text.substring(0, span.start) + newText + text.substring(ts.textSpanEnd(span));
+                text = "".concat(text.substring(0, span.start)).concat(newText).concat(text.substring(ts.textSpanEnd(span)));
             }
             return text;
         }
@@ -146695,9 +146699,6 @@ var ts;
         });
         function makeChange(changeTracker, sourceFile, pos) {
             var token = ts.getTokenAtPosition(sourceFile, pos);
-            if (!ts.isIdentifier(token)) {
-                return ts.Debug.fail("add-name-to-nameless-parameter operates on identifiers, but got a " + ts.Debug.formatSyntaxKind(token.kind));
-            }
             var param = token.parent;
             if (!ts.isParameter(param)) {
                 return ts.Debug.fail("Tried to add a parameter name to a non-parameter: " + ts.Debug.formatSyntaxKind(token.kind));
@@ -146705,9 +146706,10 @@ var ts;
             var i = param.parent.parameters.indexOf(param);
             ts.Debug.assert(!param.type, "Tried to add a parameter name to a parameter that already had one.");
             ts.Debug.assert(i > -1, "Parameter not found in parent parameter list.");
+            var typeNode = ts.factory.createTypeReferenceNode(param.name, /*typeArguments*/ undefined);
             var replacement = ts.factory.createParameterDeclaration(
-            /*decorators*/ undefined, param.modifiers, param.dotDotDotToken, "arg" + i, param.questionToken, ts.factory.createTypeReferenceNode(token, /*typeArguments*/ undefined), param.initializer);
-            changeTracker.replaceNode(sourceFile, token, replacement);
+            /*decorators*/ undefined, param.modifiers, param.dotDotDotToken, "arg" + i, param.questionToken, param.dotDotDotToken ? ts.factory.createArrayTypeNode(typeNode) : typeNode, param.initializer);
+            changeTracker.replaceNode(sourceFile, param, replacement);
         }
     })(codefix = ts.codefix || (ts.codefix = {}));
 })(ts || (ts = {}));
@@ -148038,7 +148040,7 @@ var ts;
                 if (!res.has(text) && (originalKeywordKind !== undefined && ts.isNonContextualKeyword(originalKeywordKind)
                     || checker.resolveName(text, node, 111551 /* Value */, /*excludeGlobals*/ true))) {
                     // Unconditionally add an underscore in case `text` is a keyword.
-                    res.set(text, makeUniqueName("_" + text, identifiers));
+                    res.set(text, makeUniqueName("_".concat(text), identifiers));
                 }
             });
             return res;
@@ -148138,7 +148140,7 @@ var ts;
                     // `const a = require("b").c` --> `import { c as a } from "./b";
                     return convertedImports([makeSingleImport(name.text, propertyName, moduleSpecifier, quotePreference)]);
                 default:
-                    return ts.Debug.assertNever(name, "Convert to ES module got invalid syntax form " + name.kind);
+                    return ts.Debug.assertNever(name, "Convert to ES module got invalid syntax form ".concat(name.kind));
             }
         }
         function convertAssignment(sourceFile, checker, assignment, changes, exports, useSitesToUnqualify) {
@@ -148189,7 +148191,7 @@ var ts;
                     case 168 /* MethodDeclaration */:
                         return !ts.isIdentifier(prop.name) ? undefined : functionExpressionToDeclaration(prop.name.text, [ts.factory.createToken(93 /* ExportKeyword */)], prop, useSitesToUnqualify);
                     default:
-                        ts.Debug.assertNever(prop, "Convert to ES6 got invalid prop kind " + prop.kind);
+                        ts.Debug.assertNever(prop, "Convert to ES6 got invalid prop kind ".concat(prop.kind));
                 }
             });
             return statements && [statements, false];
@@ -148323,7 +148325,7 @@ var ts;
                 case 79 /* Identifier */:
                     return convertSingleIdentifierImport(name, moduleSpecifier, checker, identifiers, quotePreference);
                 default:
-                    return ts.Debug.assertNever(name, "Convert to ES module got invalid name kind " + name.kind);
+                    return ts.Debug.assertNever(name, "Convert to ES module got invalid name kind ".concat(name.kind));
             }
         }
         /**
@@ -148380,7 +148382,7 @@ var ts;
         // Identifiers helpers
         function makeUniqueName(name, identifiers) {
             while (identifiers.original.has(name) || identifiers.additional.has(name)) {
-                name = "_" + name;
+                name = "_".concat(name);
             }
             identifiers.additional.add(name);
             return name;
@@ -148460,7 +148462,7 @@ var ts;
                 if (!qualifiedName)
                     return undefined;
                 var changes = ts.textChanges.ChangeTracker.with(context, function (t) { return doChange(t, context.sourceFile, qualifiedName); });
-                var newText = qualifiedName.left.text + "[\"" + qualifiedName.right.text + "\"]";
+                var newText = "".concat(qualifiedName.left.text, "[\"").concat(qualifiedName.right.text, "\"]");
                 return [codefix.createCodeFixAction(fixId, changes, [ts.Diagnostics.Rewrite_as_the_indexed_access_type_0, newText], fixId, ts.Diagnostics.Rewrite_all_as_indexed_access_types)];
             },
             fixIds: [fixId],
@@ -148857,7 +148859,7 @@ var ts;
                         break;
                     }
                     default:
-                        ts.Debug.assertNever(fix, "fix wasn't never - got kind " + fix.kind);
+                        ts.Debug.assertNever(fix, "fix wasn't never - got kind ".concat(fix.kind));
                 }
                 function reduceAddAsTypeOnlyValues(prevValue, newValue) {
                     // `NotAllowed` overrides `Required` because one addition of a new import might be required to be type-only
@@ -148901,7 +148903,7 @@ var ts;
                     return newEntry;
                 }
                 function newImportsKey(moduleSpecifier, topLevelTypeOnly) {
-                    return (topLevelTypeOnly ? 1 : 0) + "|" + moduleSpecifier;
+                    return "".concat(topLevelTypeOnly ? 1 : 0, "|").concat(moduleSpecifier);
                 }
             }
             function writeFixes(changeTracker) {
@@ -149354,7 +149356,7 @@ var ts;
                 case ts.ModuleKind.NodeNext:
                     return importingFile.impliedNodeFormat === ts.ModuleKind.ESNext ? 2 /* Namespace */ : 3 /* CommonJS */;
                 default:
-                    return ts.Debug.assertNever(moduleKind, "Unexpected moduleKind " + moduleKind);
+                    return ts.Debug.assertNever(moduleKind, "Unexpected moduleKind ".concat(moduleKind));
             }
         }
         function getFixesInfoForNonUMDImport(_a, symbolToken, useAutoImportProvider) {
@@ -149461,7 +149463,7 @@ var ts;
             switch (fix.kind) {
                 case 0 /* UseNamespace */:
                     addNamespaceQualifier(changes, sourceFile, fix);
-                    return [ts.Diagnostics.Change_0_to_1, symbolName, fix.namespacePrefix + "." + symbolName];
+                    return [ts.Diagnostics.Change_0_to_1, symbolName, "".concat(fix.namespacePrefix, ".").concat(symbolName)];
                 case 1 /* JsdocTypeImport */:
                     addImportType(changes, sourceFile, fix, quotePreference);
                     return [ts.Diagnostics.Change_0_to_1, symbolName, getImportTypePrefix(fix.moduleSpecifier, quotePreference) + symbolName];
@@ -149485,7 +149487,7 @@ var ts;
                     return [importKind === 1 /* Default */ ? ts.Diagnostics.Import_default_0_from_module_1 : ts.Diagnostics.Import_0_from_module_1, symbolName, moduleSpecifier];
                 }
                 default:
-                    return ts.Debug.assertNever(fix, "Unexpected fix kind " + fix.kind);
+                    return ts.Debug.assertNever(fix, "Unexpected fix kind ".concat(fix.kind));
             }
         }
         function doAddExistingFix(changes, sourceFile, clause, defaultImport, namedImports, compilerOptions) {
@@ -149581,7 +149583,7 @@ var ts;
         }
         function getImportTypePrefix(moduleSpecifier, quotePreference) {
             var quote = ts.getQuoteFromPreference(quotePreference);
-            return "import(" + quote + moduleSpecifier + quote + ").";
+            return "import(".concat(quote).concat(moduleSpecifier).concat(quote, ").");
         }
         function needsTypeOnly(_a) {
             var addAsTypeOnly = _a.addAsTypeOnly;
@@ -149674,7 +149676,7 @@ var ts;
                 lastCharWasValid = isValid;
             }
             // Need `|| "_"` to ensure result isn't empty.
-            return !ts.isStringANonContextualKeyword(res) ? res || "_" : "_" + res;
+            return !ts.isStringANonContextualKeyword(res) ? res || "_" : "_".concat(res);
         }
         codefix.moduleSpecifierToValidIdentifier = moduleSpecifierToValidIdentifier;
     })(codefix = ts.codefix || (ts.codefix = {}));
@@ -150874,7 +150876,7 @@ var ts;
                             break;
                         }
                         default:
-                            ts.Debug.fail("Bad fixId: " + context.fixId);
+                            ts.Debug.fail("Bad fixId: ".concat(context.fixId));
                     }
                 });
             },
@@ -151322,7 +151324,7 @@ var ts;
             if (!isValidCharacter(character)) {
                 return;
             }
-            var replacement = useHtmlEntity ? htmlEntity[character] : "{" + ts.quote(sourceFile, preferences, character) + "}";
+            var replacement = useHtmlEntity ? htmlEntity[character] : "{".concat(ts.quote(sourceFile, preferences, character), "}");
             changes.replaceRangeWithText(sourceFile, { pos: start, end: start + 1 }, replacement);
         }
     })(codefix = ts.codefix || (ts.codefix = {}));
@@ -151513,11 +151515,11 @@ var ts;
                 token = ts.cast(token.parent, ts.isInferTypeNode).typeParameter.name;
             }
             if (ts.isIdentifier(token) && canPrefix(token)) {
-                changes.replaceNode(sourceFile, token, ts.factory.createIdentifier("_" + token.text));
+                changes.replaceNode(sourceFile, token, ts.factory.createIdentifier("_".concat(token.text)));
                 if (ts.isParameter(token.parent)) {
                     ts.getJSDocParameterTags(token.parent).forEach(function (tag) {
                         if (ts.isIdentifier(tag.name)) {
-                            changes.replaceNode(sourceFile, tag.name, ts.factory.createIdentifier("_" + tag.name.text));
+                            changes.replaceNode(sourceFile, tag.name, ts.factory.createIdentifier("_".concat(tag.name.text)));
                         }
                     });
                 }
@@ -151853,7 +151855,7 @@ var ts;
             }); }
         });
         function doChange(changes, sourceFile, name) {
-            changes.replaceNodeWithText(sourceFile, name, name.text + "()");
+            changes.replaceNodeWithText(sourceFile, name, "".concat(name.text, "()"));
         }
         function getCallName(sourceFile, start) {
             var token = ts.getTokenAtPosition(sourceFile, start);
@@ -153002,7 +153004,7 @@ var ts;
                 var parameters = [];
                 var length = Math.max.apply(Math, calls.map(function (c) { return c.argumentTypes.length; }));
                 var _loop_16 = function (i) {
-                    var symbol = checker.createSymbol(1 /* FunctionScopedVariable */, ts.escapeLeadingUnderscores("arg" + i));
+                    var symbol = checker.createSymbol(1 /* FunctionScopedVariable */, ts.escapeLeadingUnderscores("arg".concat(i)));
                     symbol.type = combineTypes(calls.map(function (call) { return call.argumentTypes[i] || checker.getUndefinedType(); }));
                     if (calls.some(function (call) { return call.argumentTypes[i] === undefined; })) {
                         symbol.flags |= 16777216 /* Optional */;
@@ -153105,7 +153107,7 @@ var ts;
                     codefix.createCodeFixActionWithoutFixAll(fixName, [codefix.createFileTextChanges(sourceFile.fileName, [
                             ts.createTextChange(sourceFile.checkJsDirective
                                 ? ts.createTextSpanFromBounds(sourceFile.checkJsDirective.pos, sourceFile.checkJsDirective.end)
-                                : ts.createTextSpan(0, 0), "// @ts-nocheck" + newLineCharacter),
+                                : ts.createTextSpan(0, 0), "// @ts-nocheck".concat(newLineCharacter)),
                         ])], ts.Diagnostics.Disable_checking_for_this_file),
                 ];
                 if (ts.textChanges.isValidLocationToAddComment(sourceFile, span.start)) {
@@ -153161,11 +153163,18 @@ var ts;
             };
         }
         codefix.getNoopSymbolTrackerWithResolver = getNoopSymbolTrackerWithResolver;
+        var PreserveOptionalFlags;
+        (function (PreserveOptionalFlags) {
+            PreserveOptionalFlags[PreserveOptionalFlags["Method"] = 1] = "Method";
+            PreserveOptionalFlags[PreserveOptionalFlags["Property"] = 2] = "Property";
+            PreserveOptionalFlags[PreserveOptionalFlags["All"] = 3] = "All";
+        })(PreserveOptionalFlags = codefix.PreserveOptionalFlags || (codefix.PreserveOptionalFlags = {}));
         /**
          * `addClassElement` will not be called if we can't figure out a representation for `symbol` in `enclosingDeclaration`.
          * @param body If defined, this will be the body of the member node passed to `addClassElement`. Otherwise, the body will default to a stub.
          */
-        function addNewNodeForMemberSymbol(symbol, enclosingDeclaration, sourceFile, context, preferences, importAdder, addClassElement, body, isAmbient) {
+        function addNewNodeForMemberSymbol(symbol, enclosingDeclaration, sourceFile, context, preferences, importAdder, addClassElement, body, preserveOptional, isAmbient) {
+            if (preserveOptional === void 0) { preserveOptional = 3 /* All */; }
             if (isAmbient === void 0) { isAmbient = false; }
             var declarations = symbol.getDeclarations();
             if (!(declarations && declarations.length)) {
@@ -153194,7 +153203,7 @@ var ts;
                         }
                     }
                     addClassElement(ts.factory.createPropertyDeclaration(
-                    /*decorators*/ undefined, modifiers, name, optional ? ts.factory.createToken(57 /* QuestionToken */) : undefined, typeNode, 
+                    /*decorators*/ undefined, modifiers, name, optional && (preserveOptional & 2 /* Property */) ? ts.factory.createToken(57 /* QuestionToken */) : undefined, typeNode, 
                     /*initializer*/ undefined));
                     break;
                 case 171 /* GetAccessor */:
@@ -153258,13 +153267,13 @@ var ts;
                         }
                         else {
                             ts.Debug.assert(declarations.length === signatures.length, "Declarations and signatures should match count");
-                            addClassElement(createMethodImplementingSignatures(checker, context, enclosingDeclaration, signatures, name, optional, modifiers, quotePreference, body));
+                            addClassElement(createMethodImplementingSignatures(checker, context, enclosingDeclaration, signatures, name, optional && !!(preserveOptional & 1 /* Method */), modifiers, quotePreference, body));
                         }
                     }
                     break;
             }
             function outputMethod(quotePreference, signature, modifiers, name, body) {
-                var method = createSignatureDeclarationFromSignature(168 /* MethodDeclaration */, context, quotePreference, signature, body, name, modifiers, optional, enclosingDeclaration, importAdder);
+                var method = createSignatureDeclarationFromSignature(168 /* MethodDeclaration */, context, quotePreference, signature, body, name, modifiers, optional && !!(preserveOptional & 1 /* Method */), enclosingDeclaration, importAdder);
                 if (method)
                     addClassElement(method);
             }
@@ -153364,7 +153373,7 @@ var ts;
             var typeParameters = isJs || typeArguments === undefined
                 ? undefined
                 : ts.map(typeArguments, function (_, i) {
-                    return ts.factory.createTypeParameterDeclaration(84 /* T */ + typeArguments.length - 1 <= 90 /* Z */ ? String.fromCharCode(84 /* T */ + i) : "T" + i);
+                    return ts.factory.createTypeParameterDeclaration(84 /* T */ + typeArguments.length - 1 <= 90 /* Z */ ? String.fromCharCode(84 /* T */ + i) : "T".concat(i));
                 });
             var parameters = createDummyParameters(args.length, names, types, /*minArgumentCount*/ undefined, isJs);
             var type = isJs || contextualType === undefined
@@ -153399,7 +153408,7 @@ var ts;
                 /*decorators*/ undefined, 
                 /*modifiers*/ undefined, 
                 /*dotDotDotToken*/ undefined, 
-                /*name*/ names && names[i] || "arg" + i, 
+                /*name*/ names && names[i] || "arg".concat(i), 
                 /*questionToken*/ minArgumentCount !== undefined && i >= minArgumentCount ? ts.factory.createToken(57 /* QuestionToken */) : undefined, 
                 /*type*/ inJs ? undefined : types && types[i] || ts.factory.createKeywordTypeNode(130 /* AnyKeyword */), 
                 /*initializer*/ undefined);
@@ -153650,7 +153659,7 @@ var ts;
             }
             var name = declaration.name.text;
             var startWithUnderscore = ts.startsWithUnderscore(name);
-            var fieldName = createPropertyName(startWithUnderscore ? name : ts.getUniqueName("_" + name, file), declaration.name);
+            var fieldName = createPropertyName(startWithUnderscore ? name : ts.getUniqueName("_".concat(name), file), declaration.name);
             var accessorName = createPropertyName(startWithUnderscore ? ts.getUniqueName(name.substring(1), file) : name, declaration.name);
             return {
                 isStatic: ts.hasStaticModifier(declaration),
@@ -154674,7 +154683,7 @@ var ts;
                         changes.insertNodeAfter(exportingSourceFile, exportNode, ts.factory.createExportDefault(ts.factory.createIdentifier(exportName.text)));
                         break;
                     default:
-                        ts.Debug.fail("Unexpected exportNode kind " + exportNode.kind);
+                        ts.Debug.fail("Unexpected exportNode kind ".concat(exportNode.kind));
                 }
             }
         }
@@ -154762,7 +154771,7 @@ var ts;
                     break;
                 }
                 default:
-                    ts.Debug.assertNever(parent, "Unexpected parent kind " + parent.kind);
+                    ts.Debug.assertNever(parent, "Unexpected parent kind ".concat(parent.kind));
             }
         }
         function makeImportSpecifier(propertyName, name) {
@@ -155326,7 +155335,7 @@ var ts;
                         var newComment = ts.displayPartsToString(parameterDocComment);
                         if (newComment.length) {
                             ts.setSyntheticLeadingComments(result, [{
-                                    text: "*\n" + newComment.split("\n").map(function (c) { return " * " + c; }).join("\n") + "\n ",
+                                    text: "*\n".concat(newComment.split("\n").map(function (c) { return " * ".concat(c); }).join("\n"), "\n "),
                                     kind: 3 /* MultiLineCommentTrivia */,
                                     pos: -1,
                                     end: -1,
@@ -155471,7 +155480,7 @@ var ts;
                                 usedFunctionNames.set(description, true);
                                 functionActions.push({
                                     description: description,
-                                    name: "function_scope_" + i,
+                                    name: "function_scope_".concat(i),
                                     kind: extractFunctionAction.kind
                                 });
                             }
@@ -155479,7 +155488,7 @@ var ts;
                         else if (!innermostErrorFunctionAction) {
                             innermostErrorFunctionAction = {
                                 description: description,
-                                name: "function_scope_" + i,
+                                name: "function_scope_".concat(i),
                                 notApplicableReason: getStringError(functionExtraction.errors),
                                 kind: extractFunctionAction.kind
                             };
@@ -155495,7 +155504,7 @@ var ts;
                                 usedConstantNames.set(description_1, true);
                                 constantActions.push({
                                     description: description_1,
-                                    name: "constant_scope_" + i,
+                                    name: "constant_scope_".concat(i),
                                     kind: extractConstantAction.kind
                                 });
                             }
@@ -155503,7 +155512,7 @@ var ts;
                         else if (!innermostErrorConstantAction) {
                             innermostErrorConstantAction = {
                                 description: description,
-                                name: "constant_scope_" + i,
+                                name: "constant_scope_".concat(i),
                                 notApplicableReason: getStringError(constantExtraction.errors),
                                 kind: extractConstantAction.kind
                             };
@@ -156087,28 +156096,28 @@ var ts;
                     case 212 /* FunctionExpression */:
                     case 255 /* FunctionDeclaration */:
                         return scope.name
-                            ? "function '" + scope.name.text + "'"
+                            ? "function '".concat(scope.name.text, "'")
                             : ts.ANONYMOUS;
                     case 213 /* ArrowFunction */:
                         return "arrow function";
                     case 168 /* MethodDeclaration */:
-                        return "method '" + scope.name.getText() + "'";
+                        return "method '".concat(scope.name.getText(), "'");
                     case 171 /* GetAccessor */:
-                        return "'get " + scope.name.getText() + "'";
+                        return "'get ".concat(scope.name.getText(), "'");
                     case 172 /* SetAccessor */:
-                        return "'set " + scope.name.getText() + "'";
+                        return "'set ".concat(scope.name.getText(), "'");
                     default:
-                        throw ts.Debug.assertNever(scope, "Unexpected scope kind " + scope.kind);
+                        throw ts.Debug.assertNever(scope, "Unexpected scope kind ".concat(scope.kind));
                 }
             }
             function getDescriptionForClassLikeDeclaration(scope) {
                 return scope.kind === 256 /* ClassDeclaration */
-                    ? scope.name ? "class '" + scope.name.text + "'" : "anonymous class declaration"
-                    : scope.name ? "class expression '" + scope.name.text + "'" : "anonymous class expression";
+                    ? scope.name ? "class '".concat(scope.name.text, "'") : "anonymous class declaration"
+                    : scope.name ? "class expression '".concat(scope.name.text, "'") : "anonymous class expression";
             }
             function getDescriptionForModuleLikeDeclaration(scope) {
                 return scope.kind === 261 /* ModuleBlock */
-                    ? "namespace '" + scope.parent.name.getText() + "'"
+                    ? "namespace '".concat(scope.parent.name.getText(), "'")
                     : scope.externalModuleIndicator ? 0 /* Module */ : 1 /* Global */;
             }
             var SpecialScope;
@@ -157575,7 +157584,7 @@ var ts;
                 case 253 /* VariableDeclaration */:
                     return ts.tryCast(node.name, ts.isIdentifier);
                 default:
-                    return ts.Debug.assertNever(node, "Unexpected node kind " + node.kind);
+                    return ts.Debug.assertNever(node, "Unexpected node kind ".concat(node.kind));
             }
         }
         function updateNamespaceLikeImport(changes, sourceFile, checker, movedSymbols, newModuleName, newModuleSpecifier, oldImportId, oldImportNode) {
@@ -157612,7 +157621,7 @@ var ts;
                 case 253 /* VariableDeclaration */:
                     return ts.factory.createVariableDeclaration(newNamespaceId, /*exclamationToken*/ undefined, /*type*/ undefined, createRequireCall(newModuleString));
                 default:
-                    return ts.Debug.assertNever(node, "Unexpected node kind " + node.kind);
+                    return ts.Debug.assertNever(node, "Unexpected node kind ".concat(node.kind));
             }
         }
         function moduleSpecifierFromImport(i) {
@@ -157699,7 +157708,7 @@ var ts;
                     deleteUnusedImportsInVariableDeclaration(sourceFile, importDecl, changes, isUnused);
                     break;
                 default:
-                    ts.Debug.assertNever(importDecl, "Unexpected import decl kind " + importDecl.kind);
+                    ts.Debug.assertNever(importDecl, "Unexpected import decl kind ".concat(importDecl.kind));
             }
         }
         function deleteUnusedImportsInDeclaration(sourceFile, importDecl, changes, isUnused) {
@@ -157799,7 +157808,7 @@ var ts;
                 var name = ts.combinePaths(inDirectory, newModuleName + extension);
                 if (!host.fileExists(name))
                     return newModuleName; // TODO: GH#18217
-                newModuleName = moduleName + "." + i;
+                newModuleName = "".concat(moduleName, ".").concat(i);
             }
         }
         function getNewModuleName(movedSymbols) {
@@ -157906,7 +157915,7 @@ var ts;
                     return name ? makeVariableStatement(name, i.type, createRequireCall(moduleSpecifier), i.parent.flags) : undefined;
                 }
                 default:
-                    return ts.Debug.assertNever(i, "Unexpected import kind " + i.kind);
+                    return ts.Debug.assertNever(i, "Unexpected import kind ".concat(i.kind));
             }
         }
         function filterNamedBindings(namedBindings, keep) {
@@ -158021,7 +158030,7 @@ var ts;
                 case 200 /* ObjectBindingPattern */:
                     return ts.firstDefined(name.elements, function (em) { return ts.isOmittedExpression(em) ? undefined : forEachTopLevelDeclarationInBindingName(em.name, cb); });
                 default:
-                    return ts.Debug.assertNever(name, "Unexpected name kind " + name.kind);
+                    return ts.Debug.assertNever(name, "Unexpected name kind ".concat(name.kind));
             }
         }
         function nameOfTopLevelDeclaration(d) {
@@ -158082,7 +158091,7 @@ var ts;
                 case 237 /* ExpressionStatement */:
                     return ts.Debug.fail(); // Shouldn't try to add 'export' keyword to `exports.x = ...`
                 default:
-                    return ts.Debug.assertNever(d, "Unexpected declaration kind " + d.kind);
+                    return ts.Debug.assertNever(d, "Unexpected declaration kind ".concat(d.kind));
             }
         }
         function addCommonjsExport(decl) {
@@ -158104,7 +158113,7 @@ var ts;
                 case 237 /* ExpressionStatement */:
                     return ts.Debug.fail("Can't export an ExpressionStatement"); // Shouldn't try to add 'export' keyword to `exports.x = ...`
                 default:
-                    return ts.Debug.assertNever(decl, "Unexpected decl kind " + decl.kind);
+                    return ts.Debug.assertNever(decl, "Unexpected decl kind ".concat(decl.kind));
             }
         }
         /** Creates `exports.x = x;` */
@@ -158742,7 +158751,7 @@ var ts;
                             return [functionDeclaration.name, functionDeclaration.parent.name];
                         return [functionDeclaration.parent.name];
                     default:
-                        return ts.Debug.assertNever(functionDeclaration, "Unexpected function declaration kind " + functionDeclaration.kind);
+                        return ts.Debug.assertNever(functionDeclaration, "Unexpected function declaration kind ".concat(functionDeclaration.kind));
                 }
             }
         })(convertParamsToDestructuredObject = refactor.convertParamsToDestructuredObject || (refactor.convertParamsToDestructuredObject = {}));
@@ -159446,7 +159455,7 @@ var ts;
             var textPos = ts.scanner.getTextPos();
             if (textPos <= end) {
                 if (token === 79 /* Identifier */) {
-                    ts.Debug.fail("Did not expect " + ts.Debug.formatSyntaxKind(parent.kind) + " to have an Identifier in its trivia");
+                    ts.Debug.fail("Did not expect ".concat(ts.Debug.formatSyntaxKind(parent.kind), " to have an Identifier in its trivia"));
                 }
                 nodes.push(createNode(token, pos, textPos, parent));
             }
@@ -160328,7 +160337,7 @@ var ts;
         function getValidSourceFile(fileName) {
             var sourceFile = program.getSourceFile(fileName);
             if (!sourceFile) {
-                var error = new Error("Could not find source file: '" + fileName + "'.");
+                var error = new Error("Could not find source file: '".concat(fileName, "'."));
                 // We've been having trouble debugging this, so attach sidecar data for the tsserver log.
                 // See https://github.com/microsoft/TypeScript/issues/30180.
                 error.ProgramFiles = program.getSourceFiles().map(function (f) { return f.fileName; });
@@ -161003,7 +161012,7 @@ var ts;
             var element = token.kind === 31 /* GreaterThanToken */ && ts.isJsxOpeningElement(token.parent) ? token.parent.parent
                 : ts.isJsxText(token) && ts.isJsxElement(token.parent) ? token.parent : undefined;
             if (element && isUnclosedTag(element)) {
-                return { newText: "</" + element.openingElement.tagName.getText(sourceFile) + ">" };
+                return { newText: "</".concat(element.openingElement.tagName.getText(sourceFile), ">") };
             }
             var fragment = token.kind === 31 /* GreaterThanToken */ && ts.isJsxOpeningFragment(token.parent) ? token.parent.parent
                 : ts.isJsxText(token) && ts.isJsxFragment(token.parent) ? token.parent : undefined;
@@ -161109,7 +161118,7 @@ var ts;
                     pos = commentRange.end + 1;
                 }
                 else { // If it's not in a comment range, then we need to comment the uncommented portions.
-                    var newPos = text.substring(pos, textRange.end).search("(" + openMultilineRegex + ")|(" + closeMultilineRegex + ")");
+                    var newPos = text.substring(pos, textRange.end).search("(".concat(openMultilineRegex, ")|(").concat(closeMultilineRegex, ")"));
                     isCommenting = insertComment !== undefined
                         ? insertComment
                         : isCommenting || !ts.isTextWhiteSpaceLike(text, pos, newPos === -1 ? textRange.end : pos + newPos); // If isCommenting is already true we don't need to check whitespace again.
@@ -161504,14 +161513,14 @@ var ts;
             case ts.LanguageServiceMode.PartialSemantic:
                 invalidOperationsInPartialSemanticMode.forEach(function (key) {
                     return ls[key] = function () {
-                        throw new Error("LanguageService Operation: " + key + " not allowed in LanguageServiceMode.PartialSemantic");
+                        throw new Error("LanguageService Operation: ".concat(key, " not allowed in LanguageServiceMode.PartialSemantic"));
                     };
                 });
                 break;
             case ts.LanguageServiceMode.Syntactic:
                 invalidOperationsInSyntacticMode.forEach(function (key) {
                     return ls[key] = function () {
-                        throw new Error("LanguageService Operation: " + key + " not allowed in LanguageServiceMode.Syntactic");
+                        throw new Error("LanguageService Operation: ".concat(key, " not allowed in LanguageServiceMode.Syntactic"));
                     };
                 });
                 break;
@@ -162493,13 +162502,13 @@ var ts;
         var result = action();
         if (logPerformance) {
             var end = ts.timestamp();
-            logger.log(actionDescription + " completed in " + (end - start) + " msec");
+            logger.log("".concat(actionDescription, " completed in ").concat(end - start, " msec"));
             if (ts.isString(result)) {
                 var str = result;
                 if (str.length > 128) {
                     str = str.substring(0, 128) + "...";
                 }
-                logger.log("  result.length=" + str.length + ", result='" + JSON.stringify(str) + "'");
+                logger.log("  result.length=".concat(str.length, ", result='").concat(JSON.stringify(str), "'"));
             }
         }
         return result;
@@ -162581,7 +162590,7 @@ var ts;
          * Update the list of scripts known to the compiler
          */
         LanguageServiceShimObject.prototype.refresh = function (throwOnError) {
-            this.forwardJSONCall("refresh(" + throwOnError + ")", function () { return null; } // eslint-disable-line no-null/no-null
+            this.forwardJSONCall("refresh(".concat(throwOnError, ")"), function () { return null; } // eslint-disable-line no-null/no-null
             );
         };
         LanguageServiceShimObject.prototype.cleanupSemanticCache = function () {
@@ -162597,43 +162606,43 @@ var ts;
         };
         LanguageServiceShimObject.prototype.getSyntacticClassifications = function (fileName, start, length) {
             var _this = this;
-            return this.forwardJSONCall("getSyntacticClassifications('" + fileName + "', " + start + ", " + length + ")", function () { return _this.languageService.getSyntacticClassifications(fileName, ts.createTextSpan(start, length)); });
+            return this.forwardJSONCall("getSyntacticClassifications('".concat(fileName, "', ").concat(start, ", ").concat(length, ")"), function () { return _this.languageService.getSyntacticClassifications(fileName, ts.createTextSpan(start, length)); });
         };
         LanguageServiceShimObject.prototype.getSemanticClassifications = function (fileName, start, length) {
             var _this = this;
-            return this.forwardJSONCall("getSemanticClassifications('" + fileName + "', " + start + ", " + length + ")", function () { return _this.languageService.getSemanticClassifications(fileName, ts.createTextSpan(start, length)); });
+            return this.forwardJSONCall("getSemanticClassifications('".concat(fileName, "', ").concat(start, ", ").concat(length, ")"), function () { return _this.languageService.getSemanticClassifications(fileName, ts.createTextSpan(start, length)); });
         };
         LanguageServiceShimObject.prototype.getEncodedSyntacticClassifications = function (fileName, start, length) {
             var _this = this;
-            return this.forwardJSONCall("getEncodedSyntacticClassifications('" + fileName + "', " + start + ", " + length + ")", 
+            return this.forwardJSONCall("getEncodedSyntacticClassifications('".concat(fileName, "', ").concat(start, ", ").concat(length, ")"), 
             // directly serialize the spans out to a string.  This is much faster to decode
             // on the managed side versus a full JSON array.
             function () { return convertClassifications(_this.languageService.getEncodedSyntacticClassifications(fileName, ts.createTextSpan(start, length))); });
         };
         LanguageServiceShimObject.prototype.getEncodedSemanticClassifications = function (fileName, start, length) {
             var _this = this;
-            return this.forwardJSONCall("getEncodedSemanticClassifications('" + fileName + "', " + start + ", " + length + ")", 
+            return this.forwardJSONCall("getEncodedSemanticClassifications('".concat(fileName, "', ").concat(start, ", ").concat(length, ")"), 
             // directly serialize the spans out to a string.  This is much faster to decode
             // on the managed side versus a full JSON array.
             function () { return convertClassifications(_this.languageService.getEncodedSemanticClassifications(fileName, ts.createTextSpan(start, length))); });
         };
         LanguageServiceShimObject.prototype.getSyntacticDiagnostics = function (fileName) {
             var _this = this;
-            return this.forwardJSONCall("getSyntacticDiagnostics('" + fileName + "')", function () {
+            return this.forwardJSONCall("getSyntacticDiagnostics('".concat(fileName, "')"), function () {
                 var diagnostics = _this.languageService.getSyntacticDiagnostics(fileName);
                 return _this.realizeDiagnostics(diagnostics);
             });
         };
         LanguageServiceShimObject.prototype.getSemanticDiagnostics = function (fileName) {
             var _this = this;
-            return this.forwardJSONCall("getSemanticDiagnostics('" + fileName + "')", function () {
+            return this.forwardJSONCall("getSemanticDiagnostics('".concat(fileName, "')"), function () {
                 var diagnostics = _this.languageService.getSemanticDiagnostics(fileName);
                 return _this.realizeDiagnostics(diagnostics);
             });
         };
         LanguageServiceShimObject.prototype.getSuggestionDiagnostics = function (fileName) {
             var _this = this;
-            return this.forwardJSONCall("getSuggestionDiagnostics('" + fileName + "')", function () { return _this.realizeDiagnostics(_this.languageService.getSuggestionDiagnostics(fileName)); });
+            return this.forwardJSONCall("getSuggestionDiagnostics('".concat(fileName, "')"), function () { return _this.realizeDiagnostics(_this.languageService.getSuggestionDiagnostics(fileName)); });
         };
         LanguageServiceShimObject.prototype.getCompilerOptionsDiagnostics = function () {
             var _this = this;
@@ -162649,7 +162658,7 @@ var ts;
          */
         LanguageServiceShimObject.prototype.getQuickInfoAtPosition = function (fileName, position) {
             var _this = this;
-            return this.forwardJSONCall("getQuickInfoAtPosition('" + fileName + "', " + position + ")", function () { return _this.languageService.getQuickInfoAtPosition(fileName, position); });
+            return this.forwardJSONCall("getQuickInfoAtPosition('".concat(fileName, "', ").concat(position, ")"), function () { return _this.languageService.getQuickInfoAtPosition(fileName, position); });
         };
         /// NAMEORDOTTEDNAMESPAN
         /**
@@ -162658,7 +162667,7 @@ var ts;
          */
         LanguageServiceShimObject.prototype.getNameOrDottedNameSpan = function (fileName, startPos, endPos) {
             var _this = this;
-            return this.forwardJSONCall("getNameOrDottedNameSpan('" + fileName + "', " + startPos + ", " + endPos + ")", function () { return _this.languageService.getNameOrDottedNameSpan(fileName, startPos, endPos); });
+            return this.forwardJSONCall("getNameOrDottedNameSpan('".concat(fileName, "', ").concat(startPos, ", ").concat(endPos, ")"), function () { return _this.languageService.getNameOrDottedNameSpan(fileName, startPos, endPos); });
         };
         /**
          * STATEMENTSPAN
@@ -162666,12 +162675,12 @@ var ts;
          */
         LanguageServiceShimObject.prototype.getBreakpointStatementAtPosition = function (fileName, position) {
             var _this = this;
-            return this.forwardJSONCall("getBreakpointStatementAtPosition('" + fileName + "', " + position + ")", function () { return _this.languageService.getBreakpointStatementAtPosition(fileName, position); });
+            return this.forwardJSONCall("getBreakpointStatementAtPosition('".concat(fileName, "', ").concat(position, ")"), function () { return _this.languageService.getBreakpointStatementAtPosition(fileName, position); });
         };
         /// SIGNATUREHELP
         LanguageServiceShimObject.prototype.getSignatureHelpItems = function (fileName, position, options) {
             var _this = this;
-            return this.forwardJSONCall("getSignatureHelpItems('" + fileName + "', " + position + ")", function () { return _this.languageService.getSignatureHelpItems(fileName, position, options); });
+            return this.forwardJSONCall("getSignatureHelpItems('".concat(fileName, "', ").concat(position, ")"), function () { return _this.languageService.getSignatureHelpItems(fileName, position, options); });
         };
         /// GOTO DEFINITION
         /**
@@ -162680,7 +162689,7 @@ var ts;
          */
         LanguageServiceShimObject.prototype.getDefinitionAtPosition = function (fileName, position) {
             var _this = this;
-            return this.forwardJSONCall("getDefinitionAtPosition('" + fileName + "', " + position + ")", function () { return _this.languageService.getDefinitionAtPosition(fileName, position); });
+            return this.forwardJSONCall("getDefinitionAtPosition('".concat(fileName, "', ").concat(position, ")"), function () { return _this.languageService.getDefinitionAtPosition(fileName, position); });
         };
         /**
          * Computes the definition location and file for the symbol
@@ -162688,7 +162697,7 @@ var ts;
          */
         LanguageServiceShimObject.prototype.getDefinitionAndBoundSpan = function (fileName, position) {
             var _this = this;
-            return this.forwardJSONCall("getDefinitionAndBoundSpan('" + fileName + "', " + position + ")", function () { return _this.languageService.getDefinitionAndBoundSpan(fileName, position); });
+            return this.forwardJSONCall("getDefinitionAndBoundSpan('".concat(fileName, "', ").concat(position, ")"), function () { return _this.languageService.getDefinitionAndBoundSpan(fileName, position); });
         };
         /// GOTO Type
         /**
@@ -162697,7 +162706,7 @@ var ts;
          */
         LanguageServiceShimObject.prototype.getTypeDefinitionAtPosition = function (fileName, position) {
             var _this = this;
-            return this.forwardJSONCall("getTypeDefinitionAtPosition('" + fileName + "', " + position + ")", function () { return _this.languageService.getTypeDefinitionAtPosition(fileName, position); });
+            return this.forwardJSONCall("getTypeDefinitionAtPosition('".concat(fileName, "', ").concat(position, ")"), function () { return _this.languageService.getTypeDefinitionAtPosition(fileName, position); });
         };
         /// GOTO Implementation
         /**
@@ -162706,37 +162715,37 @@ var ts;
          */
         LanguageServiceShimObject.prototype.getImplementationAtPosition = function (fileName, position) {
             var _this = this;
-            return this.forwardJSONCall("getImplementationAtPosition('" + fileName + "', " + position + ")", function () { return _this.languageService.getImplementationAtPosition(fileName, position); });
+            return this.forwardJSONCall("getImplementationAtPosition('".concat(fileName, "', ").concat(position, ")"), function () { return _this.languageService.getImplementationAtPosition(fileName, position); });
         };
         LanguageServiceShimObject.prototype.getRenameInfo = function (fileName, position, options) {
             var _this = this;
-            return this.forwardJSONCall("getRenameInfo('" + fileName + "', " + position + ")", function () { return _this.languageService.getRenameInfo(fileName, position, options); });
+            return this.forwardJSONCall("getRenameInfo('".concat(fileName, "', ").concat(position, ")"), function () { return _this.languageService.getRenameInfo(fileName, position, options); });
         };
         LanguageServiceShimObject.prototype.getSmartSelectionRange = function (fileName, position) {
             var _this = this;
-            return this.forwardJSONCall("getSmartSelectionRange('" + fileName + "', " + position + ")", function () { return _this.languageService.getSmartSelectionRange(fileName, position); });
+            return this.forwardJSONCall("getSmartSelectionRange('".concat(fileName, "', ").concat(position, ")"), function () { return _this.languageService.getSmartSelectionRange(fileName, position); });
         };
         LanguageServiceShimObject.prototype.findRenameLocations = function (fileName, position, findInStrings, findInComments, providePrefixAndSuffixTextForRename) {
             var _this = this;
-            return this.forwardJSONCall("findRenameLocations('" + fileName + "', " + position + ", " + findInStrings + ", " + findInComments + ", " + providePrefixAndSuffixTextForRename + ")", function () { return _this.languageService.findRenameLocations(fileName, position, findInStrings, findInComments, providePrefixAndSuffixTextForRename); });
+            return this.forwardJSONCall("findRenameLocations('".concat(fileName, "', ").concat(position, ", ").concat(findInStrings, ", ").concat(findInComments, ", ").concat(providePrefixAndSuffixTextForRename, ")"), function () { return _this.languageService.findRenameLocations(fileName, position, findInStrings, findInComments, providePrefixAndSuffixTextForRename); });
         };
         /// GET BRACE MATCHING
         LanguageServiceShimObject.prototype.getBraceMatchingAtPosition = function (fileName, position) {
             var _this = this;
-            return this.forwardJSONCall("getBraceMatchingAtPosition('" + fileName + "', " + position + ")", function () { return _this.languageService.getBraceMatchingAtPosition(fileName, position); });
+            return this.forwardJSONCall("getBraceMatchingAtPosition('".concat(fileName, "', ").concat(position, ")"), function () { return _this.languageService.getBraceMatchingAtPosition(fileName, position); });
         };
         LanguageServiceShimObject.prototype.isValidBraceCompletionAtPosition = function (fileName, position, openingBrace) {
             var _this = this;
-            return this.forwardJSONCall("isValidBraceCompletionAtPosition('" + fileName + "', " + position + ", " + openingBrace + ")", function () { return _this.languageService.isValidBraceCompletionAtPosition(fileName, position, openingBrace); });
+            return this.forwardJSONCall("isValidBraceCompletionAtPosition('".concat(fileName, "', ").concat(position, ", ").concat(openingBrace, ")"), function () { return _this.languageService.isValidBraceCompletionAtPosition(fileName, position, openingBrace); });
         };
         LanguageServiceShimObject.prototype.getSpanOfEnclosingComment = function (fileName, position, onlyMultiLine) {
             var _this = this;
-            return this.forwardJSONCall("getSpanOfEnclosingComment('" + fileName + "', " + position + ")", function () { return _this.languageService.getSpanOfEnclosingComment(fileName, position, onlyMultiLine); });
+            return this.forwardJSONCall("getSpanOfEnclosingComment('".concat(fileName, "', ").concat(position, ")"), function () { return _this.languageService.getSpanOfEnclosingComment(fileName, position, onlyMultiLine); });
         };
         /// GET SMART INDENT
         LanguageServiceShimObject.prototype.getIndentationAtPosition = function (fileName, position, options /*Services.EditorOptions*/) {
             var _this = this;
-            return this.forwardJSONCall("getIndentationAtPosition('" + fileName + "', " + position + ")", function () {
+            return this.forwardJSONCall("getIndentationAtPosition('".concat(fileName, "', ").concat(position, ")"), function () {
                 var localOptions = JSON.parse(options);
                 return _this.languageService.getIndentationAtPosition(fileName, position, localOptions);
             });
@@ -162744,23 +162753,23 @@ var ts;
         /// GET REFERENCES
         LanguageServiceShimObject.prototype.getReferencesAtPosition = function (fileName, position) {
             var _this = this;
-            return this.forwardJSONCall("getReferencesAtPosition('" + fileName + "', " + position + ")", function () { return _this.languageService.getReferencesAtPosition(fileName, position); });
+            return this.forwardJSONCall("getReferencesAtPosition('".concat(fileName, "', ").concat(position, ")"), function () { return _this.languageService.getReferencesAtPosition(fileName, position); });
         };
         LanguageServiceShimObject.prototype.findReferences = function (fileName, position) {
             var _this = this;
-            return this.forwardJSONCall("findReferences('" + fileName + "', " + position + ")", function () { return _this.languageService.findReferences(fileName, position); });
+            return this.forwardJSONCall("findReferences('".concat(fileName, "', ").concat(position, ")"), function () { return _this.languageService.findReferences(fileName, position); });
         };
         LanguageServiceShimObject.prototype.getFileReferences = function (fileName) {
             var _this = this;
-            return this.forwardJSONCall("getFileReferences('" + fileName + ")", function () { return _this.languageService.getFileReferences(fileName); });
+            return this.forwardJSONCall("getFileReferences('".concat(fileName, ")"), function () { return _this.languageService.getFileReferences(fileName); });
         };
         LanguageServiceShimObject.prototype.getOccurrencesAtPosition = function (fileName, position) {
             var _this = this;
-            return this.forwardJSONCall("getOccurrencesAtPosition('" + fileName + "', " + position + ")", function () { return _this.languageService.getOccurrencesAtPosition(fileName, position); });
+            return this.forwardJSONCall("getOccurrencesAtPosition('".concat(fileName, "', ").concat(position, ")"), function () { return _this.languageService.getOccurrencesAtPosition(fileName, position); });
         };
         LanguageServiceShimObject.prototype.getDocumentHighlights = function (fileName, position, filesToSearch) {
             var _this = this;
-            return this.forwardJSONCall("getDocumentHighlights('" + fileName + "', " + position + ")", function () {
+            return this.forwardJSONCall("getDocumentHighlights('".concat(fileName, "', ").concat(position, ")"), function () {
                 var results = _this.languageService.getDocumentHighlights(fileName, position, JSON.parse(filesToSearch));
                 // workaround for VS document highlighting issue - keep only items from the initial file
                 var normalizedName = ts.toFileNameLowerCase(ts.normalizeSlashes(fileName));
@@ -162775,108 +162784,108 @@ var ts;
          */
         LanguageServiceShimObject.prototype.getCompletionsAtPosition = function (fileName, position, preferences) {
             var _this = this;
-            return this.forwardJSONCall("getCompletionsAtPosition('" + fileName + "', " + position + ", " + preferences + ")", function () { return _this.languageService.getCompletionsAtPosition(fileName, position, preferences); });
+            return this.forwardJSONCall("getCompletionsAtPosition('".concat(fileName, "', ").concat(position, ", ").concat(preferences, ")"), function () { return _this.languageService.getCompletionsAtPosition(fileName, position, preferences); });
         };
         /** Get a string based representation of a completion list entry details */
         LanguageServiceShimObject.prototype.getCompletionEntryDetails = function (fileName, position, entryName, formatOptions, source, preferences, data) {
             var _this = this;
-            return this.forwardJSONCall("getCompletionEntryDetails('" + fileName + "', " + position + ", '" + entryName + "')", function () {
+            return this.forwardJSONCall("getCompletionEntryDetails('".concat(fileName, "', ").concat(position, ", '").concat(entryName, "')"), function () {
                 var localOptions = formatOptions === undefined ? undefined : JSON.parse(formatOptions);
                 return _this.languageService.getCompletionEntryDetails(fileName, position, entryName, localOptions, source, preferences, data);
             });
         };
         LanguageServiceShimObject.prototype.getFormattingEditsForRange = function (fileName, start, end, options /*Services.FormatCodeOptions*/) {
             var _this = this;
-            return this.forwardJSONCall("getFormattingEditsForRange('" + fileName + "', " + start + ", " + end + ")", function () {
+            return this.forwardJSONCall("getFormattingEditsForRange('".concat(fileName, "', ").concat(start, ", ").concat(end, ")"), function () {
                 var localOptions = JSON.parse(options);
                 return _this.languageService.getFormattingEditsForRange(fileName, start, end, localOptions);
             });
         };
         LanguageServiceShimObject.prototype.getFormattingEditsForDocument = function (fileName, options /*Services.FormatCodeOptions*/) {
             var _this = this;
-            return this.forwardJSONCall("getFormattingEditsForDocument('" + fileName + "')", function () {
+            return this.forwardJSONCall("getFormattingEditsForDocument('".concat(fileName, "')"), function () {
                 var localOptions = JSON.parse(options);
                 return _this.languageService.getFormattingEditsForDocument(fileName, localOptions);
             });
         };
         LanguageServiceShimObject.prototype.getFormattingEditsAfterKeystroke = function (fileName, position, key, options /*Services.FormatCodeOptions*/) {
             var _this = this;
-            return this.forwardJSONCall("getFormattingEditsAfterKeystroke('" + fileName + "', " + position + ", '" + key + "')", function () {
+            return this.forwardJSONCall("getFormattingEditsAfterKeystroke('".concat(fileName, "', ").concat(position, ", '").concat(key, "')"), function () {
                 var localOptions = JSON.parse(options);
                 return _this.languageService.getFormattingEditsAfterKeystroke(fileName, position, key, localOptions);
             });
         };
         LanguageServiceShimObject.prototype.getDocCommentTemplateAtPosition = function (fileName, position, options) {
             var _this = this;
-            return this.forwardJSONCall("getDocCommentTemplateAtPosition('" + fileName + "', " + position + ")", function () { return _this.languageService.getDocCommentTemplateAtPosition(fileName, position, options); });
+            return this.forwardJSONCall("getDocCommentTemplateAtPosition('".concat(fileName, "', ").concat(position, ")"), function () { return _this.languageService.getDocCommentTemplateAtPosition(fileName, position, options); });
         };
         /// NAVIGATE TO
         /** Return a list of symbols that are interesting to navigate to */
         LanguageServiceShimObject.prototype.getNavigateToItems = function (searchValue, maxResultCount, fileName) {
             var _this = this;
-            return this.forwardJSONCall("getNavigateToItems('" + searchValue + "', " + maxResultCount + ", " + fileName + ")", function () { return _this.languageService.getNavigateToItems(searchValue, maxResultCount, fileName); });
+            return this.forwardJSONCall("getNavigateToItems('".concat(searchValue, "', ").concat(maxResultCount, ", ").concat(fileName, ")"), function () { return _this.languageService.getNavigateToItems(searchValue, maxResultCount, fileName); });
         };
         LanguageServiceShimObject.prototype.getNavigationBarItems = function (fileName) {
             var _this = this;
-            return this.forwardJSONCall("getNavigationBarItems('" + fileName + "')", function () { return _this.languageService.getNavigationBarItems(fileName); });
+            return this.forwardJSONCall("getNavigationBarItems('".concat(fileName, "')"), function () { return _this.languageService.getNavigationBarItems(fileName); });
         };
         LanguageServiceShimObject.prototype.getNavigationTree = function (fileName) {
             var _this = this;
-            return this.forwardJSONCall("getNavigationTree('" + fileName + "')", function () { return _this.languageService.getNavigationTree(fileName); });
+            return this.forwardJSONCall("getNavigationTree('".concat(fileName, "')"), function () { return _this.languageService.getNavigationTree(fileName); });
         };
         LanguageServiceShimObject.prototype.getOutliningSpans = function (fileName) {
             var _this = this;
-            return this.forwardJSONCall("getOutliningSpans('" + fileName + "')", function () { return _this.languageService.getOutliningSpans(fileName); });
+            return this.forwardJSONCall("getOutliningSpans('".concat(fileName, "')"), function () { return _this.languageService.getOutliningSpans(fileName); });
         };
         LanguageServiceShimObject.prototype.getTodoComments = function (fileName, descriptors) {
             var _this = this;
-            return this.forwardJSONCall("getTodoComments('" + fileName + "')", function () { return _this.languageService.getTodoComments(fileName, JSON.parse(descriptors)); });
+            return this.forwardJSONCall("getTodoComments('".concat(fileName, "')"), function () { return _this.languageService.getTodoComments(fileName, JSON.parse(descriptors)); });
         };
         /// CALL HIERARCHY
         LanguageServiceShimObject.prototype.prepareCallHierarchy = function (fileName, position) {
             var _this = this;
-            return this.forwardJSONCall("prepareCallHierarchy('" + fileName + "', " + position + ")", function () { return _this.languageService.prepareCallHierarchy(fileName, position); });
+            return this.forwardJSONCall("prepareCallHierarchy('".concat(fileName, "', ").concat(position, ")"), function () { return _this.languageService.prepareCallHierarchy(fileName, position); });
         };
         LanguageServiceShimObject.prototype.provideCallHierarchyIncomingCalls = function (fileName, position) {
             var _this = this;
-            return this.forwardJSONCall("provideCallHierarchyIncomingCalls('" + fileName + "', " + position + ")", function () { return _this.languageService.provideCallHierarchyIncomingCalls(fileName, position); });
+            return this.forwardJSONCall("provideCallHierarchyIncomingCalls('".concat(fileName, "', ").concat(position, ")"), function () { return _this.languageService.provideCallHierarchyIncomingCalls(fileName, position); });
         };
         LanguageServiceShimObject.prototype.provideCallHierarchyOutgoingCalls = function (fileName, position) {
             var _this = this;
-            return this.forwardJSONCall("provideCallHierarchyOutgoingCalls('" + fileName + "', " + position + ")", function () { return _this.languageService.provideCallHierarchyOutgoingCalls(fileName, position); });
+            return this.forwardJSONCall("provideCallHierarchyOutgoingCalls('".concat(fileName, "', ").concat(position, ")"), function () { return _this.languageService.provideCallHierarchyOutgoingCalls(fileName, position); });
         };
         LanguageServiceShimObject.prototype.provideInlayHints = function (fileName, span, preference) {
             var _this = this;
-            return this.forwardJSONCall("provideInlayHints('" + fileName + "', '" + JSON.stringify(span) + "', " + JSON.stringify(preference) + ")", function () { return _this.languageService.provideInlayHints(fileName, span, preference); });
+            return this.forwardJSONCall("provideInlayHints('".concat(fileName, "', '").concat(JSON.stringify(span), "', ").concat(JSON.stringify(preference), ")"), function () { return _this.languageService.provideInlayHints(fileName, span, preference); });
         };
         /// Emit
         LanguageServiceShimObject.prototype.getEmitOutput = function (fileName) {
             var _this = this;
-            return this.forwardJSONCall("getEmitOutput('" + fileName + "')", function () {
+            return this.forwardJSONCall("getEmitOutput('".concat(fileName, "')"), function () {
                 var _a = _this.languageService.getEmitOutput(fileName), diagnostics = _a.diagnostics, rest = __rest(_a, ["diagnostics"]);
                 return __assign(__assign({}, rest), { diagnostics: _this.realizeDiagnostics(diagnostics) });
             });
         };
         LanguageServiceShimObject.prototype.getEmitOutputObject = function (fileName) {
             var _this = this;
-            return forwardCall(this.logger, "getEmitOutput('" + fileName + "')", 
+            return forwardCall(this.logger, "getEmitOutput('".concat(fileName, "')"), 
             /*returnJson*/ false, function () { return _this.languageService.getEmitOutput(fileName); }, this.logPerformance);
         };
         LanguageServiceShimObject.prototype.toggleLineComment = function (fileName, textRange) {
             var _this = this;
-            return this.forwardJSONCall("toggleLineComment('" + fileName + "', '" + JSON.stringify(textRange) + "')", function () { return _this.languageService.toggleLineComment(fileName, textRange); });
+            return this.forwardJSONCall("toggleLineComment('".concat(fileName, "', '").concat(JSON.stringify(textRange), "')"), function () { return _this.languageService.toggleLineComment(fileName, textRange); });
         };
         LanguageServiceShimObject.prototype.toggleMultilineComment = function (fileName, textRange) {
             var _this = this;
-            return this.forwardJSONCall("toggleMultilineComment('" + fileName + "', '" + JSON.stringify(textRange) + "')", function () { return _this.languageService.toggleMultilineComment(fileName, textRange); });
+            return this.forwardJSONCall("toggleMultilineComment('".concat(fileName, "', '").concat(JSON.stringify(textRange), "')"), function () { return _this.languageService.toggleMultilineComment(fileName, textRange); });
         };
         LanguageServiceShimObject.prototype.commentSelection = function (fileName, textRange) {
             var _this = this;
-            return this.forwardJSONCall("commentSelection('" + fileName + "', '" + JSON.stringify(textRange) + "')", function () { return _this.languageService.commentSelection(fileName, textRange); });
+            return this.forwardJSONCall("commentSelection('".concat(fileName, "', '").concat(JSON.stringify(textRange), "')"), function () { return _this.languageService.commentSelection(fileName, textRange); });
         };
         LanguageServiceShimObject.prototype.uncommentSelection = function (fileName, textRange) {
             var _this = this;
-            return this.forwardJSONCall("uncommentSelection('" + fileName + "', '" + JSON.stringify(textRange) + "')", function () { return _this.languageService.uncommentSelection(fileName, textRange); });
+            return this.forwardJSONCall("uncommentSelection('".concat(fileName, "', '").concat(JSON.stringify(textRange), "')"), function () { return _this.languageService.uncommentSelection(fileName, textRange); });
         };
         return LanguageServiceShimObject;
     }(ShimBase));
@@ -162926,7 +162935,7 @@ var ts;
         };
         CoreServicesShimObject.prototype.resolveModuleName = function (fileName, moduleName, compilerOptionsJson) {
             var _this = this;
-            return this.forwardJSONCall("resolveModuleName('" + fileName + "')", function () {
+            return this.forwardJSONCall("resolveModuleName('".concat(fileName, "')"), function () {
                 var compilerOptions = JSON.parse(compilerOptionsJson);
                 var result = ts.resolveModuleName(moduleName, ts.normalizeSlashes(fileName), compilerOptions, _this.host);
                 var resolvedFileName = result.resolvedModule ? result.resolvedModule.resolvedFileName : undefined;
@@ -162941,7 +162950,7 @@ var ts;
         };
         CoreServicesShimObject.prototype.resolveTypeReferenceDirective = function (fileName, typeReferenceDirective, compilerOptionsJson) {
             var _this = this;
-            return this.forwardJSONCall("resolveTypeReferenceDirective(" + fileName + ")", function () {
+            return this.forwardJSONCall("resolveTypeReferenceDirective(".concat(fileName, ")"), function () {
                 var compilerOptions = JSON.parse(compilerOptionsJson);
                 var result = ts.resolveTypeReferenceDirective(typeReferenceDirective, ts.normalizeSlashes(fileName), compilerOptions, _this.host);
                 return {
@@ -162953,7 +162962,7 @@ var ts;
         };
         CoreServicesShimObject.prototype.getPreProcessedFileInfo = function (fileName, sourceTextSnapshot) {
             var _this = this;
-            return this.forwardJSONCall("getPreProcessedFileInfo('" + fileName + "')", function () {
+            return this.forwardJSONCall("getPreProcessedFileInfo('".concat(fileName, "')"), function () {
                 // for now treat files as JavaScript
                 var result = ts.preProcessFile(ts.getSnapshotText(sourceTextSnapshot), /* readImportFiles */ true, /* detectJavaScriptImports */ true);
                 return {
@@ -162968,7 +162977,7 @@ var ts;
         };
         CoreServicesShimObject.prototype.getAutomaticTypeDirectiveNames = function (compilerOptionsJson) {
             var _this = this;
-            return this.forwardJSONCall("getAutomaticTypeDirectiveNames('" + compilerOptionsJson + "')", function () {
+            return this.forwardJSONCall("getAutomaticTypeDirectiveNames('".concat(compilerOptionsJson, "')"), function () {
                 var compilerOptions = JSON.parse(compilerOptionsJson);
                 return ts.getAutomaticTypeDirectiveNames(compilerOptions, _this.host);
             });
@@ -162990,7 +162999,7 @@ var ts;
         };
         CoreServicesShimObject.prototype.getTSConfigFileInfo = function (fileName, sourceTextSnapshot) {
             var _this = this;
-            return this.forwardJSONCall("getTSConfigFileInfo('" + fileName + "')", function () {
+            return this.forwardJSONCall("getTSConfigFileInfo('".concat(fileName, "')"), function () {
                 var result = ts.parseJsonText(fileName, ts.getSnapshotText(sourceTextSnapshot));
                 var normalizedFileName = ts.normalizeSlashes(fileName);
                 var configFile = ts.parseJsonSourceFileConfigFileContent(result, _this.host, ts.getDirectoryPath(normalizedFileName), /*existingOptions*/ {}, normalizedFileName);