@typescript-deploys/pr-build 4.9.0-pr-50528-25 → 4.9.0-pr-50903-18

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/lib/tsc.js CHANGED
@@ -69,7 +69,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
69
69
  var ts;
70
70
  (function (ts) {
71
71
  ts.versionMajorMinor = "4.9";
72
- ts.version = "".concat(ts.versionMajorMinor, ".0-insiders.20221021");
72
+ ts.version = "".concat(ts.versionMajorMinor, ".0-insiders.20221025");
73
73
  var NativeCollections;
74
74
  (function (NativeCollections) {
75
75
  var globals = typeof globalThis !== "undefined" ? globalThis :
@@ -1606,8 +1606,8 @@ var ts;
1606
1606
  return compareValues(a === null || a === void 0 ? void 0 : a.start, b === null || b === void 0 ? void 0 : b.start) || compareValues(a === null || a === void 0 ? void 0 : a.length, b === null || b === void 0 ? void 0 : b.length);
1607
1607
  }
1608
1608
  ts.compareTextSpans = compareTextSpans;
1609
- function min(a, b, compare) {
1610
- return compare(a, b) === -1 ? a : b;
1609
+ function min(items, compare) {
1610
+ return reduceLeft(items, function (x, y) { return compare(x, y) === -1 ? x : y; });
1611
1611
  }
1612
1612
  ts.min = min;
1613
1613
  function compareStringsCaseInsensitive(a, b) {
@@ -6020,6 +6020,7 @@ var ts;
6020
6020
  Object_is_possibly_undefined: diag(2532, ts.DiagnosticCategory.Error, "Object_is_possibly_undefined_2532", "Object is possibly 'undefined'."),
6021
6021
  Object_is_possibly_null_or_undefined: diag(2533, ts.DiagnosticCategory.Error, "Object_is_possibly_null_or_undefined_2533", "Object is possibly 'null' or 'undefined'."),
6022
6022
  A_function_returning_never_cannot_have_a_reachable_end_point: diag(2534, ts.DiagnosticCategory.Error, "A_function_returning_never_cannot_have_a_reachable_end_point_2534", "A function returning 'never' cannot have a reachable end point."),
6023
+ Enum_type_0_has_members_with_initializers_that_are_not_literals: diag(2535, ts.DiagnosticCategory.Error, "Enum_type_0_has_members_with_initializers_that_are_not_literals_2535", "Enum type '{0}' has members with initializers that are not literals."),
6023
6024
  Type_0_cannot_be_used_to_index_type_1: diag(2536, ts.DiagnosticCategory.Error, "Type_0_cannot_be_used_to_index_type_1_2536", "Type '{0}' cannot be used to index type '{1}'."),
6024
6025
  Type_0_has_no_matching_index_signature_for_type_1: diag(2537, ts.DiagnosticCategory.Error, "Type_0_has_no_matching_index_signature_for_type_1_2537", "Type '{0}' has no matching index signature for type '{1}'."),
6025
6026
  Type_0_cannot_be_used_as_an_index_type: diag(2538, ts.DiagnosticCategory.Error, "Type_0_cannot_be_used_as_an_index_type_2538", "Type '{0}' cannot be used as an index type."),
@@ -7262,7 +7263,7 @@ var ts;
7262
7263
  An_optional_chain_cannot_contain_private_identifiers: diag(18030, ts.DiagnosticCategory.Error, "An_optional_chain_cannot_contain_private_identifiers_18030", "An optional chain cannot contain private identifiers."),
7263
7264
  The_intersection_0_was_reduced_to_never_because_property_1_has_conflicting_types_in_some_constituents: diag(18031, ts.DiagnosticCategory.Error, "The_intersection_0_was_reduced_to_never_because_property_1_has_conflicting_types_in_some_constituent_18031", "The intersection '{0}' was reduced to 'never' because property '{1}' has conflicting types in some constituents."),
7264
7265
  The_intersection_0_was_reduced_to_never_because_property_1_exists_in_multiple_constituents_and_is_private_in_some: diag(18032, ts.DiagnosticCategory.Error, "The_intersection_0_was_reduced_to_never_because_property_1_exists_in_multiple_constituents_and_is_pr_18032", "The intersection '{0}' was reduced to 'never' because property '{1}' exists in multiple constituents and is private in some."),
7265
- Type_0_is_not_assignable_to_type_1_as_required_for_computed_enum_member_values: diag(18033, ts.DiagnosticCategory.Error, "Type_0_is_not_assignable_to_type_1_as_required_for_computed_enum_member_values_18033", "Type '{0}' is not assignable to type '{1}' as required for computed enum member values."),
7266
+ Only_numeric_enums_can_have_computed_members_but_this_expression_has_type_0_If_you_do_not_need_exhaustiveness_checks_consider_using_an_object_literal_instead: diag(18033, ts.DiagnosticCategory.Error, "Only_numeric_enums_can_have_computed_members_but_this_expression_has_type_0_If_you_do_not_need_exhau_18033", "Only numeric enums can have computed members, but this expression has type '{0}'. If you do not need exhaustiveness checks, consider using an object literal instead."),
7266
7267
  Specify_the_JSX_fragment_factory_function_to_use_when_targeting_react_JSX_emit_with_jsxFactory_compiler_option_is_specified_e_g_Fragment: diag(18034, ts.DiagnosticCategory.Message, "Specify_the_JSX_fragment_factory_function_to_use_when_targeting_react_JSX_emit_with_jsxFactory_compi_18034", "Specify the JSX fragment factory function to use when targeting 'react' JSX emit with 'jsxFactory' compiler option is specified, e.g. 'Fragment'."),
7267
7268
  Invalid_value_for_jsxFragmentFactory_0_is_not_a_valid_identifier_or_qualified_name: diag(18035, ts.DiagnosticCategory.Error, "Invalid_value_for_jsxFragmentFactory_0_is_not_a_valid_identifier_or_qualified_name_18035", "Invalid value for 'jsxFragmentFactory'. '{0}' is not a valid identifier or qualified-name."),
7268
7269
  Class_decorators_can_t_be_used_with_static_private_identifier_Consider_removing_the_experimental_decorator: diag(18036, ts.DiagnosticCategory.Error, "Class_decorators_can_t_be_used_with_static_private_identifier_Consider_removing_the_experimental_dec_18036", "Class decorators can't be used with static private identifier. Consider removing the experimental decorator."),
@@ -23203,7 +23204,7 @@ var ts;
23203
23204
  importName: "__generator",
23204
23205
  scoped: false,
23205
23206
  priority: 6,
23206
- text: "\n var __generator = (this && this.__generator) || function (thisArg, body) {\n var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;\n return g = { next: verb(0), \"throw\": verb(1), \"return\": verb(2) }, typeof Symbol === \"function\" && (g[Symbol.iterator] = function() { return this; }), g;\n function verb(n) { return function (v) { return step([n, v]); }; }\n function step(op) {\n if (f) throw new TypeError(\"Generator is already executing.\");\n while (_) try {\n if (f = 1, y && (t = op[0] & 2 ? y[\"return\"] : op[0] ? y[\"throw\"] || ((t = y[\"return\"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;\n if (y = 0, t) op = [op[0] & 2, t.value];\n switch (op[0]) {\n case 0: case 1: t = op; break;\n case 4: _.label++; return { value: op[1], done: false };\n case 5: _.label++; y = op[1]; op = [0]; continue;\n case 7: op = _.ops.pop(); _.trys.pop(); continue;\n default:\n if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }\n if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }\n if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }\n if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }\n if (t[2]) _.ops.pop();\n _.trys.pop(); continue;\n }\n op = body.call(thisArg, _);\n } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }\n if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };\n }\n };"
23207
+ text: "\n var __generator = (this && this.__generator) || function (thisArg, body) {\n var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;\n return g = { next: verb(0), \"throw\": verb(1), \"return\": verb(2) }, typeof Symbol === \"function\" && (g[Symbol.iterator] = function() { return this; }), g;\n function verb(n) { return function (v) { return step([n, v]); }; }\n function step(op) {\n if (f) throw new TypeError(\"Generator is already executing.\");\n while (g && (g = 0, op[0] && (_ = 0)), _) try {\n if (f = 1, y && (t = op[0] & 2 ? y[\"return\"] : op[0] ? y[\"throw\"] || ((t = y[\"return\"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;\n if (y = 0, t) op = [op[0] & 2, t.value];\n switch (op[0]) {\n case 0: case 1: t = op; break;\n case 4: _.label++; return { value: op[1], done: false };\n case 5: _.label++; y = op[1]; op = [0]; continue;\n case 7: op = _.ops.pop(); _.trys.pop(); continue;\n default:\n if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }\n if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }\n if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }\n if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }\n if (t[2]) _.ops.pop();\n _.trys.pop(); continue;\n }\n op = body.call(thisArg, _);\n } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }\n if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };\n }\n };"
23207
23208
  };
23208
23209
  ts.createBindingHelper = {
23209
23210
  name: "typescript:commonjscreatebinding",
@@ -40380,6 +40381,7 @@ var ts;
40380
40381
  var Signature = ts.objectAllocator.getSignatureConstructor();
40381
40382
  var typeCount = 0;
40382
40383
  var symbolCount = 0;
40384
+ var enumCount = 0;
40383
40385
  var totalInstantiationCount = 0;
40384
40386
  var instantiationCount = 0;
40385
40387
  var instantiationDepth = 0;
@@ -43585,11 +43587,6 @@ var ts;
43585
43587
  ts.tracing === null || ts.tracing === void 0 ? void 0 : ts.tracing.recordType(result);
43586
43588
  return result;
43587
43589
  }
43588
- function createTypeWithSymbol(flags, symbol) {
43589
- var result = createType(flags);
43590
- result.symbol = symbol;
43591
- return result;
43592
- }
43593
43590
  function createOriginType(flags) {
43594
43591
  return new Type(checker, flags);
43595
43592
  }
@@ -43601,8 +43598,9 @@ var ts;
43601
43598
  return type;
43602
43599
  }
43603
43600
  function createObjectType(objectFlags, symbol) {
43604
- var type = createTypeWithSymbol(524288, symbol);
43601
+ var type = createType(524288);
43605
43602
  type.objectFlags = objectFlags;
43603
+ type.symbol = symbol;
43606
43604
  type.members = undefined;
43607
43605
  type.properties = undefined;
43608
43606
  type.callSignatures = undefined;
@@ -43614,7 +43612,10 @@ var ts;
43614
43612
  return getUnionType(ts.arrayFrom(typeofNEFacts.keys(), getStringLiteralType));
43615
43613
  }
43616
43614
  function createTypeParameter(symbol) {
43617
- return createTypeWithSymbol(262144, symbol);
43615
+ var type = createType(262144);
43616
+ if (symbol)
43617
+ type.symbol = symbol;
43618
+ return type;
43618
43619
  }
43619
43620
  function isReservedMemberName(name) {
43620
43621
  return name.charCodeAt(0) === 95 &&
@@ -44255,28 +44256,28 @@ var ts;
44255
44256
  context.approximateLength += 7;
44256
44257
  return ts.factory.createKeywordTypeNode(134);
44257
44258
  }
44258
- if (type.flags & 1056) {
44259
- if (type.symbol.flags & 8) {
44260
- var parentSymbol = getParentOfSymbol(type.symbol);
44261
- var parentName = symbolToTypeNode(parentSymbol, context, 788968);
44262
- if (getDeclaredTypeOfSymbol(parentSymbol) === type) {
44263
- return parentName;
44264
- }
44265
- var memberName = ts.symbolName(type.symbol);
44266
- if (ts.isIdentifierText(memberName, 0)) {
44267
- return appendReferenceToType(parentName, ts.factory.createTypeReferenceNode(memberName, undefined));
44268
- }
44269
- if (ts.isImportTypeNode(parentName)) {
44270
- parentName.isTypeOf = true;
44271
- return ts.factory.createIndexedAccessTypeNode(parentName, ts.factory.createLiteralTypeNode(ts.factory.createStringLiteral(memberName)));
44272
- }
44273
- else if (ts.isTypeReferenceNode(parentName)) {
44274
- return ts.factory.createIndexedAccessTypeNode(ts.factory.createTypeQueryNode(parentName.typeName), ts.factory.createLiteralTypeNode(ts.factory.createStringLiteral(memberName)));
44275
- }
44276
- else {
44277
- return ts.Debug.fail("Unhandled type node kind returned from `symbolToTypeNode`.");
44278
- }
44259
+ if (type.flags & 1024 && !(type.flags & 1048576)) {
44260
+ var parentSymbol = getParentOfSymbol(type.symbol);
44261
+ var parentName = symbolToTypeNode(parentSymbol, context, 788968);
44262
+ if (getDeclaredTypeOfSymbol(parentSymbol) === type) {
44263
+ return parentName;
44264
+ }
44265
+ var memberName = ts.symbolName(type.symbol);
44266
+ if (ts.isIdentifierText(memberName, 0)) {
44267
+ return appendReferenceToType(parentName, ts.factory.createTypeReferenceNode(memberName, undefined));
44268
+ }
44269
+ if (ts.isImportTypeNode(parentName)) {
44270
+ parentName.isTypeOf = true;
44271
+ return ts.factory.createIndexedAccessTypeNode(parentName, ts.factory.createLiteralTypeNode(ts.factory.createStringLiteral(memberName)));
44272
+ }
44273
+ else if (ts.isTypeReferenceNode(parentName)) {
44274
+ return ts.factory.createIndexedAccessTypeNode(ts.factory.createTypeQueryNode(parentName.typeName), ts.factory.createLiteralTypeNode(ts.factory.createStringLiteral(memberName)));
44275
+ }
44276
+ else {
44277
+ return ts.Debug.fail("Unhandled type node kind returned from `symbolToTypeNode`.");
44279
44278
  }
44279
+ }
44280
+ if (type.flags & 1056) {
44280
44281
  return symbolToTypeNode(type.symbol, context, 788968);
44281
44282
  }
44282
44283
  if (type.flags & 128) {
@@ -48574,12 +48575,70 @@ var ts;
48574
48575
  }
48575
48576
  return links.declaredType;
48576
48577
  }
48578
+ function isStringConcatExpression(expr) {
48579
+ if (ts.isStringLiteralLike(expr)) {
48580
+ return true;
48581
+ }
48582
+ else if (expr.kind === 223) {
48583
+ return isStringConcatExpression(expr.left) && isStringConcatExpression(expr.right);
48584
+ }
48585
+ return false;
48586
+ }
48587
+ function isLiteralEnumMember(member) {
48588
+ var expr = member.initializer;
48589
+ if (!expr) {
48590
+ return !(member.flags & 16777216);
48591
+ }
48592
+ switch (expr.kind) {
48593
+ case 10:
48594
+ case 8:
48595
+ case 14:
48596
+ return true;
48597
+ case 221:
48598
+ return expr.operator === 40 &&
48599
+ expr.operand.kind === 8;
48600
+ case 79:
48601
+ return ts.nodeIsMissing(expr) || !!getSymbolOfNode(member.parent).exports.get(expr.escapedText);
48602
+ case 223:
48603
+ return isStringConcatExpression(expr);
48604
+ default:
48605
+ return false;
48606
+ }
48607
+ }
48608
+ function getEnumKind(symbol) {
48609
+ var links = getSymbolLinks(symbol);
48610
+ if (links.enumKind !== undefined) {
48611
+ return links.enumKind;
48612
+ }
48613
+ var hasNonLiteralMember = false;
48614
+ if (symbol.declarations) {
48615
+ for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
48616
+ var declaration = _a[_i];
48617
+ if (declaration.kind === 263) {
48618
+ for (var _b = 0, _c = declaration.members; _b < _c.length; _b++) {
48619
+ var member = _c[_b];
48620
+ if (member.initializer && ts.isStringLiteralLike(member.initializer)) {
48621
+ return links.enumKind = 1;
48622
+ }
48623
+ if (!isLiteralEnumMember(member)) {
48624
+ hasNonLiteralMember = true;
48625
+ }
48626
+ }
48627
+ }
48628
+ }
48629
+ }
48630
+ return links.enumKind = hasNonLiteralMember ? 0 : 1;
48631
+ }
48577
48632
  function getBaseTypeOfEnumLiteralType(type) {
48578
48633
  return type.flags & 1024 && !(type.flags & 1048576) ? getDeclaredTypeOfSymbol(getParentOfSymbol(type.symbol)) : type;
48579
48634
  }
48580
48635
  function getDeclaredTypeOfEnum(symbol) {
48581
48636
  var links = getSymbolLinks(symbol);
48582
- if (!links.declaredType) {
48637
+ if (links.declaredType) {
48638
+ return links.declaredType;
48639
+ }
48640
+ if (getEnumKind(symbol) === 1) {
48641
+ enumCount++;
48583
48642
  var memberTypeList = [];
48584
48643
  if (symbol.declarations) {
48585
48644
  for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
@@ -48587,29 +48646,26 @@ var ts;
48587
48646
  if (declaration.kind === 263) {
48588
48647
  for (var _b = 0, _c = declaration.members; _b < _c.length; _b++) {
48589
48648
  var member = _c[_b];
48590
- if (hasBindableName(member)) {
48591
- var memberSymbol = getSymbolOfNode(member);
48592
- var value = getEnumMemberValue(member);
48593
- var memberType = value !== undefined ?
48594
- getFreshTypeOfLiteralType(getEnumLiteralType(value, getSymbolId(symbol), memberSymbol)) :
48595
- createTypeWithSymbol(32, memberSymbol);
48596
- getSymbolLinks(memberSymbol).declaredType = memberType;
48597
- memberTypeList.push(getRegularTypeOfLiteralType(memberType));
48598
- }
48649
+ var value = getEnumMemberValue(member);
48650
+ var memberType = getFreshTypeOfLiteralType(getEnumLiteralType(value !== undefined ? value : 0, enumCount, getSymbolOfNode(member)));
48651
+ getSymbolLinks(getSymbolOfNode(member)).declaredType = memberType;
48652
+ memberTypeList.push(getRegularTypeOfLiteralType(memberType));
48599
48653
  }
48600
48654
  }
48601
48655
  }
48602
48656
  }
48603
- var enumType = memberTypeList.length ?
48604
- getUnionType(memberTypeList, 1, symbol, undefined) :
48605
- createTypeWithSymbol(32, symbol);
48606
- if (enumType.flags & 1048576) {
48607
- enumType.flags |= 1024;
48608
- enumType.symbol = symbol;
48657
+ if (memberTypeList.length) {
48658
+ var enumType_1 = getUnionType(memberTypeList, 1, symbol, undefined);
48659
+ if (enumType_1.flags & 1048576) {
48660
+ enumType_1.flags |= 1024;
48661
+ enumType_1.symbol = symbol;
48662
+ }
48663
+ return links.declaredType = enumType_1;
48609
48664
  }
48610
- links.declaredType = enumType;
48611
48665
  }
48612
- return links.declaredType;
48666
+ var enumType = createType(32);
48667
+ enumType.symbol = symbol;
48668
+ return links.declaredType = enumType;
48613
48669
  }
48614
48670
  function getDeclaredTypeOfEnumMember(symbol) {
48615
48671
  var links = getSymbolLinks(symbol);
@@ -51010,7 +51066,8 @@ var ts;
51010
51066
  return type;
51011
51067
  }
51012
51068
  function cloneTypeReference(source) {
51013
- var type = createTypeWithSymbol(source.flags, source.symbol);
51069
+ var type = createType(source.flags);
51070
+ type.symbol = source.symbol;
51014
51071
  type.objectFlags = source.objectFlags;
51015
51072
  type.target = source.target;
51016
51073
  type.resolvedTypeArguments = source.resolvedTypeArguments;
@@ -52634,7 +52691,7 @@ var ts;
52634
52691
  type.flags & 128 ? getStringLiteralType(applyStringMapping(symbol, type.value)) :
52635
52692
  type.flags & 134217728 ? getTemplateLiteralType.apply(void 0, applyTemplateStringMapping(symbol, type.texts, type.types)) :
52636
52693
  type.flags & 268435456 && symbol === type.symbol ? type :
52637
- type.flags & (1 | 4 || type.flags & 268435456) || isGenericIndexType(type) ? getStringMappingTypeForGenericType(symbol, type) :
52694
+ type.flags & (1 | 4 | 268435456) || isGenericIndexType(type) ? getStringMappingTypeForGenericType(symbol, type) :
52638
52695
  isPatternLiteralPlaceholderType(type) ? getStringMappingTypeForGenericType(symbol, getTemplateLiteralType(["", ""], [type])) :
52639
52696
  type;
52640
52697
  }
@@ -52665,7 +52722,8 @@ var ts;
52665
52722
  return result;
52666
52723
  }
52667
52724
  function createStringMappingType(symbol, type) {
52668
- var result = createTypeWithSymbol(268435456, symbol);
52725
+ var result = createType(268435456);
52726
+ result.symbol = symbol;
52669
52727
  result.type = type;
52670
52728
  return result;
52671
52729
  }
@@ -53541,7 +53599,8 @@ var ts;
53541
53599
  return info.isReadonly !== readonly ? createIndexInfo(info.keyType, info.type, readonly, info.declaration) : info;
53542
53600
  }
53543
53601
  function createLiteralType(flags, value, symbol, regularType) {
53544
- var type = createTypeWithSymbol(flags, symbol);
53602
+ var type = createType(flags);
53603
+ type.symbol = symbol;
53545
53604
  type.value = value;
53546
53605
  type.regularType = regularType || type;
53547
53606
  return type;
@@ -53583,7 +53642,8 @@ var ts;
53583
53642
  }
53584
53643
  function getEnumLiteralType(value, enumId, symbol) {
53585
53644
  var type;
53586
- var key = "".concat(enumId).concat(typeof value === "string" ? "@" : "#").concat(value);
53645
+ var qualifier = typeof value === "string" ? "@" : "#";
53646
+ var key = enumId + qualifier + value;
53587
53647
  var flags = 1024 | (typeof value === "string" ? 128 : 256);
53588
53648
  return enumLiteralTypes.get(key) ||
53589
53649
  (enumLiteralTypes.set(key, type = createLiteralType(flags, value, symbol)), type);
@@ -53599,7 +53659,8 @@ var ts;
53599
53659
  return links.resolvedType;
53600
53660
  }
53601
53661
  function createUniqueESSymbolType(symbol) {
53602
- var type = createTypeWithSymbol(8192, symbol);
53662
+ var type = createType(8192);
53663
+ type.symbol = symbol;
53603
53664
  type.escapedName = "__@".concat(type.symbol.escapedName, "@").concat(getSymbolId(type.symbol));
53604
53665
  return type;
53605
53666
  }
@@ -54282,7 +54343,13 @@ var ts;
54282
54343
  return ts.hasContextSensitiveParameters(node) || hasContextSensitiveReturnExpression(node);
54283
54344
  }
54284
54345
  function hasContextSensitiveReturnExpression(node) {
54285
- return !node.typeParameters && !ts.getEffectiveReturnTypeNode(node) && !!node.body && node.body.kind !== 238 && isContextSensitive(node.body);
54346
+ if (node.typeParameters || ts.getEffectiveReturnTypeNode(node) || !node.body) {
54347
+ return false;
54348
+ }
54349
+ if (node.body.kind !== 238) {
54350
+ return isContextSensitive(node.body);
54351
+ }
54352
+ return !!ts.forEachReturnStatement(node.body, function (statement) { return !!statement.expression && isContextSensitive(statement.expression); });
54286
54353
  }
54287
54354
  function isContextSensitiveFunctionOrObjectLiteralMethod(func) {
54288
54355
  return (ts.isFunctionExpressionOrArrowFunction(func) || ts.isObjectLiteralMethod(func)) &&
@@ -54941,20 +55008,19 @@ var ts;
54941
55008
  type.flags & 3145728 && ts.every(type.types, isStringIndexSignatureOnlyType) ||
54942
55009
  false;
54943
55010
  }
54944
- function isEnumTypeRelatedTo(source, target, errorReporter) {
54945
- var sourceSymbol = source.flags & 8 ? getParentOfSymbol(source) : source;
54946
- var targetSymbol = target.flags & 8 ? getParentOfSymbol(target) : target;
55011
+ function isEnumTypeRelatedTo(sourceSymbol, targetSymbol, errorReporter) {
54947
55012
  if (sourceSymbol === targetSymbol) {
54948
55013
  return true;
54949
55014
  }
54950
- if (sourceSymbol.escapedName !== targetSymbol.escapedName || !(sourceSymbol.flags & 256) || !(targetSymbol.flags & 256)) {
54951
- return false;
54952
- }
54953
55015
  var id = getSymbolId(sourceSymbol) + "," + getSymbolId(targetSymbol);
54954
55016
  var entry = enumRelation.get(id);
54955
55017
  if (entry !== undefined && !(!(entry & 4) && entry & 2 && errorReporter)) {
54956
55018
  return !!(entry & 1);
54957
55019
  }
55020
+ if (sourceSymbol.escapedName !== targetSymbol.escapedName || !(sourceSymbol.flags & 256) || !(targetSymbol.flags & 256)) {
55021
+ enumRelation.set(id, 2 | 4);
55022
+ return false;
55023
+ }
54958
55024
  var targetEnumType = getTypeOfSymbol(targetSymbol);
54959
55025
  for (var _i = 0, _a = getPropertiesOfType(getTypeOfSymbol(sourceSymbol)); _i < _a.length; _i++) {
54960
55026
  var property = _a[_i];
@@ -55000,14 +55066,14 @@ var ts;
55000
55066
  return true;
55001
55067
  if (s & 12288 && t & 4096)
55002
55068
  return true;
55003
- if (s & 32 && t & 32 && source.symbol.escapedName === target.symbol.escapedName &&
55004
- isEnumTypeRelatedTo(source.symbol, target.symbol, errorReporter))
55069
+ if (s & 32 && t & 32 && isEnumTypeRelatedTo(source.symbol, target.symbol, errorReporter))
55005
55070
  return true;
55006
55071
  if (s & 1024 && t & 1024) {
55007
55072
  if (s & 1048576 && t & 1048576 && isEnumTypeRelatedTo(source.symbol, target.symbol, errorReporter))
55008
55073
  return true;
55009
- if (s & 2944 && t & 2944 && source.value === target.value &&
55010
- isEnumTypeRelatedTo(source.symbol, target.symbol, errorReporter))
55074
+ if (s & 2944 && t & 2944 &&
55075
+ source.value === target.value &&
55076
+ isEnumTypeRelatedTo(getParentOfSymbol(source.symbol), getParentOfSymbol(target.symbol), errorReporter))
55011
55077
  return true;
55012
55078
  }
55013
55079
  if (s & 32768 && (!strictNullChecks && !(t & 3145728) || t & (32768 | 16384)))
@@ -61606,11 +61672,16 @@ var ts;
61606
61672
  var immediateContainer = ts.getSuperContainer(node, true);
61607
61673
  var container = immediateContainer;
61608
61674
  var needToCaptureLexicalThis = false;
61675
+ var inAsyncFunction = false;
61609
61676
  if (!isCallExpression) {
61610
61677
  while (container && container.kind === 216) {
61678
+ if (ts.hasSyntacticModifier(container, 512))
61679
+ inAsyncFunction = true;
61611
61680
  container = ts.getSuperContainer(container, true);
61612
61681
  needToCaptureLexicalThis = languageVersion < 2;
61613
61682
  }
61683
+ if (container && ts.hasSyntacticModifier(container, 512))
61684
+ inAsyncFunction = true;
61614
61685
  }
61615
61686
  var canUseSuperExpression = isLegalUsageOfSuperExpression(container);
61616
61687
  var nodeCheckFlag = 0;
@@ -61649,7 +61720,7 @@ var ts;
61649
61720
  nodeCheckFlag = 256;
61650
61721
  }
61651
61722
  getNodeLinks(node).flags |= nodeCheckFlag;
61652
- if (container.kind === 171 && ts.hasSyntacticModifier(container, 512)) {
61723
+ if (container.kind === 171 && inAsyncFunction) {
61653
61724
  if (ts.isSuperProperty(node.parent) && ts.isAssignmentTarget(node.parent)) {
61654
61725
  getNodeLinks(container).flags |= 4096;
61655
61726
  }
@@ -66068,7 +66139,7 @@ var ts;
66068
66139
  if (symbol && symbol.flags & 2097152) {
66069
66140
  symbol = resolveAlias(symbol);
66070
66141
  }
66071
- return !!(symbol && getAllSymbolFlags(symbol) & 384);
66142
+ return !!(symbol && (getAllSymbolFlags(symbol) & 384) && getEnumKind(symbol) === 1);
66072
66143
  }
66073
66144
  return false;
66074
66145
  }
@@ -68067,7 +68138,7 @@ var ts;
68067
68138
  }
68068
68139
  }
68069
68140
  function checkExpressionCached(node, checkMode) {
68070
- if (checkMode) {
68141
+ if (checkMode && checkMode !== 0) {
68071
68142
  return checkExpression(node, checkMode);
68072
68143
  }
68073
68144
  var links = getNodeLinks(node);
@@ -69127,6 +69198,9 @@ var ts;
69127
69198
  if (ts.some(symbol.declarations, function (d) { return ts.isTypeDeclaration(d) && !!(d.flags & 268435456); })) {
69128
69199
  addDeprecatedSuggestion(getDeprecatedSuggestionNode(node), symbol.declarations, symbol.escapedName);
69129
69200
  }
69201
+ if (type.flags & 32 && symbol.flags & 8) {
69202
+ error(node, ts.Diagnostics.Enum_type_0_has_members_with_initializers_that_are_not_literals, typeToString(type));
69203
+ }
69130
69204
  }
69131
69205
  }
69132
69206
  }
@@ -69655,7 +69729,7 @@ var ts;
69655
69729
  if (isReferenceToType(type, getGlobalPromiseType(false))) {
69656
69730
  return typeAsPromise.promisedTypeOfPromise = getTypeArguments(type)[0];
69657
69731
  }
69658
- if (allTypesAssignableToKind(type, 131068 | 131072)) {
69732
+ if (allTypesAssignableToKind(getBaseConstraintOrType(type), 131068 | 131072)) {
69659
69733
  return undefined;
69660
69734
  }
69661
69735
  var thenFunction = getTypeOfPropertyOfType(type, "then");
@@ -69711,7 +69785,7 @@ var ts;
69711
69785
  return awaitedType || errorType;
69712
69786
  }
69713
69787
  function isThenableType(type) {
69714
- if (allTypesAssignableToKind(type, 131068 | 131072)) {
69788
+ if (allTypesAssignableToKind(getBaseConstraintOrType(type), 131068 | 131072)) {
69715
69789
  return false;
69716
69790
  }
69717
69791
  var thenFunction = getTypeOfPropertyOfType(type, "then");
@@ -72601,7 +72675,7 @@ var ts;
72601
72675
  if (member.initializer) {
72602
72676
  return computeConstantValue(member);
72603
72677
  }
72604
- if (member.parent.flags & 16777216 && !ts.isEnumConst(member.parent)) {
72678
+ if (member.parent.flags & 16777216 && !ts.isEnumConst(member.parent) && getEnumKind(getSymbolOfNode(member.parent)) === 0) {
72605
72679
  return undefined;
72606
72680
  }
72607
72681
  if (autoValue !== undefined) {
@@ -72611,9 +72685,10 @@ var ts;
72611
72685
  return undefined;
72612
72686
  }
72613
72687
  function computeConstantValue(member) {
72688
+ var enumKind = getEnumKind(getSymbolOfNode(member.parent));
72614
72689
  var isConstEnum = ts.isEnumConst(member.parent);
72615
72690
  var initializer = member.initializer;
72616
- var value = evaluate(initializer, member);
72691
+ var value = enumKind === 1 && !isLiteralEnumMember(member) ? undefined : evaluate(initializer);
72617
72692
  if (value !== undefined) {
72618
72693
  if (isConstEnum && typeof value === "number" && !isFinite(value)) {
72619
72694
  error(initializer, isNaN(value) ?
@@ -72621,6 +72696,10 @@ var ts;
72621
72696
  ts.Diagnostics.const_enum_member_initializer_was_evaluated_to_a_non_finite_value);
72622
72697
  }
72623
72698
  }
72699
+ else if (enumKind === 1) {
72700
+ error(initializer, ts.Diagnostics.Computed_values_are_not_permitted_in_an_enum_with_string_valued_members);
72701
+ return 0;
72702
+ }
72624
72703
  else if (isConstEnum) {
72625
72704
  error(initializer, ts.Diagnostics.const_enum_member_initializers_can_only_contain_literal_values_and_other_computed_enum_values);
72626
72705
  }
@@ -72628,117 +72707,110 @@ var ts;
72628
72707
  error(initializer, ts.Diagnostics.In_ambient_enum_declarations_member_initializer_must_be_constant_expression);
72629
72708
  }
72630
72709
  else {
72631
- checkTypeAssignableTo(checkExpression(initializer), numberType, initializer, ts.Diagnostics.Type_0_is_not_assignable_to_type_1_as_required_for_computed_enum_member_values);
72710
+ var source = checkExpression(initializer);
72711
+ if (!isTypeAssignableToKind(source, 296)) {
72712
+ error(initializer, ts.Diagnostics.Only_numeric_enums_can_have_computed_members_but_this_expression_has_type_0_If_you_do_not_need_exhaustiveness_checks_consider_using_an_object_literal_instead, typeToString(source));
72713
+ }
72714
+ else {
72715
+ checkTypeAssignableTo(source, getDeclaredTypeOfSymbol(getSymbolOfNode(member.parent)), initializer, undefined);
72716
+ }
72632
72717
  }
72633
72718
  return value;
72634
- }
72635
- function evaluate(expr, location) {
72636
- switch (expr.kind) {
72637
- case 221:
72638
- var value = evaluate(expr.operand, location);
72639
- if (typeof value === "number") {
72640
- switch (expr.operator) {
72641
- case 39: return value;
72642
- case 40: return -value;
72643
- case 54: return ~value;
72719
+ function evaluate(expr) {
72720
+ switch (expr.kind) {
72721
+ case 221:
72722
+ var value_2 = evaluate(expr.operand);
72723
+ if (typeof value_2 === "number") {
72724
+ switch (expr.operator) {
72725
+ case 39: return value_2;
72726
+ case 40: return -value_2;
72727
+ case 54: return ~value_2;
72728
+ }
72644
72729
  }
72645
- }
72646
- break;
72647
- case 223:
72648
- var left = evaluate(expr.left, location);
72649
- var right = evaluate(expr.right, location);
72650
- if (typeof left === "number" && typeof right === "number") {
72651
- switch (expr.operatorToken.kind) {
72652
- case 51: return left | right;
72653
- case 50: return left & right;
72654
- case 48: return left >> right;
72655
- case 49: return left >>> right;
72656
- case 47: return left << right;
72657
- case 52: return left ^ right;
72658
- case 41: return left * right;
72659
- case 43: return left / right;
72660
- case 39: return left + right;
72661
- case 40: return left - right;
72662
- case 44: return left % right;
72663
- case 42: return Math.pow(left, right);
72664
- }
72665
- }
72666
- else if ((typeof left === "string" || typeof left === "number") &&
72667
- (typeof right === "string" || typeof right === "number") &&
72668
- expr.operatorToken.kind === 39) {
72669
- return "" + left + right;
72670
- }
72671
- break;
72672
- case 10:
72673
- case 14:
72674
- return expr.text;
72675
- case 225:
72676
- return evaluateTemplateExpression(expr, location);
72677
- case 8:
72678
- checkGrammarNumericLiteral(expr);
72679
- return +expr.text;
72680
- case 214:
72681
- return evaluate(expr.expression, location);
72682
- case 79:
72683
- if (ts.isInfinityOrNaNString(expr.escapedText)) {
72684
- return +(expr.escapedText);
72685
- }
72686
- case 208:
72687
- if (ts.isEntityNameExpression(expr)) {
72688
- var symbol = resolveEntityName(expr, 111551, true);
72689
- if (symbol) {
72690
- if (symbol.flags & 8) {
72691
- return evaluateEnumMember(expr, symbol, location);
72730
+ break;
72731
+ case 223:
72732
+ var left = evaluate(expr.left);
72733
+ var right = evaluate(expr.right);
72734
+ if (typeof left === "number" && typeof right === "number") {
72735
+ switch (expr.operatorToken.kind) {
72736
+ case 51: return left | right;
72737
+ case 50: return left & right;
72738
+ case 48: return left >> right;
72739
+ case 49: return left >>> right;
72740
+ case 47: return left << right;
72741
+ case 52: return left ^ right;
72742
+ case 41: return left * right;
72743
+ case 43: return left / right;
72744
+ case 39: return left + right;
72745
+ case 40: return left - right;
72746
+ case 44: return left % right;
72747
+ case 42: return Math.pow(left, right);
72692
72748
  }
72693
- if (isConstVariable(symbol)) {
72694
- var declaration = symbol.valueDeclaration;
72695
- if (declaration && !declaration.type && declaration.initializer && declaration !== location && isBlockScopedNameDeclaredBeforeUse(declaration, location)) {
72696
- return evaluate(declaration.initializer, declaration);
72749
+ }
72750
+ else if (typeof left === "string" && typeof right === "string" && expr.operatorToken.kind === 39) {
72751
+ return left + right;
72752
+ }
72753
+ break;
72754
+ case 10:
72755
+ case 14:
72756
+ return expr.text;
72757
+ case 8:
72758
+ checkGrammarNumericLiteral(expr);
72759
+ return +expr.text;
72760
+ case 214:
72761
+ return evaluate(expr.expression);
72762
+ case 79:
72763
+ var identifier = expr;
72764
+ if (ts.isInfinityOrNaNString(identifier.escapedText)) {
72765
+ return +(identifier.escapedText);
72766
+ }
72767
+ return ts.nodeIsMissing(expr) ? 0 : evaluateEnumMember(expr, getSymbolOfNode(member.parent), identifier.escapedText);
72768
+ case 209:
72769
+ case 208:
72770
+ if (isConstantMemberAccess(expr)) {
72771
+ var type = getTypeOfExpression(expr.expression);
72772
+ if (type.symbol && type.symbol.flags & 384) {
72773
+ var name = void 0;
72774
+ if (expr.kind === 208) {
72775
+ name = expr.name.escapedText;
72776
+ }
72777
+ else {
72778
+ name = ts.escapeLeadingUnderscores(ts.cast(expr.argumentExpression, ts.isLiteralExpression).text);
72697
72779
  }
72780
+ return evaluateEnumMember(expr, type.symbol, name);
72698
72781
  }
72699
72782
  }
72700
- }
72701
- break;
72702
- case 209:
72703
- var root = expr.expression;
72704
- if (ts.isEntityNameExpression(root) && ts.isStringLiteralLike(expr.argumentExpression)) {
72705
- var rootSymbol = resolveEntityName(root, 111551, true);
72706
- if (rootSymbol && rootSymbol.flags & 384) {
72707
- var name = ts.escapeLeadingUnderscores(expr.argumentExpression.text);
72708
- var member = rootSymbol.exports.get(name);
72709
- if (member) {
72710
- return evaluateEnumMember(expr, member, location);
72711
- }
72783
+ break;
72784
+ }
72785
+ return undefined;
72786
+ }
72787
+ function evaluateEnumMember(expr, enumSymbol, name) {
72788
+ var memberSymbol = enumSymbol.exports.get(name);
72789
+ if (memberSymbol) {
72790
+ var declaration = memberSymbol.valueDeclaration;
72791
+ if (declaration !== member) {
72792
+ if (declaration && isBlockScopedNameDeclaredBeforeUse(declaration, member) && ts.isEnumDeclaration(declaration.parent)) {
72793
+ return getEnumMemberValue(declaration);
72712
72794
  }
72795
+ error(expr, ts.Diagnostics.A_member_initializer_in_a_enum_declaration_cannot_reference_members_declared_after_it_including_members_defined_in_other_enums);
72796
+ return 0;
72713
72797
  }
72714
- break;
72715
- }
72716
- return undefined;
72717
- }
72718
- function evaluateEnumMember(expr, symbol, location) {
72719
- var declaration = symbol.valueDeclaration;
72720
- if (!declaration || declaration === location) {
72721
- error(expr, ts.Diagnostics.Property_0_is_used_before_being_assigned, symbolToString(symbol));
72798
+ else {
72799
+ error(expr, ts.Diagnostics.Property_0_is_used_before_being_assigned, symbolToString(memberSymbol));
72800
+ }
72801
+ }
72722
72802
  return undefined;
72723
72803
  }
72724
- if (!isBlockScopedNameDeclaredBeforeUse(declaration, location)) {
72725
- error(expr, ts.Diagnostics.A_member_initializer_in_a_enum_declaration_cannot_reference_members_declared_after_it_including_members_defined_in_other_enums);
72726
- return 0;
72727
- }
72728
- return getEnumMemberValue(declaration);
72729
72804
  }
72730
- function evaluateTemplateExpression(expr, location) {
72731
- var result = expr.head.text;
72732
- for (var _i = 0, _a = expr.templateSpans; _i < _a.length; _i++) {
72733
- var span = _a[_i];
72734
- var value = evaluate(span.expression, location);
72735
- if (value === undefined) {
72736
- return undefined;
72737
- }
72738
- result += value;
72739
- result += span.literal.text;
72805
+ function isConstantMemberAccess(node) {
72806
+ var type = getTypeOfExpression(node);
72807
+ if (type === errorType) {
72808
+ return false;
72740
72809
  }
72741
- return result;
72810
+ return node.kind === 79 ||
72811
+ node.kind === 208 && isConstantMemberAccess(node.expression) ||
72812
+ node.kind === 209 && isConstantMemberAccess(node.expression) &&
72813
+ ts.isStringLiteralLike(node.argumentExpression);
72742
72814
  }
72743
72815
  function checkEnumDeclaration(node) {
72744
72816
  addLazyDiagnostic(function () { return checkEnumDeclarationWorker(node); });
@@ -82469,8 +82541,11 @@ var ts;
82469
82541
  }
82470
82542
  return ts.visitEachChild(node, visitor, context);
82471
82543
  case 174:
82544
+ return doWithContext(1 | 2, visitGetAccessorDeclaration, node);
82472
82545
  case 175:
82546
+ return doWithContext(1 | 2, visitSetAccessorDeclaration, node);
82473
82547
  case 173:
82548
+ return doWithContext(1 | 2, visitConstructorDeclaration, node);
82474
82549
  case 260:
82475
82550
  case 228:
82476
82551
  return doWithContext(1 | 2, visitDefault, node);
@@ -82561,10 +82636,19 @@ var ts;
82561
82636
  }
82562
82637
  return ts.setOriginalNode(ts.setTextRange(factory.createYieldExpression(undefined, ts.visitNode(node.expression, visitor, ts.isExpression)), node), node);
82563
82638
  }
82639
+ function visitConstructorDeclaration(node) {
82640
+ return factory.updateConstructorDeclaration(node, ts.visitNodes(node.modifiers, visitor, ts.isModifierLike), ts.visitParameterList(node.parameters, visitor, context), transformMethodBody(node));
82641
+ }
82564
82642
  function visitMethodDeclaration(node) {
82565
82643
  return factory.updateMethodDeclaration(node, ts.visitNodes(node.modifiers, visitor, ts.isModifierLike), node.asteriskToken, node.name, undefined, undefined, ts.visitParameterList(node.parameters, visitor, context), undefined, ts.getFunctionFlags(node) & 2
82566
82644
  ? transformAsyncFunctionBody(node)
82567
- : ts.visitFunctionBody(node.body, visitor, context));
82645
+ : transformMethodBody(node));
82646
+ }
82647
+ function visitGetAccessorDeclaration(node) {
82648
+ return factory.updateGetAccessorDeclaration(node, ts.visitNodes(node.modifiers, visitor, ts.isModifierLike), node.name, ts.visitParameterList(node.parameters, visitor, context), undefined, transformMethodBody(node));
82649
+ }
82650
+ function visitSetAccessorDeclaration(node) {
82651
+ return factory.updateSetAccessorDeclaration(node, ts.visitNodes(node.modifiers, visitor, ts.isModifierLike), node.name, ts.visitParameterList(node.parameters, visitor, context), transformMethodBody(node));
82568
82652
  }
82569
82653
  function visitFunctionDeclaration(node) {
82570
82654
  return factory.updateFunctionDeclaration(node, ts.visitNodes(node.modifiers, visitor, ts.isModifierLike), node.asteriskToken, node.name, undefined, ts.visitParameterList(node.parameters, visitor, context), undefined, ts.getFunctionFlags(node) & 2
@@ -82648,6 +82732,39 @@ var ts;
82648
82732
  }
82649
82733
  return false;
82650
82734
  }
82735
+ function transformMethodBody(node) {
82736
+ ts.Debug.assertIsDefined(node.body);
82737
+ var savedCapturedSuperProperties = capturedSuperProperties;
82738
+ var savedHasSuperElementAccess = hasSuperElementAccess;
82739
+ capturedSuperProperties = new ts.Set();
82740
+ hasSuperElementAccess = false;
82741
+ var updated = ts.visitFunctionBody(node.body, visitor, context);
82742
+ var originalMethod = ts.getOriginalNode(node, ts.isFunctionLikeDeclaration);
82743
+ var emitSuperHelpers = languageVersion >= 2 &&
82744
+ resolver.getNodeCheckFlags(node) & (4096 | 2048) &&
82745
+ (ts.getFunctionFlags(originalMethod) & 3) !== 3;
82746
+ if (emitSuperHelpers) {
82747
+ enableSubstitutionForAsyncMethodsWithSuper();
82748
+ if (capturedSuperProperties.size) {
82749
+ var variableStatement = createSuperAccessVariableStatement(factory, resolver, node, capturedSuperProperties);
82750
+ substitutedSuperAccessors[ts.getNodeId(variableStatement)] = true;
82751
+ var statements = updated.statements.slice();
82752
+ ts.insertStatementsAfterStandardPrologue(statements, [variableStatement]);
82753
+ updated = factory.updateBlock(updated, statements);
82754
+ }
82755
+ if (hasSuperElementAccess) {
82756
+ if (resolver.getNodeCheckFlags(node) & 4096) {
82757
+ ts.addEmitHelper(updated, ts.advancedAsyncSuperHelper);
82758
+ }
82759
+ else if (resolver.getNodeCheckFlags(node) & 2048) {
82760
+ ts.addEmitHelper(updated, ts.asyncSuperHelper);
82761
+ }
82762
+ }
82763
+ }
82764
+ capturedSuperProperties = savedCapturedSuperProperties;
82765
+ hasSuperElementAccess = savedHasSuperElementAccess;
82766
+ return updated;
82767
+ }
82651
82768
  function transformAsyncFunctionBody(node) {
82652
82769
  resumeLexicalEnvironment();
82653
82770
  var original = ts.getOriginalNode(node, ts.isFunctionLike);
@@ -102658,7 +102775,7 @@ var ts;
102658
102775
  var isNonDirectorySeparatorRoot = rootLength > 1 || dirPath.charCodeAt(0) !== 47;
102659
102776
  if (isNonDirectorySeparatorRoot &&
102660
102777
  dirPath.search(/[a-zA-Z]:/) !== 0 &&
102661
- pathPartForUserCheck.search(/[a-zA-z]\$\//) === 0) {
102778
+ pathPartForUserCheck.search(/[a-zA-Z]\$\//) === 0) {
102662
102779
  nextDirectorySeparator = dirPath.indexOf(ts.directorySeparator, nextDirectorySeparator + 1);
102663
102780
  if (nextDirectorySeparator === -1) {
102664
102781
  return false;
@@ -103935,15 +104052,21 @@ var ts;
103935
104052
  return undefined;
103936
104053
  }
103937
104054
  function tryGetModuleNameFromRootDirs(rootDirs, moduleFileName, sourceDirectory, getCanonicalFileName, ending, compilerOptions) {
103938
- var normalizedTargetPath = getPathRelativeToRootDirs(moduleFileName, rootDirs, getCanonicalFileName);
103939
- if (normalizedTargetPath === undefined) {
104055
+ var normalizedTargetPaths = getPathsRelativeToRootDirs(moduleFileName, rootDirs, getCanonicalFileName);
104056
+ if (normalizedTargetPaths === undefined) {
104057
+ return undefined;
104058
+ }
104059
+ var normalizedSourcePaths = getPathsRelativeToRootDirs(sourceDirectory, rootDirs, getCanonicalFileName);
104060
+ var relativePaths = ts.flatMap(normalizedSourcePaths, function (sourcePath) {
104061
+ return ts.map(normalizedTargetPaths, function (targetPath) { return ts.ensurePathIsNonModuleName(ts.getRelativePathFromDirectory(sourcePath, targetPath, getCanonicalFileName)); });
104062
+ });
104063
+ var shortest = ts.min(relativePaths, ts.compareNumberOfDirectorySeparators);
104064
+ if (!shortest) {
103940
104065
  return undefined;
103941
104066
  }
103942
- var normalizedSourcePath = getPathRelativeToRootDirs(sourceDirectory, rootDirs, getCanonicalFileName);
103943
- var relativePath = normalizedSourcePath !== undefined ? ts.ensurePathIsNonModuleName(ts.getRelativePathFromDirectory(normalizedSourcePath, normalizedTargetPath, getCanonicalFileName)) : normalizedTargetPath;
103944
104067
  return ts.getEmitModuleResolutionKind(compilerOptions) === ts.ModuleResolutionKind.NodeJs
103945
- ? removeExtensionAndIndexPostFix(relativePath, ending, compilerOptions)
103946
- : ts.removeFileExtension(relativePath);
104068
+ ? removeExtensionAndIndexPostFix(shortest, ending, compilerOptions)
104069
+ : ts.removeFileExtension(shortest);
103947
104070
  }
103948
104071
  function tryGetModuleNameAsNodeModule(_a, _b, importingSourceFile, host, options, userPreferences, packageNameOnly, overrideMode) {
103949
104072
  var path = _a.path, isRedirect = _a.isRedirect;
@@ -104063,8 +104186,8 @@ var ts;
104063
104186
  }
104064
104187
  }
104065
104188
  }
104066
- function getPathRelativeToRootDirs(path, rootDirs, getCanonicalFileName) {
104067
- return ts.firstDefined(rootDirs, function (rootDir) {
104189
+ function getPathsRelativeToRootDirs(path, rootDirs, getCanonicalFileName) {
104190
+ return ts.mapDefined(rootDirs, function (rootDir) {
104068
104191
  var relativePath = getRelativePathIfInDirectory(path, rootDir, getCanonicalFileName);
104069
104192
  return relativePath !== undefined && isPathRelativeToParent(relativePath) ? undefined : relativePath;
104070
104193
  });