Skip to content
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 .prettierrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"printWidth": 80,
"printWidth": 140,
"tabWidth": 4,
"useTabs": false,
"semi": true,
Expand Down
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

- [ ] Update **Prettier** rules:

- [ ] **printWidth** should be around **140** characters per line.
- [x] **printWidth** should be around **140** characters per line.

- [ ] Find a way to keep a new line between **@inject** anotation and property declarations.

Expand All @@ -18,6 +18,8 @@

### v0.1.1

- Update Prettier rules (see #45).

- Update CODEBEAT project UUID (see #44).

- Update codeclimate settings (see #43).
Expand Down
16 changes: 4 additions & 12 deletions src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,7 @@
/**
* SignalCommandMap Extension
*/
export {
ISignalCommandMap
} from "./robotlegs/bender/extensions/signalCommandMap/api/ISignalCommandMap";
export {
SignalCommandMap
} from "./robotlegs/bender/extensions/signalCommandMap/impl/SignalCommandMap";
export {
SignalCommandTrigger
} from "./robotlegs/bender/extensions/signalCommandMap/impl/SignalCommandTrigger";
export {
SignalCommandMapExtension
} from "./robotlegs/bender/extensions/signalCommandMap/SignalCommandMapExtension";
export { ISignalCommandMap } from "./robotlegs/bender/extensions/signalCommandMap/api/ISignalCommandMap";
export { SignalCommandMap } from "./robotlegs/bender/extensions/signalCommandMap/impl/SignalCommandMap";
export { SignalCommandTrigger } from "./robotlegs/bender/extensions/signalCommandMap/impl/SignalCommandTrigger";
export { SignalCommandMapExtension } from "./robotlegs/bender/extensions/signalCommandMap/SignalCommandMapExtension";
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,7 @@
// in accordance with the terms of the license agreement accompanying it.
// ------------------------------------------------------------------------------

import {
MonoSignal,
OnceSignal,
Signal,
DeluxeSignal,
PrioritySignal
} from "@robotlegsjs/signals";
import { MonoSignal, OnceSignal, Signal, DeluxeSignal, PrioritySignal } from "@robotlegsjs/signals";

import { injectable, IContext, IExtension, UID } from "@robotlegsjs/core";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,7 @@ export class SignalCommandMap implements ISignalCommandMap {
constructor(@inject(IContext) context: IContext) {
this._injector = context.injector;
this._logger = context.getLogger(this);
this._triggerMap = new CommandTriggerMap(
this.getKey,
this.createTrigger.bind(this)
);
this._triggerMap = new CommandTriggerMap(this.getKey, this.createTrigger.bind(this));
}

/*============================================================================*/
Expand Down Expand Up @@ -87,11 +84,7 @@ export class SignalCommandMap implements ISignalCommandMap {
/*============================================================================*/

private createTrigger(signalClass: IClass<ISignal>): ICommandTrigger {
return new SignalCommandTrigger(
this._injector,
signalClass,
this._mappingProcessors
);
return new SignalCommandTrigger(this._injector, signalClass, this._mappingProcessors);
}

private getTrigger(signalClass: IClass<ISignal>): SignalCommandTrigger {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,23 +44,11 @@ export class SignalCommandTrigger implements ICommandTrigger {
/**
* @private
*/
constructor(
injector: IInjector,
signalClass: IClass<ISignal>,
processors?: Function[],
logger?: ILogger
) {
constructor(injector: IInjector, signalClass: IClass<ISignal>, processors?: Function[], logger?: ILogger) {
this._injector = injector;
this._signalClass = signalClass;
this._mappings = new CommandMappingList(
this,
processors ? processors : [],
logger
);
this._executor = new CommandExecutor(
injector,
this._mappings.removeMapping.bind(this._mappings)
);
this._mappings = new CommandMappingList(this, processors ? processors : [], logger);
this._executor = new CommandExecutor(injector, this._mappings.removeMapping.bind(this._mappings));
}

/*============================================================================*/
Expand Down Expand Up @@ -108,10 +96,7 @@ export class SignalCommandTrigger implements ICommandTrigger {
private routePayloadToCommands = (...valueObjects: any[]): void => {
let valueClasses: any[] = this._signal.valueClasses;

let payload: CommandPayload = new CommandPayload(
valueObjects,
valueClasses
);
let payload: CommandPayload = new CommandPayload(valueObjects, valueClasses);

this._executor.executeCommands(this._mappings.getList(), payload);
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,24 +11,9 @@ import sinon = require("sinon");

import { assert } from "chai";

import {
ISignal,
MonoSignal,
OnceSignal,
Signal,
DeluxeSignal,
PrioritySignal
} from "@robotlegsjs/signals";

import {
injectable,
IContext,
IInjector,
ICommandMapper,
ICommandUnmapper,
Context,
CommandMapper
} from "@robotlegsjs/core";
import { ISignal, MonoSignal, OnceSignal, Signal, DeluxeSignal, PrioritySignal } from "@robotlegsjs/signals";

import { injectable, IContext, IInjector, ICommandMapper, ICommandUnmapper, Context, CommandMapper } from "@robotlegsjs/core";

import { SignalCommandMap } from "../../../../../../src/robotlegs/bender/extensions/signalCommandMap/impl/SignalCommandMap";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,24 +11,9 @@ import sinon = require("sinon");

import { assert } from "chai";

import {
ISignal,
MonoSignal,
OnceSignal,
Signal,
DeluxeSignal,
PrioritySignal
} from "@robotlegsjs/signals";

import {
injectable,
IContext,
IInjector,
ICommandMapper,
ICommandUnmapper,
Context,
CommandMapper
} from "@robotlegsjs/core";
import { ISignal, MonoSignal, OnceSignal, Signal, DeluxeSignal, PrioritySignal } from "@robotlegsjs/signals";

import { injectable, IContext, IInjector, ICommandMapper, ICommandUnmapper, Context, CommandMapper } from "@robotlegsjs/core";

import { ISignalCommandMap } from "../../../../../../src/robotlegs/bender/extensions/signalCommandMap/api/ISignalCommandMap";
import { SignalCommandMap } from "../../../../../../src/robotlegs/bender/extensions/signalCommandMap/impl/SignalCommandMap";
Expand Down Expand Up @@ -62,11 +47,7 @@ describe("SignalCommandMap", () => {
reportedExecutions.push(itemClass);
}

function commandExecutionCount(
totalEvents: number = 1,
oneshot: boolean = false,
...valueObjects
): number {
function commandExecutionCount(totalEvents: number = 1, oneshot: boolean = false, ...valueObjects): number {
let executeCount: number = 0;

injector
Expand Down Expand Up @@ -183,13 +164,9 @@ describe("SignalCommandMap", () => {
injected = command.payload;
})
.whenTargetNamed("executeCallback");
signalCommandMap
.map(StrictPayloadCarryingSignal)
.toCommand(PayloadInjectedCallbackCommand);
signalCommandMap.map(StrictPayloadCarryingSignal).toCommand(PayloadInjectedCallbackCommand);
let payload: Payload = new Payload();
let signal: StrictPayloadCarryingSignal = injector.get(
StrictPayloadCarryingSignal
);
let signal: StrictPayloadCarryingSignal = injector.get(StrictPayloadCarryingSignal);

signal.dispatch(payload);

Expand Down Expand Up @@ -247,10 +224,7 @@ describe("SignalCommandMap", () => {

signal.dispatch();

assert.deepEqual(reportedExecutions, [
ReportingCommand,
ReportingCommand2
]);
assert.deepEqual(reportedExecutions, [ReportingCommand, ReportingCommand2]);
});

it("test_one_shot_command_should_not_cause_infinite_loop_when_dispatching_to_self", () => {
Expand Down Expand Up @@ -306,11 +280,7 @@ describe("SignalCommandMap", () => {

signal1.dispatch();

assert.deepEqual(reportedExecutions, [
ReportingCommand,
ReportingCommand2,
ReportingCommand3
]);
assert.deepEqual(reportedExecutions, [ReportingCommand, ReportingCommand2, ReportingCommand3]);
});

it("test_commands_are_executed_in_order", () => {
Expand All @@ -327,11 +297,7 @@ describe("SignalCommandMap", () => {

signal.dispatch();

assert.deepEqual(reportedExecutions, [
ReportingCommand,
ReportingCommand2,
ReportingCommand3
]);
assert.deepEqual(reportedExecutions, [ReportingCommand, ReportingCommand2, ReportingCommand3]);
});

it("test_hooks_are_called", () => {
Expand Down Expand Up @@ -375,28 +341,19 @@ describe("SignalCommandMap", () => {
});

it("test_command_executes_when_all_guards_allow", () => {
assert.equal(
commandExecutionCountWithGuards(HappyGuard, HappyGuard),
1
);
assert.equal(commandExecutionCountWithGuards(HappyGuard, HappyGuard), 1);
});

it("test_command_does_not_execute_when_the_guard_denies", () => {
assert.equal(commandExecutionCountWithGuards(GrumpyGuard), 0);
});

it("test_command_does_not_execute_when_any_guards_denies", () => {
assert.equal(
commandExecutionCountWithGuards(HappyGuard, GrumpyGuard),
0
);
assert.equal(commandExecutionCountWithGuards(HappyGuard, GrumpyGuard), 0);
});

it("test_command_does_not_execute_when_all_guards_deny", () => {
assert.equal(
commandExecutionCountWithGuards(GrumpyGuard, GrumpyGuard),
0
);
assert.equal(commandExecutionCountWithGuards(GrumpyGuard, GrumpyGuard), 0);
});

it("test_payload_is_injected_into_guard", () => {
Expand All @@ -415,9 +372,7 @@ describe("SignalCommandMap", () => {
.withGuards(PayloadInjectedGuard);

let payload: Payload = new Payload();
let signal: StrictPayloadCarryingSignal = injector.get(
StrictPayloadCarryingSignal
);
let signal: StrictPayloadCarryingSignal = injector.get(StrictPayloadCarryingSignal);

signal.dispatch(payload);

Expand All @@ -441,9 +396,7 @@ describe("SignalCommandMap", () => {
.withHooks(PayloadInjectedHook);

let payload: Payload = new Payload();
let signal: StrictPayloadCarryingSignal = injector.get(
StrictPayloadCarryingSignal
);
let signal: StrictPayloadCarryingSignal = injector.get(StrictPayloadCarryingSignal);

signal.dispatch(payload);

Expand All @@ -461,14 +414,10 @@ describe("SignalCommandMap", () => {
})
.whenTargetNamed("executeCallback");

signalCommandMap
.map(StrictPayloadCarryingSignal)
.toCommand(ExecuteMethodWithParametersCommand);
signalCommandMap.map(StrictPayloadCarryingSignal).toCommand(ExecuteMethodWithParametersCommand);

let payload: Payload = new Payload();
let signal: StrictPayloadCarryingSignal = injector.get(
StrictPayloadCarryingSignal
);
let signal: StrictPayloadCarryingSignal = injector.get(StrictPayloadCarryingSignal);

signal.dispatch(payload);

Expand All @@ -486,9 +435,7 @@ describe("SignalCommandMap", () => {
})
.whenTargetNamed("executeCallback");

signalCommandMap
.map(SupportSignal)
.toCommand(ExecuteMethodWithParametersCommand);
signalCommandMap.map(SupportSignal).toCommand(ExecuteMethodWithParametersCommand);

let payload: Payload = new Payload();
let signal: SupportSignal = injector.get(SupportSignal);
Expand Down Expand Up @@ -545,12 +492,7 @@ describe("SignalCommandMap", () => {

signal.dispatch();

assert.deepEqual(reportedExecutions, [
ReportingGuard,
ReportingCommand,
ReportingGuard2,
ReportingCommand2
]);
assert.deepEqual(reportedExecutions, [ReportingGuard, ReportingCommand, ReportingGuard2, ReportingCommand2]);
});

it("test_previously_constructed_command_does_not_slip_through_the_loop", () => {
Expand Down
Loading