Skip to content

Commit 79c9a92

Browse files
austinddaustindd
committed
Merge remote-tracking branch 'upstream/stream-callbacks' into release/13.0.0-beta.2
2 parents 2bc773d + 3d35d21 commit 79c9a92

File tree

1 file changed

+79
-31
lines changed

1 file changed

+79
-31
lines changed

‎src/Stream.re‎

Lines changed: 79 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -371,6 +371,7 @@ module Readable = {
371371
type nonrec t('r) = subtype(void, 'r, kind);
372372
type objStream('r) = subtype(void, 'r, [ kind | objectMode]);
373373

374+
type calledBackDestroy;
374375
type makeOptions('r);
375376
[@bs.obj]
376377
external makeOptions:
@@ -383,9 +384,9 @@ module Readable = {
383384
(
384385
t('r),
385386
Js.nullable(Js.Exn.t),
386-
(~err: option(Js.Exn.t)) => unit
387+
(~err: option(Js.Exn.t)) => calledBackDestroy
387388
) =>
388-
unit
389+
calledBackDestroy
389390
),
390391
~read: [@bs.this] ((t('r), Js.nullable(int)) => unit),
391392
unit
@@ -394,6 +395,7 @@ module Readable = {
394395
[@bs.module "stream"] [@bs.new]
395396
external make: makeOptions(Buffer.t) => t(Buffer.t) = "Readable";
396397

398+
type calledBackDestroyObjMode;
397399
type makeOptionsObjMode('r);
398400
[@bs.obj]
399401
external makeOptionsObjMode:
@@ -406,9 +408,9 @@ module Readable = {
406408
(
407409
t('r),
408410
Js.nullable(Js.Exn.t),
409-
(~err: option(Js.Exn.t)) => unit
411+
(~err: option(Js.Exn.t)) => calledBackDestroyObjMode
410412
) =>
411-
unit
413+
calledBackDestroyObjMode
412414
),
413415
~read: [@bs.this] ((t('r), Js.nullable(int)) => unit),
414416
unit
@@ -575,6 +577,11 @@ module Writable = {
575577
type nonrec subtype('w, 'r, 'a) = subtype('w, 'r, [> kind] as 'a);
576578
type nonrec t('w) = subtype('w, void, kind);
577579
type objStream('w) = subtype('w, void, [ kind | objectMode]);
580+
581+
type calledBackDestroy;
582+
type calledBackFinal;
583+
type calledBackWritev;
584+
type calledBackWrite;
578585
type makeOptions('w);
579586
[@bs.obj]
580587
external makeOptions:
@@ -587,33 +594,39 @@ module Writable = {
587594
(
588595
t('w),
589596
Js.nullable(Js.Exn.t),
590-
(~err: option(Js.Exn.t)) => unit
597+
(~err: option(Js.Exn.t)) => calledBackDestroy
591598
) =>
592-
unit
599+
calledBackDestroy
593600
)
594601
=?,
595602
~final: [@bs.this] (
596-
(t('w), 'w, (~err: option(Js.Exn.t)) => unit) => unit
603+
(t('w), 'w, (~err: option(Js.Exn.t)) => calledBackFinal) =>
604+
calledBackFinal
597605
)
598606
=?,
599607
~writev: [@bs.this] (
600608
(
601609
t('w),
602610
array(chunk('w)),
603-
(~err: option(Js.Exn.t)) => unit
611+
(~err: option(Js.Exn.t)) => calledBackWritev
604612
) =>
605-
unit
613+
calledBackWritev
606614
)
607615
=?,
608616
~write: [@bs.this] (
609-
(t('w), 'w, (~err: option(Js.Exn.t)) => unit) => unit
617+
(t('w), 'w, (~err: option(Js.Exn.t)) => calledBackWrite) =>
618+
calledBackWrite
610619
),
611620
unit
612621
) =>
613622
makeOptions('w);
614623
[@bs.module "stream"] [@bs.new]
615624
external make: makeOptions(Buffer.t) => t(Buffer.t) = "Writable";
616625

626+
type calledBackDestroyObjMode;
627+
type calledBackFinalObjMode;
628+
type calledBackWritevObjMode;
629+
type calledBackWriteObjMode;
617630
type makeOptionsObjMode('w);
618631
[@bs.obj]
619632
external makeOptionsObjMode:
@@ -626,26 +639,36 @@ module Writable = {
626639
(
627640
t('w),
628641
Js.nullable(Js.Exn.t),
629-
(~err: option(Js.Exn.t)) => unit
642+
(~err: option(Js.Exn.t)) => calledBackDestroyObjMode
630643
) =>
631-
unit
644+
calledBackDestroyObjMode
632645
)
633646
=?,
634647
~final: [@bs.this] (
635-
(t('w), 'w, (~err: option(Js.Exn.t)) => unit) => unit
648+
(
649+
t('w),
650+
'w,
651+
(~err: option(Js.Exn.t)) => calledBackFinalObjMode
652+
) =>
653+
calledBackFinalObjMode
636654
)
637655
=?,
638656
~writev: [@bs.this] (
639657
(
640658
t('w),
641659
array(chunk('w)),
642-
(~err: option(Js.Exn.t)) => unit
660+
(~err: option(Js.Exn.t)) => calledBackWritevObjMode
643661
) =>
644-
unit
662+
calledBackWritevObjMode
645663
)
646664
=?,
647665
~write: [@bs.this] (
648-
(t('w), 'w, (~err: option(Js.Exn.t)) => unit) => unit
666+
(
667+
t('w),
668+
'w,
669+
(~err: option(Js.Exn.t)) => calledBackWriteObjMode
670+
) =>
671+
calledBackWriteObjMode
649672
),
650673
unit
651674
) =>
@@ -669,6 +692,11 @@ module Duplex = {
669692
type nonrec supertype('w, 'r, 'a) = subtype('w, 'r, [< kind] as 'a);
670693
type nonrec subtype('w, 'r, 'a) = subtype('w, 'r, [> kind] as 'a);
671694
type nonrec t('w, 'r) = subtype('w, 'r, kind);
695+
696+
type calledBackDestroy;
697+
type calledBackFinal;
698+
type calledBackWritev;
699+
type calledBackWrite;
672700
type makeOptions('w, 'r);
673701
[@bs.obj]
674702
external makeOptions:
@@ -682,27 +710,37 @@ module Duplex = {
682710
(
683711
t('w, 'r),
684712
Js.nullable(Js.Exn.t),
685-
(~err: option(Js.Exn.t)) => unit
713+
(~err: option(Js.Exn.t)) => calledBackDestroy
686714
) =>
687-
unit
715+
calledBackDestroy
688716
)
689717
=?,
690718
~final: [@bs.this] (
691-
(t('w, 'r), 'w, (~err: option(Js.Exn.t)) => unit) => unit
719+
(
720+
t('w, 'r),
721+
'w,
722+
(~err: option(Js.Exn.t)) => calledBackFinal
723+
) =>
724+
calledBackFinal
692725
)
693726
=?,
694727
~writev: [@bs.this] (
695728
(
696729
t('w, 'r),
697730
array(chunk('w)),
698-
(~err: option(Js.Exn.t)) => unit
731+
(~err: option(Js.Exn.t)) => calledBackWritev
699732
) =>
700-
unit
733+
calledBackWritev
701734
)
702735
=?,
703736
~read: [@bs.this] ((t('w, 'r), Js.nullable(int)) => unit),
704737
~write: [@bs.this] (
705-
(t('w, 'r), 'w, (~err: option(Js.Exn.t)) => unit) => unit
738+
(
739+
t('w, 'r),
740+
'w,
741+
(~err: option(Js.Exn.t)) => calledBackWrite
742+
) =>
743+
calledBackWrite
706744
),
707745
unit
708746
) =>
@@ -728,6 +766,10 @@ module Transform = {
728766
type nonrec t('w, 'r) = subtype('w, 'r, kind);
729767
type objStream('w, 'r) = subtype('w, 'r, [ kind | objectMode]);
730768
type makeOptions('w, 'r);
769+
770+
// TODO
771+
type calledBackTransform;
772+
type calledBackFlush;
731773
[@bs.obj]
732774
external makeOptions:
733775
(
@@ -740,16 +782,18 @@ module Transform = {
740782
t('w, 'r),
741783
'w,
742784
string,
743-
(~err: option(Js.Exn.t), ~data: option('r)) => unit
785+
(~err: option(Js.Exn.t), ~data: option('r)) =>
786+
calledBackTransform
744787
) =>
745-
unit
788+
calledBackTransform
746789
),
747790
~flush: [@bs.this] (
748791
(
749792
t('w, 'r),
750-
(~err: option(Js.Exn.t), ~data: option('r)) => unit
793+
(~err: option(Js.Exn.t), ~data: option('r)) =>
794+
calledBackFlush
751795
) =>
752-
unit
796+
calledBackFlush
753797
),
754798
unit
755799
) =>
@@ -759,6 +803,8 @@ module Transform = {
759803
external make: makeOptions(Buffer.t, Buffer.t) => t(Buffer.t, Buffer.t) =
760804
"Transform";
761805

806+
type calledBackTransformObjMode;
807+
type calledBackFlushObjMode;
762808
type makeOptionsObjMode('w, 'r);
763809
[@bs.obj]
764810
external makeOptionsObjMode:
@@ -772,16 +818,18 @@ module Transform = {
772818
t('w, 'r),
773819
'w,
774820
string,
775-
(~err: option(Js.Exn.t), ~data: option('r)) => unit
821+
(~err: option(Js.Exn.t), ~data: option('r)) =>
822+
calledBackTransformObjMode
776823
) =>
777-
unit
824+
calledBackTransformObjMode
778825
),
779826
~flush: [@bs.this] (
780827
(
781828
t('w, 'r),
782-
(~err: option(Js.Exn.t), ~data: option('r)) => unit
829+
(~err: option(Js.Exn.t), ~data: option('r)) =>
830+
calledBackFlushObjMode
783831
) =>
784-
unit
832+
calledBackFlushObjMode
785833
),
786834
unit
787835
) =>
@@ -856,4 +904,4 @@ external pipeline2:
856904
Js.nullable(Js.Exn.t) => unit
857905
) =>
858906
Writable.subtype('t1, 't3, 'dest) =
859-
"pipeline";
907+
"pipeline";

0 commit comments

Comments
 (0)