@typescript-deploys/pr-build 5.1.0-pr-53502-7 → 5.1.0-pr-53549-16

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-insiders.20230325`;
+var version = `${versionMajorMinor}.0-insiders.20230328`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -43383,6 +43383,8 @@ function createTypeChecker(host) {
   var resolutionTargets = [];
   var resolutionResults = [];
   var resolutionPropertyNames = [];
+  var resolutionStart = 0;
+  var inVarianceComputation = false;
   var suggestionCount = 0;
   var maximumSuggestionCount = 10;
   var mergedSymbols = [];
@@ -49912,6 +49914,7 @@ function createTypeChecker(host) {
         ), 0 /* None */);
       }
       function serializeMaybeAliasAssignment(symbol) {
+        var _a2;
         if (symbol.flags & 4194304 /* Prototype */) {
           return false;
         }
@@ -49991,7 +49994,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 +50030,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);
@@ -50582,7 +50585,7 @@ function createTypeChecker(host) {
     return true;
   }
   function findResolutionCycleStartIndex(target, propertyName) {
-    for (let i = resolutionTargets.length - 1; i >= 0; i--) {
+    for (let i = resolutionTargets.length - 1; i >= resolutionStart; i--) {
       if (resolutionTargetHasProperty(resolutionTargets[i], resolutionPropertyNames[i])) {
         return -1;
       }
@@ -53527,6 +53530,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 +53543,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) {
@@ -61613,6 +61621,11 @@ function createTypeChecker(host) {
     const links = getSymbolLinks(symbol);
     if (!links.variances) {
       (_a2 = tracing) == null ? void 0 : _a2.push(tracing.Phase.CheckTypes, "getVariancesWorker", { arity: typeParameters.length, id: getTypeId(getDeclaredTypeOfSymbol(symbol)) });
+      const oldVarianceComputation = inVarianceComputation;
+      if (!inVarianceComputation) {
+        inVarianceComputation = true;
+        resolutionStart = resolutionTargets.length;
+      }
       links.variances = emptyArray;
       const variances = [];
       for (const tp of typeParameters) {
@@ -61641,6 +61654,10 @@ function createTypeChecker(host) {
         }
         variances.push(variance);
       }
+      if (!oldVarianceComputation) {
+        inVarianceComputation = false;
+        resolutionStart = 0;
+      }
       links.variances = variances;
       (_b = tracing) == null ? void 0 : _b.pop({ variances: variances.map(Debug.formatVariance) });
     }
@@ -66803,7 +66820,7 @@ function createTypeChecker(host) {
     return node === conditional.whenTrue || node === conditional.whenFalse ? getContextualType(conditional, contextFlags) : void 0;
   }
   function getContextualTypeForChildJsxExpression(node, child, contextFlags) {
-    const attributesType = getApparentTypeOfContextualType(node.openingElement.attributes, contextFlags);
+    const attributesType = getApparentTypeOfContextualType(node.openingElement.tagName, contextFlags);
     const jsxChildrenPropertyName = getJsxElementChildrenPropertyName(getJsxNamespaceAt(node));
     if (!(attributesType && !isTypeAny(attributesType) && jsxChildrenPropertyName && jsxChildrenPropertyName !== "")) {
       return void 0;
@@ -72228,7 +72245,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 +91335,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-insiders.20230325`;
+var version = `${versionMajorMinor}.0-insiders.20230328`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -48025,6 +48025,8 @@ function createTypeChecker(host) {
   var resolutionTargets = [];
   var resolutionResults = [];
   var resolutionPropertyNames = [];
+  var resolutionStart = 0;
+  var inVarianceComputation = false;
   var suggestionCount = 0;
   var maximumSuggestionCount = 10;
   var mergedSymbols = [];
@@ -54554,6 +54556,7 @@ function createTypeChecker(host) {
         ), 0 /* None */);
       }
       function serializeMaybeAliasAssignment(symbol) {
+        var _a2;
         if (symbol.flags & 4194304 /* Prototype */) {
           return false;
         }
@@ -54633,7 +54636,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 +54672,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);
@@ -55224,7 +55227,7 @@ function createTypeChecker(host) {
     return true;
   }
   function findResolutionCycleStartIndex(target, propertyName) {
-    for (let i = resolutionTargets.length - 1; i >= 0; i--) {
+    for (let i = resolutionTargets.length - 1; i >= resolutionStart; i--) {
       if (resolutionTargetHasProperty(resolutionTargets[i], resolutionPropertyNames[i])) {
         return -1;
       }
@@ -58169,6 +58172,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 +58185,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) {
@@ -66255,6 +66263,11 @@ function createTypeChecker(host) {
     const links = getSymbolLinks(symbol);
     if (!links.variances) {
       (_a2 = tracing) == null ? void 0 : _a2.push(tracing.Phase.CheckTypes, "getVariancesWorker", { arity: typeParameters.length, id: getTypeId(getDeclaredTypeOfSymbol(symbol)) });
+      const oldVarianceComputation = inVarianceComputation;
+      if (!inVarianceComputation) {
+        inVarianceComputation = true;
+        resolutionStart = resolutionTargets.length;
+      }
       links.variances = emptyArray;
       const variances = [];
       for (const tp of typeParameters) {
@@ -66283,6 +66296,10 @@ function createTypeChecker(host) {
         }
         variances.push(variance);
       }
+      if (!oldVarianceComputation) {
+        inVarianceComputation = false;
+        resolutionStart = 0;
+      }
       links.variances = variances;
       (_b = tracing) == null ? void 0 : _b.pop({ variances: variances.map(Debug.formatVariance) });
     }
@@ -71445,7 +71462,7 @@ function createTypeChecker(host) {
     return node === conditional.whenTrue || node === conditional.whenFalse ? getContextualType2(conditional, contextFlags) : void 0;
   }
   function getContextualTypeForChildJsxExpression(node, child, contextFlags) {
-    const attributesType = getApparentTypeOfContextualType(node.openingElement.attributes, contextFlags);
+    const attributesType = getApparentTypeOfContextualType(node.openingElement.tagName, contextFlags);
     const jsxChildrenPropertyName = getJsxElementChildrenPropertyName(getJsxNamespaceAt(node));
     if (!(attributesType && !isTypeAny(attributesType) && jsxChildrenPropertyName && jsxChildrenPropertyName !== "")) {
       return void 0;
@@ -76870,7 +76887,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 +96148,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 +152547,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 +161612,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 +162091,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-insiders.20230325`;
+      version = `${versionMajorMinor}.0-insiders.20230328`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -45833,6 +45833,8 @@ ${lanes.join("\n")}
     var resolutionTargets = [];
     var resolutionResults = [];
     var resolutionPropertyNames = [];
+    var resolutionStart = 0;
+    var inVarianceComputation = false;
     var suggestionCount = 0;
     var maximumSuggestionCount = 10;
     var mergedSymbols = [];
@@ -52362,6 +52364,7 @@ ${lanes.join("\n")}
           ), 0 /* None */);
         }
         function serializeMaybeAliasAssignment(symbol) {
+          var _a2;
           if (symbol.flags & 4194304 /* Prototype */) {
             return false;
           }
@@ -52441,7 +52444,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 +52480,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);
@@ -53032,7 +53035,7 @@ ${lanes.join("\n")}
       return true;
     }
     function findResolutionCycleStartIndex(target, propertyName) {
-      for (let i = resolutionTargets.length - 1; i >= 0; i--) {
+      for (let i = resolutionTargets.length - 1; i >= resolutionStart; i--) {
         if (resolutionTargetHasProperty(resolutionTargets[i], resolutionPropertyNames[i])) {
           return -1;
         }
@@ -55977,6 +55980,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 +55993,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) {
@@ -64063,6 +64071,11 @@ ${lanes.join("\n")}
       const links = getSymbolLinks(symbol);
       if (!links.variances) {
         (_a2 = tracing) == null ? void 0 : _a2.push(tracing.Phase.CheckTypes, "getVariancesWorker", { arity: typeParameters.length, id: getTypeId(getDeclaredTypeOfSymbol(symbol)) });
+        const oldVarianceComputation = inVarianceComputation;
+        if (!inVarianceComputation) {
+          inVarianceComputation = true;
+          resolutionStart = resolutionTargets.length;
+        }
         links.variances = emptyArray;
         const variances = [];
         for (const tp of typeParameters) {
@@ -64091,6 +64104,10 @@ ${lanes.join("\n")}
           }
           variances.push(variance);
         }
+        if (!oldVarianceComputation) {
+          inVarianceComputation = false;
+          resolutionStart = 0;
+        }
         links.variances = variances;
         (_b = tracing) == null ? void 0 : _b.pop({ variances: variances.map(Debug.formatVariance) });
       }
@@ -69253,7 +69270,7 @@ ${lanes.join("\n")}
       return node === conditional.whenTrue || node === conditional.whenFalse ? getContextualType2(conditional, contextFlags) : void 0;
     }
     function getContextualTypeForChildJsxExpression(node, child, contextFlags) {
-      const attributesType = getApparentTypeOfContextualType(node.openingElement.attributes, contextFlags);
+      const attributesType = getApparentTypeOfContextualType(node.openingElement.tagName, contextFlags);
       const jsxChildrenPropertyName = getJsxElementChildrenPropertyName(getJsxNamespaceAt(node));
       if (!(attributesType && !isTypeAny(attributesType) && jsxChildrenPropertyName && jsxChildrenPropertyName !== "")) {
         return void 0;
@@ -74678,7 +74695,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 +94149,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 +151644,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 +160882,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 +161361,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-insiders.20230325`;
+      version = `${versionMajorMinor}.0-insiders.20230328`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -45833,6 +45833,8 @@ ${lanes.join("\n")}
     var resolutionTargets = [];
     var resolutionResults = [];
     var resolutionPropertyNames = [];
+    var resolutionStart = 0;
+    var inVarianceComputation = false;
     var suggestionCount = 0;
     var maximumSuggestionCount = 10;
     var mergedSymbols = [];
@@ -52362,6 +52364,7 @@ ${lanes.join("\n")}
           ), 0 /* None */);
         }
         function serializeMaybeAliasAssignment(symbol) {
+          var _a2;
           if (symbol.flags & 4194304 /* Prototype */) {
             return false;
           }
@@ -52441,7 +52444,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 +52480,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);
@@ -53032,7 +53035,7 @@ ${lanes.join("\n")}
       return true;
     }
     function findResolutionCycleStartIndex(target, propertyName) {
-      for (let i = resolutionTargets.length - 1; i >= 0; i--) {
+      for (let i = resolutionTargets.length - 1; i >= resolutionStart; i--) {
         if (resolutionTargetHasProperty(resolutionTargets[i], resolutionPropertyNames[i])) {
           return -1;
         }
@@ -55977,6 +55980,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 +55993,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) {
@@ -64063,6 +64071,11 @@ ${lanes.join("\n")}
       const links = getSymbolLinks(symbol);
       if (!links.variances) {
         (_a2 = tracing) == null ? void 0 : _a2.push(tracing.Phase.CheckTypes, "getVariancesWorker", { arity: typeParameters.length, id: getTypeId(getDeclaredTypeOfSymbol(symbol)) });
+        const oldVarianceComputation = inVarianceComputation;
+        if (!inVarianceComputation) {
+          inVarianceComputation = true;
+          resolutionStart = resolutionTargets.length;
+        }
         links.variances = emptyArray;
         const variances = [];
         for (const tp of typeParameters) {
@@ -64091,6 +64104,10 @@ ${lanes.join("\n")}
           }
           variances.push(variance);
         }
+        if (!oldVarianceComputation) {
+          inVarianceComputation = false;
+          resolutionStart = 0;
+        }
         links.variances = variances;
         (_b = tracing) == null ? void 0 : _b.pop({ variances: variances.map(Debug.formatVariance) });
       }
@@ -69253,7 +69270,7 @@ ${lanes.join("\n")}
       return node === conditional.whenTrue || node === conditional.whenFalse ? getContextualType2(conditional, contextFlags) : void 0;
     }
     function getContextualTypeForChildJsxExpression(node, child, contextFlags) {
-      const attributesType = getApparentTypeOfContextualType(node.openingElement.attributes, contextFlags);
+      const attributesType = getApparentTypeOfContextualType(node.openingElement.tagName, contextFlags);
       const jsxChildrenPropertyName = getJsxElementChildrenPropertyName(getJsxNamespaceAt(node));
       if (!(attributesType && !isTypeAny(attributesType) && jsxChildrenPropertyName && jsxChildrenPropertyName !== "")) {
         return void 0;
@@ -74678,7 +74695,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 +94149,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 +151658,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 +160896,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 +161375,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-insiders.20230325`;
+var version = `${versionMajorMinor}.0-insiders.20230328`;
 
 // src/compiler/core.ts
 var emptyArray = [];

package/package.json

@@ -2,7 +2,7 @@
   "name": "@typescript-deploys/pr-build",
   "author": "Microsoft Corp.",
   "homepage": "https://www.typescriptlang.org/",
-  "version": "5.1.0-pr-53502-7",
+  "version": "5.1.0-pr-53549-16",
   "license": "Apache-2.0",
   "description": "TypeScript is a language for application scale JavaScript development",
   "keywords": [
@@ -114,5 +114,5 @@
     "node": "14.21.1",
     "npm": "8.19.3"
   },
-  "gitHead": "31793330fc1f6663df6b0efa88f13142285b80f4"
+  "gitHead": "80b6b038e269d5c218bfde672c663dbadc5b1525"
 }