@typescript-deploys/pr-build 5.4.0-pr-56939-8 → 5.4.0-pr-56911-7

package/lib/tsc.js

@@ -18,7 +18,7 @@ and limitations under the License.
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.4";
-var version = `${versionMajorMinor}.0-insiders.20240103`;
+var version = `${versionMajorMinor}.0-insiders.20240104`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -44254,6 +44254,19 @@ function createTypeChecker(host) {
     emptyArray
   );
   var unknownUnionType = strictNullChecks ? getUnionType([undefinedType, nullType, unknownEmptyObjectType]) : unknownType;
+  var keyofConstraintObjectType = createAnonymousType(
+    /*symbol*/
+    void 0,
+    emptySymbols,
+    emptyArray,
+    emptyArray,
+    [stringType, numberType, esSymbolType].map((t) => createIndexInfo(
+      t,
+      unknownType,
+      /*isReadonly*/
+      false
+    ))
+  );
   var emptyGenericType = createAnonymousType(
     /*symbol*/
     void 0,
@@ -54530,17 +54543,13 @@ function createTypeChecker(host) {
   function replaceIndexedAccess(instantiable, type, replacement) {
     return instantiateType(instantiable, createTypeMapper([type.indexType, type.objectType], [getNumberLiteralType(0), createTupleType([replacement])]));
   }
-  function getLimitedConstraint(type) {
+  function getReverseMappedTypeMembersLimitingConstraint(type) {
     const constraint = getConstraintTypeFromMappedType(type.mappedType);
-    if (!(constraint.flags & 1048576 /* Union */ || constraint.flags & 2097152 /* Intersection */)) {
-      return;
-    }
-    const origin = constraint.flags & 1048576 /* Union */ ? constraint.origin : constraint;
-    if (!origin || !(origin.flags & 2097152 /* Intersection */)) {
+    if (constraint === type.constraintType) {
       return;
     }
-    const limitedConstraint = getIntersectionType(origin.types.filter((t) => t !== type.constraintType));
-    return limitedConstraint !== neverType ? limitedConstraint : void 0;
+    const mapper = appendTypeMapping(type.mappedType.mapper, type.constraintType.type, keyofConstraintObjectType);
+    return getBaseConstraintOrType(instantiateType(constraint, mapper));
   }
   function resolveReverseMappedTypeMembers(type) {
     const indexInfo = getIndexInfoOfType(type.source, stringType);
@@ -54549,11 +54558,11 @@ function createTypeChecker(host) {
     const optionalMask = modifiers & 4 /* IncludeOptional */ ? 0 : 16777216 /* Optional */;
     const indexInfos = indexInfo ? [createIndexInfo(stringType, inferReverseMappedType(indexInfo.type, type.mappedType, type.constraintType), readonlyMask && indexInfo.isReadonly)] : emptyArray;
     const members = createSymbolTable();
-    const limitedConstraint = getLimitedConstraint(type);
+    const membersLimitingConstraint = getReverseMappedTypeMembersLimitingConstraint(type);
     for (const prop of getPropertiesOfType(type.source)) {
-      if (limitedConstraint) {
+      if (membersLimitingConstraint) {
         const propertyNameType = getLiteralTypeFromProperty(prop, 8576 /* StringOrNumberLiteralOrUnique */);
-        if (!isTypeAssignableTo(propertyNameType, limitedConstraint)) {
+        if (!isTypeAssignableTo(propertyNameType, membersLimitingConstraint)) {
           continue;
         }
       }
@@ -64831,7 +64840,7 @@ function createTypeChecker(host) {
       }
     }
     function inferToMappedType(source, target, constraintType) {
-      if (constraintType.flags & 1048576 /* Union */ || constraintType.flags & 2097152 /* Intersection */) {
+      if (constraintType.flags & 3145728 /* UnionOrIntersection */) {
         let result = false;
         for (const type of constraintType.types) {
           result = inferToMappedType(source, target, type) || result;
@@ -75732,7 +75741,7 @@ function createTypeChecker(host) {
             const context = getInferenceContext(node);
             const returnType = context.signature && getReturnTypeOfSignature(context.signature);
             const returnSignature = returnType && getSingleCallOrConstructSignature(returnType);
-            if (returnSignature && !returnSignature.typeParameters && !every(context.inferences, (info) => hasInferenceCandidates(info) && info.priority === 0 /* None */)) {
+            if (returnSignature && !returnSignature.typeParameters && !every(context.inferences, hasInferenceCandidates)) {
               const uniqueTypeParameters = getUniqueTypeParameters(context, signature.typeParameters);
               const instantiatedSignature = getSignatureInstantiationWithoutFillingInTypeArguments(signature, uniqueTypeParameters);
               const inferences = map(context.inferences, (info) => createInferenceInfo(info.typeParameter));
@@ -75751,8 +75760,8 @@ function createTypeChecker(host) {
                 applyToReturnTypes(instantiatedSignature, contextualSignature, (source, target) => {
                   inferTypes(inferences, source, target);
                 });
-                const merged = tryInferencesMerge(context.inferences, inferences);
-                if (merged) {
+                if (!hasOverlappingInferences(context.inferences, inferences)) {
+                  mergeInferences(context.inferences, inferences);
                   context.inferredTypeParameters = concatenate(context.inferredTypeParameters, uniqueTypeParameters);
                   return getOrCreateTypeFromSignature(instantiatedSignature);
                 }
@@ -75785,17 +75794,12 @@ function createTypeChecker(host) {
     }
     return false;
   }
-  function tryInferencesMerge(target, source) {
-    let merged = false;
-    const areOverlapping = hasOverlappingInferences(target, source);
+  function mergeInferences(target, source) {
     for (let i = 0; i < target.length; i++) {
-      if (areOverlapping ? hasInferenceCandidates(source[i]) && hasInferenceCandidates(target[i]) && source[i].priority < (target[i].priority & ~128 /* ReturnType */) : hasInferenceCandidates(source[i])) {
+      if (!hasInferenceCandidates(target[i]) && hasInferenceCandidates(source[i])) {
         target[i] = source[i];
-        target[i].priority = 0 /* None */;
-        merged = true;
       }
     }
-    return merged;
   }
   function getUniqueTypeParameters(context, typeParameters) {
     const result = [];

package/lib/tsserver.js

@@ -2341,7 +2341,7 @@ module.exports = __toCommonJS(server_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.4";
-var version = `${versionMajorMinor}.0-insiders.20240103`;
+var version = `${versionMajorMinor}.0-insiders.20240104`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -48982,6 +48982,19 @@ function createTypeChecker(host) {
     emptyArray
   );
   var unknownUnionType = strictNullChecks ? getUnionType([undefinedType, nullType, unknownEmptyObjectType]) : unknownType;
+  var keyofConstraintObjectType = createAnonymousType(
+    /*symbol*/
+    void 0,
+    emptySymbols,
+    emptyArray,
+    emptyArray,
+    [stringType, numberType, esSymbolType].map((t) => createIndexInfo(
+      t,
+      unknownType,
+      /*isReadonly*/
+      false
+    ))
+  );
   var emptyGenericType = createAnonymousType(
     /*symbol*/
     void 0,
@@ -59258,17 +59271,13 @@ function createTypeChecker(host) {
   function replaceIndexedAccess(instantiable, type, replacement) {
     return instantiateType(instantiable, createTypeMapper([type.indexType, type.objectType], [getNumberLiteralType(0), createTupleType([replacement])]));
   }
-  function getLimitedConstraint(type) {
+  function getReverseMappedTypeMembersLimitingConstraint(type) {
     const constraint = getConstraintTypeFromMappedType(type.mappedType);
-    if (!(constraint.flags & 1048576 /* Union */ || constraint.flags & 2097152 /* Intersection */)) {
-      return;
-    }
-    const origin = constraint.flags & 1048576 /* Union */ ? constraint.origin : constraint;
-    if (!origin || !(origin.flags & 2097152 /* Intersection */)) {
+    if (constraint === type.constraintType) {
       return;
     }
-    const limitedConstraint = getIntersectionType(origin.types.filter((t) => t !== type.constraintType));
-    return limitedConstraint !== neverType ? limitedConstraint : void 0;
+    const mapper = appendTypeMapping(type.mappedType.mapper, type.constraintType.type, keyofConstraintObjectType);
+    return getBaseConstraintOrType(instantiateType(constraint, mapper));
   }
   function resolveReverseMappedTypeMembers(type) {
     const indexInfo = getIndexInfoOfType(type.source, stringType);
@@ -59277,11 +59286,11 @@ function createTypeChecker(host) {
     const optionalMask = modifiers & 4 /* IncludeOptional */ ? 0 : 16777216 /* Optional */;
     const indexInfos = indexInfo ? [createIndexInfo(stringType, inferReverseMappedType(indexInfo.type, type.mappedType, type.constraintType), readonlyMask && indexInfo.isReadonly)] : emptyArray;
     const members = createSymbolTable();
-    const limitedConstraint = getLimitedConstraint(type);
+    const membersLimitingConstraint = getReverseMappedTypeMembersLimitingConstraint(type);
     for (const prop of getPropertiesOfType(type.source)) {
-      if (limitedConstraint) {
+      if (membersLimitingConstraint) {
         const propertyNameType = getLiteralTypeFromProperty(prop, 8576 /* StringOrNumberLiteralOrUnique */);
-        if (!isTypeAssignableTo(propertyNameType, limitedConstraint)) {
+        if (!isTypeAssignableTo(propertyNameType, membersLimitingConstraint)) {
           continue;
         }
       }
@@ -69559,7 +69568,7 @@ function createTypeChecker(host) {
       }
     }
     function inferToMappedType(source, target, constraintType) {
-      if (constraintType.flags & 1048576 /* Union */ || constraintType.flags & 2097152 /* Intersection */) {
+      if (constraintType.flags & 3145728 /* UnionOrIntersection */) {
         let result = false;
         for (const type of constraintType.types) {
           result = inferToMappedType(source, target, type) || result;
@@ -80460,7 +80469,7 @@ function createTypeChecker(host) {
             const context = getInferenceContext(node);
             const returnType = context.signature && getReturnTypeOfSignature(context.signature);
             const returnSignature = returnType && getSingleCallOrConstructSignature(returnType);
-            if (returnSignature && !returnSignature.typeParameters && !every(context.inferences, (info) => hasInferenceCandidates(info) && info.priority === 0 /* None */)) {
+            if (returnSignature && !returnSignature.typeParameters && !every(context.inferences, hasInferenceCandidates)) {
               const uniqueTypeParameters = getUniqueTypeParameters(context, signature.typeParameters);
               const instantiatedSignature = getSignatureInstantiationWithoutFillingInTypeArguments(signature, uniqueTypeParameters);
               const inferences = map(context.inferences, (info) => createInferenceInfo(info.typeParameter));
@@ -80479,8 +80488,8 @@ function createTypeChecker(host) {
                 applyToReturnTypes(instantiatedSignature, contextualSignature, (source, target) => {
                   inferTypes(inferences, source, target);
                 });
-                const merged = tryInferencesMerge(context.inferences, inferences);
-                if (merged) {
+                if (!hasOverlappingInferences(context.inferences, inferences)) {
+                  mergeInferences(context.inferences, inferences);
                   context.inferredTypeParameters = concatenate(context.inferredTypeParameters, uniqueTypeParameters);
                   return getOrCreateTypeFromSignature(instantiatedSignature);
                 }
@@ -80513,17 +80522,12 @@ function createTypeChecker(host) {
     }
     return false;
   }
-  function tryInferencesMerge(target, source) {
-    let merged = false;
-    const areOverlapping = hasOverlappingInferences(target, source);
+  function mergeInferences(target, source) {
     for (let i = 0; i < target.length; i++) {
-      if (areOverlapping ? hasInferenceCandidates(source[i]) && hasInferenceCandidates(target[i]) && source[i].priority < (target[i].priority & ~128 /* ReturnType */) : hasInferenceCandidates(source[i])) {
+      if (!hasInferenceCandidates(target[i]) && hasInferenceCandidates(source[i])) {
         target[i] = source[i];
-        target[i].priority = 0 /* None */;
-        merged = true;
       }
     }
-    return merged;
   }
   function getUniqueTypeParameters(context, typeParameters) {
     const result = [];
@@ -147133,13 +147137,14 @@ function getPropertySymbolsFromContextualType(node, checker, contextualType, uni
     const symbol = contextualType.getProperty(name);
     return symbol ? [symbol] : emptyArray;
   }
-  const discriminatedPropertySymbols = mapDefined(contextualType.types, (t) => (isObjectLiteralExpression(node.parent) || isJsxAttributes(node.parent)) && checker.isTypeInvalidDueToUnionDiscriminant(t, node.parent) ? void 0 : t.getProperty(name));
+  const filteredTypes = isObjectLiteralExpression(node.parent) || isJsxAttributes(node.parent) ? filter(contextualType.types, (t) => !checker.isTypeInvalidDueToUnionDiscriminant(t, node.parent)) : contextualType.types;
+  const discriminatedPropertySymbols = mapDefined(filteredTypes, (t) => t.getProperty(name));
   if (unionSymbolOk && (discriminatedPropertySymbols.length === 0 || discriminatedPropertySymbols.length === contextualType.types.length)) {
     const symbol = contextualType.getProperty(name);
     if (symbol)
       return [symbol];
   }
-  if (discriminatedPropertySymbols.length === 0) {
+  if (!filteredTypes.length && !discriminatedPropertySymbols.length) {
     return mapDefined(contextualType.types, (t) => t.getProperty(name));
   }
   return deduplicate(discriminatedPropertySymbols, equateValues);

package/lib/typescript.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.4";
-      version = `${versionMajorMinor}.0-insiders.20240103`;
+      version = `${versionMajorMinor}.0-insiders.20240104`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -46736,6 +46736,19 @@ ${lanes.join("\n")}
       emptyArray
     );
     var unknownUnionType = strictNullChecks ? getUnionType([undefinedType, nullType, unknownEmptyObjectType]) : unknownType;
+    var keyofConstraintObjectType = createAnonymousType(
+      /*symbol*/
+      void 0,
+      emptySymbols,
+      emptyArray,
+      emptyArray,
+      [stringType, numberType, esSymbolType].map((t) => createIndexInfo(
+        t,
+        unknownType,
+        /*isReadonly*/
+        false
+      ))
+    );
     var emptyGenericType = createAnonymousType(
       /*symbol*/
       void 0,
@@ -57012,17 +57025,13 @@ ${lanes.join("\n")}
     function replaceIndexedAccess(instantiable, type, replacement) {
       return instantiateType(instantiable, createTypeMapper([type.indexType, type.objectType], [getNumberLiteralType(0), createTupleType([replacement])]));
     }
-    function getLimitedConstraint(type) {
+    function getReverseMappedTypeMembersLimitingConstraint(type) {
       const constraint = getConstraintTypeFromMappedType(type.mappedType);
-      if (!(constraint.flags & 1048576 /* Union */ || constraint.flags & 2097152 /* Intersection */)) {
-        return;
-      }
-      const origin = constraint.flags & 1048576 /* Union */ ? constraint.origin : constraint;
-      if (!origin || !(origin.flags & 2097152 /* Intersection */)) {
+      if (constraint === type.constraintType) {
         return;
       }
-      const limitedConstraint = getIntersectionType(origin.types.filter((t) => t !== type.constraintType));
-      return limitedConstraint !== neverType ? limitedConstraint : void 0;
+      const mapper = appendTypeMapping(type.mappedType.mapper, type.constraintType.type, keyofConstraintObjectType);
+      return getBaseConstraintOrType(instantiateType(constraint, mapper));
     }
     function resolveReverseMappedTypeMembers(type) {
       const indexInfo = getIndexInfoOfType(type.source, stringType);
@@ -57031,11 +57040,11 @@ ${lanes.join("\n")}
       const optionalMask = modifiers & 4 /* IncludeOptional */ ? 0 : 16777216 /* Optional */;
       const indexInfos = indexInfo ? [createIndexInfo(stringType, inferReverseMappedType(indexInfo.type, type.mappedType, type.constraintType), readonlyMask && indexInfo.isReadonly)] : emptyArray;
       const members = createSymbolTable();
-      const limitedConstraint = getLimitedConstraint(type);
+      const membersLimitingConstraint = getReverseMappedTypeMembersLimitingConstraint(type);
       for (const prop of getPropertiesOfType(type.source)) {
-        if (limitedConstraint) {
+        if (membersLimitingConstraint) {
           const propertyNameType = getLiteralTypeFromProperty(prop, 8576 /* StringOrNumberLiteralOrUnique */);
-          if (!isTypeAssignableTo(propertyNameType, limitedConstraint)) {
+          if (!isTypeAssignableTo(propertyNameType, membersLimitingConstraint)) {
             continue;
           }
         }
@@ -67313,7 +67322,7 @@ ${lanes.join("\n")}
         }
       }
       function inferToMappedType(source, target, constraintType) {
-        if (constraintType.flags & 1048576 /* Union */ || constraintType.flags & 2097152 /* Intersection */) {
+        if (constraintType.flags & 3145728 /* UnionOrIntersection */) {
           let result = false;
           for (const type of constraintType.types) {
             result = inferToMappedType(source, target, type) || result;
@@ -78214,7 +78223,7 @@ ${lanes.join("\n")}
               const context = getInferenceContext(node);
               const returnType = context.signature && getReturnTypeOfSignature(context.signature);
               const returnSignature = returnType && getSingleCallOrConstructSignature(returnType);
-              if (returnSignature && !returnSignature.typeParameters && !every(context.inferences, (info) => hasInferenceCandidates(info) && info.priority === 0 /* None */)) {
+              if (returnSignature && !returnSignature.typeParameters && !every(context.inferences, hasInferenceCandidates)) {
                 const uniqueTypeParameters = getUniqueTypeParameters(context, signature.typeParameters);
                 const instantiatedSignature = getSignatureInstantiationWithoutFillingInTypeArguments(signature, uniqueTypeParameters);
                 const inferences = map(context.inferences, (info) => createInferenceInfo(info.typeParameter));
@@ -78233,8 +78242,8 @@ ${lanes.join("\n")}
                   applyToReturnTypes(instantiatedSignature, contextualSignature, (source, target) => {
                     inferTypes(inferences, source, target);
                   });
-                  const merged = tryInferencesMerge(context.inferences, inferences);
-                  if (merged) {
+                  if (!hasOverlappingInferences(context.inferences, inferences)) {
+                    mergeInferences(context.inferences, inferences);
                     context.inferredTypeParameters = concatenate(context.inferredTypeParameters, uniqueTypeParameters);
                     return getOrCreateTypeFromSignature(instantiatedSignature);
                   }
@@ -78267,17 +78276,12 @@ ${lanes.join("\n")}
       }
       return false;
     }
-    function tryInferencesMerge(target, source) {
-      let merged = false;
-      const areOverlapping = hasOverlappingInferences(target, source);
+    function mergeInferences(target, source) {
       for (let i = 0; i < target.length; i++) {
-        if (areOverlapping ? hasInferenceCandidates(source[i]) && hasInferenceCandidates(target[i]) && source[i].priority < (target[i].priority & ~128 /* ReturnType */) : hasInferenceCandidates(source[i])) {
+        if (!hasInferenceCandidates(target[i]) && hasInferenceCandidates(source[i])) {
           target[i] = source[i];
-          target[i].priority = 0 /* None */;
-          merged = true;
         }
       }
-      return merged;
     }
     function getUniqueTypeParameters(context, typeParameters) {
       const result = [];
@@ -145063,13 +145067,14 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
       const symbol = contextualType.getProperty(name);
       return symbol ? [symbol] : emptyArray;
     }
-    const discriminatedPropertySymbols = mapDefined(contextualType.types, (t) => (isObjectLiteralExpression(node.parent) || isJsxAttributes(node.parent)) && checker.isTypeInvalidDueToUnionDiscriminant(t, node.parent) ? void 0 : t.getProperty(name));
+    const filteredTypes = isObjectLiteralExpression(node.parent) || isJsxAttributes(node.parent) ? filter(contextualType.types, (t) => !checker.isTypeInvalidDueToUnionDiscriminant(t, node.parent)) : contextualType.types;
+    const discriminatedPropertySymbols = mapDefined(filteredTypes, (t) => t.getProperty(name));
     if (unionSymbolOk && (discriminatedPropertySymbols.length === 0 || discriminatedPropertySymbols.length === contextualType.types.length)) {
       const symbol = contextualType.getProperty(name);
       if (symbol)
         return [symbol];
     }
-    if (discriminatedPropertySymbols.length === 0) {
+    if (!filteredTypes.length && !discriminatedPropertySymbols.length) {
       return mapDefined(contextualType.types, (t) => t.getProperty(name));
     }
     return deduplicate(discriminatedPropertySymbols, equateValues);

package/lib/typingsInstaller.js

@@ -54,7 +54,7 @@ var path = __toESM(require("path"));
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.4";
-var version = `${versionMajorMinor}.0-insiders.20240103`;
+var version = `${versionMajorMinor}.0-insiders.20240104`;
 
 // 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.4.0-pr-56939-8",
+  "version": "5.4.0-pr-56911-7",
   "license": "Apache-2.0",
   "description": "TypeScript is a language for application scale JavaScript development",
   "keywords": [
@@ -114,5 +114,5 @@
     "node": "20.1.0",
     "npm": "8.19.4"
   },
-  "gitHead": "04c80422db846a111808f99b29888f1ee1f5a6f7"
+  "gitHead": "3baf3b4e1804f2f32ace0d49b294bcf08f3ee314"
 }