w3c-html-validator 1.6.0 → 1.6.2

package/README.md

@@ -78,7 +78,7 @@ Examples:
    Uses a regex with "or" operators (`|`) to skip multiple HTML validation messages.
 
    - `html-validator docs --ignore-config=spec/ignore-config.txt`<br>
-   Similar to the pervious command but strings and regexes are stored in a configuration file (see the _Ignore Configuration File_ section below).
+   Similar to the pervious command but strings and regexes are stored in a configuration file (see the _Configuration File for Ignore Patterns_ section below).
 
    - `html-validator --quiet`<br>
    Suppresses all the "pass" status messages.
@@ -91,7 +91,7 @@ Examples:
 
 _**Note:** Single quotes in commands are normalized so they work cross-platform and avoid the errors often encountered on Microsoft Windows._
 
-### 5. Ignore Configuration File
+### 5. Configuration File for Ignore Patterns
 The optional `--ignore-config=FILENAME` flag specifies a configuration file with one string or regex per line.&nbsp;
 HTML validation messages containing any of the strings or matching any of the regexes will be skipped.&nbsp;
 Empty lines and lines starting with a hash sign (`#`) are treated as comments and do nothing.

package/bin/cli.js

@@ -26,6 +26,7 @@ import { cliArgvUtil } from 'cli-argv-util';
 import { globSync } from 'glob';
 import { w3cHtmlValidator } from '../dist/w3c-html-validator.js';
 import fs from 'fs';
+import slash from 'slash';
 
 // Parameters and flags
 const validFlags = ['continue', 'delay', 'exclude', 'ignore', 'ignore-config', 'note', 'quiet', 'trim'];
@@ -39,9 +40,9 @@ const trim =         Number(cli.flagMap.trim) || null;
 // Validator
 const globOptions =  { ignore: '**/node_modules/**/*' };
 const keep =         (filename) => !filename.includes('node_modules/');
-const readFolder =   (folder) => globSync(folder + '**/*.html', globOptions);
+const readFolder =   (folder) => globSync(slash(folder + '**/*.html'), globOptions);
+const getAllPaths =  () => files.map(file => globSync(slash(file), globOptions)).flat();
 const expandFolder = (file) => fs.lstatSync(file).isDirectory() ? readFolder(file + '/') : file;
-const getAllPaths =  () => files.map(file => globSync(file, globOptions)).flat();
 const getFilenames = () => getAllPaths().map(expandFolder).flat().filter(keep).sort();
 const list =         files.length ? getFilenames() : readFolder('');
 const excludes =     cli.flagMap.exclude?.split(',') ?? [];

package/dist/w3c-html-validator.d.ts

@@ -1,4 +1,4 @@
-//! w3c-html-validator v1.6.0 ~~ https://github.com/center-key/w3c-html-validator ~~ MIT License
+//! w3c-html-validator v1.6.2 ~~ https://github.com/center-key/w3c-html-validator ~~ MIT License
 
 export type ValidatorSettings = {
     html: string;

package/dist/w3c-html-validator.js

@@ -1,11 +1,12 @@
-//! w3c-html-validator v1.6.0 ~~ https://github.com/center-key/w3c-html-validator ~~ MIT License
+//! w3c-html-validator v1.6.2 ~~ https://github.com/center-key/w3c-html-validator ~~ MIT License
 
 import chalk from 'chalk';
 import fs from 'fs';
 import log from 'fancy-log';
 import request from 'superagent';
+import slash from 'slash';
 const w3cHtmlValidator = {
-    version: '1.6.0',
+    version: '1.6.2',
     validate(options) {
         const defaults = {
             checkUrl: 'https://validator.w3.org/nu/',
@@ -20,9 +21,10 @@ const w3cHtmlValidator = {
             throw Error('[w3c-html-validator] Invalid ignoreLevel option: ' + settings.ignoreLevel);
         if (settings.output !== 'json' && settings.output !== 'html')
             throw Error('[w3c-html-validator] Option "output" must be "json" or "html".');
-        const mode = settings.html ? 'html' : settings.filename ? 'filename' : 'website';
+        const filename = settings.filename ? slash(settings.filename) : null;
+        const mode = settings.html ? 'html' : filename ? 'filename' : 'website';
         const readFile = (filename) => fs.readFileSync(filename, 'utf-8').replace(/\r/g, '');
-        const inputHtml = settings.html ?? (settings.filename ? readFile(settings.filename) : null);
+        const inputHtml = settings.html ?? (filename ? readFile(filename) : null);
         const makePostRequest = () => request.post(settings.checkUrl)
             .set('Content-Type', 'text/html; encoding=utf-8')
             .send(inputHtml);
@@ -35,7 +37,7 @@ const w3cHtmlValidator = {
         const success = '<p class="success">';
         const titleLookup = {
             html: 'HTML String (characters: ' + inputHtml?.length + ')',
-            filename: settings.filename,
+            filename: filename,
             website: settings.website,
         };
         const filterMessages = (response) => {
@@ -52,7 +54,7 @@ const w3cHtmlValidator = {
             mode: mode,
             title: titleLookup[mode],
             html: inputHtml,
-            filename: settings.filename || null,
+            filename: filename,
             website: settings.website || null,
             output: settings.output,
             status: response.statusCode || -1,
@@ -63,8 +65,8 @@ const w3cHtmlValidator = {
             const response = reason.response;
             const getMsg = () => [response.status, response.res.statusMessage, response.request.url];
             const message = response ? getMsg() : [reason.errno, reason.message];
-            const networkErr = { type: 'network-error', message: message.join(' ') };
-            return toValidatorResults({ ...response, ...{ body: { messages: [networkErr] } } });
+            response.body = { messages: [{ type: 'network-error', message: message.join(' ') }] };
+            return toValidatorResults(response);
         };
         return w3cRequest.then(filterMessages).then(toValidatorResults).catch(handleError);
     },

package/package.json

@@ -1,6 +1,6 @@
 {
    "name": "w3c-html-validator",
-   "version": "1.6.0",
+   "version": "1.6.2",
    "description": "Check the markup validity of HTML files using the W3C validator",
    "license": "MIT",
    "type": "module",
@@ -86,25 +86,26 @@
       "cli-argv-util": "~1.2",
       "fancy-log": "~2.0",
       "glob": "~10.3",
+      "slash": "~5.1",
       "superagent": "~8.1"
    },
    "devDependencies": {
       "@types/fancy-log": "~2.0",
       "@types/glob": "~8.1",
-      "@types/node": "~20.8",
-      "@types/superagent": "~4.1",
-      "@typescript-eslint/eslint-plugin": "~6.9",
-      "@typescript-eslint/parser": "~6.9",
+      "@types/node": "~20.10",
+      "@types/superagent": "~8.1",
+      "@typescript-eslint/eslint-plugin": "~6.15",
+      "@typescript-eslint/parser": "~6.15",
       "add-dist-header": "~1.3",
       "assert-deep-strict-equal": "~1.1",
       "copy-file-util": "~1.1",
       "copy-folder-util": "~1.1",
-      "eslint": "~8.53",
+      "eslint": "~8.56",
       "jshint": "~2.13",
       "merge-stream": "~2.0",
       "mocha": "~10.2",
       "rimraf": "~5.0",
       "run-scripts-util": "~1.2",
-      "typescript": "~5.2"
+      "typescript": "~5.3"
    }
 }