@typescript-deploys/pr-build 5.3.0-pr-56140-8 → 5.3.0-pr-55811-15

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.20231017`;
+var version = `${versionMajorMinor}.0-insiders.20231023`;
 
 // 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",
@@ -54049,6 +54051,18 @@ function createTypeChecker(host) {
   function replaceIndexedAccess(instantiable, type, replacement) {
     return instantiateType(instantiable, createTypeMapper([type.indexType, type.objectType], [getNumberLiteralType(0), createTupleType([replacement])]));
   }
+  function getLimitedConstraint(type) {
+    const constraint = getConstraintTypeFromMappedType(type.mappedType);
+    if (!(constraint.flags & 1048576 /* Union */ || constraint.flags & 2097152 /* Intersection */)) {
+      return;
+    }
+    const origin = constraint.flags & 1048576 /* Union */ ? constraint.origin : constraint;
+    if (!origin || !(origin.flags & 2097152 /* Intersection */)) {
+      return;
+    }
+    const limitedConstraint = getIntersectionType(origin.types.filter((t) => t !== type.constraintType));
+    return limitedConstraint !== neverType ? limitedConstraint : void 0;
+  }
   function resolveReverseMappedTypeMembers(type) {
     const indexInfo = getIndexInfoOfType(type.source, stringType);
     const modifiers = getMappedTypeModifiers(type.mappedType);
@@ -54056,7 +54070,14 @@ function createTypeChecker(host) {
     const optionalMask = modifiers & 4 /* IncludeOptional */ ? 0 : 16777216 /* Optional */;
     const indexInfos = indexInfo ? [createIndexInfo(stringType, inferReverseMappedType(indexInfo.type, type.mappedType, type.constraintType), readonlyMask && indexInfo.isReadonly)] : emptyArray;
     const members = createSymbolTable();
+    const limitedConstraint = getLimitedConstraint(type);
     for (const prop of getPropertiesOfType(type.source)) {
+      if (limitedConstraint) {
+        const propertyNameType = getLiteralTypeFromProperty(prop, 8576 /* StringOrNumberLiteralOrUnique */);
+        if (!isTypeAssignableTo(propertyNameType, limitedConstraint)) {
+          continue;
+        }
+      }
       const checkFlags = 8192 /* ReverseMapped */ | (readonlyMask && isReadonlySymbol(prop) ? 8 /* Readonly */ : 0);
       const inferredProp = createSymbol(4 /* Property */ | prop.flags & optionalMask, prop.escapedName, checkFlags);
       inferredProp.declarations = prop.declarations;
@@ -57653,7 +57674,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;
         }
@@ -61099,13 +61124,13 @@ function createTypeChecker(host) {
       if (recursionFlags & 1 /* Source */) {
         sourceStack[sourceDepth] = source2;
         sourceDepth++;
-        if (!(expandingFlags & 1 /* Source */) && isDeeplyNestedType(source2, sourceStack, sourceDepth, 5))
+        if (!(expandingFlags & 1 /* Source */) && isDeeplyNestedType(source2, sourceStack, sourceDepth))
           expandingFlags |= 1 /* Source */;
       }
       if (recursionFlags & 2 /* Target */) {
         targetStack[targetDepth] = target2;
         targetDepth++;
-        if (!(expandingFlags & 2 /* Target */) && isDeeplyNestedType(target2, targetStack, targetDepth, 5))
+        if (!(expandingFlags & 2 /* Target */) && isDeeplyNestedType(target2, targetStack, targetDepth))
           expandingFlags |= 2 /* Target */;
       }
       let originalHandler;
@@ -62724,8 +62749,11 @@ function createTypeChecker(host) {
   function isClassDerivedFromDeclaringClasses(checkClass, prop, writing) {
     return forEachProperty(prop, (p) => getDeclarationModifierFlagsFromSymbol(p, writing) & 16 /* Protected */ ? !hasBaseType(checkClass, getDeclaringClass(p)) : false) ? void 0 : checkClass;
   }
-  function isDeeplyNestedType(type, stack, depth, maxDepth) {
+  function isDeeplyNestedType(type, stack, depth, maxDepth = 3) {
     if (depth >= maxDepth) {
+      if ((getObjectFlags(type) & 96 /* InstantiatedMapped */) === 96 /* InstantiatedMapped */) {
+        type = getMappedTargetWithSymbol(type);
+      }
       if (type.flags & 2097152 /* Intersection */) {
         return some(type.types, (t) => isDeeplyNestedType(t, stack, depth, maxDepth));
       }
@@ -62734,7 +62762,7 @@ function createTypeChecker(host) {
       let lastTypeId = 0;
       for (let i = 0; i < depth; i++) {
         const t = stack[i];
-        if (t.flags & 2097152 /* Intersection */ ? some(t.types, (u) => getRecursionIdentity(u) === identity2) : getRecursionIdentity(t) === identity2) {
+        if (hasMatchingRecursionIdentity(t, identity2)) {
           if (t.id >= lastTypeId) {
             count++;
             if (count >= maxDepth) {
@@ -62747,18 +62775,29 @@ function createTypeChecker(host) {
     }
     return false;
   }
+  function getMappedTargetWithSymbol(type) {
+    let target;
+    while ((getObjectFlags(type) & 96 /* InstantiatedMapped */) === 96 /* InstantiatedMapped */ && (target = getModifiersTypeFromMappedType(type)) && (target.symbol || target.flags & 2097152 /* Intersection */ && some(target.types, (t) => !!t.symbol))) {
+      type = target;
+    }
+    return type;
+  }
+  function hasMatchingRecursionIdentity(type, identity2) {
+    if ((getObjectFlags(type) & 96 /* InstantiatedMapped */) === 96 /* InstantiatedMapped */) {
+      type = getMappedTargetWithSymbol(type);
+    }
+    if (type.flags & 2097152 /* Intersection */) {
+      return some(type.types, (t) => hasMatchingRecursionIdentity(t, identity2));
+    }
+    return getRecursionIdentity(type) === identity2;
+  }
   function getRecursionIdentity(type) {
     if (type.flags & 524288 /* Object */ && !isObjectOrArrayLiteralType(type)) {
       if (getObjectFlags(type) & 4 /* Reference */ && type.node) {
         return type.node;
       }
-      if (type.symbol) {
-        if (getObjectFlags(type) & 32 /* Mapped */) {
-          type = getMappedTargetWithSymbol(type);
-        }
-        if (!(getObjectFlags(type) & 16 /* Anonymous */ && type.symbol.flags & 32 /* Class */)) {
-          return type.symbol;
-        }
+      if (type.symbol && !(getObjectFlags(type) & 16 /* Anonymous */ && type.symbol.flags & 32 /* Class */)) {
+        return type.symbol;
       }
       if (isTupleType(type)) {
         return type.target;
@@ -62778,13 +62817,6 @@ function createTypeChecker(host) {
     }
     return type;
   }
-  function getMappedTargetWithSymbol(type) {
-    let target = type;
-    while ((getObjectFlags(target) & 96 /* InstantiatedMapped */) === 96 /* InstantiatedMapped */ && isMappedTypeWithKeyofConstraintDeclaration(target)) {
-      target = getModifiersTypeFromMappedType(target);
-    }
-    return target.symbol ? target : type;
-  }
   function isPropertyIdenticalTo(sourceProp, targetProp) {
     return compareProperties(sourceProp, targetProp, compareTypesIdentical) !== 0 /* False */;
   }
@@ -64166,7 +64198,7 @@ function createTypeChecker(host) {
       }
     }
     function inferToMappedType(source, target, constraintType) {
-      if (constraintType.flags & 1048576 /* Union */) {
+      if (constraintType.flags & 1048576 /* Union */ || constraintType.flags & 2097152 /* Intersection */) {
         let result = false;
         for (const type of constraintType.types) {
           result = inferToMappedType(source, target, type) || result;
@@ -65930,13 +65962,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;
+            }
           }
         }
       }

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.20231017`;
+var version = `${versionMajorMinor}.0-insiders.20231023`;
 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",
@@ -58761,6 +58763,18 @@ function createTypeChecker(host) {
   function replaceIndexedAccess(instantiable, type, replacement) {
     return instantiateType(instantiable, createTypeMapper([type.indexType, type.objectType], [getNumberLiteralType(0), createTupleType([replacement])]));
   }
+  function getLimitedConstraint(type) {
+    const constraint = getConstraintTypeFromMappedType(type.mappedType);
+    if (!(constraint.flags & 1048576 /* Union */ || constraint.flags & 2097152 /* Intersection */)) {
+      return;
+    }
+    const origin = constraint.flags & 1048576 /* Union */ ? constraint.origin : constraint;
+    if (!origin || !(origin.flags & 2097152 /* Intersection */)) {
+      return;
+    }
+    const limitedConstraint = getIntersectionType(origin.types.filter((t) => t !== type.constraintType));
+    return limitedConstraint !== neverType ? limitedConstraint : void 0;
+  }
   function resolveReverseMappedTypeMembers(type) {
     const indexInfo = getIndexInfoOfType(type.source, stringType);
     const modifiers = getMappedTypeModifiers(type.mappedType);
@@ -58768,7 +58782,14 @@ function createTypeChecker(host) {
     const optionalMask = modifiers & 4 /* IncludeOptional */ ? 0 : 16777216 /* Optional */;
     const indexInfos = indexInfo ? [createIndexInfo(stringType, inferReverseMappedType(indexInfo.type, type.mappedType, type.constraintType), readonlyMask && indexInfo.isReadonly)] : emptyArray;
     const members = createSymbolTable();
+    const limitedConstraint = getLimitedConstraint(type);
     for (const prop of getPropertiesOfType(type.source)) {
+      if (limitedConstraint) {
+        const propertyNameType = getLiteralTypeFromProperty(prop, 8576 /* StringOrNumberLiteralOrUnique */);
+        if (!isTypeAssignableTo(propertyNameType, limitedConstraint)) {
+          continue;
+        }
+      }
       const checkFlags = 8192 /* ReverseMapped */ | (readonlyMask && isReadonlySymbol(prop) ? 8 /* Readonly */ : 0);
       const inferredProp = createSymbol(4 /* Property */ | prop.flags & optionalMask, prop.escapedName, checkFlags);
       inferredProp.declarations = prop.declarations;
@@ -62365,7 +62386,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;
         }
@@ -65811,13 +65836,13 @@ function createTypeChecker(host) {
       if (recursionFlags & 1 /* Source */) {
         sourceStack[sourceDepth] = source2;
         sourceDepth++;
-        if (!(expandingFlags & 1 /* Source */) && isDeeplyNestedType(source2, sourceStack, sourceDepth, 5))
+        if (!(expandingFlags & 1 /* Source */) && isDeeplyNestedType(source2, sourceStack, sourceDepth))
           expandingFlags |= 1 /* Source */;
       }
       if (recursionFlags & 2 /* Target */) {
         targetStack[targetDepth] = target2;
         targetDepth++;
-        if (!(expandingFlags & 2 /* Target */) && isDeeplyNestedType(target2, targetStack, targetDepth, 5))
+        if (!(expandingFlags & 2 /* Target */) && isDeeplyNestedType(target2, targetStack, targetDepth))
           expandingFlags |= 2 /* Target */;
       }
       let originalHandler;
@@ -67436,8 +67461,11 @@ function createTypeChecker(host) {
   function isClassDerivedFromDeclaringClasses(checkClass, prop, writing) {
     return forEachProperty2(prop, (p) => getDeclarationModifierFlagsFromSymbol(p, writing) & 16 /* Protected */ ? !hasBaseType(checkClass, getDeclaringClass(p)) : false) ? void 0 : checkClass;
   }
-  function isDeeplyNestedType(type, stack, depth, maxDepth) {
+  function isDeeplyNestedType(type, stack, depth, maxDepth = 3) {
     if (depth >= maxDepth) {
+      if ((getObjectFlags(type) & 96 /* InstantiatedMapped */) === 96 /* InstantiatedMapped */) {
+        type = getMappedTargetWithSymbol(type);
+      }
       if (type.flags & 2097152 /* Intersection */) {
         return some(type.types, (t) => isDeeplyNestedType(t, stack, depth, maxDepth));
       }
@@ -67446,7 +67474,7 @@ function createTypeChecker(host) {
       let lastTypeId = 0;
       for (let i = 0; i < depth; i++) {
         const t = stack[i];
-        if (t.flags & 2097152 /* Intersection */ ? some(t.types, (u) => getRecursionIdentity(u) === identity2) : getRecursionIdentity(t) === identity2) {
+        if (hasMatchingRecursionIdentity(t, identity2)) {
           if (t.id >= lastTypeId) {
             count++;
             if (count >= maxDepth) {
@@ -67459,18 +67487,29 @@ function createTypeChecker(host) {
     }
     return false;
   }
+  function getMappedTargetWithSymbol(type) {
+    let target;
+    while ((getObjectFlags(type) & 96 /* InstantiatedMapped */) === 96 /* InstantiatedMapped */ && (target = getModifiersTypeFromMappedType(type)) && (target.symbol || target.flags & 2097152 /* Intersection */ && some(target.types, (t) => !!t.symbol))) {
+      type = target;
+    }
+    return type;
+  }
+  function hasMatchingRecursionIdentity(type, identity2) {
+    if ((getObjectFlags(type) & 96 /* InstantiatedMapped */) === 96 /* InstantiatedMapped */) {
+      type = getMappedTargetWithSymbol(type);
+    }
+    if (type.flags & 2097152 /* Intersection */) {
+      return some(type.types, (t) => hasMatchingRecursionIdentity(t, identity2));
+    }
+    return getRecursionIdentity(type) === identity2;
+  }
   function getRecursionIdentity(type) {
     if (type.flags & 524288 /* Object */ && !isObjectOrArrayLiteralType(type)) {
       if (getObjectFlags(type) & 4 /* Reference */ && type.node) {
         return type.node;
       }
-      if (type.symbol) {
-        if (getObjectFlags(type) & 32 /* Mapped */) {
-          type = getMappedTargetWithSymbol(type);
-        }
-        if (!(getObjectFlags(type) & 16 /* Anonymous */ && type.symbol.flags & 32 /* Class */)) {
-          return type.symbol;
-        }
+      if (type.symbol && !(getObjectFlags(type) & 16 /* Anonymous */ && type.symbol.flags & 32 /* Class */)) {
+        return type.symbol;
       }
       if (isTupleType(type)) {
         return type.target;
@@ -67490,13 +67529,6 @@ function createTypeChecker(host) {
     }
     return type;
   }
-  function getMappedTargetWithSymbol(type) {
-    let target = type;
-    while ((getObjectFlags(target) & 96 /* InstantiatedMapped */) === 96 /* InstantiatedMapped */ && isMappedTypeWithKeyofConstraintDeclaration(target)) {
-      target = getModifiersTypeFromMappedType(target);
-    }
-    return target.symbol ? target : type;
-  }
   function isPropertyIdenticalTo(sourceProp, targetProp) {
     return compareProperties2(sourceProp, targetProp, compareTypesIdentical) !== 0 /* False */;
   }
@@ -68878,7 +68910,7 @@ function createTypeChecker(host) {
       }
     }
     function inferToMappedType(source, target, constraintType) {
-      if (constraintType.flags & 1048576 /* Union */) {
+      if (constraintType.flags & 1048576 /* Union */ || constraintType.flags & 2097152 /* Intersection */) {
         let result = false;
         for (const type of constraintType.types) {
           result = inferToMappedType(source, target, type) || result;
@@ -70642,13 +70674,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;
+            }
           }
         }
       }
@@ -149953,7 +149987,8 @@ function createImportAdderWorker(sourceFile, program, useAutoImportProvider, pre
         defaultImport,
         namedImports && arrayFrom(namedImports.entries(), ([name, addAsTypeOnly]) => ({ addAsTypeOnly, name })),
         namespaceLikeImport,
-        compilerOptions
+        compilerOptions,
+        preferences
       );
       newDeclarations = combine(newDeclarations, declarations);
     });
@@ -150658,7 +150693,8 @@ function codeActionForFixWorker(changes, sourceFile, symbolName2, fix, includeSy
           defaultImport,
           namedImports,
           namespaceLikeImport,
-          program.getCompilerOptions()
+          program.getCompilerOptions(),
+          preferences
         ),
         /*blankLineBetween*/
         true,
@@ -150790,7 +150826,7 @@ function doAddExistingFix(changes, sourceFile, clause, defaultImport, namedImpor
     const newSpecifiers = stableSort(
       namedImports.map(
         (namedImport) => factory.createImportSpecifier(
-          (!clause.isTypeOnly || promoteFromTypeOnly2) && needsTypeOnly(namedImport),
+          (!clause.isTypeOnly || promoteFromTypeOnly2) && shouldUseTypeOnly(namedImport, preferences),
           /*propertyName*/
           void 0,
           factory.createIdentifier(namedImport.name)
@@ -150854,21 +150890,24 @@ function getImportTypePrefix(moduleSpecifier, quotePreference) {
 function needsTypeOnly({ addAsTypeOnly }) {
   return addAsTypeOnly === 2 /* Required */;
 }
-function getNewImports(moduleSpecifier, quotePreference, defaultImport, namedImports, namespaceLikeImport, compilerOptions) {
+function shouldUseTypeOnly(info, preferences) {
+  return needsTypeOnly(info) || !!preferences.preferTypeOnlyAutoImports && info.addAsTypeOnly !== 4 /* NotAllowed */;
+}
+function getNewImports(moduleSpecifier, quotePreference, defaultImport, namedImports, namespaceLikeImport, compilerOptions, preferences) {
   const quotedModuleSpecifier = makeStringLiteral(moduleSpecifier, quotePreference);
   let statements;
   if (defaultImport !== void 0 || (namedImports == null ? void 0 : namedImports.length)) {
-    const topLevelTypeOnly = (!defaultImport || needsTypeOnly(defaultImport)) && every(namedImports, needsTypeOnly) || compilerOptions.verbatimModuleSyntax && (defaultImport == null ? void 0 : defaultImport.addAsTypeOnly) !== 4 /* NotAllowed */ && !some(namedImports, (i) => i.addAsTypeOnly === 4 /* NotAllowed */);
+    const topLevelTypeOnly = (!defaultImport || needsTypeOnly(defaultImport)) && every(namedImports, needsTypeOnly) || (compilerOptions.verbatimModuleSyntax || preferences.preferTypeOnlyAutoImports) && (defaultImport == null ? void 0 : defaultImport.addAsTypeOnly) !== 4 /* NotAllowed */ && !some(namedImports, (i) => i.addAsTypeOnly === 4 /* NotAllowed */);
     statements = combine(
       statements,
       makeImport(
         defaultImport && factory.createIdentifier(defaultImport.name),
         namedImports == null ? void 0 : namedImports.map(
-          ({ addAsTypeOnly, name }) => factory.createImportSpecifier(
-            !topLevelTypeOnly && addAsTypeOnly === 2 /* Required */,
+          (namedImport) => factory.createImportSpecifier(
+            !topLevelTypeOnly && shouldUseTypeOnly(namedImport, preferences),
             /*propertyName*/
             void 0,
-            factory.createIdentifier(name)
+            factory.createIdentifier(namedImport.name)
           )
         ),
         moduleSpecifier,
@@ -150881,14 +150920,14 @@ function getNewImports(moduleSpecifier, quotePreference, defaultImport, namedImp
     const declaration = namespaceLikeImport.importKind === 3 /* CommonJS */ ? factory.createImportEqualsDeclaration(
       /*modifiers*/
       void 0,
-      needsTypeOnly(namespaceLikeImport),
+      shouldUseTypeOnly(namespaceLikeImport, preferences),
       factory.createIdentifier(namespaceLikeImport.name),
       factory.createExternalModuleReference(quotedModuleSpecifier)
     ) : factory.createImportDeclaration(
       /*modifiers*/
       void 0,
       factory.createImportClause(
-        needsTypeOnly(namespaceLikeImport),
+        shouldUseTypeOnly(namespaceLikeImport, preferences),
         /*name*/
         void 0,
         factory.createNamespaceImport(factory.createIdentifier(namespaceLikeImport.name))

package/lib/typescript.d.ts

@@ -8742,6 +8742,7 @@ declare namespace ts {
         readonly interactiveInlayHints?: boolean;
         readonly allowRenameOfImportPath?: boolean;
         readonly autoImportFileExcludePatterns?: string[];
+        readonly preferTypeOnlyAutoImports?: boolean;
         readonly organizeImportsIgnoreCase?: "auto" | boolean;
         readonly organizeImportsCollation?: "ordinal" | "unicode";
         readonly organizeImportsLocale?: string;

package/lib/typescript.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.3";
-      version = `${versionMajorMinor}.0-insiders.20231017`;
+      version = `${versionMajorMinor}.0-insiders.20231023`;
       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",
@@ -56528,6 +56530,18 @@ ${lanes.join("\n")}
     function replaceIndexedAccess(instantiable, type, replacement) {
       return instantiateType(instantiable, createTypeMapper([type.indexType, type.objectType], [getNumberLiteralType(0), createTupleType([replacement])]));
     }
+    function getLimitedConstraint(type) {
+      const constraint = getConstraintTypeFromMappedType(type.mappedType);
+      if (!(constraint.flags & 1048576 /* Union */ || constraint.flags & 2097152 /* Intersection */)) {
+        return;
+      }
+      const origin = constraint.flags & 1048576 /* Union */ ? constraint.origin : constraint;
+      if (!origin || !(origin.flags & 2097152 /* Intersection */)) {
+        return;
+      }
+      const limitedConstraint = getIntersectionType(origin.types.filter((t) => t !== type.constraintType));
+      return limitedConstraint !== neverType ? limitedConstraint : void 0;
+    }
     function resolveReverseMappedTypeMembers(type) {
       const indexInfo = getIndexInfoOfType(type.source, stringType);
       const modifiers = getMappedTypeModifiers(type.mappedType);
@@ -56535,7 +56549,14 @@ ${lanes.join("\n")}
       const optionalMask = modifiers & 4 /* IncludeOptional */ ? 0 : 16777216 /* Optional */;
       const indexInfos = indexInfo ? [createIndexInfo(stringType, inferReverseMappedType(indexInfo.type, type.mappedType, type.constraintType), readonlyMask && indexInfo.isReadonly)] : emptyArray;
       const members = createSymbolTable();
+      const limitedConstraint = getLimitedConstraint(type);
       for (const prop of getPropertiesOfType(type.source)) {
+        if (limitedConstraint) {
+          const propertyNameType = getLiteralTypeFromProperty(prop, 8576 /* StringOrNumberLiteralOrUnique */);
+          if (!isTypeAssignableTo(propertyNameType, limitedConstraint)) {
+            continue;
+          }
+        }
         const checkFlags = 8192 /* ReverseMapped */ | (readonlyMask && isReadonlySymbol(prop) ? 8 /* Readonly */ : 0);
         const inferredProp = createSymbol(4 /* Property */ | prop.flags & optionalMask, prop.escapedName, checkFlags);
         inferredProp.declarations = prop.declarations;
@@ -60132,7 +60153,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;
           }
@@ -63578,13 +63603,13 @@ ${lanes.join("\n")}
         if (recursionFlags & 1 /* Source */) {
           sourceStack[sourceDepth] = source2;
           sourceDepth++;
-          if (!(expandingFlags & 1 /* Source */) && isDeeplyNestedType(source2, sourceStack, sourceDepth, 5))
+          if (!(expandingFlags & 1 /* Source */) && isDeeplyNestedType(source2, sourceStack, sourceDepth))
             expandingFlags |= 1 /* Source */;
         }
         if (recursionFlags & 2 /* Target */) {
           targetStack[targetDepth] = target2;
           targetDepth++;
-          if (!(expandingFlags & 2 /* Target */) && isDeeplyNestedType(target2, targetStack, targetDepth, 5))
+          if (!(expandingFlags & 2 /* Target */) && isDeeplyNestedType(target2, targetStack, targetDepth))
             expandingFlags |= 2 /* Target */;
         }
         let originalHandler;
@@ -65203,8 +65228,11 @@ ${lanes.join("\n")}
     function isClassDerivedFromDeclaringClasses(checkClass, prop, writing) {
       return forEachProperty2(prop, (p) => getDeclarationModifierFlagsFromSymbol(p, writing) & 16 /* Protected */ ? !hasBaseType(checkClass, getDeclaringClass(p)) : false) ? void 0 : checkClass;
     }
-    function isDeeplyNestedType(type, stack, depth, maxDepth) {
+    function isDeeplyNestedType(type, stack, depth, maxDepth = 3) {
       if (depth >= maxDepth) {
+        if ((getObjectFlags(type) & 96 /* InstantiatedMapped */) === 96 /* InstantiatedMapped */) {
+          type = getMappedTargetWithSymbol(type);
+        }
         if (type.flags & 2097152 /* Intersection */) {
           return some(type.types, (t) => isDeeplyNestedType(t, stack, depth, maxDepth));
         }
@@ -65213,7 +65241,7 @@ ${lanes.join("\n")}
         let lastTypeId = 0;
         for (let i = 0; i < depth; i++) {
           const t = stack[i];
-          if (t.flags & 2097152 /* Intersection */ ? some(t.types, (u) => getRecursionIdentity(u) === identity2) : getRecursionIdentity(t) === identity2) {
+          if (hasMatchingRecursionIdentity(t, identity2)) {
             if (t.id >= lastTypeId) {
               count++;
               if (count >= maxDepth) {
@@ -65226,18 +65254,29 @@ ${lanes.join("\n")}
       }
       return false;
     }
+    function getMappedTargetWithSymbol(type) {
+      let target;
+      while ((getObjectFlags(type) & 96 /* InstantiatedMapped */) === 96 /* InstantiatedMapped */ && (target = getModifiersTypeFromMappedType(type)) && (target.symbol || target.flags & 2097152 /* Intersection */ && some(target.types, (t) => !!t.symbol))) {
+        type = target;
+      }
+      return type;
+    }
+    function hasMatchingRecursionIdentity(type, identity2) {
+      if ((getObjectFlags(type) & 96 /* InstantiatedMapped */) === 96 /* InstantiatedMapped */) {
+        type = getMappedTargetWithSymbol(type);
+      }
+      if (type.flags & 2097152 /* Intersection */) {
+        return some(type.types, (t) => hasMatchingRecursionIdentity(t, identity2));
+      }
+      return getRecursionIdentity(type) === identity2;
+    }
     function getRecursionIdentity(type) {
       if (type.flags & 524288 /* Object */ && !isObjectOrArrayLiteralType(type)) {
         if (getObjectFlags(type) & 4 /* Reference */ && type.node) {
           return type.node;
         }
-        if (type.symbol) {
-          if (getObjectFlags(type) & 32 /* Mapped */) {
-            type = getMappedTargetWithSymbol(type);
-          }
-          if (!(getObjectFlags(type) & 16 /* Anonymous */ && type.symbol.flags & 32 /* Class */)) {
-            return type.symbol;
-          }
+        if (type.symbol && !(getObjectFlags(type) & 16 /* Anonymous */ && type.symbol.flags & 32 /* Class */)) {
+          return type.symbol;
         }
         if (isTupleType(type)) {
           return type.target;
@@ -65257,13 +65296,6 @@ ${lanes.join("\n")}
       }
       return type;
     }
-    function getMappedTargetWithSymbol(type) {
-      let target = type;
-      while ((getObjectFlags(target) & 96 /* InstantiatedMapped */) === 96 /* InstantiatedMapped */ && isMappedTypeWithKeyofConstraintDeclaration(target)) {
-        target = getModifiersTypeFromMappedType(target);
-      }
-      return target.symbol ? target : type;
-    }
     function isPropertyIdenticalTo(sourceProp, targetProp) {
       return compareProperties2(sourceProp, targetProp, compareTypesIdentical) !== 0 /* False */;
     }
@@ -66645,7 +66677,7 @@ ${lanes.join("\n")}
         }
       }
       function inferToMappedType(source, target, constraintType) {
-        if (constraintType.flags & 1048576 /* Union */) {
+        if (constraintType.flags & 1048576 /* Union */ || constraintType.flags & 2097152 /* Intersection */) {
           let result = false;
           for (const type of constraintType.types) {
             result = inferToMappedType(source, target, type) || result;
@@ -68409,13 +68441,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;
+              }
             }
           }
         }
@@ -148674,7 +148708,8 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
           defaultImport,
           namedImports && arrayFrom(namedImports.entries(), ([name, addAsTypeOnly]) => ({ addAsTypeOnly, name })),
           namespaceLikeImport,
-          compilerOptions
+          compilerOptions,
+          preferences
         );
         newDeclarations = combine(newDeclarations, declarations);
       });
@@ -149379,7 +149414,8 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
             defaultImport,
             namedImports,
             namespaceLikeImport,
-            program.getCompilerOptions()
+            program.getCompilerOptions(),
+            preferences
           ),
           /*blankLineBetween*/
           true,
@@ -149511,7 +149547,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
       const newSpecifiers = stableSort(
         namedImports.map(
           (namedImport) => factory.createImportSpecifier(
-            (!clause.isTypeOnly || promoteFromTypeOnly2) && needsTypeOnly(namedImport),
+            (!clause.isTypeOnly || promoteFromTypeOnly2) && shouldUseTypeOnly(namedImport, preferences),
             /*propertyName*/
             void 0,
             factory.createIdentifier(namedImport.name)
@@ -149575,21 +149611,24 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
   function needsTypeOnly({ addAsTypeOnly }) {
     return addAsTypeOnly === 2 /* Required */;
   }
-  function getNewImports(moduleSpecifier, quotePreference, defaultImport, namedImports, namespaceLikeImport, compilerOptions) {
+  function shouldUseTypeOnly(info, preferences) {
+    return needsTypeOnly(info) || !!preferences.preferTypeOnlyAutoImports && info.addAsTypeOnly !== 4 /* NotAllowed */;
+  }
+  function getNewImports(moduleSpecifier, quotePreference, defaultImport, namedImports, namespaceLikeImport, compilerOptions, preferences) {
     const quotedModuleSpecifier = makeStringLiteral(moduleSpecifier, quotePreference);
     let statements;
     if (defaultImport !== void 0 || (namedImports == null ? void 0 : namedImports.length)) {
-      const topLevelTypeOnly = (!defaultImport || needsTypeOnly(defaultImport)) && every(namedImports, needsTypeOnly) || compilerOptions.verbatimModuleSyntax && (defaultImport == null ? void 0 : defaultImport.addAsTypeOnly) !== 4 /* NotAllowed */ && !some(namedImports, (i) => i.addAsTypeOnly === 4 /* NotAllowed */);
+      const topLevelTypeOnly = (!defaultImport || needsTypeOnly(defaultImport)) && every(namedImports, needsTypeOnly) || (compilerOptions.verbatimModuleSyntax || preferences.preferTypeOnlyAutoImports) && (defaultImport == null ? void 0 : defaultImport.addAsTypeOnly) !== 4 /* NotAllowed */ && !some(namedImports, (i) => i.addAsTypeOnly === 4 /* NotAllowed */);
       statements = combine(
         statements,
         makeImport(
           defaultImport && factory.createIdentifier(defaultImport.name),
           namedImports == null ? void 0 : namedImports.map(
-            ({ addAsTypeOnly, name }) => factory.createImportSpecifier(
-              !topLevelTypeOnly && addAsTypeOnly === 2 /* Required */,
+            (namedImport) => factory.createImportSpecifier(
+              !topLevelTypeOnly && shouldUseTypeOnly(namedImport, preferences),
               /*propertyName*/
               void 0,
-              factory.createIdentifier(name)
+              factory.createIdentifier(namedImport.name)
             )
           ),
           moduleSpecifier,
@@ -149602,14 +149641,14 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
       const declaration = namespaceLikeImport.importKind === 3 /* CommonJS */ ? factory.createImportEqualsDeclaration(
         /*modifiers*/
         void 0,
-        needsTypeOnly(namespaceLikeImport),
+        shouldUseTypeOnly(namespaceLikeImport, preferences),
         factory.createIdentifier(namespaceLikeImport.name),
         factory.createExternalModuleReference(quotedModuleSpecifier)
       ) : factory.createImportDeclaration(
         /*modifiers*/
         void 0,
         factory.createImportClause(
-          needsTypeOnly(namespaceLikeImport),
+          shouldUseTypeOnly(namespaceLikeImport, preferences),
           /*name*/
           void 0,
           factory.createNamespaceImport(factory.createIdentifier(namespaceLikeImport.name))

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.20231017`;
+var version = `${versionMajorMinor}.0-insiders.20231023`;
 
 // 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-56140-8",
+  "version": "5.3.0-pr-55811-15",
   "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": "d733d4564db3eaab91f3d0f37b66f160dd8746b2"
+  "gitHead": "2aeee792ffeabc91b8b8d9806cc4c3be910d772b"
 }