typescript 5.3.0-dev.20231026 → 5.3.0-dev.20231027

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-dev.20231026`;
+var version = `${versionMajorMinor}.0-dev.20231027`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -6644,7 +6644,7 @@ var Diagnostics = {
   Import_assertion_values_must_be_string_literal_expressions: diag(2837, 1 /* Error */, "Import_assertion_values_must_be_string_literal_expressions_2837", "Import assertion values must be string literal expressions."),
   All_declarations_of_0_must_have_identical_constraints: diag(2838, 1 /* Error */, "All_declarations_of_0_must_have_identical_constraints_2838", "All declarations of '{0}' must have identical constraints."),
   This_condition_will_always_return_0_since_JavaScript_compares_objects_by_reference_not_value: diag(2839, 1 /* Error */, "This_condition_will_always_return_0_since_JavaScript_compares_objects_by_reference_not_value_2839", "This condition will always return '{0}' since JavaScript compares objects by reference, not value."),
-  An_interface_cannot_extend_a_primitive_type_like_0_an_interface_can_only_extend_named_types_and_classes: diag(2840, 1 /* Error */, "An_interface_cannot_extend_a_primitive_type_like_0_an_interface_can_only_extend_named_types_and_clas_2840", "An interface cannot extend a primitive type like '{0}'; an interface can only extend named types and classes"),
+  An_interface_cannot_extend_a_primitive_type_like_0_It_can_only_extend_other_named_object_types: diag(2840, 1 /* Error */, "An_interface_cannot_extend_a_primitive_type_like_0_It_can_only_extend_other_named_object_types_2840", "An interface cannot extend a primitive type like '{0}'. It can only extend other named object types."),
   _0_is_an_unused_renaming_of_1_Did_you_intend_to_use_it_as_a_type_annotation: diag(2842, 1 /* Error */, "_0_is_an_unused_renaming_of_1_Did_you_intend_to_use_it_as_a_type_annotation_2842", "'{0}' is an unused renaming of '{1}'. Did you intend to use it as a type annotation?"),
   We_can_only_write_a_type_for_0_by_adding_a_type_for_the_entire_parameter_here: diag(2843, 1 /* Error */, "We_can_only_write_a_type_for_0_by_adding_a_type_for_the_entire_parameter_here_2843", "We can only write a type for '{0}' by adding a type for the entire parameter here."),
   Type_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor: diag(2844, 1 /* Error */, "Type_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor_2844", "Type of instance member variable '{0}' cannot reference identifier '{1}' declared in the constructor."),
@@ -6665,6 +6665,8 @@ var Diagnostics = {
   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."),
+  A_class_cannot_extend_a_primitive_type_like_0_Classes_can_only_extend_constructable_values: diag(2863, 1 /* Error */, "A_class_cannot_extend_a_primitive_type_like_0_Classes_can_only_extend_constructable_values_2863", "A class cannot extend a primitive type like '{0}'. Classes can only extend constructable values."),
+  A_class_cannot_implement_a_primitive_type_like_0_It_can_only_implement_other_named_object_types: diag(2864, 1 /* Error */, "A_class_cannot_implement_a_primitive_type_like_0_It_can_only_implement_other_named_object_types_2864", "A class cannot implement a primitive type like '{0}'. It can only implement other named object types."),
   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}'."),
@@ -45371,8 +45373,17 @@ function createTypeChecker(host) {
   function checkAndReportErrorForUsingTypeAsValue(errorLocation, name, meaning) {
     if (meaning & 111551 /* Value */) {
       if (isPrimitiveTypeName(name)) {
-        if (isExtendedByInterface(errorLocation)) {
-          error(errorLocation, Diagnostics.An_interface_cannot_extend_a_primitive_type_like_0_an_interface_can_only_extend_named_types_and_classes, unescapeLeadingUnderscores(name));
+        const grandparent = errorLocation.parent.parent;
+        if (grandparent && grandparent.parent && isHeritageClause(grandparent)) {
+          const heritageKind = grandparent.token;
+          const containerKind = grandparent.parent.kind;
+          if (containerKind === 264 /* InterfaceDeclaration */ && heritageKind === 96 /* ExtendsKeyword */) {
+            error(errorLocation, Diagnostics.An_interface_cannot_extend_a_primitive_type_like_0_It_can_only_extend_other_named_object_types, unescapeLeadingUnderscores(name));
+          } else if (containerKind === 263 /* ClassDeclaration */ && heritageKind === 96 /* ExtendsKeyword */) {
+            error(errorLocation, Diagnostics.A_class_cannot_extend_a_primitive_type_like_0_Classes_can_only_extend_constructable_values, unescapeLeadingUnderscores(name));
+          } else if (containerKind === 263 /* ClassDeclaration */ && heritageKind === 119 /* ImplementsKeyword */) {
+            error(errorLocation, Diagnostics.A_class_cannot_implement_a_primitive_type_like_0_It_can_only_implement_other_named_object_types, unescapeLeadingUnderscores(name));
+          }
         } else {
           error(errorLocation, Diagnostics._0_only_refers_to_a_type_but_is_being_used_as_a_value_here, unescapeLeadingUnderscores(name));
         }
@@ -45404,16 +45415,6 @@ function createTypeChecker(host) {
     }
     return false;
   }
-  function isExtendedByInterface(node) {
-    const grandparent = node.parent.parent;
-    const parentOfGrandparent = grandparent.parent;
-    if (grandparent && parentOfGrandparent) {
-      const isExtending = isHeritageClause(grandparent) && grandparent.token === 96 /* ExtendsKeyword */;
-      const isInterface = isInterfaceDeclaration(parentOfGrandparent);
-      return isExtending && isInterface;
-    }
-    return false;
-  }
   function maybeMappedType(node, symbol) {
     const container = findAncestor(node.parent, (n) => isComputedPropertyName(n) || isPropertySignature(n) ? false : isTypeLiteralNode(n) || "quit");
     if (container && container.members.length === 1) {
@@ -57857,7 +57858,7 @@ function createTypeChecker(host) {
   }
   function isPatternLiteralPlaceholderType(type) {
     if (type.flags & 2097152 /* Intersection */) {
-      return some(type.types, (t) => !!(t.flags & (2944 /* Literal */ | 65536 /* Null */ | 32768 /* Undefined */)) || isPatternLiteralPlaceholderType(t));
+      return !isGenericType(type) && some(type.types, (t) => !!(t.flags & (2944 /* Literal */ | 98304 /* Nullable */)) || isPatternLiteralPlaceholderType(t));
     }
     return !!(type.flags & (1 /* Any */ | 4 /* String */ | 8 /* Number */ | 64 /* BigInt */)) || isPatternLiteralType(type);
   }
@@ -67615,7 +67616,24 @@ function createTypeChecker(host) {
     }
     const signature = getContextualSignatureForFunctionLikeDeclaration(functionDecl);
     if (signature && !isResolvingReturnTypeOfSignature(signature)) {
-      return getReturnTypeOfSignature(signature);
+      const returnType2 = getReturnTypeOfSignature(signature);
+      const functionFlags = getFunctionFlags(functionDecl);
+      if (functionFlags & 1 /* Generator */) {
+        return filterType(returnType2, (t) => {
+          return !!(t.flags & (3 /* AnyOrUnknown */ | 16384 /* Void */ | 58982400 /* InstantiableNonPrimitive */)) || checkGeneratorInstantiationAssignabilityToReturnType(
+            t,
+            functionFlags,
+            /*errorNode*/
+            void 0
+          );
+        });
+      }
+      if (functionFlags & 2 /* Async */) {
+        return filterType(returnType2, (t) => {
+          return !!(t.flags & (3 /* AnyOrUnknown */ | 16384 /* Void */ | 58982400 /* InstantiableNonPrimitive */)) || !!getAwaitedTypeOfPromise(t);
+        });
+      }
+      return returnType2;
     }
     const iife = getImmediatelyInvokedFunctionExpression(functionDecl);
     if (iife) {
@@ -74816,7 +74834,15 @@ function createTypeChecker(host) {
         checkExternalEmitHelpers(node, 256 /* Values */);
       }
     }
-    const returnType = getReturnTypeFromAnnotation(func);
+    let returnType = getReturnTypeFromAnnotation(func);
+    if (returnType && returnType.flags & 1048576 /* Union */) {
+      returnType = filterType(returnType, (t) => checkGeneratorInstantiationAssignabilityToReturnType(
+        t,
+        functionFlags,
+        /*errorNode*/
+        void 0
+      ));
+    }
     const iterationTypes = returnType && getIterationTypesOfGeneratorFunctionReturnType(returnType, isAsync);
     const signatureYieldType = iterationTypes && iterationTypes.yieldType || anyType;
     const signatureNextType = iterationTypes && iterationTypes.nextType || anyType;
@@ -75629,11 +75655,7 @@ function createTypeChecker(host) {
           if (returnType === voidType) {
             error(returnTypeErrorLocation, Diagnostics.A_generator_cannot_have_a_void_type_annotation);
           } else {
-            const generatorYieldType = getIterationTypeOfGeneratorFunctionReturnType(0 /* Yield */, returnType, (functionFlags2 & 2 /* Async */) !== 0) || anyType;
-            const generatorReturnType = getIterationTypeOfGeneratorFunctionReturnType(1 /* Return */, returnType, (functionFlags2 & 2 /* Async */) !== 0) || generatorYieldType;
-            const generatorNextType = getIterationTypeOfGeneratorFunctionReturnType(2 /* Next */, returnType, (functionFlags2 & 2 /* Async */) !== 0) || unknownType;
-            const generatorInstantiation = createGeneratorReturnType(generatorYieldType, generatorReturnType, generatorNextType, !!(functionFlags2 & 2 /* Async */));
-            checkTypeAssignableTo(generatorInstantiation, returnType, returnTypeErrorLocation);
+            checkGeneratorInstantiationAssignabilityToReturnType(returnType, functionFlags2, returnTypeErrorLocation);
           }
         } else if ((functionFlags2 & 3 /* AsyncGenerator */) === 2 /* Async */) {
           checkAsyncFunctionReturnType(node, returnTypeNode, returnTypeErrorLocation);
@@ -75644,6 +75666,13 @@ function createTypeChecker(host) {
       }
     }
   }
+  function checkGeneratorInstantiationAssignabilityToReturnType(returnType, functionFlags, errorNode) {
+    const generatorYieldType = getIterationTypeOfGeneratorFunctionReturnType(0 /* Yield */, returnType, (functionFlags & 2 /* Async */) !== 0) || anyType;
+    const generatorReturnType = getIterationTypeOfGeneratorFunctionReturnType(1 /* Return */, returnType, (functionFlags & 2 /* Async */) !== 0) || generatorYieldType;
+    const generatorNextType = getIterationTypeOfGeneratorFunctionReturnType(2 /* Next */, returnType, (functionFlags & 2 /* Async */) !== 0) || unknownType;
+    const generatorInstantiation = createGeneratorReturnType(generatorYieldType, generatorReturnType, generatorNextType, !!(functionFlags & 2 /* Async */));
+    return checkTypeAssignableTo(generatorInstantiation, returnType, errorNode);
+  }
   function checkClassForDuplicateDeclarations(node) {
     const instanceNames = /* @__PURE__ */ new Map();
     const staticNames = /* @__PURE__ */ new Map();

package/lib/tsserver.js

@@ -56,7 +56,7 @@ var init_corePublic = __esm({
   "src/compiler/corePublic.ts"() {
     "use strict";
     versionMajorMinor = "5.3";
-    version = `${versionMajorMinor}.0-dev.20231026`;
+    version = `${versionMajorMinor}.0-dev.20231027`;
     Comparison = /* @__PURE__ */ ((Comparison3) => {
       Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
       Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -7975,7 +7975,7 @@ var init_diagnosticInformationMap_generated = __esm({
       Import_assertion_values_must_be_string_literal_expressions: diag(2837, 1 /* Error */, "Import_assertion_values_must_be_string_literal_expressions_2837", "Import assertion values must be string literal expressions."),
       All_declarations_of_0_must_have_identical_constraints: diag(2838, 1 /* Error */, "All_declarations_of_0_must_have_identical_constraints_2838", "All declarations of '{0}' must have identical constraints."),
       This_condition_will_always_return_0_since_JavaScript_compares_objects_by_reference_not_value: diag(2839, 1 /* Error */, "This_condition_will_always_return_0_since_JavaScript_compares_objects_by_reference_not_value_2839", "This condition will always return '{0}' since JavaScript compares objects by reference, not value."),
-      An_interface_cannot_extend_a_primitive_type_like_0_an_interface_can_only_extend_named_types_and_classes: diag(2840, 1 /* Error */, "An_interface_cannot_extend_a_primitive_type_like_0_an_interface_can_only_extend_named_types_and_clas_2840", "An interface cannot extend a primitive type like '{0}'; an interface can only extend named types and classes"),
+      An_interface_cannot_extend_a_primitive_type_like_0_It_can_only_extend_other_named_object_types: diag(2840, 1 /* Error */, "An_interface_cannot_extend_a_primitive_type_like_0_It_can_only_extend_other_named_object_types_2840", "An interface cannot extend a primitive type like '{0}'. It can only extend other named object types."),
       _0_is_an_unused_renaming_of_1_Did_you_intend_to_use_it_as_a_type_annotation: diag(2842, 1 /* Error */, "_0_is_an_unused_renaming_of_1_Did_you_intend_to_use_it_as_a_type_annotation_2842", "'{0}' is an unused renaming of '{1}'. Did you intend to use it as a type annotation?"),
       We_can_only_write_a_type_for_0_by_adding_a_type_for_the_entire_parameter_here: diag(2843, 1 /* Error */, "We_can_only_write_a_type_for_0_by_adding_a_type_for_the_entire_parameter_here_2843", "We can only write a type for '{0}' by adding a type for the entire parameter here."),
       Type_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor: diag(2844, 1 /* Error */, "Type_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor_2844", "Type of instance member variable '{0}' cannot reference identifier '{1}' declared in the constructor."),
@@ -7996,6 +7996,8 @@ var init_diagnosticInformationMap_generated = __esm({
       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."),
+      A_class_cannot_extend_a_primitive_type_like_0_Classes_can_only_extend_constructable_values: diag(2863, 1 /* Error */, "A_class_cannot_extend_a_primitive_type_like_0_Classes_can_only_extend_constructable_values_2863", "A class cannot extend a primitive type like '{0}'. Classes can only extend constructable values."),
+      A_class_cannot_implement_a_primitive_type_like_0_It_can_only_implement_other_named_object_types: diag(2864, 1 /* Error */, "A_class_cannot_implement_a_primitive_type_like_0_It_can_only_implement_other_named_object_types_2864", "A class cannot implement a primitive type like '{0}'. It can only implement other named object types."),
       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}'."),
@@ -47871,8 +47873,17 @@ function createTypeChecker(host) {
   function checkAndReportErrorForUsingTypeAsValue(errorLocation, name, meaning) {
     if (meaning & 111551 /* Value */) {
       if (isPrimitiveTypeName(name)) {
-        if (isExtendedByInterface(errorLocation)) {
-          error2(errorLocation, Diagnostics.An_interface_cannot_extend_a_primitive_type_like_0_an_interface_can_only_extend_named_types_and_classes, unescapeLeadingUnderscores(name));
+        const grandparent = errorLocation.parent.parent;
+        if (grandparent && grandparent.parent && isHeritageClause(grandparent)) {
+          const heritageKind = grandparent.token;
+          const containerKind = grandparent.parent.kind;
+          if (containerKind === 264 /* InterfaceDeclaration */ && heritageKind === 96 /* ExtendsKeyword */) {
+            error2(errorLocation, Diagnostics.An_interface_cannot_extend_a_primitive_type_like_0_It_can_only_extend_other_named_object_types, unescapeLeadingUnderscores(name));
+          } else if (containerKind === 263 /* ClassDeclaration */ && heritageKind === 96 /* ExtendsKeyword */) {
+            error2(errorLocation, Diagnostics.A_class_cannot_extend_a_primitive_type_like_0_Classes_can_only_extend_constructable_values, unescapeLeadingUnderscores(name));
+          } else if (containerKind === 263 /* ClassDeclaration */ && heritageKind === 119 /* ImplementsKeyword */) {
+            error2(errorLocation, Diagnostics.A_class_cannot_implement_a_primitive_type_like_0_It_can_only_implement_other_named_object_types, unescapeLeadingUnderscores(name));
+          }
         } else {
           error2(errorLocation, Diagnostics._0_only_refers_to_a_type_but_is_being_used_as_a_value_here, unescapeLeadingUnderscores(name));
         }
@@ -47904,16 +47915,6 @@ function createTypeChecker(host) {
     }
     return false;
   }
-  function isExtendedByInterface(node) {
-    const grandparent = node.parent.parent;
-    const parentOfGrandparent = grandparent.parent;
-    if (grandparent && parentOfGrandparent) {
-      const isExtending = isHeritageClause(grandparent) && grandparent.token === 96 /* ExtendsKeyword */;
-      const isInterface = isInterfaceDeclaration(parentOfGrandparent);
-      return isExtending && isInterface;
-    }
-    return false;
-  }
   function maybeMappedType(node, symbol) {
     const container = findAncestor(node.parent, (n) => isComputedPropertyName(n) || isPropertySignature(n) ? false : isTypeLiteralNode(n) || "quit");
     if (container && container.members.length === 1) {
@@ -60357,7 +60358,7 @@ function createTypeChecker(host) {
   }
   function isPatternLiteralPlaceholderType(type) {
     if (type.flags & 2097152 /* Intersection */) {
-      return some(type.types, (t) => !!(t.flags & (2944 /* Literal */ | 65536 /* Null */ | 32768 /* Undefined */)) || isPatternLiteralPlaceholderType(t));
+      return !isGenericType(type) && some(type.types, (t) => !!(t.flags & (2944 /* Literal */ | 98304 /* Nullable */)) || isPatternLiteralPlaceholderType(t));
     }
     return !!(type.flags & (1 /* Any */ | 4 /* String */ | 8 /* Number */ | 64 /* BigInt */)) || isPatternLiteralType(type);
   }
@@ -70115,7 +70116,24 @@ function createTypeChecker(host) {
     }
     const signature = getContextualSignatureForFunctionLikeDeclaration(functionDecl);
     if (signature && !isResolvingReturnTypeOfSignature(signature)) {
-      return getReturnTypeOfSignature(signature);
+      const returnType2 = getReturnTypeOfSignature(signature);
+      const functionFlags = getFunctionFlags(functionDecl);
+      if (functionFlags & 1 /* Generator */) {
+        return filterType(returnType2, (t) => {
+          return !!(t.flags & (3 /* AnyOrUnknown */ | 16384 /* Void */ | 58982400 /* InstantiableNonPrimitive */)) || checkGeneratorInstantiationAssignabilityToReturnType(
+            t,
+            functionFlags,
+            /*errorNode*/
+            void 0
+          );
+        });
+      }
+      if (functionFlags & 2 /* Async */) {
+        return filterType(returnType2, (t) => {
+          return !!(t.flags & (3 /* AnyOrUnknown */ | 16384 /* Void */ | 58982400 /* InstantiableNonPrimitive */)) || !!getAwaitedTypeOfPromise(t);
+        });
+      }
+      return returnType2;
     }
     const iife = getImmediatelyInvokedFunctionExpression(functionDecl);
     if (iife) {
@@ -77316,7 +77334,15 @@ function createTypeChecker(host) {
         checkExternalEmitHelpers(node, 256 /* Values */);
       }
     }
-    const returnType = getReturnTypeFromAnnotation(func);
+    let returnType = getReturnTypeFromAnnotation(func);
+    if (returnType && returnType.flags & 1048576 /* Union */) {
+      returnType = filterType(returnType, (t) => checkGeneratorInstantiationAssignabilityToReturnType(
+        t,
+        functionFlags,
+        /*errorNode*/
+        void 0
+      ));
+    }
     const iterationTypes = returnType && getIterationTypesOfGeneratorFunctionReturnType(returnType, isAsync);
     const signatureYieldType = iterationTypes && iterationTypes.yieldType || anyType;
     const signatureNextType = iterationTypes && iterationTypes.nextType || anyType;
@@ -78129,11 +78155,7 @@ function createTypeChecker(host) {
           if (returnType === voidType) {
             error2(returnTypeErrorLocation, Diagnostics.A_generator_cannot_have_a_void_type_annotation);
           } else {
-            const generatorYieldType = getIterationTypeOfGeneratorFunctionReturnType(0 /* Yield */, returnType, (functionFlags2 & 2 /* Async */) !== 0) || anyType;
-            const generatorReturnType = getIterationTypeOfGeneratorFunctionReturnType(1 /* Return */, returnType, (functionFlags2 & 2 /* Async */) !== 0) || generatorYieldType;
-            const generatorNextType = getIterationTypeOfGeneratorFunctionReturnType(2 /* Next */, returnType, (functionFlags2 & 2 /* Async */) !== 0) || unknownType;
-            const generatorInstantiation = createGeneratorReturnType(generatorYieldType, generatorReturnType, generatorNextType, !!(functionFlags2 & 2 /* Async */));
-            checkTypeAssignableTo(generatorInstantiation, returnType, returnTypeErrorLocation);
+            checkGeneratorInstantiationAssignabilityToReturnType(returnType, functionFlags2, returnTypeErrorLocation);
           }
         } else if ((functionFlags2 & 3 /* AsyncGenerator */) === 2 /* Async */) {
           checkAsyncFunctionReturnType(node, returnTypeNode, returnTypeErrorLocation);
@@ -78144,6 +78166,13 @@ function createTypeChecker(host) {
       }
     }
   }
+  function checkGeneratorInstantiationAssignabilityToReturnType(returnType, functionFlags, errorNode) {
+    const generatorYieldType = getIterationTypeOfGeneratorFunctionReturnType(0 /* Yield */, returnType, (functionFlags & 2 /* Async */) !== 0) || anyType;
+    const generatorReturnType = getIterationTypeOfGeneratorFunctionReturnType(1 /* Return */, returnType, (functionFlags & 2 /* Async */) !== 0) || generatorYieldType;
+    const generatorNextType = getIterationTypeOfGeneratorFunctionReturnType(2 /* Next */, returnType, (functionFlags & 2 /* Async */) !== 0) || unknownType;
+    const generatorInstantiation = createGeneratorReturnType(generatorYieldType, generatorReturnType, generatorNextType, !!(functionFlags & 2 /* Async */));
+    return checkTypeAssignableTo(generatorInstantiation, returnType, errorNode);
+  }
   function checkClassForDuplicateDeclarations(node) {
     const instanceNames = /* @__PURE__ */ new Map();
     const staticNames = /* @__PURE__ */ new Map();

package/lib/typescript.js

@@ -56,7 +56,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.3";
-      version = `${versionMajorMinor}.0-dev.20231026`;
+      version = `${versionMajorMinor}.0-dev.20231027`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -7975,7 +7975,7 @@ ${lanes.join("\n")}
         Import_assertion_values_must_be_string_literal_expressions: diag(2837, 1 /* Error */, "Import_assertion_values_must_be_string_literal_expressions_2837", "Import assertion values must be string literal expressions."),
         All_declarations_of_0_must_have_identical_constraints: diag(2838, 1 /* Error */, "All_declarations_of_0_must_have_identical_constraints_2838", "All declarations of '{0}' must have identical constraints."),
         This_condition_will_always_return_0_since_JavaScript_compares_objects_by_reference_not_value: diag(2839, 1 /* Error */, "This_condition_will_always_return_0_since_JavaScript_compares_objects_by_reference_not_value_2839", "This condition will always return '{0}' since JavaScript compares objects by reference, not value."),
-        An_interface_cannot_extend_a_primitive_type_like_0_an_interface_can_only_extend_named_types_and_classes: diag(2840, 1 /* Error */, "An_interface_cannot_extend_a_primitive_type_like_0_an_interface_can_only_extend_named_types_and_clas_2840", "An interface cannot extend a primitive type like '{0}'; an interface can only extend named types and classes"),
+        An_interface_cannot_extend_a_primitive_type_like_0_It_can_only_extend_other_named_object_types: diag(2840, 1 /* Error */, "An_interface_cannot_extend_a_primitive_type_like_0_It_can_only_extend_other_named_object_types_2840", "An interface cannot extend a primitive type like '{0}'. It can only extend other named object types."),
         _0_is_an_unused_renaming_of_1_Did_you_intend_to_use_it_as_a_type_annotation: diag(2842, 1 /* Error */, "_0_is_an_unused_renaming_of_1_Did_you_intend_to_use_it_as_a_type_annotation_2842", "'{0}' is an unused renaming of '{1}'. Did you intend to use it as a type annotation?"),
         We_can_only_write_a_type_for_0_by_adding_a_type_for_the_entire_parameter_here: diag(2843, 1 /* Error */, "We_can_only_write_a_type_for_0_by_adding_a_type_for_the_entire_parameter_here_2843", "We can only write a type for '{0}' by adding a type for the entire parameter here."),
         Type_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor: diag(2844, 1 /* Error */, "Type_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor_2844", "Type of instance member variable '{0}' cannot reference identifier '{1}' declared in the constructor."),
@@ -7996,6 +7996,8 @@ ${lanes.join("\n")}
         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."),
+        A_class_cannot_extend_a_primitive_type_like_0_Classes_can_only_extend_constructable_values: diag(2863, 1 /* Error */, "A_class_cannot_extend_a_primitive_type_like_0_Classes_can_only_extend_constructable_values_2863", "A class cannot extend a primitive type like '{0}'. Classes can only extend constructable values."),
+        A_class_cannot_implement_a_primitive_type_like_0_It_can_only_implement_other_named_object_types: diag(2864, 1 /* Error */, "A_class_cannot_implement_a_primitive_type_like_0_It_can_only_implement_other_named_object_types_2864", "A class cannot implement a primitive type like '{0}'. It can only implement other named object types."),
         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}'."),
@@ -47871,8 +47873,17 @@ ${lanes.join("\n")}
     function checkAndReportErrorForUsingTypeAsValue(errorLocation, name, meaning) {
       if (meaning & 111551 /* Value */) {
         if (isPrimitiveTypeName(name)) {
-          if (isExtendedByInterface(errorLocation)) {
-            error2(errorLocation, Diagnostics.An_interface_cannot_extend_a_primitive_type_like_0_an_interface_can_only_extend_named_types_and_classes, unescapeLeadingUnderscores(name));
+          const grandparent = errorLocation.parent.parent;
+          if (grandparent && grandparent.parent && isHeritageClause(grandparent)) {
+            const heritageKind = grandparent.token;
+            const containerKind = grandparent.parent.kind;
+            if (containerKind === 264 /* InterfaceDeclaration */ && heritageKind === 96 /* ExtendsKeyword */) {
+              error2(errorLocation, Diagnostics.An_interface_cannot_extend_a_primitive_type_like_0_It_can_only_extend_other_named_object_types, unescapeLeadingUnderscores(name));
+            } else if (containerKind === 263 /* ClassDeclaration */ && heritageKind === 96 /* ExtendsKeyword */) {
+              error2(errorLocation, Diagnostics.A_class_cannot_extend_a_primitive_type_like_0_Classes_can_only_extend_constructable_values, unescapeLeadingUnderscores(name));
+            } else if (containerKind === 263 /* ClassDeclaration */ && heritageKind === 119 /* ImplementsKeyword */) {
+              error2(errorLocation, Diagnostics.A_class_cannot_implement_a_primitive_type_like_0_It_can_only_implement_other_named_object_types, unescapeLeadingUnderscores(name));
+            }
           } else {
             error2(errorLocation, Diagnostics._0_only_refers_to_a_type_but_is_being_used_as_a_value_here, unescapeLeadingUnderscores(name));
           }
@@ -47904,16 +47915,6 @@ ${lanes.join("\n")}
       }
       return false;
     }
-    function isExtendedByInterface(node) {
-      const grandparent = node.parent.parent;
-      const parentOfGrandparent = grandparent.parent;
-      if (grandparent && parentOfGrandparent) {
-        const isExtending = isHeritageClause(grandparent) && grandparent.token === 96 /* ExtendsKeyword */;
-        const isInterface = isInterfaceDeclaration(parentOfGrandparent);
-        return isExtending && isInterface;
-      }
-      return false;
-    }
     function maybeMappedType(node, symbol) {
       const container = findAncestor(node.parent, (n) => isComputedPropertyName(n) || isPropertySignature(n) ? false : isTypeLiteralNode(n) || "quit");
       if (container && container.members.length === 1) {
@@ -60357,7 +60358,7 @@ ${lanes.join("\n")}
     }
     function isPatternLiteralPlaceholderType(type) {
       if (type.flags & 2097152 /* Intersection */) {
-        return some(type.types, (t) => !!(t.flags & (2944 /* Literal */ | 65536 /* Null */ | 32768 /* Undefined */)) || isPatternLiteralPlaceholderType(t));
+        return !isGenericType(type) && some(type.types, (t) => !!(t.flags & (2944 /* Literal */ | 98304 /* Nullable */)) || isPatternLiteralPlaceholderType(t));
       }
       return !!(type.flags & (1 /* Any */ | 4 /* String */ | 8 /* Number */ | 64 /* BigInt */)) || isPatternLiteralType(type);
     }
@@ -70115,7 +70116,24 @@ ${lanes.join("\n")}
       }
       const signature = getContextualSignatureForFunctionLikeDeclaration(functionDecl);
       if (signature && !isResolvingReturnTypeOfSignature(signature)) {
-        return getReturnTypeOfSignature(signature);
+        const returnType2 = getReturnTypeOfSignature(signature);
+        const functionFlags = getFunctionFlags(functionDecl);
+        if (functionFlags & 1 /* Generator */) {
+          return filterType(returnType2, (t) => {
+            return !!(t.flags & (3 /* AnyOrUnknown */ | 16384 /* Void */ | 58982400 /* InstantiableNonPrimitive */)) || checkGeneratorInstantiationAssignabilityToReturnType(
+              t,
+              functionFlags,
+              /*errorNode*/
+              void 0
+            );
+          });
+        }
+        if (functionFlags & 2 /* Async */) {
+          return filterType(returnType2, (t) => {
+            return !!(t.flags & (3 /* AnyOrUnknown */ | 16384 /* Void */ | 58982400 /* InstantiableNonPrimitive */)) || !!getAwaitedTypeOfPromise(t);
+          });
+        }
+        return returnType2;
       }
       const iife = getImmediatelyInvokedFunctionExpression(functionDecl);
       if (iife) {
@@ -77316,7 +77334,15 @@ ${lanes.join("\n")}
           checkExternalEmitHelpers(node, 256 /* Values */);
         }
       }
-      const returnType = getReturnTypeFromAnnotation(func);
+      let returnType = getReturnTypeFromAnnotation(func);
+      if (returnType && returnType.flags & 1048576 /* Union */) {
+        returnType = filterType(returnType, (t) => checkGeneratorInstantiationAssignabilityToReturnType(
+          t,
+          functionFlags,
+          /*errorNode*/
+          void 0
+        ));
+      }
       const iterationTypes = returnType && getIterationTypesOfGeneratorFunctionReturnType(returnType, isAsync);
       const signatureYieldType = iterationTypes && iterationTypes.yieldType || anyType;
       const signatureNextType = iterationTypes && iterationTypes.nextType || anyType;
@@ -78129,11 +78155,7 @@ ${lanes.join("\n")}
             if (returnType === voidType) {
               error2(returnTypeErrorLocation, Diagnostics.A_generator_cannot_have_a_void_type_annotation);
             } else {
-              const generatorYieldType = getIterationTypeOfGeneratorFunctionReturnType(0 /* Yield */, returnType, (functionFlags2 & 2 /* Async */) !== 0) || anyType;
-              const generatorReturnType = getIterationTypeOfGeneratorFunctionReturnType(1 /* Return */, returnType, (functionFlags2 & 2 /* Async */) !== 0) || generatorYieldType;
-              const generatorNextType = getIterationTypeOfGeneratorFunctionReturnType(2 /* Next */, returnType, (functionFlags2 & 2 /* Async */) !== 0) || unknownType;
-              const generatorInstantiation = createGeneratorReturnType(generatorYieldType, generatorReturnType, generatorNextType, !!(functionFlags2 & 2 /* Async */));
-              checkTypeAssignableTo(generatorInstantiation, returnType, returnTypeErrorLocation);
+              checkGeneratorInstantiationAssignabilityToReturnType(returnType, functionFlags2, returnTypeErrorLocation);
             }
           } else if ((functionFlags2 & 3 /* AsyncGenerator */) === 2 /* Async */) {
             checkAsyncFunctionReturnType(node, returnTypeNode, returnTypeErrorLocation);
@@ -78144,6 +78166,13 @@ ${lanes.join("\n")}
         }
       }
     }
+    function checkGeneratorInstantiationAssignabilityToReturnType(returnType, functionFlags, errorNode) {
+      const generatorYieldType = getIterationTypeOfGeneratorFunctionReturnType(0 /* Yield */, returnType, (functionFlags & 2 /* Async */) !== 0) || anyType;
+      const generatorReturnType = getIterationTypeOfGeneratorFunctionReturnType(1 /* Return */, returnType, (functionFlags & 2 /* Async */) !== 0) || generatorYieldType;
+      const generatorNextType = getIterationTypeOfGeneratorFunctionReturnType(2 /* Next */, returnType, (functionFlags & 2 /* Async */) !== 0) || unknownType;
+      const generatorInstantiation = createGeneratorReturnType(generatorYieldType, generatorReturnType, generatorNextType, !!(functionFlags & 2 /* Async */));
+      return checkTypeAssignableTo(generatorInstantiation, returnType, errorNode);
+    }
     function checkClassForDuplicateDeclarations(node) {
       const instanceNames = /* @__PURE__ */ new Map();
       const staticNames = /* @__PURE__ */ new Map();

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-dev.20231026`;
+var version = `${versionMajorMinor}.0-dev.20231027`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -6021,7 +6021,7 @@ var Diagnostics = {
   Import_assertion_values_must_be_string_literal_expressions: diag(2837, 1 /* Error */, "Import_assertion_values_must_be_string_literal_expressions_2837", "Import assertion values must be string literal expressions."),
   All_declarations_of_0_must_have_identical_constraints: diag(2838, 1 /* Error */, "All_declarations_of_0_must_have_identical_constraints_2838", "All declarations of '{0}' must have identical constraints."),
   This_condition_will_always_return_0_since_JavaScript_compares_objects_by_reference_not_value: diag(2839, 1 /* Error */, "This_condition_will_always_return_0_since_JavaScript_compares_objects_by_reference_not_value_2839", "This condition will always return '{0}' since JavaScript compares objects by reference, not value."),
-  An_interface_cannot_extend_a_primitive_type_like_0_an_interface_can_only_extend_named_types_and_classes: diag(2840, 1 /* Error */, "An_interface_cannot_extend_a_primitive_type_like_0_an_interface_can_only_extend_named_types_and_clas_2840", "An interface cannot extend a primitive type like '{0}'; an interface can only extend named types and classes"),
+  An_interface_cannot_extend_a_primitive_type_like_0_It_can_only_extend_other_named_object_types: diag(2840, 1 /* Error */, "An_interface_cannot_extend_a_primitive_type_like_0_It_can_only_extend_other_named_object_types_2840", "An interface cannot extend a primitive type like '{0}'. It can only extend other named object types."),
   _0_is_an_unused_renaming_of_1_Did_you_intend_to_use_it_as_a_type_annotation: diag(2842, 1 /* Error */, "_0_is_an_unused_renaming_of_1_Did_you_intend_to_use_it_as_a_type_annotation_2842", "'{0}' is an unused renaming of '{1}'. Did you intend to use it as a type annotation?"),
   We_can_only_write_a_type_for_0_by_adding_a_type_for_the_entire_parameter_here: diag(2843, 1 /* Error */, "We_can_only_write_a_type_for_0_by_adding_a_type_for_the_entire_parameter_here_2843", "We can only write a type for '{0}' by adding a type for the entire parameter here."),
   Type_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor: diag(2844, 1 /* Error */, "Type_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor_2844", "Type of instance member variable '{0}' cannot reference identifier '{1}' declared in the constructor."),
@@ -6042,6 +6042,8 @@ var Diagnostics = {
   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."),
+  A_class_cannot_extend_a_primitive_type_like_0_Classes_can_only_extend_constructable_values: diag(2863, 1 /* Error */, "A_class_cannot_extend_a_primitive_type_like_0_Classes_can_only_extend_constructable_values_2863", "A class cannot extend a primitive type like '{0}'. Classes can only extend constructable values."),
+  A_class_cannot_implement_a_primitive_type_like_0_It_can_only_implement_other_named_object_types: diag(2864, 1 /* Error */, "A_class_cannot_implement_a_primitive_type_like_0_It_can_only_implement_other_named_object_types_2864", "A class cannot implement a primitive type like '{0}'. It can only implement other named object types."),
   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",
     "author": "Microsoft Corp.",
     "homepage": "https://www.typescriptlang.org/",
-    "version": "5.3.0-dev.20231026",
+    "version": "5.3.0-dev.20231027",
     "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": "aa9b6953441b53f8b14072c047f0519b611150c4"
+    "gitHead": "85c2577285154657f99f32db6231cb3f9815fe51"
 }