Path2d Impl module

Author: saŭlo

src/Webapi/Canvas/Webapi__Canvas__Canvas2d.res

@@ -239,12 +239,10 @@ external strokeText: (t, string, ~x: float, ~y: float, ~maxWidth: float=?, @igno
 @send external strokeRect: (t, ~x: float, ~y: float, ~w: float, ~h: float) => unit = "strokeRect"
 @send external clearRect: (t, ~x: float, ~y: float, ~w: float, ~h: float) => unit = "clearRect"
 
-module T = {
-  type t = t
-}
-
 // CanvasPathCommons
-include Webapi__Canvas__Path_Common.Make(T)
+include Webapi__Canvas__Path_Common.Impl({
+  type t = t
+})
 
 /* Pixel maniplation */
 @send

src/Webapi/Canvas/Webapi__Canvas__Path2d.res

@@ -12,9 +12,7 @@ external make: (~d: string=?, unit) => t = "Path2D"
 @send
 external addPath: (t, t) => unit = "addPath"
 
-module T = {
-  type t = t
-}
-
 // CanvasPathCommons
-include Webapi__Canvas__Path_Common.Make(T)
+include Webapi__Canvas__Path_Common.Impl( {
+  type t = t
+})

src/Webapi/Canvas/Webapi__Canvas__Path_Common.res

@@ -1,18 +1,18 @@
-module type ModuleWithT = {
-  type t
-}
-
 /**
  * Named parameters have 1~3 of lenght, should resemble MDN/typescript docs/types.
  * This module exposes the typescript CanvasPath interface
  * https://github.com/microsoft/TypeScript/blob/46410044add2e9f53cea58e445de18dcda53443f/src/lib/dom.generated.d.ts#L5455
  */
-module Make = (M: ModuleWithT) => {
+module Impl = (
+  T: {
+    type t
+  },
+) => {
   // type t = M.t
   /** https://developer.mozilla.org/en-US/docs/Web/API/CanvasRenderingContext2D/arc */
   @send
   external arc: (
-    M.t,
+    T.t,
     ~x: float,
     ~y: float,
     ~r: float,
@@ -24,12 +24,12 @@ module Make = (M: ModuleWithT) => {
 
   /** https://developer.mozilla.org/en-US/docs/Web/API/CanvasRenderingContext2D/arcTo */
   @send
-  external arcTo: (M.t, ~x1: float, ~y1: float, ~x2: float, ~y2: float, ~r: float) => unit = "arcTo"
+  external arcTo: (T.t, ~x1: float, ~y1: float, ~x2: float, ~y2: float, ~r: float) => unit = "arcTo"
 
   /** https://developer.mozilla.org/en-US/docs/Web/API/CanvasRenderingContext2D/bezierCurveTo */
   @send
   external bezierCurveTo: (
-    M.t,
+    T.t,
     ~cp1x: float,
     ~cp1y: float,
     ~cp2x: float,
@@ -40,12 +40,12 @@ module Make = (M: ModuleWithT) => {
 
   /** https://developer.mozilla.org/en-US/docs/Web/API/CanvasRenderingContext2D/closePath*/
   @send
-  external closePath: M.t => unit = "closePath"
+  external closePath: T.t => unit = "closePath"
 
   /** https://developer.mozilla.org/en-US/docs/Web/API/CanvasRenderingContext2D/ellipse */
   @send
   external ellipse: (
-    M.t,
+    T.t,
     ~x: float,
     ~y: float,
     ~rx: float,
@@ -59,23 +59,23 @@ module Make = (M: ModuleWithT) => {
 
   /** https://developer.mozilla.org/en-US/docs/Web/API/CanvasRenderingContext2D/lineTo */
   @send
-  external lineTo: (M.t, ~x: float, ~y: float) => unit = "lineTo"
+  external lineTo: (T.t, ~x: float, ~y: float) => unit = "lineTo"
 
   /** https://developer.mozilla.org/en-US/docs/Web/API/CanvasRenderingContext2D/moveTo */
   @send
-  external moveTo: (M.t, ~x: float, ~y: float) => unit = "moveTo"
+  external moveTo: (T.t, ~x: float, ~y: float) => unit = "moveTo"
 
   /** https://developer.mozilla.org/en-US/docs/Web/API/CanvasRenderingContext2D/quadraticCurveTo */
   @send
-  external quadraticCurveTo: (M.t, ~cpx: float, ~cpy: float, ~x: float, ~y: float) => unit =
+  external quadraticCurveTo: (T.t, ~cpx: float, ~cpy: float, ~x: float, ~y: float) => unit =
     "quadraticCurveTo"
 
   /** https://developer.mozilla.org/en-US/docs/Web/API/CanvasRenderingContext2D/rect */
   @send
-  external rect: (M.t, ~x: float, ~y: float, ~w: float, ~h: float) => unit = "rect"
+  external rect: (T.t, ~x: float, ~y: float, ~w: float, ~h: float) => unit = "rect"
 
   /** https://developer.mozilla.org/en-US/docs/Web/API/CanvasRenderingContext2D/roundRect */
   @send
-  external roundRect: (M.t, ~x: float, ~y: float, ~w: float, ~h: float, ~r: float) => unit =
+  external roundRect: (T.t, ~x: float, ~y: float, ~w: float, ~h: float, ~r: float) => unit =
     "roundRect"
 }