@typescript-deploys/pr-build 5.2.0-pr-54753-25 → 5.2.0-pr-55152-2

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;
@@ -59827,6 +59803,7 @@ function createTypeChecker(host) {
     let overrideNextErrorInfo = 0;
     let lastSkippedInfo;
     let incompatibleStack;
+    let skipParentCounter = 0;
     Debug.assert(relation !== identityRelation || !errorNode, "no error reporting in identity checking");
     const result = isRelatedTo(
       source,
@@ -60002,7 +59979,15 @@ function createTypeChecker(host) {
         reportIncompatibleStack();
       if (message.elidedInCompatabilityPyramid)
         return;
-      errorInfo = chainDiagnosticMessages(errorInfo, message, ...args);
+      if (skipParentCounter === 0) {
+        errorInfo = chainDiagnosticMessages(errorInfo, message, ...args);
+      } else {
+        skipParentCounter--;
+      }
+    }
+    function reportParentSkippedError(message, ...args) {
+      reportError(message, ...args);
+      skipParentCounter++;
     }
     function associateRelatedInfo(info) {
       Debug.assert(!!errorInfo);
@@ -60339,14 +60324,14 @@ function createTypeChecker(host) {
                   }
                 }
                 if (suggestion !== void 0) {
-                  reportError(
+                  reportParentSkippedError(
                     Diagnostics.Object_literal_may_only_specify_known_properties_but_0_does_not_exist_in_type_1_Did_you_mean_to_write_2,
                     symbolToString(prop),
                     typeToString(errorTarget),
                     suggestion
                   );
                 } else {
-                  reportError(
+                  reportParentSkippedError(
                     Diagnostics.Object_literal_may_only_specify_known_properties_and_0_does_not_exist_in_type_1,
                     symbolToString(prop),
                     typeToString(errorTarget)

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;
@@ -64536,6 +64512,7 @@ function createTypeChecker(host) {
     let overrideNextErrorInfo = 0;
     let lastSkippedInfo;
     let incompatibleStack;
+    let skipParentCounter = 0;
     Debug.assert(relation !== identityRelation || !errorNode, "no error reporting in identity checking");
     const result = isRelatedTo(
       source,
@@ -64711,7 +64688,15 @@ function createTypeChecker(host) {
         reportIncompatibleStack();
       if (message.elidedInCompatabilityPyramid)
         return;
-      errorInfo = chainDiagnosticMessages(errorInfo, message, ...args);
+      if (skipParentCounter === 0) {
+        errorInfo = chainDiagnosticMessages(errorInfo, message, ...args);
+      } else {
+        skipParentCounter--;
+      }
+    }
+    function reportParentSkippedError(message, ...args) {
+      reportError(message, ...args);
+      skipParentCounter++;
     }
     function associateRelatedInfo(info) {
       Debug.assert(!!errorInfo);
@@ -65048,14 +65033,14 @@ function createTypeChecker(host) {
                   }
                 }
                 if (suggestion !== void 0) {
-                  reportError(
+                  reportParentSkippedError(
                     Diagnostics.Object_literal_may_only_specify_known_properties_but_0_does_not_exist_in_type_1_Did_you_mean_to_write_2,
                     symbolToString(prop),
                     typeToString(errorTarget),
                     suggestion
                   );
                 } else {
-                  reportError(
+                  reportParentSkippedError(
                     Diagnostics.Object_literal_may_only_specify_known_properties_and_0_does_not_exist_in_type_1,
                     symbolToString(prop),
                     typeToString(errorTarget)

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;
@@ -62301,6 +62277,7 @@ ${lanes.join("\n")}
       let overrideNextErrorInfo = 0;
       let lastSkippedInfo;
       let incompatibleStack;
+      let skipParentCounter = 0;
       Debug.assert(relation !== identityRelation || !errorNode, "no error reporting in identity checking");
       const result = isRelatedTo(
         source,
@@ -62476,7 +62453,15 @@ ${lanes.join("\n")}
           reportIncompatibleStack();
         if (message.elidedInCompatabilityPyramid)
           return;
-        errorInfo = chainDiagnosticMessages(errorInfo, message, ...args);
+        if (skipParentCounter === 0) {
+          errorInfo = chainDiagnosticMessages(errorInfo, message, ...args);
+        } else {
+          skipParentCounter--;
+        }
+      }
+      function reportParentSkippedError(message, ...args) {
+        reportError(message, ...args);
+        skipParentCounter++;
       }
       function associateRelatedInfo(info) {
         Debug.assert(!!errorInfo);
@@ -62813,14 +62798,14 @@ ${lanes.join("\n")}
                     }
                   }
                   if (suggestion !== void 0) {
-                    reportError(
+                    reportParentSkippedError(
                       Diagnostics.Object_literal_may_only_specify_known_properties_but_0_does_not_exist_in_type_1_Did_you_mean_to_write_2,
                       symbolToString(prop),
                       typeToString(errorTarget),
                       suggestion
                     );
                   } else {
-                    reportError(
+                    reportParentSkippedError(
                       Diagnostics.Object_literal_may_only_specify_known_properties_and_0_does_not_exist_in_type_1,
                       symbolToString(prop),
                       typeToString(errorTarget)

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;
@@ -62301,6 +62277,7 @@ ${lanes.join("\n")}
       let overrideNextErrorInfo = 0;
       let lastSkippedInfo;
       let incompatibleStack;
+      let skipParentCounter = 0;
       Debug.assert(relation !== identityRelation || !errorNode, "no error reporting in identity checking");
       const result = isRelatedTo(
         source,
@@ -62476,7 +62453,15 @@ ${lanes.join("\n")}
           reportIncompatibleStack();
         if (message.elidedInCompatabilityPyramid)
           return;
-        errorInfo = chainDiagnosticMessages(errorInfo, message, ...args);
+        if (skipParentCounter === 0) {
+          errorInfo = chainDiagnosticMessages(errorInfo, message, ...args);
+        } else {
+          skipParentCounter--;
+        }
+      }
+      function reportParentSkippedError(message, ...args) {
+        reportError(message, ...args);
+        skipParentCounter++;
       }
       function associateRelatedInfo(info) {
         Debug.assert(!!errorInfo);
@@ -62813,14 +62798,14 @@ ${lanes.join("\n")}
                     }
                   }
                   if (suggestion !== void 0) {
-                    reportError(
+                    reportParentSkippedError(
                       Diagnostics.Object_literal_may_only_specify_known_properties_but_0_does_not_exist_in_type_1_Did_you_mean_to_write_2,
                       symbolToString(prop),
                       typeToString(errorTarget),
                       suggestion
                     );
                   } else {
-                    reportError(
+                    reportParentSkippedError(
                       Diagnostics.Object_literal_may_only_specify_known_properties_and_0_does_not_exist_in_type_1,
                       symbolToString(prop),
                       typeToString(errorTarget)

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-25",
+  "version": "5.2.0-pr-55152-2",
   "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": "4e746373c1770c712d9801932e5188ab7bc6447e"
 }