Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
995732f
Add undefined to default-valued parameters
sandersn Nov 3, 2016
286845c
Test adding undefined to default-valued parameters
sandersn Nov 3, 2016
00ff0e5
Do not add undefined to parameter properties
sandersn Nov 4, 2016
bb9b681
Merge branch 'master' into add-undefined-to-default-valued-parameters
sandersn Dec 8, 2016
96c14de
More tests:default-valued parameter+strictNullChecks
sandersn Dec 8, 2016
d62dd29
Merge branch 'master' into add-undefined-to-default-valued-parameters
sandersn Dec 13, 2016
caad486
More test cases and notes
sandersn Dec 13, 2016
bb6f3ad
Add parameter initialisers to control flow
sandersn Dec 14, 2016
f097eaf
More tests of parameter initialiser type
sandersn Dec 14, 2016
8b29e82
Merge branch 'master' into add-undefined-to-default-valued-parameters
sandersn Dec 16, 2016
6046318
Add `| undefined` in .d.ts for initialised params
sandersn Dec 16, 2016
739c083
More tests of initialised parameters adding undefined
sandersn Dec 16, 2016
cee708d
Remove undefined when checking patterns in function declarations
sandersn Dec 21, 2016
61c742a
Update tests
sandersn Dec 21, 2016
6543048
Change narrowing rules for parameter initialisers
sandersn Dec 21, 2016
3b1309d
Test parameter initialisation narrowing rules
sandersn Dec 21, 2016
e0bf73f
Remove old add-undefined code in getTypeOfParameter
sandersn Dec 21, 2016
156d5a9
Add `| undefined` to all optional properties too
sandersn Jan 5, 2017
8a9ee1a
Merge branch 'master' into add-undefined-to-default-valued-parameters
sandersn Jan 5, 2017
e96b17b
Merge branch 'master' into add-undefined-to-default-valued-parameters
sandersn Jan 26, 2017
01a9e4f
isOptionalParameter says unused IIFE arguments are optional
sandersn Jan 26, 2017
3c243db
Remove control flow-based undefined addition
sandersn Jan 27, 2017
bb40819
Update tests and baselines
sandersn Jan 27, 2017
a235d54
Remove undefined from initialized+annotated parameter type
sandersn Jan 30, 2017
7cf595a
Test removing undefined from initialized, annotated parameters
sandersn Jan 30, 2017
6f7c984
Address PR comments
sandersn Feb 1, 2017
6328e6c
Update baselines
sandersn Feb 1, 2017
c2cd4f6
Address PR comments and fix lint
sandersn Feb 13, 2017
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
3 changes: 2 additions & 1 deletion src/compiler/checker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3206,7 +3206,8 @@ namespace ts {
// Use the type of the initializer expression if one is present
if (declaration.initializer) {
const type = checkDeclarationInitializer(declaration);
return addOptionality(type, /*optional*/ declaration.questionToken && includeOptionality);
const isOptional = declaration.questionToken || (declaration.initializer && declaration.kind === SyntaxKind.Parameter);
return addOptionality(type, isOptional && includeOptionality);
}

// If it is a short-hand property assignment, use the type of the identifier
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
//// [defaultParameterAddsUndefinedWithStrictNullChecks.ts]
function f(addUndefined1 = "J", addUndefined2?: number) {
}


//// [defaultParameterAddsUndefinedWithStrictNullChecks.js]
function f(addUndefined1, addUndefined2) {
if (addUndefined1 === void 0) { addUndefined1 = "J"; }
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
=== tests/cases/compiler/defaultParameterAddsUndefinedWithStrictNullChecks.ts ===
function f(addUndefined1 = "J", addUndefined2?: number) {
>f : Symbol(f, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 0, 0))
>addUndefined1 : Symbol(addUndefined1, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 0, 11))
>addUndefined2 : Symbol(addUndefined2, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 0, 31))
}

Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
=== tests/cases/compiler/defaultParameterAddsUndefinedWithStrictNullChecks.ts ===
function f(addUndefined1 = "J", addUndefined2?: number) {
>f : (addUndefined1?: string | undefined, addUndefined2?: number | undefined) => void
>addUndefined1 : string | undefined
>"J" : "J"
>addUndefined2 : number | undefined
}

4 changes: 2 additions & 2 deletions tests/baselines/reference/optionalMethods.js
Original file line number Diff line number Diff line change
Expand Up @@ -128,11 +128,11 @@ interface Foo {
declare function test1(x: Foo): void;
declare class Bar {
d: number;
e: number;
e: number | undefined;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is incorrect -- because there was a non-undefined initializer, the property should not include undefined

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed.

a: number;
b?: number;
c?: number | undefined;
constructor(d?: number, e?: number);
constructor(d?: number, e?: number | undefined);
f(): number;
g?(): number;
h?(): number;
Expand Down
6 changes: 3 additions & 3 deletions tests/baselines/reference/optionalMethods.types
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ class Bar {

constructor(public d?: number, public e = 10) {}
>d : number | undefined
>e : number
>e : number | undefined
>10 : 10

f() {
Expand Down Expand Up @@ -133,9 +133,9 @@ function test2(x: Bar) {
>d : number | undefined

x.e;
>x.e : number
>x.e : number | undefined
>x : Bar
>e : number
>e : number | undefined

x.f;
>x.f : () => number
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
// @strictNullChecks: true
function f(addUndefined1 = "J", addUndefined2?: number) {
}