1
1
mirror of https://github.com/theoludwig/html-w3c-validator.git synced 2025-05-21 23:21:29 +02:00

3 Commits

Author SHA1 Message Date
943b3d1fd6 fix: update dependencies to latest 2023-01-10 22:15:14 +01:00
6ca7722fcf perf: run validations in parallel
fixes #3
2022-10-20 23:46:36 +02:00
3a44eca5b1 fix: only consider errors (excluding warning/info messages) 2022-10-20 23:30:41 +02:00
17 changed files with 3577 additions and 15183 deletions

View File

@ -10,10 +10,10 @@ jobs:
build:
runs-on: 'ubuntu-latest'
steps:
- uses: 'actions/checkout@v3.0.0'
- uses: 'actions/checkout@v3.3.0'
- name: 'Use Node.js'
uses: 'actions/setup-node@v3.1.0'
uses: 'actions/setup-node@v3.6.0'
with:
node-version: 'lts/*'
cache: 'npm'
@ -23,3 +23,5 @@ jobs:
- name: 'Build'
run: 'npm run build'
- run: 'npm run build:typescript'

View File

@ -10,10 +10,10 @@ jobs:
lint:
runs-on: 'ubuntu-latest'
steps:
- uses: 'actions/checkout@v3.0.0'
- uses: 'actions/checkout@v3.3.0'
- name: 'Use Node.js'
uses: 'actions/setup-node@v3.1.0'
uses: 'actions/setup-node@v3.6.0'
with:
node-version: 'lts/*'
cache: 'npm'
@ -24,5 +24,5 @@ jobs:
- run: 'npm run lint:commit -- --to "${{ github.sha }}"'
- run: 'npm run lint:editorconfig'
- run: 'npm run lint:markdown'
- run: 'npm run lint:typescript'
- run: 'npm run lint:eslint'
- run: 'npm run lint:prettier'

View File

@ -8,13 +8,13 @@ jobs:
release:
runs-on: 'ubuntu-latest'
steps:
- uses: 'actions/checkout@v3.0.0'
- uses: 'actions/checkout@v3.3.0'
with:
fetch-depth: 0
persist-credentials: false
- name: 'Use Node.js'
uses: 'actions/setup-node@v3.1.0'
uses: 'actions/setup-node@v3.6.0'
with:
node-version: 'lts/*'
cache: 'npm'
@ -25,6 +25,8 @@ jobs:
- name: 'Build'
run: 'npm run build'
- run: 'npm run build:typescript'
- name: 'Release'
run: 'npm run release'
env:

View File

@ -10,10 +10,10 @@ jobs:
test:
runs-on: 'ubuntu-latest'
steps:
- uses: 'actions/checkout@v3.0.0'
- uses: 'actions/checkout@v3.3.0'
- name: 'Use Node.js'
uses: 'actions/setup-node@v3.1.0'
uses: 'actions/setup-node@v3.6.0'
with:
node-version: 'lts/*'
cache: 'npm'

View File

@ -1,4 +0,0 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"
npm run lint:commit -- --edit

View File

@ -1,5 +0,0 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"
npm run lint:staged
npm run build

5
.markdownlint-cli2.jsonc Normal file
View File

@ -0,0 +1,5 @@
{
"globs": ["**/*.{md,mdx}"],
"ignores": ["**/node_modules"],
"customRules": ["markdownlint-rule-relative-links"]
}

View File

@ -1,6 +1,7 @@
{
"default": true,
"MD013": false,
"relative-links": true,
"extends": "markdownlint/style/prettier",
"MD033": false,
"MD041": false
}

View File

@ -6,5 +6,9 @@
"editor.formatOnSave": true,
"editor.codeActionsOnSave": {
"source.fixAll": true
}
},
"eslint.options": {
"ignorePath": ".gitignore"
},
"prettier.ignorePath": ".gitignore"
}

View File

@ -59,7 +59,7 @@ npm install --save-dev html-w3c-validator start-server-and-test
"start": "serve \"./build\"",
// Command to validate your HTML pages
"test:html-w3c-validator": "start-server-and-test \"start\" \"http://localhost:3000\" \"html-w3c-validator\""
"test:html-w3c-validator": "start-server-and-test \"start\" \"http://127.0.0.1:3000\" \"html-w3c-validator\""
}
}
```
@ -68,7 +68,7 @@ npm install --save-dev html-w3c-validator start-server-and-test
```jsonc
{
"urls": ["http://localhost:3000/", "http://localhost:3000/about"],
"urls": ["http://127.0.0.1:3000/", "http://127.0.0.1:3000/about"],
// You can also specify HTML files instead of URLs
"files": ["./index.html", "./about.html"]
@ -84,8 +84,8 @@ npm run test:html-w3c-validator
Example of output (in case of success):
```txt
✔ Validating http://localhost:3000/
✔ Validating http://localhost:3000/about
✔ Validating http://127.0.0.1:3000/
✔ Validating http://127.0.0.1:3000/about
Success: HTML validation (W3C) passed! 🎉
```

View File

@ -1,4 +1,4 @@
{
"urls": ["http://localhost:3000/", "http://localhost:3000/about"],
"urls": ["http://127.0.0.1:3000/", "http://127.0.0.1:3000/about"],
"files": ["./build/index.html", "./build/about.html"]
}

2214
example/package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -3,11 +3,11 @@
"private": true,
"scripts": {
"start": "serve \"./build\"",
"test:html-w3c-validator": "start-server-and-test \"start\" \"http://localhost:3000\" \"html-w3c-validator\""
"test:html-w3c-validator": "start-server-and-test \"start\" \"http://127.0.0.1:3000\" \"html-w3c-validator\""
},
"devDependencies": {
"serve": "13.0.2",
"start-server-and-test": "1.14.0",
"serve": "14.1.2",
"start-server-and-test": "1.15.2",
"html-w3c-validator": "file:.."
}
}

16268
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -30,56 +30,55 @@
"build"
],
"scripts": {
"build": "rimraf ./build && swc ./src --out-dir ./build && tsc",
"build": "rimraf ./build && swc ./src --out-dir ./build",
"build:typescript": "tsc",
"lint:commit": "commitlint",
"lint:editorconfig": "editorconfig-checker",
"lint:markdown": "markdownlint \"**/*.md\" --dot --ignore-path \".gitignore\"",
"lint:typescript": "eslint \"**/*.{js,jsx,ts,tsx}\" --ignore-path \".gitignore\"",
"lint:markdown": "markdownlint-cli2",
"lint:eslint": "eslint \"**/*.{js,jsx,ts,tsx}\" --ignore-path \".gitignore\"",
"lint:prettier": "prettier \".\" --check --ignore-path \".gitignore\"",
"lint:staged": "lint-staged",
"test": "tap",
"release": "semantic-release",
"postinstall": "husky install",
"prepublishOnly": "pinst --disable",
"postpublish": "pinst --enable"
"release": "semantic-release"
},
"dependencies": {
"chalk": "5.0.1",
"chalk": "5.2.0",
"clipanion": "3.1.0",
"html-validator": "6.0.0",
"ora": "6.1.0",
"html-validator": "6.0.1",
"log-symbols": "5.1.0",
"ora": "6.1.2",
"read-pkg": "7.1.0",
"table": "6.8.0"
"table": "6.8.1"
},
"devDependencies": {
"@commitlint/cli": "16.2.3",
"@commitlint/config-conventional": "16.2.1",
"@commitlint/cli": "17.4.1",
"@commitlint/config-conventional": "17.4.0",
"@swc/cli": "0.1.57",
"@swc/core": "1.2.163",
"@types/html-validator": "5.0.2",
"@swc/core": "1.3.25",
"@tsconfig/strictest": "1.0.2",
"@types/html-validator": "5.0.3",
"@types/mock-fs": "4.13.1",
"@types/node": "17.0.23",
"@types/tap": "15.0.6",
"@typescript-eslint/eslint-plugin": "5.18.0",
"@types/node": "18.11.18",
"@types/tap": "15.0.7",
"@typescript-eslint/eslint-plugin": "5.48.1",
"editorconfig-checker": "4.0.2",
"eslint": "8.12.0",
"eslint-config-conventions": "2.0.0",
"eslint-config-prettier": "8.5.0",
"eslint": "8.31.0",
"eslint-config-conventions": "6.0.0",
"eslint-config-prettier": "8.6.0",
"eslint-plugin-import": "2.26.0",
"eslint-plugin-prettier": "4.0.0",
"eslint-plugin-promise": "6.0.0",
"eslint-plugin-unicorn": "42.0.0",
"eslint-plugin-prettier": "4.2.1",
"eslint-plugin-promise": "6.1.1",
"eslint-plugin-unicorn": "45.0.2",
"execa": "6.1.0",
"husky": "7.0.4",
"lint-staged": "12.3.7",
"markdownlint-cli": "0.31.1",
"mock-fs": "5.1.2",
"pinst": "3.0.0",
"prettier": "2.6.2",
"lint-staged": "13.1.0",
"markdownlint-cli2": "0.6.0",
"markdownlint-rule-relative-links": "1.1.1",
"mock-fs": "5.2.0",
"prettier": "2.8.2",
"rimraf": "3.0.2",
"semantic-release": "19.0.2",
"serve": "13.0.2",
"tap": "16.0.1",
"typescript": "4.6.3"
"semantic-release": "20.0.2",
"serve": "14.1.2",
"tap": "16.3.3",
"typescript": "4.9.4"
}
}

View File

@ -4,10 +4,12 @@ import fs from 'node:fs'
import { Command } from 'clipanion'
import chalk from 'chalk'
import ora from 'ora'
import validateHTML, {
import logSymbols from 'log-symbols'
import type {
ValidationMessageLocationObject,
ParsedJsonAsValidationResults
} from 'html-validator'
import validateHTML from 'html-validator'
import { table } from 'table'
import { isExistingPath } from './utils/isExistingPath.js'
@ -25,13 +27,28 @@ interface Error {
messagesTable: string[][]
}
interface Result {
data: string
isSuccess: boolean
}
const printResults = (results: Result[]): void => {
for (const result of results) {
if (result.isSuccess) {
console.log(logSymbols.success, result.data)
} else {
console.log(logSymbols.error, result.data)
}
}
}
export class HTMLValidatorCommand extends Command {
static usage = {
static override usage = {
description:
'CLI for validating multiple html pages using <https://validator.w3.org/>.'
}
async execute(): Promise<number> {
public async execute(): Promise<number> {
const configPath = path.join(CURRENT_DIRECTORY, CONFIG_FILE_NAME)
try {
if (!(await isExistingPath(configPath))) {
@ -39,7 +56,6 @@ export class HTMLValidatorCommand extends Command {
`No config file found at ${configPath}. Please create ${CONFIG_FILE_NAME}.`
)
}
const configData = await fs.promises.readFile(configPath, {
encoding: 'utf-8'
})
@ -73,8 +89,10 @@ export class HTMLValidatorCommand extends Command {
const dataToValidate = [...urls, ...files]
const errors: Error[] = []
let isValid = true
for (const { data, type } of dataToValidate) {
const loader = ora(`Validating ${data}`).start()
const loader = ora(`Validating HTML (W3C)...`).start()
const results: Result[] = []
await Promise.all(
dataToValidate.map(async ({ data, type }) => {
try {
const options = {
format: 'json' as 'json' | undefined
@ -103,19 +121,18 @@ export class HTMLValidatorCommand extends Command {
} else {
throw new Error('Invalid type')
}
const isValidHTML = result.messages.length === 0
if (isValidHTML) {
loader.succeed()
const hasErrors = result.messages.some((message) => {
return message.type === 'error'
})
if (!hasErrors) {
results.push({ data, isSuccess: true })
} else {
loader.fail()
results.push({ data, isSuccess: false })
const messagesTable: string[][] = []
for (const message of result.messages) {
const row: string[] = []
if (message.type === 'error') {
const row: string[] = []
row.push(chalk.red(message.type))
} else {
row.push(chalk.yellow(message.type))
}
row.push(message.message)
const violation = message as ValidationMessageLocationObject
if (violation.extract != null) {
@ -125,20 +142,22 @@ export class HTMLValidatorCommand extends Command {
}
messagesTable.push(row)
}
}
errors.push({ data, messagesTable })
isValid = false
}
} catch (error) {
loader.fail()
isValid = false
if (error instanceof Error) {
const messagesTable: string[][] = [[error.message]]
errors.push({ data, messagesTable })
}
}
}
})
)
if (!isValid) {
loader.fail()
printResults(results)
for (const error of errors) {
console.error(`\n${error.data}`)
console.error(table(error.messagesTable))
@ -147,10 +166,10 @@ export class HTMLValidatorCommand extends Command {
console.error()
throw new Error('HTML validation (W3C) failed!')
}
console.log()
console.log(
loader.succeed(
`${chalk.bold.green('Success:')} HTML validation (W3C) passed! 🎉`
)
printResults(results)
return 0
} catch (error) {
if (error instanceof Error) {

View File

@ -1,4 +1,5 @@
{
"extends": "@tsconfig/strictest/tsconfig.json",
"compilerOptions": {
"target": "ESNext",
"module": "ESNext",
@ -7,8 +8,6 @@
"outDir": "./build",
"rootDir": "./src",
"noEmit": true,
"strict": true,
"skipLibCheck": true,
"esModuleInterop": true
"exactOptionalPropertyTypes": false
}
}