[doclint] validate return statements

This patch teaches doclint to validate presence of return statements.
It also adds a bunch of documentation to the api.md.

References #14.
This commit is contained in:
Andrey Lushnikov 2017-07-13 15:54:37 -07:00
parent 21a722b3f8
commit 235001bab3
9 changed files with 274 additions and 86 deletions

View File

@ -52,7 +52,6 @@
* [frame.isMainFrame()](#frameismainframe) * [frame.isMainFrame()](#frameismainframe)
* [frame.name()](#framename) * [frame.name()](#framename)
* [frame.parentFrame()](#frameparentframe) * [frame.parentFrame()](#frameparentframe)
* [frame.securityOrigin()](#framesecurityorigin)
* [frame.url()](#frameurl) * [frame.url()](#frameurl)
* [frame.waitFor(selector)](#framewaitforselector) * [frame.waitFor(selector)](#framewaitforselector)
- [class: Request](#class-request) - [class: Request](#class-request)
@ -99,8 +98,17 @@ Browser manages a browser instance, creating it with a predefined
settings, opening and closing pages. Instantiating Browser class does settings, opening and closing pages. Instantiating Browser class does
not necessarily result in launching browser; the instance will be launched when the need will arise. not necessarily result in launching browser; the instance will be launched when the need will arise.
#### new Browser([options]) A typical scenario of using [Browser] is opening a new page and navigating it to a desired URL:
```js
const {Browser} = require('puppeteer');
const browser = new Browser();
browser.newPage().then(async page => {
await page.navigate('https://example.com');
browser.close();
})
```
#### new Browser([options])
- `options` <[Object]> Set of configurable options to set on the browser. Can have the following fields: - `options` <[Object]> Set of configurable options to set on the browser. Can have the following fields:
- `headless` <[boolean]> Wether to run chromium in headless mode. Defaults to `true`. - `headless` <[boolean]> Wether to run chromium in headless mode. Defaults to `true`.
- `executablePath` <[string]> Path to a chromium executable to run instead of bundled chromium. - `executablePath` <[string]> Path to a chromium executable to run instead of bundled chromium.
@ -109,87 +117,118 @@ not necessarily result in launching browser; the instance will be launched when
#### browser.close() #### browser.close()
Closes chromium application with all the pages (if any were opened). The browser object itself is considered to be disposed and could not be used anymore. Closes browser with all the pages (if any were opened). The browser object itself is considered to be disposed and could not be used anymore.
#### browser.closePage(page) #### browser.closePage(page)
- `page` <[Page]> A page to be closed. - `page` <[Page]> A page to be closed.
- returns: <[Promise]> Promise which resolves when the page is closed. - returns: <[Promise]> Promise which resolves when the page is closed.
This is an alias for the `page.close()` method.
#### browser.newPage() #### browser.newPage()
- returns: <[Promise]<[Page]>> Promise which resolves to a new [Page] object.
- returns: <[Promise]<[Page]>>
Create a new page in browser and returns a promise which gets resolved with a Page object.
#### browser.stderr #### browser.stderr
- <[stream.Readable]> - <[stream.Readable]>
A Readable Stream that represents the browser process's stderr. A Readable Stream that represents the browser process's stderr.
For example, `stderr` could be piped into `process.stderr`:
```js
const {Browser} = require('puppeteer');
const browser = new Browser();
browser.stderr.pipe(process.stderr);
browser.version().then(version => {
console.log(version);
browser.close();
});
```
#### browser.stdout #### browser.stdout
- <[stream.Readable]> - <[stream.Readable]>
A Readable Stream that represents the browser process's stdout. A Readable Stream that represents the browser process's stdout.
For example, `stdout` could be piped into `process.stdout`:
```js
const {Browser} = require('puppeteer');
const browser = new Browser();
browser.stdout.pipe(process.stdout);
browser.version().then(version => {
console.log(version);
browser.close();
});
```
#### browser.version() #### browser.version()
- returns: <[Promise]<[string]>> - returns: <[Promise]<[string]>> String describing browser version. For headless chromium, this is similar to `HeadlessChrome/61.0.3153.0`. For non-headless, this is `Chrome/61.0.3153.0`.
> **NOTE** the format of browser.version() is not fixed and might change with future releases of the library.
### class: Page ### class: Page
Page provides interface to interact with a tab in a browser. Pages are created by browser: Page provides methods to interact with browser page. Page could be thought about as a browser tab, so one [Browser] instance might have multiple [Page] instances.
```javascript An example of creating a page, navigating it to a URL and saving screenshot as `screenshot.png`:
var browser = new Browser(); ```js
browser.newPage().then(page => { const {Browser} = require('puppeteer');
... const browser = new Browser();
browser.newPage().then(async page =>
await page.navigate('https://example.com');
await page.screenshot({path: 'screenshot.png'});
browser.close();
}); });
``` ```
Pages could be closed by `page.close()` method.
#### page.addScriptTag(url) #### page.addScriptTag(url)
- `url` <[string]> Url of a script to be added - `url` <[string]> Url of a script to be added
- returns: <[Promise]> Promise which resolves as the script gets added and loads. - returns: <[Promise]> Promise which resolves as the script gets added and loads.
Adds a `<script></script>` tag to the page with the desired url. Alternatively, javascript could be injected to the page via `page.injectFile` method.
#### page.click(selector) #### page.click(selector)
- `selector` <[string]> A query selector of element to click. If there are multiple elements satisfying the selector, the first will be clicked. - `selector` <[string]> A query selector to search for element to click. If there are multiple elements satisfying the selector, the first will be clicked.
- returns: <[Promise]> Promise which resolves when the element matching `selector` is successfully clicked. Promise gets rejected if there's no element matching `selector`.
#### page.close() #### page.close()
- returns: <[Promise]> Returns promise which resolves when page gets closed. - returns: <[Promise]> Returns promise which resolves when page gets closed.
#### page.evaluate(fun, ...args) #### page.evaluate(fun, ...args)
- `fun` <[function]> Function to be evaluated in browser context - `fun` <[function]> Function to be evaluated in browser context
- `...args` <...[string]> Arguments to pass to `fun` - `...args` <...[string]> Arguments to pass to `fun`
- returns: <[Promise]<[Object]>> Promise which resolves to function return value - returns: <[Promise]<[Object]>> Promise which resolves to function return value
#### page.evaluateOnInitialized(fun, ...args) This is a shortcut for [page.mainFrame().evaluate()](#frameevaluatefun-args) method.
#### page.evaluateOnInitialized(fun, ...args)
- `fun` <[function]> Function to be evaluated in browser context - `fun` <[function]> Function to be evaluated in browser context
- `...args` <...[string]> Arguments to pass to `fun` - `...args` <...[string]> Arguments to pass to `fun`
- returns: <[Promise]<[Object]>> Promise which resolves to function - returns: <[Promise]<[Object]>> Promise which resolves to function
`page.evaluateOnInitialized` adds a function which would run on every page navigation before any page's javascript. This is useful to amend javascript environment, e.g. to seed [Math.random](https://github.com/GoogleChrome/puppeteer/blob/master/examples/unrandomize.js)
#### page.focus(selector) #### page.focus(selector)
- `selector` <[string]> A query selector of element to focus. If there are multiple elements satisfying the selector, the first will be focused. - `selector` <[string]> A query selector of element to focus. If there are multiple elements satisfying the selector, the first will be focused.
- returns: <[Promise]> Promise which resolves when the element matching `selector` is successfully focused. Promise gets rejected if there's no element matching `selector`.
#### page.frames() #### page.frames()
- returns: <[Array]<[Frame]>> An array of all frames attached to the page.
#### page.httpHeaders() #### page.httpHeaders()
- returns: <[Object]> Key-value set of additional http headers which will be sent with every request.
- returns: <[Object]> Key-value set of additional http headers, which will be sent with every request.
#### page.injectFile(filePath) #### page.injectFile(filePath)
- `filePath` <[string]> Path to the javascript file to be injected into page. - `filePath` <[string]> Path to the javascript file to be injected into page.
- returns: <[Promise]> Promise which resolves when file gets successfully evaluated in page. - returns: <[Promise]> Promise which resolves when file gets successfully evaluated in page.
#### page.mainFrame() #### page.mainFrame()
- returns: <[Frame]> returns page's main frame.
Page is guaranteed to have a main frame which persists during navigations.
#### page.navigate(url, options) #### page.navigate(url, options)
- `url` <[string]> URL to navigate page to - `url` <[string]> URL to navigate page to
- `options` <[Object]> Navigation parameters which might have the following properties: - `options` <[Object]> Navigation parameters which might have the following properties:
- `maxTime` <[number]> Maximum navigation time in milliseconds, defaults to 30 seconds. - `maxTime` <[number]> Maximum navigation time in milliseconds, defaults to 30 seconds.
@ -206,11 +245,9 @@ The `page.navigate` will throw an error if:
- the `maxTime` is exceeded during navigation. - the `maxTime` is exceeded during navigation.
#### page.plainText() #### page.plainText()
- returns: <[Promise]<[string]>> Returns page's inner text. - returns: <[Promise]<[string]>> Returns page's inner text.
#### page.printToPDF(filePath[, options]) #### page.printToPDF(filePath[, options])
- `filePath` <[string]> The file path to save the image to. The screenshot type will be inferred from file extension - `filePath` <[string]> The file path to save the image to. The screenshot type will be inferred from file extension
- `options` <[Object]> Options object which might have the following properties: - `options` <[Object]> Options object which might have the following properties:
- `scale` <[number]> - `scale` <[number]>
@ -224,7 +261,6 @@ The `page.navigate` will throw an error if:
- returns: <[Promise]> Promise which resolves when the PDF is saved. - returns: <[Promise]> Promise which resolves when the PDF is saved.
#### page.screenshot([options]) #### page.screenshot([options])
- `options` <[Object]> Options object which might have the following properties: - `options` <[Object]> Options object which might have the following properties:
- `path` <[string]> The file path to save the image to. The screenshot type will be inferred from file extension. - `path` <[string]> The file path to save the image to. The screenshot type will be inferred from file extension.
- `type` <[string]> Specify screenshot type, could be either `jpeg` or `png`. - `type` <[string]> Specify screenshot type, could be either `jpeg` or `png`.
@ -238,42 +274,78 @@ The `page.navigate` will throw an error if:
- returns: <[Promise]<[Buffer]>> Promise which resolves to buffer with captured screenshot - returns: <[Promise]<[Buffer]>> Promise which resolves to buffer with captured screenshot
#### page.setContent(html) #### page.setContent(html)
- `html` <[string]> HTML markup to assign to the page. - `html` <[string]> HTML markup to assign to the page.
- returns: <[Promise]> Promise which resolves when the content is successfully assigned. - returns: <[Promise]> Promise which resolves when the content is successfully assigned.
#### page.setHTTPHeaders(headers) #### page.setHTTPHeaders(headers)
- `headers` <[Object]> Key-value set of additional http headers to be sent with every request. - `headers` <[Object]> Key-value set of additional http headers to be sent with every request.
- returns: <[Promise]> Promise which resolves when additional headers are installed - returns: <[Promise]> Promise which resolves when additional headers are installed
#### page.setInPageCallback(name, callback) #### page.setInPageCallback(name, callback)
- `name` <[string]> Name of the callback to be assigned on window object - `name` <[string]> Name of the callback to be assigned on window object
- `callback` <[function]> Callback function which will be called in node.js - `callback` <[function]> Callback function which will be called in puppeteer's context.
- returns: <[Promise]> Promise which resolves when callback is successfully initialized - returns: <[Promise]> Promise which resolves when callback is successfully initialized
The in-page callback allows page to asynchronously reach back to the Puppeteer.
An example of a page showing amount of CPU's:
```js
const os = require('os');
const {Browser} = require('puppeteer');
const browser = new Browser();
browser.newPage().then(async page =>
await page.setInPageCallback('getCPUCount', () => os.cpus().length);
await page.evaluate(async () => {
alert(await window.getCPUCount());
});
browser.close();
});
```
#### page.setRequestInterceptor(interceptor) #### page.setRequestInterceptor(interceptor)
- `interceptor` <[function]> Callback function which accepts a single argument of type <[InterceptedRequest]>. - `interceptor` <[function]> Callback function which accepts a single argument of type <[InterceptedRequest]>.
- returns: <[Promise]> Promise which resolves when request interceptor is successfully installed on the page.
After the request interceptor is installed on the page, every request will be reported to the interceptor. The [InterceptedRequest] could be modified and then either continued via the `continue()` method, or aborted via the `abort()` method.
En example of a naive request interceptor which aborts all image requests:
```js
const {Browser} = require('puppeteer');
const browser = new Browser();
browser.newPage().then(async page =>
await page.setRequestInterceptor(interceptedRequest => {
if (interceptedRequest.url.endsWith('.png') || interceptedRequest.url.endsWith('.jpg'))
interceptedRequest.abort();
else
interceptedRequest.continue();
});
await page.navigate('https://example.com');
browser.close();
});
```
#### page.setUserAgent(userAgent) #### page.setUserAgent(userAgent)
- `userAgent` <[string]> Specific user agent to use in this page - `userAgent` <[string]> Specific user agent to use in this page
- returns: <[Promise]> Promise which resolves when the user agent is set. - returns: <[Promise]> Promise which resolves when the user agent is set.
#### page.setViewportSize(size) #### page.setViewportSize(size)
- `size` <[Object]> An object with two fields: - `size` <[Object]> An object with two fields:
- `width` <[number]> Specify page's width in pixels. - `width` <[number]> Specify page's width in pixels.
- `height` <[number]> Specify page's height in pixels. - `height` <[number]> Specify page's height in pixels.
- returns: <[Promise]> Promise which resolves when the dimensions are updated. - returns: <[Promise]> Promise which resolves when the dimensions are updated.
#### page.title() The page's viewport size defines page's dimensions, observable from page via `window.innerWidth / window.innerHeight`. The viewport size defines a size of page
screenshot (unless a `fullPage` option is given).
In case of multiple pages in one browser, each page can have its own viewport size.
#### page.title()
- returns: <[Promise]<[string]>> Returns page's title. - returns: <[Promise]<[string]>> Returns page's title.
#### page.type(text) #### page.type(text)
- `text` <[string]> A text to type into a focused element. - `text` <[string]> A text to type into a focused element.
- returns: <[Promise]> Promise which resolves when the text has been successfully typed.
#### page.uploadFile(selector, ...filePaths) #### page.uploadFile(selector, ...filePaths)
- `selector` <[string]> A query selector to a file input - `selector` <[string]> A query selector to a file input
@ -281,36 +353,33 @@ The `page.navigate` will throw an error if:
- returns: <[Promise]> Promise which resolves when the value is set. - returns: <[Promise]> Promise which resolves when the value is set.
#### page.url() #### page.url()
- returns: <[Promise]<[string]>> Promise which resolves with the current page url. - returns: <[Promise]<[string]>> Promise which resolves with the current page url.
#### page.userAgent() #### page.userAgent()
- returns: <[string]> Returns user agent. - returns: <[string]> Returns user agent.
#### page.viewportSize() #### page.viewportSize()
- returns: <[Object]> An object with two fields: - returns: <[Object]> An object with two fields:
- `width` <[number]> Page's width in pixels. - `width` <[number]> Page's width in pixels.
- `height` <[number]> Page's height in pixels. - `height` <[number]> Page's height in pixels.
#### page.waitFor(selector) #### page.waitFor(selector)
- `selector` <[string]> A query selector to wait for on the page. - `selector` <[string]> A query selector to wait for on the page.
- returns: <[Promise]> Promise which resolves when the element matching `selector` appears in the page.
Wait for the `selector` to appear in page. If at the moment of calling
the method the `selector` already exists, the method will return
immediately.
Shortcut for [page.mainFrame().waitFor(selector)](#framewaitforselector). Shortcut for [page.mainFrame().waitFor(selector)](#framewaitforselector).
### class: Dialog ### class: Dialog
#### dialog.accept([promptText]) #### dialog.accept([promptText])
- `promptText` <[string]> A text to enter in prompt. Does not cause any effects if the dialog type is not prompt. - `promptText` <[string]> A text to enter in prompt. Does not cause any effects if the dialog's `type` is not prompt.
- returns: <[Promise]> Promise which resolves when the dialog has being accepted.
#### dialog.dismiss() #### dialog.dismiss()
- returns: <[Promise]> Promise which resolves when the dialog has being dismissed.
#### dialog.message() #### dialog.message()
- returns: <[string]> A message displayed in the dialog.
#### dialog.type #### dialog.type
- <[string]> - <[string]>
@ -319,25 +388,64 @@ Dialog's type, could be one of the `alert`, `beforeunload`, `confirm` and `promp
### class: Frame ### class: Frame
#### frame.childFrames() #### frame.childFrames()
#### frame.evaluate(fun, ...args) - returns: <[Array]<[Frame]>>
#### frame.evaluate(fun, ...args)
- `fun` <[function]> Function to be evaluated in browser context - `fun` <[function]> Function to be evaluated in browser context
- `...args` <[Array]<[string]>> Arguments to pass to `fun` - `...args` <[Array]<[string]>> Arguments to pass to `fun`
- returns: <[Promise]<[Object]>> Promise which resolves to function return value - returns: <[Promise]<[Object]>> Promise which resolves to function return value
#### frame.isDetached() If the function, passed to the `page.evaluate`, returns a [Promise], then `page.evaluate` would wait for the promise to resolve and return it's value.
#### frame.isMainFrame()
#### frame.name()
#### frame.parentFrame()
#### frame.securityOrigin()
#### frame.url()
#### frame.waitFor(selector)
```js
const {Browser} = require('puppeteer');
const browser = new Browser();
browser.newPage().then(async page =>
const result = await page.evaluate(() => {
return Promise.resolve().then(() => 8 * 7);
});
console.log(result); // prints "56"
browser.close();
});
```
#### frame.isDetached()
- returns: <[boolean]>
Returns `true` if the frame has being detached, or `false` otherwise.
#### frame.isMainFrame()
- returns: <[boolean]>
Returns `true` is the frame is page's main frame, or `false` otherwise.
#### frame.name()
- returns: <[string]>
Returns frame's name as specified in the tag.
#### frame.parentFrame()
- returns: <[Frame]> Returns parent frame, if any. Detached frames and main frames return `null`.
#### frame.url()
- returns: <[string]>
Returns frame's url.
#### frame.waitFor(selector)
- `selector` <[string]> CSS selector of awaited element, - `selector` <[string]> CSS selector of awaited element,
- returns: <[Promise]> Promise which resolves when element specified by selector string is added to DOM. - returns: <[Promise]> Promise which resolves when element specified by selector string is added to DOM.
Wait for the `selector` to appear in page. If at the moment of calling
the method the `selector` already exists, the method will return
immediately.
### class: Request ### class: Request
[Request] class represents requests which are sent by page. [Request] implements [Body] mixin, which in case of HTTP POST requests allows clients to call `request.json()` or `request.text()` to get different representations of request's body.
#### request.headers #### request.headers
- <[Headers]> - <[Headers]>
@ -350,6 +458,7 @@ Contains the request's method (GET, POST, etc.)
#### request.response() #### request.response()
- returns: <[Response]> A matching [Response] object, or `null` if the response has not been received yet.
#### request.url #### request.url
- <[string]> - <[string]>
@ -358,6 +467,8 @@ Contains the URL of the request.
### class: Response ### class: Response
[Response] class represents responses which are received by page. [Response] implements [Body] mixin, which allows clients to call `response.json()` or `response.text()` to get different representations of response body.
#### response.headers #### response.headers
- <[Headers]> - <[Headers]>
@ -369,6 +480,9 @@ Contains the [Headers] object associated with the response.
Contains a boolean stating whether the response was successful (status in the range 200-299) or not. Contains a boolean stating whether the response was successful (status in the range 200-299) or not.
#### response.request() #### response.request()
- returns: <[Request]> A matching [Request] object.
#### response.status #### response.status
- <[number]> - <[number]>
@ -381,43 +495,53 @@ Contains the status code of the response (e.g., 200 for a success).
Contains the status message corresponding to the status code (e.g., OK for 200). Contains the status message corresponding to the status code (e.g., OK for 200).
#### response.url #### response.url
- <[string]> - <[string]>
Contains the URL of the response. Contains the URL of the response.
### class: InterceptedRequest ### class: InterceptedRequest
[InterceptedRequest] represents an intercepted request, which can be mutated and either continued or aborted. [InterceptedRequest] which is not continued or aborted will be in a 'hanging' state.
#### interceptedRequest.abort() #### interceptedRequest.abort()
Aborts request.
#### interceptedRequest.continue() #### interceptedRequest.continue()
Continues request.
#### interceptedRequest.headers #### interceptedRequest.headers
- <[Headers]> - <[Headers]>
Contains the [Headers] object associated with the request. Contains the [Headers] object associated with the request.
Headers could be mutated with the `headers.append`, `headers.set` and other
methods. Must not be changed in response to an authChallenge.
#### interceptedRequest.isHandled() #### interceptedRequest.isHandled()
- returns: <[boolean]> returns `true` if either `abort` or `continue` was called on the object. Otherwise, returns `false`.
#### interceptedRequest.method #### interceptedRequest.method
- <[string]> - <[string]>
Contains the request's method (GET, POST, etc.) Contains the request's method (GET, POST, etc.)
If set this allows the request method to be overridden. Must not be changed in response to an authChallenge.
#### interceptedRequest.postData #### interceptedRequest.postData
- <[string]> - <[string]>
In case of a `POST` request, contains `POST` data. Contains `POST` data for `POST` requests.
`request.postData` is mutable and could be written to. Must not be changed in response to an authChallenge.
#### interceptedRequest.url #### interceptedRequest.url
- <[string]> - <[string]>
Contains the URL of the request. If changed, the request url will be modified in a way that's not observable by page. Must not be changed in response to an authChallenge.
### class: Headers ### class: Headers
#### headers.append(name, value) #### headers.append(name, value)
@ -430,6 +554,9 @@ If there's already a header with name `name`, the header gets overwritten.
- `name` <[string]> Case-insensetive name of the header to be deleted. If there's no header with such name, the method does nothing. - `name` <[string]> Case-insensetive name of the header to be deleted. If there's no header with such name, the method does nothing.
#### headers.entries() #### headers.entries()
- returns: <[iterator]> An iterator allowing to go through all key/value pairs contained in this object. Both the key and value of each pairs are [string] objects.
#### headers.get(name) #### headers.get(name)
- `name` <[string]> Case-insensetive name of the header. - `name` <[string]> Case-insensetive name of the header.
- returns: <[string]> Header value of `null`, if there's no such header. - returns: <[string]> Header value of `null`, if there's no such header.
@ -439,6 +566,9 @@ If there's already a header with name `name`, the header gets overwritten.
- returns: <[boolean]> Returns `true` if the header with such name exists, or `false` otherwise. - returns: <[boolean]> Returns `true` if the header with such name exists, or `false` otherwise.
#### headers.keys() #### headers.keys()
- returns: <[iterator]> an iterator allowing to go through all keys contained in this object. The keys are [string] objects.
#### headers.set(name, value) #### headers.set(name, value)
- `name` <[string]> Case-insensetive header name. - `name` <[string]> Case-insensetive header name.
- `value` <[string]> Header value - `value` <[string]> Header value
@ -446,15 +576,27 @@ If there's already a header with name `name`, the header gets overwritten.
If there's already a header with name `name`, the header gets overwritten. If there's already a header with name `name`, the header gets overwritten.
#### headers.values() #### headers.values()
- returns: <[iterator]<[string]>> Returns an iterator allowing to go through all values contained in this object. The values are [string] objects.
### class: Body ### class: Body
#### body.arrayBuffer() #### body.arrayBuffer()
- returns: <Promise<[ArrayBuffer]>>
#### body.bodyUsed #### body.bodyUsed
- returns: <[boolean]>
#### body.buffer() #### body.buffer()
- returns: <Promise<[Buffer]>>
#### body.json() #### body.json()
- returns: <Promise<[Object]>>
#### body.text() #### body.text()
- returns: <Promise<[text]>>
[Array]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array "Array" [Array]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array "Array"
[ArrayBuffer]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/ArrayBuffer "ArrayBuffer"
[boolean]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Data_structures#Boolean_type "Boolean" [boolean]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Data_structures#Boolean_type "Boolean"
[Buffer]: https://nodejs.org/api/buffer.html#buffer_class_buffer "Buffer" [Buffer]: https://nodejs.org/api/buffer.html#buffer_class_buffer "Buffer"
[function]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Function "Function" [function]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Function "Function"
@ -465,4 +607,10 @@ If there's already a header with name `name`, the header gets overwritten.
[InterceptedRequest]: https://github.com/GoogleChrome/puppeteer/blob/master/docs/api.md#class-interceptedrequest "Page" [InterceptedRequest]: https://github.com/GoogleChrome/puppeteer/blob/master/docs/api.md#class-interceptedrequest "Page"
[Promise]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise "Promise" [Promise]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise "Promise"
[string]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Data_structures#String_type "String" [string]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Data_structures#String_type "String"
[stream.Readable]: https://nodejs.org/api/stream.html#stream_class_stream_readable [stream.Readable]: https://nodejs.org/api/stream.html#stream_class_stream_readable "stream.Readable"
[Frame]: https://github.com/GoogleChrome/puppeteer/blob/master/docs/api.md#class-frame "Frame"
[iterator]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Iteration_protocols "Iterator"
[Response]: https://github.com/GoogleChrome/puppeteer/blob/master/docs/api.md#class-response "Response"
[Request]: https://github.com/GoogleChrome/puppeteer/blob/master/docs/api.md#class-request "Request"
[Browser]: https://github.com/GoogleChrome/puppeteer/blob/master/docs/api.md#class-browser "Browser"
[Body]: https://github.com/GoogleChrome/puppeteer/blob/master/docs/api.md#class-body "Body"

View File

@ -282,13 +282,6 @@ class Frame {
return this._url; return this._url;
} }
/**
* @return {string}
*/
securityOrigin() {
return this._securityOrigin;
}
/** /**
* @return {?Frame} * @return {?Frame}
*/ */
@ -332,13 +325,9 @@ class Frame {
framePayload = framePayload || { framePayload = framePayload || {
name: '', name: '',
url: '', url: '',
securityOrigin: '',
mimeType: ''
}; };
this._name = framePayload.name; this._name = framePayload.name;
this._url = framePayload.url; this._url = framePayload.url;
this._securityOrigin = framePayload.securityOrigin;
this._mimeType = framePayload.mimeType;
} }
_detach() { _detach() {

View File

@ -39,6 +39,14 @@ class Documentation {
for (let methodName of methodDiff.equal) { for (let methodName of methodDiff.equal) {
const actualMethod = actualClass.methods.get(methodName); const actualMethod = actualClass.methods.get(methodName);
const expectedMethod = expectedClass.methods.get(methodName); const expectedMethod = expectedClass.methods.get(methodName);
if (actualMethod.hasReturn !== expectedMethod.hasReturn) {
if (actualMethod.hasReturn)
errors.push(`Method ${className}.${methodName} has unneeded description of return type`);
else if (!expectedMethod.async)
errors.push(`Method ${className}.${methodName} is missing return type description`);
else
errors.push(`Async method ${className}.${methodName} should describe return type Promise`);
}
const actualArgs = Array.from(actualMethod.args.keys()); const actualArgs = Array.from(actualMethod.args.keys());
const expectedArgs = Array.from(expectedMethod.args.keys()); const expectedArgs = Array.from(expectedMethod.args.keys());
const argDiff = diff(actualArgs, expectedArgs); const argDiff = diff(actualArgs, expectedArgs);
@ -117,12 +125,16 @@ Documentation.Member = class {
* @param {string} type * @param {string} type
* @param {string} name * @param {string} name
* @param {!Array<!Documentation.Argument>} argsArray * @param {!Array<!Documentation.Argument>} argsArray
* @param {boolean} hasReturn
* @param {boolean} async
*/ */
constructor(type, name, argsArray) { constructor(type, name, argsArray, hasReturn, async) {
this.type = type; this.type = type;
this.name = name; this.name = name;
this.argsArray = argsArray; this.argsArray = argsArray;
this.args = new Map(); this.args = new Map();
this.hasReturn = hasReturn;
this.async = async;
for (let arg of argsArray) for (let arg of argsArray)
this.args.set(arg.name, arg); this.args.set(arg.name, arg);
} }
@ -130,10 +142,11 @@ Documentation.Member = class {
/** /**
* @param {string} name * @param {string} name
* @param {!Array<!Documentation.Argument>} argsArray * @param {!Array<!Documentation.Argument>} argsArray
* @param {boolean} hasReturn
* @return {!Documentation.Member} * @return {!Documentation.Member}
*/ */
static createMethod(name, argsArray) { static createMethod(name, argsArray, hasReturn, async) {
return new Documentation.Member('method', name, argsArray); return new Documentation.Member('method', name, argsArray, hasReturn, async);
} }
/** /**
@ -141,7 +154,7 @@ Documentation.Member = class {
* @return {!Documentation.Member} * @return {!Documentation.Member}
*/ */
static createProperty(name) { static createProperty(name) {
return new Documentation.Member('property', name, []); return new Documentation.Member('property', name, [], false, false);
} }
}; };

View File

@ -36,13 +36,11 @@ class JSOutline {
this._currentClassMembers.push(property); this._currentClassMembers.push(property);
return; return;
} }
const args = []; // Async functions have return value.
for (let param of node.value.params) let hasReturn = node.value.async;
args.push(new Documentation.Argument(this._extractText(param)));
let method = Documentation.Member.createMethod(methodName, args);
this._currentClassMembers.push(method);
// Extract properties from constructor. // Extract properties from constructor.
if (node.kind === 'constructor') { if (node.kind === 'constructor') {
// Extract properties from constructor.
let walker = new ESTreeWalker(node => { let walker = new ESTreeWalker(node => {
if (node.type !== 'AssignmentExpression') if (node.type !== 'AssignmentExpression')
return; return;
@ -53,14 +51,23 @@ class JSOutline {
this._currentClassMembers.push(Documentation.Member.createProperty(node.property.name)); this._currentClassMembers.push(Documentation.Member.createProperty(node.property.name));
}); });
walker.walk(node); walker.walk(node);
} else if (!hasReturn) {
let walker = new ESTreeWalker(node => {
if (node.type === 'FunctionExpression' || node.type === 'FunctionDeclaration' || node.type === 'ArrowFunctionExpression')
return ESTreeWalker.SkipSubtree;
if (node.type === 'ReturnStatement')
hasReturn = hasReturn || !!node.argument;
});
walker.walk(node.value.body);
} }
const args = [];
for (let param of node.value.params)
args.push(new Documentation.Argument(this._extractText(param)));
let method = Documentation.Member.createMethod(methodName, args, hasReturn, node.value.async);
this._currentClassMembers.push(method);
return ESTreeWalker.SkipSubtree; return ESTreeWalker.SkipSubtree;
} }
_onMemberExpression(node) {
}
_flushClassIfNeeded() { _flushClassIfNeeded() {
if (this._currentClassName === null) if (this._currentClassName === null)
return; return;

View File

@ -33,11 +33,14 @@ class MDOutline {
} else if (element.matches('h4')) { } else if (element.matches('h4')) {
member = { member = {
name: element.textContent, name: element.textContent,
args: [] args: [],
hasReturn: false
}; };
currentClass.members.push(member); currentClass.members.push(member);
} else if (element.matches('li') && element.firstChild.matches && element.firstChild.matches('code')) { } else if (element.matches('li') && element.firstChild.matches && element.firstChild.matches('code')) {
member.args.push(element.firstChild.textContent); member.args.push(element.firstChild.textContent);
} else if (element.matches('li') && element.firstChild.nodeType === Element.TEXT_NODE && element.firstChild.textContent.startsWith('returns: ')) {
member.hasReturn = true;
} }
} }
return classes; return classes;
@ -83,7 +86,7 @@ class MDOutline {
if (parameters !== member.args.join(', ')) if (parameters !== member.args.join(', '))
this.errors.push(`Heading arguments for "${member.name}" do not match described ones, i.e. "${parameters}" != "${member.args.join(', ')}"`); this.errors.push(`Heading arguments for "${member.name}" do not match described ones, i.e. "${parameters}" != "${member.args.join(', ')}"`);
let args = member.args.map(arg => new Documentation.Argument(arg)); let args = member.args.map(arg => new Documentation.Argument(arg));
let method = Documentation.Member.createMethod(methodName, args); let method = Documentation.Member.createMethod(methodName, args, member.hasReturn, false);
currentClassMembers.push(method); currentClassMembers.push(method);
} }

View File

@ -0,0 +1,9 @@
### class: Foo
#### foo.asyncFunction()
#### foo.return42()
#### foo.returnNothing()
- returns: <[number]>

View File

@ -0,0 +1,15 @@
class Foo {
return42() {
return 42;
}
returnNothing() {
let e = () => {
return 10;
}
e();
}
async asyncFunction() {
}
}

View File

@ -0,0 +1,3 @@
[MarkDown] Async method Foo.asyncFunction should describe return type Promise
[MarkDown] Method Foo.return42 is missing return type description
[MarkDown] Method Foo.returnNothing has unneeded description of return type

View File

@ -38,6 +38,7 @@ describe('doclint', function() {
it('05-outdated-toc', SX(test)); it('05-outdated-toc', SX(test));
it('06-duplicates', SX(test)); it('06-duplicates', SX(test));
it('07-sorting', SX(test)); it('07-sorting', SX(test));
it('08-return', SX(test));
}); });
async function test() { async function test() {