Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make the falsy part of any/unknown any/unknown #39529

Merged
merged 1 commit into from
Aug 18, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/compiler/checker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18557,7 +18557,7 @@ namespace ts {
type.flags & TypeFlags.BigInt ? zeroBigIntType :
type === regularFalseType ||
type === falseType ||
type.flags & (TypeFlags.Void | TypeFlags.Undefined | TypeFlags.Null) ||
type.flags & (TypeFlags.Void | TypeFlags.Undefined | TypeFlags.Null | TypeFlags.AnyOrUnknown) ||
type.flags & TypeFlags.StringLiteral && (<StringLiteralType>type).value === "" ||
type.flags & TypeFlags.NumberLiteral && (<NumberLiteralType>type).value === 0 ||
type.flags & TypeFlags.BigIntLiteral && isZeroBigInt(<BigIntLiteralType>type) ? type :
Expand Down
54 changes: 54 additions & 0 deletions tests/baselines/reference/anyAndUnknownHaveFalsyComponents.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
//// [anyAndUnknownHaveFalsyComponents.ts]
declare let x1: any;
const y1 = x1 && 3;

// #39113
declare let isTreeHeader1: any;
function foo1() {
return {
display: "block",
...(isTreeHeader1 && {
display: "flex",
})
};
}

declare let x2: unknown;
const y2 = x2 && 3;

// #39113
declare let isTreeHeader2: unknown;
function foo2() {
return {
display: "block",
...(isTreeHeader1 && {
display: "flex",
})
};
}


//// [anyAndUnknownHaveFalsyComponents.js]
var __assign = (this && this.__assign) || function () {
__assign = Object.assign || function(t) {
for (var s, i = 1, n = arguments.length; i < n; i++) {
s = arguments[i];
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
t[p] = s[p];
}
return t;
};
return __assign.apply(this, arguments);
};
var y1 = x1 && 3;
function foo1() {
return __assign({ display: "block" }, (isTreeHeader1 && {
display: "flex"
}));
}
var y2 = x2 && 3;
function foo2() {
return __assign({ display: "block" }, (isTreeHeader1 && {
display: "flex"
}));
}
57 changes: 57 additions & 0 deletions tests/baselines/reference/anyAndUnknownHaveFalsyComponents.symbols
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
=== tests/cases/compiler/anyAndUnknownHaveFalsyComponents.ts ===
declare let x1: any;
>x1 : Symbol(x1, Decl(anyAndUnknownHaveFalsyComponents.ts, 0, 11))

const y1 = x1 && 3;
>y1 : Symbol(y1, Decl(anyAndUnknownHaveFalsyComponents.ts, 1, 5))
>x1 : Symbol(x1, Decl(anyAndUnknownHaveFalsyComponents.ts, 0, 11))

// #39113
declare let isTreeHeader1: any;
>isTreeHeader1 : Symbol(isTreeHeader1, Decl(anyAndUnknownHaveFalsyComponents.ts, 4, 11))

function foo1() {
>foo1 : Symbol(foo1, Decl(anyAndUnknownHaveFalsyComponents.ts, 4, 31))

return {
display: "block",
>display : Symbol(display, Decl(anyAndUnknownHaveFalsyComponents.ts, 6, 10))

...(isTreeHeader1 && {
>isTreeHeader1 : Symbol(isTreeHeader1, Decl(anyAndUnknownHaveFalsyComponents.ts, 4, 11))

display: "flex",
>display : Symbol(display, Decl(anyAndUnknownHaveFalsyComponents.ts, 8, 26))

})
};
}

declare let x2: unknown;
>x2 : Symbol(x2, Decl(anyAndUnknownHaveFalsyComponents.ts, 14, 11))

const y2 = x2 && 3;
>y2 : Symbol(y2, Decl(anyAndUnknownHaveFalsyComponents.ts, 15, 5))
>x2 : Symbol(x2, Decl(anyAndUnknownHaveFalsyComponents.ts, 14, 11))

// #39113
declare let isTreeHeader2: unknown;
>isTreeHeader2 : Symbol(isTreeHeader2, Decl(anyAndUnknownHaveFalsyComponents.ts, 18, 11))

function foo2() {
>foo2 : Symbol(foo2, Decl(anyAndUnknownHaveFalsyComponents.ts, 18, 35))

return {
display: "block",
>display : Symbol(display, Decl(anyAndUnknownHaveFalsyComponents.ts, 20, 10))

...(isTreeHeader1 && {
>isTreeHeader1 : Symbol(isTreeHeader1, Decl(anyAndUnknownHaveFalsyComponents.ts, 4, 11))

display: "flex",
>display : Symbol(display, Decl(anyAndUnknownHaveFalsyComponents.ts, 22, 26))

})
};
}

75 changes: 75 additions & 0 deletions tests/baselines/reference/anyAndUnknownHaveFalsyComponents.types
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
=== tests/cases/compiler/anyAndUnknownHaveFalsyComponents.ts ===
declare let x1: any;
>x1 : any

const y1 = x1 && 3;
>y1 : any
>x1 && 3 : any
>x1 : any
>3 : 3

// #39113
declare let isTreeHeader1: any;
>isTreeHeader1 : any

function foo1() {
>foo1 : () => any

return {
>{ display: "block", ...(isTreeHeader1 && { display: "flex", }) } : any

display: "block",
>display : string
>"block" : "block"

...(isTreeHeader1 && {
>(isTreeHeader1 && { display: "flex", }) : any
>isTreeHeader1 && { display: "flex", } : any
>isTreeHeader1 : any
>{ display: "flex", } : { display: string; }

display: "flex",
>display : string
>"flex" : "flex"

})
};
}

declare let x2: unknown;
>x2 : unknown

const y2 = x2 && 3;
>y2 : unknown
>x2 && 3 : unknown
>x2 : unknown
>3 : 3

// #39113
declare let isTreeHeader2: unknown;
>isTreeHeader2 : unknown

function foo2() {
>foo2 : () => any

return {
>{ display: "block", ...(isTreeHeader1 && { display: "flex", }) } : any

display: "block",
>display : string
>"block" : "block"

...(isTreeHeader1 && {
>(isTreeHeader1 && { display: "flex", }) : any
>isTreeHeader1 && { display: "flex", } : any
>isTreeHeader1 : any
>{ display: "flex", } : { display: string; }

display: "flex",
>display : string
>"flex" : "flex"

})
};
}

Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ export default class Operation {
>name : any

if(innerResult && innerResult.length > 0) {
>innerResult && innerResult.length > 0 : boolean
>innerResult && innerResult.length > 0 : any
>innerResult : any
>innerResult.length > 0 : boolean
>innerResult.length : any
Expand Down
4 changes: 2 additions & 2 deletions tests/baselines/reference/controlFlowCaching.types
Original file line number Diff line number Diff line change
Expand Up @@ -539,8 +539,8 @@ function f(dim, offsets, arr, acommon, centerAnchorLimit, g, has, lin) {
>titleRotation = (taTitleOrientation && taTitleOrientation == "away") ? 180 : 0 : 0 | 180
>titleRotation : number
>(taTitleOrientation && taTitleOrientation == "away") ? 180 : 0 : 0 | 180
>(taTitleOrientation && taTitleOrientation == "away") : boolean
>taTitleOrientation && taTitleOrientation == "away" : boolean
>(taTitleOrientation && taTitleOrientation == "away") : any
>taTitleOrientation && taTitleOrientation == "away" : any
>taTitleOrientation : any
>taTitleOrientation == "away" : boolean
>taTitleOrientation : any
Expand Down
24 changes: 12 additions & 12 deletions tests/baselines/reference/narrowingTruthyObject.types
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ function foo(x: unknown, b: boolean) {
>toString : () => string
}
if (x && typeof x === 'object') {
>x && typeof x === 'object' : boolean
>x && typeof x === 'object' : unknown
>x : unknown
>typeof x === 'object' : boolean
>typeof x : "string" | "number" | "bigint" | "boolean" | "symbol" | "undefined" | "object" | "function"
Expand All @@ -45,7 +45,7 @@ function foo(x: unknown, b: boolean) {
>toString : () => string
}
if (b && x && typeof x === 'object') {
>b && x && typeof x === 'object' : boolean
>b && x && typeof x === 'object' : unknown
>b && x : unknown
>b : boolean
>x : unknown
Expand All @@ -61,8 +61,8 @@ function foo(x: unknown, b: boolean) {
>toString : () => string
}
if (x && b && typeof x === 'object') {
>x && b && typeof x === 'object' : boolean
>x && b : boolean
>x && b && typeof x === 'object' : unknown
>x && b : unknown
>x : unknown
>b : boolean
>typeof x === 'object' : boolean
Expand All @@ -77,9 +77,9 @@ function foo(x: unknown, b: boolean) {
>toString : () => string
}
if (x && b && b && typeof x === 'object') {
>x && b && b && typeof x === 'object' : boolean
>x && b && b : boolean
>x && b : boolean
>x && b && b && typeof x === 'object' : unknown
>x && b && b : unknown
>x && b : unknown
>x : unknown
>b : boolean
>b : true
Expand All @@ -95,9 +95,9 @@ function foo(x: unknown, b: boolean) {
>toString : () => string
}
if (b && b && x && b && b && typeof x === 'object') {
>b && b && x && b && b && typeof x === 'object' : boolean
>b && b && x && b && b : true
>b && b && x && b : true
>b && b && x && b && b && typeof x === 'object' : unknown
>b && b && x && b && b : unknown
>b && b && x && b : unknown
>b && b && x : unknown
>b && b : boolean
>b : boolean
Expand Down Expand Up @@ -125,8 +125,8 @@ function f1(x: unknown): any {
>x : unknown

return x && typeof x === 'object' && x.hasOwnProperty('x');
>x && typeof x === 'object' && x.hasOwnProperty('x') : boolean
>x && typeof x === 'object' : boolean
>x && typeof x === 'object' && x.hasOwnProperty('x') : unknown
>x && typeof x === 'object' : unknown
>x : unknown
>typeof x === 'object' : boolean
>typeof x : "string" | "number" | "bigint" | "boolean" | "symbol" | "undefined" | "object" | "function"
Expand Down
29 changes: 29 additions & 0 deletions tests/cases/compiler/anyAndUnknownHaveFalsyComponents.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
// @strictNullChecks: true

declare let x1: any;
const y1 = x1 && 3;

// #39113
declare let isTreeHeader1: any;
function foo1() {
return {
display: "block",
...(isTreeHeader1 && {
display: "flex",
})
};
}

declare let x2: unknown;
const y2 = x2 && 3;

// #39113
declare let isTreeHeader2: unknown;
function foo2() {
return {
display: "block",
...(isTreeHeader1 && {
display: "flex",
})
};
}