typescript 4.8.0-dev.20220715 → 4.8.0-dev.20220718

package/lib/tsc.js

@@ -69,7 +69,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 var ts;
 (function (ts) {
     ts.versionMajorMinor = "4.8";
-    ts.version = ts.versionMajorMinor + ".0-dev.20220715";
+    ts.version = ts.versionMajorMinor + ".0-dev.20220718";
     var NativeCollections;
     (function (NativeCollections) {
         var globals = typeof globalThis !== "undefined" ? globalThis :
@@ -60158,16 +60158,23 @@ var ts;
                 if (!assumeTrue) {
                     return filterType(type, function (t) { return !isRelated(t, candidate); });
                 }
-                if (type.flags & 1048576) {
-                    var assignableType = filterType(type, function (t) { return isRelated(t, candidate); });
-                    if (!(assignableType.flags & 131072)) {
-                        return assignableType;
-                    }
+                if (type.flags & 3) {
+                    return candidate;
                 }
-                return isTypeSubtypeOf(candidate, type) ? candidate :
-                    isTypeAssignableTo(type, candidate) ? type :
-                        isTypeAssignableTo(candidate, type) ? candidate :
-                            getIntersectionType([type, candidate]);
+                var keyPropertyName = type.flags & 1048576 ? getKeyPropertyName(type) : undefined;
+                var narrowedType = mapType(candidate, function (c) {
+                    var discriminant = keyPropertyName && getTypeOfPropertyOfType(c, keyPropertyName);
+                    var matching = discriminant && getConstituentTypeForKeyType(type, discriminant);
+                    var directlyRelated = mapType(matching || type, function (t) { return isRelated(t, c) ? t : isRelated(c, t) ? c : neverType; });
+                    return directlyRelated.flags & 131072 ?
+                        mapType(type, function (t) { return maybeTypeOfKind(t, 465829888) && isRelated(c, getBaseConstraintOfType(t) || unknownType) ? getIntersectionType([t, c]) : neverType; }) :
+                        directlyRelated;
+                });
+                return !(narrowedType.flags & 131072) ? narrowedType :
+                    isTypeSubtypeOf(candidate, type) ? candidate :
+                        isTypeAssignableTo(type, candidate) ? type :
+                            isTypeAssignableTo(candidate, type) ? candidate :
+                                getIntersectionType([type, candidate]);
             }
             function narrowTypeByCallExpression(type, callExpression, assumeTrue) {
                 if (hasMatchingArgument(callExpression, reference)) {

package/lib/tsserver.js

@@ -109,7 +109,7 @@ var ts;
     // The following is baselined as a literal template type without intervention
     /** The version of the TypeScript compiler release */
     // eslint-disable-next-line @typescript-eslint/no-inferrable-types
-    ts.version = ts.versionMajorMinor + ".0-dev.20220715";
+    ts.version = ts.versionMajorMinor + ".0-dev.20220718";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -71916,23 +71916,32 @@ var ts;
                 if (!assumeTrue) {
                     return filterType(type, function (t) { return !isRelated(t, candidate); });
                 }
-                // If the current type is a union type, remove all constituents that couldn't be instances of
-                // the candidate type. If one or more constituents remain, return a union of those.
-                if (type.flags & 1048576 /* Union */) {
-                    var assignableType = filterType(type, function (t) { return isRelated(t, candidate); });
-                    if (!(assignableType.flags & 131072 /* Never */)) {
-                        return assignableType;
-                    }
-                }
-                // If the candidate type is a subtype of the target type, narrow to the candidate type.
-                // Otherwise, if the target type is assignable to the candidate type, keep the target type.
-                // Otherwise, if the candidate type is assignable to the target type, narrow to the candidate
-                // type. Otherwise, the types are completely unrelated, so narrow to an intersection of the
-                // two types.
-                return isTypeSubtypeOf(candidate, type) ? candidate :
-                    isTypeAssignableTo(type, candidate) ? type :
-                        isTypeAssignableTo(candidate, type) ? candidate :
-                            getIntersectionType([type, candidate]);
+                if (type.flags & 3 /* AnyOrUnknown */) {
+                    return candidate;
+                }
+                // We first attempt to filter the current type, narrowing constituents as appropriate and removing
+                // constituents that are unrelated to the candidate.
+                var keyPropertyName = type.flags & 1048576 /* Union */ ? getKeyPropertyName(type) : undefined;
+                var narrowedType = mapType(candidate, function (c) {
+                    // If a discriminant property is available, use that to reduce the type.
+                    var discriminant = keyPropertyName && getTypeOfPropertyOfType(c, keyPropertyName);
+                    var matching = discriminant && getConstituentTypeForKeyType(type, discriminant);
+                    // For each constituent t in the current type, if t and and c are directly related, pick the most
+                    // specific of the two.
+                    var directlyRelated = mapType(matching || type, function (t) { return isRelated(t, c) ? t : isRelated(c, t) ? c : neverType; });
+                    // If no constituents are directly related, create intersections for any generic constituents that
+                    // are related by constraint.
+                    return directlyRelated.flags & 131072 /* Never */ ?
+                        mapType(type, function (t) { return maybeTypeOfKind(t, 465829888 /* Instantiable */) && isRelated(c, getBaseConstraintOfType(t) || unknownType) ? getIntersectionType([t, c]) : neverType; }) :
+                        directlyRelated;
+                });
+                // If filtering produced a non-empty type, return that. Otherwise, pick the most specific of the two
+                // based on assignability, or as a last resort produce an intersection.
+                return !(narrowedType.flags & 131072 /* Never */) ? narrowedType :
+                    isTypeSubtypeOf(candidate, type) ? candidate :
+                        isTypeAssignableTo(type, candidate) ? type :
+                            isTypeAssignableTo(candidate, type) ? candidate :
+                                getIntersectionType([type, candidate]);
             }
             function narrowTypeByCallExpression(type, callExpression, assumeTrue) {
                 if (hasMatchingArgument(callExpression, reference)) {

package/lib/tsserverlibrary.js

@@ -303,7 +303,7 @@ var ts;
     // The following is baselined as a literal template type without intervention
     /** The version of the TypeScript compiler release */
     // eslint-disable-next-line @typescript-eslint/no-inferrable-types
-    ts.version = ts.versionMajorMinor + ".0-dev.20220715";
+    ts.version = ts.versionMajorMinor + ".0-dev.20220718";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -72110,23 +72110,32 @@ var ts;
                 if (!assumeTrue) {
                     return filterType(type, function (t) { return !isRelated(t, candidate); });
                 }
-                // If the current type is a union type, remove all constituents that couldn't be instances of
-                // the candidate type. If one or more constituents remain, return a union of those.
-                if (type.flags & 1048576 /* Union */) {
-                    var assignableType = filterType(type, function (t) { return isRelated(t, candidate); });
-                    if (!(assignableType.flags & 131072 /* Never */)) {
-                        return assignableType;
-                    }
-                }
-                // If the candidate type is a subtype of the target type, narrow to the candidate type.
-                // Otherwise, if the target type is assignable to the candidate type, keep the target type.
-                // Otherwise, if the candidate type is assignable to the target type, narrow to the candidate
-                // type. Otherwise, the types are completely unrelated, so narrow to an intersection of the
-                // two types.
-                return isTypeSubtypeOf(candidate, type) ? candidate :
-                    isTypeAssignableTo(type, candidate) ? type :
-                        isTypeAssignableTo(candidate, type) ? candidate :
-                            getIntersectionType([type, candidate]);
+                if (type.flags & 3 /* AnyOrUnknown */) {
+                    return candidate;
+                }
+                // We first attempt to filter the current type, narrowing constituents as appropriate and removing
+                // constituents that are unrelated to the candidate.
+                var keyPropertyName = type.flags & 1048576 /* Union */ ? getKeyPropertyName(type) : undefined;
+                var narrowedType = mapType(candidate, function (c) {
+                    // If a discriminant property is available, use that to reduce the type.
+                    var discriminant = keyPropertyName && getTypeOfPropertyOfType(c, keyPropertyName);
+                    var matching = discriminant && getConstituentTypeForKeyType(type, discriminant);
+                    // For each constituent t in the current type, if t and and c are directly related, pick the most
+                    // specific of the two.
+                    var directlyRelated = mapType(matching || type, function (t) { return isRelated(t, c) ? t : isRelated(c, t) ? c : neverType; });
+                    // If no constituents are directly related, create intersections for any generic constituents that
+                    // are related by constraint.
+                    return directlyRelated.flags & 131072 /* Never */ ?
+                        mapType(type, function (t) { return maybeTypeOfKind(t, 465829888 /* Instantiable */) && isRelated(c, getBaseConstraintOfType(t) || unknownType) ? getIntersectionType([t, c]) : neverType; }) :
+                        directlyRelated;
+                });
+                // If filtering produced a non-empty type, return that. Otherwise, pick the most specific of the two
+                // based on assignability, or as a last resort produce an intersection.
+                return !(narrowedType.flags & 131072 /* Never */) ? narrowedType :
+                    isTypeSubtypeOf(candidate, type) ? candidate :
+                        isTypeAssignableTo(type, candidate) ? type :
+                            isTypeAssignableTo(candidate, type) ? candidate :
+                                getIntersectionType([type, candidate]);
             }
             function narrowTypeByCallExpression(type, callExpression, assumeTrue) {
                 if (hasMatchingArgument(callExpression, reference)) {

package/lib/typescript.js

@@ -294,7 +294,7 @@ var ts;
     // The following is baselined as a literal template type without intervention
     /** The version of the TypeScript compiler release */
     // eslint-disable-next-line @typescript-eslint/no-inferrable-types
-    ts.version = ts.versionMajorMinor + ".0-dev.20220715";
+    ts.version = ts.versionMajorMinor + ".0-dev.20220718";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -72101,23 +72101,32 @@ var ts;
                 if (!assumeTrue) {
                     return filterType(type, function (t) { return !isRelated(t, candidate); });
                 }
-                // If the current type is a union type, remove all constituents that couldn't be instances of
-                // the candidate type. If one or more constituents remain, return a union of those.
-                if (type.flags & 1048576 /* Union */) {
-                    var assignableType = filterType(type, function (t) { return isRelated(t, candidate); });
-                    if (!(assignableType.flags & 131072 /* Never */)) {
-                        return assignableType;
-                    }
-                }
-                // If the candidate type is a subtype of the target type, narrow to the candidate type.
-                // Otherwise, if the target type is assignable to the candidate type, keep the target type.
-                // Otherwise, if the candidate type is assignable to the target type, narrow to the candidate
-                // type. Otherwise, the types are completely unrelated, so narrow to an intersection of the
-                // two types.
-                return isTypeSubtypeOf(candidate, type) ? candidate :
-                    isTypeAssignableTo(type, candidate) ? type :
-                        isTypeAssignableTo(candidate, type) ? candidate :
-                            getIntersectionType([type, candidate]);
+                if (type.flags & 3 /* AnyOrUnknown */) {
+                    return candidate;
+                }
+                // We first attempt to filter the current type, narrowing constituents as appropriate and removing
+                // constituents that are unrelated to the candidate.
+                var keyPropertyName = type.flags & 1048576 /* Union */ ? getKeyPropertyName(type) : undefined;
+                var narrowedType = mapType(candidate, function (c) {
+                    // If a discriminant property is available, use that to reduce the type.
+                    var discriminant = keyPropertyName && getTypeOfPropertyOfType(c, keyPropertyName);
+                    var matching = discriminant && getConstituentTypeForKeyType(type, discriminant);
+                    // For each constituent t in the current type, if t and and c are directly related, pick the most
+                    // specific of the two.
+                    var directlyRelated = mapType(matching || type, function (t) { return isRelated(t, c) ? t : isRelated(c, t) ? c : neverType; });
+                    // If no constituents are directly related, create intersections for any generic constituents that
+                    // are related by constraint.
+                    return directlyRelated.flags & 131072 /* Never */ ?
+                        mapType(type, function (t) { return maybeTypeOfKind(t, 465829888 /* Instantiable */) && isRelated(c, getBaseConstraintOfType(t) || unknownType) ? getIntersectionType([t, c]) : neverType; }) :
+                        directlyRelated;
+                });
+                // If filtering produced a non-empty type, return that. Otherwise, pick the most specific of the two
+                // based on assignability, or as a last resort produce an intersection.
+                return !(narrowedType.flags & 131072 /* Never */) ? narrowedType :
+                    isTypeSubtypeOf(candidate, type) ? candidate :
+                        isTypeAssignableTo(type, candidate) ? type :
+                            isTypeAssignableTo(candidate, type) ? candidate :
+                                getIntersectionType([type, candidate]);
             }
             function narrowTypeByCallExpression(type, callExpression, assumeTrue) {
                 if (hasMatchingArgument(callExpression, reference)) {

package/lib/typescriptServices.js

@@ -294,7 +294,7 @@ var ts;
     // The following is baselined as a literal template type without intervention
     /** The version of the TypeScript compiler release */
     // eslint-disable-next-line @typescript-eslint/no-inferrable-types
-    ts.version = ts.versionMajorMinor + ".0-dev.20220715";
+    ts.version = ts.versionMajorMinor + ".0-dev.20220718";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -72101,23 +72101,32 @@ var ts;
                 if (!assumeTrue) {
                     return filterType(type, function (t) { return !isRelated(t, candidate); });
                 }
-                // If the current type is a union type, remove all constituents that couldn't be instances of
-                // the candidate type. If one or more constituents remain, return a union of those.
-                if (type.flags & 1048576 /* Union */) {
-                    var assignableType = filterType(type, function (t) { return isRelated(t, candidate); });
-                    if (!(assignableType.flags & 131072 /* Never */)) {
-                        return assignableType;
-                    }
-                }
-                // If the candidate type is a subtype of the target type, narrow to the candidate type.
-                // Otherwise, if the target type is assignable to the candidate type, keep the target type.
-                // Otherwise, if the candidate type is assignable to the target type, narrow to the candidate
-                // type. Otherwise, the types are completely unrelated, so narrow to an intersection of the
-                // two types.
-                return isTypeSubtypeOf(candidate, type) ? candidate :
-                    isTypeAssignableTo(type, candidate) ? type :
-                        isTypeAssignableTo(candidate, type) ? candidate :
-                            getIntersectionType([type, candidate]);
+                if (type.flags & 3 /* AnyOrUnknown */) {
+                    return candidate;
+                }
+                // We first attempt to filter the current type, narrowing constituents as appropriate and removing
+                // constituents that are unrelated to the candidate.
+                var keyPropertyName = type.flags & 1048576 /* Union */ ? getKeyPropertyName(type) : undefined;
+                var narrowedType = mapType(candidate, function (c) {
+                    // If a discriminant property is available, use that to reduce the type.
+                    var discriminant = keyPropertyName && getTypeOfPropertyOfType(c, keyPropertyName);
+                    var matching = discriminant && getConstituentTypeForKeyType(type, discriminant);
+                    // For each constituent t in the current type, if t and and c are directly related, pick the most
+                    // specific of the two.
+                    var directlyRelated = mapType(matching || type, function (t) { return isRelated(t, c) ? t : isRelated(c, t) ? c : neverType; });
+                    // If no constituents are directly related, create intersections for any generic constituents that
+                    // are related by constraint.
+                    return directlyRelated.flags & 131072 /* Never */ ?
+                        mapType(type, function (t) { return maybeTypeOfKind(t, 465829888 /* Instantiable */) && isRelated(c, getBaseConstraintOfType(t) || unknownType) ? getIntersectionType([t, c]) : neverType; }) :
+                        directlyRelated;
+                });
+                // If filtering produced a non-empty type, return that. Otherwise, pick the most specific of the two
+                // based on assignability, or as a last resort produce an intersection.
+                return !(narrowedType.flags & 131072 /* Never */) ? narrowedType :
+                    isTypeSubtypeOf(candidate, type) ? candidate :
+                        isTypeAssignableTo(type, candidate) ? type :
+                            isTypeAssignableTo(candidate, type) ? candidate :
+                                getIntersectionType([type, candidate]);
             }
             function narrowTypeByCallExpression(type, callExpression, assumeTrue) {
                 if (hasMatchingArgument(callExpression, reference)) {

package/lib/typingsInstaller.js

@@ -89,7 +89,7 @@ var ts;
     // The following is baselined as a literal template type without intervention
     /** The version of the TypeScript compiler release */
     // eslint-disable-next-line @typescript-eslint/no-inferrable-types
-    ts.version = ts.versionMajorMinor + ".0-dev.20220715";
+    ts.version = ts.versionMajorMinor + ".0-dev.20220718";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -71896,23 +71896,32 @@ var ts;
                 if (!assumeTrue) {
                     return filterType(type, function (t) { return !isRelated(t, candidate); });
                 }
-                // If the current type is a union type, remove all constituents that couldn't be instances of
-                // the candidate type. If one or more constituents remain, return a union of those.
-                if (type.flags & 1048576 /* Union */) {
-                    var assignableType = filterType(type, function (t) { return isRelated(t, candidate); });
-                    if (!(assignableType.flags & 131072 /* Never */)) {
-                        return assignableType;
-                    }
-                }
-                // If the candidate type is a subtype of the target type, narrow to the candidate type.
-                // Otherwise, if the target type is assignable to the candidate type, keep the target type.
-                // Otherwise, if the candidate type is assignable to the target type, narrow to the candidate
-                // type. Otherwise, the types are completely unrelated, so narrow to an intersection of the
-                // two types.
-                return isTypeSubtypeOf(candidate, type) ? candidate :
-                    isTypeAssignableTo(type, candidate) ? type :
-                        isTypeAssignableTo(candidate, type) ? candidate :
-                            getIntersectionType([type, candidate]);
+                if (type.flags & 3 /* AnyOrUnknown */) {
+                    return candidate;
+                }
+                // We first attempt to filter the current type, narrowing constituents as appropriate and removing
+                // constituents that are unrelated to the candidate.
+                var keyPropertyName = type.flags & 1048576 /* Union */ ? getKeyPropertyName(type) : undefined;
+                var narrowedType = mapType(candidate, function (c) {
+                    // If a discriminant property is available, use that to reduce the type.
+                    var discriminant = keyPropertyName && getTypeOfPropertyOfType(c, keyPropertyName);
+                    var matching = discriminant && getConstituentTypeForKeyType(type, discriminant);
+                    // For each constituent t in the current type, if t and and c are directly related, pick the most
+                    // specific of the two.
+                    var directlyRelated = mapType(matching || type, function (t) { return isRelated(t, c) ? t : isRelated(c, t) ? c : neverType; });
+                    // If no constituents are directly related, create intersections for any generic constituents that
+                    // are related by constraint.
+                    return directlyRelated.flags & 131072 /* Never */ ?
+                        mapType(type, function (t) { return maybeTypeOfKind(t, 465829888 /* Instantiable */) && isRelated(c, getBaseConstraintOfType(t) || unknownType) ? getIntersectionType([t, c]) : neverType; }) :
+                        directlyRelated;
+                });
+                // If filtering produced a non-empty type, return that. Otherwise, pick the most specific of the two
+                // based on assignability, or as a last resort produce an intersection.
+                return !(narrowedType.flags & 131072 /* Never */) ? narrowedType :
+                    isTypeSubtypeOf(candidate, type) ? candidate :
+                        isTypeAssignableTo(type, candidate) ? type :
+                            isTypeAssignableTo(candidate, type) ? candidate :
+                                getIntersectionType([type, candidate]);
             }
             function narrowTypeByCallExpression(type, callExpression, assumeTrue) {
                 if (hasMatchingArgument(callExpression, reference)) {

package/package.json

@@ -2,7 +2,7 @@
     "name": "typescript",
     "author": "Microsoft Corp.",
     "homepage": "https://www.typescriptlang.org/",
-    "version": "4.8.0-dev.20220715",
+    "version": "4.8.0-dev.20220718",
     "license": "Apache-2.0",
     "description": "TypeScript is a language for application scale JavaScript development",
     "keywords": [