Skip to content

Commit 400c53a

Browse files
christianalfonichristianalfoni
authored
Merge branch 'master' into patch-4
2 parents c04bf0a + f8a1fdd commit 400c53a

File tree

15 files changed

+106
-175
lines changed

15 files changed

+106
-175
lines changed

‎package-lock.json‎

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
"ts-jest": "23.10.4",
9191
"ts-loader": "4.4.2",
9292
"tslib": "1.9.3",
93-
"typescript": "3.1.3",
93+
"typescript": "3.3.1",
9494
"typescript-eslint-parser": "^21.0.1",
9595
"url-loader": "1.0.1",
9696
"vue": "2.5.16",

‎packages/node_modules/betsy/package.json‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,5 @@
3232
"dependencies": {
3333
"@types/node": "^10.5.1",
3434
"tslib": "^1.9.3"
35-
},
36-
"devDependencies": {
37-
"typescript": "^3.1.3"
3835
}
3936
}

‎packages/node_modules/overmind-angular/package.json‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,5 @@
3333
"@types/node": "^10.5.1",
3434
"overmind": "next",
3535
"tslib": "^1.9.3"
36-
},
37-
"devDependencies": {
38-
"rimraf": "^2.6.2",
39-
"typescript": "^3.1.3"
4036
}
4137
}

‎packages/node_modules/overmind-devtools/package.json‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -33,17 +33,5 @@
3333
"overmind-themes": "next",
3434
"emotion": "^9.2.12",
3535
"ws": "^5.2.1"
36-
},
37-
"devDependencies": {
38-
"@types/jest": "^23.1.4",
39-
"@types/react": "^16.7.13",
40-
"jest": "^23.5.0",
41-
"ts-jest": "^23.10.4",
42-
"ts-loader": "^4.4.2",
43-
"tslib": "^1.9.3",
44-
"typescript": "^3.1.3",
45-
"url-loader": "^1.0.1",
46-
"webpack": "4.28.4",
47-
"webpack-cli": "^3.1.2"
4836
}
4937
}

‎packages/node_modules/overmind-react/package.json‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,5 @@
3535
"@types/node": "^10.5.1",
3636
"overmind": "next",
3737
"tslib": "^1.9.3"
38-
},
39-
"devDependencies": {
40-
"@types/jest": "^23.1.4",
41-
"@types/react": "^16.7.13",
42-
"jest": "^23.5.0",
43-
"react": "^16.7.0-alpha.2",
44-
"react-test-renderer": "^16.4.1",
45-
"rimraf": "^2.6.2",
46-
"ts-jest": "^23.10.4",
47-
"typescript": "^3.1.3"
4838
}
4939
}

‎packages/node_modules/overmind-themes/package.json‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,5 @@
3838
"@types/node": "^10.5.1",
3939
"color": "^3.0.0",
4040
"tslib": "^1.9.3"
41-
},
42-
"devDependencies": {
43-
"rimraf": "^2.6.2",
44-
"typescript": "^3.1.3"
4541
}
4642
}

‎packages/node_modules/overmind-vue/package.json‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,5 @@
3535
"@types/node": "^10.5.1",
3636
"overmind": "next",
3737
"tslib": "^1.9.3"
38-
},
39-
"devDependencies": {
40-
"@types/jest": "^23.1.4",
41-
"jest": "^23.5.0",
42-
"jsdom": "^11.12.0",
43-
"rimraf": "^2.6.2",
44-
"ts-jest": "^23.10.4",
45-
"typescript": "^3.1.3",
46-
"vue": "^2.5.16"
4738
}
4839
}

‎packages/node_modules/overmind/package.json‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,5 @@
3737
"betsy": "next",
3838
"proxy-state-tree": "next",
3939
"tslib": "^1.9.3"
40-
},
41-
"devDependencies": {
42-
"@types/jest": "^23.1.4",
43-
"jest": "^23.5.0",
44-
"jsdom": "^11.12.0",
45-
"rimraf": "^2.6.2",
46-
"ts-jest": "^23.10.4",
47-
"typescript": "^3.1.3"
4840
}
4941
}

‎packages/node_modules/overmind/src/index.ts‎

Lines changed: 66 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -631,44 +631,44 @@ export type Operator<Input = void, Output = Input> = IOperator<
631631
Output
632632
>
633633

634-
export function pipe<Config extends Configuration, A, B>(
635-
aOperator: IOperator<Config, A, B>
636-
): IOperator<Config, A, B>
637-
638-
export function pipe<Config extends Configuration, A, B, C>(
639-
aOperator: IOperator<Config, A, B>,
640-
bOperator: IOperator<Config, B, C>
641-
): IOperator<Config, A, C>
642-
643-
export function pipe<Config extends Configuration, A, B, C, D>(
644-
aOperator: IOperator<Config, A, B>,
645-
bOperator: IOperator<Config, B, C>,
646-
cOperator: IOperator<Config, C, D>
647-
): IOperator<Config, A, D>
648-
649-
export function pipe<Config extends Configuration, A, B, C, D, E>(
650-
aOperator: IOperator<Config, A, B>,
651-
bOperator: IOperator<Config, B, C>,
652-
cOperator: IOperator<Config, C, D>,
653-
dOperator: IOperator<Config, D, E>
654-
): IOperator<Config, A, E>
655-
656-
export function pipe<Config extends Configuration, A, B, C, D, E, F>(
657-
aOperator: IOperator<Config, A, B>,
658-
bOperator: IOperator<Config, B, C>,
659-
cOperator: IOperator<Config, C, D>,
660-
dOperator: IOperator<Config, D, E>,
661-
eOperator: IOperator<Config, E, F>
662-
): IOperator<Config, A, F>
663-
664-
export function pipe<Config extends Configuration, A, B, C, D, E, F, G>(
665-
aOperator: IOperator<Config, A, B>,
666-
bOperator: IOperator<Config, B, C>,
667-
cOperator: IOperator<Config, C, D>,
668-
dOperator: IOperator<Config, D, E>,
669-
eOperator: IOperator<Config, E, F>,
670-
fOperator: IOperator<Config, F, G>
671-
): IOperator<Config, A, G>
634+
export function pipe<ThisConfig extends Configuration, A, B>(
635+
aOperator: IOperator<ThisConfig, A, B>
636+
): IOperator<ThisConfig, A, B>
637+
638+
export function pipe<ThisConfig extends Configuration, A, B, C>(
639+
aOperator: IOperator<ThisConfig, A, B>,
640+
bOperator: IOperator<ThisConfig, B, C>
641+
): IOperator<ThisConfig, A, C>
642+
643+
export function pipe<ThisConfig extends Configuration, A, B, C, D>(
644+
aOperator: IOperator<ThisConfig, A, B>,
645+
bOperator: IOperator<ThisConfig, B, C>,
646+
cOperator: IOperator<ThisConfig, C, D>
647+
): IOperator<ThisConfig, A, D>
648+
649+
export function pipe<ThisConfig extends Configuration, A, B, C, D, E>(
650+
aOperator: IOperator<ThisConfig, A, B>,
651+
bOperator: IOperator<ThisConfig, B, C>,
652+
cOperator: IOperator<ThisConfig, C, D>,
653+
dOperator: IOperator<ThisConfig, D, E>
654+
): IOperator<ThisConfig, A, E>
655+
656+
export function pipe<ThisConfig extends Configuration, A, B, C, D, E, F>(
657+
aOperator: IOperator<ThisConfig, A, B>,
658+
bOperator: IOperator<ThisConfig, B, C>,
659+
cOperator: IOperator<ThisConfig, C, D>,
660+
dOperator: IOperator<ThisConfig, D, E>,
661+
eOperator: IOperator<ThisConfig, E, F>
662+
): IOperator<ThisConfig, A, F>
663+
664+
export function pipe<ThisConfig extends Configuration, A, B, C, D, E, F, G>(
665+
aOperator: IOperator<ThisConfig, A, B>,
666+
bOperator: IOperator<ThisConfig, B, C>,
667+
cOperator: IOperator<ThisConfig, C, D>,
668+
dOperator: IOperator<ThisConfig, D, E>,
669+
eOperator: IOperator<ThisConfig, E, F>,
670+
fOperator: IOperator<ThisConfig, F, G>
671+
): IOperator<ThisConfig, A, G>
672672

673673
export function pipe(...operators) {
674674
const instance = (err, context, next, final = next) => {
@@ -810,9 +810,9 @@ function createNextPath(next) {
810810
}
811811
}
812812

813-
export function map<Input, Output, Config extends Configuration = Config>(
814-
operation: (input: TValueContext<Config, Input>) => Output
815-
): IOperator<Config, Input, Output extends Promise<infer U> ? U : Output> {
813+
export function map<Input, Output, ThisConfig extends Configuration = Config>(
814+
operation: (input: TValueContext<ThisConfig, Input>) => Output
815+
): IOperator<ThisConfig, Input, Output extends Promise<infer U> ? U : Output> {
816816
const instance = (err, context, next) => {
817817
if (err) next(err)
818818
else {
@@ -829,10 +829,10 @@ export function map<Input, Output, Config extends Configuration = Config>(
829829

830830
export function forEach<
831831
Input extends any[],
832-
Config extends Configuration = Config
832+
ThisConfig extends Configuration = Config
833833
>(
834-
forEachItemOperator: IOperator<Config, Input[0], any>
835-
): IOperator<Config, Input, Input> {
834+
forEachItemOperator: IOperator<ThisConfig, Input[0], any>
835+
): IOperator<ThisConfig, Input, Input> {
836836
const instance = (err, context, next) => {
837837
if (err) next(err)
838838
else {
@@ -873,9 +873,9 @@ export function forEach<
873873
return instance
874874
}
875875

876-
export function parallel<Input, Config extends Configuration = Config>(
877-
...operators: IOperator<Config, Input>[]
878-
): IOperator<Config, Input, Input> {
876+
export function parallel<Input, ThisConfig extends Configuration = Config>(
877+
...operators: IOperator<ThisConfig, Input>[]
878+
): IOperator<ThisConfig, Input, Input> {
879879
const instance = (err, context, next) => {
880880
if (err) next(err)
881881
else {
@@ -915,9 +915,9 @@ export function parallel<Input, Config extends Configuration = Config>(
915915
return instance
916916
}
917917

918-
export function filter<Input, Config extends Configuration = Config>(
919-
operation: (input: TValueContext<Config, Input>) => boolean
920-
): IOperator<Config, Input, Input> {
918+
export function filter<Input, ThisConfig extends Configuration = Config>(
919+
operation: (input: TValueContext<ThisConfig, Input>) => boolean
920+
): IOperator<ThisConfig, Input, Input> {
921921
const instance = (err, context, next, final) => {
922922
if (err) next(err)
923923
else {
@@ -936,9 +936,9 @@ export function filter<Input, Config extends Configuration = Config>(
936936
return instance
937937
}
938938

939-
export function action<Input, Config extends Configuration = Config>(
940-
operation: (input: TValueContext<Config, Input>) => void
941-
): IOperator<Config, Input, Input> {
939+
export function action<Input, ThisConfig extends Configuration = Config>(
940+
operation: (input: TValueContext<ThisConfig, Input>) => void
941+
): IOperator<ThisConfig, Input, Input> {
942942
const instance = (err, context, next) => {
943943
if (err) next(err)
944944
else {
@@ -994,12 +994,12 @@ export function action<Input, Config extends Configuration = Config>(
994994

995995
export function fork<
996996
Input,
997-
Paths extends { [key: string]: IOperator<Config, Input, any> },
998-
Config extends Configuration = Config
997+
Paths extends { [key: string]: IOperator<ThisConfig, Input, any> },
998+
ThisConfig extends Configuration = Config
999999
>(
1000-
operation: (input: TValueContext<Config, Input>) => keyof Paths,
1000+
operation: (input: TValueContext<ThisConfig, Input>) => keyof Paths,
10011001
paths: Paths
1002-
): IOperator<Config, Input, Input> {
1002+
): IOperator<ThisConfig, Input, Input> {
10031003
const instance = (err, context, next) => {
10041004
if (err) next(err)
10051005
else {
@@ -1029,14 +1029,14 @@ export function when<
10291029
Input,
10301030
OutputA,
10311031
OutputB,
1032-
Config extends Configuration = Config
1032+
ThisConfig extends Configuration = Config
10331033
>(
1034-
operation: (input: TValueContext<Config, Input>) => boolean,
1034+
operation: (input: TValueContext<ThisConfig, Input>) => boolean,
10351035
paths: {
1036-
true: IOperator<Config, Input, OutputA>
1037-
false: IOperator<Config, Input, OutputB>
1036+
true: IOperator<ThisConfig, Input, OutputA>
1037+
false: IOperator<ThisConfig, Input, OutputB>
10381038
}
1039-
): IOperator<Config, Input, OutputA | OutputB> {
1039+
): IOperator<ThisConfig, Input, OutputA | OutputB> {
10401040
const instance = (err, context, next) => {
10411041
if (err) next(err)
10421042
else {
@@ -1067,9 +1067,9 @@ export function when<
10671067
return instance
10681068
}
10691069

1070-
export function wait<Input, Config extends Configuration = Config>(
1070+
export function wait<Input, ThisConfig extends Configuration = Config>(
10711071
ms: number
1072-
): IOperator<Config, Input, Input> {
1072+
): IOperator<ThisConfig, Input, Input> {
10731073
const instance = (err, context, next) => {
10741074
if (err) next(err)
10751075
else {
@@ -1085,9 +1085,9 @@ export function wait<Input, Config extends Configuration = Config>(
10851085
return instance
10861086
}
10871087

1088-
export function debounce<Input, Config extends Configuration = Config>(
1088+
export function debounce<Input, ThisConfig extends Configuration = Config>(
10891089
ms: number
1090-
): IOperator<Config, Input, Input> {
1090+
): IOperator<ThisConfig, Input, Input> {
10911091
let timeout
10921092
let previousFinal
10931093
const instance = (err, context, next, final) => {

0 commit comments

Comments
 (0)