diff --git a/.eslintrc.js b/.eslintrc.js index 13d3b2f7a..682fb0044 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -20,7 +20,7 @@ module.exports = { parserOptions: { ecmaVersion: 6, sourceType: 'module', - project: './tsconfig.lint.json', + project: './tsconfig.json', warnOnUnsupportedTypeScriptVersion: false, }, plugins: ['@typescript-eslint'], @@ -38,13 +38,11 @@ module.exports = { 'template-tag-spacing': 'error', quotes: ['error', 'single', { avoidEscape: true }], - '@typescript-eslint/adjacent-overload-signatures': 'off', '@typescript-eslint/ban-ts-comment': 'off', '@typescript-eslint/no-unsafe-argument': 'off', '@typescript-eslint/no-unsafe-assignment': 'off', '@typescript-eslint/no-unsafe-call': 'off', '@typescript-eslint/no-unsafe-member-access': 'off', - '@typescript-eslint/no-unused-vars': 'off', '@typescript-eslint/no-var-requires': 'off', '@typescript-eslint/restrict-template-expressions': 'off', }, diff --git a/.github/workflows/development.yml b/.github/workflows/development.yml index 0e56751bd..16a2f80eb 100644 --- a/.github/workflows/development.yml +++ b/.github/workflows/development.yml @@ -74,7 +74,8 @@ jobs: - name: Run coverage run: npm run test:coverage - - name: Upload coverage to Codecov - uses: codecov/codecov-action@v2.1.0 + - name: ⬆️ Upload coverage to Codecov + uses: codecov/codecov-action@v2 with: - file: ./coverage/lcov.info + files: ./coverage/coverage-final.json + name: codecov-dev diff --git a/.github/workflows/production.yml b/.github/workflows/production.yml index a73e2ec5b..974e4d951 100644 --- a/.github/workflows/production.yml +++ b/.github/workflows/production.yml @@ -74,9 +74,10 @@ jobs: run: npm run test:coverage - name: ⬆️ Upload coverage to Codecov - uses: codecov/codecov-action@v2.1.0 + uses: codecov/codecov-action@v2 with: - file: ./coverage/lcov.info + files: ./coverage/coverage-final.json + name: codecov-prod release: if: ${{ github.repository == 'htmlhint/HTMLHint' && diff --git a/.gitignore b/.gitignore index 052d256c2..b14c4db7c 100644 --- a/.gitignore +++ b/.gitignore @@ -64,3 +64,6 @@ test/e2e/reports /website/node_modules /website/build /website/.docusaurus + +# HTML formatter output +report.html diff --git a/.husky/pre-commit b/.husky/pre-commit old mode 100644 new mode 100755 diff --git a/.husky/prepare-commit-msg b/.husky/prepare-commit-msg old mode 100644 new mode 100755 index 17e2764cd..249fea58a --- a/.husky/prepare-commit-msg +++ b/.husky/prepare-commit-msg @@ -1,4 +1,4 @@ #!/bin/sh . "$(dirname "$0")/_/husky.sh" -exec < /dev/tty && npx cz --hook || true +( exec < /dev/tty && npx cz --hook ) || true 2> /dev/null diff --git a/.prettierignore b/.prettierignore index b60541118..6c31cb9d0 100644 --- a/.prettierignore +++ b/.prettierignore @@ -28,3 +28,6 @@ npm-debug.log* # CHANGELOG.md will be generated by semantic-release CHANGELOG.md + +# Report created by test +report.html diff --git a/CHANGELOG.md b/CHANGELOG.md index 1b628740b..defe0246d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,16 @@ +# [1.0.0](https://github.com/htmlhint/HTMLHint/compare/v0.16.3...v1.0.0) (2021-11-26) + + +### Features + +* set minimum support to es6 ([ed5f895](https://github.com/htmlhint/HTMLHint/commit/ed5f89546340df17890e88a9a1df78edb4568cb1)) +* upgrade to Typescript 4 ([472722b](https://github.com/htmlhint/HTMLHint/commit/472722b2c8d61d46576741d388a222c55fe92ea6)) + + +### BREAKING CHANGES + +* IE11 and older browsers will no longer be supported + ## [0.16.3](https://github.com/htmlhint/HTMLHint/compare/v0.16.2...v0.16.3) (2021-11-24) diff --git a/SECURITY.md b/SECURITY.md new file mode 100644 index 000000000..10551281d --- /dev/null +++ b/SECURITY.md @@ -0,0 +1,18 @@ +# Security Notice + +This document outlines general security procedures and policies for the GoTrustify infrastructure + +## Reporting a vulnerability + +Please report security vulnerabilities to us via [email](mailto:htmlhint@gmail.com) to work on verifying the vulnerability and fixing it. You will receive a response within 48 hours. +Please allow the vulnerability to be fixed before any public exposure, as this will help protect all of the people who use a fork of the repo. + +Please include the requested information listed below (as much as you can provide) to help us better understand the nature and scope of the possible issue: + +- Type of issue (e.g. buffer overflow, SQL injection, cross-site scripting, etc.) +- Full paths of source file(s) related to the manifestation of the issue +- The location of the affected source code (tag/branch/commit or direct URL) +- Any special configuration required to reproduce the issue +- Step-by-step instructions to reproduce the issue +- Proof-of-concept or exploit code (if possible) +- Impact of the issue, including how an attacker might exploit the issue diff --git a/build-linux.sh b/build-linux.sh deleted file mode 100755 index 3e1b2aa54..000000000 --- a/build-linux.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash -set -x - -# Cleanup -rm -Rf ./dist - -# Prepare -npx tsc - -# Build core -npm run build:rollup diff --git a/build-windows.bat b/build-windows.bat deleted file mode 100755 index 9b7548015..000000000 --- a/build-windows.bat +++ /dev/null @@ -1,10 +0,0 @@ -@echo off - -:: Cleanup -IF EXIST dist ( rmdir dist /q /s ) ELSE ( echo dist folder not present ) - -:: Prepare -call npx tsc - -:: Build core -npm run build:rollup diff --git a/build.js b/build.js deleted file mode 100644 index c88ba582b..000000000 --- a/build.js +++ /dev/null @@ -1,17 +0,0 @@ -const { execSync } = require('child_process') - -const os = require('os') - -const type = os.type() - -switch (type) { - case 'Linux': - case 'Darwin': - execSync('./build-linux.sh', { stdio: 'inherit' }) - break - case 'Windows_NT': - execSync('build-windows.bat', { stdio: 'inherit' }) - break - default: - throw new Error(`Unsupported OS found: ${type}`) -} diff --git a/codecov.yml b/codecov.yml index 15496f4e4..077817c9b 100644 --- a/codecov.yml +++ b/codecov.yml @@ -1,6 +1,20 @@ +codecov: + require_ci_to_pass: true + coverage: - status: - project: - default: - target: auto # this is default - if_not_found: success # no commit found? still set a success + precision: 2 + round: down + range: '70...100' + +parsers: + gcov: + branch_detection: + conditional: yes + loop: yes + method: no + macro: no + +comment: + layout: 'reach,diff,flags,files,footer' + behavior: default + require_changes: false diff --git a/dist/cli/formatter.js b/dist/cli/formatter.js index a16c9d540..56e1631bf 100644 --- a/dist/cli/formatter.js +++ b/dist/cli/formatter.js @@ -1,35 +1,35 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -var chalk = require("chalk"); -var events_1 = require("events"); -var glob_1 = require("glob"); -var path_1 = require("path"); -var HTMLHint; -var options; -var mapFormatters = loadFormatters(); -var arrSupportedFormatters = []; -for (var formatterName in mapFormatters) { +const chalk = require("chalk"); +const events_1 = require("events"); +const glob_1 = require("glob"); +const path_1 = require("path"); +let HTMLHint; +let options; +const mapFormatters = loadFormatters(); +const arrSupportedFormatters = []; +for (const formatterName in mapFormatters) { if (formatterName !== 'default') { arrSupportedFormatters.push(formatterName); } } function loadFormatters() { - var arrFiles = glob_1.sync('./formatters/*.js', { + const arrFiles = (0, glob_1.sync)('./formatters/*.js', { cwd: __dirname, dot: false, nodir: true, strict: false, silent: true, }); - var mapFormatters = {}; - arrFiles.forEach(function (file) { - var fileInfo = path_1.parse(file); - var formatterPath = path_1.resolve(__dirname, file); + const mapFormatters = {}; + arrFiles.forEach((file) => { + const fileInfo = (0, path_1.parse)(file); + const formatterPath = (0, path_1.resolve)(__dirname, file); mapFormatters[fileInfo.name] = require(formatterPath); }); return mapFormatters; } -var formatter = new events_1.EventEmitter(); +const formatter = new events_1.EventEmitter(); formatter.getSupported = function () { return arrSupportedFormatters; }; @@ -38,7 +38,7 @@ formatter.init = function (tmpHTMLHint, tmpOptions) { options = tmpOptions; }; formatter.setFormat = function (format) { - var formatHandel = mapFormatters[format]; + const formatHandel = mapFormatters[format]; if (formatHandel === undefined) { console.log(chalk.red('No supported formatter, supported formatters: %s'), arrSupportedFormatters.join(', ')); process.exit(1); @@ -48,4 +48,4 @@ formatter.setFormat = function (format) { } }; module.exports = formatter; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZm9ybWF0dGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NsaS9mb3JtYXR0ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSw2QkFBOEI7QUFDOUIsaUNBQXFDO0FBQ3JDLDZCQUF1QztBQUN2Qyw2QkFBcUM7QUFJckMsSUFBSSxRQUEwQixDQUFBO0FBQzlCLElBQUksT0FBOEIsQ0FBQTtBQUdsQyxJQUFNLGFBQWEsR0FBRyxjQUFjLEVBQUUsQ0FBQTtBQUN0QyxJQUFNLHNCQUFzQixHQUFhLEVBQUUsQ0FBQTtBQUUzQyxLQUFLLElBQU0sYUFBYSxJQUFJLGFBQWEsRUFBRTtJQUN6QyxJQUFJLGFBQWEsS0FBSyxTQUFTLEVBQUU7UUFDL0Isc0JBQXNCLENBQUMsSUFBSSxDQUFDLGFBQWEsQ0FBQyxDQUFBO0tBQzNDO0NBQ0Y7QUFHRCxTQUFTLGNBQWM7SUFDckIsSUFBTSxRQUFRLEdBQUcsV0FBUSxDQUFDLG1CQUFtQixFQUFFO1FBQzdDLEdBQUcsRUFBRSxTQUFTO1FBQ2QsR0FBRyxFQUFFLEtBQUs7UUFDVixLQUFLLEVBQUUsSUFBSTtRQUNYLE1BQU0sRUFBRSxLQUFLO1FBQ2IsTUFBTSxFQUFFLElBQUk7S0FDYixDQUFDLENBQUE7SUFFRixJQUFNLGFBQWEsR0FBMEMsRUFBRSxDQUFBO0lBQy9ELFFBQVEsQ0FBQyxPQUFPLENBQUMsVUFBQyxJQUFJO1FBQ3BCLElBQU0sUUFBUSxHQUFHLFlBQUssQ0FBQyxJQUFJLENBQUMsQ0FBQTtRQUM1QixJQUFNLGFBQWEsR0FBRyxjQUFPLENBQUMsU0FBUyxFQUFFLElBQUksQ0FBQyxDQUFBO1FBQzlDLGFBQWEsQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLEdBQUcsT0FBTyxDQUFDLGFBQWEsQ0FBQyxDQUFBO0lBQ3ZELENBQUMsQ0FBQyxDQUFBO0lBRUYsT0FBTyxhQUFhLENBQUE7QUFDdEIsQ0FBQztBQTJDRCxJQUFNLFNBQVMsR0FBYyxJQUFJLHFCQUFZLEVBQWUsQ0FBQTtBQUU1RCxTQUFTLENBQUMsWUFBWSxHQUFHO0lBQ3ZCLE9BQU8sc0JBQXNCLENBQUE7QUFDL0IsQ0FBQyxDQUFBO0FBRUQsU0FBUyxDQUFDLElBQUksR0FBRyxVQUFVLFdBQVcsRUFBRSxVQUFVO0lBQ2hELFFBQVEsR0FBRyxXQUFXLENBQUE7SUFDdEIsT0FBTyxHQUFHLFVBQVUsQ0FBQTtBQUN0QixDQUFDLENBQUE7QUFFRCxTQUFTLENBQUMsU0FBUyxHQUFHLFVBQVUsTUFBTTtJQUNwQyxJQUFNLFlBQVksR0FBRyxhQUFhLENBQUMsTUFBTSxDQUFDLENBQUE7SUFFMUMsSUFBSSxZQUFZLEtBQUssU0FBUyxFQUFFO1FBQzlCLE9BQU8sQ0FBQyxHQUFHLENBQ1QsS0FBSyxDQUFDLEdBQUcsQ0FBQyxrREFBa0QsQ0FBQyxFQUM3RCxzQkFBc0IsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQ2xDLENBQUE7UUFDRCxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFBO0tBQ2hCO1NBQU07UUFDTCxZQUFZLENBQUMsU0FBUyxFQUFFLFFBQVEsRUFBRSxPQUFPLENBQUMsQ0FBQTtLQUMzQztBQUNILENBQUMsQ0FBQTtBQVFELE1BQU0sQ0FBQyxPQUFPLEdBQUcsU0FBUyxDQUFBIn0= \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZm9ybWF0dGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NsaS9mb3JtYXR0ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSwrQkFBOEI7QUFDOUIsbUNBQXFDO0FBQ3JDLCtCQUF1QztBQUN2QywrQkFBcUM7QUFJckMsSUFBSSxRQUEwQixDQUFBO0FBQzlCLElBQUksT0FBOEIsQ0FBQTtBQUdsQyxNQUFNLGFBQWEsR0FBRyxjQUFjLEVBQUUsQ0FBQTtBQUN0QyxNQUFNLHNCQUFzQixHQUFhLEVBQUUsQ0FBQTtBQUUzQyxLQUFLLE1BQU0sYUFBYSxJQUFJLGFBQWEsRUFBRTtJQUN6QyxJQUFJLGFBQWEsS0FBSyxTQUFTLEVBQUU7UUFDL0Isc0JBQXNCLENBQUMsSUFBSSxDQUFDLGFBQWEsQ0FBQyxDQUFBO0tBQzNDO0NBQ0Y7QUFHRCxTQUFTLGNBQWM7SUFDckIsTUFBTSxRQUFRLEdBQUcsSUFBQSxXQUFRLEVBQUMsbUJBQW1CLEVBQUU7UUFDN0MsR0FBRyxFQUFFLFNBQVM7UUFDZCxHQUFHLEVBQUUsS0FBSztRQUNWLEtBQUssRUFBRSxJQUFJO1FBQ1gsTUFBTSxFQUFFLEtBQUs7UUFDYixNQUFNLEVBQUUsSUFBSTtLQUNiLENBQUMsQ0FBQTtJQUVGLE1BQU0sYUFBYSxHQUEwQyxFQUFFLENBQUE7SUFDL0QsUUFBUSxDQUFDLE9BQU8sQ0FBQyxDQUFDLElBQUksRUFBRSxFQUFFO1FBQ3hCLE1BQU0sUUFBUSxHQUFHLElBQUEsWUFBSyxFQUFDLElBQUksQ0FBQyxDQUFBO1FBQzVCLE1BQU0sYUFBYSxHQUFHLElBQUEsY0FBTyxFQUFDLFNBQVMsRUFBRSxJQUFJLENBQUMsQ0FBQTtRQUM5QyxhQUFhLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxHQUFHLE9BQU8sQ0FBQyxhQUFhLENBQUMsQ0FBQTtJQUN2RCxDQUFDLENBQUMsQ0FBQTtJQUVGLE9BQU8sYUFBYSxDQUFBO0FBQ3RCLENBQUM7QUF5Q0QsTUFBTSxTQUFTLEdBQWMsSUFBSSxxQkFBWSxFQUFlLENBQUE7QUFFNUQsU0FBUyxDQUFDLFlBQVksR0FBRztJQUN2QixPQUFPLHNCQUFzQixDQUFBO0FBQy9CLENBQUMsQ0FBQTtBQUVELFNBQVMsQ0FBQyxJQUFJLEdBQUcsVUFBVSxXQUFXLEVBQUUsVUFBVTtJQUNoRCxRQUFRLEdBQUcsV0FBVyxDQUFBO0lBQ3RCLE9BQU8sR0FBRyxVQUFVLENBQUE7QUFDdEIsQ0FBQyxDQUFBO0FBRUQsU0FBUyxDQUFDLFNBQVMsR0FBRyxVQUFVLE1BQU07SUFDcEMsTUFBTSxZQUFZLEdBQUcsYUFBYSxDQUFDLE1BQU0sQ0FBQyxDQUFBO0lBRTFDLElBQUksWUFBWSxLQUFLLFNBQVMsRUFBRTtRQUM5QixPQUFPLENBQUMsR0FBRyxDQUNULEtBQUssQ0FBQyxHQUFHLENBQUMsa0RBQWtELENBQUMsRUFDN0Qsc0JBQXNCLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUNsQyxDQUFBO1FBQ0QsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQTtLQUNoQjtTQUFNO1FBQ0wsWUFBWSxDQUFDLFNBQVMsRUFBRSxRQUFRLEVBQUUsT0FBTyxDQUFDLENBQUE7S0FDM0M7QUFDSCxDQUFDLENBQUE7QUFRRCxNQUFNLENBQUMsT0FBTyxHQUFHLFNBQVMsQ0FBQSJ9 \ No newline at end of file diff --git a/dist/cli/formatters/checkstyle.js b/dist/cli/formatters/checkstyle.js index d5c4863f2..138fc3e9b 100644 --- a/dist/cli/formatters/checkstyle.js +++ b/dist/cli/formatters/checkstyle.js @@ -1,21 +1,14 @@ "use strict"; -var __spreadArrays = (this && this.__spreadArrays) || function () { - for (var s = 0, i = 0, il = arguments.length; i < il; i++) s += arguments[i].length; - for (var r = Array(s), k = 0, i = 0; i < il; i++) - for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++) - r[k] = a[j]; - return r; -}; Object.defineProperty(exports, "__esModule", { value: true }); -var xml = require("xml"); -var checkstyleFormatter = function (formatter) { - formatter.on('end', function (event) { - var arrFiles = []; - var arrAllMessages = event.arrAllMessages; - arrAllMessages.forEach(function (fileInfo) { - var arrMessages = fileInfo.messages; - var arrErrors = []; - arrMessages.forEach(function (message) { +const xml = require("xml"); +const checkstyleFormatter = function (formatter) { + formatter.on('end', (event) => { + const arrFiles = []; + const arrAllMessages = event.arrAllMessages; + arrAllMessages.forEach((fileInfo) => { + const arrMessages = fileInfo.messages; + const arrErrors = []; + arrMessages.forEach((message) => { arrErrors.push({ error: { _attr: { @@ -23,29 +16,31 @@ var checkstyleFormatter = function (formatter) { column: message.col, severity: message.type, message: message.message, - source: "htmlhint." + message.rule.id, + source: `htmlhint.${message.rule.id}`, }, }, }); }); arrFiles.push({ - file: __spreadArrays([ + file: [ { _attr: { name: fileInfo.file, }, - } - ], arrErrors), + }, + ...arrErrors, + ], }); }); - var objXml = { - checkstyle: __spreadArrays([ + const objXml = { + checkstyle: [ { _attr: { version: '4.3', }, - } - ], arrFiles), + }, + ...arrFiles, + ], }; console.log(xml(objXml, { declaration: true, @@ -54,4 +49,4 @@ var checkstyleFormatter = function (formatter) { }); }; module.exports = checkstyleFormatter; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hlY2tzdHlsZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jbGkvZm9ybWF0dGVycy9jaGVja3N0eWxlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7OztBQUFBLHlCQUEwQjtBQUkxQixJQUFNLG1CQUFtQixHQUFzQixVQUFVLFNBQVM7SUFDaEUsU0FBUyxDQUFDLEVBQUUsQ0FBQyxLQUFLLEVBQUUsVUFBQyxLQUFLO1FBQ3hCLElBQU0sUUFBUSxHQUFnQixFQUFFLENBQUE7UUFDaEMsSUFBTSxjQUFjLEdBQUcsS0FBSyxDQUFDLGNBQWMsQ0FBQTtRQUUzQyxjQUFjLENBQUMsT0FBTyxDQUFDLFVBQUMsUUFBUTtZQUM5QixJQUFNLFdBQVcsR0FBRyxRQUFRLENBQUMsUUFBUSxDQUFBO1lBQ3JDLElBQU0sU0FBUyxHQUFnQixFQUFFLENBQUE7WUFFakMsV0FBVyxDQUFDLE9BQU8sQ0FBQyxVQUFDLE9BQU87Z0JBQzFCLFNBQVMsQ0FBQyxJQUFJLENBQUM7b0JBQ2IsS0FBSyxFQUFFO3dCQUNMLEtBQUssRUFBRTs0QkFDTCxJQUFJLEVBQUUsT0FBTyxDQUFDLElBQUk7NEJBQ2xCLE1BQU0sRUFBRSxPQUFPLENBQUMsR0FBRzs0QkFDbkIsUUFBUSxFQUFFLE9BQU8sQ0FBQyxJQUFJOzRCQUN0QixPQUFPLEVBQUUsT0FBTyxDQUFDLE9BQU87NEJBQ3hCLE1BQU0sRUFBRSxjQUFZLE9BQU8sQ0FBQyxJQUFJLENBQUMsRUFBSTt5QkFDdEM7cUJBQ0Y7aUJBQ0YsQ0FBQyxDQUFBO1lBQ0osQ0FBQyxDQUFDLENBQUE7WUFFRixRQUFRLENBQUMsSUFBSSxDQUFDO2dCQUNaLElBQUk7b0JBQ0Y7d0JBQ0UsS0FBSyxFQUFFOzRCQUNMLElBQUksRUFBRSxRQUFRLENBQUMsSUFBSTt5QkFDcEI7cUJBQ0Y7bUJBQ0UsU0FBUyxDQUNiO2FBQ0YsQ0FBQyxDQUFBO1FBQ0osQ0FBQyxDQUFDLENBQUE7UUFFRixJQUFNLE1BQU0sR0FBYztZQUN4QixVQUFVO2dCQUNSO29CQUNFLEtBQUssRUFBRTt3QkFDTCxPQUFPLEVBQUUsS0FBSztxQkFDZjtpQkFDRjtlQUNFLFFBQVEsQ0FDWjtTQUNGLENBQUE7UUFFRCxPQUFPLENBQUMsR0FBRyxDQUNULEdBQUcsQ0FBQyxNQUFNLEVBQUU7WUFDVixXQUFXLEVBQUUsSUFBSTtZQUNqQixNQUFNLEVBQUUsTUFBTTtTQUNmLENBQUMsQ0FDSCxDQUFBO0lBQ0gsQ0FBQyxDQUFDLENBQUE7QUFDSixDQUFDLENBQUE7QUFFRCxNQUFNLENBQUMsT0FBTyxHQUFHLG1CQUFtQixDQUFBIn0= \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hlY2tzdHlsZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jbGkvZm9ybWF0dGVycy9jaGVja3N0eWxlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsMkJBQTBCO0FBSTFCLE1BQU0sbUJBQW1CLEdBQXNCLFVBQVUsU0FBUztJQUNoRSxTQUFTLENBQUMsRUFBRSxDQUFDLEtBQUssRUFBRSxDQUFDLEtBQUssRUFBRSxFQUFFO1FBQzVCLE1BQU0sUUFBUSxHQUFnQixFQUFFLENBQUE7UUFDaEMsTUFBTSxjQUFjLEdBQUcsS0FBSyxDQUFDLGNBQWMsQ0FBQTtRQUUzQyxjQUFjLENBQUMsT0FBTyxDQUFDLENBQUMsUUFBUSxFQUFFLEVBQUU7WUFDbEMsTUFBTSxXQUFXLEdBQUcsUUFBUSxDQUFDLFFBQVEsQ0FBQTtZQUNyQyxNQUFNLFNBQVMsR0FBZ0IsRUFBRSxDQUFBO1lBRWpDLFdBQVcsQ0FBQyxPQUFPLENBQUMsQ0FBQyxPQUFPLEVBQUUsRUFBRTtnQkFDOUIsU0FBUyxDQUFDLElBQUksQ0FBQztvQkFDYixLQUFLLEVBQUU7d0JBQ0wsS0FBSyxFQUFFOzRCQUNMLElBQUksRUFBRSxPQUFPLENBQUMsSUFBSTs0QkFDbEIsTUFBTSxFQUFFLE9BQU8sQ0FBQyxHQUFHOzRCQUNuQixRQUFRLEVBQUUsT0FBTyxDQUFDLElBQUk7NEJBQ3RCLE9BQU8sRUFBRSxPQUFPLENBQUMsT0FBTzs0QkFDeEIsTUFBTSxFQUFFLFlBQVksT0FBTyxDQUFDLElBQUksQ0FBQyxFQUFFLEVBQUU7eUJBQ3RDO3FCQUNGO2lCQUNGLENBQUMsQ0FBQTtZQUNKLENBQUMsQ0FBQyxDQUFBO1lBRUYsUUFBUSxDQUFDLElBQUksQ0FBQztnQkFDWixJQUFJLEVBQUU7b0JBQ0o7d0JBQ0UsS0FBSyxFQUFFOzRCQUNMLElBQUksRUFBRSxRQUFRLENBQUMsSUFBSTt5QkFDcEI7cUJBQ0Y7b0JBQ0QsR0FBRyxTQUFTO2lCQUNiO2FBQ0YsQ0FBQyxDQUFBO1FBQ0osQ0FBQyxDQUFDLENBQUE7UUFFRixNQUFNLE1BQU0sR0FBYztZQUN4QixVQUFVLEVBQUU7Z0JBQ1Y7b0JBQ0UsS0FBSyxFQUFFO3dCQUNMLE9BQU8sRUFBRSxLQUFLO3FCQUNmO2lCQUNGO2dCQUNELEdBQUcsUUFBUTthQUNaO1NBQ0YsQ0FBQTtRQUVELE9BQU8sQ0FBQyxHQUFHLENBQ1QsR0FBRyxDQUFDLE1BQU0sRUFBRTtZQUNWLFdBQVcsRUFBRSxJQUFJO1lBQ2pCLE1BQU0sRUFBRSxNQUFNO1NBQ2YsQ0FBQyxDQUNILENBQUE7SUFDSCxDQUFDLENBQUMsQ0FBQTtBQUNKLENBQUMsQ0FBQTtBQUVELE1BQU0sQ0FBQyxPQUFPLEdBQUcsbUJBQW1CLENBQUEifQ== \ No newline at end of file diff --git a/dist/cli/formatters/compact.js b/dist/cli/formatters/compact.js index 0f64f4564..76372ae56 100644 --- a/dist/cli/formatters/compact.js +++ b/dist/cli/formatters/compact.js @@ -1,22 +1,22 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -var chalk = require("chalk"); -var compactFormatter = function (formatter, HTMLHint, options) { - var nocolor = options.nocolor; - var chalkInstance = nocolor !== false ? new chalk.Instance({ level: 1 }) : chalk; - formatter.on('file', function (event) { - event.messages.forEach(function (message) { +const chalk = require("chalk"); +const compactFormatter = function (formatter, HTMLHint, options) { + const nocolor = options.nocolor; + const chalkInstance = nocolor !== false ? new chalk.Instance({ level: 1 }) : chalk; + formatter.on('file', (event) => { + event.messages.forEach((message) => { console.log('%s: line %d, col %d, %s - %s (%s)', event.file, message.line, message.col, message.type, message.message, message.rule.id); }); }); - formatter.on('end', function (event) { - var allHintCount = event.allHintCount; + formatter.on('end', (event) => { + const allHintCount = event.allHintCount; if (allHintCount > 0) { console.log(''); - var message = '%d problems'; + const message = '%d problems'; console.log(nocolor ? message : chalkInstance.red(message), event.allHintCount); } }); }; module.exports = compactFormatter; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29tcGFjdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jbGkvZm9ybWF0dGVycy9jb21wYWN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsNkJBQThCO0FBRzlCLElBQU0sZ0JBQWdCLEdBQXNCLFVBQzFDLFNBQVMsRUFDVCxRQUFRLEVBQ1IsT0FBTztJQUVQLElBQU0sT0FBTyxHQUFHLE9BQU8sQ0FBQyxPQUFPLENBQUE7SUFFL0IsSUFBTSxhQUFhLEdBQ2pCLE9BQU8sS0FBSyxLQUFLLENBQUMsQ0FBQyxDQUFDLElBQUksS0FBSyxDQUFDLFFBQVEsQ0FBQyxFQUFFLEtBQUssRUFBRSxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUE7SUFFOUQsU0FBUyxDQUFDLEVBQUUsQ0FBQyxNQUFNLEVBQUUsVUFBQyxLQUFLO1FBQ3pCLEtBQUssQ0FBQyxRQUFRLENBQUMsT0FBTyxDQUFDLFVBQUMsT0FBTztZQUM3QixPQUFPLENBQUMsR0FBRyxDQUNULG1DQUFtQyxFQUNuQyxLQUFLLENBQUMsSUFBSSxFQUNWLE9BQU8sQ0FBQyxJQUFJLEVBQ1osT0FBTyxDQUFDLEdBQUcsRUFDWCxPQUFPLENBQUMsSUFBSSxFQUNaLE9BQU8sQ0FBQyxPQUFPLEVBQ2YsT0FBTyxDQUFDLElBQUksQ0FBQyxFQUFFLENBQ2hCLENBQUE7UUFDSCxDQUFDLENBQUMsQ0FBQTtJQUNKLENBQUMsQ0FBQyxDQUFBO0lBRUYsU0FBUyxDQUFDLEVBQUUsQ0FBQyxLQUFLLEVBQUUsVUFBQyxLQUFLO1FBQ3hCLElBQU0sWUFBWSxHQUFHLEtBQUssQ0FBQyxZQUFZLENBQUE7UUFDdkMsSUFBSSxZQUFZLEdBQUcsQ0FBQyxFQUFFO1lBQ3BCLE9BQU8sQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLENBQUE7WUFDZixJQUFNLE9BQU8sR0FBRyxhQUFhLENBQUE7WUFDN0IsT0FBTyxDQUFDLEdBQUcsQ0FDVCxPQUFPLENBQUMsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsYUFBYSxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsRUFDOUMsS0FBSyxDQUFDLFlBQVksQ0FDbkIsQ0FBQTtTQUNGO0lBQ0gsQ0FBQyxDQUFDLENBQUE7QUFDSixDQUFDLENBQUE7QUFFRCxNQUFNLENBQUMsT0FBTyxHQUFHLGdCQUFnQixDQUFBIn0= \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29tcGFjdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jbGkvZm9ybWF0dGVycy9jb21wYWN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsK0JBQThCO0FBRzlCLE1BQU0sZ0JBQWdCLEdBQXNCLFVBQzFDLFNBQVMsRUFDVCxRQUFRLEVBQ1IsT0FBTztJQUVQLE1BQU0sT0FBTyxHQUFHLE9BQU8sQ0FBQyxPQUFPLENBQUE7SUFFL0IsTUFBTSxhQUFhLEdBQ2pCLE9BQU8sS0FBSyxLQUFLLENBQUMsQ0FBQyxDQUFDLElBQUksS0FBSyxDQUFDLFFBQVEsQ0FBQyxFQUFFLEtBQUssRUFBRSxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUE7SUFFOUQsU0FBUyxDQUFDLEVBQUUsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxLQUFLLEVBQUUsRUFBRTtRQUM3QixLQUFLLENBQUMsUUFBUSxDQUFDLE9BQU8sQ0FBQyxDQUFDLE9BQU8sRUFBRSxFQUFFO1lBQ2pDLE9BQU8sQ0FBQyxHQUFHLENBQ1QsbUNBQW1DLEVBQ25DLEtBQUssQ0FBQyxJQUFJLEVBQ1YsT0FBTyxDQUFDLElBQUksRUFDWixPQUFPLENBQUMsR0FBRyxFQUNYLE9BQU8sQ0FBQyxJQUFJLEVBQ1osT0FBTyxDQUFDLE9BQU8sRUFDZixPQUFPLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FDaEIsQ0FBQTtRQUNILENBQUMsQ0FBQyxDQUFBO0lBQ0osQ0FBQyxDQUFDLENBQUE7SUFFRixTQUFTLENBQUMsRUFBRSxDQUFDLEtBQUssRUFBRSxDQUFDLEtBQUssRUFBRSxFQUFFO1FBQzVCLE1BQU0sWUFBWSxHQUFHLEtBQUssQ0FBQyxZQUFZLENBQUE7UUFDdkMsSUFBSSxZQUFZLEdBQUcsQ0FBQyxFQUFFO1lBQ3BCLE9BQU8sQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLENBQUE7WUFDZixNQUFNLE9BQU8sR0FBRyxhQUFhLENBQUE7WUFDN0IsT0FBTyxDQUFDLEdBQUcsQ0FDVCxPQUFPLENBQUMsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsYUFBYSxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsRUFDOUMsS0FBSyxDQUFDLFlBQVksQ0FDbkIsQ0FBQTtTQUNGO0lBQ0gsQ0FBQyxDQUFDLENBQUE7QUFDSixDQUFDLENBQUE7QUFFRCxNQUFNLENBQUMsT0FBTyxHQUFHLGdCQUFnQixDQUFBIn0= \ No newline at end of file diff --git a/dist/cli/formatters/default.js b/dist/cli/formatters/default.js index 49c11d34b..a060d3e2b 100644 --- a/dist/cli/formatters/default.js +++ b/dist/cli/formatters/default.js @@ -1,33 +1,33 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -var chalk = require("chalk"); -var defaultFormatter = function (formatter, HTMLHint, options) { - var nocolor = !!options.nocolor; - formatter.on('start', function () { +const chalk = require("chalk"); +const defaultFormatter = function (formatter, HTMLHint, options) { + const nocolor = !!options.nocolor; + formatter.on('start', () => { console.log(''); }); - formatter.on('config', function (event) { - var configPath = event.configPath; + formatter.on('config', (event) => { + const configPath = event.configPath; console.log(' Config loaded: %s', nocolor ? configPath : chalk.cyan(configPath)); console.log(''); }); - formatter.on('file', function (event) { - console.log(" " + chalk.white(event.file)); - var arrLogs = HTMLHint.format(event.messages, { + formatter.on('file', (event) => { + console.log(` ${chalk.white(event.file)}`); + const arrLogs = HTMLHint.format(event.messages, { colors: !nocolor, indent: 6, }); - arrLogs.forEach(function (str) { + arrLogs.forEach((str) => { console.log(str); }); console.log(''); }); - formatter.on('end', function (event) { - var allFileCount = event.allFileCount; - var allHintCount = event.allHintCount; - var allHintFileCount = event.allHintFileCount; - var time = event.time; - var message; + formatter.on('end', (event) => { + const allFileCount = event.allFileCount; + const allHintCount = event.allHintCount; + const allHintFileCount = event.allHintFileCount; + const time = event.time; + let message; if (allHintCount > 0) { message = 'Scanned %d files, found %d errors in %d files (%d ms)'; console.log(nocolor ? message : chalk.red(message), allFileCount, allHintCount, allHintFileCount, time); @@ -39,4 +39,4 @@ var defaultFormatter = function (formatter, HTMLHint, options) { }); }; module.exports = defaultFormatter; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVmYXVsdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jbGkvZm9ybWF0dGVycy9kZWZhdWx0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsNkJBQThCO0FBRzlCLElBQU0sZ0JBQWdCLEdBQXNCLFVBQzFDLFNBQVMsRUFDVCxRQUFRLEVBQ1IsT0FBTztJQUVQLElBQU0sT0FBTyxHQUFHLENBQUMsQ0FBQyxPQUFPLENBQUMsT0FBTyxDQUFBO0lBRWpDLFNBQVMsQ0FBQyxFQUFFLENBQUMsT0FBTyxFQUFFO1FBQ3BCLE9BQU8sQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLENBQUE7SUFDakIsQ0FBQyxDQUFDLENBQUE7SUFFRixTQUFTLENBQUMsRUFBRSxDQUFDLFFBQVEsRUFBRSxVQUFDLEtBQUs7UUFFM0IsSUFBTSxVQUFVLEdBQUcsS0FBSyxDQUFDLFVBQVcsQ0FBQTtRQUNwQyxPQUFPLENBQUMsR0FBRyxDQUNULHNCQUFzQixFQUN0QixPQUFPLENBQUMsQ0FBQyxDQUFDLFVBQVUsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxVQUFVLENBQUMsQ0FDOUMsQ0FBQTtRQUNELE9BQU8sQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLENBQUE7SUFDakIsQ0FBQyxDQUFDLENBQUE7SUFFRixTQUFTLENBQUMsRUFBRSxDQUFDLE1BQU0sRUFBRSxVQUFDLEtBQUs7UUFDekIsT0FBTyxDQUFDLEdBQUcsQ0FBQyxRQUFNLEtBQUssQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBRyxDQUFDLENBQUE7UUFFNUMsSUFBTSxPQUFPLEdBQUcsUUFBUSxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsUUFBUSxFQUFFO1lBQzlDLE1BQU0sRUFBRSxDQUFDLE9BQU87WUFDaEIsTUFBTSxFQUFFLENBQUM7U0FDVixDQUFDLENBQUE7UUFFRixPQUFPLENBQUMsT0FBTyxDQUFDLFVBQUMsR0FBRztZQUNsQixPQUFPLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFBO1FBQ2xCLENBQUMsQ0FBQyxDQUFBO1FBRUYsT0FBTyxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsQ0FBQTtJQUNqQixDQUFDLENBQUMsQ0FBQTtJQUVGLFNBQVMsQ0FBQyxFQUFFLENBQUMsS0FBSyxFQUFFLFVBQUMsS0FBSztRQUN4QixJQUFNLFlBQVksR0FBRyxLQUFLLENBQUMsWUFBWSxDQUFBO1FBQ3ZDLElBQU0sWUFBWSxHQUFHLEtBQUssQ0FBQyxZQUFZLENBQUE7UUFDdkMsSUFBTSxnQkFBZ0IsR0FBRyxLQUFLLENBQUMsZ0JBQWdCLENBQUE7UUFDL0MsSUFBTSxJQUFJLEdBQUcsS0FBSyxDQUFDLElBQUksQ0FBQTtRQUN2QixJQUFJLE9BQU8sQ0FBQTtRQUVYLElBQUksWUFBWSxHQUFHLENBQUMsRUFBRTtZQUNwQixPQUFPLEdBQUcsdURBQXVELENBQUE7WUFDakUsT0FBTyxDQUFDLEdBQUcsQ0FDVCxPQUFPLENBQUMsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsRUFDdEMsWUFBWSxFQUNaLFlBQVksRUFDWixnQkFBZ0IsRUFDaEIsSUFBSSxDQUNMLENBQUE7U0FDRjthQUFNO1lBQ0wsT0FBTyxHQUFHLDRDQUE0QyxDQUFBO1lBQ3RELE9BQU8sQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLEVBQUUsWUFBWSxFQUFFLElBQUksQ0FBQyxDQUFBO1NBQzFFO0lBQ0gsQ0FBQyxDQUFDLENBQUE7QUFDSixDQUFDLENBQUE7QUFFRCxNQUFNLENBQUMsT0FBTyxHQUFHLGdCQUFnQixDQUFBIn0= \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVmYXVsdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jbGkvZm9ybWF0dGVycy9kZWZhdWx0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsK0JBQThCO0FBRzlCLE1BQU0sZ0JBQWdCLEdBQXNCLFVBQzFDLFNBQVMsRUFDVCxRQUFRLEVBQ1IsT0FBTztJQUVQLE1BQU0sT0FBTyxHQUFHLENBQUMsQ0FBQyxPQUFPLENBQUMsT0FBTyxDQUFBO0lBRWpDLFNBQVMsQ0FBQyxFQUFFLENBQUMsT0FBTyxFQUFFLEdBQUcsRUFBRTtRQUN6QixPQUFPLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxDQUFBO0lBQ2pCLENBQUMsQ0FBQyxDQUFBO0lBRUYsU0FBUyxDQUFDLEVBQUUsQ0FBQyxRQUFRLEVBQUUsQ0FBQyxLQUFLLEVBQUUsRUFBRTtRQUUvQixNQUFNLFVBQVUsR0FBRyxLQUFLLENBQUMsVUFBVyxDQUFBO1FBQ3BDLE9BQU8sQ0FBQyxHQUFHLENBQ1Qsc0JBQXNCLEVBQ3RCLE9BQU8sQ0FBQyxDQUFDLENBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxDQUM5QyxDQUFBO1FBQ0QsT0FBTyxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsQ0FBQTtJQUNqQixDQUFDLENBQUMsQ0FBQTtJQUVGLFNBQVMsQ0FBQyxFQUFFLENBQUMsTUFBTSxFQUFFLENBQUMsS0FBSyxFQUFFLEVBQUU7UUFDN0IsT0FBTyxDQUFDLEdBQUcsQ0FBQyxNQUFNLEtBQUssQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQTtRQUU1QyxNQUFNLE9BQU8sR0FBRyxRQUFRLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxRQUFRLEVBQUU7WUFDOUMsTUFBTSxFQUFFLENBQUMsT0FBTztZQUNoQixNQUFNLEVBQUUsQ0FBQztTQUNWLENBQUMsQ0FBQTtRQUVGLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FBQyxHQUFHLEVBQUUsRUFBRTtZQUN0QixPQUFPLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFBO1FBQ2xCLENBQUMsQ0FBQyxDQUFBO1FBRUYsT0FBTyxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsQ0FBQTtJQUNqQixDQUFDLENBQUMsQ0FBQTtJQUVGLFNBQVMsQ0FBQyxFQUFFLENBQUMsS0FBSyxFQUFFLENBQUMsS0FBSyxFQUFFLEVBQUU7UUFDNUIsTUFBTSxZQUFZLEdBQUcsS0FBSyxDQUFDLFlBQVksQ0FBQTtRQUN2QyxNQUFNLFlBQVksR0FBRyxLQUFLLENBQUMsWUFBWSxDQUFBO1FBQ3ZDLE1BQU0sZ0JBQWdCLEdBQUcsS0FBSyxDQUFDLGdCQUFnQixDQUFBO1FBQy9DLE1BQU0sSUFBSSxHQUFHLEtBQUssQ0FBQyxJQUFJLENBQUE7UUFDdkIsSUFBSSxPQUFPLENBQUE7UUFFWCxJQUFJLFlBQVksR0FBRyxDQUFDLEVBQUU7WUFDcEIsT0FBTyxHQUFHLHVEQUF1RCxDQUFBO1lBQ2pFLE9BQU8sQ0FBQyxHQUFHLENBQ1QsT0FBTyxDQUFDLENBQUMsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLEVBQ3RDLFlBQVksRUFDWixZQUFZLEVBQ1osZ0JBQWdCLEVBQ2hCLElBQUksQ0FDTCxDQUFBO1NBQ0Y7YUFBTTtZQUNMLE9BQU8sR0FBRyw0Q0FBNEMsQ0FBQTtZQUN0RCxPQUFPLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxFQUFFLFlBQVksRUFBRSxJQUFJLENBQUMsQ0FBQTtTQUMxRTtJQUNILENBQUMsQ0FBQyxDQUFBO0FBQ0osQ0FBQyxDQUFBO0FBRUQsTUFBTSxDQUFDLE9BQU8sR0FBRyxnQkFBZ0IsQ0FBQSJ9 \ No newline at end of file diff --git a/dist/cli/formatters/html.js b/dist/cli/formatters/html.js index 966b53553..902a90028 100644 --- a/dist/cli/formatters/html.js +++ b/dist/cli/formatters/html.js @@ -1,31 +1,24 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -var fs_1 = require("fs"); -var htmlFormatter = function (formatter) { - formatter.on('end', function (event) { - var fileContent = ''; +const fs_1 = require("fs"); +const htmlFormatter = function (formatter) { + formatter.on('end', (event) => { + let fileContent = ''; fileContent += 'HTML Hint Violation Report'; fileContent += ''; fileContent += '

Violation Report

'; fileContent += ''; fileContent += ''; - var _loop_1 = function (file, messages) { + for (const { file, messages } of event.arrAllMessages) { fileContent += messages - .map(function (_a, i) { - var line = _a.line, message = _a.message; - return ""; - }) + .map(({ line, message }, i) => ``) .join(''); - }; - for (var _i = 0, _a = event.arrAllMessages; _i < _a.length; _i++) { - var _b = _a[_i], file = _b.file, messages = _b.messages; - _loop_1(file, messages); } fileContent += '
Number#File NameLine NumberMessage
" + (i + 1) + "" + file + "" + line + "" + message + "
${i + 1}${file}${line}${message}
'; console.log(fileContent); - fs_1.writeFileSync('report.html', fileContent); + (0, fs_1.writeFileSync)('report.html', fileContent); }); }; module.exports = htmlFormatter; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaHRtbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jbGkvZm9ybWF0dGVycy9odG1sLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEseUJBQWtDO0FBR2xDLElBQU0sYUFBYSxHQUFzQixVQUFVLFNBQVM7SUFDMUQsU0FBUyxDQUFDLEVBQUUsQ0FBQyxLQUFLLEVBQUUsVUFBQyxLQUFLO1FBQ3hCLElBQUksV0FBVyxHQUFHLFFBQVEsQ0FBQTtRQUMxQixXQUFXLElBQUksd0RBQXdELENBQUE7UUFDdkUsV0FBVyxJQUFJLFFBQVEsQ0FBQTtRQUN2QixXQUFXLElBQUksNENBQTRDLENBQUE7UUFFM0QsV0FBVyxJQUFJLG9CQUFvQixDQUFBO1FBQ25DLFdBQVc7WUFDVCxpRkFBaUYsQ0FBQTtnQ0FFdEUsSUFBSSxFQUFFLFFBQVE7WUFDekIsV0FBVyxJQUFJLFFBQVE7aUJBQ3BCLEdBQUcsQ0FDRixVQUFDLEVBQWlCLEVBQUUsQ0FBQztvQkFBbEIsSUFBSSxVQUFBLEVBQUUsT0FBTyxhQUFBO2dCQUNkLE9BQUEsY0FDRSxDQUFDLEdBQUcsQ0FBQyxrQkFDSyxJQUFJLGlCQUFZLElBQUksaUJBQVksT0FBTyxlQUFZO1lBRi9ELENBRStELENBQ2xFO2lCQUNBLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQTs7UUFSYixLQUFpQyxVQUFvQixFQUFwQixLQUFBLEtBQUssQ0FBQyxjQUFjLEVBQXBCLGNBQW9CLEVBQXBCLElBQW9CO1lBQTFDLElBQUEsV0FBa0IsRUFBaEIsSUFBSSxVQUFBLEVBQUUsUUFBUSxjQUFBO29CQUFkLElBQUksRUFBRSxRQUFRO1NBUzFCO1FBRUQsV0FBVyxJQUFJLHdCQUF3QixDQUFBO1FBQ3ZDLE9BQU8sQ0FBQyxHQUFHLENBQUMsV0FBVyxDQUFDLENBQUE7UUFDeEIsa0JBQWEsQ0FBQyxhQUFhLEVBQUUsV0FBVyxDQUFDLENBQUE7SUFDM0MsQ0FBQyxDQUFDLENBQUE7QUFDSixDQUFDLENBQUE7QUFFRCxNQUFNLENBQUMsT0FBTyxHQUFHLGFBQWEsQ0FBQSJ9 \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaHRtbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jbGkvZm9ybWF0dGVycy9odG1sLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsMkJBQWtDO0FBR2xDLE1BQU0sYUFBYSxHQUFzQixVQUFVLFNBQVM7SUFDMUQsU0FBUyxDQUFDLEVBQUUsQ0FBQyxLQUFLLEVBQUUsQ0FBQyxLQUFLLEVBQUUsRUFBRTtRQUM1QixJQUFJLFdBQVcsR0FBRyxRQUFRLENBQUE7UUFDMUIsV0FBVyxJQUFJLHdEQUF3RCxDQUFBO1FBQ3ZFLFdBQVcsSUFBSSxRQUFRLENBQUE7UUFDdkIsV0FBVyxJQUFJLDRDQUE0QyxDQUFBO1FBRTNELFdBQVcsSUFBSSxvQkFBb0IsQ0FBQTtRQUNuQyxXQUFXO1lBQ1QsaUZBQWlGLENBQUE7UUFFbkYsS0FBSyxNQUFNLEVBQUUsSUFBSSxFQUFFLFFBQVEsRUFBRSxJQUFJLEtBQUssQ0FBQyxjQUFjLEVBQUU7WUFDckQsV0FBVyxJQUFJLFFBQVE7aUJBQ3BCLEdBQUcsQ0FDRixDQUFDLEVBQUUsSUFBSSxFQUFFLE9BQU8sRUFBRSxFQUFFLENBQUMsRUFBRSxFQUFFLENBQ3ZCLFdBQ0UsQ0FBQyxHQUFHLENBQ04sWUFBWSxJQUFJLFlBQVksSUFBSSxZQUFZLE9BQU8sWUFBWSxDQUNsRTtpQkFDQSxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUE7U0FDWjtRQUVELFdBQVcsSUFBSSx3QkFBd0IsQ0FBQTtRQUN2QyxPQUFPLENBQUMsR0FBRyxDQUFDLFdBQVcsQ0FBQyxDQUFBO1FBQ3hCLElBQUEsa0JBQWEsRUFBQyxhQUFhLEVBQUUsV0FBVyxDQUFDLENBQUE7SUFDM0MsQ0FBQyxDQUFDLENBQUE7QUFDSixDQUFDLENBQUE7QUFFRCxNQUFNLENBQUMsT0FBTyxHQUFHLGFBQWEsQ0FBQSJ9 \ No newline at end of file diff --git a/dist/cli/formatters/json.js b/dist/cli/formatters/json.js index 8b48950ea..cde4c5207 100644 --- a/dist/cli/formatters/json.js +++ b/dist/cli/formatters/json.js @@ -1,9 +1,9 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -var jsonFormatter = function (formatter) { - formatter.on('end', function (event) { +const jsonFormatter = function (formatter) { + formatter.on('end', (event) => { console.log(JSON.stringify(event.arrAllMessages)); }); }; module.exports = jsonFormatter; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoianNvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jbGkvZm9ybWF0dGVycy9qc29uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBRUEsSUFBTSxhQUFhLEdBQXNCLFVBQVUsU0FBUztJQUMxRCxTQUFTLENBQUMsRUFBRSxDQUFDLEtBQUssRUFBRSxVQUFDLEtBQUs7UUFDeEIsT0FBTyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLEtBQUssQ0FBQyxjQUFjLENBQUMsQ0FBQyxDQUFBO0lBQ25ELENBQUMsQ0FBQyxDQUFBO0FBQ0osQ0FBQyxDQUFBO0FBRUQsTUFBTSxDQUFDLE9BQU8sR0FBRyxhQUFhLENBQUEifQ== \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoianNvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jbGkvZm9ybWF0dGVycy9qc29uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBRUEsTUFBTSxhQUFhLEdBQXNCLFVBQVUsU0FBUztJQUMxRCxTQUFTLENBQUMsRUFBRSxDQUFDLEtBQUssRUFBRSxDQUFDLEtBQUssRUFBRSxFQUFFO1FBQzVCLE9BQU8sQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxLQUFLLENBQUMsY0FBYyxDQUFDLENBQUMsQ0FBQTtJQUNuRCxDQUFDLENBQUMsQ0FBQTtBQUNKLENBQUMsQ0FBQTtBQUVELE1BQU0sQ0FBQyxPQUFPLEdBQUcsYUFBYSxDQUFBIn0= \ No newline at end of file diff --git a/dist/cli/formatters/junit.js b/dist/cli/formatters/junit.js index 4e005a630..80b212620 100644 --- a/dist/cli/formatters/junit.js +++ b/dist/cli/formatters/junit.js @@ -1,20 +1,13 @@ "use strict"; -var __spreadArrays = (this && this.__spreadArrays) || function () { - for (var s = 0, i = 0, il = arguments.length; i < il; i++) s += arguments[i].length; - for (var r = Array(s), k = 0, i = 0; i < il; i++) - for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++) - r[k] = a[j]; - return r; -}; Object.defineProperty(exports, "__esModule", { value: true }); -var xml = require("xml"); -var junitFormatter = function (formatter, HTMLHint) { - formatter.on('end', function (event) { - var arrTestcase = []; - var arrAllMessages = event.arrAllMessages; - arrAllMessages.forEach(function (fileInfo) { - var arrMessages = fileInfo.messages; - var arrLogs = HTMLHint.format(arrMessages); +const xml = require("xml"); +const junitFormatter = function (formatter, HTMLHint) { + formatter.on('end', (event) => { + const arrTestcase = []; + const arrAllMessages = event.arrAllMessages; + arrAllMessages.forEach((fileInfo) => { + const arrMessages = fileInfo.messages; + const arrLogs = HTMLHint.format(arrMessages); arrTestcase.push({ testcase: [ { @@ -26,7 +19,7 @@ var junitFormatter = function (formatter, HTMLHint) { { failure: { _attr: { - message: "Found " + arrMessages.length + " errors", + message: `Found ${arrMessages.length} errors`, }, _cdata: arrLogs.join('\r\n'), }, @@ -34,10 +27,10 @@ var junitFormatter = function (formatter, HTMLHint) { ], }); }); - var objXml = { + const objXml = { testsuites: [ { - testsuite: __spreadArrays([ + testsuite: [ { _attr: { name: 'HTMLHint Tests', @@ -45,8 +38,9 @@ var junitFormatter = function (formatter, HTMLHint) { tests: event.allFileCount, failures: arrAllMessages.length, }, - } - ], arrTestcase), + }, + ...arrTestcase, + ], }, ], }; @@ -57,4 +51,4 @@ var junitFormatter = function (formatter, HTMLHint) { }); }; module.exports = junitFormatter; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoianVuaXQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY2xpL2Zvcm1hdHRlcnMvanVuaXQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7O0FBQUEseUJBQTBCO0FBSTFCLElBQU0sY0FBYyxHQUFzQixVQUFVLFNBQVMsRUFBRSxRQUFRO0lBQ3JFLFNBQVMsQ0FBQyxFQUFFLENBQUMsS0FBSyxFQUFFLFVBQUMsS0FBSztRQUN4QixJQUFNLFdBQVcsR0FBZ0IsRUFBRSxDQUFBO1FBQ25DLElBQU0sY0FBYyxHQUFHLEtBQUssQ0FBQyxjQUFjLENBQUE7UUFFM0MsY0FBYyxDQUFDLE9BQU8sQ0FBQyxVQUFDLFFBQVE7WUFDOUIsSUFBTSxXQUFXLEdBQUcsUUFBUSxDQUFDLFFBQVEsQ0FBQTtZQUNyQyxJQUFNLE9BQU8sR0FBRyxRQUFRLENBQUMsTUFBTSxDQUFDLFdBQVcsQ0FBQyxDQUFBO1lBRTVDLFdBQVcsQ0FBQyxJQUFJLENBQUM7Z0JBQ2YsUUFBUSxFQUFFO29CQUNSO3dCQUNFLEtBQUssRUFBRTs0QkFDTCxJQUFJLEVBQUUsUUFBUSxDQUFDLElBQUk7NEJBQ25CLElBQUksRUFBRSxDQUFDLFFBQVEsQ0FBQyxJQUFJLEdBQUcsSUFBSSxDQUFDLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQzt5QkFDeEM7cUJBQ0Y7b0JBQ0Q7d0JBQ0UsT0FBTyxFQUFFOzRCQUNQLEtBQUssRUFBRTtnQ0FDTCxPQUFPLEVBQUUsV0FBUyxXQUFXLENBQUMsTUFBTSxZQUFTOzZCQUM5Qzs0QkFDRCxNQUFNLEVBQUUsT0FBTyxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUM7eUJBQzdCO3FCQUNGO2lCQUNGO2FBQ0YsQ0FBQyxDQUFBO1FBQ0osQ0FBQyxDQUFDLENBQUE7UUFFRixJQUFNLE1BQU0sR0FBYztZQUN4QixVQUFVLEVBQUU7Z0JBQ1Y7b0JBQ0UsU0FBUzt3QkFDUDs0QkFDRSxLQUFLLEVBQUU7Z0NBQ0wsSUFBSSxFQUFFLGdCQUFnQjtnQ0FDdEIsSUFBSSxFQUFFLENBQUMsS0FBSyxDQUFDLElBQUksR0FBRyxJQUFJLENBQUMsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDO2dDQUNwQyxLQUFLLEVBQUUsS0FBSyxDQUFDLFlBQVk7Z0NBQ3pCLFFBQVEsRUFBRSxjQUFjLENBQUMsTUFBTTs2QkFDaEM7eUJBQ0Y7dUJBQ0UsV0FBVyxDQUNmO2lCQUNGO2FBQ0Y7U0FDRixDQUFBO1FBRUQsT0FBTyxDQUFDLEdBQUcsQ0FDVCxHQUFHLENBQUMsTUFBTSxFQUFFO1lBQ1YsV0FBVyxFQUFFLElBQUk7WUFDakIsTUFBTSxFQUFFLE1BQU07U0FDZixDQUFDLENBQ0gsQ0FBQTtJQUNILENBQUMsQ0FBQyxDQUFBO0FBQ0osQ0FBQyxDQUFBO0FBRUQsTUFBTSxDQUFDLE9BQU8sR0FBRyxjQUFjLENBQUEifQ== \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoianVuaXQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY2xpL2Zvcm1hdHRlcnMvanVuaXQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSwyQkFBMEI7QUFJMUIsTUFBTSxjQUFjLEdBQXNCLFVBQVUsU0FBUyxFQUFFLFFBQVE7SUFDckUsU0FBUyxDQUFDLEVBQUUsQ0FBQyxLQUFLLEVBQUUsQ0FBQyxLQUFLLEVBQUUsRUFBRTtRQUM1QixNQUFNLFdBQVcsR0FBZ0IsRUFBRSxDQUFBO1FBQ25DLE1BQU0sY0FBYyxHQUFHLEtBQUssQ0FBQyxjQUFjLENBQUE7UUFFM0MsY0FBYyxDQUFDLE9BQU8sQ0FBQyxDQUFDLFFBQVEsRUFBRSxFQUFFO1lBQ2xDLE1BQU0sV0FBVyxHQUFHLFFBQVEsQ0FBQyxRQUFRLENBQUE7WUFDckMsTUFBTSxPQUFPLEdBQUcsUUFBUSxDQUFDLE1BQU0sQ0FBQyxXQUFXLENBQUMsQ0FBQTtZQUU1QyxXQUFXLENBQUMsSUFBSSxDQUFDO2dCQUNmLFFBQVEsRUFBRTtvQkFDUjt3QkFDRSxLQUFLLEVBQUU7NEJBQ0wsSUFBSSxFQUFFLFFBQVEsQ0FBQyxJQUFJOzRCQUNuQixJQUFJLEVBQUUsQ0FBQyxRQUFRLENBQUMsSUFBSSxHQUFHLElBQUksQ0FBQyxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUM7eUJBQ3hDO3FCQUNGO29CQUNEO3dCQUNFLE9BQU8sRUFBRTs0QkFDUCxLQUFLLEVBQUU7Z0NBQ0wsT0FBTyxFQUFFLFNBQVMsV0FBVyxDQUFDLE1BQU0sU0FBUzs2QkFDOUM7NEJBQ0QsTUFBTSxFQUFFLE9BQU8sQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDO3lCQUM3QjtxQkFDRjtpQkFDRjthQUNGLENBQUMsQ0FBQTtRQUNKLENBQUMsQ0FBQyxDQUFBO1FBRUYsTUFBTSxNQUFNLEdBQWM7WUFDeEIsVUFBVSxFQUFFO2dCQUNWO29CQUNFLFNBQVMsRUFBRTt3QkFDVDs0QkFDRSxLQUFLLEVBQUU7Z0NBQ0wsSUFBSSxFQUFFLGdCQUFnQjtnQ0FDdEIsSUFBSSxFQUFFLENBQUMsS0FBSyxDQUFDLElBQUksR0FBRyxJQUFJLENBQUMsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDO2dDQUNwQyxLQUFLLEVBQUUsS0FBSyxDQUFDLFlBQVk7Z0NBQ3pCLFFBQVEsRUFBRSxjQUFjLENBQUMsTUFBTTs2QkFDaEM7eUJBQ0Y7d0JBQ0QsR0FBRyxXQUFXO3FCQUNmO2lCQUNGO2FBQ0Y7U0FDRixDQUFBO1FBRUQsT0FBTyxDQUFDLEdBQUcsQ0FDVCxHQUFHLENBQUMsTUFBTSxFQUFFO1lBQ1YsV0FBVyxFQUFFLElBQUk7WUFDakIsTUFBTSxFQUFFLE1BQU07U0FDZixDQUFDLENBQ0gsQ0FBQTtJQUNILENBQUMsQ0FBQyxDQUFBO0FBQ0osQ0FBQyxDQUFBO0FBRUQsTUFBTSxDQUFDLE9BQU8sR0FBRyxjQUFjLENBQUEifQ== \ No newline at end of file diff --git a/dist/cli/formatters/markdown.js b/dist/cli/formatters/markdown.js index 9452e3a71..44366bb03 100644 --- a/dist/cli/formatters/markdown.js +++ b/dist/cli/formatters/markdown.js @@ -1,17 +1,17 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -var markdownFormatter = function (formatter, HTMLHint) { - formatter.on('end', function (event) { +const markdownFormatter = function (formatter, HTMLHint) { + formatter.on('end', (event) => { console.log('# TOC'); - var arrToc = []; - var arrContents = []; - var arrAllMessages = event.arrAllMessages; - arrAllMessages.forEach(function (fileInfo) { - var filePath = fileInfo.file; - var arrMessages = fileInfo.messages; - var errorCount = 0; - var warningCount = 0; - arrMessages.forEach(function (message) { + const arrToc = []; + const arrContents = []; + const arrAllMessages = event.arrAllMessages; + arrAllMessages.forEach((fileInfo) => { + const filePath = fileInfo.file; + const arrMessages = fileInfo.messages; + let errorCount = 0; + let warningCount = 0; + arrMessages.forEach((message) => { if (message.type === 'error') { errorCount++; } @@ -19,21 +19,21 @@ var markdownFormatter = function (formatter, HTMLHint) { warningCount++; } }); - arrToc.push(" - [" + filePath + "](#" + filePath + ")"); - arrContents.push(""); - arrContents.push("# " + filePath); + arrToc.push(` - [${filePath}](#${filePath})`); + arrContents.push(``); + arrContents.push(`# ${filePath}`); arrContents.push(''); - arrContents.push("Found " + errorCount + " errors, " + warningCount + " warnings"); - var arrLogs = HTMLHint.format(arrMessages); + arrContents.push(`Found ${errorCount} errors, ${warningCount} warnings`); + const arrLogs = HTMLHint.format(arrMessages); arrContents.push(''); - arrLogs.forEach(function (log) { - arrContents.push(" " + log); + arrLogs.forEach((log) => { + arrContents.push(` ${log}`); }); arrContents.push(''); }); - console.log(arrToc.join('\r\n') + "\r\n"); + console.log(`${arrToc.join('\r\n')}\r\n`); console.log(arrContents.join('\r\n')); }); }; module.exports = markdownFormatter; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWFya2Rvd24uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY2xpL2Zvcm1hdHRlcnMvbWFya2Rvd24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFFQSxJQUFNLGlCQUFpQixHQUFzQixVQUFVLFNBQVMsRUFBRSxRQUFRO0lBQ3hFLFNBQVMsQ0FBQyxFQUFFLENBQUMsS0FBSyxFQUFFLFVBQUMsS0FBSztRQUN4QixPQUFPLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxDQUFBO1FBRXBCLElBQU0sTUFBTSxHQUFhLEVBQUUsQ0FBQTtRQUMzQixJQUFNLFdBQVcsR0FBYSxFQUFFLENBQUE7UUFDaEMsSUFBTSxjQUFjLEdBQUcsS0FBSyxDQUFDLGNBQWMsQ0FBQTtRQUUzQyxjQUFjLENBQUMsT0FBTyxDQUFDLFVBQUMsUUFBUTtZQUM5QixJQUFNLFFBQVEsR0FBRyxRQUFRLENBQUMsSUFBSSxDQUFBO1lBQzlCLElBQU0sV0FBVyxHQUFHLFFBQVEsQ0FBQyxRQUFRLENBQUE7WUFDckMsSUFBSSxVQUFVLEdBQUcsQ0FBQyxDQUFBO1lBQ2xCLElBQUksWUFBWSxHQUFHLENBQUMsQ0FBQTtZQUVwQixXQUFXLENBQUMsT0FBTyxDQUFDLFVBQUMsT0FBTztnQkFDMUIsSUFBSSxPQUFPLENBQUMsSUFBSSxLQUFLLE9BQU8sRUFBRTtvQkFDNUIsVUFBVSxFQUFFLENBQUE7aUJBQ2I7cUJBQU07b0JBQ0wsWUFBWSxFQUFFLENBQUE7aUJBQ2Y7WUFDSCxDQUFDLENBQUMsQ0FBQTtZQUVGLE1BQU0sQ0FBQyxJQUFJLENBQUMsV0FBUyxRQUFRLFdBQU0sUUFBUSxNQUFHLENBQUMsQ0FBQTtZQUMvQyxXQUFXLENBQUMsSUFBSSxDQUFDLGVBQVksUUFBUSxVQUFNLENBQUMsQ0FBQTtZQUM1QyxXQUFXLENBQUMsSUFBSSxDQUFDLE9BQUssUUFBVSxDQUFDLENBQUE7WUFDakMsV0FBVyxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQTtZQUNwQixXQUFXLENBQUMsSUFBSSxDQUFDLFdBQVMsVUFBVSxpQkFBWSxZQUFZLGNBQVcsQ0FBQyxDQUFBO1lBRXhFLElBQU0sT0FBTyxHQUFHLFFBQVEsQ0FBQyxNQUFNLENBQUMsV0FBVyxDQUFDLENBQUE7WUFDNUMsV0FBVyxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQTtZQUNwQixPQUFPLENBQUMsT0FBTyxDQUFDLFVBQUMsR0FBRztnQkFDbEIsV0FBVyxDQUFDLElBQUksQ0FBQyxTQUFPLEdBQUssQ0FBQyxDQUFBO1lBQ2hDLENBQUMsQ0FBQyxDQUFBO1lBQ0YsV0FBVyxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQTtRQUN0QixDQUFDLENBQUMsQ0FBQTtRQUVGLE9BQU8sQ0FBQyxHQUFHLENBQUksTUFBTSxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsU0FBTSxDQUFDLENBQUE7UUFDekMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxXQUFXLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUE7SUFDdkMsQ0FBQyxDQUFDLENBQUE7QUFDSixDQUFDLENBQUE7QUFFRCxNQUFNLENBQUMsT0FBTyxHQUFHLGlCQUFpQixDQUFBIn0= \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWFya2Rvd24uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY2xpL2Zvcm1hdHRlcnMvbWFya2Rvd24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFFQSxNQUFNLGlCQUFpQixHQUFzQixVQUFVLFNBQVMsRUFBRSxRQUFRO0lBQ3hFLFNBQVMsQ0FBQyxFQUFFLENBQUMsS0FBSyxFQUFFLENBQUMsS0FBSyxFQUFFLEVBQUU7UUFDNUIsT0FBTyxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsQ0FBQTtRQUVwQixNQUFNLE1BQU0sR0FBYSxFQUFFLENBQUE7UUFDM0IsTUFBTSxXQUFXLEdBQWEsRUFBRSxDQUFBO1FBQ2hDLE1BQU0sY0FBYyxHQUFHLEtBQUssQ0FBQyxjQUFjLENBQUE7UUFFM0MsY0FBYyxDQUFDLE9BQU8sQ0FBQyxDQUFDLFFBQVEsRUFBRSxFQUFFO1lBQ2xDLE1BQU0sUUFBUSxHQUFHLFFBQVEsQ0FBQyxJQUFJLENBQUE7WUFDOUIsTUFBTSxXQUFXLEdBQUcsUUFBUSxDQUFDLFFBQVEsQ0FBQTtZQUNyQyxJQUFJLFVBQVUsR0FBRyxDQUFDLENBQUE7WUFDbEIsSUFBSSxZQUFZLEdBQUcsQ0FBQyxDQUFBO1lBRXBCLFdBQVcsQ0FBQyxPQUFPLENBQUMsQ0FBQyxPQUFPLEVBQUUsRUFBRTtnQkFDOUIsSUFBSSxPQUFPLENBQUMsSUFBSSxLQUFLLE9BQU8sRUFBRTtvQkFDNUIsVUFBVSxFQUFFLENBQUE7aUJBQ2I7cUJBQU07b0JBQ0wsWUFBWSxFQUFFLENBQUE7aUJBQ2Y7WUFDSCxDQUFDLENBQUMsQ0FBQTtZQUVGLE1BQU0sQ0FBQyxJQUFJLENBQUMsU0FBUyxRQUFRLE1BQU0sUUFBUSxHQUFHLENBQUMsQ0FBQTtZQUMvQyxXQUFXLENBQUMsSUFBSSxDQUFDLFlBQVksUUFBUSxNQUFNLENBQUMsQ0FBQTtZQUM1QyxXQUFXLENBQUMsSUFBSSxDQUFDLEtBQUssUUFBUSxFQUFFLENBQUMsQ0FBQTtZQUNqQyxXQUFXLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxDQUFBO1lBQ3BCLFdBQVcsQ0FBQyxJQUFJLENBQUMsU0FBUyxVQUFVLFlBQVksWUFBWSxXQUFXLENBQUMsQ0FBQTtZQUV4RSxNQUFNLE9BQU8sR0FBRyxRQUFRLENBQUMsTUFBTSxDQUFDLFdBQVcsQ0FBQyxDQUFBO1lBQzVDLFdBQVcsQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUE7WUFDcEIsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQUFDLEdBQUcsRUFBRSxFQUFFO2dCQUN0QixXQUFXLENBQUMsSUFBSSxDQUFDLE9BQU8sR0FBRyxFQUFFLENBQUMsQ0FBQTtZQUNoQyxDQUFDLENBQUMsQ0FBQTtZQUNGLFdBQVcsQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUE7UUFDdEIsQ0FBQyxDQUFDLENBQUE7UUFFRixPQUFPLENBQUMsR0FBRyxDQUFDLEdBQUcsTUFBTSxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLENBQUE7UUFDekMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxXQUFXLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUE7SUFDdkMsQ0FBQyxDQUFDLENBQUE7QUFDSixDQUFDLENBQUE7QUFFRCxNQUFNLENBQUMsT0FBTyxHQUFHLGlCQUFpQixDQUFBIn0= \ No newline at end of file diff --git a/dist/cli/formatters/unix.js b/dist/cli/formatters/unix.js index 8baa3b086..022a76901 100644 --- a/dist/cli/formatters/unix.js +++ b/dist/cli/formatters/unix.js @@ -1,27 +1,27 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -var chalk = require("chalk"); -var unixFormatter = function (formatter, HTMLHint, options) { - var nocolor = options.nocolor; - var chalkInstance = nocolor !== false ? new chalk.Instance({ level: 1 }) : chalk; - formatter.on('file', function (event) { - event.messages.forEach(function (message) { +const chalk = require("chalk"); +const unixFormatter = function (formatter, HTMLHint, options) { + const nocolor = options.nocolor; + const chalkInstance = nocolor !== false ? new chalk.Instance({ level: 1 }) : chalk; + formatter.on('file', (event) => { + event.messages.forEach((message) => { console.log([ event.file, message.line, message.col, - " " + message.message + " [" + message.type + "/" + message.rule.id + "]", + ` ${message.message} [${message.type}/${message.rule.id}]`, ].join(':')); }); }); - formatter.on('end', function (event) { - var allHintCount = event.allHintCount; + formatter.on('end', (event) => { + const allHintCount = event.allHintCount; if (allHintCount > 0) { console.log(''); - var message = '%d problems'; + const message = '%d problems'; console.log(nocolor ? message : chalkInstance.red(message), event.allHintCount); } }); }; module.exports = unixFormatter; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidW5peC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jbGkvZm9ybWF0dGVycy91bml4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsNkJBQThCO0FBRzlCLElBQU0sYUFBYSxHQUFzQixVQUN2QyxTQUFTLEVBQ1QsUUFBUSxFQUNSLE9BQU87SUFFUCxJQUFNLE9BQU8sR0FBRyxPQUFPLENBQUMsT0FBTyxDQUFBO0lBRS9CLElBQU0sYUFBYSxHQUNqQixPQUFPLEtBQUssS0FBSyxDQUFDLENBQUMsQ0FBQyxJQUFJLEtBQUssQ0FBQyxRQUFRLENBQUMsRUFBRSxLQUFLLEVBQUUsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFBO0lBRTlELFNBQVMsQ0FBQyxFQUFFLENBQUMsTUFBTSxFQUFFLFVBQUMsS0FBSztRQUN6QixLQUFLLENBQUMsUUFBUSxDQUFDLE9BQU8sQ0FBQyxVQUFDLE9BQU87WUFDN0IsT0FBTyxDQUFDLEdBQUcsQ0FDVDtnQkFDRSxLQUFLLENBQUMsSUFBSTtnQkFDVixPQUFPLENBQUMsSUFBSTtnQkFDWixPQUFPLENBQUMsR0FBRztnQkFDWCxNQUFJLE9BQU8sQ0FBQyxPQUFPLFVBQUssT0FBTyxDQUFDLElBQUksU0FBSSxPQUFPLENBQUMsSUFBSSxDQUFDLEVBQUUsTUFBRzthQUMzRCxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FDWixDQUFBO1FBQ0gsQ0FBQyxDQUFDLENBQUE7SUFDSixDQUFDLENBQUMsQ0FBQTtJQUVGLFNBQVMsQ0FBQyxFQUFFLENBQUMsS0FBSyxFQUFFLFVBQUMsS0FBSztRQUN4QixJQUFNLFlBQVksR0FBRyxLQUFLLENBQUMsWUFBWSxDQUFBO1FBQ3ZDLElBQUksWUFBWSxHQUFHLENBQUMsRUFBRTtZQUNwQixPQUFPLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxDQUFBO1lBQ2YsSUFBTSxPQUFPLEdBQUcsYUFBYSxDQUFBO1lBQzdCLE9BQU8sQ0FBQyxHQUFHLENBQ1QsT0FBTyxDQUFDLENBQUMsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLGFBQWEsQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLEVBQzlDLEtBQUssQ0FBQyxZQUFZLENBQ25CLENBQUE7U0FDRjtJQUNILENBQUMsQ0FBQyxDQUFBO0FBQ0osQ0FBQyxDQUFBO0FBRUQsTUFBTSxDQUFDLE9BQU8sR0FBRyxhQUFhLENBQUEifQ== \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidW5peC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jbGkvZm9ybWF0dGVycy91bml4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsK0JBQThCO0FBRzlCLE1BQU0sYUFBYSxHQUFzQixVQUN2QyxTQUFTLEVBQ1QsUUFBUSxFQUNSLE9BQU87SUFFUCxNQUFNLE9BQU8sR0FBRyxPQUFPLENBQUMsT0FBTyxDQUFBO0lBRS9CLE1BQU0sYUFBYSxHQUNqQixPQUFPLEtBQUssS0FBSyxDQUFDLENBQUMsQ0FBQyxJQUFJLEtBQUssQ0FBQyxRQUFRLENBQUMsRUFBRSxLQUFLLEVBQUUsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFBO0lBRTlELFNBQVMsQ0FBQyxFQUFFLENBQUMsTUFBTSxFQUFFLENBQUMsS0FBSyxFQUFFLEVBQUU7UUFDN0IsS0FBSyxDQUFDLFFBQVEsQ0FBQyxPQUFPLENBQUMsQ0FBQyxPQUFPLEVBQUUsRUFBRTtZQUNqQyxPQUFPLENBQUMsR0FBRyxDQUNUO2dCQUNFLEtBQUssQ0FBQyxJQUFJO2dCQUNWLE9BQU8sQ0FBQyxJQUFJO2dCQUNaLE9BQU8sQ0FBQyxHQUFHO2dCQUNYLElBQUksT0FBTyxDQUFDLE9BQU8sS0FBSyxPQUFPLENBQUMsSUFBSSxJQUFJLE9BQU8sQ0FBQyxJQUFJLENBQUMsRUFBRSxHQUFHO2FBQzNELENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUNaLENBQUE7UUFDSCxDQUFDLENBQUMsQ0FBQTtJQUNKLENBQUMsQ0FBQyxDQUFBO0lBRUYsU0FBUyxDQUFDLEVBQUUsQ0FBQyxLQUFLLEVBQUUsQ0FBQyxLQUFLLEVBQUUsRUFBRTtRQUM1QixNQUFNLFlBQVksR0FBRyxLQUFLLENBQUMsWUFBWSxDQUFBO1FBQ3ZDLElBQUksWUFBWSxHQUFHLENBQUMsRUFBRTtZQUNwQixPQUFPLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxDQUFBO1lBQ2YsTUFBTSxPQUFPLEdBQUcsYUFBYSxDQUFBO1lBQzdCLE9BQU8sQ0FBQyxHQUFHLENBQ1QsT0FBTyxDQUFDLENBQUMsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLGFBQWEsQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLEVBQzlDLEtBQUssQ0FBQyxZQUFZLENBQ25CLENBQUE7U0FDRjtJQUNILENBQUMsQ0FBQyxDQUFBO0FBQ0osQ0FBQyxDQUFBO0FBRUQsTUFBTSxDQUFDLE9BQU8sR0FBRyxhQUFhLENBQUEifQ== \ No newline at end of file diff --git a/dist/cli/htmlhint.js b/dist/cli/htmlhint.js index d41bb7104..a8a17d81c 100644 --- a/dist/cli/htmlhint.js +++ b/dist/cli/htmlhint.js @@ -1,27 +1,28 @@ #!/usr/bin/env node "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -var async_1 = require("async"); -var chalk = require("chalk"); -var program = require("commander"); -var fs_1 = require("fs"); -var glob = require("glob"); -var parseGlob = require("parse-glob"); -var path_1 = require("path"); -var node_fetch_1 = require("node-fetch"); -var stripJsonComments = require("strip-json-comments"); -var HTMLHint = require('../htmlhint.js').HTMLHint; -var formatter = require('./formatter'); -var pkg = require('../../package.json'); +const async_1 = require("async"); +const chalk = require("chalk"); +const commander_1 = require("commander"); +const fs_1 = require("fs"); +const glob = require("glob"); +const parseGlob = require("parse-glob"); +const path_1 = require("path"); +const node_fetch_1 = require("node-fetch"); +const stripJsonComments = require("strip-json-comments"); +const HTMLHint = require('../htmlhint.js').HTMLHint; +const formatter = require('./formatter'); +const pkg = require('../../package.json'); function map(val) { - var objMap = {}; - val.split(',').forEach(function (item) { - var arrItem = item.split(/\s*=\s*/); + const objMap = {}; + val.split(',').forEach((item) => { + const arrItem = item.split(/\s*=\s*/); objMap[arrItem[0]] = arrItem[1] ? arrItem[1] : true; }); return objMap; } -program.on('--help', function () { +const program = new commander_1.Command(); +program.on('--help', () => { console.log(' Examples:'); console.log(''); console.log(' htmlhint'); @@ -38,7 +39,7 @@ program.on('--help', function () { console.log(' htmlhint --rulesdir ./rules/'); console.log(''); }); -var arrSupportedFormatters = formatter.getSupported(); +const arrSupportedFormatters = formatter.getSupported(); program .version(pkg.version) .usage(' [options]') @@ -46,58 +47,59 @@ program .option('-c, --config ', 'custom configuration file') .option('-r, --rules ', 'set all of the rules available', map) .option('-R, --rulesdir ', 'load custom rules from file or folder') - .option("-f, --format <" + arrSupportedFormatters.join('|') + ">", 'output messages as custom format') + .option(`-f, --format <${arrSupportedFormatters.join('|')}>`, 'output messages as custom format') .option('-i, --ignore ', 'add pattern to exclude matches') .option('--nocolor', 'disable color') .option('--warn', 'Warn only, exit with 0') .parse(process.argv); -if (program.list) { +const cliOptions = program.opts(); +if (cliOptions.list) { listRules(); process.exit(0); } -var arrTargets = program.args; +const arrTargets = program.args; if (arrTargets.length === 0) { arrTargets.push('./'); } formatter.init(HTMLHint, { - nocolor: program.nocolor, + nocolor: cliOptions.nocolor, }); -var format = program.format || 'default'; +const format = cliOptions.format || 'default'; if (format) { formatter.setFormat(format); } hintTargets(arrTargets, { - rulesdir: program.rulesdir, - ruleset: program.rules, + rulesdir: cliOptions.rulesdir, + ruleset: cliOptions.rules, formatter: formatter, - ignore: program.ignore, + ignore: cliOptions.ignore, }); function listRules() { - var rules = HTMLHint.rules; - var rule; + const rules = HTMLHint.rules; + let rule; console.log(' All rules:'); console.log(' =================================================='); - for (var id in rules) { + for (const id in rules) { rule = rules[id]; console.log(' %s : %s', chalk.bold(rule.id), rule.description); } } function hintTargets(arrTargets, options) { - var arrAllMessages = []; - var allFileCount = 0; - var allHintFileCount = 0; - var allHintCount = 0; - var startTime = new Date().getTime(); - var formatter = options.formatter; - var rulesdir = options.rulesdir; + let arrAllMessages = []; + let allFileCount = 0; + let allHintFileCount = 0; + let allHintCount = 0; + const startTime = new Date().getTime(); + const formatter = options.formatter; + const rulesdir = options.rulesdir; if (rulesdir) { loadCustomRules(rulesdir); } formatter.emit('start'); - var arrTasks = []; - arrTargets.forEach(function (target) { - arrTasks.push(function (next) { - hintAllFiles(target, options, function (result) { + const arrTasks = []; + arrTargets.forEach((target) => { + arrTasks.push((next) => { + hintAllFiles(target, options, (result) => { allFileCount += result.targetFileCount; allHintFileCount += result.targetHintFileCount; allHintCount += result.targetHintCount; @@ -106,8 +108,8 @@ function hintTargets(arrTargets, options) { }); }); }); - async_1.series(arrTasks, function () { - var spendTime = new Date().getTime() - startTime; + (0, async_1.series)(arrTasks, () => { + const spendTime = new Date().getTime() - startTime; formatter.emit('end', { arrAllMessages: arrAllMessages, allFileCount: allFileCount, @@ -115,22 +117,22 @@ function hintTargets(arrTargets, options) { allHintCount: allHintCount, time: spendTime, }); - process.exit(!program.warn && allHintCount > 0 ? 1 : 0); + process.exit(!cliOptions.warn && allHintCount > 0 ? 1 : 0); }); } function loadCustomRules(rulesdir) { rulesdir = rulesdir.replace(/\\/g, '/'); - if (fs_1.existsSync(rulesdir)) { - if (fs_1.statSync(rulesdir).isDirectory()) { + if ((0, fs_1.existsSync)(rulesdir)) { + if ((0, fs_1.statSync)(rulesdir).isDirectory()) { rulesdir += /\/$/.test(rulesdir) ? '' : '/'; rulesdir += '**/*.js'; - var arrFiles = glob.sync(rulesdir, { + const arrFiles = glob.sync(rulesdir, { dot: false, nodir: true, strict: false, silent: true, }); - arrFiles.forEach(function (file) { + arrFiles.forEach((file) => { loadRule(file); }); } @@ -140,28 +142,28 @@ function loadCustomRules(rulesdir) { } } function loadRule(filepath) { - filepath = path_1.resolve(filepath); + filepath = (0, path_1.resolve)(filepath); try { - var module_1 = require(filepath); - module_1(HTMLHint); + const module = require(filepath); + module(HTMLHint); } catch (e) { } } function hintAllFiles(target, options, onFinished) { - var globInfo = getGlobInfo(target); + const globInfo = getGlobInfo(target); globInfo.ignore = options.ignore; - var formatter = options.formatter; - var targetFileCount = 0; - var targetHintFileCount = 0; - var targetHintCount = 0; - var arrTargetMessages = []; - var ruleset = options.ruleset; + const formatter = options.formatter; + let targetFileCount = 0; + let targetHintFileCount = 0; + let targetHintCount = 0; + const arrTargetMessages = []; + let ruleset = options.ruleset; if (ruleset === undefined) { - ruleset = getConfig(program.config, globInfo.base, formatter); + ruleset = getConfig(cliOptions.config, globInfo.base, formatter); } - var hintQueue = async_1.queue(function (filepath, next) { - var startTime = new Date().getTime(); + const hintQueue = (0, async_1.queue)((filepath, next) => { + const startTime = new Date().getTime(); if (filepath === 'stdin') { hintStdin(ruleset, hintNext); } @@ -169,12 +171,12 @@ function hintAllFiles(target, options, onFinished) { hintUrl(filepath, ruleset, hintNext); } else { - var messages = hintFile(filepath, ruleset); + const messages = hintFile(filepath, ruleset); hintNext(messages); } function hintNext(messages) { - var spendTime = new Date().getTime() - startTime; - var hintCount = messages.length; + const spendTime = new Date().getTime() - startTime; + const hintCount = messages.length; if (hintCount > 0) { formatter.emit('file', { file: filepath, @@ -193,9 +195,9 @@ function hintAllFiles(target, options, onFinished) { setImmediate(next); } }, 10); - var isWalkDone = false; - var isHintDone = true; - hintQueue.drain(function () { + let isWalkDone = false; + let isHintDone = true; + hintQueue.drain(() => { isHintDone = true; checkAllHinted(); }); @@ -218,10 +220,10 @@ function hintAllFiles(target, options, onFinished) { void hintQueue.push(target); } else { - walkPath(globInfo, function (filepath) { + walkPath(globInfo, (filepath) => { isHintDone = false; void hintQueue.push(filepath); - }, function () { + }, () => { isWalkDone = true; checkAllHinted(); }); @@ -229,12 +231,12 @@ function hintAllFiles(target, options, onFinished) { } function getGlobInfo(target) { target = target.replace(/\\/g, '/'); - var globInfo = parseGlob(target); - var base = path_1.resolve(globInfo.base); + const globInfo = parseGlob(target); + let base = (0, path_1.resolve)(globInfo.base); base += /\/$/.test(base) ? '' : '/'; - var pattern = globInfo.glob; - var globPath = globInfo.path; - var defaultGlob = '*.{htm,html}'; + let pattern = globInfo.glob; + const globPath = globInfo.path; + const defaultGlob = '*.{htm,html}'; if (globInfo.is.glob === true) { if (globPath.basename === '') { pattern += defaultGlob; @@ -242,11 +244,11 @@ function getGlobInfo(target) { } else { if (globPath.basename === '') { - pattern += "**/" + defaultGlob; + pattern += `**/${defaultGlob}`; } - else if (fs_1.existsSync(target) && fs_1.statSync(target).isDirectory()) { - base += globPath.basename + "/"; - pattern = "**/" + defaultGlob; + else if ((0, fs_1.existsSync)(target) && (0, fs_1.statSync)(target).isDirectory()) { + base += `${globPath.basename}/`; + pattern = `**/${defaultGlob}`; } } return { @@ -255,13 +257,13 @@ function getGlobInfo(target) { }; } function getConfig(configPath, base, formatter) { - if (configPath === undefined && fs_1.existsSync(base)) { - if (fs_1.statSync(base).isDirectory() === false) { - base = path_1.dirname(base); + if (configPath === undefined && (0, fs_1.existsSync)(base)) { + if ((0, fs_1.statSync)(base).isDirectory() === false) { + base = (0, path_1.dirname)(base); } while (base) { - var tmpConfigFile = path_1.resolve(base, '.htmlhintrc'); - if (fs_1.existsSync(tmpConfigFile)) { + const tmpConfigFile = (0, path_1.resolve)(base, '.htmlhintrc'); + if ((0, fs_1.existsSync)(tmpConfigFile)) { configPath = tmpConfigFile; break; } @@ -271,9 +273,9 @@ function getConfig(configPath, base, formatter) { base = base.substring(0, base.lastIndexOf(path_1.sep)); } } - if (configPath !== undefined && fs_1.existsSync(configPath)) { - var config = fs_1.readFileSync(configPath, 'utf-8'); - var ruleset = {}; + if (configPath !== undefined && (0, fs_1.existsSync)(configPath)) { + const config = (0, fs_1.readFileSync)(configPath, 'utf-8'); + let ruleset = {}; try { ruleset = JSON.parse(stripJsonComments(config)); formatter.emit('config', { @@ -287,26 +289,26 @@ function getConfig(configPath, base, formatter) { } } function walkPath(globInfo, callback, onFinish) { - var base = globInfo.base; - var pattern = globInfo.pattern; - var ignore = globInfo.ignore; - var arrIgnores = ['**/node_modules/**']; + let base = globInfo.base; + const pattern = globInfo.pattern; + const ignore = globInfo.ignore; + const arrIgnores = ['**/node_modules/**']; if (ignore) { - ignore.split(',').forEach(function (pattern) { + ignore.split(',').forEach((pattern) => { arrIgnores.push(pattern); }); } - var walk = glob(pattern, { + const walk = glob(pattern, { cwd: base, dot: false, ignore: arrIgnores, nodir: true, strict: false, silent: true, - }, function () { + }, () => { onFinish(); }); - walk.on('match', function (file) { + walk.on('match', (file) => { base = base.replace(/^.\//, ''); if (path_1.sep !== '/') { base = base.replace(/\//g, path_1.sep); @@ -315,9 +317,9 @@ function walkPath(globInfo, callback, onFinish) { }); } function hintFile(filepath, ruleset) { - var content = ''; + let content = ''; try { - content = fs_1.readFileSync(filepath, 'utf-8'); + content = (0, fs_1.readFileSync)(filepath, 'utf-8'); } catch (e) { } @@ -325,22 +327,22 @@ function hintFile(filepath, ruleset) { } function hintStdin(ruleset, callback) { process.stdin.setEncoding('utf8'); - var buffers = []; - process.stdin.on('data', function (text) { + const buffers = []; + process.stdin.on('data', (text) => { buffers.push(text); }); - process.stdin.on('end', function () { - var content = buffers.join(''); - var messages = HTMLHint.verify(content, ruleset); + process.stdin.on('end', () => { + const content = buffers.join(''); + const messages = HTMLHint.verify(content, ruleset); callback(messages); }); } function hintUrl(url, ruleset, callback) { - var errorFn = function () { return callback([]); }; - node_fetch_1.default(url).then(function (response) { + const errorFn = () => callback([]); + (0, node_fetch_1.default)(url).then((response) => { if (response.ok) { - response.text().then(function (body) { - var messages = HTMLHint.verify(body, ruleset); + response.text().then((body) => { + const messages = HTMLHint.verify(body, ruleset); callback(messages); }, errorFn); } @@ -349,4 +351,4 @@ function hintUrl(url, ruleset, callback) { } }, errorFn); } -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"htmlhint.js","sourceRoot":"","sources":["../../src/cli/htmlhint.ts"],"names":[],"mappings":"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"} \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"htmlhint.js","sourceRoot":"","sources":["../../src/cli/htmlhint.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/core/core.js b/dist/core/core.js index b643ca16b..e58f40151 100644 --- a/dist/core/core.js +++ b/dist/core/core.js @@ -1,14 +1,14 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.HTMLParser = exports.Reporter = exports.HTMLRules = exports.HTMLHint = void 0; -var htmlparser_1 = require("./htmlparser"); +const htmlparser_1 = require("./htmlparser"); exports.HTMLParser = htmlparser_1.default; -var reporter_1 = require("./reporter"); +const reporter_1 = require("./reporter"); exports.Reporter = reporter_1.default; -var HTMLRules = require("./rules"); +const HTMLRules = require("./rules"); exports.HTMLRules = HTMLRules; -var HTMLHintCore = (function () { - function HTMLHintCore() { +class HTMLHintCore { + constructor() { this.rules = {}; this.defaultRuleset = { 'tagname-lowercase': true, @@ -23,27 +23,26 @@ var HTMLHintCore = (function () { 'title-require': true, }; } - HTMLHintCore.prototype.addRule = function (rule) { + addRule(rule) { this.rules[rule.id] = rule; - }; - HTMLHintCore.prototype.verify = function (html, ruleset) { - if (ruleset === void 0) { ruleset = this.defaultRuleset; } + } + verify(html, ruleset = this.defaultRuleset) { if (Object.keys(ruleset).length === 0) { ruleset = this.defaultRuleset; } - html = html.replace(/^\s*/i, function (all, strRuleset) { - strRuleset.replace(/(?:^|,)\s*([^:,]+)\s*(?:\:\s*([^,\s]+))?/g, function (all, ruleId, value) { + html = html.replace(/^\s*/i, (all, strRuleset) => { + strRuleset.replace(/(?:^|,)\s*([^:,]+)\s*(?:\:\s*([^,\s]+))?/g, (all, ruleId, value) => { ruleset[ruleId] = value !== undefined && value.length > 0 ? JSON.parse(value) : true; return ''; }); return ''; }); - var parser = new htmlparser_1.default(); - var reporter = new reporter_1.default(html, ruleset); - var rules = this.rules; - var rule; - for (var id in ruleset) { + const parser = new htmlparser_1.default(); + const reporter = new reporter_1.default(html, ruleset); + const rules = this.rules; + let rule; + for (const id in ruleset) { rule = rules[id]; if (rule !== undefined && ruleset[id] !== false) { rule.init(parser, reporter, ruleset[id]); @@ -51,11 +50,10 @@ var HTMLHintCore = (function () { } parser.parse(html); return reporter.messages; - }; - HTMLHintCore.prototype.format = function (arrMessages, options) { - if (options === void 0) { options = {}; } - var arrLogs = []; - var colors = { + } + format(arrMessages, options = {}) { + const arrLogs = []; + const colors = { white: '', grey: '', red: '', @@ -67,46 +65,45 @@ var HTMLHintCore = (function () { colors.red = '\x1b[31m'; colors.reset = '\x1b[39m'; } - var indent = options.indent || 0; - arrMessages.forEach(function (hint) { - var leftWindow = 40; - var rightWindow = leftWindow + 20; - var evidence = hint.evidence; - var line = hint.line; - var col = hint.col; - var evidenceCount = evidence.length; - var leftCol = col > leftWindow + 1 ? col - leftWindow : 1; - var rightCol = evidence.length > col + rightWindow ? col + rightWindow : evidenceCount; + const indent = options.indent || 0; + arrMessages.forEach((hint) => { + const leftWindow = 40; + const rightWindow = leftWindow + 20; + let evidence = hint.evidence; + const line = hint.line; + const col = hint.col; + const evidenceCount = evidence.length; + let leftCol = col > leftWindow + 1 ? col - leftWindow : 1; + let rightCol = evidence.length > col + rightWindow ? col + rightWindow : evidenceCount; if (col < leftWindow + 1) { rightCol += leftWindow - col + 1; } evidence = evidence.replace(/\t/g, ' ').substring(leftCol - 1, rightCol); if (leftCol > 1) { - evidence = "..." + evidence; + evidence = `...${evidence}`; leftCol -= 3; } if (rightCol < evidenceCount) { evidence += '...'; } - arrLogs.push(colors.white + repeatStr(indent) + "L" + line + " |" + colors.grey + evidence + colors.reset); - var pointCol = col - leftCol; - var match = evidence.substring(0, pointCol).match(/[^\u0000-\u00ff]/g); + arrLogs.push(`${colors.white + repeatStr(indent)}L${line} |${colors.grey}${evidence}${colors.reset}`); + let pointCol = col - leftCol; + const match = evidence.substring(0, pointCol).match(/[^\u0000-\u00ff]/g); if (match !== null) { pointCol += match.length; } - arrLogs.push(colors.white + + arrLogs.push(`${colors.white + repeatStr(indent) + - repeatStr(String(line).length + 3 + pointCol) + "^ " + colors.red + hint.message + " (" + hint.rule.id + ")" + colors.reset); + repeatStr(String(line).length + 3 + pointCol)}^ ${colors.red}${hint.message} (${hint.rule.id})${colors.reset}`); }); return arrLogs; - }; - return HTMLHintCore; -}()); + } +} function repeatStr(n, str) { return new Array(n + 1).join(str || ' '); } exports.HTMLHint = new HTMLHintCore(); -Object.keys(HTMLRules).forEach(function (key) { +Object.keys(HTMLRules).forEach((key) => { exports.HTMLHint.addRule(HTMLRules[key]); }); -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29yZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb3JlL2NvcmUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsMkNBQXFDO0FBb0tQLHFCQXBLdkIsb0JBQVUsQ0FvS3VCO0FBbkt4Qyx1Q0FBaUM7QUFtS2IsbUJBbktiLGtCQUFRLENBbUthO0FBbEs1QixtQ0FBb0M7QUFrSzNCLDhCQUFTO0FBMUpsQjtJQUFBO1FBQ1MsVUFBSyxHQUEyQixFQUFFLENBQUE7UUFDekIsbUJBQWMsR0FBWTtZQUN4QyxtQkFBbUIsRUFBRSxJQUFJO1lBQ3pCLGdCQUFnQixFQUFFLElBQUk7WUFDdEIsMEJBQTBCLEVBQUUsSUFBSTtZQUNoQyxlQUFlLEVBQUUsSUFBSTtZQUNyQixVQUFVLEVBQUUsSUFBSTtZQUNoQixrQkFBa0IsRUFBRSxJQUFJO1lBQ3hCLFdBQVcsRUFBRSxJQUFJO1lBQ2pCLGVBQWUsRUFBRSxJQUFJO1lBQ3JCLHFCQUFxQixFQUFFLElBQUk7WUFDM0IsZUFBZSxFQUFFLElBQUk7U0FDdEIsQ0FBQTtJQThISCxDQUFDO0lBNUhRLDhCQUFPLEdBQWQsVUFBZSxJQUFVO1FBQ3ZCLElBQUksQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxHQUFHLElBQUksQ0FBQTtJQUM1QixDQUFDO0lBRU0sNkJBQU0sR0FBYixVQUFjLElBQVksRUFBRSxPQUFzQztRQUF0Qyx3QkFBQSxFQUFBLFVBQW1CLElBQUksQ0FBQyxjQUFjO1FBQ2hFLElBQUksTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsQ0FBQyxNQUFNLEtBQUssQ0FBQyxFQUFFO1lBQ3JDLE9BQU8sR0FBRyxJQUFJLENBQUMsY0FBYyxDQUFBO1NBQzlCO1FBR0QsSUFBSSxHQUFHLElBQUksQ0FBQyxPQUFPLENBQ2pCLDBDQUEwQyxFQUMxQyxVQUFDLEdBQUcsRUFBRSxVQUFrQjtZQUl0QixVQUFVLENBQUMsT0FBTyxDQUNoQiwyQ0FBMkMsRUFD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 \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29yZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb3JlL2NvcmUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsNkNBQXFDO0FBb0tQLHFCQXBLdkIsb0JBQVUsQ0FvS3VCO0FBbkt4Qyx5Q0FBaUM7QUFtS2IsbUJBbktiLGtCQUFRLENBbUthO0FBbEs1QixxQ0FBb0M7QUFrSzNCLDhCQUFTO0FBMUpsQixNQUFNLFlBQVk7SUFBbEI7UUFDUyxVQUFLLEdBQTJCLEVBQUUsQ0FBQTtRQUN6QixtQkFBYyxHQUFZO1lBQ3hDLG1CQUFtQixFQUFFLElBQUk7WUFDekIsZ0JBQWdCLEVBQUUsSUFBSTtZQUN0QiwwQkFBMEIsRUFBRSxJQUFJO1lBQ2hDLGVBQWUsRUFBRSxJQUFJO1lBQ3JCLFVBQVUsRUFBRSxJQUFJO1lBQ2hCLGtCQUFrQixFQUFFLElBQUk7WUFDeEIsV0FBVyxFQUFFLElBQUk7WUFDakIsZUFBZSxFQUFFLElBQUk7WUFDckIscUJBQXFCLEVBQUUsSUFBSTtZQUMzQixlQUFlLEVBQUUsSUFBSTtTQUN0QixDQUFBO0lBOEhILENBQUM7SUE1SFEsT0FBTyxDQUFDLElBQVU7UUFDdkIsSUFBSSxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLEdBQUcsSUFBSSxDQUFBO0lBQzVCLENBQUM7SUFFTSxNQUFNLENBQUMsSUFBWSxFQUFFLFVBQW1CLElBQUksQ0FBQyxjQUFjO1FBQ2hFLElBQUksTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsQ0FBQyxNQUFNLEtBQUssQ0FBQyxFQUFFO1lBQ3JDLE9BQU8sR0FBRyxJQUFJLENBQUMsY0FBYyxDQUFBO1NBQzlCO1FBR0QsSUFBSSxHQUFHLElBQUksQ0FBQyxPQUFPLENBQ2pCLDBDQUEwQyxFQUMxQyxDQUFDLEdBQUcsRUFBRSxVQUFrQixFQUFFLEVBQUU7WUFJMUIsVUFBVSxDQUFDLE9BQU8sQ0FDaEIsMkNBQTJDLEVBQzNDLENBQUMsR0FBRyxF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 \ No newline at end of file diff --git a/dist/core/htmlparser.js b/dist/core/htmlparser.js index 70f2f9fc2..180a1de92 100644 --- a/dist/core/htmlparser.js +++ b/dist/core/htmlparser.js @@ -1,53 +1,52 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -var HTMLParser = (function () { - function HTMLParser() { +class HTMLParser { + constructor() { this._listeners = {}; this._mapCdataTags = this.makeMap('script,style'); this._arrBlocks = []; this.lastEvent = null; } - HTMLParser.prototype.makeMap = function (str) { - var obj = {}; - var items = str.split(','); - for (var i = 0; i < items.length; i++) { + makeMap(str) { + const obj = {}; + const items = str.split(','); + for (let i = 0; i < items.length; i++) { obj[items[i]] = true; } return obj; - }; - HTMLParser.prototype.parse = function (html) { - var _this = this; - var mapCdataTags = this._mapCdataTags; - var regTag = /<(?:\/([^\s>]+)\s*|!--([\s\S]*?)--|!([^>]*?)|([\w\-:]+)((?:\s+[^\s"'>\/=\x00-\x0F\x7F\x80-\x9F]+(?:\s*=\s*(?:"[^"]*"|'[^']*'|[^\s"'>]*))?)*?)\s*(\/?))>/g; - var regAttr = /\s*([^\s"'>\/=\x00-\x0F\x7F\x80-\x9F]+)(?:\s*=\s*(?:(")([^"]*)"|(')([^']*)'|([^\s"'>]*)))?/g; - var regLine = /\r?\n/g; - var match; - var matchIndex; - var lastIndex = 0; - var tagName; - var arrAttrs; - var tagCDATA = null; - var attrsCDATA; - var arrCDATA = []; - var lastCDATAIndex = 0; - var text; - var lastLineIndex = 0; - var line = 1; - var arrBlocks = this._arrBlocks; + } + parse(html) { + const mapCdataTags = this._mapCdataTags; + const regTag = /<(?:\/([^\s>]+)\s*|!--([\s\S]*?)--|!([^>]*?)|([\w\-:]+)((?:\s+[^\s"'>\/=\x00-\x0F\x7F\x80-\x9F]+(?:\s*=\s*(?:"[^"]*"|'[^']*'|[^\s"'>]*))?)*?)\s*(\/?))>/g; + const regAttr = /\s*([^\s"'>\/=\x00-\x0F\x7F\x80-\x9F]+)(?:\s*=\s*(?:(")([^"]*)"|(')([^']*)'|([^\s"'>]*)))?/g; + const regLine = /\r?\n/g; + let match; + let matchIndex; + let lastIndex = 0; + let tagName; + let arrAttrs; + let tagCDATA = null; + let attrsCDATA; + let arrCDATA = []; + let lastCDATAIndex = 0; + let text; + let lastLineIndex = 0; + let line = 1; + const arrBlocks = this._arrBlocks; this.fire('start', { pos: 0, line: 1, col: 1, }); - var isMapCdataTagsRequired = function () { - var attrType = arrAttrs.find(function (attr) { return attr.name === 'type'; }) || { + const isMapCdataTagsRequired = () => { + const attrType = arrAttrs.find((attr) => attr.name === 'type') || { value: '', }; return (mapCdataTags[tagName] && attrType.value.indexOf('text/ng-template') === -1); }; - var saveBlock = function (type, raw, pos, data) { - var col = pos - lastLineIndex + 1; + const saveBlock = (type, raw, pos, data) => { + const col = pos - lastLineIndex + 1; if (data === undefined) { data = {}; } @@ -56,9 +55,8 @@ var HTMLParser = (function () { data.line = line; data.col = col; arrBlocks.push(data); - _this.fire(type, data); - var lineMatch; - while ((lineMatch = regLine.exec(raw))) { + this.fire(type, data); + while (regLine.exec(raw)) { line++; lastLineIndex = pos + regLine.lastIndex; } @@ -99,17 +97,17 @@ var HTMLParser = (function () { else { if ((tagName = match[4])) { arrAttrs = []; - var attrs = match[5]; - var attrMatch = void 0; - var attrMatchCount = 0; + const attrs = match[5]; + let attrMatch; + let attrMatchCount = 0; while ((attrMatch = regAttr.exec(attrs))) { - var name_1 = attrMatch[1]; - var quote = attrMatch[2] + const name = attrMatch[1]; + const quote = attrMatch[2] ? attrMatch[2] : attrMatch[4] ? attrMatch[4] : ''; - var value = attrMatch[3] + const value = attrMatch[3] ? attrMatch[3] : attrMatch[5] ? attrMatch[5] @@ -117,7 +115,7 @@ var HTMLParser = (function () { ? attrMatch[6] : ''; arrAttrs.push({ - name: name_1, + name: name, value: value, quote: quote, index: attrMatch.index, @@ -159,60 +157,60 @@ var HTMLParser = (function () { line: line, col: html.length - lastLineIndex + 1, }); - }; - HTMLParser.prototype.addListener = function (types, listener) { - var _listeners = this._listeners; - var arrTypes = types.split(/[,\s]/); - var type; - for (var i = 0, l = arrTypes.length; i < l; i++) { + } + addListener(types, listener) { + const _listeners = this._listeners; + const arrTypes = types.split(/[,\s]/); + let type; + for (let i = 0, l = arrTypes.length; i < l; i++) { type = arrTypes[i]; if (_listeners[type] === undefined) { _listeners[type] = []; } _listeners[type].push(listener); } - }; - HTMLParser.prototype.fire = function (type, data) { + } + fire(type, data) { if (data === undefined) { data = {}; } data.type = type; - var listeners = []; - var listenersType = this._listeners[type]; - var listenersAll = this._listeners['all']; + let listeners = []; + const listenersType = this._listeners[type]; + const listenersAll = this._listeners['all']; if (listenersType !== undefined) { listeners = listeners.concat(listenersType); } if (listenersAll !== undefined) { listeners = listeners.concat(listenersAll); } - var lastEvent = this.lastEvent; + const lastEvent = this.lastEvent; if (lastEvent !== null) { delete lastEvent['lastEvent']; data.lastEvent = lastEvent; } this.lastEvent = data; - for (var i = 0, l = listeners.length; i < l; i++) { + for (let i = 0, l = listeners.length; i < l; i++) { listeners[i].call(this, data); } - }; - HTMLParser.prototype.removeListener = function (type, listener) { - var listenersType = this._listeners[type]; + } + removeListener(type, listener) { + const listenersType = this._listeners[type]; if (listenersType !== undefined) { - for (var i = 0, l = listenersType.length; i < l; i++) { + for (let i = 0, l = listenersType.length; i < l; i++) { if (listenersType[i] === listener) { listenersType.splice(i, 1); break; } } } - }; - HTMLParser.prototype.fixPos = function (event, index) { - var text = event.raw.substr(0, index); - var arrLines = text.split(/\r?\n/); - var lineCount = arrLines.length - 1; - var line = event.line; - var col; + } + fixPos(event, index) { + const text = event.raw.substr(0, index); + const arrLines = text.split(/\r?\n/); + const lineCount = arrLines.length - 1; + let line = event.line; + let col; if (lineCount > 0) { line += lineCount; col = arrLines[lineCount].length + 1; @@ -224,17 +222,16 @@ var HTMLParser = (function () { line: line, col: col, }; - }; - HTMLParser.prototype.getMapAttrs = function (arrAttrs) { - var mapAttrs = {}; - var attr; - for (var i = 0, l = arrAttrs.length; i < l; i++) { + } + getMapAttrs(arrAttrs) { + const mapAttrs = {}; + let attr; + for (let i = 0, l = arrAttrs.length; i < l; i++) { attr = arrAttrs[i]; mapAttrs[attr.name] = attr.value; } return mapAttrs; - }; - return HTMLParser; -}()); + } +} exports.default = HTMLParser; -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"htmlparser.js","sourceRoot":"","sources":["../../src/core/htmlparser.ts"],"names":[],"mappings":"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"} \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"htmlparser.js","sourceRoot":"","sources":["../../src/core/htmlparser.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/core/reporter.js b/dist/core/reporter.js index 5ea05eb72..d29eb695b 100644 --- a/dist/core/reporter.js +++ b/dist/core/reporter.js @@ -1,29 +1,29 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -var Reporter = (function () { - function Reporter(html, ruleset) { +class Reporter { + constructor(html, ruleset) { this.html = html; this.lines = html.split(/\r?\n/); - var match = /\r?\n/.exec(html); + const match = /\r?\n/.exec(html); this.brLen = match !== null ? match[0].length : 0; this.ruleset = ruleset; this.messages = []; } - Reporter.prototype.info = function (message, line, col, rule, raw) { + info(message, line, col, rule, raw) { this.report("info", message, line, col, rule, raw); - }; - Reporter.prototype.warn = function (message, line, col, rule, raw) { + } + warn(message, line, col, rule, raw) { this.report("warning", message, line, col, rule, raw); - }; - Reporter.prototype.error = function (message, line, col, rule, raw) { + } + error(message, line, col, rule, raw) { this.report("error", message, line, col, rule, raw); - }; - Reporter.prototype.report = function (type, message, line, col, rule, raw) { - var lines = this.lines; - var brLen = this.brLen; - var evidence = ''; - var evidenceLen = 0; - for (var i = line - 1, lineCount = lines.length; i < lineCount; i++) { + } + report(type, message, line, col, rule, raw) { + const lines = this.lines; + const brLen = this.brLen; + let evidence = ''; + let evidenceLen = 0; + for (let i = line - 1, lineCount = lines.length; i < lineCount; i++) { evidence = lines[i]; evidenceLen = evidence.length; if (col > evidenceLen && line < lineCount) { @@ -47,11 +47,10 @@ var Reporter = (function () { rule: { id: rule.id, description: rule.description, - link: "https://github.com/thedaviddias/HTMLHint/wiki/" + rule.id, + link: `https://github.com/thedaviddias/HTMLHint/wiki/${rule.id}`, }, }); - }; - return Reporter; -}()); + } +} exports.default = Reporter; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVwb3J0ZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29yZS9yZXBvcnRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUVBO0lBT0Usa0JBQW1CLElBQVksRUFBRSxPQUFnQjtRQUMvQyxJQUFJLENBQUMsSUFBSSxHQUFHLElBQUksQ0FBQTtRQUNoQixJQUFJLENBQUMsS0FBSyxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLENBQUE7UUFDaEMsSUFBTSxLQUFLLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQTtRQUVoQyxJQUFJLENBQUMsS0FBSyxHQUFHLEtBQUssS0FBSyxJQUFJLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQTtRQUNqRCxJQUFJLENBQUMsT0FBTyxHQUFHLE9BQU8sQ0FBQTtRQUN0QixJQUFJLENBQUMsUUFBUSxHQUFHLEVBQUUsQ0FBQTtJQUNwQixDQUFDO0lBRU0sdUJBQUksR0FBWCxVQUNFLE9BQWUsRUFDZixJQUFZLEVBQ1osR0FBVyxFQUNYLElBQVUsRUFDVixHQUFXO1FBRVgsSUFBSSxDQUFDLE1BQU0sU0FBa0IsT0FBTyxFQUFFLElBQUksRUFBRSxHQUFHLEVBQUUsSUFBSSxFQUFFLEdBQUcsQ0FBQyxDQUFBO0lBQzdELENBQUM7SUFFTSx1QkFBSSxHQUFYLFVBQ0UsT0FBZSxFQUNmLElBQVksRUFDWixHQUFXLEVBQ1gsSUFBVSxFQUNWLEdBQVc7UUFFWCxJQUFJLENBQUMsTUFBTSxZQUFxQixPQUFPLEVBQUUsSUFBSSxFQUFFLEdBQUcsRUFBRSxJQUFJLEVBQUUsR0FBRyxDQUFDLENBQUE7SUFDaEUsQ0FBQztJQUVNLHdCQUFLLEdBQVosVUFDRSxPQUFlLEVBQ2YsSUFBWSxFQUNaLEdBQVcsRUFDWCxJQUFVLEVBQ1YsR0FBVztRQUVYLElBQUksQ0FBQyxNQUFNLFVBQW1CLE9BQU8sRUFBRSxJQUFJLEVBQUUsR0FBRyxFQUFFLElBQUksRUFBRSxHQUFHLENBQUMsQ0FBQTtJQUM5RCxDQUFDO0lBRU8seUJBQU0sR0FBZCxVQUNFLElBQWdCLEVBQ2hCLE9BQWUsRUFDZixJQUFZLEVBQ1osR0FBVyxFQUNYLElBQVUsRUFDVixHQUFXO1FBRVgsSUFBTSxLQUFLLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQTtRQUN4QixJQUFNLEtBQUssR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFBO1FBQ3hCLElBQUksUUFBUSxHQUFHLEVBQUUsQ0FBQTtRQUNqQixJQUFJLFdBQVcsR0FBRyxDQUFDLENBQUE7UUFFbkIsS0FBSyxJQUFJLENBQUMsR0FBRyxJQUFJLEdBQUcsQ0FBQyxFQUFFLFNBQVMsR0FBRyxLQUFLLENBQUMsTUFBTSxFQUFFLENBQUMsR0FBRyxTQUFTLEVBQUUsQ0FBQyxFQUFFLEVBQUU7WUFDbkUsUUFBUSxHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQTtZQUNuQixXQUFXLEdBQUcsUUFBUSxDQUFDLE1BQU0sQ0FBQTtZQUM3QixJQUFJLEdBQUcsR0FBRyxXQUFXLElBQUksSUFBSSxHQUFHLFNBQVMsRUFBRTtnQkFDekMsSUFBSSxFQUFFLENBQUE7Z0JBQ04sR0FBRyxJQUFJLFdBQVcsQ0FBQTtnQkFDbEIsSUFBSSxHQUFHLEtBQUssQ0FBQyxFQUFFO29CQUNiLEdBQUcsSUFBSSxLQUFLLENBQUE7aUJBQ2I7YUFDRjtpQkFBTTtnQkFDTCxNQUFLO2FBQ047U0FDRjtRQUVELElBQUksQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDO1lBQ2pCLElBQUksRUFBRSxJQUFJO1lBQ1YsT0FBTyxFQUFFLE9BQU87WUFDaEIsR0FBRyxFQUFFLEdBQUc7WUFDUixRQUFRLEVBQUUsUUFBUTtZQUNsQixJQUFJLEVBQUUsSUFBSTtZQUNWLEdBQUcsRUFBRSxHQUFHO1lBQ1IsSUFBSSxFQUFFO2dCQUNKLEVBQUUsRUFBRSxJQUFJLENBQUMsRUFBRTtnQkFDWCxXQUFXLEVBQUUsSUFBSSxDQUFDLFdBQVc7Z0JBQzdCLElBQUksRUFBRSxtREFBaUQsSUFBSSxDQUFDLEVBQUk7YUFDekQ7U0FDVixDQUFDLENBQUE7SUFDSixDQUFDO0lBQ0gsZUFBQztBQUFELENBQUMsQUF4RkQsSUF3RkMifQ== \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVwb3J0ZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29yZS9yZXBvcnRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUVBLE1BQXFCLFFBQVE7SUFPM0IsWUFBbUIsSUFBWSxFQUFFLE9BQWdCO1FBQy9DLElBQUksQ0FBQyxJQUFJLEdBQUcsSUFBSSxDQUFBO1FBQ2hCLElBQUksQ0FBQyxLQUFLLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsQ0FBQTtRQUNoQyxNQUFNLEtBQUssR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFBO1FBRWhDLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxLQUFLLElBQUksQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFBO1FBQ2pELElBQUksQ0FBQyxPQUFPLEdBQUcsT0FBTyxDQUFBO1FBQ3RCLElBQUksQ0FBQyxRQUFRLEdBQUcsRUFBRSxDQUFBO0lBQ3BCLENBQUM7SUFFTSxJQUFJLENBQ1QsT0FBZSxFQUNmLElBQVksRUFDWixHQUFXLEVBQ1gsSUFBVSxFQUNWLEdBQVc7UUFFWCxJQUFJLENBQUMsTUFBTSxTQUFrQixPQUFPLEVBQUUsSUFBSSxFQUFFLEdBQUcsRUFBRSxJQUFJLEVBQUUsR0FBRyxDQUFDLENBQUE7SUFDN0QsQ0FBQztJQUVNLElBQUksQ0FDVCxPQUFlLEVBQ2YsSUFBWSxFQUNaLEdBQVcsRUFDWCxJQUFVLEVBQ1YsR0FBVztRQUVYLElBQUksQ0FBQyxNQUFNLFlBQXFCLE9BQU8sRUFBRSxJQUFJLEVBQUUsR0FBRyxFQUFFLElBQUksRUFBRSxHQUFHLENBQUMsQ0FBQTtJQUNoRSxDQUFDO0lBRU0sS0FBSyxDQUNWLE9BQWUsRUFDZixJQUFZLEVBQ1osR0FBVyxFQUNYLElBQVUsRUFDVixHQUFXO1FBRVgsSUFBSSxDQUFDLE1BQU0sVUFBbUIsT0FBTyxFQUFFLElBQUksRUFBRSxHQUFHLEVBQUUsSUFBSSxFQUFFLEdBQUcsQ0FBQyxDQUFBO0lBQzlELENBQUM7SUFFTyxNQUFNLENBQ1osSUFBZ0IsRUFDaEIsT0FBZSxFQUNmLElBQVksRUFDWixHQUFXLEVBQ1gsSUFBVSxFQUNWLEdBQVc7UUFFWCxNQUFNLEtBQUssR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFBO1FBQ3hCLE1BQU0sS0FBSyxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUE7UUFDeEIsSUFBSSxRQUFRLEdBQUcsRUFBRSxDQUFBO1FBQ2pCLElBQUksV0FBVyxHQUFHLENBQUMsQ0FBQTtRQUVuQixLQUFLLElBQUksQ0FBQyxHQUFHLElBQUksR0FBRyxDQUFDLEVBQUUsU0FBUyxHQUFHLEtBQUssQ0FBQyxNQUFNLEVBQUUsQ0FBQyxHQUFHLFNBQVMsRUFBRSxDQUFDLEVBQUUsRUFBRTtZQUNuRSxRQUFRLEdBQUcsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFBO1lBQ25CLFdBQVcsR0FBRyxRQUFRLENBQUMsTUFBTSxDQUFBO1lBQzdCLElBQUksR0FBRyxHQUFHLFdBQVcsSUFBSSxJQUFJLEdBQUcsU0FBUyxFQUFFO2dCQUN6QyxJQUFJLEVBQUUsQ0FBQTtnQkFDTixHQUFHLElBQUksV0FBVyxDQUFBO2dCQUNsQixJQUFJLEdBQUcsS0FBSyxDQUFDLEVBQUU7b0JBQ2IsR0FBRyxJQUFJLEtBQUssQ0FBQTtpQkFDYjthQUNGO2lCQUFNO2dCQUNMLE1BQUs7YUFDTjtTQUNGO1FBRUQsSUFBSSxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUM7WUFDakIsSUFBSSxFQUFFLElBQUk7WUFDVixPQUFPLEVBQUUsT0FBTztZQUNoQixHQUFHLEVBQUUsR0FBRztZQUNSLFFBQVEsRUFBRSxRQUFRO1lBQ2xCLElBQUksRUFBRSxJQUFJO1lBQ1YsR0FBRyxFQUFFLEdBQUc7WUFDUixJQUFJLEVBQUU7Z0JBQ0osRUFBRSxFQUFFLElBQUksQ0FBQyxFQUFFO2dCQUNYLFdBQVcsRUFBRSxJQUFJLENBQUMsV0FBVztnQkFDN0IsSUFBSSxFQUFFLGlEQUFpRCxJQUFJLENBQUMsRUFBRSxFQUFFO2FBQ3pEO1NBQ1YsQ0FBQyxDQUFBO0lBQ0osQ0FBQztDQUNGO0FBeEZELDJCQXdGQyJ9 \ No newline at end of file diff --git a/dist/core/rules/alt-require.js b/dist/core/rules/alt-require.js index a1d5df098..dd73bc3b5 100644 --- a/dist/core/rules/alt-require.js +++ b/dist/core/rules/alt-require.js @@ -3,24 +3,23 @@ Object.defineProperty(exports, "__esModule", { value: true }); exports.default = { id: 'alt-require', description: 'The alt attribute of an element must be present and alt attribute of area[href] and input[type=image] must have a value.', - init: function (parser, reporter) { - var _this = this; - parser.addListener('tagstart', function (event) { - var tagName = event.tagName.toLowerCase(); - var mapAttrs = parser.getMapAttrs(event.attrs); - var col = event.col + tagName.length + 1; - var selector; + init(parser, reporter) { + parser.addListener('tagstart', (event) => { + const tagName = event.tagName.toLowerCase(); + const mapAttrs = parser.getMapAttrs(event.attrs); + const col = event.col + tagName.length + 1; + let selector; if (tagName === 'img' && !('alt' in mapAttrs)) { - reporter.warn('An alt attribute must be present on elements.', event.line, col, _this, event.raw); + reporter.warn('An alt attribute must be present on elements.', event.line, col, this, event.raw); } else if ((tagName === 'area' && 'href' in mapAttrs) || (tagName === 'input' && mapAttrs['type'] === 'image')) { if (!('alt' in mapAttrs) || mapAttrs['alt'] === '') { selector = tagName === 'area' ? 'area[href]' : 'input[type=image]'; - reporter.warn("The alt attribute of " + selector + " must have a value.", event.line, col, _this, event.raw); + reporter.warn(`The alt attribute of ${selector} must have a value.`, event.line, col, this, event.raw); } } }); }, }; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWx0LXJlcXVpcmUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY29yZS9ydWxlcy9hbHQtcmVxdWlyZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUVBLGtCQUFlO0lBQ2IsRUFBRSxFQUFFLGFBQWE7SUFDakIsV0FBVyxFQUNULGdJQUFnSTtJQUNsSSxJQUFJLFlBQUMsTUFBTSxFQUFFLFFBQVE7UUFBckIsaUJBK0JDO1FBOUJDLE1BQU0sQ0FBQyxXQUFXLENBQUMsVUFBVSxFQUFFLFVBQUMsS0FBSztZQUNuQyxJQUFNLE9BQU8sR0FBRyxLQUFLLENBQUMsT0FBTyxDQUFDLFdBQVcsRUFBRSxDQUFBO1lBQzNDLElBQU0sUUFBUSxHQUFHLE1BQU0sQ0FBQyxXQUFXLENBQUMsS0FBSyxDQUFDLEtBQUssQ0FBQyxDQUFBO1lBQ2hELElBQU0sR0FBRyxHQUFHLEtBQUssQ0FBQyxHQUFHLEdBQUcsT0FBTyxDQUFDLE1BQU0sR0FBRyxDQUFDLENBQUE7WUFDMUMsSUFBSSxRQUFRLENBQUE7WUFFWixJQUFJLE9BQU8sS0FBSyxLQUFLLElBQUksQ0FBQyxDQUFDLEtBQUssSUFBSSxRQUFRLENBQUMsRUFBRTtnQkFDN0MsUUFBUSxDQUFDLElBQUksQ0FDWCxxREFBcUQsRUFDckQsS0FBSyxDQUFDLElBQUksRUFDVixHQUFHLEVBQ0gsS0FBSSxFQUNKLEtBQUssQ0FBQyxHQUFHLENBQ1YsQ0FBQTthQUNGO2lCQUFNLElBQ0wsQ0FBQyxPQUFPLEtBQUssTUFBTSxJQUFJLE1BQU0sSUFBSSxRQUFRLENBQUM7Z0JBQzFDLENBQUMsT0FBTyxLQUFLLE9BQU8sSUFBSSxRQUFRLENBQUMsTUFBTSxDQUFDLEtBQUssT0FBTyxDQUFDLEVBQ3JEO2dCQUNBLElBQUksQ0FBQyxDQUFDLEtBQUssSUFBSSxRQUFRLENBQUMsSUFBSSxRQUFRLENBQUMsS0FBSyxDQUFDLEtBQUssRUFBRSxFQUFFO29CQUNsRCxRQUFRLEdBQUcsT0FBTyxLQUFLLE1BQU0sQ0FBQyxDQUFDLENBQUMsWUFBWSxDQUFDLENBQUMsQ0FBQyxtQkFBbUIsQ0FBQTtvQkFDbEUsUUFBUSxDQUFDLElBQUksQ0FDWCwwQkFBd0IsUUFBUSx3QkFBcUIsRUFDckQsS0FBSyxDQUFDLElBQUksRUFDVixHQUFHLEVBQ0gsS0FBSSxFQUNKLEtBQUssQ0FBQyxHQUFHLENBQ1YsQ0FBQTtpQkFDRjthQUNGO1FBQ0gsQ0FBQyxDQUFDLENBQUE7SUFDSixDQUFDO0NBQ00sQ0FBQSJ9 \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWx0LXJlcXVpcmUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY29yZS9ydWxlcy9hbHQtcmVxdWlyZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUVBLGtCQUFlO0lBQ2IsRUFBRSxFQUFFLGFBQWE7SUFDakIsV0FBVyxFQUNULGdJQUFnSTtJQUNsSSxJQUFJLENBQUMsTUFBTSxFQUFFLFFBQVE7UUFDbkIsTUFBTSxDQUFDLFdBQVcsQ0FBQyxVQUFVLEVBQUUsQ0FBQyxLQUFLLEVBQUUsRUFBRTtZQUN2QyxNQUFNLE9BQU8sR0FBRyxLQUFLLENBQUMsT0FBTyxDQUFDLFdBQVcsRUFBRSxDQUFBO1lBQzNDLE1BQU0sUUFBUSxHQUFHLE1BQU0sQ0FBQyxXQUFXLENBQUMsS0FBSyxDQUFDLEtBQUssQ0FBQyxDQUFBO1lBQ2hELE1BQU0sR0FBRyxHQUFHLEtBQUssQ0FBQyxHQUFHLEdBQUcsT0FBTyxDQUFDLE1BQU0sR0FBRyxDQUFDLENBQUE7WUFDMUMsSUFBSSxRQUFRLENBQUE7WUFFWixJQUFJLE9BQU8sS0FBSyxLQUFLLElBQUksQ0FBQyxDQUFDLEtBQUssSUFBSSxRQUFRLENBQUMsRUFBRTtnQkFDN0MsUUFBUSxDQUFDLElBQUksQ0FDWCxxREFBcUQsRUFDckQsS0FBSyxDQUFDLElBQUksRUFDVixHQUFHLEVBQ0gsSUFBSSxFQUNKLEtBQUssQ0FBQyxHQUFHLENBQ1YsQ0FBQTthQUNGO2lCQUFNLElBQ0wsQ0FBQyxPQUFPLEtBQUssTUFBTSxJQUFJLE1BQU0sSUFBSSxRQUFRLENBQUM7Z0JBQzFDLENBQUMsT0FBTyxLQUFLLE9BQU8sSUFBSSxRQUFRLENBQUMsTUFBTSxDQUFDLEtBQUssT0FBTyxDQUFDLEVBQ3JEO2dCQUNBLElBQUksQ0FBQyxDQUFDLEtBQUssSUFBSSxRQUFRLENBQUMsSUFBSSxRQUFRLENBQUMsS0FBSyxDQUFDLEtBQUssRUFBRSxFQUFFO29CQUNsRCxRQUFRLEdBQUcsT0FBTyxLQUFLLE1BQU0sQ0FBQyxDQUFDLENBQUMsWUFBWSxDQUFDLENBQUMsQ0FBQyxtQkFBbUIsQ0FBQTtvQkFDbEUsUUFBUSxDQUFDLElBQUksQ0FDWCx3QkFBd0IsUUFBUSxxQkFBcUIsRUFDckQsS0FBSyxDQUFDLElBQUksRUFDVixHQUFHLEVBQ0gsSUFBSSxFQUNKLEtBQUssQ0FBQyxHQUFHLENBQ1YsQ0FBQTtpQkFDRjthQUNGO1FBQ0gsQ0FBQyxDQUFDLENBQUE7SUFDSixDQUFDO0NBQ00sQ0FBQSJ9 \ No newline at end of file diff --git a/dist/core/rules/attr-lowercase.js b/dist/core/rules/attr-lowercase.js index 4bd1ca14d..c068a9b37 100644 --- a/dist/core/rules/attr-lowercase.js +++ b/dist/core/rules/attr-lowercase.js @@ -6,15 +6,15 @@ function testAgainstStringOrRegExp(value, comparison) { ? { match: value, pattern: comparison } : false; } - var firstComparisonChar = comparison[0]; - var lastComparisonChar = comparison[comparison.length - 1]; - var secondToLastComparisonChar = comparison[comparison.length - 2]; - var comparisonIsRegex = firstComparisonChar === '/' && + const firstComparisonChar = comparison[0]; + const lastComparisonChar = comparison[comparison.length - 1]; + const secondToLastComparisonChar = comparison[comparison.length - 2]; + const comparisonIsRegex = firstComparisonChar === '/' && (lastComparisonChar === '/' || (secondToLastComparisonChar === '/' && lastComparisonChar === 'i')); - var hasCaseInsensitiveFlag = comparisonIsRegex && lastComparisonChar === 'i'; + const hasCaseInsensitiveFlag = comparisonIsRegex && lastComparisonChar === 'i'; if (comparisonIsRegex) { - var valueMatches = hasCaseInsensitiveFlag + const valueMatches = hasCaseInsensitiveFlag ? new RegExp(comparison.slice(1, -2), 'i').test(value) : new RegExp(comparison.slice(1, -1)).test(value); return valueMatches; @@ -24,25 +24,21 @@ function testAgainstStringOrRegExp(value, comparison) { exports.default = { id: 'attr-lowercase', description: 'All attribute names must be in lowercase.', - init: function (parser, reporter, options) { - var _this = this; - var exceptions = Array.isArray(options) ? options : []; - parser.addListener('tagstart', function (event) { - var attrs = event.attrs; - var attr; - var col = event.col + event.tagName.length + 1; - var _loop_1 = function (i, l) { + init(parser, reporter, options) { + const exceptions = Array.isArray(options) ? options : []; + parser.addListener('tagstart', (event) => { + const attrs = event.attrs; + let attr; + const col = event.col + event.tagName.length + 1; + for (let i = 0, l = attrs.length; i < l; i++) { attr = attrs[i]; - var attrName = attr.name; - if (!exceptions.find(function (exp) { return testAgainstStringOrRegExp(attrName, exp); }) && + const attrName = attr.name; + if (!exceptions.find((exp) => testAgainstStringOrRegExp(attrName, exp)) && attrName !== attrName.toLowerCase()) { - reporter.error("The attribute name of [ " + attrName + " ] must be in lowercase.", event.line, col + attr.index, _this, attr.raw); + reporter.error(`The attribute name of [ ${attrName} ] must be in lowercase.`, event.line, col + attr.index, this, attr.raw); } - }; - for (var i = 0, l = attrs.length; i < l; i++) { - _loop_1(i, l); } }); }, }; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXR0ci1sb3dlcmNhc2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY29yZS9ydWxlcy9hdHRyLWxvd2VyY2FzZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQVFBLFNBQVMseUJBQXlCLENBQUMsS0FBYSxFQUFFLFVBQTJCO0lBRTNFLElBQUksVUFBVSxZQUFZLE1BQU0sRUFBRTtRQUNoQyxPQUFPLFVBQVUsQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDO1lBQzNCLENBQUMsQ0FBQyxFQUFFLEtBQUssRUFBRSxLQUFLLEVBQUUsT0FBTyxFQUFFLFVBQVUsRUFBRTtZQUN2QyxDQUFDLENBQUMsS0FBSyxDQUFBO0tBQ1Y7SUFHRCxJQUFNLG1CQUFtQixHQUFHLFVBQVUsQ0FBQyxDQUFDLENBQUMsQ0FBQTtJQUN6QyxJQUFNLGtCQUFrQixHQUFHLFVBQVUsQ0FBQyxVQUFVLENBQUMsTUFBTSxHQUFHLENBQUMsQ0FBQyxDQUFBO0lBQzVELElBQU0sMEJBQTBCLEdBQUcsVUFBVSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEdBQUcsQ0FBQyxDQUFDLENBQUE7SUFFcEUsSUFBTSxpQkFBaUIsR0FDckIsbUJBQW1CLEtBQUssR0FBRztRQUMzQixDQUFDLGtCQUFrQixLQUFLLEdBQUc7WUFDekIsQ0FBQywwQkFBMEIsS0FBSyxHQUFHLElBQUksa0JBQWtCLEtBQUssR0FBRyxDQUFDLENBQUMsQ0FBQTtJQUV2RSxJQUFNLHNCQUFzQixHQUFHLGlCQUFpQixJQUFJLGtCQUFrQixLQUFLLEdBQUcsQ0FBQTtJQUc5RSxJQUFJLGlCQUFpQixFQUFFO1FBQ3JCLElBQU0sWUFBWSxHQUFHLHNCQUFzQjtZQUN6QyxDQUFDLENBQUMsSUFBSSxNQUFNLENBQUMsVUFBVSxDQUFDLEtBQUssQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsRUFBRSxHQUFHLENBQUMsQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDO1lBQ3RELENBQUMsQ0FBQyxJQUFJLE1BQU0sQ0FBQyxVQUFVLENBQUMsS0FBSyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFBO1FBRW5ELE9BQU8sWUFBWSxDQUFBO0tBQ3BCO0lBR0QsT0FBTyxLQUFLLEtBQUssVUFBVSxDQUFBO0FBQzdCLENBQUM7QUFFRCxrQkFBZTtJQUNiLEVBQUUsRUFBRSxnQkFBZ0I7SUFDcEIsV0FBVyxFQUFFLDJDQUEyQztJQUN4RCxJQUFJLFlBQUMsTUFBTSxFQUFFLFFBQVEsRUFBRSxPQUFPO1FBQTlCLGlCQTBCQztRQXpCQyxJQUFNLFVBQVUsR0FBRyxLQUFLLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQTtRQUV4RCxNQUFNLENBQUMsV0FBVyxDQUFDLFVBQVUsRUFBRSxVQUFDLEtBQUs7WUFDbkMsSUFBTSxLQUFLLEdBQUcsS0FBSyxDQUFDLEtBQUssQ0FBQTtZQUN6QixJQUFJLElBQUksQ0FBQTtZQUNSLElBQU0sR0FBRyxHQUFHLEtBQUssQ0FBQyxHQUFHLEdBQUcsS0FBSyxDQUFDLE9BQU8sQ0FBQyxNQUFNLEdBQUcsQ0FBQyxDQUFBO29DQUV2QyxDQUFDLEVBQU0sQ0FBQztnQkFDZixJQUFJLEdBQUcsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFBO2dCQUNmLElBQU0sUUFBUSxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUE7Z0JBRTFCLElBQ0UsQ0FBQyxVQUFVLENBQUMsSUFBSSxDQUFDLFVBQUMsR0FBRyxJQUFLLE9BQUEseUJBQXlCLENBQUMsUUFBUSxFQUFFLEdBQUcsQ0FBQyxFQUF4QyxDQUF3QyxDQUFDO29CQUNuRSxRQUFRLEtBQUssUUFBUSxDQUFDLFdBQVcsRUFBRSxFQUNuQztvQkFDQSxRQUFRLENBQUMsS0FBSyxDQUNaLDZCQUEyQixRQUFRLDZCQUEwQixFQUM3RCxLQUFLLENBQUMsSUFBSSxFQUNWLEdBQUcsR0FBRyxJQUFJLENBQUMsS0FBSyxFQUNoQixLQUFJLEVBQ0osSUFBSSxDQUFDLEdBQUcsQ0FDVCxDQUFBO2lCQUNGOztZQWZILEtBQUssSUFBSSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsR0FBRyxLQUFLLENBQUMsTUFBTSxFQUFFLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxFQUFFO3dCQUFuQyxDQUFDLEVBQU0sQ0FBQzthQWdCaEI7UUFDSCxDQUFDLENBQUMsQ0FBQTtJQUNKLENBQUM7Q0FDTSxDQUFBIn0= \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXR0ci1sb3dlcmNhc2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY29yZS9ydWxlcy9hdHRyLWxvd2VyY2FzZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQVFBLFNBQVMseUJBQXlCLENBQUMsS0FBYSxFQUFFLFVBQTJCO0lBRTNFLElBQUksVUFBVSxZQUFZLE1BQU0sRUFBRTtRQUNoQyxPQUFPLFVBQVUsQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDO1lBQzNCLENBQUMsQ0FBQyxFQUFFLEtBQUssRUFBRSxLQUFLLEVBQUUsT0FBTyxFQUFFLFVBQVUsRUFBRTtZQUN2QyxDQUFDLENBQUMsS0FBSyxDQUFBO0tBQ1Y7SUFHRCxNQUFNLG1CQUFtQixHQUFHLFVBQVUsQ0FBQyxDQUFDLENBQUMsQ0FBQTtJQUN6QyxNQUFNLGtCQUFrQixHQUFHLFVBQVUsQ0FBQyxVQUFVLENBQUMsTUFBTSxHQUFHLENBQUMsQ0FBQyxDQUFBO0lBQzVELE1BQU0sMEJBQTBCLEdBQUcsVUFBVSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEdBQUcsQ0FBQyxDQUFDLENBQUE7SUFFcEUsTUFBTSxpQkFBaUIsR0FDckIsbUJBQW1CLEtBQUssR0FBRztRQUMzQixDQUFDLGtCQUFrQixLQUFLLEdBQUc7WUFDekIsQ0FBQywwQkFBMEIsS0FBSyxHQUFHLElBQUksa0JBQWtCLEtBQUssR0FBRyxDQUFDLENBQUMsQ0FBQTtJQUV2RSxNQUFNLHNCQUFzQixHQUFHLGlCQUFpQixJQUFJLGtCQUFrQixLQUFLLEdBQUcsQ0FBQTtJQUc5RSxJQUFJLGlCQUFpQixFQUFFO1FBQ3JCLE1BQU0sWUFBWSxHQUFHLHNCQUFzQjtZQUN6QyxDQUFDLENBQUMsSUFBSSxNQUFNLENBQUMsVUFBVSxDQUFDLEtBQUssQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsRUFBRSxHQUFHLENBQUMsQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDO1lBQ3RELENBQUMsQ0FBQyxJQUFJLE1BQU0sQ0FBQyxVQUFVLENBQUMsS0FBSyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFBO1FBRW5ELE9BQU8sWUFBWSxDQUFBO0tBQ3BCO0lBR0QsT0FBTyxLQUFLLEtBQUssVUFBVSxDQUFBO0FBQzdCLENBQUM7QUFFRCxrQkFBZTtJQUNiLEVBQUUsRUFBRSxnQkFBZ0I7SUFDcEIsV0FBVyxFQUFFLDJDQUEyQztJQUN4RCxJQUFJLENBQUMsTUFBTSxFQUFFLFFBQVEsRUFBRSxPQUFPO1FBQzVCLE1BQU0sVUFBVSxHQUFHLEtBQUssQ0FBQyxPQUFPLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFBO1FBRXhELE1BQU0sQ0FBQyxXQUFXLENBQUMsVUFBVSxFQUFFLENBQUMsS0FBSyxFQUFFLEVBQUU7WUFDdkMsTUFBTSxLQUFLLEdBQUcsS0FBSyxDQUFDLEtBQUssQ0FBQTtZQUN6QixJQUFJLElBQUksQ0FBQTtZQUNSLE1BQU0sR0FBRyxHQUFHLEtBQUssQ0FBQyxHQUFHLEdBQUcsS0FBSyxDQUFDLE9BQU8sQ0FBQyxNQUFNLEdBQUcsQ0FBQyxDQUFBO1lBRWhELEtBQUssSUFBSSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsR0FBRyxLQUFLLENBQUMsTUFBTSxFQUFFLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxFQUFFLEVBQUU7Z0JBQzVDLElBQUksR0FBRyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUE7Z0JBQ2YsTUFBTSxRQUFRLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQTtnQkFFMUIsSUFDRSxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsQ0FBQyxHQUFHLEVBQUUsRUFBRSxDQUFDLHlCQUF5QixDQUFDLFFBQVEsRUFBRSxHQUFHLENBQUMsQ0FBQztvQkFDbkUsUUFBUSxLQUFLLFFBQVEsQ0FBQyxXQUFXLEVBQUUsRUFDbkM7b0JBQ0EsUUFBUSxDQUFDLEtBQUssQ0FDWiwyQkFBMkIsUUFBUSwwQkFBMEIsRUFDN0QsS0FBSyxDQUFDLElBQUksRUFDVixHQUFHLEdBQUcsSUFBSSxDQUFDLEtBQUssRUFDaEIsSUFBSSxFQUNKLElBQUksQ0FBQyxHQUFHLENBQ1QsQ0FBQTtpQkFDRjthQUNGO1FBQ0gsQ0FBQyxDQUFDLENBQUE7SUFDSixDQUFDO0NBQ00sQ0FBQSJ9 \ No newline at end of file diff --git a/dist/core/rules/attr-no-duplication.js b/dist/core/rules/attr-no-duplication.js index f50e42fed..00c69ea63 100644 --- a/dist/core/rules/attr-no-duplication.js +++ b/dist/core/rules/attr-no-duplication.js @@ -3,23 +3,22 @@ Object.defineProperty(exports, "__esModule", { value: true }); exports.default = { id: 'attr-no-duplication', description: 'Elements cannot have duplicate attributes.', - init: function (parser, reporter) { - var _this = this; - parser.addListener('tagstart', function (event) { - var attrs = event.attrs; - var attr; - var attrName; - var col = event.col + event.tagName.length + 1; - var mapAttrName = {}; - for (var i = 0, l = attrs.length; i < l; i++) { + init(parser, reporter) { + parser.addListener('tagstart', (event) => { + const attrs = event.attrs; + let attr; + let attrName; + const col = event.col + event.tagName.length + 1; + const mapAttrName = {}; + for (let i = 0, l = attrs.length; i < l; i++) { attr = attrs[i]; attrName = attr.name; if (mapAttrName[attrName] === true) { - reporter.error("Duplicate of attribute name [ " + attr.name + " ] was found.", event.line, col + attr.index, _this, attr.raw); + reporter.error(`Duplicate of attribute name [ ${attr.name} ] was found.`, event.line, col + attr.index, this, attr.raw); } mapAttrName[attrName] = true; } }); }, }; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXR0ci1uby1kdXBsaWNhdGlvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jb3JlL3J1bGVzL2F0dHItbm8tZHVwbGljYXRpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFFQSxrQkFBZTtJQUNiLEVBQUUsRUFBRSxxQkFBcUI7SUFDekIsV0FBVyxFQUFFLDRDQUE0QztJQUN6RCxJQUFJLEVBQUosVUFBSyxNQUFNLEVBQUUsUUFBUTtRQUFyQixpQkF5QkM7UUF4QkMsTUFBTSxDQUFDLFdBQVcsQ0FBQyxVQUFVLEVBQUUsVUFBQyxLQUFLO1lBQ25DLElBQU0sS0FBSyxHQUFHLEtBQUssQ0FBQyxLQUFLLENBQUE7WUFDekIsSUFBSSxJQUFJLENBQUE7WUFDUixJQUFJLFFBQWdCLENBQUE7WUFDcEIsSUFBTSxHQUFHLEdBQUcsS0FBSyxDQUFDLEdBQUcsR0FBRyxLQUFLLENBQUMsT0FBTyxDQUFDLE1BQU0sR0FBRyxDQUFDLENBQUE7WUFFaEQsSUFBTSxXQUFXLEdBQWdDLEVBQUUsQ0FBQTtZQUVuRCxLQUFLLElBQUksQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLEdBQUcsS0FBSyxDQUFDLE1BQU0sRUFBRSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsRUFBRSxFQUFFO2dCQUM1QyxJQUFJLEdBQUcsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFBO2dCQUNmLFFBQVEsR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFBO2dCQUVwQixJQUFJLFdBQVcsQ0FBQyxRQUFRLENBQUMsS0FBSyxJQUFJLEVBQUU7b0JBQ2xDLFFBQVEsQ0FBQyxLQUFLLENBQ1osbUNBQWlDLElBQUksQ0FBQyxJQUFJLGtCQUFlLEVBQ3pELEtBQUssQ0FBQyxJQUFJLEVBQ1YsR0FBRyxHQUFHLElBQUksQ0FBQyxLQUFLLEVBQ2hCLEtBQUksRUFDSixJQUFJLENBQUMsR0FBRyxDQUNULENBQUE7aUJBQ0Y7Z0JBQ0QsV0FBVyxDQUFDLFFBQVEsQ0FBQyxHQUFHLElBQUksQ0FBQTthQUM3QjtRQUNILENBQUMsQ0FBQyxDQUFBO0lBQ0osQ0FBQztDQUNNLENBQUEifQ== \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXR0ci1uby1kdXBsaWNhdGlvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jb3JlL3J1bGVzL2F0dHItbm8tZHVwbGljYXRpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFFQSxrQkFBZTtJQUNiLEVBQUUsRUFBRSxxQkFBcUI7SUFDekIsV0FBVyxFQUFFLDRDQUE0QztJQUN6RCxJQUFJLENBQUMsTUFBTSxFQUFFLFFBQVE7UUFDbkIsTUFBTSxDQUFDLFdBQVcsQ0FBQyxVQUFVLEVBQUUsQ0FBQyxLQUFLLEVBQUUsRUFBRTtZQUN2QyxNQUFNLEtBQUssR0FBRyxLQUFLLENBQUMsS0FBSyxDQUFBO1lBQ3pCLElBQUksSUFBSSxDQUFBO1lBQ1IsSUFBSSxRQUFnQixDQUFBO1lBQ3BCLE1BQU0sR0FBRyxHQUFHLEtBQUssQ0FBQyxHQUFHLEdBQUcsS0FBSyxDQUFDLE9BQU8sQ0FBQyxNQUFNLEdBQUcsQ0FBQyxDQUFBO1lBRWhELE1BQU0sV0FBVyxHQUFnQyxFQUFFLENBQUE7WUFFbkQsS0FBSyxJQUFJLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxHQUFHLEtBQUssQ0FBQyxNQUFNLEVBQUUsQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLEVBQUUsRUFBRTtnQkFDNUMsSUFBSSxHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQTtnQkFDZixRQUFRLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQTtnQkFFcEIsSUFBSSxXQUFXLENBQUMsUUFBUSxDQUFDLEtBQUssSUFBSSxFQUFFO29CQUNsQyxRQUFRLENBQUMsS0FBSyxDQUNaLGlDQUFpQyxJQUFJLENBQUMsSUFBSSxlQUFlLEVBQ3pELEtBQUssQ0FBQyxJQUFJLEVBQ1YsR0FBRyxHQUFHLElBQUksQ0FBQyxLQUFLLEVBQ2hCLElBQUksRUFDSixJQUFJLENBQUMsR0FBRyxDQUNULENBQUE7aUJBQ0Y7Z0JBQ0QsV0FBVyxDQUFDLFFBQVEsQ0FBQyxHQUFHLElBQUksQ0FBQTthQUM3QjtRQUNILENBQUMsQ0FBQyxDQUFBO0lBQ0osQ0FBQztDQUNNLENBQUEifQ== \ No newline at end of file diff --git a/dist/core/rules/attr-no-unnecessary-whitespace.js b/dist/core/rules/attr-no-unnecessary-whitespace.js index 4ebaeab5e..c1ac4808f 100644 --- a/dist/core/rules/attr-no-unnecessary-whitespace.js +++ b/dist/core/rules/attr-no-unnecessary-whitespace.js @@ -3,21 +3,20 @@ Object.defineProperty(exports, "__esModule", { value: true }); exports.default = { id: 'attr-no-unnecessary-whitespace', description: 'No spaces between attribute names and values.', - init: function (parser, reporter, options) { - var _this = this; - var exceptions = Array.isArray(options) ? options : []; - parser.addListener('tagstart', function (event) { - var attrs = event.attrs; - var col = event.col + event.tagName.length + 1; - for (var i = 0; i < attrs.length; i++) { + init(parser, reporter, options) { + const exceptions = Array.isArray(options) ? options : []; + parser.addListener('tagstart', (event) => { + const attrs = event.attrs; + const col = event.col + event.tagName.length + 1; + for (let i = 0; i < attrs.length; i++) { if (exceptions.indexOf(attrs[i].name) === -1) { - var match = /(\s*)=(\s*)/.exec(attrs[i].raw.trim()); + const match = /(\s*)=(\s*)/.exec(attrs[i].raw.trim()); if (match && (match[1].length !== 0 || match[2].length !== 0)) { - reporter.error("The attribute '" + attrs[i].name + "' must not have spaces between the name and value.", event.line, col + attrs[i].index, _this, attrs[i].raw); + reporter.error(`The attribute '${attrs[i].name}' must not have spaces between the name and value.`, event.line, col + attrs[i].index, this, attrs[i].raw); } } } }); }, }; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXR0ci1uby11bm5lY2Vzc2FyeS13aGl0ZXNwYWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NvcmUvcnVsZXMvYXR0ci1uby11bm5lY2Vzc2FyeS13aGl0ZXNwYWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBRUEsa0JBQWU7SUFDYixFQUFFLEVBQUUsZ0NBQWdDO0lBQ3BDLFdBQVcsRUFBRSwrQ0FBK0M7SUFDNUQsSUFBSSxFQUFKLFVBQUssTUFBTSxFQUFFLFFBQVEsRUFBRSxPQUFPO1FBQTlCLGlCQXNCQztRQXJCQyxJQUFNLFVBQVUsR0FBYSxLQUFLLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQTtRQUVsRSxNQUFNLENBQUMsV0FBVyxDQUFDLFVBQVUsRUFBRSxVQUFDLEtBQUs7WUFDbkMsSUFBTSxLQUFLLEdBQUcsS0FBSyxDQUFDLEtBQUssQ0FBQTtZQUN6QixJQUFNLEdBQUcsR0FBRyxLQUFLLENBQUMsR0FBRyxHQUFHLEtBQUssQ0FBQyxPQUFPLENBQUMsTUFBTSxHQUFHLENBQUMsQ0FBQTtZQUVoRCxLQUFLLElBQUksQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLEdBQUcsS0FBSyxDQUFDLE1BQU0sRUFBRSxDQUFDLEVBQUUsRUFBRTtnQkFDckMsSUFBSSxVQUFVLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUMsRUFBRTtvQkFDNUMsSUFBTSxLQUFLLEdBQUcsYUFBYSxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsR0FBRyxDQUFDLElBQUksRUFBRSxDQUFDLENBQUE7b0JBQ3JELElBQUksS0FBSyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLE1BQU0sS0FBSyxDQUFDLElBQUksS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLE1BQU0sS0FBSyxDQUFDLENBQUMsRUFBRTt3QkFDN0QsUUFBUSxDQUFDLEtBQUssQ0FDWixvQkFBa0IsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksdURBQW9ELEVBQ25GLEtBQUssQ0FBQyxJQUFJLEVBQ1YsR0FBRyxHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLEVBQ3BCLEtBQUksRUFDSixLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsR0FBRyxDQUNiLENBQUE7cUJBQ0Y7aUJBQ0Y7YUFDRjtRQUNILENBQUMsQ0FBQyxDQUFBO0lBQ0osQ0FBQztDQUNNLENBQUEifQ== \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXR0ci1uby11bm5lY2Vzc2FyeS13aGl0ZXNwYWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NvcmUvcnVsZXMvYXR0ci1uby11bm5lY2Vzc2FyeS13aGl0ZXNwYWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBRUEsa0JBQWU7SUFDYixFQUFFLEVBQUUsZ0NBQWdDO0lBQ3BDLFdBQVcsRUFBRSwrQ0FBK0M7SUFDNUQsSUFBSSxDQUFDLE1BQU0sRUFBRSxRQUFRLEVBQUUsT0FBTztRQUM1QixNQUFNLFVBQVUsR0FBYSxLQUFLLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQTtRQUVsRSxNQUFNLENBQUMsV0FBVyxDQUFDLFVBQVUsRUFBRSxDQUFDLEtBQUssRUFBRSxFQUFFO1lBQ3ZDLE1BQU0sS0FBSyxHQUFHLEtBQUssQ0FBQyxLQUFLLENBQUE7WUFDekIsTUFBTSxHQUFHLEdBQUcsS0FBSyxDQUFDLEdBQUcsR0FBRyxLQUFLLENBQUMsT0FBTyxDQUFDLE1BQU0sR0FBRyxDQUFDLENBQUE7WUFFaEQsS0FBSyxJQUFJLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxHQUFHLEtBQUssQ0FBQyxNQUFNLEVBQUUsQ0FBQyxFQUFFLEVBQUU7Z0JBQ3JDLElBQUksVUFBVSxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDLEVBQUU7b0JBQzVDLE1BQU0sS0FBSyxHQUFHLGFBQWEsQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxJQUFJLEVBQUUsQ0FBQyxDQUFBO29CQUNyRCxJQUFJLEtBQUssSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxNQUFNLEtBQUssQ0FBQyxJQUFJLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxNQUFNLEtBQUssQ0FBQyxDQUFDLEVBQUU7d0JBQzdELFFBQVEsQ0FBQyxLQUFLLENBQ1osa0JBQWtCLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxJQUFJLG9EQUFvRCxFQUNuRixLQUFLLENBQUMsSUFBSSxFQUNWLEdBQUcsR0FBRyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsS0FBSyxFQUNwQixJQUFJLEVBQ0osS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FDYixDQUFBO3FCQUNGO2lCQUNGO2FBQ0Y7UUFDSCxDQUFDLENBQUMsQ0FBQTtJQUNKLENBQUM7Q0FDTSxDQUFBIn0= \ No newline at end of file diff --git a/dist/core/rules/attr-sorted.js b/dist/core/rules/attr-sorted.js index 8586806e2..074c26b21 100644 --- a/dist/core/rules/attr-sorted.js +++ b/dist/core/rules/attr-sorted.js @@ -3,10 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true }); exports.default = { id: 'attr-sorted', description: 'Attribute tags must be in proper order.', - init: function (parser, reporter) { - var _this = this; - var orderMap = {}; - var sortOrder = [ + init(parser, reporter) { + const orderMap = {}; + const sortOrder = [ 'class', 'id', 'name', @@ -19,17 +18,17 @@ exports.default = { 'alt', 'role', ]; - for (var i = 0; i < sortOrder.length; i++) { + for (let i = 0; i < sortOrder.length; i++) { orderMap[sortOrder[i]] = i; } - parser.addListener('tagstart', function (event) { - var attrs = event.attrs; - var listOfAttributes = []; - for (var i = 0; i < attrs.length; i++) { + parser.addListener('tagstart', (event) => { + const attrs = event.attrs; + const listOfAttributes = []; + for (let i = 0; i < attrs.length; i++) { listOfAttributes.push(attrs[i].name); } - var originalAttrs = JSON.stringify(listOfAttributes); - listOfAttributes.sort(function (a, b) { + const originalAttrs = JSON.stringify(listOfAttributes); + listOfAttributes.sort((a, b) => { if (orderMap[a] == undefined && orderMap[b] == undefined) { return 0; } @@ -42,9 +41,9 @@ exports.default = { return orderMap[a] - orderMap[b] || a.localeCompare(b); }); if (originalAttrs !== JSON.stringify(listOfAttributes)) { - reporter.error("Inaccurate order " + originalAttrs + " should be in hierarchy " + JSON.stringify(listOfAttributes) + " ", event.line, event.col, _this, event.raw); + reporter.error(`Inaccurate order ${originalAttrs} should be in hierarchy ${JSON.stringify(listOfAttributes)} `, event.line, event.col, this, event.raw); } }); }, }; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXR0ci1zb3J0ZWQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY29yZS9ydWxlcy9hdHRyLXNvcnRlZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUVBLGtCQUFlO0lBQ2IsRUFBRSxFQUFFLGFBQWE7SUFDakIsV0FBVyxFQUFFLHlDQUF5QztJQUN0RCxJQUFJLEVBQUosVUFBSyxNQUFNLEVBQUUsUUFBUTtRQUFyQixpQkFxREM7UUFwREMsSUFBTSxRQUFRLEdBQThCLEVBQUUsQ0FBQTtRQUM5QyxJQUFNLFNBQVMsR0FBRztZQUNoQixPQUFPO1lBQ1AsSUFBSTtZQUNKLE1BQU07WUFDTixLQUFLO1lBQ0wsS0FBSztZQUNMLE1BQU07WUFDTixNQUFNO1lBQ04sT0FBTztZQUNQLE9BQU87WUFDUCxLQUFLO1lBQ0wsTUFBTTtTQUNQLENBQUE7UUFFRCxLQUFLLElBQUksQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLEdBQUcsU0FBUyxDQUFDLE1BQU0sRUFBRSxDQUFDLEVBQUUsRUFBRTtZQUN6QyxRQUFRLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFBO1NBQzNCO1FBRUQsTUFBTSxDQUFDLFdBQVcsQ0FBQyxVQUFVLEVBQUUsVUFBQyxLQUFLO1lBQ25DLElBQU0sS0FBSyxHQUFHLEtBQUssQ0FBQyxLQUFLLENBQUE7WUFDekIsSUFBTSxnQkFBZ0IsR0FBRyxFQUFFLENBQUE7WUFFM0IsS0FBSyxJQUFJLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxHQUFHLEtBQUssQ0FBQyxNQUFNLEVBQUUsQ0FBQyxFQUFFLEVBQUU7Z0JBQ3JDLGdCQUFnQixDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLENBQUE7YUFDckM7WUFFRCxJQUFNLGFBQWEsR0FBRyxJQUFJLENBQUMsU0FBUyxDQUFDLGdCQUFnQixDQUFDLENBQUE7WUFDdEQsZ0JBQWdCLENBQUMsSUFBSSxDQUFDLFVBQUMsQ0FBQyxFQUFFLENBQUM7Z0JBQ3pCLElBQUksUUFBUSxDQUFDLENBQUMsQ0FBQyxJQUFJLFNBQVMsSUFBSSxRQUFRLENBQUMsQ0FBQyxDQUFDLElBQUksU0FBUyxFQUFFO29CQUN4RCxPQUFPLENBQUMsQ0FBQTtpQkFDVDtnQkFDRCxJQUFJLFFBQVEsQ0FBQyxDQUFDLENBQUMsSUFBSSxTQUFTLEVBQUU7b0JBQzVCLE9BQU8sQ0FBQyxDQUFBO2lCQUNUO3FCQUFNLElBQUksUUFBUSxDQUFDLENBQUMsQ0FBQyxJQUFJLFNBQVMsRUFBRTtvQkFDbkMsT0FBTyxDQUFDLENBQUMsQ0FBQTtpQkFDVjtnQkFDRCxPQUFPLFFBQVEsQ0FBQyxDQUFDLENBQUMsR0FBRyxRQUFRLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDLGFBQWEsQ0FBQyxDQUFDLENBQUMsQ0FBQTtZQUN4RCxDQUFDLENBQUMsQ0FBQTtZQUVGLElBQUksYUFBYSxLQUFLLElBQUksQ0FBQyxTQUFTLENBQUMsZ0JBQWdCLENBQUMsRUFBRTtnQkFDdEQsUUFBUSxDQUFDLEtBQUssQ0FDWixzQkFBb0IsYUFBYSxnQ0FBMkIsSUFBSSxDQUFDLFNBQVMsQ0FDeEUsZ0JBQWdCLENBQ2pCLE1BQUcsRUFDSixLQUFLLENBQUMsSUFBSSxFQUNWLEtBQUssQ0FBQyxHQUFHLEVBQ1QsS0FBSSxFQUNKLEtBQUssQ0FBQyxHQUFHLENBQ1YsQ0FBQTthQUNGO1FBQ0gsQ0FBQyxDQUFDLENBQUE7SUFDSixDQUFDO0NBQ00sQ0FBQSJ9 \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXR0ci1zb3J0ZWQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY29yZS9ydWxlcy9hdHRyLXNvcnRlZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUVBLGtCQUFlO0lBQ2IsRUFBRSxFQUFFLGFBQWE7SUFDakIsV0FBVyxFQUFFLHlDQUF5QztJQUN0RCxJQUFJLENBQUMsTUFBTSxFQUFFLFFBQVE7UUFDbkIsTUFBTSxRQUFRLEdBQThCLEVBQUUsQ0FBQTtRQUM5QyxNQUFNLFNBQVMsR0FBRztZQUNoQixPQUFPO1lBQ1AsSUFBSTtZQUNKLE1BQU07WUFDTixLQUFLO1lBQ0wsS0FBSztZQUNMLE1BQU07WUFDTixNQUFNO1lBQ04sT0FBTztZQUNQLE9BQU87WUFDUCxLQUFLO1lBQ0wsTUFBTTtTQUNQLENBQUE7UUFFRCxLQUFLLElBQUksQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLEdBQUcsU0FBUyxDQUFDLE1BQU0sRUFBRSxDQUFDLEVBQUUsRUFBRTtZQUN6QyxRQUFRLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFBO1NBQzNCO1FBRUQsTUFBTSxDQUFDLFdBQVcsQ0FBQyxVQUFVLEVBQUUsQ0FBQyxLQUFLLEVBQUUsRUFBRTtZQUN2QyxNQUFNLEtBQUssR0FBRyxLQUFLLENBQUMsS0FBSyxDQUFBO1lBQ3pCLE1BQU0sZ0JBQWdCLEdBQUcsRUFBRSxDQUFBO1lBRTNCLEtBQUssSUFBSSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsR0FBRyxLQUFLLENBQUMsTUFBTSxFQUFFLENBQUMsRUFBRSxFQUFFO2dCQUNyQyxnQkFBZ0IsQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFBO2FBQ3JDO1lBRUQsTUFBTSxhQUFhLEdBQUcsSUFBSSxDQUFDLFNBQVMsQ0FBQyxnQkFBZ0IsQ0FBQyxDQUFBO1lBQ3RELGdCQUFnQixDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLEVBQUUsRUFBRTtnQkFDN0IsSUFBSSxRQUFRLENBQUMsQ0FBQyxDQUFDLElBQUksU0FBUyxJQUFJLFFBQVEsQ0FBQyxDQUFDLENBQUMsSUFBSSxTQUFTLEVBQUU7b0JBQ3hELE9BQU8sQ0FBQyxDQUFBO2lCQUNUO2dCQUNELElBQUksUUFBUSxDQUFDLENBQUMsQ0FBQyxJQUFJLFNBQVMsRUFBRTtvQkFDNUIsT0FBTyxDQUFDLENBQUE7aUJBQ1Q7cUJBQU0sSUFBSSxRQUFRLENBQUMsQ0FBQyxDQUFDLElBQUksU0FBUyxFQUFFO29CQUNuQyxPQUFPLENBQUMsQ0FBQyxDQUFBO2lCQUNWO2dCQUNELE9BQU8sUUFBUSxDQUFDLENBQUMsQ0FBQyxHQUFHLFFBQVEsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLENBQUMsYUFBYSxDQUFDLENBQUMsQ0FBQyxDQUFBO1lBQ3hELENBQUMsQ0FBQyxDQUFBO1lBRUYsSUFBSSxhQUFhLEtBQUssSUFBSSxDQUFDLFNBQVMsQ0FBQyxnQkFBZ0IsQ0FBQyxFQUFFO2dCQUN0RCxRQUFRLENBQUMsS0FBSyxDQUNaLG9CQUFvQixhQUFhLDJCQUEyQixJQUFJLENBQUMsU0FBUyxDQUN4RSxnQkFBZ0IsQ0FDakIsR0FBRyxFQUNKLEtBQUssQ0FBQyxJQUFJLEVBQ1YsS0FBSyxDQUFDLEdBQUcsRUFDVCxJQUFJLEVBQ0osS0FBSyxDQUFDLEdBQUcsQ0FDVixDQUFBO2FBQ0Y7UUFDSCxDQUFDLENBQUMsQ0FBQTtJQUNKLENBQUM7Q0FDTSxDQUFBIn0= \ No newline at end of file diff --git a/dist/core/rules/attr-unsafe-chars.js b/dist/core/rules/attr-unsafe-chars.js index 1b5d1c89b..33b061878 100644 --- a/dist/core/rules/attr-unsafe-chars.js +++ b/dist/core/rules/attr-unsafe-chars.js @@ -3,25 +3,24 @@ Object.defineProperty(exports, "__esModule", { value: true }); exports.default = { id: 'attr-unsafe-chars', description: 'Attribute values cannot contain unsafe chars.', - init: function (parser, reporter) { - var _this = this; - parser.addListener('tagstart', function (event) { - var attrs = event.attrs; - var attr; - var col = event.col + event.tagName.length + 1; - var regUnsafe = /[\u0000-\u0008\u000b\u000c\u000e-\u001f\u007f-\u009f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/; - var match; - for (var i = 0, l = attrs.length; i < l; i++) { + init(parser, reporter) { + parser.addListener('tagstart', (event) => { + const attrs = event.attrs; + let attr; + const col = event.col + event.tagName.length + 1; + const regUnsafe = /[\u0000-\u0008\u000b\u000c\u000e-\u001f\u007f-\u009f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/; + let match; + for (let i = 0, l = attrs.length; i < l; i++) { attr = attrs[i]; match = regUnsafe.exec(attr.value); if (match !== null) { - var unsafeCode = escape(match[0]) + const unsafeCode = escape(match[0]) .replace(/%u/, '\\u') .replace(/%/, '\\x'); - reporter.warn("The value of attribute [ " + attr.name + " ] cannot contain an unsafe char [ " + unsafeCode + " ].", event.line, col + attr.index, _this, attr.raw); + reporter.warn(`The value of attribute [ ${attr.name} ] cannot contain an unsafe char [ ${unsafeCode} ].`, event.line, col + attr.index, this, attr.raw); } } }); }, }; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXR0ci11bnNhZmUtY2hhcnMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY29yZS9ydWxlcy9hdHRyLXVuc2FmZS1jaGFycy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUVBLGtCQUFlO0lBQ2IsRUFBRSxFQUFFLG1CQUFtQjtJQUN2QixXQUFXLEVBQUUsK0NBQStDO0lBQzVELElBQUksWUFBQyxNQUFNLEVBQUUsUUFBUTtRQUFyQixpQkE2QkM7UUE1QkMsTUFBTSxDQUFDLFdBQVcsQ0FBQyxVQUFVLEVBQUUsVUFBQyxLQUFLO1lBQ25DLElBQU0sS0FBSyxHQUFHLEtBQUssQ0FBQyxLQUFLLENBQUE7WUFDekIsSUFBSSxJQUFJLENBQUE7WUFDUixJQUFNLEdBQUcsR0FBRyxLQUFLLENBQUMsR0FBRyxHQUFHLEtBQUssQ0FBQyxPQUFPLENBQUMsTUFBTSxHQUFHLENBQUMsQ0FBQTtZQUVoRCxJQUFNLFNBQVMsR0FFYixzSkFBc0osQ0FBQTtZQUN4SixJQUFJLEtBQUssQ0FBQTtZQUVULEtBQUssSUFBSSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsR0FBRyxLQUFLLENBQUMsTUFBTSxFQUFFLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxFQUFFLEVBQUU7Z0JBQzVDLElBQUksR0FBRyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUE7Z0JBQ2YsS0FBSyxHQUFHLFNBQVMsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFBO2dCQUVsQyxJQUFJLEtBQUssS0FBSyxJQUFJLEVBQUU7b0JBQ2xCLElBQU0sVUFBVSxHQUFHLE1BQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUM7eUJBQ2hDLE9BQU8sQ0FBQyxJQUFJLEVBQUUsS0FBSyxDQUFDO3lCQUNwQixPQUFPLENBQUMsR0FBRyxFQUFFLEtBQUssQ0FBQyxDQUFBO29CQUN0QixRQUFRLENBQUMsSUFBSSxDQUNYLDhCQUE0QixJQUFJLENBQUMsSUFBSSwyQ0FBc0MsVUFBVSxRQUFLLEVBQzFGLEtBQUssQ0FBQyxJQUFJLEVBQ1YsR0FBRyxHQUFHLElBQUksQ0FBQyxLQUFLLEVBQ2hCLEtBQUksRUFDSixJQUFJLENBQUMsR0FBRyxDQUNULENBQUE7aUJBQ0Y7YUFDRjtRQUNILENBQUMsQ0FBQyxDQUFBO0lBQ0osQ0FBQztDQUNNLENBQUEifQ== \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXR0ci11bnNhZmUtY2hhcnMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY29yZS9ydWxlcy9hdHRyLXVuc2FmZS1jaGFycy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUVBLGtCQUFlO0lBQ2IsRUFBRSxFQUFFLG1CQUFtQjtJQUN2QixXQUFXLEVBQUUsK0NBQStDO0lBQzVELElBQUksQ0FBQyxNQUFNLEVBQUUsUUFBUTtRQUNuQixNQUFNLENBQUMsV0FBVyxDQUFDLFVBQVUsRUFBRSxDQUFDLEtBQUssRUFBRSxFQUFFO1lBQ3ZDLE1BQU0sS0FBSyxHQUFHLEtBQUssQ0FBQyxLQUFLLENBQUE7WUFDekIsSUFBSSxJQUFJLENBQUE7WUFDUixNQUFNLEdBQUcsR0FBRyxLQUFLLENBQUMsR0FBRyxHQUFHLEtBQUssQ0FBQyxPQUFPLENBQUMsTUFBTSxHQUFHLENBQUMsQ0FBQTtZQUVoRCxNQUFNLFNBQVMsR0FFYixzSkFBc0osQ0FBQTtZQUN4SixJQUFJLEtBQUssQ0FBQTtZQUVULEtBQUssSUFBSSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsR0FBRyxLQUFLLENBQUMsTUFBTSxFQUFFLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxFQUFFLEVBQUU7Z0JBQzVDLElBQUksR0FBRyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUE7Z0JBQ2YsS0FBSyxHQUFHLFNBQVMsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFBO2dCQUVsQyxJQUFJLEtBQUssS0FBSyxJQUFJLEVBQUU7b0JBQ2xCLE1BQU0sVUFBVSxHQUFHLE1BQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUM7eUJBQ2hDLE9BQU8sQ0FBQyxJQUFJLEVBQUUsS0FBSyxDQUFDO3lCQUNwQixPQUFPLENBQUMsR0FBRyxFQUFFLEtBQUssQ0FBQyxDQUFBO29CQUN0QixRQUFRLENBQUMsSUFBSSxDQUNYLDRCQUE0QixJQUFJLENBQUMsSUFBSSxzQ0FBc0MsVUFBVSxLQUFLLEVBQzFGLEtBQUssQ0FBQyxJQUFJLEVBQ1YsR0FBRyxHQUFHLElBQUksQ0FBQyxLQUFLLEVBQ2hCLElBQUksRUFDSixJQUFJLENBQUMsR0FBRyxDQUNULENBQUE7aUJBQ0Y7YUFDRjtRQUNILENBQUMsQ0FBQyxDQUFBO0lBQ0osQ0FBQztDQUNNLENBQUEifQ== \ No newline at end of file diff --git a/dist/core/rules/attr-value-double-quotes.js b/dist/core/rules/attr-value-double-quotes.js index 9f602b092..aaefe73d4 100644 --- a/dist/core/rules/attr-value-double-quotes.js +++ b/dist/core/rules/attr-value-double-quotes.js @@ -3,20 +3,19 @@ Object.defineProperty(exports, "__esModule", { value: true }); exports.default = { id: 'attr-value-double-quotes', description: 'Attribute values must be in double quotes.', - init: function (parser, reporter) { - var _this = this; - parser.addListener('tagstart', function (event) { - var attrs = event.attrs; - var attr; - var col = event.col + event.tagName.length + 1; - for (var i = 0, l = attrs.length; i < l; i++) { + init(parser, reporter) { + parser.addListener('tagstart', (event) => { + const attrs = event.attrs; + let attr; + const col = event.col + event.tagName.length + 1; + for (let i = 0, l = attrs.length; i < l; i++) { attr = attrs[i]; if ((attr.value !== '' && attr.quote !== '"') || (attr.value === '' && attr.quote === "'")) { - reporter.error("The value of attribute [ " + attr.name + " ] must be in double quotes.", event.line, col + attr.index, _this, attr.raw); + reporter.error(`The value of attribute [ ${attr.name} ] must be in double quotes.`, event.line, col + attr.index, this, attr.raw); } } }); }, }; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXR0ci12YWx1ZS1kb3VibGUtcXVvdGVzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NvcmUvcnVsZXMvYXR0ci12YWx1ZS1kb3VibGUtcXVvdGVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBRUEsa0JBQWU7SUFDYixFQUFFLEVBQUUsMEJBQTBCO0lBQzlCLFdBQVcsRUFBRSw0Q0FBNEM7SUFDekQsSUFBSSxZQUFDLE1BQU0sRUFBRSxRQUFRO1FBQXJCLGlCQXVCQztRQXRCQyxNQUFNLENBQUMsV0FBVyxDQUFDLFVBQVUsRUFBRSxVQUFDLEtBQUs7WUFDbkMsSUFBTSxLQUFLLEdBQUcsS0FBSyxDQUFDLEtBQUssQ0FBQTtZQUN6QixJQUFJLElBQUksQ0FBQTtZQUNSLElBQU0sR0FBRyxHQUFHLEtBQUssQ0FBQyxHQUFHLEdBQUcsS0FBSyxDQUFDLE9BQU8sQ0FBQyxNQUFNLEdBQUcsQ0FBQyxDQUFBO1lBRWhELEtBQUssSUFBSSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsR0FBRyxLQUFLLENBQUMsTUFBTSxFQUFFLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxFQUFFLEVBQUU7Z0JBQzVDLElBQUksR0FBRyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUE7Z0JBRWYsSUFDRSxDQUFDLElBQUksQ0FBQyxLQUFLLEtBQUssRUFBRSxJQUFJLElBQUksQ0FBQyxLQUFLLEtBQUssR0FBRyxDQUFDO29CQUN6QyxDQUFDLElBQUksQ0FBQyxLQUFLLEtBQUssRUFBRSxJQUFJLElBQUksQ0FBQyxLQUFLLEtBQUssR0FBRyxDQUFDLEVBQ3pDO29CQUNBLFFBQVEsQ0FBQyxLQUFLLENBQ1osOEJBQTRCLElBQUksQ0FBQyxJQUFJLGlDQUE4QixFQUNuRSxLQUFLLENBQUMsSUFBSSxFQUNWLEdBQUcsR0FBRyxJQUFJLENBQUMsS0FBSyxFQUNoQixLQUFJLEVBQ0osSUFBSSxDQUFDLEdBQUcsQ0FDVCxDQUFBO2lCQUNGO2FBQ0Y7UUFDSCxDQUFDLENBQUMsQ0FBQTtJQUNKLENBQUM7Q0FDTSxDQUFBIn0= \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXR0ci12YWx1ZS1kb3VibGUtcXVvdGVzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NvcmUvcnVsZXMvYXR0ci12YWx1ZS1kb3VibGUtcXVvdGVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBRUEsa0JBQWU7SUFDYixFQUFFLEVBQUUsMEJBQTBCO0lBQzlCLFdBQVcsRUFBRSw0Q0FBNEM7SUFDekQsSUFBSSxDQUFDLE1BQU0sRUFBRSxRQUFRO1FBQ25CLE1BQU0sQ0FBQyxXQUFXLENBQUMsVUFBVSxFQUFFLENBQUMsS0FBSyxFQUFFLEVBQUU7WUFDdkMsTUFBTSxLQUFLLEdBQUcsS0FBSyxDQUFDLEtBQUssQ0FBQTtZQUN6QixJQUFJLElBQUksQ0FBQTtZQUNSLE1BQU0sR0FBRyxHQUFHLEtBQUssQ0FBQyxHQUFHLEdBQUcsS0FBSyxDQUFDLE9BQU8sQ0FBQyxNQUFNLEdBQUcsQ0FBQyxDQUFBO1lBRWhELEtBQUssSUFBSSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsR0FBRyxLQUFLLENBQUMsTUFBTSxFQUFFLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxFQUFFLEVBQUU7Z0JBQzVDLElBQUksR0FBRyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUE7Z0JBRWYsSUFDRSxDQUFDLElBQUksQ0FBQyxLQUFLLEtBQUssRUFBRSxJQUFJLElBQUksQ0FBQyxLQUFLLEtBQUssR0FBRyxDQUFDO29CQUN6QyxDQUFDLElBQUksQ0FBQyxLQUFLLEtBQUssRUFBRSxJQUFJLElBQUksQ0FBQyxLQUFLLEtBQUssR0FBRyxDQUFDLEVBQ3pDO29CQUNBLFFBQVEsQ0FBQyxLQUFLLENBQ1osNEJBQTRCLElBQUksQ0FBQyxJQUFJLDhCQUE4QixFQUNuRSxLQUFLLENBQUMsSUFBSSxFQUNWLEdBQUcsR0FBRyxJQUFJLENBQUMsS0FBSyxFQUNoQixJQUFJLEVBQ0osSUFBSSxDQUFDLEdBQUcsQ0FDVCxDQUFBO2lCQUNGO2FBQ0Y7UUFDSCxDQUFDLENBQUMsQ0FBQTtJQUNKLENBQUM7Q0FDTSxDQUFBIn0= \ No newline at end of file diff --git a/dist/core/rules/attr-value-not-empty.js b/dist/core/rules/attr-value-not-empty.js index d4d69596d..8202249e2 100644 --- a/dist/core/rules/attr-value-not-empty.js +++ b/dist/core/rules/attr-value-not-empty.js @@ -3,19 +3,18 @@ Object.defineProperty(exports, "__esModule", { value: true }); exports.default = { id: 'attr-value-not-empty', description: 'All attributes must have values.', - init: function (parser, reporter) { - var _this = this; - parser.addListener('tagstart', function (event) { - var attrs = event.attrs; - var attr; - var col = event.col + event.tagName.length + 1; - for (var i = 0, l = attrs.length; i < l; i++) { + init(parser, reporter) { + parser.addListener('tagstart', (event) => { + const attrs = event.attrs; + let attr; + const col = event.col + event.tagName.length + 1; + for (let i = 0, l = attrs.length; i < l; i++) { attr = attrs[i]; if (attr.quote === '' && attr.value === '') { - reporter.warn("The attribute [ " + attr.name + " ] must have a value.", event.line, col + attr.index, _this, attr.raw); + reporter.warn(`The attribute [ ${attr.name} ] must have a value.`, event.line, col + attr.index, this, attr.raw); } } }); }, }; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXR0ci12YWx1ZS1ub3QtZW1wdHkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY29yZS9ydWxlcy9hdHRyLXZhbHVlLW5vdC1lbXB0eS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUVBLGtCQUFlO0lBQ2IsRUFBRSxFQUFFLHNCQUFzQjtJQUMxQixXQUFXLEVBQUUsa0NBQWtDO0lBQy9DLElBQUksWUFBQyxNQUFNLEVBQUUsUUFBUTtRQUFyQixpQkFvQkM7UUFuQkMsTUFBTSxDQUFDLFdBQVcsQ0FBQyxVQUFVLEVBQUUsVUFBQyxLQUFLO1lBQ25DLElBQU0sS0FBSyxHQUFHLEtBQUssQ0FBQyxLQUFLLENBQUE7WUFDekIsSUFBSSxJQUFJLENBQUE7WUFDUixJQUFNLEdBQUcsR0FBRyxLQUFLLENBQUMsR0FBRyxHQUFHLEtBQUssQ0FBQyxPQUFPLENBQUMsTUFBTSxHQUFHLENBQUMsQ0FBQTtZQUVoRCxLQUFLLElBQUksQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLEdBQUcsS0FBSyxDQUFDLE1BQU0sRUFBRSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsRUFBRSxFQUFFO2dCQUM1QyxJQUFJLEdBQUcsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFBO2dCQUVmLElBQUksSUFBSSxDQUFDLEtBQUssS0FBSyxFQUFFLElBQUksSUFBSSxDQUFDLEtBQUssS0FBSyxFQUFFLEVBQUU7b0JBQzFDLFFBQVEsQ0FBQyxJQUFJLENBQ1gscUJBQW1CLElBQUksQ0FBQyxJQUFJLDBCQUF1QixFQUNuRCxLQUFLLENBQUMsSUFBSSxFQUNWLEdBQUcsR0FBRyxJQUFJLENBQUMsS0FBSyxFQUNoQixLQUFJLEVBQ0osSUFBSSxDQUFDLEdBQUcsQ0FDVCxDQUFBO2lCQUNGO2FBQ0Y7UUFDSCxDQUFDLENBQUMsQ0FBQTtJQUNKLENBQUM7Q0FDTSxDQUFBIn0= \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXR0ci12YWx1ZS1ub3QtZW1wdHkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY29yZS9ydWxlcy9hdHRyLXZhbHVlLW5vdC1lbXB0eS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUVBLGtCQUFlO0lBQ2IsRUFBRSxFQUFFLHNCQUFzQjtJQUMxQixXQUFXLEVBQUUsa0NBQWtDO0lBQy9DLElBQUksQ0FBQyxNQUFNLEVBQUUsUUFBUTtRQUNuQixNQUFNLENBQUMsV0FBVyxDQUFDLFVBQVUsRUFBRSxDQUFDLEtBQUssRUFBRSxFQUFFO1lBQ3ZDLE1BQU0sS0FBSyxHQUFHLEtBQUssQ0FBQyxLQUFLLENBQUE7WUFDekIsSUFBSSxJQUFJLENBQUE7WUFDUixNQUFNLEdBQUcsR0FBRyxLQUFLLENBQUMsR0FBRyxHQUFHLEtBQUssQ0FBQyxPQUFPLENBQUMsTUFBTSxHQUFHLENBQUMsQ0FBQTtZQUVoRCxLQUFLLElBQUksQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLEdBQUcsS0FBSyxDQUFDLE1BQU0sRUFBRSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsRUFBRSxFQUFFO2dCQUM1QyxJQUFJLEdBQUcsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFBO2dCQUVmLElBQUksSUFBSSxDQUFDLEtBQUssS0FBSyxFQUFFLElBQUksSUFBSSxDQUFDLEtBQUssS0FBSyxFQUFFLEVBQUU7b0JBQzFDLFFBQVEsQ0FBQyxJQUFJLENBQ1gsbUJBQW1CLElBQUksQ0FBQyxJQUFJLHVCQUF1QixFQUNuRCxLQUFLLENBQUMsSUFBSSxFQUNWLEdBQUcsR0FBRyxJQUFJLENBQUMsS0FBSyxFQUNoQixJQUFJLEVBQ0osSUFBSSxDQUFDLEdBQUcsQ0FDVCxDQUFBO2lCQUNGO2FBQ0Y7UUFDSCxDQUFDLENBQUMsQ0FBQTtJQUNKLENBQUM7Q0FDTSxDQUFBIn0= \ No newline at end of file diff --git a/dist/core/rules/attr-value-single-quotes.js b/dist/core/rules/attr-value-single-quotes.js index af20b93a4..09b6b0853 100644 --- a/dist/core/rules/attr-value-single-quotes.js +++ b/dist/core/rules/attr-value-single-quotes.js @@ -3,20 +3,19 @@ Object.defineProperty(exports, "__esModule", { value: true }); exports.default = { id: 'attr-value-single-quotes', description: 'Attribute values must be in single quotes.', - init: function (parser, reporter) { - var _this = this; - parser.addListener('tagstart', function (event) { - var attrs = event.attrs; - var attr; - var col = event.col + event.tagName.length + 1; - for (var i = 0, l = attrs.length; i < l; i++) { + init(parser, reporter) { + parser.addListener('tagstart', (event) => { + const attrs = event.attrs; + let attr; + const col = event.col + event.tagName.length + 1; + for (let i = 0, l = attrs.length; i < l; i++) { attr = attrs[i]; if ((attr.value !== '' && attr.quote !== "'") || (attr.value === '' && attr.quote === '"')) { - reporter.error("The value of attribute [ " + attr.name + " ] must be in single quotes.", event.line, col + attr.index, _this, attr.raw); + reporter.error(`The value of attribute [ ${attr.name} ] must be in single quotes.`, event.line, col + attr.index, this, attr.raw); } } }); }, }; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXR0ci12YWx1ZS1zaW5nbGUtcXVvdGVzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NvcmUvcnVsZXMvYXR0ci12YWx1ZS1zaW5nbGUtcXVvdGVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBRUEsa0JBQWU7SUFDYixFQUFFLEVBQUUsMEJBQTBCO0lBQzlCLFdBQVcsRUFBRSw0Q0FBNEM7SUFDekQsSUFBSSxZQUFDLE1BQU0sRUFBRSxRQUFRO1FBQXJCLGlCQXVCQztRQXRCQyxNQUFNLENBQUMsV0FBVyxDQUFDLFVBQVUsRUFBRSxVQUFDLEtBQUs7WUFDbkMsSUFBTSxLQUFLLEdBQUcsS0FBSyxDQUFDLEtBQUssQ0FBQTtZQUN6QixJQUFJLElBQUksQ0FBQTtZQUNSLElBQU0sR0FBRyxHQUFHLEtBQUssQ0FBQyxHQUFHLEdBQUcsS0FBSyxDQUFDLE9BQU8sQ0FBQyxNQUFNLEdBQUcsQ0FBQyxDQUFBO1lBRWhELEtBQUssSUFBSSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsR0FBRyxLQUFLLENBQUMsTUFBTSxFQUFFLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxFQUFFLEVBQUU7Z0JBQzVDLElBQUksR0FBRyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUE7Z0JBRWYsSUFDRSxDQUFDLElBQUksQ0FBQyxLQUFLLEtBQUssRUFBRSxJQUFJLElBQUksQ0FBQyxLQUFLLEtBQUssR0FBRyxDQUFDO29CQUN6QyxDQUFDLElBQUksQ0FBQyxLQUFLLEtBQUssRUFBRSxJQUFJLElBQUksQ0FBQyxLQUFLLEtBQUssR0FBRyxDQUFDLEVBQ3pDO29CQUNBLFFBQVEsQ0FBQyxLQUFLLENBQ1osOEJBQTRCLElBQUksQ0FBQyxJQUFJLGlDQUE4QixFQUNuRSxLQUFLLENBQUMsSUFBSSxFQUNWLEdBQUcsR0FBRyxJQUFJLENBQUMsS0FBSyxFQUNoQixLQUFJLEVBQ0osSUFBSSxDQUFDLEdBQUcsQ0FDVCxDQUFBO2lCQUNGO2FBQ0Y7UUFDSCxDQUFDLENBQUMsQ0FBQTtJQUNKLENBQUM7Q0FDTSxDQUFBIn0= \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXR0ci12YWx1ZS1zaW5nbGUtcXVvdGVzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NvcmUvcnVsZXMvYXR0ci12YWx1ZS1zaW5nbGUtcXVvdGVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBRUEsa0JBQWU7SUFDYixFQUFFLEVBQUUsMEJBQTBCO0lBQzlCLFdBQVcsRUFBRSw0Q0FBNEM7SUFDekQsSUFBSSxDQUFDLE1BQU0sRUFBRSxRQUFRO1FBQ25CLE1BQU0sQ0FBQyxXQUFXLENBQUMsVUFBVSxFQUFFLENBQUMsS0FBSyxFQUFFLEVBQUU7WUFDdkMsTUFBTSxLQUFLLEdBQUcsS0FBSyxDQUFDLEtBQUssQ0FBQTtZQUN6QixJQUFJLElBQUksQ0FBQTtZQUNSLE1BQU0sR0FBRyxHQUFHLEtBQUssQ0FBQyxHQUFHLEdBQUcsS0FBSyxDQUFDLE9BQU8sQ0FBQyxNQUFNLEdBQUcsQ0FBQyxDQUFBO1lBRWhELEtBQUssSUFBSSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsR0FBRyxLQUFLLENBQUMsTUFBTSxFQUFFLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxFQUFFLEVBQUU7Z0JBQzVDLElBQUksR0FBRyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUE7Z0JBRWYsSUFDRSxDQUFDLElBQUksQ0FBQyxLQUFLLEtBQUssRUFBRSxJQUFJLElBQUksQ0FBQyxLQUFLLEtBQUssR0FBRyxDQUFDO29CQUN6QyxDQUFDLElBQUksQ0FBQyxLQUFLLEtBQUssRUFBRSxJQUFJLElBQUksQ0FBQyxLQUFLLEtBQUssR0FBRyxDQUFDLEVBQ3pDO29CQUNBLFFBQVEsQ0FBQyxLQUFLLENBQ1osNEJBQTRCLElBQUksQ0FBQyxJQUFJLDhCQUE4QixFQUNuRSxLQUFLLENBQUMsSUFBSSxFQUNWLEdBQUcsR0FBRyxJQUFJLENBQUMsS0FBSyxFQUNoQixJQUFJLEVBQ0osSUFBSSxDQUFDLEdBQUcsQ0FDVCxDQUFBO2lCQUNGO2FBQ0Y7UUFDSCxDQUFDLENBQUMsQ0FBQTtJQUNKLENBQUM7Q0FDTSxDQUFBIn0= \ No newline at end of file diff --git a/dist/core/rules/attr-whitespace.js b/dist/core/rules/attr-whitespace.js index 272aa487b..e2d5ed485 100644 --- a/dist/core/rules/attr-whitespace.js +++ b/dist/core/rules/attr-whitespace.js @@ -3,29 +3,28 @@ Object.defineProperty(exports, "__esModule", { value: true }); exports.default = { id: 'attr-whitespace', description: 'All attributes should be separated by only one space and not have leading/trailing whitespace.', - init: function (parser, reporter, options) { - var _this = this; - var exceptions = Array.isArray(options) + init(parser, reporter, options) { + const exceptions = Array.isArray(options) ? options : []; - parser.addListener('tagstart', function (event) { - var attrs = event.attrs; - var attr; - var col = event.col + event.tagName.length + 1; - attrs.forEach(function (elem) { + parser.addListener('tagstart', (event) => { + const attrs = event.attrs; + let attr; + const col = event.col + event.tagName.length + 1; + attrs.forEach((elem) => { attr = elem; - var attrName = elem.name; + const attrName = elem.name; if (exceptions.indexOf(attrName) !== -1) { return; } if (elem.value.trim() !== elem.value) { - reporter.error("The attributes of [ " + attrName + " ] must not have trailing whitespace.", event.line, col + attr.index, _this, attr.raw); + reporter.error(`The attributes of [ ${attrName} ] must not have trailing whitespace.`, event.line, col + attr.index, this, attr.raw); } if (elem.value.replace(/ +(?= )/g, '') !== elem.value) { - reporter.error("The attributes of [ " + attrName + " ] must be separated by only one space.", event.line, col + attr.index, _this, attr.raw); + reporter.error(`The attributes of [ ${attrName} ] must be separated by only one space.`, event.line, col + attr.index, this, attr.raw); } }); }); }, }; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXR0ci13aGl0ZXNwYWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NvcmUvcnVsZXMvYXR0ci13aGl0ZXNwYWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBRUEsa0JBQWU7SUFDYixFQUFFLEVBQUUsaUJBQWlCO0lBQ3JCLFdBQVcsRUFDVCxnR0FBZ0c7SUFDbEcsSUFBSSxFQUFKLFVBQUssTUFBTSxFQUFFLFFBQVEsRUFBRSxPQUFPO1FBQTlCLGlCQXdDQztRQXZDQyxJQUFNLFVBQVUsR0FBNEIsS0FBSyxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUM7WUFDaEUsQ0FBQyxDQUFDLE9BQU87WUFDVCxDQUFDLENBQUMsRUFBRSxDQUFBO1FBRU4sTUFBTSxDQUFDLFdBQVcsQ0FBQyxVQUFVLEVBQUUsVUFBQyxLQUFLO1lBQ25DLElBQU0sS0FBSyxHQUFHLEtBQUssQ0FBQyxLQUFLLENBQUE7WUFDekIsSUFBSSxJQUFJLENBQUE7WUFDUixJQUFNLEdBQUcsR0FBRyxLQUFLLENBQUMsR0FBRyxHQUFHLEtBQUssQ0FBQyxPQUFPLENBQUMsTUFBTSxHQUFHLENBQUMsQ0FBQTtZQUVoRCxLQUFLLENBQUMsT0FBTyxDQUFDLFVBQUMsSUFBSTtnQkFDakIsSUFBSSxHQUFHLElBQUksQ0FBQTtnQkFDWCxJQUFNLFFBQVEsR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFBO2dCQUUxQixJQUFJLFVBQVUsQ0FBQyxPQUFPLENBQUMsUUFBUSxDQUFDLEtBQUssQ0FBQyxDQUFDLEVBQUU7b0JBQ3ZDLE9BQU07aUJBQ1A7Z0JBR0QsSUFBSSxJQUFJLENBQUMsS0FBSyxDQUFDLElBQUksRUFBRSxLQUFLLElBQUksQ0FBQyxLQUFLLEVBQUU7b0JBQ3BDLFFBQVEsQ0FBQyxLQUFLLENBQ1oseUJBQXVCLFFBQVEsMENBQXVDLEVBQ3RFLEtBQUssQ0FBQyxJQUFJLEVBQ1YsR0FBRyxHQUFHLElBQUksQ0FBQyxLQUFLLEVBQ2hCLEtBQUksRUFDSixJQUFJLENBQUMsR0FBRyxDQUNULENBQUE7aUJBQ0Y7Z0JBRUQsSUFBSSxJQUFJLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxVQUFVLEVBQUUsRUFBRSxDQUFDLEtBQUssSUFBSSxDQUFDLEtBQUssRUFBRTtvQkFDckQsUUFBUSxDQUFDLEtBQUssQ0FDWix5QkFBdUIsUUFBUSw0Q0FBeUMsRUFDeEUsS0FBSyxDQUFDLElBQUksRUFDVixHQUFHLEdBQUcsSUFBSSxDQUFDLEtBQUssRUFDaEIsS0FBSSxFQUNKLElBQUksQ0FBQyxHQUFHLENBQ1QsQ0FBQTtpQkFDRjtZQUNILENBQUMsQ0FBQyxDQUFBO1FBQ0osQ0FBQyxDQUFDLENBQUE7SUFDSixDQUFDO0NBQ00sQ0FBQSJ9 \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXR0ci13aGl0ZXNwYWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NvcmUvcnVsZXMvYXR0ci13aGl0ZXNwYWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBRUEsa0JBQWU7SUFDYixFQUFFLEVBQUUsaUJBQWlCO0lBQ3JCLFdBQVcsRUFDVCxnR0FBZ0c7SUFDbEcsSUFBSSxDQUFDLE1BQU0sRUFBRSxRQUFRLEVBQUUsT0FBTztRQUM1QixNQUFNLFVBQVUsR0FBNEIsS0FBSyxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUM7WUFDaEUsQ0FBQyxDQUFDLE9BQU87WUFDVCxDQUFDLENBQUMsRUFBRSxDQUFBO1FBRU4sTUFBTSxDQUFDLFdBQVcsQ0FBQyxVQUFVLEVBQUUsQ0FBQyxLQUFLLEVBQUUsRUFBRTtZQUN2QyxNQUFNLEtBQUssR0FBRyxLQUFLLENBQUMsS0FBSyxDQUFBO1lBQ3pCLElBQUksSUFBSSxDQUFBO1lBQ1IsTUFBTSxHQUFHLEdBQUcsS0FBSyxDQUFDLEdBQUcsR0FBRyxLQUFLLENBQUMsT0FBTyxDQUFDLE1BQU0sR0FBRyxDQUFDLENBQUE7WUFFaEQsS0FBSyxDQUFDLE9BQU8sQ0FBQyxDQUFDLElBQUksRUFBRSxFQUFFO2dCQUNyQixJQUFJLEdBQUcsSUFBSSxDQUFBO2dCQUNYLE1BQU0sUUFBUSxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUE7Z0JBRTFCLElBQUksVUFBVSxDQUFDLE9BQU8sQ0FBQyxRQUFRLENBQUMsS0FBSyxDQUFDLENBQUMsRUFBRTtvQkFDdkMsT0FBTTtpQkFDUDtnQkFHRCxJQUFJLElBQUksQ0FBQyxLQUFLLENBQUMsSUFBSSxFQUFFLEtBQUssSUFBSSxDQUFDLEtBQUssRUFBRTtvQkFDcEMsUUFBUSxDQUFDLEtBQUssQ0FDWix1QkFBdUIsUUFBUSx1Q0FBdUMsRUFDdEUsS0FBSyxDQUFDLElBQUksRUFDVixHQUFHLEdBQUcsSUFBSSxDQUFDLEtBQUssRUFDaEIsSUFBSSxFQUNKLElBQUksQ0FBQyxHQUFHLENBQ1QsQ0FBQTtpQkFDRjtnQkFFRCxJQUFJLElBQUksQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLFVBQVUsRUFBRSxFQUFFLENBQUMsS0FBSyxJQUFJLENBQUMsS0FBSyxFQUFFO29CQUNyRCxRQUFRLENBQUMsS0FBSyxDQUNaLHVCQUF1QixRQUFRLHlDQUF5QyxFQUN4RSxLQUFLLENBQUMsSUFBSSxFQUNWLEdBQUcsR0FBRyxJQUFJLENBQUMsS0FBSyxFQUNoQixJQUFJLEVBQ0osSUFBSSxDQUFDLEdBQUcsQ0FDVCxDQUFBO2lCQUNGO1lBQ0gsQ0FBQyxDQUFDLENBQUE7UUFDSixDQUFDLENBQUMsQ0FBQTtJQUNKLENBQUM7Q0FDTSxDQUFBIn0= \ No newline at end of file diff --git a/dist/core/rules/doctype-first.js b/dist/core/rules/doctype-first.js index b8966a415..f7767d371 100644 --- a/dist/core/rules/doctype-first.js +++ b/dist/core/rules/doctype-first.js @@ -3,20 +3,19 @@ Object.defineProperty(exports, "__esModule", { value: true }); exports.default = { id: 'doctype-first', description: 'Doctype must be declared first.', - init: function (parser, reporter) { - var _this = this; - var allEvent = function (event) { + init(parser, reporter) { + const allEvent = (event) => { if (event.type === 'start' || (event.type === 'text' && /^\s*$/.test(event.raw))) { return; } if ((event.type !== 'comment' && event.long === false) || /^DOCTYPE\s+/i.test(event.content) === false) { - reporter.error('Doctype must be declared first.', event.line, event.col, _this, event.raw); + reporter.error('Doctype must be declared first.', event.line, event.col, this, event.raw); } parser.removeListener('all', allEvent); }; parser.addListener('all', allEvent); }, }; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZG9jdHlwZS1maXJzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jb3JlL3J1bGVzL2RvY3R5cGUtZmlyc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFHQSxrQkFBZTtJQUNiLEVBQUUsRUFBRSxlQUFlO0lBQ25CLFdBQVcsRUFBRSxpQ0FBaUM7SUFDOUMsSUFBSSxFQUFKLFVBQUssTUFBTSxFQUFFLFFBQVE7UUFBckIsaUJBMEJDO1FBekJDLElBQU0sUUFBUSxHQUFhLFVBQUMsS0FBSztZQUMvQixJQUNFLEtBQUssQ0FBQyxJQUFJLEtBQUssT0FBTztnQkFDdEIsQ0FBQyxLQUFLLENBQUMsSUFBSSxLQUFLLE1BQU0sSUFBSSxPQUFPLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQyxFQUNsRDtnQkFDQSxPQUFNO2FBQ1A7WUFFRCxJQUNFLENBQUMsS0FBSyxDQUFDLElBQUksS0FBSyxTQUFTLElBQUksS0FBSyxDQUFDLElBQUksS0FBSyxLQUFLLENBQUM7Z0JBQ2xELGNBQWMsQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxLQUFLLEtBQUssRUFDNUM7Z0JBQ0EsUUFBUSxDQUFDLEtBQUssQ0FDWixpQ0FBaUMsRUFDakMsS0FBSyxDQUFDLElBQUksRUFDVixLQUFLLENBQUMsR0FBRyxFQUNULEtBQUksRUFDSixLQUFLLENBQUMsR0FBRyxDQUNWLENBQUE7YUFDRjtZQUVELE1BQU0sQ0FBQyxjQUFjLENBQUMsS0FBSyxFQUFFLFFBQVEsQ0FBQyxDQUFBO1FBQ3hDLENBQUMsQ0FBQTtRQUVELE1BQU0sQ0FBQyxXQUFXLENBQUMsS0FBSyxFQUFFLFFBQVEsQ0FBQyxDQUFBO0lBQ3JDLENBQUM7Q0FDTSxDQUFBIn0= \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZG9jdHlwZS1maXJzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jb3JlL3J1bGVzL2RvY3R5cGUtZmlyc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFHQSxrQkFBZTtJQUNiLEVBQUUsRUFBRSxlQUFlO0lBQ25CLFdBQVcsRUFBRSxpQ0FBaUM7SUFDOUMsSUFBSSxDQUFDLE1BQU0sRUFBRSxRQUFRO1FBQ25CLE1BQU0sUUFBUSxHQUFhLENBQUMsS0FBSyxFQUFFLEVBQUU7WUFDbkMsSUFDRSxLQUFLLENBQUMsSUFBSSxLQUFLLE9BQU87Z0JBQ3RCLENBQUMsS0FBSyxDQUFDLElBQUksS0FBSyxNQUFNLElBQUksT0FBTyxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUMsRUFDbEQ7Z0JBQ0EsT0FBTTthQUNQO1lBRUQsSUFDRSxDQUFDLEtBQUssQ0FBQyxJQUFJLEtBQUssU0FBUyxJQUFJLEtBQUssQ0FBQyxJQUFJLEtBQUssS0FBSyxDQUFDO2dCQUNsRCxjQUFjLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsS0FBSyxLQUFLLEVBQzVDO2dCQUNBLFFBQVEsQ0FBQyxLQUFLLENBQ1osaUNBQWlDLEVBQ2pDLEtBQUssQ0FBQyxJQUFJLEVBQ1YsS0FBSyxDQUFDLEdBQUcsRUFDVCxJQUFJLEVBQ0osS0FBSyxDQUFDLEdBQUcsQ0FDVixDQUFBO2FBQ0Y7WUFFRCxNQUFNLENBQUMsY0FBYyxDQUFDLEtBQUssRUFBRSxRQUFRLENBQUMsQ0FBQTtRQUN4QyxDQUFDLENBQUE7UUFFRCxNQUFNLENBQUMsV0FBVyxDQUFDLEtBQUssRUFBRSxRQUFRLENBQUMsQ0FBQTtJQUNyQyxDQUFDO0NBQ00sQ0FBQSJ9 \ No newline at end of file diff --git a/dist/core/rules/doctype-html5.js b/dist/core/rules/doctype-html5.js index a48544ce7..5f3c32c9e 100644 --- a/dist/core/rules/doctype-html5.js +++ b/dist/core/rules/doctype-html5.js @@ -3,15 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true }); exports.default = { id: 'doctype-html5', description: 'Invalid doctype. Use: ""', - init: function (parser, reporter) { - var _this = this; - var onComment = function (event) { + init(parser, reporter) { + const onComment = (event) => { if (event.long === false && event.content.toLowerCase() !== 'doctype html') { - reporter.warn('Invalid doctype. Use: ""', event.line, event.col, _this, event.raw); + reporter.warn('Invalid doctype. Use: ""', event.line, event.col, this, event.raw); } }; - var onTagStart = function () { + const onTagStart = () => { parser.removeListener('comment', onComment); parser.removeListener('tagstart', onTagStart); }; @@ -19,4 +18,4 @@ exports.default = { parser.addListener('tagstart', onTagStart); }, }; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZG9jdHlwZS1odG1sNS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jb3JlL3J1bGVzL2RvY3R5cGUtaHRtbDUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFHQSxrQkFBZTtJQUNiLEVBQUUsRUFBRSxlQUFlO0lBQ25CLFdBQVcsRUFBRSx5Q0FBeUM7SUFDdEQsSUFBSSxFQUFKLFVBQUssTUFBTSxFQUFFLFFBQVE7UUFBckIsaUJBdUJDO1FBdEJDLElBQU0sU0FBUyxHQUFhLFVBQUMsS0FBSztZQUNoQyxJQUNFLEtBQUssQ0FBQyxJQUFJLEtBQUssS0FBSztnQkFDcEIsS0FBSyxDQUFDLE9BQU8sQ0FBQyxXQUFXLEVBQUUsS0FBSyxjQUFjLEVBQzlDO2dCQUNBLFFBQVEsQ0FBQyxJQUFJLENBQ1gseUNBQXlDLEVBQ3pDLEtBQUssQ0FBQyxJQUFJLEVBQ1YsS0FBSyxDQUFDLEdBQUcsRUFDVCxLQUFJLEVBQ0osS0FBSyxDQUFDLEdBQUcsQ0FDVixDQUFBO2FBQ0Y7UUFDSCxDQUFDLENBQUE7UUFFRCxJQUFNLFVBQVUsR0FBYTtZQUMzQixNQUFNLENBQUMsY0FBYyxDQUFDLFNBQVMsRUFBRSxTQUFTLENBQUMsQ0FBQTtZQUMzQyxNQUFNLENBQUMsY0FBYyxDQUFDLFVBQVUsRUFBRSxVQUFVLENBQUMsQ0FBQTtRQUMvQyxDQUFDLENBQUE7UUFFRCxNQUFNLENBQUMsV0FBVyxDQUFDLEtBQUssRUFBRSxTQUFTLENBQUMsQ0FBQTtRQUNwQyxNQUFNLENBQUMsV0FBVyxDQUFDLFVBQVUsRUFBRSxVQUFVLENBQUMsQ0FBQTtJQUM1QyxDQUFDO0NBQ00sQ0FBQSJ9 \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZG9jdHlwZS1odG1sNS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jb3JlL3J1bGVzL2RvY3R5cGUtaHRtbDUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFHQSxrQkFBZTtJQUNiLEVBQUUsRUFBRSxlQUFlO0lBQ25CLFdBQVcsRUFBRSx5Q0FBeUM7SUFDdEQsSUFBSSxDQUFDLE1BQU0sRUFBRSxRQUFRO1FBQ25CLE1BQU0sU0FBUyxHQUFhLENBQUMsS0FBSyxFQUFFLEVBQUU7WUFDcEMsSUFDRSxLQUFLLENBQUMsSUFBSSxLQUFLLEtBQUs7Z0JBQ3BCLEtBQUssQ0FBQyxPQUFPLENBQUMsV0FBVyxFQUFFLEtBQUssY0FBYyxFQUM5QztnQkFDQSxRQUFRLENBQUMsSUFBSSxDQUNYLHlDQUF5QyxFQUN6QyxLQUFLLENBQUMsSUFBSSxFQUNWLEtBQUssQ0FBQyxHQUFHLEVBQ1QsSUFBSSxFQUNKLEtBQUssQ0FBQyxHQUFHLENBQ1YsQ0FBQTthQUNGO1FBQ0gsQ0FBQyxDQUFBO1FBRUQsTUFBTSxVQUFVLEdBQWEsR0FBRyxFQUFFO1lBQ2hDLE1BQU0sQ0FBQyxjQUFjLENBQUMsU0FBUyxFQUFFLFNBQVMsQ0FBQyxDQUFBO1lBQzNDLE1BQU0sQ0FBQyxjQUFjLENBQUMsVUFBVSxFQUFFLFVBQVUsQ0FBQyxDQUFBO1FBQy9DLENBQUMsQ0FBQTtRQUVELE1BQU0sQ0FBQyxXQUFXLENBQUMsS0FBSyxFQUFFLFNBQVMsQ0FBQyxDQUFBO1FBQ3BDLE1BQU0sQ0FBQyxXQUFXLENBQUMsVUFBVSxFQUFFLFVBQVUsQ0FBQyxDQUFBO0lBQzVDLENBQUM7Q0FDTSxDQUFBIn0= \ No newline at end of file diff --git a/dist/core/rules/empty-tag-not-self-closed.js b/dist/core/rules/empty-tag-not-self-closed.js index c849c2dee..6b81bfbe1 100644 --- a/dist/core/rules/empty-tag-not-self-closed.js +++ b/dist/core/rules/empty-tag-not-self-closed.js @@ -3,17 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true }); exports.default = { id: 'empty-tag-not-self-closed', description: 'Empty tags must not use self closed syntax.', - init: function (parser, reporter) { - var _this = this; - var mapEmptyTags = parser.makeMap('area,base,basefont,bgsound,br,col,frame,hr,img,input,isindex,link,meta,param,embed,track,command,source,keygen,wbr'); - parser.addListener('tagstart', function (event) { - var tagName = event.tagName.toLowerCase(); + init(parser, reporter) { + const mapEmptyTags = parser.makeMap('area,base,basefont,bgsound,br,col,frame,hr,img,input,isindex,link,meta,param,embed,track,command,source,keygen,wbr'); + parser.addListener('tagstart', (event) => { + const tagName = event.tagName.toLowerCase(); if (mapEmptyTags[tagName] !== undefined) { if (event.close) { - reporter.error("The empty tag : [ " + tagName + " ] must not use self closed syntax.", event.line, event.col, _this, event.raw); + reporter.error(`The empty tag : [ ${tagName} ] must not use self closed syntax.`, event.line, event.col, this, event.raw); } } }); }, }; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZW1wdHktdGFnLW5vdC1zZWxmLWNsb3NlZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jb3JlL3J1bGVzL2VtcHR5LXRhZy1ub3Qtc2VsZi1jbG9zZWQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFFQSxrQkFBZTtJQUNiLEVBQUUsRUFBRSwyQkFBMkI7SUFDL0IsV0FBVyxFQUFFLDZDQUE2QztJQUMxRCxJQUFJLFlBQUMsTUFBTSxFQUFFLFFBQVE7UUFBckIsaUJBbUJDO1FBbEJDLElBQU0sWUFBWSxHQUFHLE1BQU0sQ0FBQyxPQUFPLENBQ2pDLG9IQUFvSCxDQUNySCxDQUFBO1FBRUQsTUFBTSxDQUFDLFdBQVcsQ0FBQyxVQUFVLEVBQUUsVUFBQyxLQUFLO1lBQ25DLElBQU0sT0FBTyxHQUFHLEtBQUssQ0FBQyxPQUFPLENBQUMsV0FBVyxFQUFFLENBQUE7WUFDM0MsSUFBSSxZQUFZLENBQUMsT0FBTyxDQUFDLEtBQUssU0FBUyxFQUFFO2dCQUN2QyxJQUFJLEtBQUssQ0FBQyxLQUFLLEVBQUU7b0JBQ2YsUUFBUSxDQUFDLEtBQUssQ0FDWix1QkFBcUIsT0FBTyx3Q0FBcUMsRUFDakUsS0FBSyxDQUFDLElBQUksRUFDVixLQUFLLENBQUMsR0FBRyxFQUNULEtBQUksRUFDSixLQUFLLENBQUMsR0FBRyxDQUNWLENBQUE7aUJBQ0Y7YUFDRjtRQUNILENBQUMsQ0FBQyxDQUFBO0lBQ0osQ0FBQztDQUNNLENBQUEifQ== \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZW1wdHktdGFnLW5vdC1zZWxmLWNsb3NlZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jb3JlL3J1bGVzL2VtcHR5LXRhZy1ub3Qtc2VsZi1jbG9zZWQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFFQSxrQkFBZTtJQUNiLEVBQUUsRUFBRSwyQkFBMkI7SUFDL0IsV0FBVyxFQUFFLDZDQUE2QztJQUMxRCxJQUFJLENBQUMsTUFBTSxFQUFFLFFBQVE7UUFDbkIsTUFBTSxZQUFZLEdBQUcsTUFBTSxDQUFDLE9BQU8sQ0FDakMsb0hBQW9ILENBQ3JILENBQUE7UUFFRCxNQUFNLENBQUMsV0FBVyxDQUFDLFVBQVUsRUFBRSxDQUFDLEtBQUssRUFBRSxFQUFFO1lBQ3ZDLE1BQU0sT0FBTyxHQUFHLEtBQUssQ0FBQyxPQUFPLENBQUMsV0FBVyxFQUFFLENBQUE7WUFDM0MsSUFBSSxZQUFZLENBQUMsT0FBTyxDQUFDLEtBQUssU0FBUyxFQUFFO2dCQUN2QyxJQUFJLEtBQUssQ0FBQyxLQUFLLEVBQUU7b0JBQ2YsUUFBUSxDQUFDLEtBQUssQ0FDWixxQkFBcUIsT0FBTyxxQ0FBcUMsRUFDakUsS0FBSyxDQUFDLElBQUksRUFDVixLQUFLLENBQUMsR0FBRyxFQUNULElBQUksRUFDSixLQUFLLENBQUMsR0FBRyxDQUNWLENBQUE7aUJBQ0Y7YUFDRjtRQUNILENBQUMsQ0FBQyxDQUFBO0lBQ0osQ0FBQztDQUNNLENBQUEifQ== \ No newline at end of file diff --git a/dist/core/rules/head-script-disabled.js b/dist/core/rules/head-script-disabled.js index 821e6362b..599c62c14 100644 --- a/dist/core/rules/head-script-disabled.js +++ b/dist/core/rules/head-script-disabled.js @@ -3,24 +3,23 @@ Object.defineProperty(exports, "__esModule", { value: true }); exports.default = { id: 'head-script-disabled', description: 'The