Merge pull request #31 from sikanhe/stream-api-2020-05-19

Adjustments to the 'Stream' subtype definitions

Author: austindd

src/Console.re

@@ -8,8 +8,8 @@ type consoleOptions;
 [@bs.obj]
 external consoleOptions:
   (
-    ~stdout: Stream.Writable.subtype('w, 'r, 'a),
-    ~stderr: Stream.Writable.subtype('w, 'r, 'a)=?,
+    ~stdout: Stream.Writable.subtype('w, 'a),
+    ~stderr: Stream.Writable.subtype('w, 'a)=?,
     ~ignoreErrors: bool=?,
     ~colorMode: bool=?,
     ~inspectOptions: Util.inspectOptions=?,
@@ -20,7 +20,7 @@ external consoleOptions:
 [@bs.new] [@bs.module "console"]
 external make: consoleOptions => t = "Console";
 [@bs.new] [@bs.module "console"]
-external make2: {.. "stdout": Stream.Writable.subtype('w, 'r, 'a)} => t =
+external make2: {.. "stdout": Stream.Writable.subtype('w, 'a)} => t =
   "Console";
 
 [@bs.send] external assert_: (t, bool) => unit = "assert";

src/Crypto.re

@@ -36,7 +36,7 @@ module KeyObject = {
 
 module PivateKey = {
   include KeyObject.Impl;
-  type kind = [ KeyObject.publicKey];
+  type kind = [ KeyObject.privateKey];
   type t('a) = KeyObject.t('a, [ kind]);
   [@bs.module "crypto"] external make: Buffer.t => t('a) = "createPrivateKey";
   [@bs.module "crypto"]
@@ -61,11 +61,10 @@ module PublicKey = {
 };
 
 module Hash = {
-  type kind = [ Stream.transform | `Hash];
-  type subtype('w, 'r, 'a) =
-    Stream.Transform.subtype('w, 'r, [> kind] as 'a);
-  type supertype('w, 'r, 'a) = Stream.subtype('w, 'r, [< kind] as 'a);
-  type t = subtype(Buffer.t, Buffer.t, kind);
+  type kind('w, 'r) = [ Stream.transform('w, 'r) | `Hash];
+  type subtype('w, 'r, 'a) = Stream.subtype([> kind('w, 'r)] as 'a);
+  type supertype('w, 'r, 'a) = Stream.subtype([< kind('w, 'r)] as 'a);
+  type t = Stream.subtype(kind(Buffer.t, Buffer.t));
   module Impl = {
     include Stream.Transform.Impl;
     [@bs.send] external copy: t => t = "copy";
@@ -78,11 +77,10 @@ module Hash = {
 [@bs.module "crypto"] external createHash: string => Hash.t = "createHash";
 
 module Hmac = {
-  type kind = [ Stream.transform | `Hmac];
-  type subtype('w, 'r, 'a) =
-    Stream.Transform.subtype('w, 'r, [> kind] as 'a);
-  type supertype('w, 'r, 'a) = Stream.subtype('w, 'r, [< kind] as 'a);
-  type t = subtype(Buffer.t, Buffer.t, kind);
+  type kind('w, 'r) = [ Stream.transform('w, 'r) | `Hmac];
+  type subtype('w, 'r, 'a) = Stream.subtype([> kind('w, 'r)] as 'a);
+  type supertype('w, 'r, 'a) = Stream.subtype([< kind('w, 'r)] as 'a);
+  type t = subtype(Buffer.t, Buffer.t, kind('w, 'r));
   module Impl = {
     include Stream.Transform.Impl;
     [@bs.send] external digest: t => Buffer.t = "digest";
@@ -105,11 +103,10 @@ module Certificate = {
 };
 
 module Cipher = {
-  type kind = [ Stream.transform | `Cipher];
-  type subtype('w, 'r, 'a) =
-    Stream.Transform.subtype('w, 'r, [> kind] as 'a);
-  type supertype('w, 'r, 'a) = Stream.subtype('w, 'r, [< kind] as 'a);
-  type t = subtype(Buffer.t, Buffer.t, kind);
+  type kind('w, 'r) = [ Stream.transform('w, 'r) | `Cipher];
+  type subtype('w, 'r, 'a) = Stream.subtype([> kind('w, 'r)] as 'a);
+  type supertype('w, 'r, 'a) = Stream.subtype([< kind('w, 'r)] as 'a);
+  type t = Stream.subtype(kind(Buffer.t, Buffer.t));
   module Impl = {
     include Stream.Transform.Impl;
     [@bs.send] external final: (t, string) => Buffer.t = "final";
@@ -150,11 +147,10 @@ module Cipher = {
 };
 
 module Decipher = {
-  type kind = [ Stream.transform | `Decipher];
-  type subtype('w, 'r, 'a) =
-    Stream.Transform.subtype('w, 'r, [> kind] as 'a);
-  type supertype('w, 'r, 'a) = Stream.subtype('w, 'r, [< kind] as 'a);
-  type t = subtype(Buffer.t, Buffer.t, kind);
+  type kind('w, 'r) = [ Stream.transform('w, 'r) | `Decipher];
+  type subtype('w, 'r, 'a) = Stream.subtype([> kind('w, 'r)] as 'a);
+  type supertype('w, 'r, 'a) = Stream.subtype([< kind('w, 'r)] as 'a);
+  type t = Stream.subtype(kind(Buffer.t, Buffer.t));
   module Impl = {
     [@bs.send]
     external final: (subtype('w, 'r, 'a), string) => Buffer.t = "final";
@@ -197,7 +193,7 @@ module Decipher = {
     ) =>
     t =
     "createDecipheriv";
-};
+} /* }*/ /* }*/ /* module Verify = */;
 
 // module DiffieHellman = {
 
@@ -207,10 +203,4 @@ module Decipher = {
 
 // };
 
-// module Sign = {
-
-// };
-
-// module Verify = {
-
-// };
+// module Sign = {

src/Fs.re

@@ -352,21 +352,21 @@ external openWithMode:
   "open";
 
 module WriteStream = {
-  type kind = [ Stream.writable | `FileSystem];
-  type subtype('w, 'r, 'a) = Stream.Writable.subtype('w, 'r, [> kind] as 'a);
-  type supertype('w, 'r, 'a) = Stream.subtype('w, 'r, [< kind] as 'a);
-  type t = subtype(Buffer.t, Buffer.t, [ kind]);
+  type kind('w) = [ Stream.writable('w) | `FileSystem];
+  type subtype('w, 'ty) = Stream.subtype([> kind('w)] as 'ty);
+  type supertype('w, 'ty) = Stream.subtype([< kind('w)] as 'ty);
+  type t = subtype(Buffer.t, [ kind(Buffer.t)]);
   module Impl = {
     include Stream.Writable.Impl;
     [@bs.send]
-    external bytesWritten: subtype('w, 'r, [> kind]) => int = "bytesWritten";
-    [@bs.send] external path: subtype('w, 'r, [> kind]) => string = "path";
+    external bytesWritten: subtype('w, [> kind('w)]) => int = "bytesWritten";
+    [@bs.send] external path: subtype('w, [> kind('w)]) => string = "path";
     [@bs.send]
-    external pending: subtype('w, 'r, [> kind]) => bool = "pending";
+    external pending: subtype('w, [> kind('w)]) => bool = "pending";
     [@bs.send]
     external onOpen:
       (
-        subtype('w, 'r, [> kind]) as 'stream',
+        subtype('w, [> kind('w)]) as 'stream',
         [@bs.as "open"] _,
         [@bs.uncurry] (fd => unit)
       ) =>
@@ -375,7 +375,7 @@ module WriteStream = {
     [@bs.send]
     external onReady:
       (
-        subtype('w, 'r, [> kind]) as 'stream,
+        subtype('w, [> kind('w)]) as 'stream,
         [@bs.as "ready"] _,
         [@bs.uncurry] (unit => unit)
       ) =>
@@ -386,23 +386,22 @@ module WriteStream = {
 };
 
 module ReadStream = {
-  type kind = [ Stream.readable | `FileSystem];
-  type subtype('w, 'r, 'a) =
-    Stream.Readable.subtype(Stream.void, 'r, [> kind] as 'a);
-  type supertype('w, 'r, 'a) =
-    Stream.subtype(Stream.void, 'r, [< kind] as 'a);
-  type t = subtype(Stream.void, Buffer.t, [ kind]);
+  type kind('r) = [ Stream.readable('r) | `FileSystem];
+  type subtype('r, 'ty) = Stream.subtype([> kind('r)] as 'ty);
+  type supertype('r, 'ty) =
+    Stream.subtype([< kind('r)] as 'ty);
+  type t = subtype(Buffer.t, [ kind(Buffer.t)]);
   module Impl = {
     include Stream.Readable.Impl;
     [@bs.send]
-    external bytesRead: subtype('w, 'r, [> kind]) => int = "bytesWritten";
-    [@bs.send] external path: subtype('w, 'r, [> kind]) => string = "path";
+    external bytesRead: subtype('r, [> kind('r)]) => int = "bytesWritten";
+    [@bs.send] external path: subtype('r, [> kind('r)]) => string = "path";
     [@bs.send]
-    external pending: subtype('w, 'r, [> kind]) => bool = "pending";
+    external pending: subtype('r, [> kind('r)]) => bool = "pending";
     [@bs.send]
     external onOpen:
       (
-        subtype('w, 'r, [> kind]) as 'stream,
+        subtype('r, [> kind('r)]) as 'stream,
         [@bs.as "open"] _,
         [@bs.uncurry] (fd => unit)
       ) =>
@@ -411,7 +410,7 @@ module ReadStream = {
     [@bs.send]
     external onReady:
       (
-        subtype('w, 'r, [> kind]) as 'stream,
+        subtype('r, [> kind('r)]) as 'stream,
         [@bs.as "ready"] _,
         [@bs.uncurry] (unit => unit)
       ) =>