typescript 5.5.0-dev.20240502 → 5.5.0-dev.20240503

package/lib/tsc.js

@@ -18,7 +18,7 @@ and limitations under the License.
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.5";
-var version = `${versionMajorMinor}.0-dev.20240502`;
+var version = `${versionMajorMinor}.0-dev.20240503`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -56906,7 +56906,7 @@ function createTypeChecker(host) {
         }
       }
       return getNormalizedType(
-        getIntersectionType(constraints),
+        getIntersectionType(constraints, 2 /* NoConstraintReduction */),
         /*writing*/
         false
       );
@@ -59711,7 +59711,7 @@ function createTypeChecker(host) {
     result.aliasTypeArguments = aliasTypeArguments;
     return result;
   }
-  function getIntersectionType(types, aliasSymbol, aliasTypeArguments, noSupertypeReduction) {
+  function getIntersectionType(types, flags = 0 /* None */, aliasSymbol, aliasTypeArguments) {
     const typeMembershipMap = /* @__PURE__ */ new Map();
     const includes = addTypesToIntersection(typeMembershipMap, 0, types);
     const typeSet = arrayFrom(typeMembershipMap.values());
@@ -59732,7 +59732,7 @@ function createTypeChecker(host) {
       return includes & 16777216 /* IncludesEmptyObject */ ? neverType : includes & 32768 /* Undefined */ ? undefinedType : nullType;
     }
     if (includes & 4 /* String */ && includes & (128 /* StringLiteral */ | 134217728 /* TemplateLiteral */ | 268435456 /* StringMapping */) || includes & 8 /* Number */ && includes & 256 /* NumberLiteral */ || includes & 64 /* BigInt */ && includes & 2048 /* BigIntLiteral */ || includes & 4096 /* ESSymbol */ && includes & 8192 /* UniqueESSymbol */ || includes & 16384 /* Void */ && includes & 32768 /* Undefined */ || includes & 16777216 /* IncludesEmptyObject */ && includes & 470302716 /* DefinitelyNonNullable */) {
-      if (!noSupertypeReduction)
+      if (!(flags & 1 /* NoSupertypeReduction */))
         removeRedundantSupertypes(typeSet, includes);
     }
     if (includes & 262144 /* IncludesMissingType */) {
@@ -59744,7 +59744,7 @@ function createTypeChecker(host) {
     if (typeSet.length === 1) {
       return typeSet[0];
     }
-    if (typeSet.length === 2) {
+    if (typeSet.length === 2 && !(flags & 2 /* NoConstraintReduction */)) {
       const typeVarIndex = typeSet[0].flags & 8650752 /* TypeVariable */ ? 0 : 1;
       const typeVariable = typeSet[typeVarIndex];
       const primitiveType = typeSet[1 - typeVarIndex];
@@ -59763,27 +59763,27 @@ function createTypeChecker(host) {
         }
       }
     }
-    const id = getTypeListId(typeSet) + getAliasId(aliasSymbol, aliasTypeArguments);
+    const id = getTypeListId(typeSet) + (flags & 2 /* NoConstraintReduction */ ? "*" : getAliasId(aliasSymbol, aliasTypeArguments));
     let result = intersectionTypes.get(id);
     if (!result) {
       if (includes & 1048576 /* Union */) {
         if (intersectUnionsOfPrimitiveTypes(typeSet)) {
-          result = getIntersectionType(typeSet, aliasSymbol, aliasTypeArguments);
+          result = getIntersectionType(typeSet, flags, aliasSymbol, aliasTypeArguments);
         } else if (every(typeSet, (t) => !!(t.flags & 1048576 /* Union */ && t.types[0].flags & 32768 /* Undefined */))) {
           const containedUndefinedType = some(typeSet, containsMissingType) ? missingType : undefinedType;
           removeFromEach(typeSet, 32768 /* Undefined */);
-          result = getUnionType([getIntersectionType(typeSet), containedUndefinedType], 1 /* Literal */, aliasSymbol, aliasTypeArguments);
+          result = getUnionType([getIntersectionType(typeSet, flags), containedUndefinedType], 1 /* Literal */, aliasSymbol, aliasTypeArguments);
         } else if (every(typeSet, (t) => !!(t.flags & 1048576 /* Union */ && (t.types[0].flags & 65536 /* Null */ || t.types[1].flags & 65536 /* Null */)))) {
           removeFromEach(typeSet, 65536 /* Null */);
-          result = getUnionType([getIntersectionType(typeSet), nullType], 1 /* Literal */, aliasSymbol, aliasTypeArguments);
+          result = getUnionType([getIntersectionType(typeSet, flags), nullType], 1 /* Literal */, aliasSymbol, aliasTypeArguments);
         } else if (typeSet.length >= 4) {
           const middle = Math.floor(typeSet.length / 2);
-          result = getIntersectionType([getIntersectionType(typeSet.slice(0, middle)), getIntersectionType(typeSet.slice(middle))], aliasSymbol, aliasTypeArguments);
+          result = getIntersectionType([getIntersectionType(typeSet.slice(0, middle), flags), getIntersectionType(typeSet.slice(middle), flags)], flags, aliasSymbol, aliasTypeArguments);
         } else {
           if (!checkCrossProductUnion(typeSet)) {
             return errorType;
           }
-          const constituents = getCrossProductIntersections(typeSet);
+          const constituents = getCrossProductIntersections(typeSet, flags);
           const origin = some(constituents, (t) => !!(t.flags & 2097152 /* Intersection */)) && getConstituentCountOfTypes(constituents) > getConstituentCountOfTypes(typeSet) ? createOriginUnionOrIntersectionType(2097152 /* Intersection */, typeSet) : void 0;
           result = getUnionType(constituents, 1 /* Literal */, aliasSymbol, aliasTypeArguments, origin);
         }
@@ -59807,7 +59807,7 @@ function createTypeChecker(host) {
     }
     return true;
   }
-  function getCrossProductIntersections(types) {
+  function getCrossProductIntersections(types, flags) {
     const count = getCrossProductUnionSize(types);
     const intersections = [];
     for (let i = 0; i < count; i++) {
@@ -59821,7 +59821,7 @@ function createTypeChecker(host) {
           n = Math.floor(n / length2);
         }
       }
-      const t = getIntersectionType(constituents);
+      const t = getIntersectionType(constituents, flags);
       if (!(t.flags & 131072 /* Never */))
         intersections.push(t);
     }
@@ -59841,7 +59841,7 @@ function createTypeChecker(host) {
       const emptyIndex = types.length === 2 ? types.indexOf(emptyTypeLiteralType) : -1;
       const t = emptyIndex >= 0 ? types[1 - emptyIndex] : unknownType;
       const noSupertypeReduction = !!(t.flags & (4 /* String */ | 8 /* Number */ | 64 /* BigInt */) || t.flags & 134217728 /* TemplateLiteral */ && isPatternLiteralType(t));
-      links.resolvedType = getIntersectionType(types, aliasSymbol, getTypeArgumentsForAliasSymbol(aliasSymbol), noSupertypeReduction);
+      links.resolvedType = getIntersectionType(types, noSupertypeReduction ? 1 /* NoSupertypeReduction */ : 0, aliasSymbol, getTypeArgumentsForAliasSymbol(aliasSymbol));
     }
     return links.resolvedType;
   }
@@ -60532,7 +60532,7 @@ function createTypeChecker(host) {
       if (wasMissingProp) {
         return void 0;
       }
-      return accessFlags & 4 /* Writing */ ? getIntersectionType(propTypes, aliasSymbol, aliasTypeArguments) : getUnionType(propTypes, 1 /* Literal */, aliasSymbol, aliasTypeArguments);
+      return accessFlags & 4 /* Writing */ ? getIntersectionType(propTypes, 0 /* None */, aliasSymbol, aliasTypeArguments) : getUnionType(propTypes, 1 /* Literal */, aliasSymbol, aliasTypeArguments);
     }
     return getPropertyTypeForIndexType(objectType, apparentObjectType, indexType, indexType, accessNode, accessFlags | 8 /* CacheSymbol */ | 64 /* ReportDeprecated */);
   }
@@ -61656,7 +61656,7 @@ function createTypeChecker(host) {
       }
       const newAliasSymbol = aliasSymbol || type.aliasSymbol;
       const newAliasTypeArguments = aliasSymbol ? aliasTypeArguments : instantiateTypes(type.aliasTypeArguments, mapper);
-      return flags & 2097152 /* Intersection */ || origin && origin.flags & 2097152 /* Intersection */ ? getIntersectionType(newTypes, newAliasSymbol, newAliasTypeArguments) : getUnionType(newTypes, 1 /* Literal */, newAliasSymbol, newAliasTypeArguments);
+      return flags & 2097152 /* Intersection */ || origin && origin.flags & 2097152 /* Intersection */ ? getIntersectionType(newTypes, 0 /* None */, newAliasSymbol, newAliasTypeArguments) : getUnionType(newTypes, 1 /* Literal */, newAliasSymbol, newAliasTypeArguments);
     }
     if (flags & 4194304 /* Index */) {
       return getIndexType(instantiateType(type.type, mapper));

package/lib/typescript.js

@@ -99,6 +99,7 @@ __export(typescript_exports, {
   InlayHints: () => ts_InlayHints_exports,
   InternalEmitFlags: () => InternalEmitFlags,
   InternalSymbolName: () => InternalSymbolName,
+  IntersectionFlags: () => IntersectionFlags,
   InvalidatedProjectKind: () => InvalidatedProjectKind,
   JSDocParsingMode: () => JSDocParsingMode,
   JsDoc: () => ts_JsDoc_exports,
@@ -2363,7 +2364,7 @@ module.exports = __toCommonJS(typescript_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.5";
-var version = `${versionMajorMinor}.0-dev.20240502`;
+var version = `${versionMajorMinor}.0-dev.20240503`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -6390,6 +6391,12 @@ var UnionReduction = /* @__PURE__ */ ((UnionReduction2) => {
   UnionReduction2[UnionReduction2["Subtype"] = 2] = "Subtype";
   return UnionReduction2;
 })(UnionReduction || {});
+var IntersectionFlags = /* @__PURE__ */ ((IntersectionFlags2) => {
+  IntersectionFlags2[IntersectionFlags2["None"] = 0] = "None";
+  IntersectionFlags2[IntersectionFlags2["NoSupertypeReduction"] = 1] = "NoSupertypeReduction";
+  IntersectionFlags2[IntersectionFlags2["NoConstraintReduction"] = 2] = "NoConstraintReduction";
+  return IntersectionFlags2;
+})(IntersectionFlags || {});
 var ContextFlags = /* @__PURE__ */ ((ContextFlags3) => {
   ContextFlags3[ContextFlags3["None"] = 0] = "None";
   ContextFlags3[ContextFlags3["Signature"] = 1] = "Signature";
@@ -61739,7 +61746,7 @@ function createTypeChecker(host) {
         }
       }
       return getNormalizedType(
-        getIntersectionType(constraints),
+        getIntersectionType(constraints, 2 /* NoConstraintReduction */),
         /*writing*/
         false
       );
@@ -64544,7 +64551,7 @@ function createTypeChecker(host) {
     result.aliasTypeArguments = aliasTypeArguments;
     return result;
   }
-  function getIntersectionType(types, aliasSymbol, aliasTypeArguments, noSupertypeReduction) {
+  function getIntersectionType(types, flags = 0 /* None */, aliasSymbol, aliasTypeArguments) {
     const typeMembershipMap = /* @__PURE__ */ new Map();
     const includes = addTypesToIntersection(typeMembershipMap, 0, types);
     const typeSet = arrayFrom(typeMembershipMap.values());
@@ -64565,7 +64572,7 @@ function createTypeChecker(host) {
       return includes & 16777216 /* IncludesEmptyObject */ ? neverType : includes & 32768 /* Undefined */ ? undefinedType : nullType;
     }
     if (includes & 4 /* String */ && includes & (128 /* StringLiteral */ | 134217728 /* TemplateLiteral */ | 268435456 /* StringMapping */) || includes & 8 /* Number */ && includes & 256 /* NumberLiteral */ || includes & 64 /* BigInt */ && includes & 2048 /* BigIntLiteral */ || includes & 4096 /* ESSymbol */ && includes & 8192 /* UniqueESSymbol */ || includes & 16384 /* Void */ && includes & 32768 /* Undefined */ || includes & 16777216 /* IncludesEmptyObject */ && includes & 470302716 /* DefinitelyNonNullable */) {
-      if (!noSupertypeReduction)
+      if (!(flags & 1 /* NoSupertypeReduction */))
         removeRedundantSupertypes(typeSet, includes);
     }
     if (includes & 262144 /* IncludesMissingType */) {
@@ -64577,7 +64584,7 @@ function createTypeChecker(host) {
     if (typeSet.length === 1) {
       return typeSet[0];
     }
-    if (typeSet.length === 2) {
+    if (typeSet.length === 2 && !(flags & 2 /* NoConstraintReduction */)) {
       const typeVarIndex = typeSet[0].flags & 8650752 /* TypeVariable */ ? 0 : 1;
       const typeVariable = typeSet[typeVarIndex];
       const primitiveType = typeSet[1 - typeVarIndex];
@@ -64596,27 +64603,27 @@ function createTypeChecker(host) {
         }
       }
     }
-    const id = getTypeListId(typeSet) + getAliasId(aliasSymbol, aliasTypeArguments);
+    const id = getTypeListId(typeSet) + (flags & 2 /* NoConstraintReduction */ ? "*" : getAliasId(aliasSymbol, aliasTypeArguments));
     let result = intersectionTypes.get(id);
     if (!result) {
       if (includes & 1048576 /* Union */) {
         if (intersectUnionsOfPrimitiveTypes(typeSet)) {
-          result = getIntersectionType(typeSet, aliasSymbol, aliasTypeArguments);
+          result = getIntersectionType(typeSet, flags, aliasSymbol, aliasTypeArguments);
         } else if (every(typeSet, (t) => !!(t.flags & 1048576 /* Union */ && t.types[0].flags & 32768 /* Undefined */))) {
           const containedUndefinedType = some(typeSet, containsMissingType) ? missingType : undefinedType;
           removeFromEach(typeSet, 32768 /* Undefined */);
-          result = getUnionType([getIntersectionType(typeSet), containedUndefinedType], 1 /* Literal */, aliasSymbol, aliasTypeArguments);
+          result = getUnionType([getIntersectionType(typeSet, flags), containedUndefinedType], 1 /* Literal */, aliasSymbol, aliasTypeArguments);
         } else if (every(typeSet, (t) => !!(t.flags & 1048576 /* Union */ && (t.types[0].flags & 65536 /* Null */ || t.types[1].flags & 65536 /* Null */)))) {
           removeFromEach(typeSet, 65536 /* Null */);
-          result = getUnionType([getIntersectionType(typeSet), nullType], 1 /* Literal */, aliasSymbol, aliasTypeArguments);
+          result = getUnionType([getIntersectionType(typeSet, flags), nullType], 1 /* Literal */, aliasSymbol, aliasTypeArguments);
         } else if (typeSet.length >= 4) {
           const middle = Math.floor(typeSet.length / 2);
-          result = getIntersectionType([getIntersectionType(typeSet.slice(0, middle)), getIntersectionType(typeSet.slice(middle))], aliasSymbol, aliasTypeArguments);
+          result = getIntersectionType([getIntersectionType(typeSet.slice(0, middle), flags), getIntersectionType(typeSet.slice(middle), flags)], flags, aliasSymbol, aliasTypeArguments);
         } else {
           if (!checkCrossProductUnion(typeSet)) {
             return errorType;
           }
-          const constituents = getCrossProductIntersections(typeSet);
+          const constituents = getCrossProductIntersections(typeSet, flags);
           const origin = some(constituents, (t) => !!(t.flags & 2097152 /* Intersection */)) && getConstituentCountOfTypes(constituents) > getConstituentCountOfTypes(typeSet) ? createOriginUnionOrIntersectionType(2097152 /* Intersection */, typeSet) : void 0;
           result = getUnionType(constituents, 1 /* Literal */, aliasSymbol, aliasTypeArguments, origin);
         }
@@ -64640,7 +64647,7 @@ function createTypeChecker(host) {
     }
     return true;
   }
-  function getCrossProductIntersections(types) {
+  function getCrossProductIntersections(types, flags) {
     const count = getCrossProductUnionSize(types);
     const intersections = [];
     for (let i = 0; i < count; i++) {
@@ -64654,7 +64661,7 @@ function createTypeChecker(host) {
           n = Math.floor(n / length2);
         }
       }
-      const t = getIntersectionType(constituents);
+      const t = getIntersectionType(constituents, flags);
       if (!(t.flags & 131072 /* Never */))
         intersections.push(t);
     }
@@ -64674,7 +64681,7 @@ function createTypeChecker(host) {
       const emptyIndex = types.length === 2 ? types.indexOf(emptyTypeLiteralType) : -1;
       const t = emptyIndex >= 0 ? types[1 - emptyIndex] : unknownType;
       const noSupertypeReduction = !!(t.flags & (4 /* String */ | 8 /* Number */ | 64 /* BigInt */) || t.flags & 134217728 /* TemplateLiteral */ && isPatternLiteralType(t));
-      links.resolvedType = getIntersectionType(types, aliasSymbol, getTypeArgumentsForAliasSymbol(aliasSymbol), noSupertypeReduction);
+      links.resolvedType = getIntersectionType(types, noSupertypeReduction ? 1 /* NoSupertypeReduction */ : 0, aliasSymbol, getTypeArgumentsForAliasSymbol(aliasSymbol));
     }
     return links.resolvedType;
   }
@@ -65365,7 +65372,7 @@ function createTypeChecker(host) {
       if (wasMissingProp) {
         return void 0;
       }
-      return accessFlags & 4 /* Writing */ ? getIntersectionType(propTypes, aliasSymbol, aliasTypeArguments) : getUnionType(propTypes, 1 /* Literal */, aliasSymbol, aliasTypeArguments);
+      return accessFlags & 4 /* Writing */ ? getIntersectionType(propTypes, 0 /* None */, aliasSymbol, aliasTypeArguments) : getUnionType(propTypes, 1 /* Literal */, aliasSymbol, aliasTypeArguments);
     }
     return getPropertyTypeForIndexType(objectType, apparentObjectType, indexType, indexType, accessNode, accessFlags | 8 /* CacheSymbol */ | 64 /* ReportDeprecated */);
   }
@@ -66489,7 +66496,7 @@ function createTypeChecker(host) {
       }
       const newAliasSymbol = aliasSymbol || type.aliasSymbol;
       const newAliasTypeArguments = aliasSymbol ? aliasTypeArguments : instantiateTypes(type.aliasTypeArguments, mapper);
-      return flags & 2097152 /* Intersection */ || origin && origin.flags & 2097152 /* Intersection */ ? getIntersectionType(newTypes, newAliasSymbol, newAliasTypeArguments) : getUnionType(newTypes, 1 /* Literal */, newAliasSymbol, newAliasTypeArguments);
+      return flags & 2097152 /* Intersection */ || origin && origin.flags & 2097152 /* Intersection */ ? getIntersectionType(newTypes, 0 /* None */, newAliasSymbol, newAliasTypeArguments) : getUnionType(newTypes, 1 /* Literal */, newAliasSymbol, newAliasTypeArguments);
     }
     if (flags & 4194304 /* Index */) {
       return getIndexType(instantiateType(type.type, mapper));
@@ -178889,6 +178896,7 @@ __export(ts_exports2, {
   InlayHints: () => ts_InlayHints_exports,
   InternalEmitFlags: () => InternalEmitFlags,
   InternalSymbolName: () => InternalSymbolName,
+  IntersectionFlags: () => IntersectionFlags,
   InvalidatedProjectKind: () => InvalidatedProjectKind,
   JSDocParsingMode: () => JSDocParsingMode,
   JsDoc: () => ts_JsDoc_exports,
@@ -193318,6 +193326,7 @@ if (typeof console !== "undefined") {
   InlayHints,
   InternalEmitFlags,
   InternalSymbolName,
+  IntersectionFlags,
   InvalidatedProjectKind,
   JSDocParsingMode,
   JsDoc,

package/package.json

@@ -2,7 +2,7 @@
     "name": "typescript",
     "author": "Microsoft Corp.",
     "homepage": "https://www.typescriptlang.org/",
-    "version": "5.5.0-dev.20240502",
+    "version": "5.5.0-dev.20240503",
     "license": "Apache-2.0",
     "description": "TypeScript is a language for application scale JavaScript development",
     "keywords": [
@@ -110,5 +110,5 @@
         "node": "20.1.0",
         "npm": "8.19.4"
     },
-    "gitHead": "7a38980a7e04bee0e273163f26c91d5c99f28298"
+    "gitHead": "3a74ec4e992eacba932c302fded9a636a6c00875"
 }