@typescript-deploys/pr-build 5.2.0-pr-54753-32 → 5.2.0-pr-52095-19

package/lib/tsc.js

@@ -53914,12 +53914,7 @@ function createTypeChecker(host) {
       for (const current of type.types) {
         for (const prop of getPropertiesOfType(current)) {
           if (!members.has(prop.escapedName)) {
-            const combinedProp = getPropertyOfUnionOrIntersectionType(
-              type,
-              prop.escapedName,
-              /*skipObjectFunctionPropertyAugment*/
-              !!(type.flags & 2097152 /* Intersection */)
-            );
+            const combinedProp = getPropertyOfUnionOrIntersectionType(type, prop.escapedName);
             if (combinedProp) {
               members.set(prop.escapedName, combinedProp);
             }
@@ -54399,17 +54394,13 @@ function createTypeChecker(host) {
     return result;
   }
   function getUnionOrIntersectionProperty(type, name, skipObjectFunctionPropertyAugment) {
-    var _a, _b, _c;
+    var _a, _b;
     let property = ((_a = type.propertyCacheWithoutObjectFunctionPropertyAugment) == null ? void 0 : _a.get(name)) || !skipObjectFunctionPropertyAugment ? (_b = type.propertyCache) == null ? void 0 : _b.get(name) : void 0;
     if (!property) {
       property = createUnionOrIntersectionProperty(type, name, skipObjectFunctionPropertyAugment);
       if (property) {
         const properties = skipObjectFunctionPropertyAugment ? type.propertyCacheWithoutObjectFunctionPropertyAugment || (type.propertyCacheWithoutObjectFunctionPropertyAugment = createSymbolTable()) : type.propertyCache || (type.propertyCache = createSymbolTable());
         properties.set(name, property);
-        if (skipObjectFunctionPropertyAugment && !((_c = type.propertyCache) == null ? void 0 : _c.get(name))) {
-          const properties2 = type.propertyCache || (type.propertyCache = createSymbolTable());
-          properties2.set(name, property);
-        }
       }
     }
     return property;
@@ -54529,22 +54520,7 @@ function createTypeChecker(host) {
       }
       return getPropertyOfObjectType(globalObjectType, name);
     }
-    if (type.flags & 2097152 /* Intersection */) {
-      const prop = getPropertyOfUnionOrIntersectionType(
-        type,
-        name,
-        /*skipObjectFunctionPropertyAugment*/
-        true
-      );
-      if (prop) {
-        return prop;
-      }
-      if (!skipObjectFunctionPropertyAugment) {
-        return getPropertyOfUnionOrIntersectionType(type, name, skipObjectFunctionPropertyAugment);
-      }
-      return void 0;
-    }
-    if (type.flags & 1048576 /* Union */) {
+    if (type.flags & 3145728 /* UnionOrIntersection */) {
       return getPropertyOfUnionOrIntersectionType(type, name, skipObjectFunctionPropertyAugment);
     }
     return void 0;
@@ -67277,41 +67253,75 @@ function createTypeChecker(host) {
     return mapType(
       type,
       (t) => {
-        var _a;
-        if (isGenericMappedType(t) && !t.declaration.nameType) {
-          const constraint = getConstraintTypeFromMappedType(t);
-          const constraintOfConstraint = getBaseConstraintOfType(constraint) || constraint;
-          const propertyNameType = nameType || getStringLiteralType(unescapeLeadingUnderscores(name));
-          if (isTypeAssignableTo(propertyNameType, constraintOfConstraint)) {
-            return substituteIndexedMappedType(t, propertyNameType);
-          }
-        } else if (t.flags & 3670016 /* StructuredType */) {
-          const prop = getPropertyOfType(t, name);
-          if (prop) {
-            return isCircularMappedProperty(prop) ? void 0 : getTypeOfSymbol(prop);
-          }
-          if (isTupleType(t) && isNumericLiteralName(name) && +name >= 0) {
-            const restType = getElementTypeOfSliceOfTupleType(
-              t,
-              t.target.fixedLength,
-              /*endSkipCount*/
-              0,
-              /*writing*/
-              false,
-              /*noReductions*/
-              true
-            );
-            if (restType) {
-              return restType;
+        if (!(t.flags & 3670016 /* StructuredType */)) {
+          return void 0;
+        }
+        if (t.flags & 2097152 /* Intersection */) {
+          const intersection = t;
+          let applicableIndexedMappedTypeSubstitions;
+          let concretePropertyTypes;
+          let applicableIndexInfoCandidates;
+          for (const t2 of intersection.types) {
+            if (isGenericMappedType(t2) && !t2.declaration.nameType) {
+              applicableIndexedMappedTypeSubstitions = append(applicableIndexedMappedTypeSubstitions, getTypeOfApplicableIndexedMappedTypeSubstitutionOfContextualType(t2));
+              continue;
             }
+            const typeOfConcreteProperty = getTypeOfConcretePropertyOfContextualType(t2);
+            if (typeOfConcreteProperty) {
+              concretePropertyTypes = append(concretePropertyTypes, typeOfConcreteProperty);
+              continue;
+            }
+            applicableIndexInfoCandidates = append(applicableIndexInfoCandidates, t2);
+          }
+          if (concretePropertyTypes) {
+            return getIntersectionType(concatenate(concretePropertyTypes, applicableIndexedMappedTypeSubstitions));
+          }
+          const types = concatenate(mapDefined(applicableIndexInfoCandidates, getTypeOfApplicableIndexInfoOfContextualType), applicableIndexedMappedTypeSubstitions);
+          if (types.length > 0) {
+            return getIntersectionType(types);
           }
-          return (_a = findApplicableIndexInfo(getIndexInfosOfStructuredType(t), nameType || getStringLiteralType(unescapeLeadingUnderscores(name)))) == null ? void 0 : _a.type;
+          return void 0;
         }
-        return void 0;
+        return isGenericMappedType(t) && !t.declaration.nameType ? getTypeOfApplicableIndexedMappedTypeSubstitutionOfContextualType(t) : getTypeOfConcretePropertyOfContextualType(t) || getTypeOfApplicableIndexInfoOfContextualType(t);
       },
       /*noReductions*/
       true
     );
+    function getTypeOfApplicableIndexedMappedTypeSubstitutionOfContextualType(t) {
+      const constraint = getConstraintTypeFromMappedType(t);
+      const constraintOfConstraint = getBaseConstraintOfType(constraint) || constraint;
+      const propertyNameType = nameType || getStringLiteralType(unescapeLeadingUnderscores(name));
+      if (isTypeAssignableTo(propertyNameType, constraintOfConstraint)) {
+        return substituteIndexedMappedType(t, propertyNameType);
+      }
+      return void 0;
+    }
+    function getTypeOfConcretePropertyOfContextualType(t) {
+      const prop = getPropertyOfType(t, name);
+      if (prop) {
+        return isCircularMappedProperty(prop) ? void 0 : getTypeOfSymbol(prop);
+      }
+      if (isTupleType(t) && isNumericLiteralName(name) && +name >= 0) {
+        const restType = getElementTypeOfSliceOfTupleType(
+          t,
+          t.target.fixedLength,
+          /*endSkipCount*/
+          0,
+          /*writing*/
+          false,
+          /*noReductions*/
+          true
+        );
+        if (restType) {
+          return restType;
+        }
+      }
+      return void 0;
+    }
+    function getTypeOfApplicableIndexInfoOfContextualType(t) {
+      var _a;
+      return (_a = findApplicableIndexInfo(getIndexInfosOfStructuredType(t), nameType || getStringLiteralType(unescapeLeadingUnderscores(name)))) == null ? void 0 : _a.type;
+    }
   }
   function getContextualTypeForObjectLiteralMethod(node, contextFlags) {
     Debug.assert(isObjectLiteralMethod(node));

package/lib/tsserver.js

@@ -58623,12 +58623,7 @@ function createTypeChecker(host) {
       for (const current of type.types) {
         for (const prop of getPropertiesOfType(current)) {
           if (!members.has(prop.escapedName)) {
-            const combinedProp = getPropertyOfUnionOrIntersectionType(
-              type,
-              prop.escapedName,
-              /*skipObjectFunctionPropertyAugment*/
-              !!(type.flags & 2097152 /* Intersection */)
-            );
+            const combinedProp = getPropertyOfUnionOrIntersectionType(type, prop.escapedName);
             if (combinedProp) {
               members.set(prop.escapedName, combinedProp);
             }
@@ -59108,17 +59103,13 @@ function createTypeChecker(host) {
     return result;
   }
   function getUnionOrIntersectionProperty(type, name, skipObjectFunctionPropertyAugment) {
-    var _a, _b, _c;
+    var _a, _b;
     let property = ((_a = type.propertyCacheWithoutObjectFunctionPropertyAugment) == null ? void 0 : _a.get(name)) || !skipObjectFunctionPropertyAugment ? (_b = type.propertyCache) == null ? void 0 : _b.get(name) : void 0;
     if (!property) {
       property = createUnionOrIntersectionProperty(type, name, skipObjectFunctionPropertyAugment);
       if (property) {
         const properties = skipObjectFunctionPropertyAugment ? type.propertyCacheWithoutObjectFunctionPropertyAugment || (type.propertyCacheWithoutObjectFunctionPropertyAugment = createSymbolTable()) : type.propertyCache || (type.propertyCache = createSymbolTable());
         properties.set(name, property);
-        if (skipObjectFunctionPropertyAugment && !((_c = type.propertyCache) == null ? void 0 : _c.get(name))) {
-          const properties2 = type.propertyCache || (type.propertyCache = createSymbolTable());
-          properties2.set(name, property);
-        }
       }
     }
     return property;
@@ -59238,22 +59229,7 @@ function createTypeChecker(host) {
       }
       return getPropertyOfObjectType(globalObjectType, name);
     }
-    if (type.flags & 2097152 /* Intersection */) {
-      const prop = getPropertyOfUnionOrIntersectionType(
-        type,
-        name,
-        /*skipObjectFunctionPropertyAugment*/
-        true
-      );
-      if (prop) {
-        return prop;
-      }
-      if (!skipObjectFunctionPropertyAugment) {
-        return getPropertyOfUnionOrIntersectionType(type, name, skipObjectFunctionPropertyAugment);
-      }
-      return void 0;
-    }
-    if (type.flags & 1048576 /* Union */) {
+    if (type.flags & 3145728 /* UnionOrIntersection */) {
       return getPropertyOfUnionOrIntersectionType(type, name, skipObjectFunctionPropertyAugment);
     }
     return void 0;
@@ -71986,41 +71962,75 @@ function createTypeChecker(host) {
     return mapType(
       type,
       (t) => {
-        var _a;
-        if (isGenericMappedType(t) && !t.declaration.nameType) {
-          const constraint = getConstraintTypeFromMappedType(t);
-          const constraintOfConstraint = getBaseConstraintOfType(constraint) || constraint;
-          const propertyNameType = nameType || getStringLiteralType(unescapeLeadingUnderscores(name));
-          if (isTypeAssignableTo(propertyNameType, constraintOfConstraint)) {
-            return substituteIndexedMappedType(t, propertyNameType);
-          }
-        } else if (t.flags & 3670016 /* StructuredType */) {
-          const prop = getPropertyOfType(t, name);
-          if (prop) {
-            return isCircularMappedProperty(prop) ? void 0 : getTypeOfSymbol(prop);
-          }
-          if (isTupleType(t) && isNumericLiteralName(name) && +name >= 0) {
-            const restType = getElementTypeOfSliceOfTupleType(
-              t,
-              t.target.fixedLength,
-              /*endSkipCount*/
-              0,
-              /*writing*/
-              false,
-              /*noReductions*/
-              true
-            );
-            if (restType) {
-              return restType;
+        if (!(t.flags & 3670016 /* StructuredType */)) {
+          return void 0;
+        }
+        if (t.flags & 2097152 /* Intersection */) {
+          const intersection = t;
+          let applicableIndexedMappedTypeSubstitions;
+          let concretePropertyTypes;
+          let applicableIndexInfoCandidates;
+          for (const t2 of intersection.types) {
+            if (isGenericMappedType(t2) && !t2.declaration.nameType) {
+              applicableIndexedMappedTypeSubstitions = append(applicableIndexedMappedTypeSubstitions, getTypeOfApplicableIndexedMappedTypeSubstitutionOfContextualType(t2));
+              continue;
             }
+            const typeOfConcreteProperty = getTypeOfConcretePropertyOfContextualType(t2);
+            if (typeOfConcreteProperty) {
+              concretePropertyTypes = append(concretePropertyTypes, typeOfConcreteProperty);
+              continue;
+            }
+            applicableIndexInfoCandidates = append(applicableIndexInfoCandidates, t2);
+          }
+          if (concretePropertyTypes) {
+            return getIntersectionType(concatenate(concretePropertyTypes, applicableIndexedMappedTypeSubstitions));
+          }
+          const types = concatenate(mapDefined(applicableIndexInfoCandidates, getTypeOfApplicableIndexInfoOfContextualType), applicableIndexedMappedTypeSubstitions);
+          if (types.length > 0) {
+            return getIntersectionType(types);
           }
-          return (_a = findApplicableIndexInfo(getIndexInfosOfStructuredType(t), nameType || getStringLiteralType(unescapeLeadingUnderscores(name)))) == null ? void 0 : _a.type;
+          return void 0;
         }
-        return void 0;
+        return isGenericMappedType(t) && !t.declaration.nameType ? getTypeOfApplicableIndexedMappedTypeSubstitutionOfContextualType(t) : getTypeOfConcretePropertyOfContextualType(t) || getTypeOfApplicableIndexInfoOfContextualType(t);
       },
       /*noReductions*/
       true
     );
+    function getTypeOfApplicableIndexedMappedTypeSubstitutionOfContextualType(t) {
+      const constraint = getConstraintTypeFromMappedType(t);
+      const constraintOfConstraint = getBaseConstraintOfType(constraint) || constraint;
+      const propertyNameType = nameType || getStringLiteralType(unescapeLeadingUnderscores(name));
+      if (isTypeAssignableTo(propertyNameType, constraintOfConstraint)) {
+        return substituteIndexedMappedType(t, propertyNameType);
+      }
+      return void 0;
+    }
+    function getTypeOfConcretePropertyOfContextualType(t) {
+      const prop = getPropertyOfType(t, name);
+      if (prop) {
+        return isCircularMappedProperty(prop) ? void 0 : getTypeOfSymbol(prop);
+      }
+      if (isTupleType(t) && isNumericLiteralName(name) && +name >= 0) {
+        const restType = getElementTypeOfSliceOfTupleType(
+          t,
+          t.target.fixedLength,
+          /*endSkipCount*/
+          0,
+          /*writing*/
+          false,
+          /*noReductions*/
+          true
+        );
+        if (restType) {
+          return restType;
+        }
+      }
+      return void 0;
+    }
+    function getTypeOfApplicableIndexInfoOfContextualType(t) {
+      var _a;
+      return (_a = findApplicableIndexInfo(getIndexInfosOfStructuredType(t), nameType || getStringLiteralType(unescapeLeadingUnderscores(name)))) == null ? void 0 : _a.type;
+    }
   }
   function getContextualTypeForObjectLiteralMethod(node, contextFlags) {
     Debug.assert(isObjectLiteralMethod(node));

package/lib/tsserverlibrary.js

@@ -56388,12 +56388,7 @@ ${lanes.join("\n")}
         for (const current of type.types) {
           for (const prop of getPropertiesOfType(current)) {
             if (!members.has(prop.escapedName)) {
-              const combinedProp = getPropertyOfUnionOrIntersectionType(
-                type,
-                prop.escapedName,
-                /*skipObjectFunctionPropertyAugment*/
-                !!(type.flags & 2097152 /* Intersection */)
-              );
+              const combinedProp = getPropertyOfUnionOrIntersectionType(type, prop.escapedName);
               if (combinedProp) {
                 members.set(prop.escapedName, combinedProp);
               }
@@ -56873,17 +56868,13 @@ ${lanes.join("\n")}
       return result;
     }
     function getUnionOrIntersectionProperty(type, name, skipObjectFunctionPropertyAugment) {
-      var _a, _b, _c;
+      var _a, _b;
       let property = ((_a = type.propertyCacheWithoutObjectFunctionPropertyAugment) == null ? void 0 : _a.get(name)) || !skipObjectFunctionPropertyAugment ? (_b = type.propertyCache) == null ? void 0 : _b.get(name) : void 0;
       if (!property) {
         property = createUnionOrIntersectionProperty(type, name, skipObjectFunctionPropertyAugment);
         if (property) {
           const properties = skipObjectFunctionPropertyAugment ? type.propertyCacheWithoutObjectFunctionPropertyAugment || (type.propertyCacheWithoutObjectFunctionPropertyAugment = createSymbolTable()) : type.propertyCache || (type.propertyCache = createSymbolTable());
           properties.set(name, property);
-          if (skipObjectFunctionPropertyAugment && !((_c = type.propertyCache) == null ? void 0 : _c.get(name))) {
-            const properties2 = type.propertyCache || (type.propertyCache = createSymbolTable());
-            properties2.set(name, property);
-          }
         }
       }
       return property;
@@ -57003,22 +56994,7 @@ ${lanes.join("\n")}
         }
         return getPropertyOfObjectType(globalObjectType, name);
       }
-      if (type.flags & 2097152 /* Intersection */) {
-        const prop = getPropertyOfUnionOrIntersectionType(
-          type,
-          name,
-          /*skipObjectFunctionPropertyAugment*/
-          true
-        );
-        if (prop) {
-          return prop;
-        }
-        if (!skipObjectFunctionPropertyAugment) {
-          return getPropertyOfUnionOrIntersectionType(type, name, skipObjectFunctionPropertyAugment);
-        }
-        return void 0;
-      }
-      if (type.flags & 1048576 /* Union */) {
+      if (type.flags & 3145728 /* UnionOrIntersection */) {
         return getPropertyOfUnionOrIntersectionType(type, name, skipObjectFunctionPropertyAugment);
       }
       return void 0;
@@ -69751,41 +69727,75 @@ ${lanes.join("\n")}
       return mapType(
         type,
         (t) => {
-          var _a;
-          if (isGenericMappedType(t) && !t.declaration.nameType) {
-            const constraint = getConstraintTypeFromMappedType(t);
-            const constraintOfConstraint = getBaseConstraintOfType(constraint) || constraint;
-            const propertyNameType = nameType || getStringLiteralType(unescapeLeadingUnderscores(name));
-            if (isTypeAssignableTo(propertyNameType, constraintOfConstraint)) {
-              return substituteIndexedMappedType(t, propertyNameType);
-            }
-          } else if (t.flags & 3670016 /* StructuredType */) {
-            const prop = getPropertyOfType(t, name);
-            if (prop) {
-              return isCircularMappedProperty(prop) ? void 0 : getTypeOfSymbol(prop);
-            }
-            if (isTupleType(t) && isNumericLiteralName(name) && +name >= 0) {
-              const restType = getElementTypeOfSliceOfTupleType(
-                t,
-                t.target.fixedLength,
-                /*endSkipCount*/
-                0,
-                /*writing*/
-                false,
-                /*noReductions*/
-                true
-              );
-              if (restType) {
-                return restType;
+          if (!(t.flags & 3670016 /* StructuredType */)) {
+            return void 0;
+          }
+          if (t.flags & 2097152 /* Intersection */) {
+            const intersection = t;
+            let applicableIndexedMappedTypeSubstitions;
+            let concretePropertyTypes;
+            let applicableIndexInfoCandidates;
+            for (const t2 of intersection.types) {
+              if (isGenericMappedType(t2) && !t2.declaration.nameType) {
+                applicableIndexedMappedTypeSubstitions = append(applicableIndexedMappedTypeSubstitions, getTypeOfApplicableIndexedMappedTypeSubstitutionOfContextualType(t2));
+                continue;
               }
+              const typeOfConcreteProperty = getTypeOfConcretePropertyOfContextualType(t2);
+              if (typeOfConcreteProperty) {
+                concretePropertyTypes = append(concretePropertyTypes, typeOfConcreteProperty);
+                continue;
+              }
+              applicableIndexInfoCandidates = append(applicableIndexInfoCandidates, t2);
+            }
+            if (concretePropertyTypes) {
+              return getIntersectionType(concatenate(concretePropertyTypes, applicableIndexedMappedTypeSubstitions));
+            }
+            const types = concatenate(mapDefined(applicableIndexInfoCandidates, getTypeOfApplicableIndexInfoOfContextualType), applicableIndexedMappedTypeSubstitions);
+            if (types.length > 0) {
+              return getIntersectionType(types);
             }
-            return (_a = findApplicableIndexInfo(getIndexInfosOfStructuredType(t), nameType || getStringLiteralType(unescapeLeadingUnderscores(name)))) == null ? void 0 : _a.type;
+            return void 0;
           }
-          return void 0;
+          return isGenericMappedType(t) && !t.declaration.nameType ? getTypeOfApplicableIndexedMappedTypeSubstitutionOfContextualType(t) : getTypeOfConcretePropertyOfContextualType(t) || getTypeOfApplicableIndexInfoOfContextualType(t);
         },
         /*noReductions*/
         true
       );
+      function getTypeOfApplicableIndexedMappedTypeSubstitutionOfContextualType(t) {
+        const constraint = getConstraintTypeFromMappedType(t);
+        const constraintOfConstraint = getBaseConstraintOfType(constraint) || constraint;
+        const propertyNameType = nameType || getStringLiteralType(unescapeLeadingUnderscores(name));
+        if (isTypeAssignableTo(propertyNameType, constraintOfConstraint)) {
+          return substituteIndexedMappedType(t, propertyNameType);
+        }
+        return void 0;
+      }
+      function getTypeOfConcretePropertyOfContextualType(t) {
+        const prop = getPropertyOfType(t, name);
+        if (prop) {
+          return isCircularMappedProperty(prop) ? void 0 : getTypeOfSymbol(prop);
+        }
+        if (isTupleType(t) && isNumericLiteralName(name) && +name >= 0) {
+          const restType = getElementTypeOfSliceOfTupleType(
+            t,
+            t.target.fixedLength,
+            /*endSkipCount*/
+            0,
+            /*writing*/
+            false,
+            /*noReductions*/
+            true
+          );
+          if (restType) {
+            return restType;
+          }
+        }
+        return void 0;
+      }
+      function getTypeOfApplicableIndexInfoOfContextualType(t) {
+        var _a;
+        return (_a = findApplicableIndexInfo(getIndexInfosOfStructuredType(t), nameType || getStringLiteralType(unescapeLeadingUnderscores(name)))) == null ? void 0 : _a.type;
+      }
     }
     function getContextualTypeForObjectLiteralMethod(node, contextFlags) {
       Debug.assert(isObjectLiteralMethod(node));

package/lib/typescript.js

@@ -56388,12 +56388,7 @@ ${lanes.join("\n")}
         for (const current of type.types) {
           for (const prop of getPropertiesOfType(current)) {
             if (!members.has(prop.escapedName)) {
-              const combinedProp = getPropertyOfUnionOrIntersectionType(
-                type,
-                prop.escapedName,
-                /*skipObjectFunctionPropertyAugment*/
-                !!(type.flags & 2097152 /* Intersection */)
-              );
+              const combinedProp = getPropertyOfUnionOrIntersectionType(type, prop.escapedName);
               if (combinedProp) {
                 members.set(prop.escapedName, combinedProp);
               }
@@ -56873,17 +56868,13 @@ ${lanes.join("\n")}
       return result;
     }
     function getUnionOrIntersectionProperty(type, name, skipObjectFunctionPropertyAugment) {
-      var _a, _b, _c;
+      var _a, _b;
       let property = ((_a = type.propertyCacheWithoutObjectFunctionPropertyAugment) == null ? void 0 : _a.get(name)) || !skipObjectFunctionPropertyAugment ? (_b = type.propertyCache) == null ? void 0 : _b.get(name) : void 0;
       if (!property) {
         property = createUnionOrIntersectionProperty(type, name, skipObjectFunctionPropertyAugment);
         if (property) {
           const properties = skipObjectFunctionPropertyAugment ? type.propertyCacheWithoutObjectFunctionPropertyAugment || (type.propertyCacheWithoutObjectFunctionPropertyAugment = createSymbolTable()) : type.propertyCache || (type.propertyCache = createSymbolTable());
           properties.set(name, property);
-          if (skipObjectFunctionPropertyAugment && !((_c = type.propertyCache) == null ? void 0 : _c.get(name))) {
-            const properties2 = type.propertyCache || (type.propertyCache = createSymbolTable());
-            properties2.set(name, property);
-          }
         }
       }
       return property;
@@ -57003,22 +56994,7 @@ ${lanes.join("\n")}
         }
         return getPropertyOfObjectType(globalObjectType, name);
       }
-      if (type.flags & 2097152 /* Intersection */) {
-        const prop = getPropertyOfUnionOrIntersectionType(
-          type,
-          name,
-          /*skipObjectFunctionPropertyAugment*/
-          true
-        );
-        if (prop) {
-          return prop;
-        }
-        if (!skipObjectFunctionPropertyAugment) {
-          return getPropertyOfUnionOrIntersectionType(type, name, skipObjectFunctionPropertyAugment);
-        }
-        return void 0;
-      }
-      if (type.flags & 1048576 /* Union */) {
+      if (type.flags & 3145728 /* UnionOrIntersection */) {
         return getPropertyOfUnionOrIntersectionType(type, name, skipObjectFunctionPropertyAugment);
       }
       return void 0;
@@ -69751,41 +69727,75 @@ ${lanes.join("\n")}
       return mapType(
         type,
         (t) => {
-          var _a;
-          if (isGenericMappedType(t) && !t.declaration.nameType) {
-            const constraint = getConstraintTypeFromMappedType(t);
-            const constraintOfConstraint = getBaseConstraintOfType(constraint) || constraint;
-            const propertyNameType = nameType || getStringLiteralType(unescapeLeadingUnderscores(name));
-            if (isTypeAssignableTo(propertyNameType, constraintOfConstraint)) {
-              return substituteIndexedMappedType(t, propertyNameType);
-            }
-          } else if (t.flags & 3670016 /* StructuredType */) {
-            const prop = getPropertyOfType(t, name);
-            if (prop) {
-              return isCircularMappedProperty(prop) ? void 0 : getTypeOfSymbol(prop);
-            }
-            if (isTupleType(t) && isNumericLiteralName(name) && +name >= 0) {
-              const restType = getElementTypeOfSliceOfTupleType(
-                t,
-                t.target.fixedLength,
-                /*endSkipCount*/
-                0,
-                /*writing*/
-                false,
-                /*noReductions*/
-                true
-              );
-              if (restType) {
-                return restType;
+          if (!(t.flags & 3670016 /* StructuredType */)) {
+            return void 0;
+          }
+          if (t.flags & 2097152 /* Intersection */) {
+            const intersection = t;
+            let applicableIndexedMappedTypeSubstitions;
+            let concretePropertyTypes;
+            let applicableIndexInfoCandidates;
+            for (const t2 of intersection.types) {
+              if (isGenericMappedType(t2) && !t2.declaration.nameType) {
+                applicableIndexedMappedTypeSubstitions = append(applicableIndexedMappedTypeSubstitions, getTypeOfApplicableIndexedMappedTypeSubstitutionOfContextualType(t2));
+                continue;
               }
+              const typeOfConcreteProperty = getTypeOfConcretePropertyOfContextualType(t2);
+              if (typeOfConcreteProperty) {
+                concretePropertyTypes = append(concretePropertyTypes, typeOfConcreteProperty);
+                continue;
+              }
+              applicableIndexInfoCandidates = append(applicableIndexInfoCandidates, t2);
+            }
+            if (concretePropertyTypes) {
+              return getIntersectionType(concatenate(concretePropertyTypes, applicableIndexedMappedTypeSubstitions));
+            }
+            const types = concatenate(mapDefined(applicableIndexInfoCandidates, getTypeOfApplicableIndexInfoOfContextualType), applicableIndexedMappedTypeSubstitions);
+            if (types.length > 0) {
+              return getIntersectionType(types);
             }
-            return (_a = findApplicableIndexInfo(getIndexInfosOfStructuredType(t), nameType || getStringLiteralType(unescapeLeadingUnderscores(name)))) == null ? void 0 : _a.type;
+            return void 0;
           }
-          return void 0;
+          return isGenericMappedType(t) && !t.declaration.nameType ? getTypeOfApplicableIndexedMappedTypeSubstitutionOfContextualType(t) : getTypeOfConcretePropertyOfContextualType(t) || getTypeOfApplicableIndexInfoOfContextualType(t);
         },
         /*noReductions*/
         true
       );
+      function getTypeOfApplicableIndexedMappedTypeSubstitutionOfContextualType(t) {
+        const constraint = getConstraintTypeFromMappedType(t);
+        const constraintOfConstraint = getBaseConstraintOfType(constraint) || constraint;
+        const propertyNameType = nameType || getStringLiteralType(unescapeLeadingUnderscores(name));
+        if (isTypeAssignableTo(propertyNameType, constraintOfConstraint)) {
+          return substituteIndexedMappedType(t, propertyNameType);
+        }
+        return void 0;
+      }
+      function getTypeOfConcretePropertyOfContextualType(t) {
+        const prop = getPropertyOfType(t, name);
+        if (prop) {
+          return isCircularMappedProperty(prop) ? void 0 : getTypeOfSymbol(prop);
+        }
+        if (isTupleType(t) && isNumericLiteralName(name) && +name >= 0) {
+          const restType = getElementTypeOfSliceOfTupleType(
+            t,
+            t.target.fixedLength,
+            /*endSkipCount*/
+            0,
+            /*writing*/
+            false,
+            /*noReductions*/
+            true
+          );
+          if (restType) {
+            return restType;
+          }
+        }
+        return void 0;
+      }
+      function getTypeOfApplicableIndexInfoOfContextualType(t) {
+        var _a;
+        return (_a = findApplicableIndexInfo(getIndexInfosOfStructuredType(t), nameType || getStringLiteralType(unescapeLeadingUnderscores(name)))) == null ? void 0 : _a.type;
+      }
     }
     function getContextualTypeForObjectLiteralMethod(node, contextFlags) {
       Debug.assert(isObjectLiteralMethod(node));

package/package.json

@@ -2,7 +2,7 @@
   "name": "@typescript-deploys/pr-build",
   "author": "Microsoft Corp.",
   "homepage": "https://www.typescriptlang.org/",
-  "version": "5.2.0-pr-54753-32",
+  "version": "5.2.0-pr-52095-19",
   "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": "c0de1c1946fa712793c87b058898fb22d4a474d1"
+  "gitHead": "4c71532aed3e7c13c47ac849a5161e466ec26773"
 }