feat: usage of ESM modules imports (instead of CommonJS)

fixes #2

.devcontainer/Dockerfile

@@ -1,2 +0,0 @@
-ARG VARIANT="16"
-FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:0-${VARIANT}

.devcontainer/devcontainer.json

@@ -1,15 +0,0 @@
-{
-  "name": "html-w3c-validator",
-  "dockerComposeFile": "./docker-compose.yml",
-  "service": "workspace",
-  "workspaceFolder": "/workspace",
-  "extensions": [
-    "editorconfig.editorconfig",
-    "esbenp.prettier-vscode",
-    "dbaeumer.vscode-eslint",
-    "davidanson.vscode-markdownlint",
-    "ms-azuretools.vscode-docker"
-  ],
-  "postAttachCommand": ["npm", "install"],
-  "remoteUser": "node"
-}

.devcontainer/docker-compose.yml

@@ -1,10 +0,0 @@
-version: '3.0'
-
-services:
-  workspace:
-    build:
-      context: './'
-      dockerfile: './Dockerfile'
-    volumes:
-      - '..:/workspace:cached'
-    command: 'sleep infinity'

.eslintignore

@@ -1,5 +0,0 @@
-build
-node_modules
-coverage
-package.json
-package-lock.json

.eslintrc.json

@@ -1,21 +1,16 @@
 {
-  "extends": ["standard-with-typescript", "prettier"],
+  "extends": ["conventions", "prettier"],
-  "plugins": ["unicorn", "import", "prettier"],
+  "plugins": ["prettier", "import", "unicorn"],
   "parserOptions": {
     "project": "./tsconfig.json"
   },
   "env": {
-    "node": true,
+    "node": true
-    "jest": true
   },
   "rules": {
     "prettier/prettier": "error",
-    "import/order": [
-      "error",
-      { "groups": ["builtin", "external", "internal"] }
-    ],
     "import/extensions": ["error", "always"],
-    "unicorn/prefer-node-protocol": "error",
+    "unicorn/prevent-abbreviations": "error",
-    "unicorn/prevent-abbreviations": "error"
+    "unicorn/prefer-node-protocol": "error"
   }
 }

.gitattributes

@@ -0,0 +1 @@
+* text=auto eol=lf

.github/workflows/build.yml

@@ -2,7 +2,7 @@ name: 'Build'
 
 on:
   push:
-    branches: [master, develop]
+    branches: [develop]
   pull_request:
     branches: [master, develop]
 
@@ -10,12 +10,12 @@ jobs:
   build:
     runs-on: 'ubuntu-latest'
     steps:
-      - uses: 'actions/checkout@v2'
+      - uses: 'actions/checkout@v3.0.0'
 
       - name: 'Use Node.js'
-        uses: 'actions/setup-node@v2.5.1'
+        uses: 'actions/setup-node@v3.1.0'
         with:
-          node-version: '16.x'
+          node-version: 'lts/*'
           cache: 'npm'
 
       - name: 'Install'

.github/workflows/lint.yml

@@ -2,7 +2,7 @@ name: 'Lint'
 
 on:
   push:
-    branches: [master, develop]
+    branches: [develop]
   pull_request:
     branches: [master, develop]
 
@@ -10,28 +10,19 @@ jobs:
   lint:
     runs-on: 'ubuntu-latest'
     steps:
-      - uses: 'actions/checkout@v2'
+      - uses: 'actions/checkout@v3.0.0'
 
       - name: 'Use Node.js'
-        uses: 'actions/setup-node@v2.5.1'
+        uses: 'actions/setup-node@v3.1.0'
         with:
-          node-version: '16.x'
+          node-version: 'lts/*'
           cache: 'npm'
 
       - name: 'Install'
         run: 'npm install'
 
-      - name: 'lint:commit'
+      - run: 'npm run lint:commit -- --to "${{ github.sha }}"'
-        run: 'npm run lint:commit -- --to "${{ github.sha }}"'
+      - run: 'npm run lint:editorconfig'
-
+      - run: 'npm run lint:markdown'
-      - name: 'lint:editorconfig'
+      - run: 'npm run lint:typescript'
-        run: 'npm run lint:editorconfig'
+      - run: 'npm run lint:prettier'
-
-      - name: 'lint:markdown'
-        run: 'npm run lint:markdown'
-
-      - name: 'lint:typescript'
-        run: 'npm run lint:typescript'
-
-      - name: 'lint:prettier'
-        run: 'npm run lint:prettier'

.github/workflows/release.yml

@@ -8,15 +8,15 @@ jobs:
   release:
     runs-on: 'ubuntu-latest'
     steps:
-      - uses: 'actions/checkout@v2.3.4'
+      - uses: 'actions/checkout@v3.0.0'
         with:
           fetch-depth: 0
           persist-credentials: false
 
       - name: 'Use Node.js'
-        uses: 'actions/setup-node@v2.5.1'
+        uses: 'actions/setup-node@v3.1.0'
         with:
-          node-version: '16.x'
+          node-version: 'lts/*'
           cache: 'npm'
 
       - name: 'Install'

.github/workflows/test.yml

@@ -2,7 +2,7 @@ name: 'Test'
 
 on:
   push:
-    branches: [master, develop]
+    branches: [develop]
   pull_request:
     branches: [master, develop]
 
@@ -10,12 +10,12 @@ jobs:
   test:
     runs-on: 'ubuntu-latest'
     steps:
-      - uses: 'actions/checkout@v2'
+      - uses: 'actions/checkout@v3.0.0'
 
       - name: 'Use Node.js'
-        uses: 'actions/setup-node@v2.5.1'
+        uses: 'actions/setup-node@v3.1.0'
         with:
-          node-version: '16.x'
+          node-version: 'lts/*'
           cache: 'npm'
 
       - name: 'Install'

.gitignore

@@ -8,6 +8,7 @@ node_modules
 
 # testing
 coverage
+.nyc_output
 
 # envs
 .env

.lintstagedrc.json

@@ -1,10 +1,6 @@
 {
   "*": ["editorconfig-checker"],
-  "*.{js,ts,jsx,tsx}": [
+  "*.{js,ts,jsx,tsx}": ["prettier --write", "eslint --fix"],
-    "prettier --write",
-    "eslint --fix",
-    "jest --findRelatedTests"
-  ],
   "*.{yml,json}": ["prettier --write"],
-  "*.{md}": ["prettier --write", "markdownlint --dot --fix"]
+  "*.md": ["prettier --write", "markdownlint --dot --fix"]
 }

.npmrc

@@ -1,2 +1 @@
 save-exact=true
-engine-strict=true

.prettierignore

@@ -1,5 +0,0 @@
-/build
-node_modules
-coverage
-package.json
-package-lock.json

.swcrc

@@ -13,7 +13,7 @@
     "loose": true
   },
   "module": {
-    "type": "commonjs",
+    "type": "es6",
     "strict": false,
     "strictMode": true,
     "lazy": false,

.taprc

@@ -0,0 +1,9 @@
+ts: false
+jsx: false
+flow: false
+check-coverage: false
+coverage: false
+timeout: 120000
+
+files:
+  - 'build/**/*.test.js'

.vscode/settings.json

@@ -1,33 +1,10 @@
 {
   "typescript.tsdk": "node_modules/typescript/lib",
   "typescript.preferences.importModuleSpecifierEnding": "js",
+  "editor.defaultFormatter": "esbenp.prettier-vscode",
   "prettier.configPath": ".prettierrc.json",
   "editor.formatOnSave": true,
   "editor.codeActionsOnSave": {
     "source.fixAll": true
-  },
-  "[markdown]": {
-    "editor.autoClosingBrackets": "always",
-    "editor.defaultFormatter": "esbenp.prettier-vscode"
-  },
-  "[yaml]": {
-    "editor.autoClosingBrackets": "always",
-    "editor.defaultFormatter": "esbenp.prettier-vscode"
-  },
-  "[json]": {
-    "editor.autoClosingBrackets": "always",
-    "editor.defaultFormatter": "esbenp.prettier-vscode"
-  },
-  "[jsonc]": {
-    "editor.autoClosingBrackets": "always",
-    "editor.defaultFormatter": "esbenp.prettier-vscode"
-  },
-  "[typescript]": {
-    "editor.autoClosingBrackets": "always",
-    "editor.defaultFormatter": "esbenp.prettier-vscode"
-  },
-  "[javascript]": {
-    "editor.autoClosingBrackets": "always",
-    "editor.defaultFormatter": "esbenp.prettier-vscode"
   }
 }

README.md

@@ -24,7 +24,7 @@
 
 **html-w3c-validator** is a CLI tool to validate multiple html pages using [validator.w3.org](https://validator.w3.org/).
 
-You might use a JavaScript framework or simply use HTML: **you should validate your production HTML** and this validation should be part of your CI/CD pipeline (tests, linting, etc.).
+You might use a JavaScript framework or simply use HTML but **you should always validate your production HTML** and this validation should be part of your CI/CD pipeline (tests, linting, etc.).
 
 ### Why should I validate my HTML pages?
 
@@ -56,19 +56,22 @@ npm install --save-dev html-w3c-validator start-server-and-test
 {
   "scripts": {
     // Command to start the server serving your HTML pages (e.g: using vercel/serve)
-    "start": "serve ./build",
+    "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://localhost:3000\" \"html-w3c-validator\""
   }
 }
 ```
 
 ### `.html-w3c-validatorrc.json`
 
-```json
+```jsonc
 {
-  "urls": ["http://localhost:3000/", "http://localhost:3000/about"]
+  "urls": ["http://localhost:3000/", "http://localhost:3000/about"],
+
+  // You can also specify HTML files instead of URLs
+  "files": ["./index.html", "./about.html"]
 }
 ```
 

example/.html-w3c-validatorrc.json

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

example/package.json

@@ -2,8 +2,8 @@
   "name": "example",
   "private": true,
   "scripts": {
-    "start": "serve ./build",
+    "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://localhost:3000\" \"html-w3c-validator\""
   },
   "devDependencies": {
     "serve": "13.0.2",

jest.config.json

@@ -1,9 +0,0 @@
-{
-  "testEnvironment": "node",
-  "resolver": "jest-ts-webcompat-resolver",
-  "transform": {
-    "^.+\\.(t|j)sx?$": ["@swc/jest"]
-  },
-  "rootDir": "./src",
-  "setupFiles": ["<rootDir>/__test__/setup.ts"]
-}

package.json

@@ -1,7 +1,9 @@
 {
   "name": "html-w3c-validator",
   "version": "0.0.0-development",
+  "public": true,
   "description": "CLI for validating multiple html pages using validator.w3.org.",
+  "type": "module",
   "author": "Divlo <contact@divlo.fr>",
   "license": "MIT",
   "repository": {
@@ -31,57 +33,53 @@
     "build": "rimraf ./build && swc ./src --out-dir ./build && tsc",
     "lint:commit": "commitlint",
     "lint:editorconfig": "editorconfig-checker",
-    "lint:markdown": "markdownlint '**/*.md' --dot --ignore node_modules",
+    "lint:markdown": "markdownlint \"**/*.md\" --dot --ignore-path \".gitignore\"",
-    "lint:typescript": "eslint '**/*.{js,ts,jsx,tsx}'",
+    "lint:typescript": "eslint \"**/*.{js,jsx,ts,tsx}\" --ignore-path \".gitignore\"",
-    "lint:prettier": "prettier '.' --check",
+    "lint:prettier": "prettier \".\" --check --ignore-path \".gitignore\"",
     "lint:staged": "lint-staged",
-    "test": "jest",
+    "test": "tap",
     "release": "semantic-release",
     "postinstall": "husky install",
     "prepublishOnly": "pinst --disable",
     "postpublish": "pinst --enable"
   },
   "dependencies": {
-    "chalk": "4.1.2",
+    "chalk": "5.0.1",
     "clipanion": "3.1.0",
     "html-validator": "6.0.0",
-    "ora": "5.4.1",
+    "ora": "6.1.0",
-    "read-pkg": "5.2.0",
+    "read-pkg": "7.1.0",
     "table": "6.8.0"
   },
   "devDependencies": {
-    "@commitlint/cli": "16.0.1",
+    "@commitlint/cli": "16.2.3",
-    "@commitlint/config-conventional": "16.0.0",
+    "@commitlint/config-conventional": "16.2.1",
-    "@swc/cli": "0.1.55",
+    "@swc/cli": "0.1.57",
-    "@swc/core": "1.2.127",
+    "@swc/core": "1.2.163",
-    "@swc/jest": "0.2.15",
     "@types/html-validator": "5.0.2",
-    "@types/jest": "27.4.0",
     "@types/mock-fs": "4.13.1",
-    "@types/node": "17.0.8",
+    "@types/node": "17.0.23",
+    "@types/tap": "15.0.6",
+    "@typescript-eslint/eslint-plugin": "5.18.0",
     "editorconfig-checker": "4.0.2",
-    "eslint": "7.32.0",
+    "eslint": "8.12.0",
-    "eslint-config-prettier": "8.3.0",
+    "eslint-config-conventions": "2.0.0",
-    "eslint-config-standard-with-typescript": "21.0.1",
+    "eslint-config-prettier": "8.5.0",
-    "eslint-plugin-import": "2.25.4",
+    "eslint-plugin-import": "2.26.0",
-    "eslint-plugin-node": "11.1.0",
     "eslint-plugin-prettier": "4.0.0",
-    "eslint-plugin-promise": "5.1.1",
+    "eslint-plugin-promise": "6.0.0",
-    "eslint-plugin-unicorn": "40.0.0",
+    "eslint-plugin-unicorn": "42.0.0",
-    "execa": "5.1.1",
+    "execa": "6.1.0",
     "husky": "7.0.4",
-    "jest": "27.4.7",
+    "lint-staged": "12.3.7",
-    "jest-mock-extended": "2.0.4",
+    "markdownlint-cli": "0.31.1",
-    "jest-ts-webcompat-resolver": "1.0.0",
-    "lint-staged": "12.1.5",
-    "markdownlint-cli": "0.30.0",
     "mock-fs": "5.1.2",
-    "npm": "8.3.0",
+    "pinst": "3.0.0",
-    "pinst": "2.1.6",
+    "prettier": "2.6.2",
-    "prettier": "2.5.1",
     "rimraf": "3.0.2",
-    "semantic-release": "18.0.1",
+    "semantic-release": "19.0.2",
     "serve": "13.0.2",
-    "typescript": "4.5.4"
+    "tap": "16.0.1",
+    "typescript": "4.6.3"
   }
 }

src/HTMLValidatorCommand.ts

@@ -4,7 +4,10 @@ import fs from 'node:fs'
 import { Command } from 'clipanion'
 import chalk from 'chalk'
 import ora from 'ora'
-import validateHTML, { ValidationMessageLocationObject } from 'html-validator'
+import validateHTML, {
+  ValidationMessageLocationObject,
+  ParsedJsonAsValidationResults
+} from 'html-validator'
 import { table } from 'table'
 
 import { isExistingPath } from './utils/isExistingPath.js'
@@ -13,11 +16,12 @@ const CURRENT_DIRECTORY = process.cwd()
 const CONFIG_FILE_NAME = '.html-w3c-validatorrc.json'
 
 interface Config {
-  urls: string[]
+  urls?: string[]
+  files?: string[]
 }
 
 interface Error {
-  url: string
+  data: string
   messagesTable: string[][]
 }
 
@@ -39,59 +43,104 @@ export class HTMLValidatorCommand extends Command {
       const configData = await fs.promises.readFile(configPath, {
         encoding: 'utf-8'
       })
-      let config: Config = { urls: [] }
+      let config: Config = { urls: [], files: [] }
       let isValidConfig = true
       try {
         config = JSON.parse(configData)
       } catch {
         isValidConfig = false
       }
-      isValidConfig = isValidConfig && Array.isArray(config.urls)
+      isValidConfig =
+        isValidConfig &&
+        (Array.isArray(config.urls) || Array.isArray(config.urls))
       if (!isValidConfig) {
         throw new Error(
           `Invalid config file at ${configPath}. Please check the syntax.`
         )
       }
-
+      const urls =
+        config.urls == null
+          ? []
+          : config.urls.map((url) => {
+              return { type: 'url', data: url }
+            })
+      const files =
+        config.files == null
+          ? []
+          : config.files.map((file) => {
+              return { type: 'file', data: file }
+            })
+      const dataToValidate = [...urls, ...files]
       const errors: Error[] = []
       let isValid = true
-      for (const url of config.urls) {
+      for (const { data, type } of dataToValidate) {
-        const loader = ora(`Validating ${url}`).start()
+        const loader = ora(`Validating ${data}`).start()
-        const result = await validateHTML({
+        try {
-          url,
+          const options = {
-          format: 'json',
+            format: 'json' as 'json' | undefined
-          isLocal: true
+          }
-        })
+          let result: ParsedJsonAsValidationResults | undefined
-        const isValidHTML = result.messages.length === 0
+          if (type === 'url') {
-        if (isValidHTML) {
+            result = await validateHTML({
-          loader.succeed()
+              url: data,
-        } else {
+              isLocal: true,
-          loader.fail()
+              ...options
-          const messagesTable: string[][] = []
+            })
-          for (const message of result.messages) {
+          } else if (type === 'file') {
-            const row: string[] = []
+            const htmlPath = path.resolve(CURRENT_DIRECTORY, data)
-            if (message.type === 'error') {
+            if (!(await isExistingPath(htmlPath))) {
-              row.push(chalk.red(message.type))
+              throw new Error(
-            } else {
+                `No file found at ${htmlPath}. Please check the path.`
-              row.push(chalk.yellow(message.type))
-            }
-            row.push(message.message)
-            const violation = message as ValidationMessageLocationObject
-            if (violation.extract != null) {
-              row.push(
-                `line: ${violation.lastLine}, column: ${violation.firstColumn}-${violation.lastColumn}`
               )
             }
-            messagesTable.push(row)
+            const html = await fs.promises.readFile(htmlPath, {
+              encoding: 'utf-8'
+            })
+            result = await validateHTML({
+              data: html,
+              ...options
+            })
+          } else {
+            throw new Error('Invalid type')
           }
-          errors.push({ url, messagesTable })
+          const isValidHTML = result.messages.length === 0
+          if (isValidHTML) {
+            loader.succeed()
+          } else {
+            loader.fail()
+            const messagesTable: string[][] = []
+            for (const message of result.messages) {
+              const row: string[] = []
+              if (message.type === 'error') {
+                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) {
+                row.push(
+                  `line: ${violation.lastLine}, column: ${violation.firstColumn}-${violation.lastColumn}`
+                )
+              }
+              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) {
         for (const error of errors) {
-          console.error(`\n${error.url}`)
+          console.error(`\n${error.data}`)
           console.error(table(error.messagesTable))
           console.error('------------------------------')
         }

src/__test__/HTMLValidatorCommand.test.ts

@@ -1,26 +1,21 @@
-import path from 'node:path'
+import tap from 'tap'
-
+import { execa } from 'execa'
-import execa from 'execa'
 
 import { cli } from '../cli.js'
 import { HTMLValidatorCommand } from '../HTMLValidatorCommand.js'
 
-describe('html-w3c-validator', () => {
+await tap.test('html-w3c-validator', async (t) => {
-  afterEach(() => {
+  await t.test('should be instance of the command', async (t) => {
-    jest.clearAllMocks()
-  })
-
-  it('should be instance of the command', async () => {
     const command = cli.process([])
-    expect(command).toBeInstanceOf(HTMLValidatorCommand)
+    t.equal(command instanceof HTMLValidatorCommand, true)
   })
 
-  it('succeeds and validate the html correctly', async () => {
+  await t.test('succeeds and validate the html correctly', async (t) => {
-    const examplePath = path.join(__dirname, '..', '..', 'example')
+    const exampleURL = new URL('../../example', import.meta.url)
-    process.chdir(examplePath)
+    process.chdir(exampleURL.pathname)
     await execa('rimraf', ['node_modules'])
     await execa('npm', ['install'])
     const { exitCode } = await execa('npm', ['run', 'test:html-w3c-validator'])
-    expect(exitCode).toEqual(0)
+    t.equal(exitCode, 0)
   })
 })

src/__test__/setup.ts

@@ -1 +0,0 @@
-jest.setTimeout(60000)

src/cli.ts

@@ -1,11 +1,7 @@
-import path from 'node:path'
-
 import { Builtins, Cli } from 'clipanion'
-import readPackage from 'read-pkg'
 
 import { HTMLValidatorCommand } from './HTMLValidatorCommand.js'
-
+import { packageJSON } from './packageJSON.js'
-const packageJSON = readPackage.sync({ cwd: path.join(__dirname, '..') })
 
 export const cli = new Cli({
   binaryLabel: packageJSON.name,

src/index.ts

@@ -1,12 +1,8 @@
 #!/usr/bin/env node
-import chalk from 'chalk'
 import { Cli } from 'clipanion'
 
 import { cli } from './cli.js'
 
 const [, , ...arguments_] = process.argv
 
-cli.runExit(arguments_, Cli.defaultContext).catch(() => {
+await cli.runExit(arguments_, Cli.defaultContext)
-  console.error(chalk.red('Error occurred...'))
-  process.exit(1)
-})

src/packageJSON.ts

@@ -0,0 +1,5 @@
+import { readPackage } from 'read-pkg'
+
+export const packageJSON = await readPackage({
+  cwd: new URL('..', import.meta.url)
+})

src/utils/__test__/isExistingPath.test.ts

@@ -1,29 +1,24 @@
 import fsMock from 'mock-fs'
+import tap from 'tap'
 
 import { isExistingPath } from '../isExistingPath.js'
 
-describe('utils/isExistingFile', () => {
+await tap.test('utils/isExistingPath', async (t) => {
-  afterEach(async () => {
+  t.afterEach(() => {
     fsMock.restore()
   })
 
-  it('should return true if the file exists', async () => {
+  await t.test('should return true if the file exists', async () => {
-    fsMock(
+    fsMock({
-      {
+      '/file.txt': ''
-        '/file.txt': ''
+    })
-      },
+    t.equal(await isExistingPath('/file.txt'), true)
-      { createCwd: false }
-    )
-    expect(await isExistingPath('/file.txt')).toBeTruthy()
   })
 
-  it("should return false if the file doesn't exists", async () => {
+  await t.test("should return false if the file doesn't exists", async () => {
-    fsMock(
+    fsMock({
-      {
+      '/file.txt': ''
-        '/file.txt': ''
+    })
-      },
+    t.equal(await isExistingPath('/randomfile.txt'), false)
-      { createCwd: false }
-    )
-    expect(await isExistingPath('/randomfile.txt')).toBeFalsy()
   })
 })

tsconfig.json

@@ -1,7 +1,7 @@
 {
   "compilerOptions": {
     "target": "ESNext",
-    "module": "commonjs",
+    "module": "ESNext",
     "lib": ["ESNext"],
     "moduleResolution": "node",
     "outDir": "./build",