@typescript-deploys/pr-build 5.3.0-pr-56131-2 → 5.3.0-pr-56161-5

package/lib/tsc.js

@@ -18,7 +18,7 @@ and limitations under the License.
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.3";
-var version = `${versionMajorMinor}.0-insiders.20231016`;
+var version = `${versionMajorMinor}.0-insiders.20231020`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -6653,6 +6653,7 @@ var Diagnostics = {
   Excessive_complexity_comparing_types_0_and_1: diag(2859, 1 /* Error */, "Excessive_complexity_comparing_types_0_and_1_2859", "Excessive complexity comparing types '{0}' and '{1}'."),
   The_left_hand_side_of_an_instanceof_expression_must_be_assignable_to_the_first_argument_of_the_right_hand_side_s_Symbol_hasInstance_method: diag(2860, 1 /* Error */, "The_left_hand_side_of_an_instanceof_expression_must_be_assignable_to_the_first_argument_of_the_right_2860", "The left-hand side of an 'instanceof' expression must be assignable to the first argument of the right-hand side's '[Symbol.hasInstance]' method."),
   An_object_s_Symbol_hasInstance_method_must_return_a_boolean_value_for_it_to_be_used_on_the_right_hand_side_of_an_instanceof_expression: diag(2861, 1 /* Error */, "An_object_s_Symbol_hasInstance_method_must_return_a_boolean_value_for_it_to_be_used_on_the_right_han_2861", "An object's '[Symbol.hasInstance]' method must return a boolean value for it to be used on the right-hand side of an 'instanceof' expression."),
+  Type_0_is_generic_and_can_only_be_indexed_for_reading: diag(2862, 1 /* Error */, "Type_0_is_generic_and_can_only_be_indexed_for_reading_2862", "Type '{0}' is generic and can only be indexed for reading."),
   Import_declaration_0_is_using_private_name_1: diag(4e3, 1 /* Error */, "Import_declaration_0_is_using_private_name_1_4000", "Import declaration '{0}' is using private name '{1}'."),
   Type_parameter_0_of_exported_class_has_or_is_using_private_name_1: diag(4002, 1 /* Error */, "Type_parameter_0_of_exported_class_has_or_is_using_private_name_1_4002", "Type parameter '{0}' of exported class has or is using private name '{1}'."),
   Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1: diag(4004, 1 /* Error */, "Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1_4004", "Type parameter '{0}' of exported interface has or is using private name '{1}'."),
@@ -23693,17 +23694,18 @@ var asyncGeneratorHelper = {
   scoped: false,
   dependencies: [awaitHelper],
   text: `
-            var __asyncGenerator = (this && this.__asyncGenerator) || function (thisArg, _arguments, generator) {
-                if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
-                var g = generator.apply(thisArg, _arguments || []), i, q = [];
-                return i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i;
-                function verb(n) { if (g[n]) i[n] = function (v) { return new Promise(function (a, b) { q.push([n, v, a, b]) > 1 || resume(n, v); }); }; }
-                function resume(n, v) { try { step(g[n](v)); } catch (e) { settle(q[0][3], e); } }
-                function step(r) { r.value instanceof __await ? Promise.resolve(r.value.v).then(fulfill, reject) : settle(q[0][2], r); }
-                function fulfill(value) { resume("next", value); }
-                function reject(value) { resume("throw", value); }
-                function settle(f, v) { if (f(v), q.shift(), q.length) resume(q[0][0], q[0][1]); }
-            };`
+        var __asyncGenerator = (this && this.__asyncGenerator) || function (thisArg, _arguments, generator) {
+            if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
+            var g = generator.apply(thisArg, _arguments || []), i, q = [];
+            return i = {}, verb("next"), verb("throw"), verb("return", awaitReturn), i[Symbol.asyncIterator] = function () { return this; }, i;
+            function awaitReturn(f) { return function (v) { return Promise.resolve(v).then(f, reject); }; }
+            function verb(n, f) { if (g[n]) { i[n] = function (v) { return new Promise(function (a, b) { q.push([n, v, a, b]) > 1 || resume(n, v); }); }; if (f) i[n] = f(i[n]); } }
+            function resume(n, v) { try { step(g[n](v)); } catch (e) { settle(q[0][3], e); } }
+            function step(r) { r.value instanceof __await ? Promise.resolve(r.value.v).then(fulfill, reject) : settle(q[0][2], r); }
+            function fulfill(value) { resume("next", value); }
+            function reject(value) { resume("throw", value); }
+            function settle(f, v) { if (f(v), q.shift(), q.length) resume(q[0][0], q[0][1]); }
+        };`
 };
 var asyncDelegator = {
   name: "typescript:asyncDelegator",
@@ -57653,7 +57655,11 @@ function createTypeChecker(host) {
       if (indexInfo) {
         if (accessFlags & 2 /* NoIndexSignatures */ && indexInfo.keyType !== numberType) {
           if (accessExpression) {
-            error(accessExpression, Diagnostics.Type_0_cannot_be_used_to_index_type_1, typeToString(indexType), typeToString(originalObjectType));
+            if (accessFlags & 4 /* Writing */) {
+              error(accessExpression, Diagnostics.Type_0_is_generic_and_can_only_be_indexed_for_reading, typeToString(originalObjectType));
+            } else {
+              error(accessExpression, Diagnostics.Type_0_cannot_be_used_to_index_type_1, typeToString(indexType), typeToString(originalObjectType));
+            }
           }
           return void 0;
         }
@@ -65930,13 +65936,15 @@ function createTypeChecker(host) {
       return void 0;
     }
     function getDiscriminantPropertyAccess(expr, computedType) {
-      const type = !(computedType.flags & 1048576 /* Union */) && declaredType.flags & 1048576 /* Union */ ? declaredType : computedType;
-      if (type.flags & 1048576 /* Union */) {
+      if (declaredType.flags & 1048576 /* Union */ || computedType.flags & 1048576 /* Union */) {
         const access = getCandidateDiscriminantPropertyAccess(expr);
         if (access) {
           const name = getAccessedPropertyName(access);
-          if (name && isDiscriminantProperty(type, name)) {
-            return access;
+          if (name) {
+            const type = declaredType.flags & 1048576 /* Union */ && isTypeSubsetOf(computedType, declaredType) ? declaredType : computedType;
+            if (isDiscriminantProperty(type, name)) {
+              return access;
+            }
           }
         }
       }
@@ -79682,7 +79690,7 @@ function createTypeChecker(host) {
       error(member.name, Diagnostics.Computed_property_names_are_not_allowed_in_enums);
     } else {
       const text = getTextOfPropertyName(member.name);
-      if (isNumericLiteralName(text) && !isInfinityOrNaNString(text)) {
+      if (isNumericLiteralName(text)) {
         error(member.name, Diagnostics.An_enum_member_cannot_have_a_numeric_name);
       }
     }

package/lib/tsserver.js

@@ -2328,7 +2328,7 @@ module.exports = __toCommonJS(server_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.3";
-var version = `${versionMajorMinor}.0-insiders.20231016`;
+var version = `${versionMajorMinor}.0-insiders.20231020`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -10181,6 +10181,7 @@ var Diagnostics = {
   Excessive_complexity_comparing_types_0_and_1: diag(2859, 1 /* Error */, "Excessive_complexity_comparing_types_0_and_1_2859", "Excessive complexity comparing types '{0}' and '{1}'."),
   The_left_hand_side_of_an_instanceof_expression_must_be_assignable_to_the_first_argument_of_the_right_hand_side_s_Symbol_hasInstance_method: diag(2860, 1 /* Error */, "The_left_hand_side_of_an_instanceof_expression_must_be_assignable_to_the_first_argument_of_the_right_2860", "The left-hand side of an 'instanceof' expression must be assignable to the first argument of the right-hand side's '[Symbol.hasInstance]' method."),
   An_object_s_Symbol_hasInstance_method_must_return_a_boolean_value_for_it_to_be_used_on_the_right_hand_side_of_an_instanceof_expression: diag(2861, 1 /* Error */, "An_object_s_Symbol_hasInstance_method_must_return_a_boolean_value_for_it_to_be_used_on_the_right_han_2861", "An object's '[Symbol.hasInstance]' method must return a boolean value for it to be used on the right-hand side of an 'instanceof' expression."),
+  Type_0_is_generic_and_can_only_be_indexed_for_reading: diag(2862, 1 /* Error */, "Type_0_is_generic_and_can_only_be_indexed_for_reading_2862", "Type '{0}' is generic and can only be indexed for reading."),
   Import_declaration_0_is_using_private_name_1: diag(4e3, 1 /* Error */, "Import_declaration_0_is_using_private_name_1_4000", "Import declaration '{0}' is using private name '{1}'."),
   Type_parameter_0_of_exported_class_has_or_is_using_private_name_1: diag(4002, 1 /* Error */, "Type_parameter_0_of_exported_class_has_or_is_using_private_name_1_4002", "Type parameter '{0}' of exported class has or is using private name '{1}'."),
   Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1: diag(4004, 1 /* Error */, "Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1_4004", "Type parameter '{0}' of exported interface has or is using private name '{1}'."),
@@ -27957,17 +27958,18 @@ var asyncGeneratorHelper = {
   scoped: false,
   dependencies: [awaitHelper],
   text: `
-            var __asyncGenerator = (this && this.__asyncGenerator) || function (thisArg, _arguments, generator) {
-                if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
-                var g = generator.apply(thisArg, _arguments || []), i, q = [];
-                return i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i;
-                function verb(n) { if (g[n]) i[n] = function (v) { return new Promise(function (a, b) { q.push([n, v, a, b]) > 1 || resume(n, v); }); }; }
-                function resume(n, v) { try { step(g[n](v)); } catch (e) { settle(q[0][3], e); } }
-                function step(r) { r.value instanceof __await ? Promise.resolve(r.value.v).then(fulfill, reject) : settle(q[0][2], r); }
-                function fulfill(value) { resume("next", value); }
-                function reject(value) { resume("throw", value); }
-                function settle(f, v) { if (f(v), q.shift(), q.length) resume(q[0][0], q[0][1]); }
-            };`
+        var __asyncGenerator = (this && this.__asyncGenerator) || function (thisArg, _arguments, generator) {
+            if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
+            var g = generator.apply(thisArg, _arguments || []), i, q = [];
+            return i = {}, verb("next"), verb("throw"), verb("return", awaitReturn), i[Symbol.asyncIterator] = function () { return this; }, i;
+            function awaitReturn(f) { return function (v) { return Promise.resolve(v).then(f, reject); }; }
+            function verb(n, f) { if (g[n]) { i[n] = function (v) { return new Promise(function (a, b) { q.push([n, v, a, b]) > 1 || resume(n, v); }); }; if (f) i[n] = f(i[n]); } }
+            function resume(n, v) { try { step(g[n](v)); } catch (e) { settle(q[0][3], e); } }
+            function step(r) { r.value instanceof __await ? Promise.resolve(r.value.v).then(fulfill, reject) : settle(q[0][2], r); }
+            function fulfill(value) { resume("next", value); }
+            function reject(value) { resume("throw", value); }
+            function settle(f, v) { if (f(v), q.shift(), q.length) resume(q[0][0], q[0][1]); }
+        };`
 };
 var asyncDelegator = {
   name: "typescript:asyncDelegator",
@@ -62365,7 +62367,11 @@ function createTypeChecker(host) {
       if (indexInfo) {
         if (accessFlags & 2 /* NoIndexSignatures */ && indexInfo.keyType !== numberType) {
           if (accessExpression) {
-            error2(accessExpression, Diagnostics.Type_0_cannot_be_used_to_index_type_1, typeToString(indexType), typeToString(originalObjectType));
+            if (accessFlags & 4 /* Writing */) {
+              error2(accessExpression, Diagnostics.Type_0_is_generic_and_can_only_be_indexed_for_reading, typeToString(originalObjectType));
+            } else {
+              error2(accessExpression, Diagnostics.Type_0_cannot_be_used_to_index_type_1, typeToString(indexType), typeToString(originalObjectType));
+            }
           }
           return void 0;
         }
@@ -70642,13 +70648,15 @@ function createTypeChecker(host) {
       return void 0;
     }
     function getDiscriminantPropertyAccess(expr, computedType) {
-      const type = !(computedType.flags & 1048576 /* Union */) && declaredType.flags & 1048576 /* Union */ ? declaredType : computedType;
-      if (type.flags & 1048576 /* Union */) {
+      if (declaredType.flags & 1048576 /* Union */ || computedType.flags & 1048576 /* Union */) {
         const access = getCandidateDiscriminantPropertyAccess(expr);
         if (access) {
           const name = getAccessedPropertyName(access);
-          if (name && isDiscriminantProperty(type, name)) {
-            return access;
+          if (name) {
+            const type = declaredType.flags & 1048576 /* Union */ && isTypeSubsetOf(computedType, declaredType) ? declaredType : computedType;
+            if (isDiscriminantProperty(type, name)) {
+              return access;
+            }
           }
         }
       }
@@ -84394,7 +84402,7 @@ function createTypeChecker(host) {
       error2(member.name, Diagnostics.Computed_property_names_are_not_allowed_in_enums);
     } else {
       const text = getTextOfPropertyName(member.name);
-      if (isNumericLiteralName(text) && !isInfinityOrNaNString(text)) {
+      if (isNumericLiteralName(text)) {
         error2(member.name, Diagnostics.An_enum_member_cannot_have_a_numeric_name);
       }
     }
@@ -138605,46 +138613,26 @@ function getRangeToExtract(context, considerEmptySpans = true) {
   const current = getTokenAtPosition(file, startPosition);
   const range = createTextRangeFromSpan(getRefactorContextSpan(context));
   const cursorRequest = range.pos === range.end && considerEmptySpans;
-  const firstType = findAncestor(current, (node) => node.parent && isTypeNode(node) && !rangeContainsSkipTrivia(range, node.parent, file) && (cursorRequest || nodeOverlapsWithStartEnd(current, file, range.pos, range.end)));
-  if (!firstType || !isTypeNode(firstType))
+  const selection = findAncestor(current, (node) => node.parent && isTypeNode(node) && !rangeContainsSkipTrivia(range, node.parent, file) && (cursorRequest || nodeOverlapsWithStartEnd(current, file, range.pos, range.end)));
+  if (!selection || !isTypeNode(selection))
     return { error: getLocaleSpecificMessage(Diagnostics.Selection_is_not_a_valid_type_node) };
   const checker = context.program.getTypeChecker();
-  const enclosingNode = getEnclosingNode(firstType, isJS);
+  const enclosingNode = getEnclosingNode(selection, isJS);
   if (enclosingNode === void 0)
     return { error: getLocaleSpecificMessage(Diagnostics.No_type_could_be_extracted_from_this_type_node) };
-  const typeList = [];
-  if ((isUnionTypeNode(firstType.parent) || isIntersectionTypeNode(firstType.parent)) && range.end > firstType.end) {
-    addRange(
-      typeList,
-      firstType.parent.types.filter((type) => {
-        return type.getStart() >= range.pos && type.getEnd() <= range.end;
-      })
-    );
-  }
-  const selection = typeList.length > 1 ? typeList : firstType;
   const typeParameters = collectTypeParameters(checker, selection, enclosingNode, file);
   if (!typeParameters)
     return { error: getLocaleSpecificMessage(Diagnostics.No_type_could_be_extracted_from_this_type_node) };
   const typeElements = flattenTypeLiteralNodeReference(checker, selection);
   return { isJS, selection, enclosingNode, typeParameters, typeElements };
 }
-function flattenTypeLiteralNodeReference(checker, selection) {
-  if (!selection)
+function flattenTypeLiteralNodeReference(checker, node) {
+  if (!node)
     return void 0;
-  if (isArray(selection)) {
-    const result = [];
-    for (const type of selection) {
-      const flattenedTypeMembers = flattenTypeLiteralNodeReference(checker, type);
-      if (!flattenedTypeMembers)
-        return void 0;
-      addRange(result, flattenedTypeMembers);
-    }
-    return result;
-  }
-  if (isIntersectionTypeNode(selection)) {
+  if (isIntersectionTypeNode(node)) {
     const result = [];
     const seen = /* @__PURE__ */ new Map();
-    for (const type of selection.types) {
+    for (const type of node.types) {
       const flattenedTypeMembers = flattenTypeLiteralNodeReference(checker, type);
       if (!flattenedTypeMembers || !flattenedTypeMembers.every((type2) => type2.name && addToSeen(seen, getNameFromPropertyName(type2.name)))) {
         return void 0;
@@ -138652,30 +138640,18 @@ function flattenTypeLiteralNodeReference(checker, selection) {
       addRange(result, flattenedTypeMembers);
     }
     return result;
-  } else if (isParenthesizedTypeNode(selection)) {
-    return flattenTypeLiteralNodeReference(checker, selection.type);
-  } else if (isTypeLiteralNode(selection)) {
-    return selection.members;
+  } else if (isParenthesizedTypeNode(node)) {
+    return flattenTypeLiteralNodeReference(checker, node.type);
+  } else if (isTypeLiteralNode(node)) {
+    return node.members;
   }
   return void 0;
 }
 function rangeContainsSkipTrivia(r1, node, file) {
-  const r1Range = arrayToNode(r1);
-  const nodeRange = arrayToNode(node);
-  return rangeContainsStartEnd(r1Range, skipTrivia(file.text, nodeRange.pos), nodeRange.end);
-  function arrayToNode(rangeOrArray) {
-    return isArray(rangeOrArray) ? { pos: rangeOrArray[0].pos, end: rangeOrArray[rangeOrArray.length - 1].end } : rangeOrArray;
-  }
+  return rangeContainsStartEnd(r1, skipTrivia(file.text, node.pos), node.end);
 }
 function collectTypeParameters(checker, selection, enclosingNode, file) {
   const result = [];
-  if (isArray(selection)) {
-    selection.forEach((t) => {
-      if (!visitor(t))
-        return void 0;
-    });
-    return result;
-  }
   return visitor(selection) ? void 0 : result;
   function visitor(node) {
     if (isTypeReferenceNode(node)) {
@@ -138736,62 +138712,32 @@ function collectTypeParameters(checker, selection, enclosingNode, file) {
 }
 function doTypeAliasChange(changes, file, name, info) {
   const { enclosingNode, selection, typeParameters } = info;
-  if (isArray(selection)) {
-    const newTypeValue = isUnionTypeNode(selection[0].parent) ? factory.createUnionTypeNode(selection) : factory.createIntersectionTypeNode(selection);
-    const newTypeDeclaration = factory.createTypeAliasDeclaration(
-      /*modifiers*/
-      void 0,
-      name,
-      typeParameters.map((id) => factory.updateTypeParameterDeclaration(
-        id,
-        id.modifiers,
-        id.name,
-        id.constraint,
-        /*defaultType*/
-        void 0
-      )),
-      newTypeValue
-    );
-    changes.insertNodeBefore(
-      file,
-      enclosingNode,
-      ignoreSourceNewlines(newTypeDeclaration),
-      /*blankLineBetween*/
-      true
-    );
-    changes.replaceNodeRange(file, selection[0], selection[selection.length - 1], factory.createTypeReferenceNode(name, typeParameters.map((id) => factory.createTypeReferenceNode(
-      id.name,
-      /*typeArguments*/
-      void 0
-    ))), { leadingTriviaOption: ts_textChanges_exports.LeadingTriviaOption.Exclude, trailingTriviaOption: ts_textChanges_exports.TrailingTriviaOption.ExcludeWhitespace });
-  } else {
-    const newTypeNode = factory.createTypeAliasDeclaration(
-      /*modifiers*/
-      void 0,
-      name,
-      typeParameters.map((id) => factory.updateTypeParameterDeclaration(
-        id,
-        id.modifiers,
-        id.name,
-        id.constraint,
-        /*defaultType*/
-        void 0
-      )),
-      selection
-    );
-    changes.insertNodeBefore(
-      file,
-      enclosingNode,
-      ignoreSourceNewlines(newTypeNode),
-      /*blankLineBetween*/
-      true
-    );
-    changes.replaceNode(file, selection, factory.createTypeReferenceNode(name, typeParameters.map((id) => factory.createTypeReferenceNode(
+  const newTypeNode = factory.createTypeAliasDeclaration(
+    /*modifiers*/
+    void 0,
+    name,
+    typeParameters.map((id) => factory.updateTypeParameterDeclaration(
+      id,
+      id.modifiers,
       id.name,
-      /*typeArguments*/
+      id.constraint,
+      /*defaultType*/
       void 0
-    ))), { leadingTriviaOption: ts_textChanges_exports.LeadingTriviaOption.Exclude, trailingTriviaOption: ts_textChanges_exports.TrailingTriviaOption.ExcludeWhitespace });
-  }
+    )),
+    selection
+  );
+  changes.insertNodeBefore(
+    file,
+    enclosingNode,
+    ignoreSourceNewlines(newTypeNode),
+    /*blankLineBetween*/
+    true
+  );
+  changes.replaceNode(file, selection, factory.createTypeReferenceNode(name, typeParameters.map((id) => factory.createTypeReferenceNode(
+    id.name,
+    /*typeArguments*/
+    void 0
+  ))), { leadingTriviaOption: ts_textChanges_exports.LeadingTriviaOption.Exclude, trailingTriviaOption: ts_textChanges_exports.TrailingTriviaOption.ExcludeWhitespace });
 }
 function doInterfaceChange(changes, file, name, info) {
   var _a;
@@ -138813,36 +138759,19 @@ function doInterfaceChange(changes, file, name, info) {
     /*blankLineBetween*/
     true
   );
-  if (isArray(selection)) {
-    changes.replaceNodeRange(file, selection[0], selection[selection.length - 1], factory.createTypeReferenceNode(name, typeParameters.map((id) => factory.createTypeReferenceNode(
-      id.name,
-      /*typeArguments*/
-      void 0
-    ))), { leadingTriviaOption: ts_textChanges_exports.LeadingTriviaOption.Exclude, trailingTriviaOption: ts_textChanges_exports.TrailingTriviaOption.ExcludeWhitespace });
-  } else {
-    changes.replaceNode(file, selection, factory.createTypeReferenceNode(name, typeParameters.map((id) => factory.createTypeReferenceNode(
-      id.name,
-      /*typeArguments*/
-      void 0
-    ))), { leadingTriviaOption: ts_textChanges_exports.LeadingTriviaOption.Exclude, trailingTriviaOption: ts_textChanges_exports.TrailingTriviaOption.ExcludeWhitespace });
-  }
+  changes.replaceNode(file, selection, factory.createTypeReferenceNode(name, typeParameters.map((id) => factory.createTypeReferenceNode(
+    id.name,
+    /*typeArguments*/
+    void 0
+  ))), { leadingTriviaOption: ts_textChanges_exports.LeadingTriviaOption.Exclude, trailingTriviaOption: ts_textChanges_exports.TrailingTriviaOption.ExcludeWhitespace });
 }
 function doTypedefChange(changes, context, file, name, info) {
   var _a;
   const { enclosingNode, selection, typeParameters } = info;
-  let newTypeValue;
-  if (isArray(selection)) {
-    selection.forEach((typeNode) => {
-      setEmitFlags(typeNode, 3072 /* NoComments */ | 4096 /* NoNestedComments */);
-    });
-    newTypeValue = isUnionTypeNode(selection[0].parent) ? factory.createUnionTypeNode(selection) : factory.createIntersectionTypeNode(selection);
-  } else {
-    setEmitFlags(selection, 3072 /* NoComments */ | 4096 /* NoNestedComments */);
-    newTypeValue = selection;
-  }
+  setEmitFlags(selection, 3072 /* NoComments */ | 4096 /* NoNestedComments */);
   const node = factory.createJSDocTypedefTag(
     factory.createIdentifier("typedef"),
-    factory.createJSDocTypeExpression(newTypeValue),
+    factory.createJSDocTypeExpression(selection),
     factory.createIdentifier(name)
   );
   const templates = [];
@@ -138880,19 +138809,11 @@ function doTypedefChange(changes, context, file, name, info) {
       true
     );
   }
-  if (isArray(selection)) {
-    changes.replaceNodeRange(file, selection[0], selection[selection.length - 1], factory.createTypeReferenceNode(name, typeParameters.map((id) => factory.createTypeReferenceNode(
-      id.name,
-      /*typeArguments*/
-      void 0
-    ))));
-  } else {
-    changes.replaceNode(file, selection, factory.createTypeReferenceNode(name, typeParameters.map((id) => factory.createTypeReferenceNode(
-      id.name,
-      /*typeArguments*/
-      void 0
-    ))));
-  }
+  changes.replaceNode(file, selection, factory.createTypeReferenceNode(name, typeParameters.map((id) => factory.createTypeReferenceNode(
+    id.name,
+    /*typeArguments*/
+    void 0
+  ))));
 }
 function getEnclosingNode(node, isJS) {
   return findAncestor(node, isStatement) || (isJS ? findAncestor(node, isJSDoc) : void 0);

package/lib/typescript.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.3";
-      version = `${versionMajorMinor}.0-insiders.20231016`;
+      version = `${versionMajorMinor}.0-insiders.20231020`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -7963,6 +7963,7 @@ ${lanes.join("\n")}
         Excessive_complexity_comparing_types_0_and_1: diag(2859, 1 /* Error */, "Excessive_complexity_comparing_types_0_and_1_2859", "Excessive complexity comparing types '{0}' and '{1}'."),
         The_left_hand_side_of_an_instanceof_expression_must_be_assignable_to_the_first_argument_of_the_right_hand_side_s_Symbol_hasInstance_method: diag(2860, 1 /* Error */, "The_left_hand_side_of_an_instanceof_expression_must_be_assignable_to_the_first_argument_of_the_right_2860", "The left-hand side of an 'instanceof' expression must be assignable to the first argument of the right-hand side's '[Symbol.hasInstance]' method."),
         An_object_s_Symbol_hasInstance_method_must_return_a_boolean_value_for_it_to_be_used_on_the_right_hand_side_of_an_instanceof_expression: diag(2861, 1 /* Error */, "An_object_s_Symbol_hasInstance_method_must_return_a_boolean_value_for_it_to_be_used_on_the_right_han_2861", "An object's '[Symbol.hasInstance]' method must return a boolean value for it to be used on the right-hand side of an 'instanceof' expression."),
+        Type_0_is_generic_and_can_only_be_indexed_for_reading: diag(2862, 1 /* Error */, "Type_0_is_generic_and_can_only_be_indexed_for_reading_2862", "Type '{0}' is generic and can only be indexed for reading."),
         Import_declaration_0_is_using_private_name_1: diag(4e3, 1 /* Error */, "Import_declaration_0_is_using_private_name_1_4000", "Import declaration '{0}' is using private name '{1}'."),
         Type_parameter_0_of_exported_class_has_or_is_using_private_name_1: diag(4002, 1 /* Error */, "Type_parameter_0_of_exported_class_has_or_is_using_private_name_1_4002", "Type parameter '{0}' of exported class has or is using private name '{1}'."),
         Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1: diag(4004, 1 /* Error */, "Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1_4004", "Type parameter '{0}' of exported interface has or is using private name '{1}'."),
@@ -25834,17 +25835,18 @@ ${lanes.join("\n")}
         scoped: false,
         dependencies: [awaitHelper],
         text: `
-            var __asyncGenerator = (this && this.__asyncGenerator) || function (thisArg, _arguments, generator) {
-                if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
-                var g = generator.apply(thisArg, _arguments || []), i, q = [];
-                return i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i;
-                function verb(n) { if (g[n]) i[n] = function (v) { return new Promise(function (a, b) { q.push([n, v, a, b]) > 1 || resume(n, v); }); }; }
-                function resume(n, v) { try { step(g[n](v)); } catch (e) { settle(q[0][3], e); } }
-                function step(r) { r.value instanceof __await ? Promise.resolve(r.value.v).then(fulfill, reject) : settle(q[0][2], r); }
-                function fulfill(value) { resume("next", value); }
-                function reject(value) { resume("throw", value); }
-                function settle(f, v) { if (f(v), q.shift(), q.length) resume(q[0][0], q[0][1]); }
-            };`
+        var __asyncGenerator = (this && this.__asyncGenerator) || function (thisArg, _arguments, generator) {
+            if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
+            var g = generator.apply(thisArg, _arguments || []), i, q = [];
+            return i = {}, verb("next"), verb("throw"), verb("return", awaitReturn), i[Symbol.asyncIterator] = function () { return this; }, i;
+            function awaitReturn(f) { return function (v) { return Promise.resolve(v).then(f, reject); }; }
+            function verb(n, f) { if (g[n]) { i[n] = function (v) { return new Promise(function (a, b) { q.push([n, v, a, b]) > 1 || resume(n, v); }); }; if (f) i[n] = f(i[n]); } }
+            function resume(n, v) { try { step(g[n](v)); } catch (e) { settle(q[0][3], e); } }
+            function step(r) { r.value instanceof __await ? Promise.resolve(r.value.v).then(fulfill, reject) : settle(q[0][2], r); }
+            function fulfill(value) { resume("next", value); }
+            function reject(value) { resume("throw", value); }
+            function settle(f, v) { if (f(v), q.shift(), q.length) resume(q[0][0], q[0][1]); }
+        };`
       };
       asyncDelegator = {
         name: "typescript:asyncDelegator",
@@ -60132,7 +60134,11 @@ ${lanes.join("\n")}
         if (indexInfo) {
           if (accessFlags & 2 /* NoIndexSignatures */ && indexInfo.keyType !== numberType) {
             if (accessExpression) {
-              error2(accessExpression, Diagnostics.Type_0_cannot_be_used_to_index_type_1, typeToString(indexType), typeToString(originalObjectType));
+              if (accessFlags & 4 /* Writing */) {
+                error2(accessExpression, Diagnostics.Type_0_is_generic_and_can_only_be_indexed_for_reading, typeToString(originalObjectType));
+              } else {
+                error2(accessExpression, Diagnostics.Type_0_cannot_be_used_to_index_type_1, typeToString(indexType), typeToString(originalObjectType));
+              }
             }
             return void 0;
           }
@@ -68409,13 +68415,15 @@ ${lanes.join("\n")}
         return void 0;
       }
       function getDiscriminantPropertyAccess(expr, computedType) {
-        const type = !(computedType.flags & 1048576 /* Union */) && declaredType.flags & 1048576 /* Union */ ? declaredType : computedType;
-        if (type.flags & 1048576 /* Union */) {
+        if (declaredType.flags & 1048576 /* Union */ || computedType.flags & 1048576 /* Union */) {
           const access = getCandidateDiscriminantPropertyAccess(expr);
           if (access) {
             const name = getAccessedPropertyName(access);
-            if (name && isDiscriminantProperty(type, name)) {
-              return access;
+            if (name) {
+              const type = declaredType.flags & 1048576 /* Union */ && isTypeSubsetOf(computedType, declaredType) ? declaredType : computedType;
+              if (isDiscriminantProperty(type, name)) {
+                return access;
+              }
             }
           }
         }
@@ -82161,7 +82169,7 @@ ${lanes.join("\n")}
         error2(member.name, Diagnostics.Computed_property_names_are_not_allowed_in_enums);
       } else {
         const text = getTextOfPropertyName(member.name);
-        if (isNumericLiteralName(text) && !isInfinityOrNaNString(text)) {
+        if (isNumericLiteralName(text)) {
           error2(member.name, Diagnostics.An_enum_member_cannot_have_a_numeric_name);
         }
       }
@@ -136916,46 +136924,26 @@ ${lanes.join("\n")}
     const current = getTokenAtPosition(file, startPosition);
     const range = createTextRangeFromSpan(getRefactorContextSpan(context));
     const cursorRequest = range.pos === range.end && considerEmptySpans;
-    const firstType = findAncestor(current, (node) => node.parent && isTypeNode(node) && !rangeContainsSkipTrivia(range, node.parent, file) && (cursorRequest || nodeOverlapsWithStartEnd(current, file, range.pos, range.end)));
-    if (!firstType || !isTypeNode(firstType))
+    const selection = findAncestor(current, (node) => node.parent && isTypeNode(node) && !rangeContainsSkipTrivia(range, node.parent, file) && (cursorRequest || nodeOverlapsWithStartEnd(current, file, range.pos, range.end)));
+    if (!selection || !isTypeNode(selection))
       return { error: getLocaleSpecificMessage(Diagnostics.Selection_is_not_a_valid_type_node) };
     const checker = context.program.getTypeChecker();
-    const enclosingNode = getEnclosingNode(firstType, isJS);
+    const enclosingNode = getEnclosingNode(selection, isJS);
     if (enclosingNode === void 0)
       return { error: getLocaleSpecificMessage(Diagnostics.No_type_could_be_extracted_from_this_type_node) };
-    const typeList = [];
-    if ((isUnionTypeNode(firstType.parent) || isIntersectionTypeNode(firstType.parent)) && range.end > firstType.end) {
-      addRange(
-        typeList,
-        firstType.parent.types.filter((type) => {
-          return type.getStart() >= range.pos && type.getEnd() <= range.end;
-        })
-      );
-    }
-    const selection = typeList.length > 1 ? typeList : firstType;
     const typeParameters = collectTypeParameters(checker, selection, enclosingNode, file);
     if (!typeParameters)
       return { error: getLocaleSpecificMessage(Diagnostics.No_type_could_be_extracted_from_this_type_node) };
     const typeElements = flattenTypeLiteralNodeReference(checker, selection);
     return { isJS, selection, enclosingNode, typeParameters, typeElements };
   }
-  function flattenTypeLiteralNodeReference(checker, selection) {
-    if (!selection)
+  function flattenTypeLiteralNodeReference(checker, node) {
+    if (!node)
       return void 0;
-    if (isArray(selection)) {
-      const result = [];
-      for (const type of selection) {
-        const flattenedTypeMembers = flattenTypeLiteralNodeReference(checker, type);
-        if (!flattenedTypeMembers)
-          return void 0;
-        addRange(result, flattenedTypeMembers);
-      }
-      return result;
-    }
-    if (isIntersectionTypeNode(selection)) {
+    if (isIntersectionTypeNode(node)) {
       const result = [];
       const seen = /* @__PURE__ */ new Map();
-      for (const type of selection.types) {
+      for (const type of node.types) {
         const flattenedTypeMembers = flattenTypeLiteralNodeReference(checker, type);
         if (!flattenedTypeMembers || !flattenedTypeMembers.every((type2) => type2.name && addToSeen(seen, getNameFromPropertyName(type2.name)))) {
           return void 0;
@@ -136963,30 +136951,18 @@ ${lanes.join("\n")}
         addRange(result, flattenedTypeMembers);
       }
       return result;
-    } else if (isParenthesizedTypeNode(selection)) {
-      return flattenTypeLiteralNodeReference(checker, selection.type);
-    } else if (isTypeLiteralNode(selection)) {
-      return selection.members;
+    } else if (isParenthesizedTypeNode(node)) {
+      return flattenTypeLiteralNodeReference(checker, node.type);
+    } else if (isTypeLiteralNode(node)) {
+      return node.members;
     }
     return void 0;
   }
   function rangeContainsSkipTrivia(r1, node, file) {
-    const r1Range = arrayToNode(r1);
-    const nodeRange = arrayToNode(node);
-    return rangeContainsStartEnd(r1Range, skipTrivia(file.text, nodeRange.pos), nodeRange.end);
-    function arrayToNode(rangeOrArray) {
-      return isArray(rangeOrArray) ? { pos: rangeOrArray[0].pos, end: rangeOrArray[rangeOrArray.length - 1].end } : rangeOrArray;
-    }
+    return rangeContainsStartEnd(r1, skipTrivia(file.text, node.pos), node.end);
   }
   function collectTypeParameters(checker, selection, enclosingNode, file) {
     const result = [];
-    if (isArray(selection)) {
-      selection.forEach((t) => {
-        if (!visitor(t))
-          return void 0;
-      });
-      return result;
-    }
     return visitor(selection) ? void 0 : result;
     function visitor(node) {
       if (isTypeReferenceNode(node)) {
@@ -137047,62 +137023,32 @@ ${lanes.join("\n")}
   }
   function doTypeAliasChange(changes, file, name, info) {
     const { enclosingNode, selection, typeParameters } = info;
-    if (isArray(selection)) {
-      const newTypeValue = isUnionTypeNode(selection[0].parent) ? factory.createUnionTypeNode(selection) : factory.createIntersectionTypeNode(selection);
-      const newTypeDeclaration = factory.createTypeAliasDeclaration(
-        /*modifiers*/
-        void 0,
-        name,
-        typeParameters.map((id) => factory.updateTypeParameterDeclaration(
-          id,
-          id.modifiers,
-          id.name,
-          id.constraint,
-          /*defaultType*/
-          void 0
-        )),
-        newTypeValue
-      );
-      changes.insertNodeBefore(
-        file,
-        enclosingNode,
-        ignoreSourceNewlines(newTypeDeclaration),
-        /*blankLineBetween*/
-        true
-      );
-      changes.replaceNodeRange(file, selection[0], selection[selection.length - 1], factory.createTypeReferenceNode(name, typeParameters.map((id) => factory.createTypeReferenceNode(
-        id.name,
-        /*typeArguments*/
-        void 0
-      ))), { leadingTriviaOption: ts_textChanges_exports.LeadingTriviaOption.Exclude, trailingTriviaOption: ts_textChanges_exports.TrailingTriviaOption.ExcludeWhitespace });
-    } else {
-      const newTypeNode = factory.createTypeAliasDeclaration(
-        /*modifiers*/
-        void 0,
-        name,
-        typeParameters.map((id) => factory.updateTypeParameterDeclaration(
-          id,
-          id.modifiers,
-          id.name,
-          id.constraint,
-          /*defaultType*/
-          void 0
-        )),
-        selection
-      );
-      changes.insertNodeBefore(
-        file,
-        enclosingNode,
-        ignoreSourceNewlines(newTypeNode),
-        /*blankLineBetween*/
-        true
-      );
-      changes.replaceNode(file, selection, factory.createTypeReferenceNode(name, typeParameters.map((id) => factory.createTypeReferenceNode(
+    const newTypeNode = factory.createTypeAliasDeclaration(
+      /*modifiers*/
+      void 0,
+      name,
+      typeParameters.map((id) => factory.updateTypeParameterDeclaration(
+        id,
+        id.modifiers,
         id.name,
-        /*typeArguments*/
+        id.constraint,
+        /*defaultType*/
         void 0
-      ))), { leadingTriviaOption: ts_textChanges_exports.LeadingTriviaOption.Exclude, trailingTriviaOption: ts_textChanges_exports.TrailingTriviaOption.ExcludeWhitespace });
-    }
+      )),
+      selection
+    );
+    changes.insertNodeBefore(
+      file,
+      enclosingNode,
+      ignoreSourceNewlines(newTypeNode),
+      /*blankLineBetween*/
+      true
+    );
+    changes.replaceNode(file, selection, factory.createTypeReferenceNode(name, typeParameters.map((id) => factory.createTypeReferenceNode(
+      id.name,
+      /*typeArguments*/
+      void 0
+    ))), { leadingTriviaOption: ts_textChanges_exports.LeadingTriviaOption.Exclude, trailingTriviaOption: ts_textChanges_exports.TrailingTriviaOption.ExcludeWhitespace });
   }
   function doInterfaceChange(changes, file, name, info) {
     var _a;
@@ -137124,36 +137070,19 @@ ${lanes.join("\n")}
       /*blankLineBetween*/
       true
     );
-    if (isArray(selection)) {
-      changes.replaceNodeRange(file, selection[0], selection[selection.length - 1], factory.createTypeReferenceNode(name, typeParameters.map((id) => factory.createTypeReferenceNode(
-        id.name,
-        /*typeArguments*/
-        void 0
-      ))), { leadingTriviaOption: ts_textChanges_exports.LeadingTriviaOption.Exclude, trailingTriviaOption: ts_textChanges_exports.TrailingTriviaOption.ExcludeWhitespace });
-    } else {
-      changes.replaceNode(file, selection, factory.createTypeReferenceNode(name, typeParameters.map((id) => factory.createTypeReferenceNode(
-        id.name,
-        /*typeArguments*/
-        void 0
-      ))), { leadingTriviaOption: ts_textChanges_exports.LeadingTriviaOption.Exclude, trailingTriviaOption: ts_textChanges_exports.TrailingTriviaOption.ExcludeWhitespace });
-    }
+    changes.replaceNode(file, selection, factory.createTypeReferenceNode(name, typeParameters.map((id) => factory.createTypeReferenceNode(
+      id.name,
+      /*typeArguments*/
+      void 0
+    ))), { leadingTriviaOption: ts_textChanges_exports.LeadingTriviaOption.Exclude, trailingTriviaOption: ts_textChanges_exports.TrailingTriviaOption.ExcludeWhitespace });
   }
   function doTypedefChange(changes, context, file, name, info) {
     var _a;
     const { enclosingNode, selection, typeParameters } = info;
-    let newTypeValue;
-    if (isArray(selection)) {
-      selection.forEach((typeNode) => {
-        setEmitFlags(typeNode, 3072 /* NoComments */ | 4096 /* NoNestedComments */);
-      });
-      newTypeValue = isUnionTypeNode(selection[0].parent) ? factory.createUnionTypeNode(selection) : factory.createIntersectionTypeNode(selection);
-    } else {
-      setEmitFlags(selection, 3072 /* NoComments */ | 4096 /* NoNestedComments */);
-      newTypeValue = selection;
-    }
+    setEmitFlags(selection, 3072 /* NoComments */ | 4096 /* NoNestedComments */);
     const node = factory.createJSDocTypedefTag(
       factory.createIdentifier("typedef"),
-      factory.createJSDocTypeExpression(newTypeValue),
+      factory.createJSDocTypeExpression(selection),
       factory.createIdentifier(name)
     );
     const templates = [];
@@ -137191,19 +137120,11 @@ ${lanes.join("\n")}
         true
       );
     }
-    if (isArray(selection)) {
-      changes.replaceNodeRange(file, selection[0], selection[selection.length - 1], factory.createTypeReferenceNode(name, typeParameters.map((id) => factory.createTypeReferenceNode(
-        id.name,
-        /*typeArguments*/
-        void 0
-      ))));
-    } else {
-      changes.replaceNode(file, selection, factory.createTypeReferenceNode(name, typeParameters.map((id) => factory.createTypeReferenceNode(
-        id.name,
-        /*typeArguments*/
-        void 0
-      ))));
-    }
+    changes.replaceNode(file, selection, factory.createTypeReferenceNode(name, typeParameters.map((id) => factory.createTypeReferenceNode(
+      id.name,
+      /*typeArguments*/
+      void 0
+    ))));
   }
   function getEnclosingNode(node, isJS) {
     return findAncestor(node, isStatement) || (isJS ? findAncestor(node, isJSDoc) : void 0);

package/lib/typingsInstaller.js

@@ -54,7 +54,7 @@ var path = __toESM(require("path"));
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.3";
-var version = `${versionMajorMinor}.0-insiders.20231016`;
+var version = `${versionMajorMinor}.0-insiders.20231020`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -6030,6 +6030,7 @@ var Diagnostics = {
   Excessive_complexity_comparing_types_0_and_1: diag(2859, 1 /* Error */, "Excessive_complexity_comparing_types_0_and_1_2859", "Excessive complexity comparing types '{0}' and '{1}'."),
   The_left_hand_side_of_an_instanceof_expression_must_be_assignable_to_the_first_argument_of_the_right_hand_side_s_Symbol_hasInstance_method: diag(2860, 1 /* Error */, "The_left_hand_side_of_an_instanceof_expression_must_be_assignable_to_the_first_argument_of_the_right_2860", "The left-hand side of an 'instanceof' expression must be assignable to the first argument of the right-hand side's '[Symbol.hasInstance]' method."),
   An_object_s_Symbol_hasInstance_method_must_return_a_boolean_value_for_it_to_be_used_on_the_right_hand_side_of_an_instanceof_expression: diag(2861, 1 /* Error */, "An_object_s_Symbol_hasInstance_method_must_return_a_boolean_value_for_it_to_be_used_on_the_right_han_2861", "An object's '[Symbol.hasInstance]' method must return a boolean value for it to be used on the right-hand side of an 'instanceof' expression."),
+  Type_0_is_generic_and_can_only_be_indexed_for_reading: diag(2862, 1 /* Error */, "Type_0_is_generic_and_can_only_be_indexed_for_reading_2862", "Type '{0}' is generic and can only be indexed for reading."),
   Import_declaration_0_is_using_private_name_1: diag(4e3, 1 /* Error */, "Import_declaration_0_is_using_private_name_1_4000", "Import declaration '{0}' is using private name '{1}'."),
   Type_parameter_0_of_exported_class_has_or_is_using_private_name_1: diag(4002, 1 /* Error */, "Type_parameter_0_of_exported_class_has_or_is_using_private_name_1_4002", "Type parameter '{0}' of exported class has or is using private name '{1}'."),
   Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1: diag(4004, 1 /* Error */, "Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1_4004", "Type parameter '{0}' of exported interface has or is using private name '{1}'."),

package/package.json

@@ -2,7 +2,7 @@
   "name": "@typescript-deploys/pr-build",
   "author": "Microsoft Corp.",
   "homepage": "https://www.typescriptlang.org/",
-  "version": "5.3.0-pr-56131-2",
+  "version": "5.3.0-pr-56161-5",
   "license": "Apache-2.0",
   "description": "TypeScript is a language for application scale JavaScript development",
   "keywords": [
@@ -115,5 +115,5 @@
     "node": "20.1.0",
     "npm": "8.19.4"
   },
-  "gitHead": "e200ac3a5a2ed19564bf2d945bff492fa5a9576f"
+  "gitHead": "dcaa0b853cdd7d1d26b312a499a64451a9fe41e5"
 }