Skip to content
This repository was archived by the owner on Feb 22, 2018. It is now read-only.

Commit dfd0c1f

Browse files
author
Olivier Chafik
committed
Use destructuring assignments for named parameters (#180)
Before: let onMatch = opts && 'onMatch' in opts ? opts.onMatch : null; let onNonMatch = opts && 'onNonMatch' in opts ? opts.onNonMatch : null; After: let {onMatch = null, onNonMatch = null} = opts || {};
1 parent d1ad87f commit dfd0c1f

32 files changed

+748
-310
lines changed

‎lib/runtime/dart/_interceptors.js

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -209,14 +209,14 @@ dart_library.library('dart/_interceptors', null, /* Imports */[
209209
return _internal.IterableMixinWorkaround.fold(this, initialValue, combine);
210210
}
211211
[dartx.firstWhere](test, opts) {
212+
let {orElse = null} = opts || {};
212213
dart.as(test, dart.functionType(core.bool, [E]));
213-
let orElse = opts && 'orElse' in opts ? opts.orElse : null;
214214
dart.as(orElse, dart.functionType(E, []));
215215
return dart.as(_internal.IterableMixinWorkaround.firstWhere(this, test, orElse), E);
216216
}
217217
[dartx.lastWhere](test, opts) {
218+
let {orElse = null} = opts || {};
218219
dart.as(test, dart.functionType(core.bool, [E]));
219-
let orElse = opts && 'orElse' in opts ? opts.orElse : null;
220220
dart.as(orElse, dart.functionType(E, []));
221221
return dart.as(_internal.IterableMixinWorkaround.lastWhereList(this, test, orElse), E);
222222
}
@@ -346,7 +346,7 @@ dart_library.library('dart/_interceptors', null, /* Imports */[
346346
return collection.ListBase.listToString(this);
347347
}
348348
[dartx.toList](opts) {
349-
let growable = opts && 'growable' in opts ? opts.growable : true;
349+
let {growable = true} = opts || {};
350350
let list = this.slice();
351351
if (!dart.notNull(growable))
352352
JSArray$().markFixedList(dart.as(list, core.List));
@@ -1006,8 +1006,7 @@ dart_library.library('dart/_interceptors', null, /* Imports */[
10061006
return this[dartx.splitMapJoin](from, {onMatch: convert});
10071007
}
10081008
[dartx.splitMapJoin](from, opts) {
1009-
let onMatch = opts && 'onMatch' in opts ? opts.onMatch : null;
1010-
let onNonMatch = opts && 'onNonMatch' in opts ? opts.onNonMatch : null;
1009+
let {onMatch = null, onNonMatch = null} = opts || {};
10111010
return dart.as(_js_helper.stringReplaceAllFuncUnchecked(this, from, onMatch, onNonMatch), core.String);
10121011
}
10131012
[dartx.replaceFirst](from, to, startIndex) {

‎lib/runtime/dart/_internal.js

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@ dart_library.library('dart/_internal', null, /* Imports */[
8484
return false;
8585
}
8686
firstWhere(test, opts) {
87+
let {orElse = null} = opts || {};
8788
dart.as(test, dart.functionType(core.bool, [E]));
88-
let orElse = opts && 'orElse' in opts ? opts.orElse : null;
8989
dart.as(orElse, dart.functionType(E, []));
9090
let length = this.length;
9191
for (let i = 0; dart.notNull(i) < dart.notNull(length); i = dart.notNull(i) + 1) {
@@ -101,8 +101,8 @@ dart_library.library('dart/_internal', null, /* Imports */[
101101
dart.throw(IterableElementError.noElement());
102102
}
103103
lastWhere(test, opts) {
104+
let {orElse = null} = opts || {};
104105
dart.as(test, dart.functionType(core.bool, [E]));
105-
let orElse = opts && 'orElse' in opts ? opts.orElse : null;
106106
dart.as(orElse, dart.functionType(E, []));
107107
let length = this.length;
108108
for (let i = dart.notNull(length) - 1; dart.notNull(i) >= 0; i = dart.notNull(i) - 1) {
@@ -219,7 +219,7 @@ dart_library.library('dart/_internal', null, /* Imports */[
219219
return super.takeWhile(test);
220220
}
221221
toList(opts) {
222-
let growable = opts && 'growable' in opts ? opts.growable : true;
222+
let {growable = true} = opts || {};
223223
let result = null;
224224
if (dart.notNull(growable)) {
225225
result = core.List$(E).new();
@@ -358,7 +358,7 @@ dart_library.library('dart/_internal', null, /* Imports */[
358358
}
359359
}
360360
toList(opts) {
361-
let growable = opts && 'growable' in opts ? opts.growable : true;
361+
let {growable = true} = opts || {};
362362
let start = this[_start];
363363
let end = this[_iterable][dartx.length];
364364
if (this[_endOrLength] != null && dart.notNull(this[_endOrLength]) < dart.notNull(end))
@@ -620,7 +620,7 @@ dart_library.library('dart/_internal', null, /* Imports */[
620620
super.IterableBase();
621621
}
622622
get iterator() {
623-
return new (ExpandIterator$(S, T))(this[_iterable][dartx.iterator], dart.as(this[_f], __CastType0));
623+
return new (ExpandIterator$(S, T))(this[_iterable][dartx.iterator], dart.as(this[_f], __CastType0$(S, T)));
624624
}
625625
}
626626
dart.setSignature(ExpandIterable, {
@@ -973,24 +973,24 @@ dart_library.library('dart/_internal', null, /* Imports */[
973973
return false;
974974
}
975975
firstWhere(test, opts) {
976+
let {orElse = null} = opts || {};
976977
dart.as(test, dart.functionType(core.bool, [E]));
977-
let orElse = opts && 'orElse' in opts ? opts.orElse : null;
978978
dart.as(orElse, dart.functionType(E, []));
979979
if (orElse != null)
980980
return orElse();
981981
dart.throw(IterableElementError.noElement());
982982
}
983983
lastWhere(test, opts) {
984+
let {orElse = null} = opts || {};
984985
dart.as(test, dart.functionType(core.bool, [E]));
985-
let orElse = opts && 'orElse' in opts ? opts.orElse : null;
986986
dart.as(orElse, dart.functionType(E, []));
987987
if (orElse != null)
988988
return orElse();
989989
dart.throw(IterableElementError.noElement());
990990
}
991991
singleWhere(test, opts) {
992+
let {orElse = null} = opts || {};
992993
dart.as(test, dart.functionType(core.bool, [E]));
993-
let orElse = opts && 'orElse' in opts ? opts.orElse : null;
994994
dart.as(orElse, dart.functionType(E, []));
995995
if (orElse != null)
996996
return orElse();
@@ -1034,7 +1034,7 @@ dart_library.library('dart/_internal', null, /* Imports */[
10341034
return this;
10351035
}
10361036
toList(opts) {
1037-
let growable = opts && 'growable' in opts ? opts.growable : true;
1037+
let {growable = true} = opts || {};
10381038
return dart.notNull(growable) ? dart.list([], E) : core.List$(E).new(0);
10391039
}
10401040
toSet() {
@@ -1317,7 +1317,7 @@ dart_library.library('dart/_internal', null, /* Imports */[
13171317
}
13181318
where(iterable, f) {
13191319
dart.as(f, dart.functionType(core.bool, [dart.dynamic]));
1320-
return new (WhereIterable$(T))(dart.as(iterable, core.Iterable$(T)), dart.as(f, __CastType2));
1320+
return new (WhereIterable$(T))(dart.as(iterable, core.Iterable$(T)), dart.as(f, __CastType2$(T)));
13211321
}
13221322
static map(iterable, f) {
13231323
dart.as(f, dart.functionType(dart.dynamic, [dart.dynamic]));

‎lib/runtime/dart/_isolate_helper.js

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ dart_library.library('dart/_isolate_helper', null, /* Imports */[
3535
let _receivePort = Symbol('_receivePort');
3636
class _Serializer extends core.Object {
3737
_Serializer(opts) {
38-
let serializeSendPorts = opts && 'serializeSendPorts' in opts ? opts.serializeSendPorts : true;
38+
let {serializeSendPorts = true} = opts || {};
3939
this.serializedObjectIds = core.Map$(dart.dynamic, core.int).identity();
4040
this[_serializeSendPorts] = dart.as(serializeSendPorts, core.bool);
4141
}
@@ -192,7 +192,7 @@ dart_library.library('dart/_isolate_helper', null, /* Imports */[
192192
let _adjustSendPorts = Symbol('_adjustSendPorts');
193193
class _Deserializer extends core.Object {
194194
_Deserializer(opts) {
195-
let adjustSendPorts = opts && 'adjustSendPorts' in opts ? opts.adjustSendPorts : true;
195+
let {adjustSendPorts = true} = opts || {};
196196
this.deserializedObjects = core.List.new();
197197
this[_adjustSendPorts] = dart.as(adjustSendPorts, core.bool);
198198
}
@@ -1413,9 +1413,7 @@ dart_library.library('dart/_isolate_helper', null, /* Imports */[
14131413
this[_rawPort].handler = dart.bind(this[_controller], 'add');
14141414
}
14151415
listen(onData, opts) {
1416-
let onError = opts && 'onError' in opts ? opts.onError : null;
1417-
let onDone = opts && 'onDone' in opts ? opts.onDone : null;
1418-
let cancelOnError = opts && 'cancelOnError' in opts ? opts.cancelOnError : null;
1416+
let {onError = null, onDone = null, cancelOnError = null} = opts || {};
14191417
return this[_controller].stream.listen(onData, {onError: onError, onDone: onDone, cancelOnError: cancelOnError});
14201418
}
14211419
close() {

‎lib/runtime/dart/_js_helper.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ dart_library.library('dart/_js_helper', null, /* Imports */[
3232
});
3333
class JsPeerInterface extends core.Object {
3434
JsPeerInterface(opts) {
35-
let name = opts && 'name' in opts ? opts.name : null;
35+
let {name = null} = opts || {};
3636
this.name = name;
3737
}
3838
}
@@ -80,8 +80,7 @@ dart_library.library('dart/_js_helper', null, /* Imports */[
8080
return `RegExp/${this.pattern}/`;
8181
}
8282
JSSyntaxRegExp(source, opts) {
83-
let multiLine = opts && 'multiLine' in opts ? opts.multiLine : false;
84-
let caseSensitive = opts && 'caseSensitive' in opts ? opts.caseSensitive : true;
83+
let {multiLine = false, caseSensitive = true} = opts || {};
8584
this.pattern = source;
8685
this[_nativeRegExp] = JSSyntaxRegExp.makeNative(source, multiLine, caseSensitive, false);
8786
this[_nativeGlobalRegExp] = null;

0 commit comments

Comments
 (0)