typescript 5.1.0-dev.20230326 → 5.1.0-dev.20230328

package/lib/tsc.js

@@ -18,7 +18,7 @@ and limitations under the License.
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.1";
-var version = `${versionMajorMinor}.0-dev.20230326`;
+var version = `${versionMajorMinor}.0-dev.20230328`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -49912,6 +49912,7 @@ function createTypeChecker(host) {
         ), 0 /* None */);
       }
       function serializeMaybeAliasAssignment(symbol) {
+        var _a2;
         if (symbol.flags & 4194304 /* Prototype */) {
           return false;
         }
@@ -49991,7 +49992,7 @@ function createTypeChecker(host) {
                   void 0,
                   serializeTypeForDeclaration(context, typeToSerialize, symbol, enclosingDeclaration, includePrivateSymbol, bundled)
                 )
-              ], 2 /* Const */)
+              ], ((_a2 = context.enclosingDeclaration) == null ? void 0 : _a2.kind) === 265 /* ModuleDeclaration */ ? 1 /* Let */ : 2 /* Const */)
             );
             addResult(
               statement,
@@ -50027,7 +50028,7 @@ function createTypeChecker(host) {
           if (isStatic2 && p.flags & (788968 /* Type */ | 1920 /* Namespace */ | 2097152 /* Alias */)) {
             return [];
           }
-          if (p.flags & 4194304 /* Prototype */ || baseType && getPropertyOfType(baseType, p.escapedName) && isReadonlySymbol(getPropertyOfType(baseType, p.escapedName)) === isReadonlySymbol(p) && (p.flags & 16777216 /* Optional */) === (getPropertyOfType(baseType, p.escapedName).flags & 16777216 /* Optional */) && isTypeIdenticalTo(getTypeOfSymbol(p), getTypeOfPropertyOfType(baseType, p.escapedName))) {
+          if (p.flags & 4194304 /* Prototype */ || p.escapedName === "constructor" || baseType && getPropertyOfType(baseType, p.escapedName) && isReadonlySymbol(getPropertyOfType(baseType, p.escapedName)) === isReadonlySymbol(p) && (p.flags & 16777216 /* Optional */) === (getPropertyOfType(baseType, p.escapedName).flags & 16777216 /* Optional */) && isTypeIdenticalTo(getTypeOfSymbol(p), getTypeOfPropertyOfType(baseType, p.escapedName))) {
             return [];
           }
           const flag = modifierFlags & ~512 /* Async */ | (isStatic2 ? 32 /* Static */ : 0);
@@ -53527,6 +53528,9 @@ function createTypeChecker(host) {
     return type.resolvedDefaultConstraint;
   }
   function getConstraintOfDistributiveConditionalType(type) {
+    if (type.resolvedConstraintOfDistributive !== void 0) {
+      return type.resolvedConstraintOfDistributive || void 0;
+    }
     if (type.root.isDistributive && type.restrictiveInstantiation !== type) {
       const simplified = getSimplifiedType(
         type.checkType,
@@ -53537,10 +53541,12 @@ function createTypeChecker(host) {
       if (constraint && constraint !== type.checkType) {
         const instantiated = getConditionalTypeInstantiation(type, prependTypeMapping(type.root.checkType, constraint, type.mapper));
         if (!(instantiated.flags & 131072 /* Never */)) {
+          type.resolvedConstraintOfDistributive = instantiated;
           return instantiated;
         }
       }
     }
+    type.resolvedConstraintOfDistributive = false;
     return void 0;
   }
   function getConstraintFromConditionalType(type) {
@@ -72228,7 +72234,7 @@ function createTypeChecker(host) {
     function checkAllCodePathsInNonVoidFunctionReturnOrThrowDiagnostics() {
       const functionFlags = getFunctionFlags(func);
       const type = returnType && unwrapReturnType(returnType, functionFlags);
-      if (type && maybeTypeOfKind(type, 32768 /* Undefined */ | 16384 /* Void */ | 1 /* Any */)) {
+      if (type && maybeTypeOfKind(type, 32768 /* Undefined */ | 16384 /* Void */ | 1 /* Any */ | 2 /* Unknown */)) {
         return;
       }
       if (func.kind === 171 /* MethodSignature */ || nodeIsMissing(func.body) || func.body.kind !== 239 /* Block */ || !functionHasImplicitReturn(func)) {
@@ -91318,10 +91324,14 @@ function transformESDecorators(context) {
           visitor
         );
         const superStatementIndex = findSuperStatementIndex(node.body.statements, nonPrologueStart);
-        const indexOfFirstStatementAfterSuper = superStatementIndex >= 0 ? superStatementIndex + 1 : void 0;
-        addRange(statements, visitNodes2(node.body.statements, visitor, isStatement, nonPrologueStart, indexOfFirstStatementAfterSuper ? indexOfFirstStatementAfterSuper - nonPrologueStart : void 0));
-        addRange(statements, initializerStatements);
-        addRange(statements, visitNodes2(node.body.statements, visitor, isStatement, indexOfFirstStatementAfterSuper));
+        if (superStatementIndex >= 0) {
+          addRange(statements, visitNodes2(node.body.statements, visitor, isStatement, nonPrologueStart, superStatementIndex + 1 - nonPrologueStart));
+          addRange(statements, initializerStatements);
+          addRange(statements, visitNodes2(node.body.statements, visitor, isStatement, superStatementIndex + 1));
+        } else {
+          addRange(statements, initializerStatements);
+          addRange(statements, visitNodes2(node.body.statements, visitor, isStatement));
+        }
         body = factory2.createBlock(
           statements,
           /*multiLine*/

package/lib/tsserver.js

@@ -2286,7 +2286,7 @@ module.exports = __toCommonJS(server_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.1";
-var version = `${versionMajorMinor}.0-dev.20230326`;
+var version = `${versionMajorMinor}.0-dev.20230328`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -54554,6 +54554,7 @@ function createTypeChecker(host) {
         ), 0 /* None */);
       }
       function serializeMaybeAliasAssignment(symbol) {
+        var _a2;
         if (symbol.flags & 4194304 /* Prototype */) {
           return false;
         }
@@ -54633,7 +54634,7 @@ function createTypeChecker(host) {
                   void 0,
                   serializeTypeForDeclaration(context, typeToSerialize, symbol, enclosingDeclaration, includePrivateSymbol, bundled)
                 )
-              ], 2 /* Const */)
+              ], ((_a2 = context.enclosingDeclaration) == null ? void 0 : _a2.kind) === 265 /* ModuleDeclaration */ ? 1 /* Let */ : 2 /* Const */)
             );
             addResult(
               statement,
@@ -54669,7 +54670,7 @@ function createTypeChecker(host) {
           if (isStatic2 && p.flags & (788968 /* Type */ | 1920 /* Namespace */ | 2097152 /* Alias */)) {
             return [];
           }
-          if (p.flags & 4194304 /* Prototype */ || baseType && getPropertyOfType(baseType, p.escapedName) && isReadonlySymbol(getPropertyOfType(baseType, p.escapedName)) === isReadonlySymbol(p) && (p.flags & 16777216 /* Optional */) === (getPropertyOfType(baseType, p.escapedName).flags & 16777216 /* Optional */) && isTypeIdenticalTo(getTypeOfSymbol(p), getTypeOfPropertyOfType(baseType, p.escapedName))) {
+          if (p.flags & 4194304 /* Prototype */ || p.escapedName === "constructor" || baseType && getPropertyOfType(baseType, p.escapedName) && isReadonlySymbol(getPropertyOfType(baseType, p.escapedName)) === isReadonlySymbol(p) && (p.flags & 16777216 /* Optional */) === (getPropertyOfType(baseType, p.escapedName).flags & 16777216 /* Optional */) && isTypeIdenticalTo(getTypeOfSymbol(p), getTypeOfPropertyOfType(baseType, p.escapedName))) {
             return [];
           }
           const flag = modifierFlags & ~512 /* Async */ | (isStatic2 ? 32 /* Static */ : 0);
@@ -58169,6 +58170,9 @@ function createTypeChecker(host) {
     return type.resolvedDefaultConstraint;
   }
   function getConstraintOfDistributiveConditionalType(type) {
+    if (type.resolvedConstraintOfDistributive !== void 0) {
+      return type.resolvedConstraintOfDistributive || void 0;
+    }
     if (type.root.isDistributive && type.restrictiveInstantiation !== type) {
       const simplified = getSimplifiedType(
         type.checkType,
@@ -58179,10 +58183,12 @@ function createTypeChecker(host) {
       if (constraint && constraint !== type.checkType) {
         const instantiated = getConditionalTypeInstantiation(type, prependTypeMapping(type.root.checkType, constraint, type.mapper));
         if (!(instantiated.flags & 131072 /* Never */)) {
+          type.resolvedConstraintOfDistributive = instantiated;
           return instantiated;
         }
       }
     }
+    type.resolvedConstraintOfDistributive = false;
     return void 0;
   }
   function getConstraintFromConditionalType(type) {
@@ -76870,7 +76876,7 @@ function createTypeChecker(host) {
     function checkAllCodePathsInNonVoidFunctionReturnOrThrowDiagnostics() {
       const functionFlags = getFunctionFlags(func);
       const type = returnType && unwrapReturnType(returnType, functionFlags);
-      if (type && maybeTypeOfKind(type, 32768 /* Undefined */ | 16384 /* Void */ | 1 /* Any */)) {
+      if (type && maybeTypeOfKind(type, 32768 /* Undefined */ | 16384 /* Void */ | 1 /* Any */ | 2 /* Unknown */)) {
         return;
       }
       if (func.kind === 171 /* MethodSignature */ || nodeIsMissing(func.body) || func.body.kind !== 239 /* Block */ || !functionHasImplicitReturn(func)) {
@@ -96131,10 +96137,14 @@ function transformESDecorators(context) {
           visitor
         );
         const superStatementIndex = findSuperStatementIndex(node.body.statements, nonPrologueStart);
-        const indexOfFirstStatementAfterSuper = superStatementIndex >= 0 ? superStatementIndex + 1 : void 0;
-        addRange(statements, visitNodes2(node.body.statements, visitor, isStatement, nonPrologueStart, indexOfFirstStatementAfterSuper ? indexOfFirstStatementAfterSuper - nonPrologueStart : void 0));
-        addRange(statements, initializerStatements);
-        addRange(statements, visitNodes2(node.body.statements, visitor, isStatement, indexOfFirstStatementAfterSuper));
+        if (superStatementIndex >= 0) {
+          addRange(statements, visitNodes2(node.body.statements, visitor, isStatement, nonPrologueStart, superStatementIndex + 1 - nonPrologueStart));
+          addRange(statements, initializerStatements);
+          addRange(statements, visitNodes2(node.body.statements, visitor, isStatement, superStatementIndex + 1));
+        } else {
+          addRange(statements, initializerStatements);
+          addRange(statements, visitNodes2(node.body.statements, visitor, isStatement));
+        }
         body = factory2.createBlock(
           statements,
           /*multiLine*/
@@ -152526,7 +152536,7 @@ function getStringLiteralCompletionEntries(sourceFile, node, position, typeCheck
       const literals = contextualTypes.types.filter((literal) => !tracker.hasValue(literal.value));
       return { kind: 2 /* Types */, types: literals, isNewIdentifier: false };
     default:
-      return fromContextualType();
+      return fromContextualType() || fromContextualType(0 /* None */);
   }
   function fromContextualType(contextFlags = 4 /* Completions */) {
     const types = getStringLiteralTypes(getContextualTypeFromParent(node, typeChecker, contextFlags));
@@ -161591,9 +161601,9 @@ function extractFunctionInScope(node, scope, { usages: usagesInScope, typeParame
     }
     callArguments.push(factory.createIdentifier(name));
   });
-  const typeParametersAndDeclarations = arrayFrom(typeParameterUsages.values(), (type) => ({ type, declaration: getFirstDeclaration(type) }));
+  const typeParametersAndDeclarations = arrayFrom(typeParameterUsages.values(), (type) => ({ type, declaration: getFirstDeclarationBeforePosition(type, context.startPosition) }));
   const sortedTypeParametersAndDeclarations = typeParametersAndDeclarations.sort(compareTypesByDeclarationOrder);
-  const typeParameters = sortedTypeParametersAndDeclarations.length === 0 ? void 0 : sortedTypeParametersAndDeclarations.map((t) => t.declaration);
+  const typeParameters = sortedTypeParametersAndDeclarations.length === 0 ? void 0 : mapDefined(sortedTypeParametersAndDeclarations, ({ declaration }) => declaration);
   const callTypeArguments = typeParameters !== void 0 ? typeParameters.map((decl) => factory.createTypeReferenceNode(
     decl.name,
     /*typeArguments*/
@@ -162070,12 +162080,12 @@ function getContainingVariableDeclarationIfInList(node, scope) {
     node = node.parent;
   }
 }
-function getFirstDeclaration(type) {
+function getFirstDeclarationBeforePosition(type, position) {
   let firstDeclaration;
   const symbol = type.symbol;
   if (symbol && symbol.declarations) {
     for (const declaration of symbol.declarations) {
-      if (firstDeclaration === void 0 || declaration.pos < firstDeclaration.pos) {
+      if ((firstDeclaration === void 0 || declaration.pos < firstDeclaration.pos) && declaration.pos < position) {
         firstDeclaration = declaration;
       }
     }

package/lib/tsserverlibrary.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.1";
-      version = `${versionMajorMinor}.0-dev.20230326`;
+      version = `${versionMajorMinor}.0-dev.20230328`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -52362,6 +52362,7 @@ ${lanes.join("\n")}
           ), 0 /* None */);
         }
         function serializeMaybeAliasAssignment(symbol) {
+          var _a2;
           if (symbol.flags & 4194304 /* Prototype */) {
             return false;
           }
@@ -52441,7 +52442,7 @@ ${lanes.join("\n")}
                     void 0,
                     serializeTypeForDeclaration(context, typeToSerialize, symbol, enclosingDeclaration, includePrivateSymbol, bundled)
                   )
-                ], 2 /* Const */)
+                ], ((_a2 = context.enclosingDeclaration) == null ? void 0 : _a2.kind) === 265 /* ModuleDeclaration */ ? 1 /* Let */ : 2 /* Const */)
               );
               addResult(
                 statement,
@@ -52477,7 +52478,7 @@ ${lanes.join("\n")}
             if (isStatic2 && p.flags & (788968 /* Type */ | 1920 /* Namespace */ | 2097152 /* Alias */)) {
               return [];
             }
-            if (p.flags & 4194304 /* Prototype */ || baseType && getPropertyOfType(baseType, p.escapedName) && isReadonlySymbol(getPropertyOfType(baseType, p.escapedName)) === isReadonlySymbol(p) && (p.flags & 16777216 /* Optional */) === (getPropertyOfType(baseType, p.escapedName).flags & 16777216 /* Optional */) && isTypeIdenticalTo(getTypeOfSymbol(p), getTypeOfPropertyOfType(baseType, p.escapedName))) {
+            if (p.flags & 4194304 /* Prototype */ || p.escapedName === "constructor" || baseType && getPropertyOfType(baseType, p.escapedName) && isReadonlySymbol(getPropertyOfType(baseType, p.escapedName)) === isReadonlySymbol(p) && (p.flags & 16777216 /* Optional */) === (getPropertyOfType(baseType, p.escapedName).flags & 16777216 /* Optional */) && isTypeIdenticalTo(getTypeOfSymbol(p), getTypeOfPropertyOfType(baseType, p.escapedName))) {
               return [];
             }
             const flag = modifierFlags & ~512 /* Async */ | (isStatic2 ? 32 /* Static */ : 0);
@@ -55977,6 +55978,9 @@ ${lanes.join("\n")}
       return type.resolvedDefaultConstraint;
     }
     function getConstraintOfDistributiveConditionalType(type) {
+      if (type.resolvedConstraintOfDistributive !== void 0) {
+        return type.resolvedConstraintOfDistributive || void 0;
+      }
       if (type.root.isDistributive && type.restrictiveInstantiation !== type) {
         const simplified = getSimplifiedType(
           type.checkType,
@@ -55987,10 +55991,12 @@ ${lanes.join("\n")}
         if (constraint && constraint !== type.checkType) {
           const instantiated = getConditionalTypeInstantiation(type, prependTypeMapping(type.root.checkType, constraint, type.mapper));
           if (!(instantiated.flags & 131072 /* Never */)) {
+            type.resolvedConstraintOfDistributive = instantiated;
             return instantiated;
           }
         }
       }
+      type.resolvedConstraintOfDistributive = false;
       return void 0;
     }
     function getConstraintFromConditionalType(type) {
@@ -74678,7 +74684,7 @@ ${lanes.join("\n")}
       function checkAllCodePathsInNonVoidFunctionReturnOrThrowDiagnostics() {
         const functionFlags = getFunctionFlags(func);
         const type = returnType && unwrapReturnType(returnType, functionFlags);
-        if (type && maybeTypeOfKind(type, 32768 /* Undefined */ | 16384 /* Void */ | 1 /* Any */)) {
+        if (type && maybeTypeOfKind(type, 32768 /* Undefined */ | 16384 /* Void */ | 1 /* Any */ | 2 /* Unknown */)) {
           return;
         }
         if (func.kind === 171 /* MethodSignature */ || nodeIsMissing(func.body) || func.body.kind !== 239 /* Block */ || !functionHasImplicitReturn(func)) {
@@ -94132,10 +94138,14 @@ ${lanes.join("\n")}
             visitor
           );
           const superStatementIndex = findSuperStatementIndex(node.body.statements, nonPrologueStart);
-          const indexOfFirstStatementAfterSuper = superStatementIndex >= 0 ? superStatementIndex + 1 : void 0;
-          addRange(statements, visitNodes2(node.body.statements, visitor, isStatement, nonPrologueStart, indexOfFirstStatementAfterSuper ? indexOfFirstStatementAfterSuper - nonPrologueStart : void 0));
-          addRange(statements, initializerStatements);
-          addRange(statements, visitNodes2(node.body.statements, visitor, isStatement, indexOfFirstStatementAfterSuper));
+          if (superStatementIndex >= 0) {
+            addRange(statements, visitNodes2(node.body.statements, visitor, isStatement, nonPrologueStart, superStatementIndex + 1 - nonPrologueStart));
+            addRange(statements, initializerStatements);
+            addRange(statements, visitNodes2(node.body.statements, visitor, isStatement, superStatementIndex + 1));
+          } else {
+            addRange(statements, initializerStatements);
+            addRange(statements, visitNodes2(node.body.statements, visitor, isStatement));
+          }
           body = factory2.createBlock(
             statements,
             /*multiLine*/
@@ -151623,7 +151633,7 @@ ${lanes.join("\n")}
         const literals = contextualTypes.types.filter((literal) => !tracker.hasValue(literal.value));
         return { kind: 2 /* Types */, types: literals, isNewIdentifier: false };
       default:
-        return fromContextualType();
+        return fromContextualType() || fromContextualType(0 /* None */);
     }
     function fromContextualType(contextFlags = 4 /* Completions */) {
       const types = getStringLiteralTypes(getContextualTypeFromParent(node, typeChecker, contextFlags));
@@ -160861,9 +160871,9 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
       }
       callArguments.push(factory.createIdentifier(name));
     });
-    const typeParametersAndDeclarations = arrayFrom(typeParameterUsages.values(), (type) => ({ type, declaration: getFirstDeclaration(type) }));
+    const typeParametersAndDeclarations = arrayFrom(typeParameterUsages.values(), (type) => ({ type, declaration: getFirstDeclarationBeforePosition(type, context.startPosition) }));
     const sortedTypeParametersAndDeclarations = typeParametersAndDeclarations.sort(compareTypesByDeclarationOrder);
-    const typeParameters = sortedTypeParametersAndDeclarations.length === 0 ? void 0 : sortedTypeParametersAndDeclarations.map((t) => t.declaration);
+    const typeParameters = sortedTypeParametersAndDeclarations.length === 0 ? void 0 : mapDefined(sortedTypeParametersAndDeclarations, ({ declaration }) => declaration);
     const callTypeArguments = typeParameters !== void 0 ? typeParameters.map((decl) => factory.createTypeReferenceNode(
       decl.name,
       /*typeArguments*/
@@ -161340,12 +161350,12 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
       node = node.parent;
     }
   }
-  function getFirstDeclaration(type) {
+  function getFirstDeclarationBeforePosition(type, position) {
     let firstDeclaration;
     const symbol = type.symbol;
     if (symbol && symbol.declarations) {
       for (const declaration of symbol.declarations) {
-        if (firstDeclaration === void 0 || declaration.pos < firstDeclaration.pos) {
+        if ((firstDeclaration === void 0 || declaration.pos < firstDeclaration.pos) && declaration.pos < position) {
           firstDeclaration = declaration;
         }
       }

package/lib/typescript.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.1";
-      version = `${versionMajorMinor}.0-dev.20230326`;
+      version = `${versionMajorMinor}.0-dev.20230328`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -52362,6 +52362,7 @@ ${lanes.join("\n")}
           ), 0 /* None */);
         }
         function serializeMaybeAliasAssignment(symbol) {
+          var _a2;
           if (symbol.flags & 4194304 /* Prototype */) {
             return false;
           }
@@ -52441,7 +52442,7 @@ ${lanes.join("\n")}
                     void 0,
                     serializeTypeForDeclaration(context, typeToSerialize, symbol, enclosingDeclaration, includePrivateSymbol, bundled)
                   )
-                ], 2 /* Const */)
+                ], ((_a2 = context.enclosingDeclaration) == null ? void 0 : _a2.kind) === 265 /* ModuleDeclaration */ ? 1 /* Let */ : 2 /* Const */)
               );
               addResult(
                 statement,
@@ -52477,7 +52478,7 @@ ${lanes.join("\n")}
             if (isStatic2 && p.flags & (788968 /* Type */ | 1920 /* Namespace */ | 2097152 /* Alias */)) {
               return [];
             }
-            if (p.flags & 4194304 /* Prototype */ || baseType && getPropertyOfType(baseType, p.escapedName) && isReadonlySymbol(getPropertyOfType(baseType, p.escapedName)) === isReadonlySymbol(p) && (p.flags & 16777216 /* Optional */) === (getPropertyOfType(baseType, p.escapedName).flags & 16777216 /* Optional */) && isTypeIdenticalTo(getTypeOfSymbol(p), getTypeOfPropertyOfType(baseType, p.escapedName))) {
+            if (p.flags & 4194304 /* Prototype */ || p.escapedName === "constructor" || baseType && getPropertyOfType(baseType, p.escapedName) && isReadonlySymbol(getPropertyOfType(baseType, p.escapedName)) === isReadonlySymbol(p) && (p.flags & 16777216 /* Optional */) === (getPropertyOfType(baseType, p.escapedName).flags & 16777216 /* Optional */) && isTypeIdenticalTo(getTypeOfSymbol(p), getTypeOfPropertyOfType(baseType, p.escapedName))) {
               return [];
             }
             const flag = modifierFlags & ~512 /* Async */ | (isStatic2 ? 32 /* Static */ : 0);
@@ -55977,6 +55978,9 @@ ${lanes.join("\n")}
       return type.resolvedDefaultConstraint;
     }
     function getConstraintOfDistributiveConditionalType(type) {
+      if (type.resolvedConstraintOfDistributive !== void 0) {
+        return type.resolvedConstraintOfDistributive || void 0;
+      }
       if (type.root.isDistributive && type.restrictiveInstantiation !== type) {
         const simplified = getSimplifiedType(
           type.checkType,
@@ -55987,10 +55991,12 @@ ${lanes.join("\n")}
         if (constraint && constraint !== type.checkType) {
           const instantiated = getConditionalTypeInstantiation(type, prependTypeMapping(type.root.checkType, constraint, type.mapper));
           if (!(instantiated.flags & 131072 /* Never */)) {
+            type.resolvedConstraintOfDistributive = instantiated;
             return instantiated;
           }
         }
       }
+      type.resolvedConstraintOfDistributive = false;
       return void 0;
     }
     function getConstraintFromConditionalType(type) {
@@ -74678,7 +74684,7 @@ ${lanes.join("\n")}
       function checkAllCodePathsInNonVoidFunctionReturnOrThrowDiagnostics() {
         const functionFlags = getFunctionFlags(func);
         const type = returnType && unwrapReturnType(returnType, functionFlags);
-        if (type && maybeTypeOfKind(type, 32768 /* Undefined */ | 16384 /* Void */ | 1 /* Any */)) {
+        if (type && maybeTypeOfKind(type, 32768 /* Undefined */ | 16384 /* Void */ | 1 /* Any */ | 2 /* Unknown */)) {
           return;
         }
         if (func.kind === 171 /* MethodSignature */ || nodeIsMissing(func.body) || func.body.kind !== 239 /* Block */ || !functionHasImplicitReturn(func)) {
@@ -94132,10 +94138,14 @@ ${lanes.join("\n")}
             visitor
           );
           const superStatementIndex = findSuperStatementIndex(node.body.statements, nonPrologueStart);
-          const indexOfFirstStatementAfterSuper = superStatementIndex >= 0 ? superStatementIndex + 1 : void 0;
-          addRange(statements, visitNodes2(node.body.statements, visitor, isStatement, nonPrologueStart, indexOfFirstStatementAfterSuper ? indexOfFirstStatementAfterSuper - nonPrologueStart : void 0));
-          addRange(statements, initializerStatements);
-          addRange(statements, visitNodes2(node.body.statements, visitor, isStatement, indexOfFirstStatementAfterSuper));
+          if (superStatementIndex >= 0) {
+            addRange(statements, visitNodes2(node.body.statements, visitor, isStatement, nonPrologueStart, superStatementIndex + 1 - nonPrologueStart));
+            addRange(statements, initializerStatements);
+            addRange(statements, visitNodes2(node.body.statements, visitor, isStatement, superStatementIndex + 1));
+          } else {
+            addRange(statements, initializerStatements);
+            addRange(statements, visitNodes2(node.body.statements, visitor, isStatement));
+          }
           body = factory2.createBlock(
             statements,
             /*multiLine*/
@@ -151637,7 +151647,7 @@ ${lanes.join("\n")}
         const literals = contextualTypes.types.filter((literal) => !tracker.hasValue(literal.value));
         return { kind: 2 /* Types */, types: literals, isNewIdentifier: false };
       default:
-        return fromContextualType();
+        return fromContextualType() || fromContextualType(0 /* None */);
     }
     function fromContextualType(contextFlags = 4 /* Completions */) {
       const types = getStringLiteralTypes(getContextualTypeFromParent(node, typeChecker, contextFlags));
@@ -160875,9 +160885,9 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
       }
       callArguments.push(factory.createIdentifier(name));
     });
-    const typeParametersAndDeclarations = arrayFrom(typeParameterUsages.values(), (type) => ({ type, declaration: getFirstDeclaration(type) }));
+    const typeParametersAndDeclarations = arrayFrom(typeParameterUsages.values(), (type) => ({ type, declaration: getFirstDeclarationBeforePosition(type, context.startPosition) }));
     const sortedTypeParametersAndDeclarations = typeParametersAndDeclarations.sort(compareTypesByDeclarationOrder);
-    const typeParameters = sortedTypeParametersAndDeclarations.length === 0 ? void 0 : sortedTypeParametersAndDeclarations.map((t) => t.declaration);
+    const typeParameters = sortedTypeParametersAndDeclarations.length === 0 ? void 0 : mapDefined(sortedTypeParametersAndDeclarations, ({ declaration }) => declaration);
     const callTypeArguments = typeParameters !== void 0 ? typeParameters.map((decl) => factory.createTypeReferenceNode(
       decl.name,
       /*typeArguments*/
@@ -161354,12 +161364,12 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
       node = node.parent;
     }
   }
-  function getFirstDeclaration(type) {
+  function getFirstDeclarationBeforePosition(type, position) {
     let firstDeclaration;
     const symbol = type.symbol;
     if (symbol && symbol.declarations) {
       for (const declaration of symbol.declarations) {
-        if (firstDeclaration === void 0 || declaration.pos < firstDeclaration.pos) {
+        if ((firstDeclaration === void 0 || declaration.pos < firstDeclaration.pos) && declaration.pos < position) {
           firstDeclaration = declaration;
         }
       }

package/lib/typingsInstaller.js

@@ -54,7 +54,7 @@ var path = __toESM(require("path"));
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.1";
-var version = `${versionMajorMinor}.0-dev.20230326`;
+var version = `${versionMajorMinor}.0-dev.20230328`;
 
 // src/compiler/core.ts
 var emptyArray = [];

package/package.json

@@ -2,7 +2,7 @@
     "name": "typescript",
     "author": "Microsoft Corp.",
     "homepage": "https://www.typescriptlang.org/",
-    "version": "5.1.0-dev.20230326",
+    "version": "5.1.0-dev.20230328",
     "license": "Apache-2.0",
     "description": "TypeScript is a language for application scale JavaScript development",
     "keywords": [
@@ -113,5 +113,5 @@
         "node": "14.21.1",
         "npm": "8.19.3"
     },
-    "gitHead": "f64f40d20511d2d2a9eb4fcc1ad6750977be2d40"
+    "gitHead": "647c587e46418063a1b13bdd6b4758ff90a75198"
 }