-
Notifications
You must be signed in to change notification settings - Fork 19
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
13 changed files
with
659 additions
and
243 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,27 +1,8 @@ | ||
| const request = require('request') | ||
| const config = require('./config') | ||
| const filterData = require('./filter-data') | ||
| const w3c = require('./w3c-validator') | ||
| const whatwg = require('./whatwg-validator') | ||
|
|
||
| module.exports = async options => { | ||
| const requestOptions = await config(options) | ||
| const ignore = options.ignore | ||
| return new Promise((resolve, reject) => { | ||
| request(requestOptions, function (error, response, result) { | ||
| if (error) { | ||
| return reject(error) | ||
| } | ||
|
|
||
| if (response && response.statusCode !== 200) { | ||
| const error = new Error('Validator returned unexpected statuscode: ' + response.statusCode) | ||
| return reject(error) | ||
| } | ||
|
|
||
| let data = options.format === 'json' && !ignore ? JSON.parse(result) : result | ||
|
|
||
| if (ignore) { | ||
| data = filterData(data, ignore) | ||
| } | ||
| return resolve(data) | ||
| }) | ||
| }) | ||
| const { validator } = options | ||
| const useWHATWG = validator && validator.toLowerCase() === 'whatwg' | ||
| return useWHATWG ? whatwg(options) : w3c(options) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| const request = require('request') | ||
| const config = require('./config') | ||
| const filterData = require('./filter-data') | ||
|
|
||
| module.exports = async options => { | ||
| const requestOptions = await config(options) | ||
| const ignore = options.ignore | ||
| return new Promise((resolve, reject) => { | ||
| request(requestOptions, function (error, response, result) { | ||
| if (error) { | ||
| return reject(error) | ||
| } | ||
|
|
||
| if (response && response.statusCode !== 200) { | ||
| const error = new Error('Validator returned unexpected statuscode: ' + response.statusCode) | ||
| return reject(error) | ||
| } | ||
|
|
||
| let data = options.format === 'json' && !ignore ? JSON.parse(result) : result | ||
|
|
||
| if (ignore) { | ||
| data = filterData(data, ignore) | ||
| } | ||
| return resolve(data) | ||
| }) | ||
| }) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| module.exports = function (messages, ignore) { | ||
| const filters = Array.isArray(ignore) ? ignore : [ignore] | ||
| const filtered = messages.filter(item => { | ||
| const { ruleId, message } = item | ||
| if (filters.includes(ruleId) || filters.includes(message)) { | ||
| return false | ||
| } else { | ||
| return true | ||
| } | ||
| }) | ||
| return filtered | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| const { HtmlValidate } = require('html-validate') | ||
| const filterMessages = require('./whatwg-filter-messages') | ||
| const config = require('./config') | ||
|
|
||
| module.exports = async options => { | ||
| const htmlvalidate = new HtmlValidate() | ||
| const { ignore } = options | ||
| options.isLocal = !options.data | ||
| const validatorOptions = await config(options) | ||
| const { body } = validatorOptions | ||
| const report = htmlvalidate.validateString(body) | ||
| let { valid, errorCount, warningCount, results } = report | ||
| let isValid = valid | ||
| const messages = results.length > 0 ? results[0].messages : [] | ||
| let errors = messages.filter(message => message.severity === 2) | ||
| let warnings = messages.filter(message => message.severity === 1) | ||
|
|
||
| if (ignore) { | ||
| console.log('Lets ignore') | ||
| errors = filterMessages(errors, ignore) | ||
| warnings = filterMessages(warnings, ignore) | ||
| isValid = errors.length === 0 | ||
| errorCount = errors.length | ||
| warningCount = warnings.length | ||
| } | ||
|
|
||
| return { | ||
| isValid, | ||
| errorCount, | ||
| warningCount, | ||
| errors, | ||
| warnings | ||
| } | ||
| } |
Oops, something went wrong.