Skip to content

Commit 8ffe5ee

Browse files
tiagoschenkeltiagoschenkel
authored
Merge pull request #40 from RobotlegsJS/prettier
Update Prettier Rules
2 parents 01d95be + 7e759c2 commit 8ffe5ee

28 files changed

+99
-418
lines changed

‎.prettierrc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"printWidth": 80,
2+
"printWidth": 140,
33
"tabWidth": 4,
44
"useTabs": false,
55
"semi": true,

‎CHANGELOG.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,9 @@
66

77
- [ ] Use [**Function Types**](https://www.typescriptlang.org/docs/handbook/functions.html) for handlers and callbacks instead of generic **Function** type.
88

9-
- [ ] Update **Prettier** rules:
9+
- [x] Update **Prettier** rules:
1010

11-
- [ ] **printWidth** should be around **140** characters per line.
12-
13-
- [ ] Find a way to keep a new line between **@inject** anotation and property declarations.
11+
- [x] **printWidth** should be around **140** characters per line.
1412

1513
- [ ] Improve Code Coverage to reach 100%.
1614

@@ -20,6 +18,8 @@
2018

2119
### v0.0.13
2220

21+
- Update Prettier rules (see #40).
22+
2323
- Update CODEBEAT project UUID (see #38).
2424

2525
- Update dev dependencies to latest version.

‎src/index.ts‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
export { DeluxeSignal } from "./org/osflash/signals/DeluxeSignal";
22
export { GenericEvent } from "./org/osflash/signals/events/GenericEvent";
3-
export {
4-
IBubbleEventHandler
5-
} from "./org/osflash/signals/events/IBubbleEventHandler";
3+
export { IBubbleEventHandler } from "./org/osflash/signals/events/IBubbleEventHandler";
64
export { IEvent } from "./org/osflash/signals/events/IEvent";
75
export { IOnceSignal } from "./org/osflash/signals/IOnceSignal";
86
export { IPrioritySignal } from "./org/osflash/signals/IPrioritySignal";

‎src/org/osflash/signals/DeluxeSignal.ts‎

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,7 @@ export class DeluxeSignal extends PrioritySignal {
3535
*/
3636
constructor(target: Object = null, ...valueClasses) {
3737
// Cannot use super.apply(null, valueClasses), so allow the subclass to call super(valueClasses).
38-
valueClasses =
39-
valueClasses.length === 1 && valueClasses[0] instanceof Array
40-
? valueClasses[0]
41-
: valueClasses;
38+
valueClasses = valueClasses.length === 1 && valueClasses[0] instanceof Array ? valueClasses[0] : valueClasses;
4239

4340
super(valueClasses);
4441

@@ -73,32 +70,18 @@ export class DeluxeSignal extends PrioritySignal {
7370

7471
if (numValueObjects < numValueClasses) {
7572
throw new Error(
76-
"Incorrect number of arguments. " +
77-
"Expected at least " +
78-
numValueClasses +
79-
" but received " +
80-
numValueObjects +
81-
"."
73+
"Incorrect number of arguments. " + "Expected at least " + numValueClasses + " but received " + numValueObjects + "."
8274
);
8375
}
8476

8577
// Cannot dispatch differently typed objects than declared classes.
8678
for (let i: number = 0; i < numValueClasses; i++) {
8779
// Optimized for the optimistic case that values are correct.
88-
if (
89-
valueObjects[i] === null ||
90-
valueObjects[i].constructor === this._valueClasses[i]
91-
) {
80+
if (valueObjects[i] === null || valueObjects[i].constructor === this._valueClasses[i]) {
9281
continue;
9382
}
9483

95-
throw new Error(
96-
"Value object <" +
97-
valueObjects[i] +
98-
"> is not an instance of <" +
99-
this._valueClasses[i] +
100-
">."
101-
);
84+
throw new Error("Value object <" + valueObjects[i] + "> is not an instance of <" + this._valueClasses[i] + ">.");
10285
}
10386

10487
// Extract and clone event object if necessary.

‎src/org/osflash/signals/MonoSignal.ts‎

Lines changed: 6 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,7 @@ export class MonoSignal implements ISignal {
2929
*/
3030
constructor(...valueClasses) {
3131
// Cannot use super.apply(null, valueClasses), so allow the subclass to call super(valueClasses).
32-
this.valueClasses =
33-
valueClasses.length === 1 && valueClasses[0] instanceof Array
34-
? valueClasses[0]
35-
: valueClasses;
32+
this.valueClasses = valueClasses.length === 1 && valueClasses[0] instanceof Array ? valueClasses[0] : valueClasses;
3633
}
3734

3835
/**
@@ -116,12 +113,7 @@ export class MonoSignal implements ISignal {
116113
// Cannot dispatch fewer objects than declared classes.
117114
if (numValueObjects < numValueClasses) {
118115
throw new Error(
119-
"Incorrect number of arguments. " +
120-
"Expected at least " +
121-
numValueClasses +
122-
" but received " +
123-
numValueObjects +
124-
"."
116+
"Incorrect number of arguments. " + "Expected at least " + numValueClasses + " but received " + numValueObjects + "."
125117
);
126118
}
127119

@@ -130,19 +122,12 @@ export class MonoSignal implements ISignal {
130122
// Optimized for the optimistic case that values are correct.
131123
if (
132124
valueObjects[i] === null ||
133-
(valueObjects[i] instanceof this._valueClasses[i] ||
134-
valueObjects[i].constructor === this._valueClasses[i])
125+
(valueObjects[i] instanceof this._valueClasses[i] || valueObjects[i].constructor === this._valueClasses[i])
135126
) {
136127
continue;
137128
}
138129

139-
throw new Error(
140-
"Value object <" +
141-
valueObjects[i] +
142-
"> is not an instance of <" +
143-
this._valueClasses[i] +
144-
">."
145-
);
130+
throw new Error("Value object <" + valueObjects[i] + "> is not an instance of <" + this._valueClasses[i] + ">.");
146131
}
147132

148133
// Broadcast to the one listener.
@@ -151,15 +136,10 @@ export class MonoSignal implements ISignal {
151136
}
152137
}
153138

154-
protected registerListener(
155-
listener: Function,
156-
once: boolean = false
157-
): ISlot {
139+
protected registerListener(listener: Function, once: boolean = false): ISlot {
158140
if (this.slot) {
159141
// If the listener exits previously added, definitely don't add it.
160-
throw new Error(
161-
"You cannot add or addOnce with a listener already added, remove the current listener first."
162-
);
142+
throw new Error("You cannot add or addOnce with a listener already added, remove the current listener first.");
163143
}
164144

165145
return (this.slot = new Slot(listener, this, once));

‎src/org/osflash/signals/OnceSignal.ts‎

Lines changed: 6 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,7 @@ export class OnceSignal implements IOnceSignal {
3636
*/
3737
constructor(...valueClasses) {
3838
// Cannot use super.apply(null, valueClasses), so allow the subclass to call super(valueClasses).
39-
this.valueClasses =
40-
valueClasses.length === 1 && valueClasses[0] instanceof Array
41-
? valueClasses[0]
42-
: valueClasses;
39+
this.valueClasses = valueClasses.length === 1 && valueClasses[0] instanceof Array ? valueClasses[0] : valueClasses;
4340
}
4441

4542
/**
@@ -112,12 +109,7 @@ export class OnceSignal implements IOnceSignal {
112109
// Cannot dispatch fewer objects than declared classes.
113110
if (numValueObjects < numValueClasses) {
114111
throw new Error(
115-
"Incorrect number of arguments. " +
116-
"Expected at least " +
117-
numValueClasses +
118-
" but received " +
119-
numValueObjects +
120-
"."
112+
"Incorrect number of arguments. " + "Expected at least " + numValueClasses + " but received " + numValueObjects + "."
121113
);
122114
}
123115

@@ -126,19 +118,12 @@ export class OnceSignal implements IOnceSignal {
126118
// Optimized for the optimistic case that values are correct.
127119
if (
128120
valueObjects[i] === null ||
129-
(valueObjects[i] instanceof this._valueClasses[i] ||
130-
valueObjects[i].constructor === this._valueClasses[i])
121+
(valueObjects[i] instanceof this._valueClasses[i] || valueObjects[i].constructor === this._valueClasses[i])
131122
) {
132123
continue;
133124
}
134125

135-
throw new Error(
136-
"Value object <" +
137-
valueObjects[i] +
138-
"> is not an instance of <" +
139-
this._valueClasses[i] +
140-
">."
141-
);
126+
throw new Error("Value object <" + valueObjects[i] + "> is not an instance of <" + this._valueClasses[i] + ">.");
142127
}
143128

144129
// Broadcast to listeners.
@@ -151,10 +136,7 @@ export class OnceSignal implements IOnceSignal {
151136
}
152137
}
153138

154-
protected registerListener(
155-
listener: Function,
156-
once: boolean = false
157-
): ISlot {
139+
protected registerListener(listener: Function, once: boolean = false): ISlot {
158140
if (this.registrationPossible(listener, once)) {
159141
let newSlot: ISlot = new Slot(listener, this, once);
160142
this.slots = this.slots.prepend(newSlot);
@@ -177,9 +159,7 @@ export class OnceSignal implements IOnceSignal {
177159
if (existingSlot.once !== once) {
178160
// If the listener was previously added, definitely don't add it again.
179161
// But throw an exception if their once values differ.
180-
throw new Error(
181-
"You cannot addOnce() then add() the same listener without removing the relationship first."
182-
);
162+
throw new Error("You cannot addOnce() then add() the same listener without removing the relationship first.");
183163
}
184164

185165
return false; // Listener was already registered.

‎src/org/osflash/signals/PrioritySignal.ts‎

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,7 @@ import { Slot } from "./Slot";
66
export class PrioritySignal extends Signal implements IPrioritySignal {
77
constructor(...valueClasses) {
88
// Cannot use super.apply(null, valueClasses), so allow the subclass to call super(valueClasses).
9-
valueClasses =
10-
valueClasses.length === 1 && valueClasses[0] instanceof Array
11-
? valueClasses[0]
12-
: valueClasses;
9+
valueClasses = valueClasses.length === 1 && valueClasses[0] instanceof Array ? valueClasses[0] : valueClasses;
1310

1411
super(valueClasses);
1512
}
@@ -28,26 +25,16 @@ export class PrioritySignal extends Signal implements IPrioritySignal {
2825
* @throws flash.errors.IllegalOperationError <code>IllegalOperationError</code>: You cannot addOnce() then add() the same listener without removing the relationship first.
2926
* @throws ArgumentError <code>ArgumentError</code>: Given listener is <code>null</code>.
3027
*/
31-
public addOnceWithPriority(
32-
listener: Function,
33-
priority: number = 0
34-
): ISlot {
28+
public addOnceWithPriority(listener: Function, priority: number = 0): ISlot {
3529
return this.registerListenerWithPriority(listener, true, priority);
3630
}
3731

3832
/*override*/
39-
protected registerListener(
40-
listener: Function,
41-
once: boolean = false
42-
): ISlot {
33+
protected registerListener(listener: Function, once: boolean = false): ISlot {
4334
return this.registerListenerWithPriority(listener, once);
4435
}
4536

46-
protected registerListenerWithPriority(
47-
listener: Function,
48-
once: boolean = false,
49-
priority: number = 0
50-
): ISlot {
37+
protected registerListenerWithPriority(listener: Function, once: boolean = false, priority: number = 0): ISlot {
5138
if (this.registrationPossible(listener, once)) {
5239
let slot: ISlot = new Slot(listener, this, once, priority);
5340
this.slots = this.slots.insertWithPriority(slot);

‎src/org/osflash/signals/Signal.ts‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,7 @@ export class Signal extends OnceSignal implements ISignal {
3232
*/
3333
constructor(...valueClasses) {
3434
// Cannot use super.apply(null, valueClasses), so allow the subclass to call super(valueClasses).
35-
valueClasses =
36-
valueClasses.length === 1 && valueClasses[0] instanceof Array
37-
? valueClasses[0]
38-
: valueClasses;
35+
valueClasses = valueClasses.length === 1 && valueClasses[0] instanceof Array ? valueClasses[0] : valueClasses;
3936

4037
super(valueClasses);
4138
}

‎src/org/osflash/signals/Slot.ts‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,7 @@ export class Slot implements ISlot {
2626
* @throws ArgumentError <code>ArgumentError</code>: Given listener is <code>null</code>.
2727
* @throws Error <code>Error</code>: Internal signal reference has not been set yet.
2828
*/
29-
constructor(
30-
listener: Function,
31-
signal: IOnceSignal,
32-
once: boolean = false,
33-
priority: number = 0
34-
) {
29+
constructor(listener: Function, signal: IOnceSignal, once: boolean = false, priority: number = 0) {
3530
this._listener = listener;
3631
this._once = once;
3732
this._signal = signal;
@@ -122,9 +117,7 @@ export class Slot implements ISlot {
122117

123118
public set listener(value: Function) {
124119
if (null == value) {
125-
throw new Error(
126-
"Given listener is null.\nDid you want to set enabled to false instead?"
127-
);
120+
throw new Error("Given listener is null.\nDid you want to set enabled to false instead?");
128121
}
129122

130123
this.verifyListener(value);

‎src/org/osflash/signals/SlotList.ts‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,7 @@ export class SlotList {
3333
constructor(head: ISlot, tail: SlotList = null) {
3434
if (!head && !tail) {
3535
if (SlotList.NIL) {
36-
throw new Error(
37-
"Parameters head and tail are null. Use the NIL element instead."
38-
);
36+
throw new Error("Parameters head and tail are null. Use the NIL element instead.");
3937
}
4038

4139
// this is the NIL element as per definition

0 commit comments

Comments
 (0)