Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Convert to object-first convention for use with fast pipe #77

Merged
merged 14 commits into from
Aug 16, 2018
406 changes: 191 additions & 215 deletions __tests__/puppeteer_test.re

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions examples/logHtml.re
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@ let logHtml = () =>
|> then_(browser => browser |> Browser.newPage)
|> then_(page => {
let options = Navigation.makeOptions(~timeout=25000., ());
page
|> Page.goto("https://google.com", ~options, ())
page->Page.goto("https://google.com", ~options, ())
|> then_(res => res |> Js.Null.getExn |> Response.text);
})
|> then_(text => Js.log(text) |> resolve)
Expand Down
21 changes: 10 additions & 11 deletions examples/search.re
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,18 @@ let search = () =>
|> then_(page => {
let options =
Navigation.makeOptions(~timeout=20000., ~waitUntil=`load, ());
page
|> Page.goto("https://google.com", ~options, ())
|> then_(_ => page |> Page.type_("#lst-ib", "puppeteer", ()))
|> then_(() => page |> Page.click("input[type='submit']", ()))
|> then_(() => page |> Page.waitForSelector("h3 a", ()))
page->Page.goto("https://google.com", ~options, ())
|> then_(_ => page->Page.type_("#lst-ib", "puppeteer", ()))
|> then_(() => page->Page.click("input[type='submit']", ()))
|> then_(() => page->Page.waitForSelector("h3 a", ()))
|> then_(() =>
page
|> Page.selectOneEval(
"h3 a",
[%raw
{| function (element) { return element.textContent; } |}
],
)
->Page.selectOneEval(
"h3 a",
[%raw
{| function (element) { return element.textContent; } |}
],
)
)
|> then_(text => Js.log2("Got:", text) |> resolve)
|> then_(_ => Browser.close(browser))
Expand Down
5 changes: 2 additions & 3 deletions examples/takeScreenshot.re
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,12 @@ let takeScreenshot = () =>
browser
|> Browser.newPage
|> then_(page =>
page
|> Page.goto("https://google.com", ())
page->Page.goto("https://google.com", ())
|> then_(_ => {
Js.log("screenshotting");
let options =
Screenshot.makeOptions(~path="./screenshot.png", ());
page |> Page.screenshot(~options, ());
page->Page.screenshot(~options, ());
})
)
|> then_(_ => Browser.close(browser))
Expand Down
77 changes: 41 additions & 36 deletions lib/js/__tests__/puppeteer_test.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 0 additions & 6 deletions lib/js/src/BrowserFetcher.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 1 addition & 10 deletions lib/js/src/CDPSession.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 1 addition & 15 deletions lib/js/src/Coverage.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/js/src/Page.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"build": "bsb -make-world",
"clean": "bsb -clean-world",
"lint-staged": "lint-staged",
"precommit": "lint-staged",
"precommit": "bsb -make-world && lint-staged",
"start": "bsb -make-world -w",
"test": "bsb -make-world && jest",
"test:ci": "jest --bail --ci",
Expand Down
6 changes: 1 addition & 5 deletions src/BrowserFetcher.re
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,10 @@ external empty: unit => t = "%identity";

[@bs.send]
external download:
(t, string, Js.Undefined.t((float, float) => unit)) =>
(t, ~revision: string, ~progressCallback: (float, float) => unit=?, unit) =>
Js.Promise.t(revisionInfo) =
"";

let download =
(~revision, ~progressCallback=?, t): Js.Promise.t(revisionInfo) =>
download(t, revision, progressCallback |> Js.Undefined.fromOption);

[@bs.send] external localRevisions: t => Js.Promise.t(array(string)) = "";

[@bs.deriving jsConverter]
Expand Down
5 changes: 1 addition & 4 deletions src/CDPSession.re
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,5 @@ type t;

[@bs.send]
external send:
(t, string, Js.Undefined.t(Js.t({..}))) => Js.Promise.t(Js.t({..})) =
(t, string, ~params: Js.t({..})=?, unit) => Js.Promise.t(Js.t({..})) =
"";

let send = (~method_, ~params=?, t) =>
send(t, method_, params |> Js.Undefined.fromOption);
8 changes: 2 additions & 6 deletions src/Coverage.re
Original file line number Diff line number Diff line change
Expand Up @@ -34,18 +34,14 @@ external makeJSCoverageOptions:

[@bs.send]
external startCSSCoverage:
(t, ~options: cssCoverageOptions=?) => Js.Promise.t(unit) =
(t, ~options: cssCoverageOptions=?, unit) => Js.Promise.t(unit) =
"";

let startCSSCoverage = (~options=?, t) => startCSSCoverage(t, ~options?);

[@bs.send]
external startJSCoverage:
(t, ~options: jsCoverageOptions=?) => Js.Promise.t(unit) =
(t, ~options: jsCoverageOptions=?, unit) => Js.Promise.t(unit) =
"";

let startJSCoverage = (~options=?, t) => startJSCoverage(t, ~options?);

[@bs.send] external stopCSSCoverage: t => Js.Promise.t(array(report)) = "";

[@bs.send] external stopJSCoverage: t => Js.Promise.t(array(report)) = "";
36 changes: 20 additions & 16 deletions src/ElementHandle.re
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,9 @@ let boxModel = handle =>
boxModel(handle)
|> Js.Promise.(then_(handle => Js.toOption(handle) |> resolve));

[@bs.send.pipe: t]
external click: (~options: Click.clickOptions=?, unit) => Js.Promise.t(unit) =
[@bs.send]
external click:
(t, ~options: Click.clickOptions=?, unit) => Js.Promise.t(unit) =
"";

[@bs.send] external focus: t => Js.Promise.t(unit) = "";
Expand All @@ -29,36 +30,39 @@ external click: (~options: Click.clickOptions=?, unit) => Js.Promise.t(unit) =

[@bs.send] external isIntersectingViewport: t => Js.Promise.t(bool) = "";

[@bs.send.pipe: t]
[@bs.send]
external press:
(~key: string, ~options: Keyboard.options=?, unit) => Js.Promise.t(unit) =
(t, ~key: string, ~options: Keyboard.options=?, unit) => Js.Promise.t(unit) =
"";

[@bs.send.pipe: t]
[@bs.send]
external screenshot:
(~options: Screenshot.options=?, unit) => Js.Promise.t(Node.Buffer.t) =
(t, ~options: Screenshot.options=?, unit) => Js.Promise.t(Node.Buffer.t) =
"";

[@bs.send.pipe: t]
external selectOne: (~selector: string) => Js.Promise.t(Js.Null.t(t)) = "$";
[@bs.send]
external selectOne: (t, ~selector: string) => Js.Promise.t(Js.Null.t(t)) =
"$";

[@bs.send.pipe: t]
external selectAll: (~selector: string) => Js.Promise.t(array(t)) = "$$";
[@bs.send]
external selectAll: (t, ~selector: string) => Js.Promise.t(array(t)) = "$$";

[@bs.send.pipe: t]
external selectXPath: (~xpath: string) => Js.Promise.t(array(t)) = "$x";
[@bs.send]
external selectXPath: (t, ~xpath: string) => Js.Promise.t(array(t)) = "$x";

[@bs.send] external tap: t => Js.Promise.t(unit) = "";

[@bs.send] external toString: t => string = "";

[@bs.send.pipe: t]
[@bs.send]
external type_:
(~text: string, ~options: {. "delay": float}=?, unit) => Js.Promise.t(unit) =
(t, ~text: string, ~options: {. "delay": float}=?, unit) =>
Js.Promise.t(unit) =
"type";

[@bs.send.pipe: t] [@bs.splice]
external uploadFile: (~filePaths: array(string)) => Js.Promise.t(unit) = "";
[@bs.send] [@bs.splice]
external uploadFile: (t, ~filePaths: array(string)) => Js.Promise.t(unit) =
"";

[@bs.send]
external contentFrame: t => Js.Promise.t(Js.Null.t(Types.frameBase)) = "";
Loading