From 0a46eefb700adb30a21bd9173bf64b03f468c99d Mon Sep 17 00:00:00 2001 From: Philipp Spiess Date: Sat, 13 Oct 2018 18:19:28 +0200 Subject: [PATCH] Run prettier on all files --- package.json | 4 +-- type-definitions/ReComponent.d.ts | 36 ++++++++++++++--------- type-definitions/__tests__/ReComponent.js | 31 +++++++++++-------- type-definitions/ts-tests/exports.ts | 11 +++++-- type-definitions/ts-tests/updateTypes.ts | 7 ++++- 5 files changed, 57 insertions(+), 32 deletions(-) diff --git a/package.json b/package.json index 66b1b98..73233ae 100644 --- a/package.json +++ b/package.json @@ -32,8 +32,8 @@ }, "scripts": { "test": "run-p test:js test:types:*", - "prettier": "prettier {{__tests__,src,type-definitions}/**.{js,flow},README.md}", - "format": "prettier --write", + "prettier": "prettier {{__tests__,src,type-definitions}/**/*.{js,flow,ts},README.md}", + "format": "yarn prettier --write", "test:js": "jest", "test:types:ts": "yarn build && tsc ./type-definitions/ReComponent.d.ts --lib es2015 && dtslint type-definitions/ts-tests", "test:types:flow": "flow check .", diff --git a/type-definitions/ReComponent.d.ts b/type-definitions/ReComponent.d.ts index 8590d76..52676dd 100644 --- a/type-definitions/ReComponent.d.ts +++ b/type-definitions/ReComponent.d.ts @@ -4,36 +4,36 @@ export enum UpdateType { NO_UPDATE = 0, UPDATE = 1, SIDE_EFFECTS = 2, - UPDATE_WITH_SIDE_EFFECTS = 3, + UPDATE_WITH_SIDE_EFFECTS = 3 } export type SideEffect = (this: T) => any; export type NoUpdateAction = { type: UpdateType.NO_UPDATE; -} +}; export type UpdateAction = { type: UpdateType.UPDATE; state: T; -} +}; export type SideEffectsAction = { type: UpdateType.SIDE_EFFECTS; sideEffects: SideEffect; -} +}; export type UpdateWithSideEffectsAction = { type: UpdateType.UPDATE_WITH_SIDE_EFFECTS; state: S; sideEffects: SideEffect; -} +}; export type ReducerAction = - NoUpdateAction | - UpdateAction | - SideEffectsAction | - UpdateWithSideEffectsAction; + | NoUpdateAction + | UpdateAction + | SideEffectsAction + | UpdateWithSideEffectsAction; export function NoUpdate(): NoUpdateAction; @@ -41,18 +41,26 @@ export function Update(state: T): UpdateAction; export function SideEffects(sideEffect: SideEffect): SideEffectsAction; -export function UpdateWithSideEffects(state: S, sideEffects: SideEffect): UpdateWithSideEffectsAction; +export function UpdateWithSideEffects( + state: S, + sideEffects: SideEffect +): UpdateWithSideEffectsAction; export type Action = { type: string; -} +}; export class ReComponent

extends Component { - static reducer(action: Action, state: TState): ReducerAction; + static reducer( + action: Action, + state: TState + ): ReducerAction; send(action: TAction): void; - createSender(type: TAction): ((payload: TPayload) => { type: TAction, payload: TPayload }); + createSender( + type: TAction + ): ((payload: TPayload) => { type: TAction; payload: TPayload }); } -export class RePureComponent

extends ReComponent { } +export class RePureComponent

extends ReComponent {} diff --git a/type-definitions/__tests__/ReComponent.js b/type-definitions/__tests__/ReComponent.js index f957b16..37e300f 100644 --- a/type-definitions/__tests__/ReComponent.js +++ b/type-definitions/__tests__/ReComponent.js @@ -4,14 +4,17 @@ import * as React from "react"; import { ReComponent, - Update, NoUpdate, SideEffects, UpdateWithSideEffects } from "../../"; -type Action = {| type: "A" |} | {| type: "B" |} | {| type: "C" |} | {| type: "D" |} +type Action = + | {| type: "A" |} + | {| type: "B" |} + | {| type: "C" |} + | {| type: "D" |}; class StateMismatch extends ReComponent<{}, { count: number }, Action> { // $ExpectError @@ -54,7 +57,6 @@ class UpdateTypes extends ReComponent<{}, { count: number }, Action> { instance.someClassProperty = 1; // $ExpectError - `instance.someClassProperty` has to be number instance.someClassProperty = "1"; - }); } } @@ -63,9 +65,9 @@ class UpdateTypes extends ReComponent<{}, { count: number }, Action> { class TypedActionTypes extends ReComponent< {}, { count: number }, - {| type: 'CLICK' |} + {| type: "CLICK" |} > { - handleClick = () => this.send({ type: 'CLICK' }); + handleClick = () => this.send({ type: "CLICK" }); static reducer(action, state) { switch (action.type) { @@ -105,7 +107,7 @@ const absurd = (x: empty): T => { class ExhaustivelyTypedFailingActionTypes extends ReComponent< {}, { count: number }, - {| type: 'CLICK' |} | {| type: 'CLACK' |} + {| type: "CLICK" |} | {| type: "CLACK" |} > { static reducer(action, state) { switch (action.type) { @@ -139,16 +141,17 @@ class ExhaustivelyTypedPassingActionTypes extends ReComponent< } } - class FailingPayloadType extends ReComponent< {}, { count: number, awesome: boolean }, { type: "CLICK", payload: number } | { type: "CLACK", payload: boolean } > { // $ExpectError - `clicks` should be `number` - handleClick = (clicks: boolean) => this.send({ type: 'CLICK', payload: clicks }); + handleClick = (clicks: boolean) => + this.send({ type: "CLICK", payload: clicks }); // $ExpectError - `awesome` should be `boolean` - handleClack = (awesome: number) => this.send({ type: 'CLACK', payload: awesome }); + handleClack = (awesome: number) => + this.send({ type: "CLACK", payload: awesome }); static reducer(action, state) { switch (action.type) { @@ -170,9 +173,11 @@ class PassingPayloadType extends ReComponent< {}, { count: number, awesome: boolean }, { type: "CLICK", payload: number } | { type: "CLACK", payload: boolean } - > { - handleClick = (clicks: number) => this.send({ type: 'CLICK', payload: clicks }); - handleClack = (awesome: boolean) => this.send({ type: 'CLACK', payload: awesome }); +> { + handleClick = (clicks: number) => + this.send({ type: "CLICK", payload: clicks }); + handleClack = (awesome: boolean) => + this.send({ type: "CLACK", payload: awesome }); static reducer(action, state) { switch (action.type) { @@ -191,7 +196,7 @@ class PassingPayloadType extends ReComponent< class CreateSenderTest extends ReComponent< {}, { count: number }, - {| type: 'CLICK' |} | {| type: 'CLACK', payload: number |} + {| type: "CLICK" |} | {| type: "CLACK", payload: number |} > { handleClick = this.createSender("CLICK"); handleClack = this.createSender("CLACK"); diff --git a/type-definitions/ts-tests/exports.ts b/type-definitions/ts-tests/exports.ts index 05c4a03..7506a3e 100644 --- a/type-definitions/ts-tests/exports.ts +++ b/type-definitions/ts-tests/exports.ts @@ -1,5 +1,12 @@ -import * as recomponent from 'react-recomponent'; -import { NoUpdate, Update, SideEffects, UpdateWithSideEffects, ReComponent, RePureComponent } from 'react-recomponent'; +import * as recomponent from "react-recomponent"; +import { + NoUpdate, + Update, + SideEffects, + UpdateWithSideEffects, + ReComponent, + RePureComponent +} from "react-recomponent"; NoUpdate; // $ExpectType () => NoUpdateAction Update; // $ExpectType (state: T) => UpdateAction diff --git a/type-definitions/ts-tests/updateTypes.ts b/type-definitions/ts-tests/updateTypes.ts index c34a5bc..07b2141 100644 --- a/type-definitions/ts-tests/updateTypes.ts +++ b/type-definitions/ts-tests/updateTypes.ts @@ -1,4 +1,9 @@ -import { NoUpdate, Update, SideEffects, UpdateWithSideEffects } from 'react-recomponent'; +import { + NoUpdate, + Update, + SideEffects, + UpdateWithSideEffects +} from "react-recomponent"; // $ExpectType NoUpdateAction NoUpdate();