Skip to content

Commit 558c7d5

Browse files
authored
Merge pull request #18 from Minnozz/convert-to-rescript
Convert to ReScript syntax
2 parents 2d56e0d + 253ba95 commit 558c7d5

File tree

307 files changed

+6255
-6365
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

307 files changed

+6255
-6365
lines changed

Diff for: examples/dom_example.re renamed to examples/dom_example.res

+18-16
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,42 @@
1-
open Webapi.Dom;
2-
open Belt.Option;
1+
open Webapi.Dom
2+
open Belt.Option
33

44
/* Adapted from https://developer.mozilla.org/en-US/docs/Web/API/Document_Object_Model/Examples#Example_7:_Displaying_Event_Object_Properties */
55

6-
let unwrapUnsafely =
7-
fun
6+
let unwrapUnsafely = x =>
7+
switch x {
88
| Some(v) => v
9-
| None => raise(Invalid_argument("Passed `None` to unwrapUnsafely"));
9+
| None => raise(Invalid_argument("Passed `None` to unwrapUnsafely"))
10+
}
1011

1112
/*
1213
* These SHOULD type check
1314
*/
14-
let _ = document->Document.createElement("div")->Element.className;
15+
let _ = document->Document.createElement("div")->Element.className
1516

1617
let _ =
17-
document->Document.createElement("div")->Element.nextElementSibling->map(Element.innerText); /* innerText is a function that accepts a Node */
18+
document
19+
->Document.createElement("div")
20+
->Element.nextElementSibling
21+
->map(Element.innerText) /* innerText is a function that accepts a Node */
1822

1923
/* Before subtyping:
2024
document->Document.createElement("div")
2125
->Element.asNode
2226
->Node.parentElement /* inherited from Node, returns DomRe.element */
2327
->map(Element.innerText); /* inherited from Node */
24-
*/
28+
*/
2529

2630
/* After subtyping: */
2731
let _ =
2832
document
2933
->Document.createElement("div")
3034
->Element.parentElement /* inherited from Node, returns DomRe.element */
31-
->map(Element.innerText); /* inherited from Node */
35+
->map(Element.innerText) /* inherited from Node */
3236

33-
let el = document->Document.createElement("div")->Element.asHtmlElement->unwrapUnsafely;
37+
let el = document->Document.createElement("div")->Element.asHtmlElement->unwrapUnsafely
3438

35-
/*
39+
/*
3640
document->Document.asHtmlDocument
3741
->flatMap(HtmlDocument.body)
3842
->map(Element.appendChild(el));
@@ -42,14 +46,14 @@ let el = document->Document.createElement("div")->Element.asHtmlElement->unwrapU
4246
document->Document.asHtmlDocument
4347
->flatMap(HtmlDocument.body)
4448
->map(Element.appendChild (el->HtmlElement.asNode));
45-
*/
49+
*/
4650

4751
/* After subtyping: */
4852
let _ =
4953
document
5054
->Document.asHtmlDocument
5155
->flatMap(HtmlDocument.body)
52-
->map(body => body->Element.appendChild(el));
56+
->map(body => body->Element.appendChild(el))
5357

5458
/*
5559
/*
@@ -84,6 +88,4 @@ let _ =
8488
/* non-standard event-specific listener API - log screen coordinates of mouse cursor when moved */
8589
document
8690
->Document.createElement("div")
87-
->Element.addMouseMoveEventListener(e =>
88-
(MouseEvent.screenX(e), MouseEvent.screenY(e))->Js.log
89-
);
91+
->Element.addMouseMoveEventListener(e => (MouseEvent.screenX(e), MouseEvent.screenY(e))->Js.log)

Diff for: lib/js/tests/Webapi/Canvas/Webapi__Canvas__Canvas2d__test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict';
22

3-
var List = require("bs-platform/lib/js/list.js");
3+
var List = require("rescript/lib/js/list.js");
44
var Webapi__Canvas__Canvas2d = require("../../../src/Webapi/Canvas/Webapi__Canvas__Canvas2d.js");
55

66
var canvasEl = document.createElement("canvas");

Diff for: lib/js/tests/Webapi/Dom/Webapi__Dom__AnimationEvent__test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict';
22

3-
var Curry = require("bs-platform/lib/js/curry.js");
3+
var Curry = require("rescript/lib/js/curry.js");
44
var Webapi__Dom__AnimationEvent = require("../../../src/Webapi/Dom/Webapi__Dom__AnimationEvent.js");
55

66
var $$event = new AnimationEvent("my-event");

Diff for: lib/js/tests/Webapi/Dom/Webapi__Dom__BeforeUnloadEvent__test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict';
22

3-
var Curry = require("bs-platform/lib/js/curry.js");
3+
var Curry = require("rescript/lib/js/curry.js");
44
var Webapi__Dom__BeforeUnloadEvent = require("../../../src/Webapi/Dom/Webapi__Dom__BeforeUnloadEvent.js");
55

66
var $$event = new BeforeUnloadEvent("my-event");

Diff for: lib/js/tests/Webapi/Dom/Webapi__Dom__ClipboardEvent__test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict';
22

3-
var Curry = require("bs-platform/lib/js/curry.js");
3+
var Curry = require("rescript/lib/js/curry.js");
44
var Webapi__Dom__ClipboardEvent = require("../../../src/Webapi/Dom/Webapi__Dom__ClipboardEvent.js");
55

66
var $$event = new ClipboardEvent("my-event");

Diff for: lib/js/tests/Webapi/Dom/Webapi__Dom__CloseEvent__test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict';
22

3-
var Curry = require("bs-platform/lib/js/curry.js");
3+
var Curry = require("rescript/lib/js/curry.js");
44
var Webapi__Dom__CloseEvent = require("../../../src/Webapi/Dom/Webapi__Dom__CloseEvent.js");
55

66
var $$event = new CloseEvent("my-event");

Diff for: lib/js/tests/Webapi/Dom/Webapi__Dom__CompositionEvent__test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict';
22

3-
var Curry = require("bs-platform/lib/js/curry.js");
3+
var Curry = require("rescript/lib/js/curry.js");
44
var Webapi__Dom__CompositionEvent = require("../../../src/Webapi/Dom/Webapi__Dom__CompositionEvent.js");
55

66
var $$event = new CompositionEvent("my-event");

Diff for: lib/js/tests/Webapi/Dom/Webapi__Dom__CustomEvent__test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict';
22

3-
var Curry = require("bs-platform/lib/js/curry.js");
3+
var Curry = require("rescript/lib/js/curry.js");
44
var Webapi__Dom__CustomEvent = require("../../../src/Webapi/Dom/Webapi__Dom__CustomEvent.js");
55

66
var $$event = new CustomEvent("my-event");

Diff for: lib/js/tests/Webapi/Dom/Webapi__Dom__DomStringMap__test.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'use strict';
22

3-
var Belt_Option = require("bs-platform/lib/js/belt_Option.js");
4-
var Caml_option = require("bs-platform/lib/js/caml_option.js");
3+
var Belt_Option = require("rescript/lib/js/belt_Option.js");
4+
var Caml_option = require("rescript/lib/js/caml_option.js");
55
var Webapi__Dom__Element = require("../../../src/Webapi/Dom/Webapi__Dom__Element.js");
66
var Webapi__Dom__DomStringMap = require("../../../src/Webapi/Dom/Webapi__Dom__DomStringMap.js");
77

Diff for: lib/js/tests/Webapi/Dom/Webapi__Dom__DragEvent__test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict';
22

3-
var Curry = require("bs-platform/lib/js/curry.js");
3+
var Curry = require("rescript/lib/js/curry.js");
44
var Webapi__Dom__DragEvent = require("../../../src/Webapi/Dom/Webapi__Dom__DragEvent.js");
55

66
var $$event = new DragEvent("my-event");

Diff for: lib/js/tests/Webapi/Dom/Webapi__Dom__ErrorEvent__test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict';
22

3-
var Curry = require("bs-platform/lib/js/curry.js");
3+
var Curry = require("rescript/lib/js/curry.js");
44
var Webapi__Dom__ErrorEvent = require("../../../src/Webapi/Dom/Webapi__Dom__ErrorEvent.js");
55

66
var $$event = new ErrorEvent("my-event");

Diff for: lib/js/tests/Webapi/Dom/Webapi__Dom__FocusEvent__test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict';
22

3-
var Curry = require("bs-platform/lib/js/curry.js");
3+
var Curry = require("rescript/lib/js/curry.js");
44
var Webapi__Dom__FocusEvent = require("../../../src/Webapi/Dom/Webapi__Dom__FocusEvent.js");
55

66
var $$event = new FocusEvent("my-event");

Diff for: lib/js/tests/Webapi/Dom/Webapi__Dom__IdbVersionChangeEvent__test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict';
22

3-
var Curry = require("bs-platform/lib/js/curry.js");
3+
var Curry = require("rescript/lib/js/curry.js");
44
var Webapi__Dom__IdbVersionChangeEvent = require("../../../src/Webapi/Dom/Webapi__Dom__IdbVersionChangeEvent.js");
55

66
var $$event = new IDBVersionChangeEvent("my-event");

Diff for: lib/js/tests/Webapi/Dom/Webapi__Dom__InputEvent__test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict';
22

3-
var Curry = require("bs-platform/lib/js/curry.js");
3+
var Curry = require("rescript/lib/js/curry.js");
44
var Webapi__Dom__InputEvent = require("../../../src/Webapi/Dom/Webapi__Dom__InputEvent.js");
55

66
var $$event = new InputEvent("my-event");

Diff for: lib/js/tests/Webapi/Dom/Webapi__Dom__KeyboardEvent__test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict';
22

3-
var Curry = require("bs-platform/lib/js/curry.js");
3+
var Curry = require("rescript/lib/js/curry.js");
44
var Webapi__Dom__KeyboardEvent = require("../../../src/Webapi/Dom/Webapi__Dom__KeyboardEvent.js");
55

66
var $$event = new KeyboardEvent("my-event");

Diff for: lib/js/tests/Webapi/Dom/Webapi__Dom__MouseEvent__test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict';
22

3-
var Curry = require("bs-platform/lib/js/curry.js");
3+
var Curry = require("rescript/lib/js/curry.js");
44
var Webapi__Dom__MouseEvent = require("../../../src/Webapi/Dom/Webapi__Dom__MouseEvent.js");
55

66
var $$event = new MouseEvent("my-event");

Diff for: lib/js/tests/Webapi/Dom/Webapi__Dom__PageTransitionEvent__test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict';
22

3-
var Curry = require("bs-platform/lib/js/curry.js");
3+
var Curry = require("rescript/lib/js/curry.js");
44
var Webapi__Dom__PageTransitionEvent = require("../../../src/Webapi/Dom/Webapi__Dom__PageTransitionEvent.js");
55

66
var $$event = new PageTransitionEvent("my-event");

Diff for: lib/js/tests/Webapi/Dom/Webapi__Dom__PointerEvent__test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict';
22

3-
var Curry = require("bs-platform/lib/js/curry.js");
3+
var Curry = require("rescript/lib/js/curry.js");
44
var Webapi__Dom__PointerEvent = require("../../../src/Webapi/Dom/Webapi__Dom__PointerEvent.js");
55

66
var $$event = new PointerEvent("my-event");

Diff for: lib/js/tests/Webapi/Dom/Webapi__Dom__PopStateEvent__test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict';
22

3-
var Curry = require("bs-platform/lib/js/curry.js");
3+
var Curry = require("rescript/lib/js/curry.js");
44
var Webapi__Dom__PopStateEvent = require("../../../src/Webapi/Dom/Webapi__Dom__PopStateEvent.js");
55

66
var $$event = new PopStateEvent("my-event");

Diff for: lib/js/tests/Webapi/Dom/Webapi__Dom__ProgressEvent__test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict';
22

3-
var Curry = require("bs-platform/lib/js/curry.js");
3+
var Curry = require("rescript/lib/js/curry.js");
44
var Webapi__Dom__ProgressEvent = require("../../../src/Webapi/Dom/Webapi__Dom__ProgressEvent.js");
55

66
var $$event = new ProgressEvent("my-event");

Diff for: lib/js/tests/Webapi/Dom/Webapi__Dom__RelatedEvent__test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict';
22

3-
var Curry = require("bs-platform/lib/js/curry.js");
3+
var Curry = require("rescript/lib/js/curry.js");
44
var Webapi__Dom__RelatedEvent = require("../../../src/Webapi/Dom/Webapi__Dom__RelatedEvent.js");
55

66
var $$event = new RelatedEvent("my-event");

Diff for: lib/js/tests/Webapi/Dom/Webapi__Dom__StorageEvent__test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict';
22

3-
var Curry = require("bs-platform/lib/js/curry.js");
3+
var Curry = require("rescript/lib/js/curry.js");
44
var Webapi__Dom__StorageEvent = require("../../../src/Webapi/Dom/Webapi__Dom__StorageEvent.js");
55

66
var $$event = new StorageEvent("my-event");

Diff for: lib/js/tests/Webapi/Dom/Webapi__Dom__SvgZoomEvent__test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict';
22

3-
var Curry = require("bs-platform/lib/js/curry.js");
3+
var Curry = require("rescript/lib/js/curry.js");
44
var Webapi__Dom__SvgZoomEvent = require("../../../src/Webapi/Dom/Webapi__Dom__SvgZoomEvent.js");
55

66
var $$event = new SVGZoomEvent("my-event");

Diff for: lib/js/tests/Webapi/Dom/Webapi__Dom__TimeEvent__test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict';
22

3-
var Curry = require("bs-platform/lib/js/curry.js");
3+
var Curry = require("rescript/lib/js/curry.js");
44
var Webapi__Dom__TimeEvent = require("../../../src/Webapi/Dom/Webapi__Dom__TimeEvent.js");
55

66
var $$event = new TimeEvent("my-event");

Diff for: lib/js/tests/Webapi/Dom/Webapi__Dom__TouchEvent__test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict';
22

3-
var Curry = require("bs-platform/lib/js/curry.js");
3+
var Curry = require("rescript/lib/js/curry.js");
44
var Webapi__Dom__TouchEvent = require("../../../src/Webapi/Dom/Webapi__Dom__TouchEvent.js");
55

66
var $$event = new TouchEvent("my-event");

Diff for: lib/js/tests/Webapi/Dom/Webapi__Dom__TrackEvent__test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict';
22

3-
var Curry = require("bs-platform/lib/js/curry.js");
3+
var Curry = require("rescript/lib/js/curry.js");
44
var Webapi__Dom__TrackEvent = require("../../../src/Webapi/Dom/Webapi__Dom__TrackEvent.js");
55

66
var $$event = new TrackEvent("my-event");

Diff for: lib/js/tests/Webapi/Dom/Webapi__Dom__TransitionEvent__test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict';
22

3-
var Curry = require("bs-platform/lib/js/curry.js");
3+
var Curry = require("rescript/lib/js/curry.js");
44
var Webapi__Dom__TransitionEvent = require("../../../src/Webapi/Dom/Webapi__Dom__TransitionEvent.js");
55

66
var $$event = new TransitionEvent("my-event");

Diff for: lib/js/tests/Webapi/Dom/Webapi__Dom__UiEvent__test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict';
22

3-
var Curry = require("bs-platform/lib/js/curry.js");
3+
var Curry = require("rescript/lib/js/curry.js");
44
var Webapi__Dom__UiEvent = require("../../../src/Webapi/Dom/Webapi__Dom__UiEvent.js");
55

66
var $$event = new UIEvent("my-event");

Diff for: lib/js/tests/Webapi/Dom/Webapi__Dom__WebGlContextEvent__test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict';
22

3-
var Curry = require("bs-platform/lib/js/curry.js");
3+
var Curry = require("rescript/lib/js/curry.js");
44
var Webapi__Dom__WebGlContextEvent = require("../../../src/Webapi/Dom/Webapi__Dom__WebGlContextEvent.js");
55

66
var $$event = new WebGLContextEvent("my-event");

Diff for: lib/js/tests/Webapi/Dom/Webapi__Dom__WheelEvent__test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict';
22

3-
var Curry = require("bs-platform/lib/js/curry.js");
3+
var Curry = require("rescript/lib/js/curry.js");
44
var Webapi__Dom__WheelEvent = require("../../../src/Webapi/Dom/Webapi__Dom__WheelEvent.js");
55

66
var $$event = new WheelEvent("my-event");

Diff for: lib/js/tests/Webapi/Webapi__ReadableStream__test.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'use strict';
22

3-
var Belt_Option = require("bs-platform/lib/js/belt_Option.js");
4-
var Caml_option = require("bs-platform/lib/js/caml_option.js");
3+
var Belt_Option = require("rescript/lib/js/belt_Option.js");
4+
var Caml_option = require("rescript/lib/js/caml_option.js");
55

66
function test_closed(reader) {
77
return reader.closed();

Diff for: lib/js/tests/Webapi/Webapi__ResizeObserver__test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict';
22

3-
var Caml_array = require("bs-platform/lib/js/caml_array.js");
3+
var Caml_array = require("rescript/lib/js/caml_array.js");
44

55
var el = document.createElement("strong");
66

Diff for: lib/js/tests/Webapi/Webapi__Url__test.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
var params = new URLSearchParams("key1=value1&key2=value2");
55

6-
params.forEach(function (prim, prim$1) {
7-
console.log(prim, prim$1);
6+
params.forEach(function (prim0, prim1) {
7+
console.log(prim0, prim1);
88

99
});
1010

Diff for: package.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@
1515
"dom"
1616
],
1717
"scripts": {
18-
"build": "bsb -make-world",
19-
"start": "bsb -make-world -w",
20-
"clean": "bsb -clean-world",
18+
"build": "rescript",
19+
"start": "rescript build -w",
20+
"clean": "rescript clean",
2121
"doc-install": "npm install --no-save bsdoc",
22-
"test": "bsb -make-world && bsdoc build api && bsdoc support-files",
23-
"refmt-all": "find src tests \\( -name '*.re' -o -name '*.rei' \\) | xargs bsrefmt -w 100 --in-place"
22+
"test": "rescript && bsdoc build api && bsdoc support-files",
23+
"refmt-all": "rescript format -all"
2424
},
2525
"files": [
2626
"src",
@@ -29,7 +29,7 @@
2929
"author": "Tiny Technologies Inc",
3030
"license": "MIT",
3131
"devDependencies": {
32-
"bs-platform": "^9.0.2"
32+
"rescript": "^9.1.4"
3333
},
3434
"dependencies": {
3535
"bs-fetch": "^0.6.2"

0 commit comments

Comments
 (0)