Skip to content

Commit

Permalink
Update prettier and re-prettify the world
Browse files Browse the repository at this point in the history
  • Loading branch information
Macil committed Jun 8, 2019
1 parent 0bc3df6 commit 75198fb
Show file tree
Hide file tree
Showing 21 changed files with 127 additions and 179 deletions.
125 changes: 4 additions & 121 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -44,7 +44,7 @@
"flow-bin": "^0.100.0",
"inquirer": "^6.3.1",
"mocha": "^6.1.4",
"prettier": "1.0.2",
"prettier": "^1.18.2",
"pug": "^2.0.3",
"rollup": "^0.41.6",
"rollup-plugin-babel": "^2.7.1",
Expand Down
2 changes: 1 addition & 1 deletion src/interop/symbol.js
@@ -1,4 +1,4 @@
// this file contains some hot JS modules systems stuff

import symbol from 'symbol-observable'
export default (symbol.default ? symbol.default : symbol)
export default symbol.default ? symbol.default : symbol
7 changes: 4 additions & 3 deletions src/interop/to-es-observable.js
Expand Up @@ -8,9 +8,10 @@ function ESObservable(observable) {

extend(ESObservable.prototype, {
subscribe(observerOrOnNext, onError, onComplete) {
const observer = typeof observerOrOnNext === 'function'
? {next: observerOrOnNext, error: onError, complete: onComplete}
: observerOrOnNext
const observer =
typeof observerOrOnNext === 'function'
? {next: observerOrOnNext, error: onError, complete: onComplete}
: observerOrOnNext

const fn = event => {
if (event.type === END) {
Expand Down
7 changes: 5 additions & 2 deletions src/many-sources/combine.js
Expand Up @@ -70,7 +70,8 @@ inherit(Combine, Stream, {
},

_onDeactivation() {
let length = this._sources.length, i
let length = this._sources.length,
i
for (i = 0; i < length; i++) {
this._sources[i].offAny(this._$handlers[i])
}
Expand Down Expand Up @@ -166,7 +167,9 @@ function combineAsObject(active, passive = {}, combinator) {
throw new Error('Combine can only combine active and passive collections of the same type.')
}

let keys = [], activeObservables = [], passiveObservables = []
let keys = [],
activeObservables = [],
passiveObservables = []

collect(active, keys, activeObservables)
collect(passive, keys, passiveObservables)
Expand Down
7 changes: 4 additions & 3 deletions src/observable.js
Expand Up @@ -119,9 +119,10 @@ extend(Observable.prototype, {
const _this = this
let closed = false

const observer = !observerOrOnValue || typeof observerOrOnValue === 'function'
? {value: observerOrOnValue, error: onError, end: onEnd}
: observerOrOnValue
const observer =
!observerOrOnValue || typeof observerOrOnValue === 'function'
? {value: observerOrOnValue, error: onError, end: onEnd}
: observerOrOnValue

const handler = function(event) {
if (event.type === END) {
Expand Down
36 changes: 26 additions & 10 deletions src/utils/collections.js
Expand Up @@ -20,15 +20,18 @@ function concat(a, b) {
}

function circleShift(arr, distance) {
let length = arr.length, result = new Array(length), i
let length = arr.length,
result = new Array(length),
i
for (i = 0; i < length; i++) {
result[(i + distance) % length] = arr[i]
}
return result
}

function find(arr, value) {
let length = arr.length, i
let length = arr.length,
i
for (i = 0; i < length; i++) {
if (arr[i] === value) {
return i
Expand All @@ -38,7 +41,8 @@ function find(arr, value) {
}

function findByPred(arr, pred) {
let length = arr.length, i
let length = arr.length,
i
for (i = 0; i < length; i++) {
if (pred(arr[i])) {
return i
Expand All @@ -48,21 +52,26 @@ function findByPred(arr, pred) {
}

function cloneArray(input) {
let length = input.length, result = new Array(length), i
let length = input.length,
result = new Array(length),
i
for (i = 0; i < length; i++) {
result[i] = input[i]
}
return result
}

function remove(input, index) {
let length = input.length, result, i, j
let length = input.length,
result,
i,
j
if (index >= 0 && index < length) {
if (length === 1) {
return []
} else {
result = new Array(length - 1)
for ((i = 0), (j = 0); i < length; i++) {
for (i = 0, j = 0; i < length; i++) {
if (i !== index) {
result[j] = input[i]
j++
Expand All @@ -80,22 +89,26 @@ function removeByPred(input, pred) {
}

function map(input, fn) {
let length = input.length, result = new Array(length), i
let length = input.length,
result = new Array(length),
i
for (i = 0; i < length; i++) {
result[i] = fn(input[i])
}
return result
}

function forEach(arr, fn) {
let length = arr.length, i
let length = arr.length,
i
for (i = 0; i < length; i++) {
fn(arr[i])
}
}

function fillArray(arr, value) {
let length = arr.length, i
let length = arr.length,
i
for (i = 0; i < length; i++) {
arr[i] = value
}
Expand All @@ -106,7 +119,10 @@ function contains(arr, value) {
}

function slide(cur, next, max) {
let length = Math.min(max, cur.length + 1), offset = cur.length - length + 1, result = new Array(length), i
let length = Math.min(max, cur.length + 1),
offset = cur.length - length + 1,
result = new Array(length),
i
for (i = offset; i < length; i++) {
result[i - offset] = cur[i]
}
Expand Down
2 changes: 1 addition & 1 deletion src/utils/now.js
@@ -1 +1 @@
export default (Date.now ? () => Date.now() : () => new Date().getTime())
export default Date.now ? () => Date.now() : () => new Date().getTime()
7 changes: 5 additions & 2 deletions src/utils/objects.js
Expand Up @@ -5,7 +5,9 @@ function createObj(proto) {
}

function extend(target /*, mixin1, mixin2...*/) {
let length = arguments.length, i, prop
let length = arguments.length,
i,
prop
for (i = 1; i < length; i++) {
for (prop in arguments[i]) {
target[prop] = arguments[i][prop]
Expand All @@ -15,7 +17,8 @@ function extend(target /*, mixin1, mixin2...*/) {
}

function inherit(Child, Parent /*, mixin1, mixin2...*/) {
let length = arguments.length, i
let length = arguments.length,
i
Child.prototype = createObj(Parent.prototype)
Child.prototype.constructor = Child
for (i = 2; i < length; i++) {
Expand Down
14 changes: 7 additions & 7 deletions test/flow/combine.js
Expand Up @@ -124,13 +124,13 @@ function test_combine_object_withCombinator() {
}

function test_combine_object_withCombinatorAndPassive() {
const xs = Kefir.combine({numbers, strings}, {functions}, (args: {
numbers: number,
strings: string,
functions: (n: number) => string,
}) => {
return args.functions(args.numbers) + args.strings
})
const xs = Kefir.combine(
{numbers, strings},
{functions},
(args: {numbers: number, strings: string, functions: (n: number) => string}) => {
return args.functions(args.numbers) + args.strings
}
)

xs.onValue((x: string) => {})

Expand Down
5 changes: 4 additions & 1 deletion test/flow/error.js
Expand Up @@ -3,7 +3,10 @@
import Kefir from '../../kefir'

// error type should be persisted through and unaffected by map call.
const prop = Kefir.constantError(1).merge(Kefir.constant(2)).map(x => String(x)).mapErrors(err => ({a: err}))
const prop = Kefir.constantError(1)
.merge(Kefir.constant(2))
.map(x => String(x))
.mapErrors(err => ({a: err}))

prop
.onValue(x => {
Expand Down

0 comments on commit 75198fb

Please sign in to comment.