Spread & rest over intersection and unions #12552

mhegazy · 2016-11-29T08:15:07Z

…nd distribute spread&rest over unions

sandersn · 2016-11-29T15:59:02Z

tests/baselines/reference/restIntersectionOrIntersection.types

@@ -0,0 +1,38 @@
+=== tests/cases/compiler/restIntersectionOrIntersection.ts ===


should be named restIntersectionOrUnion.ts, right?

sandersn

You should copy some fourslash tests from the original spread PR, pre-object-only. In particular, rename was tricky, as I recall.

sandersn

Couple of tiny updates, otherwise looks good.

sandersn · 2016-11-29T20:51:16Z

src/compiler/checker.ts

+                    return getUnionType(map(types, t => getSpreadType(left, t, isFromObjectLiteral)));
+                }
+                else {
+                    right = emptyObjectType


missing semicolon

sandersn · 2016-11-29T20:52:16Z

tests/baselines/reference/objectSpreadNegative.errors.txt

@@ -68,11 +66,7 @@ tests/cases/conformance/types/spread/objectSpreadNegative.ts(61,14): error TS269

    // null, undefined and primitives are not allowed


can you update this comment?

mhegazy · 2016-11-29T21:37:56Z

@ahejlsberg can you take a look

vladima · 2016-11-30T00:15:39Z

src/compiler/checker.ts

            if (left.flags & TypeFlags.Any || right.flags & TypeFlags.Any) {
                return anyType;
            }
+
+            if (left.flags & TypeFlags.Union) {


nit: these two parts of code for left and right looks quite similar, can they be extracted to a function?

vladima · 2016-11-30T00:16:09Z

src/compiler/checker.ts

            if (left.flags & TypeFlags.Any || right.flags & TypeFlags.Any) {
                return anyType;
            }
+
+            if (left.flags & TypeFlags.Union) {
+                const types = filter((<UnionType>left).types, t => !(t.flags & TypeFlags.Nullable));


this pattern filter out nullable types is repeated at least 3 times

ahejlsberg · 2016-11-30T00:42:58Z

src/compiler/checker.ts

            if (left.flags & TypeFlags.Any || right.flags & TypeFlags.Any) {
                return anyType;
            }
+
+            if (left.flags & TypeFlags.Union) {


You can replace all of these new lines with just this:

left = filterType(left, t => !(t.flags & TypeFlags.Nullable)); if (left.flags & TypeFlags.Never) { return right; } right = filterType(right, t => !(t.flags & TypeFlags.Nullable)); if (right.flags & TypeFlags.Never) { return left; } if (left.flags & TypeFlags.Union) { return mapType(left, t => getSpreadType(t, right, isFromObjectLiteral)); } if (right.flags & TypeFlags.Union) { return mapType(right, t => getSpreadType(left, t, isFromObjectLiteral)); }

ahejlsberg · 2016-11-30T00:55:13Z

src/compiler/checker.ts

@@ -11516,6 +11552,24 @@ namespace ts {
            }
       }

+        function isValidSpreadType(type: Type): boolean {


The functional style is a lot shorter:

function isValidSpreadType(type: Type): boolean { return !!(type.flags & (TypeFlags.Any | TypeFlags.Null | TypeFlags.Undefined) || type.flags & TypeFlags.Object && !isGenericMappedType(type) || type.flags & TypeFlags.UnionOrIntersection && !forEach((<UnionOrIntersectionType>type).types, t => !isValidSpreadType(t))); }

thanks. fixed.

ahejlsberg · 2016-11-30T00:57:50Z

src/compiler/checker.ts

@@ -6097,16 +6103,46 @@ namespace ts {
            return symbol ? getLocalTypeParametersOfClassOrInterfaceOrTypeAlias(symbol) : undefined;
        }

+        function filterNulableTypes(union: UnionType): Type[] {


Spelling. Not sure you need to keep this function, but if you do, have it operate on any kind of type in the same way as mapType and filterType.

Jessidhia · 2016-11-30T00:59:26Z

src/compiler/checker.ts

@@ -11516,6 +11538,24 @@ namespace ts {
            }
       }

+        function isValidSpreadType(type: Type): boolean {
+            if (type.flags & (TypeFlags.Any | TypeFlags.Null | TypeFlags.Undefined)) {
+                return true;


IIUC this should also fix #12460

Port null/undefined support in __rest from microsoft/TypeScript#12552

ahejlsberg · 2016-11-30T01:10:57Z

👍

mhegazy added 2 commits November 29, 2016 00:04

Allow union and intersection as targets for object spread and rest, a…

f2e30f6

…nd distribute spread&rest over unions

Fix function name

5c10764

msftclas added the cla-not-required label Nov 29, 2016

mhegazy changed the title ~~Spread rest intersection and unions~~ Spread & rest over intersection and unions Nov 29, 2016

sandersn reviewed Nov 29, 2016

View reviewed changes

sandersn requested changes Nov 29, 2016

View reviewed changes

mhegazy added 5 commits November 29, 2016 10:36

Change name of the function

5c4f145

Handel null and undefined in object spread and rest

216f286

Handel null and undefined in __rest

86b48e3

change test

9ab55c1

Update test name

e4f0a50

sandersn approved these changes Nov 29, 2016

View reviewed changes

mhegazy added 2 commits November 29, 2016 13:37

add missing semicolons

17b6645

Update test

51f5ef6

vladima reviewed Nov 30, 2016

View reviewed changes

vladima approved these changes Nov 30, 2016

View reviewed changes

extract filterNullableTypes

2178d55

mhegazy added a commit to microsoft/tslib that referenced this pull request Nov 30, 2016

Port null/undefined support in __rest from microsoft/TypeScript#12552

956643a

ahejlsberg reviewed Nov 30, 2016

View reviewed changes

mhegazy added 2 commits November 29, 2016 16:55

Simplify logic

2152683

Simplify isValidSpreadType

505c153

ahejlsberg reviewed Nov 30, 2016

View reviewed changes

Jessidhia reviewed Nov 30, 2016

View reviewed changes

mhegazy added a commit to microsoft/tslib that referenced this pull request Nov 30, 2016

Merge pull request #9 from Microsoft/SupportNullInRest

d7c44c8

Port null/undefined support in __rest from microsoft/TypeScript#12552

mhegazy merged commit 4c9bdb9 into master Nov 30, 2016

mhegazy deleted the spreadRestIntersectionAndUnions branch November 30, 2016 01:27

mhegazy mentioned this pull request Dec 1, 2016

Merge master1201 #12608

Merged

microsoft locked and limited conversation to collaborators Jun 19, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Spread & rest over intersection and unions #12552

Spread & rest over intersection and unions #12552

Uh oh!

mhegazy commented Nov 29, 2016 •

edited

Loading

Uh oh!

sandersn Nov 29, 2016

Uh oh!

sandersn left a comment

Uh oh!

sandersn left a comment

Uh oh!

sandersn Nov 29, 2016

Uh oh!

sandersn Nov 29, 2016

Uh oh!

mhegazy commented Nov 29, 2016

Uh oh!

vladima Nov 30, 2016

Uh oh!

vladima Nov 30, 2016

Uh oh!

ahejlsberg Nov 30, 2016

Uh oh!

ahejlsberg Nov 30, 2016

Uh oh!

mhegazy Nov 30, 2016

Uh oh!

ahejlsberg Nov 30, 2016

Uh oh!

Jessidhia Nov 30, 2016

Uh oh!

ahejlsberg commented Nov 30, 2016 •

edited

Loading

Uh oh!

Uh oh!

		@@ -0,0 +1,38 @@
		=== tests/cases/compiler/restIntersectionOrIntersection.ts ===

		@@ -68,11 +66,7 @@ tests/cases/conformance/types/spread/objectSpreadNegative.ts(61,14): error TS269

		// null, undefined and primitives are not allowed

Spread & rest over intersection and unions #12552

Spread & rest over intersection and unions #12552

Uh oh!

Conversation

mhegazy commented Nov 29, 2016 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

sandersn left a comment

Choose a reason for hiding this comment

Uh oh!

sandersn left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

mhegazy commented Nov 29, 2016

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ahejlsberg commented Nov 30, 2016 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

mhegazy commented Nov 29, 2016 •

edited

Loading

ahejlsberg commented Nov 30, 2016 •

edited

Loading