From 7d81a55380e907657a79ae696e39792a05044e1d Mon Sep 17 00:00:00 2001 From: Tiago Schenkel Date: Mon, 12 Mar 2018 19:53:30 +0100 Subject: [PATCH 1/4] udpate prettier rules to support 140 chars per line --- .prettierrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.prettierrc b/.prettierrc index 252778e..da47411 100644 --- a/.prettierrc +++ b/.prettierrc @@ -1,5 +1,5 @@ { - "printWidth": 80, + "printWidth": 140, "tabWidth": 4, "useTabs": false, "semi": true, From e20344ef356b1a30e84c6040b78a1df92461a472 Mon Sep 17 00:00:00 2001 From: Tiago Schenkel Date: Mon, 12 Mar 2018 19:54:02 +0100 Subject: [PATCH 2/4] update changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d508c08..6774b5e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,8 @@ ### v0.1.1 +- Update Prettier rules (see #45). + - Update CODEBEAT project UUID (see #44). - Update codeclimate settings (see #43). From f0ed694cc236b42f735c4f0a9b8f3d5bf20d9931 Mon Sep 17 00:00:00 2001 From: Tiago Schenkel Date: Mon, 12 Mar 2018 19:54:23 +0100 Subject: [PATCH 3/4] code formatting --- src/index.ts | 16 +--- .../SignalCommandMapExtension.ts | 8 +- .../signalCommandMap/impl/SignalCommandMap.ts | 11 +-- .../impl/SignalCommandTrigger.ts | 23 +---- .../impl/signalCommandMap.test.ts | 21 +---- .../impl/signalCommandMapIntegration.test.ts | 94 ++++--------------- .../impl/signalCommandTrigger.test.ts | 38 +------- .../signalCommandMapExtension.test.ts | 4 +- 8 files changed, 38 insertions(+), 177 deletions(-) diff --git a/src/index.ts b/src/index.ts index 9801797..056a89a 100644 --- a/src/index.ts +++ b/src/index.ts @@ -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"; diff --git a/src/robotlegs/bender/extensions/signalCommandMap/SignalCommandMapExtension.ts b/src/robotlegs/bender/extensions/signalCommandMap/SignalCommandMapExtension.ts index e0e304c..a20c3b0 100644 --- a/src/robotlegs/bender/extensions/signalCommandMap/SignalCommandMapExtension.ts +++ b/src/robotlegs/bender/extensions/signalCommandMap/SignalCommandMapExtension.ts @@ -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"; diff --git a/src/robotlegs/bender/extensions/signalCommandMap/impl/SignalCommandMap.ts b/src/robotlegs/bender/extensions/signalCommandMap/impl/SignalCommandMap.ts index a6d3fe1..329dacb 100644 --- a/src/robotlegs/bender/extensions/signalCommandMap/impl/SignalCommandMap.ts +++ b/src/robotlegs/bender/extensions/signalCommandMap/impl/SignalCommandMap.ts @@ -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)); } /*============================================================================*/ @@ -87,11 +84,7 @@ export class SignalCommandMap implements ISignalCommandMap { /*============================================================================*/ private createTrigger(signalClass: IClass): ICommandTrigger { - return new SignalCommandTrigger( - this._injector, - signalClass, - this._mappingProcessors - ); + return new SignalCommandTrigger(this._injector, signalClass, this._mappingProcessors); } private getTrigger(signalClass: IClass): SignalCommandTrigger { diff --git a/src/robotlegs/bender/extensions/signalCommandMap/impl/SignalCommandTrigger.ts b/src/robotlegs/bender/extensions/signalCommandMap/impl/SignalCommandTrigger.ts index 322865a..112a7bc 100644 --- a/src/robotlegs/bender/extensions/signalCommandMap/impl/SignalCommandTrigger.ts +++ b/src/robotlegs/bender/extensions/signalCommandMap/impl/SignalCommandTrigger.ts @@ -44,23 +44,11 @@ export class SignalCommandTrigger implements ICommandTrigger { /** * @private */ - constructor( - injector: IInjector, - signalClass: IClass, - processors?: Function[], - logger?: ILogger - ) { + constructor(injector: IInjector, signalClass: IClass, 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)); } /*============================================================================*/ @@ -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); }; diff --git a/test/robotlegs/bender/extensions/signalCommandMap/impl/signalCommandMap.test.ts b/test/robotlegs/bender/extensions/signalCommandMap/impl/signalCommandMap.test.ts index 7f502fd..e3e9018 100644 --- a/test/robotlegs/bender/extensions/signalCommandMap/impl/signalCommandMap.test.ts +++ b/test/robotlegs/bender/extensions/signalCommandMap/impl/signalCommandMap.test.ts @@ -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"; diff --git a/test/robotlegs/bender/extensions/signalCommandMap/impl/signalCommandMapIntegration.test.ts b/test/robotlegs/bender/extensions/signalCommandMap/impl/signalCommandMapIntegration.test.ts index 671a4a0..63f82e4 100644 --- a/test/robotlegs/bender/extensions/signalCommandMap/impl/signalCommandMapIntegration.test.ts +++ b/test/robotlegs/bender/extensions/signalCommandMap/impl/signalCommandMapIntegration.test.ts @@ -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"; @@ -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 @@ -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); @@ -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", () => { @@ -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", () => { @@ -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", () => { @@ -375,10 +341,7 @@ 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", () => { @@ -386,17 +349,11 @@ describe("SignalCommandMap", () => { }); 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", () => { @@ -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); @@ -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); @@ -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); @@ -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); @@ -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", () => { diff --git a/test/robotlegs/bender/extensions/signalCommandMap/impl/signalCommandTrigger.test.ts b/test/robotlegs/bender/extensions/signalCommandMap/impl/signalCommandTrigger.test.ts index e97178d..af7906e 100644 --- a/test/robotlegs/bender/extensions/signalCommandMap/impl/signalCommandTrigger.test.ts +++ b/test/robotlegs/bender/extensions/signalCommandMap/impl/signalCommandTrigger.test.ts @@ -11,21 +11,9 @@ import sinon = require("sinon"); import { assert } from "chai"; -import { - ISignal, - MonoSignal, - OnceSignal, - Signal, - DeluxeSignal, - PrioritySignal -} from "@robotlegsjs/signals"; - -import { - injectable, - IInjector, - RobotlegsInjector, - CommandMapper -} from "@robotlegsjs/core"; +import { ISignal, MonoSignal, OnceSignal, Signal, DeluxeSignal, PrioritySignal } from "@robotlegsjs/signals"; + +import { injectable, IInjector, RobotlegsInjector, CommandMapper } from "@robotlegsjs/core"; import { SignalCommandTrigger } from "../../../../../../src/robotlegs/bender/extensions/signalCommandMap/impl/SignalCommandTrigger"; @@ -146,15 +134,7 @@ describe("SignalCommandTrigger", () => { }); it("command_is_triggered_but_do_not_receives_parameters_from_signal_without_value_classes", () => { - const parameters: any[] = [ - true, - 999, - "I'm a string!", - ISignal, - { x: 5, y: 5 }, - new Date(), - [1, 2, 3, 4, 5, 6, 7, 8, 9] - ]; + const parameters: any[] = [true, 999, "I'm a string!", ISignal, { x: 5, y: 5 }, new Date(), [1, 2, 3, 4, 5, 6, 7, 8, 9]]; const expected: any[] = []; let actual: any[] = []; @@ -176,15 +156,7 @@ describe("SignalCommandTrigger", () => { }); it("command_is_triggered_and_receives_parameters_from_signal_with_value_classes", () => { - const expected: any[] = [ - true, - 999, - "I'm a string!", - ISignal, - { x: 5, y: 5 }, - new Date(), - [1, 2, 3, 4, 5, 6, 7, 8, 9] - ]; + const expected: any[] = [true, 999, "I'm a string!", ISignal, { x: 5, y: 5 }, new Date(), [1, 2, 3, 4, 5, 6, 7, 8, 9]]; let actual: any[] = []; let mapper: CommandMapper; diff --git a/test/robotlegs/bender/extensions/signalCommandMap/signalCommandMapExtension.test.ts b/test/robotlegs/bender/extensions/signalCommandMap/signalCommandMapExtension.test.ts index fe9b64c..fee3746 100644 --- a/test/robotlegs/bender/extensions/signalCommandMap/signalCommandMapExtension.test.ts +++ b/test/robotlegs/bender/extensions/signalCommandMap/signalCommandMapExtension.test.ts @@ -46,9 +46,7 @@ describe("SignalCommandMapExtension", () => { context.install(SignalCommandMapExtension); context.initialize(); - let instance: ISignalCommandMap = context.injector.get< - ISignalCommandMap - >(ISignalCommandMap); + let instance: ISignalCommandMap = context.injector.get(ISignalCommandMap); instance.map(RelaySignal).toCommand(RelayCommand); instance.map(TargetSignal).toCommand(TargetCommand); From 11a72d9a8ce68299306bbe1dcabb02e69fb92c9a Mon Sep 17 00:00:00 2001 From: Tiago Schenkel Date: Mon, 12 Mar 2018 19:55:41 +0100 Subject: [PATCH 4/4] update changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6774b5e..d4bbbd8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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.