w3c-html-validator 1.8.2 → 1.9.0

package/LICENSE.txt

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021-2024 Individual contributors to w3c-html-validator
+Copyright (c) 2021-2025 Individual contributors to w3c-html-validator
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -158,7 +158,7 @@ Setting `ignoreLevel` to `'warning'` skips both `'warning'` level and `'info'` l
 
 ### 3. TypeScript declarations
 See the TypeScript declarations at the top of the
-[w3c-html-validator.ts](w3c-html-validator.ts) file.
+[w3c-html-validator.ts](src/w3c-html-validator.ts) file.
 
 The output of the `w3cHtmlValidator.validate(options: ValidatorOptions)` function is a **promise**
 for a `ValidatorResults` object:

package/bin/cli.js

@@ -29,25 +29,23 @@ import fs from 'fs';
 import slash from 'slash';
 
 // Parameters and flags
-const validFlags = ['continue', 'delay', 'dry-run', 'exclude', 'ignore', 'ignore-config', 'note', 'quiet', 'trim'];
+const validFlags =
+   ['continue', 'delay', 'dry-run', 'exclude', 'ignore', 'ignore-config', 'note', 'quiet', 'trim'];
 const cli =          cliArgvUtil.parse(validFlags);
-const files =        cli.params;
+const files =        cli.params.length ? cli.params.map(cliArgvUtil.cleanPath) : ['.'];
 const ignore =       cli.flagMap.ignore ?? null;
 const ignoreConfig = cli.flagMap.ignoreConfig ?? null;
 const delay =        Number(cli.flagMap.delay) || 500;  //default half second debounce pause
 const trim =         Number(cli.flagMap.trim) || null;
 const dryRunMode =   cli.flagOn.dryRun || process.env.w3cHtmlValidator === 'dry-run';  //bash: export w3cHtmlValidator=dry-run
 
-// Validator
-const globOptions =  { ignore: '**/node_modules/**/*' };
-const keep =         (filename) => !filename.includes('node_modules/');
-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 getFilenames = () => getAllPaths().map(expandFolder).flat().filter(keep).sort();
-const list =         files.length ? getFilenames() : readFolder('');
-const excludes =     cli.flagMap.exclude?.split(',') ?? [];
-const filenames =    list.filter(name => !excludes.find(exclude => name.includes(exclude)));
+const getFilenames = () => {
+   const readFilenames = (file) => globSync(file, { ignore: '**/node_modules/**/*' }).map(slash);
+   const readHtmlFiles = (folder) => readFilenames(folder + '/**/*.html');
+   const addHtml =       (file) => fs.lstatSync(file).isDirectory() ? readHtmlFiles(file) : file;
+   return files.map(readFilenames).flat().map(addHtml).flat().sort();
+   };
+const filenames = getFilenames();
 const error =
    cli.invalidFlag ?          cli.invalidFlagMsg :
    !filenames.length ?        'No files to validate.' :

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

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

package/dist/w3c-html-validator.js

@@ -1,4 +1,4 @@
-//! w3c-html-validator v1.8.2 ~~ https://github.com/center-key/w3c-html-validator ~~ MIT License
+//! w3c-html-validator v1.9.0 ~~ https://github.com/center-key/w3c-html-validator ~~ MIT License
 
 import chalk from 'chalk';
 import fs from 'fs';
@@ -6,7 +6,7 @@ import log from 'fancy-log';
 import request from 'superagent';
 import slash from 'slash';
 const w3cHtmlValidator = {
-    version: '1.8.2',
+    version: '1.9.0',
     validate(options) {
         const defaults = {
             checkUrl: 'https://validator.w3.org/nu/',
@@ -94,7 +94,7 @@ const w3cHtmlValidator = {
         };
         const settings = { ...defaults, ...options };
         if (typeof results?.validates !== 'boolean')
-            throw new Error('[w3c-html-validator] Invalid results for reporter(): ' + String(results));
+            throw new Error(`[w3c-html-validator] Invalid results for reporter(): ${results}`);
         const messages = results.messages ?? [];
         const title = settings.title ?? results.title;
         const status = results.validates ? chalk.green.bold('✔ pass') : chalk.red.bold('✘ fail');
@@ -123,7 +123,7 @@ const w3cHtmlValidator = {
             return !results.filename ? results.messages[0].message : fileDetails();
         };
         if (!settings.continueOnFail && !results.validates)
-            throw new Error('[w3c-html-validator] Failed: ' + failDetails());
+            throw new Error(`[w3c-html-validator] Failed: ${failDetails()}`);
         return results;
     },
 };

package/package.json

@@ -1,6 +1,6 @@
 {
    "name": "w3c-html-validator",
-   "version": "1.8.2",
+   "version": "1.9.0",
    "description": "Check the markup validity of HTML files using the W3C validator",
    "license": "MIT",
    "type": "module",
@@ -57,29 +57,29 @@
       "examples": "node examples.js"
    },
    "dependencies": {
-      "chalk": "~5.3",
-      "cli-argv-util": "~1.2",
+      "chalk": "~5.4",
+      "cli-argv-util": "~1.3",
       "fancy-log": "~2.0",
       "glob": "~11.0",
       "slash": "~5.1",
-      "superagent": "~9.0"
+      "superagent": "~10.2"
    },
    "devDependencies": {
-      "@eslint/js": "~9.9",
+      "@eslint/js": "~9.30",
       "@types/fancy-log": "~2.0",
-      "@types/node": "~22.2",
+      "@types/node": "~24.0",
       "@types/superagent": "~8.1",
       "add-dist-header": "~1.4",
       "assert-deep-strict-equal": "~1.2",
       "copy-file-util": "~1.2",
       "copy-folder-util": "~1.1",
-      "eslint": "~9.9",
+      "eslint": "~9.30",
       "jshint": "~2.13",
       "merge-stream": "~2.0",
-      "mocha": "~10.7",
+      "mocha": "~11.7",
       "rimraf": "~6.0",
       "run-scripts-util": "~1.3",
-      "typescript": "~5.5",
-      "typescript-eslint": "~8.0"
+      "typescript": "~5.8",
+      "typescript-eslint": "~8.36"
    }
 }