html-validate 10.1.1 → 10.1.2

package/dist/cjs/cli.js

@@ -3,14 +3,13 @@
 var coreNodejs = require('./core-nodejs.js');
 var core = require('./core.js');
 var path$1 = require('node:path/posix');
-var fs = require('fs');
+var fs = require('node:fs');
 var path = require('node:path');
 var glob = require('glob');
 var prompts = require('prompts');
 require('./meta-helper.js');
-var fs$1 = require('node:fs');
-var betterAjvErrors = require('@sidvind/better-ajv-errors');
 var kleur = require('kleur');
+var betterAjvErrors = require('@sidvind/better-ajv-errors');
 
 var _documentCurrentScript = typeof document !== 'undefined' ? document.currentScript : null;
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
@@ -19,9 +18,8 @@ var path__default$1 = /*#__PURE__*/_interopDefault(path$1);
 var fs__default = /*#__PURE__*/_interopDefault(fs);
 var path__default = /*#__PURE__*/_interopDefault(path);
 var prompts__default = /*#__PURE__*/_interopDefault(prompts);
-var fs__default$1 = /*#__PURE__*/_interopDefault(fs$1);
-var betterAjvErrors__default = /*#__PURE__*/_interopDefault(betterAjvErrors);
 var kleur__default = /*#__PURE__*/_interopDefault(kleur);
+var betterAjvErrors__default = /*#__PURE__*/_interopDefault(betterAjvErrors);
 
 const DEFAULT_EXTENSIONS = ["html"];
 function isDirectory(filename) {
@@ -112,55 +110,34 @@ function getFormatter(formatters) {
   };
 }
 
-class IsIgnored {
-  /** Cache for parsed .htmlvalidateignore files */
-  cacheIgnore;
-  constructor() {
-    this.cacheIgnore = /* @__PURE__ */ new Map();
-  }
-  /**
-   * Searches ".htmlvalidateignore" files from filesystem and returns `true` if
-   * one of them contains a pattern matching given filename.
-   */
-  isIgnored(filename) {
-    return this.match(filename);
-  }
-  /**
-   * Clear cache
-   */
-  clearCache() {
-    this.cacheIgnore.clear();
-  }
-  match(target) {
-    let current = path__default.default.dirname(target);
-    while (true) {
-      const relative = path__default.default.relative(current, target);
-      const filename = path__default.default.join(current, ".htmlvalidateignore");
-      const ig = this.parseFile(filename);
-      if (ig?.ignores(relative)) {
-        return true;
-      }
-      const child = current;
-      current = path__default.default.dirname(current);
-      if (current === child) {
-        break;
-      }
-    }
-    return false;
+function parseSeverity(ruleId, severity) {
+  switch (severity) {
+    case "off":
+    case "0":
+      return "off";
+    case "warn":
+    case "1":
+      return "warn";
+    case "error":
+    case "2":
+      return "error";
+    default:
+      throw new Error(`Invalid severity "${severity}" for rule "${ruleId}"`);
   }
-  parseFile(filename) {
-    if (this.cacheIgnore.has(filename)) {
-      return this.cacheIgnore.get(filename);
-    }
-    if (!fs__default.default.existsSync(filename)) {
-      this.cacheIgnore.set(filename, void 0);
-      return void 0;
-    }
-    const content = fs__default.default.readFileSync(filename, "utf-8");
-    const ig = core.ignore().add(content);
-    this.cacheIgnore.set(filename, ig);
-    return ig;
+}
+
+function parseItem(value) {
+  const [ruleId, severity = "error"] = value.split(":", 2);
+  return { ruleId, severity: parseSeverity(ruleId, severity) };
+}
+function getRuleConfig(values) {
+  if (typeof values === "string") {
+    return getRuleConfig([values]);
   }
+  return values.reduce((parsedRules, value) => {
+    const { ruleId, severity } = parseItem(value.trim());
+    return { [ruleId]: severity, ...parsedRules };
+  }, {});
 }
 
 const frameworkConfig = {
@@ -236,34 +213,55 @@ async function init$1(cwd) {
   };
 }
 
-function parseSeverity(ruleId, severity) {
-  switch (severity) {
-    case "off":
-    case "0":
-      return "off";
-    case "warn":
-    case "1":
-      return "warn";
-    case "error":
-    case "2":
-      return "error";
-    default:
-      throw new Error(`Invalid severity "${severity}" for rule "${ruleId}"`);
+class IsIgnored {
+  /** Cache for parsed .htmlvalidateignore files */
+  cacheIgnore;
+  constructor() {
+    this.cacheIgnore = /* @__PURE__ */ new Map();
   }
-}
-
-function parseItem(value) {
-  const [ruleId, severity = "error"] = value.split(":", 2);
-  return { ruleId, severity: parseSeverity(ruleId, severity) };
-}
-function getRuleConfig(values) {
-  if (typeof values === "string") {
-    return getRuleConfig([values]);
+  /**
+   * Searches ".htmlvalidateignore" files from filesystem and returns `true` if
+   * one of them contains a pattern matching given filename.
+   */
+  isIgnored(filename) {
+    return this.match(filename);
+  }
+  /**
+   * Clear cache
+   */
+  clearCache() {
+    this.cacheIgnore.clear();
+  }
+  match(target) {
+    let current = path__default.default.dirname(target);
+    while (true) {
+      const relative = path__default.default.relative(current, target);
+      const filename = path__default.default.join(current, ".htmlvalidateignore");
+      const ig = this.parseFile(filename);
+      if (ig?.ignores(relative)) {
+        return true;
+      }
+      const child = current;
+      current = path__default.default.dirname(current);
+      if (current === child) {
+        break;
+      }
+    }
+    return false;
+  }
+  parseFile(filename) {
+    if (this.cacheIgnore.has(filename)) {
+      return this.cacheIgnore.get(filename);
+    }
+    if (!fs__default.default.existsSync(filename)) {
+      this.cacheIgnore.set(filename, void 0);
+      return void 0;
+    }
+    const content = fs__default.default.readFileSync(filename, "utf-8");
+    const ig = core.ignore().add(content);
+    this.cacheIgnore.set(filename, ig);
+    return ig;
   }
-  return values.reduce((parsedRules, value) => {
-    const { ruleId, severity } = parseItem(value.trim());
-    return { [ruleId]: severity, ...parsedRules };
-  }, {});
 }
 
 const resolver = coreNodejs.esmResolver();
@@ -391,51 +389,53 @@ class CLI {
   }
 }
 
-function prettyError(err) {
-  let json;
-  if (err.filename && fs__default$1.default.existsSync(err.filename)) {
-    json = fs__default$1.default.readFileSync(err.filename, "utf-8");
-  }
-  return betterAjvErrors__default.default(err.schema, err.obj, err.errors, {
-    format: "cli",
-    indent: 2,
-    json
-  });
+const jsonIgnored = [
+  "annotation",
+  "blockedRules",
+  "cache",
+  "closed",
+  "depth",
+  "disabledRules",
+  "nodeType",
+  "unique",
+  "voidElement"
+];
+const jsonFiltered = [
+  "childNodes",
+  "children",
+  "data",
+  "meta",
+  "metaElement",
+  "originalData",
+  "parent"
+];
+function isLocation(key, value) {
+  return Boolean(value && (key === "location" || key.endsWith("Location")));
 }
-function handleSchemaValidationError(console, err) {
-  if (err.filename) {
-    const filename = path__default.default.relative(process.cwd(), err.filename);
-    console.error(kleur__default.default.red(`A configuration error was found in "${filename}":`));
-  } else {
-    console.error(kleur__default.default.red(`A configuration error was found:`));
-  }
-  console.group();
-  {
-    console.error(prettyError(err));
-  }
-  console.groupEnd();
+function isIgnored(key) {
+  return key.startsWith("_") || jsonIgnored.includes(key);
 }
-
-class ImportResolveMissingError extends core.UserError {
-  constructor() {
-    const message = `import.meta.resolve(..) is not available on this system`;
-    super(message);
-    Error.captureStackTrace(this, ImportResolveMissingError);
-    this.name = ImportResolveMissingError.name;
+function isFiltered(key, value) {
+  return Boolean(value && jsonFiltered.includes(key));
+}
+function eventReplacer(key, value) {
+  if (isLocation(key, value)) {
+    const filename = value.filename;
+    const line = String(value.line);
+    const column = String(value.column);
+    return `${filename}:${line}:${column}`;
   }
-  prettyFormat() {
-    const { message } = this;
-    const currentVersion = process.version;
-    const requiredVersion = core.engines.node.split("||").map((it) => `v${it.replace(/^[^\d]+/, "").trim()}`);
-    return [
-      kleur__default.default.red(`Error: ${message}.`),
-      "",
-      `Either ensure you are running a supported NodeJS version:`,
-      `  Current:  ${currentVersion}`,
-      `  Required: ${requiredVersion.join(", ")} or later`,
-      `Or set NODE_OPTIONS="--experimental-import-meta-resolve"`
-    ].join("\n");
+  if (isIgnored(key)) {
+    return void 0;
   }
+  if (isFiltered(key, value)) {
+    return "[truncated]";
+  }
+  return value;
+}
+function eventFormatter(entry) {
+  const strdata = JSON.stringify(entry.data, eventReplacer, 2);
+  return `${entry.event}: ${strdata}`;
 }
 
 var Mode = /* @__PURE__ */ ((Mode2) => {
@@ -467,6 +467,48 @@ function modeToFlag(mode) {
   }
 }
 
+async function dump(htmlvalidate, output, files, mode) {
+  let lines;
+  switch (mode) {
+    case Mode.DUMP_EVENTS:
+      lines = files.map(async (filename) => {
+        const lines2 = await htmlvalidate.dumpEvents(filename);
+        return lines2.map(eventFormatter);
+      });
+      break;
+    case Mode.DUMP_TOKENS:
+      lines = files.map(async (filename) => {
+        const lines2 = await htmlvalidate.dumpTokens(filename);
+        return lines2.map((entry) => {
+          const data = JSON.stringify(entry.data);
+          return `TOKEN: ${entry.token}
+  Data: ${data}
+  Location: ${entry.location}`;
+        });
+      });
+      break;
+    case Mode.DUMP_TREE:
+      lines = files.map((filename) => htmlvalidate.dumpTree(filename));
+      break;
+    case Mode.DUMP_SOURCE:
+      lines = files.map((filename) => htmlvalidate.dumpSource(filename));
+      break;
+    default:
+      throw new Error(`Unknown mode "${String(mode)}"`);
+  }
+  const flat = (await Promise.all(lines)).reduce((s, c) => s.concat(c), []);
+  output.write(flat.join("\n"));
+  output.write("\n");
+  return Promise.resolve(true);
+}
+
+async function init(cli, output, options) {
+  const result = await cli.init(options.cwd);
+  output.write(`Configuration written to "${result.filename}"
+`);
+  return true;
+}
+
 function renameStdin(report, filename) {
   const stdin = report.results.find((cur) => cur.filePath === "/dev/stdin");
   if (stdin) {
@@ -501,13 +543,6 @@ html-validate found too many warnings (maximum: ${String(options.maxWarnings)}).
   return merged.valid;
 }
 
-async function init(cli, output, options) {
-  const result = await cli.init(options.cwd);
-  output.write(`Configuration written to "${result.filename}"
-`);
-  return true;
-}
-
 async function printConfig(htmlvalidate, output, files) {
   if (files.length > 1) {
     output.write(`\`--print-config\` expected a single filename but got multiple:
@@ -527,88 +562,51 @@ async function printConfig(htmlvalidate, output, files) {
   return true;
 }
 
-const jsonIgnored = [
-  "annotation",
-  "blockedRules",
-  "cache",
-  "closed",
-  "depth",
-  "disabledRules",
-  "nodeType",
-  "unique",
-  "voidElement"
-];
-const jsonFiltered = [
-  "childNodes",
-  "children",
-  "data",
-  "meta",
-  "metaElement",
-  "originalData",
-  "parent"
-];
-function isLocation(key, value) {
-  return Boolean(value && (key === "location" || key.endsWith("Location")));
-}
-function isIgnored(key) {
-  return key.startsWith("_") || jsonIgnored.includes(key);
-}
-function isFiltered(key, value) {
-  return Boolean(value && jsonFiltered.includes(key));
-}
-function eventReplacer(key, value) {
-  if (isLocation(key, value)) {
-    const filename = value.filename;
-    const line = String(value.line);
-    const column = String(value.column);
-    return `${filename}:${line}:${column}`;
+function prettyError(err) {
+  let json;
+  if (err.filename && fs__default.default.existsSync(err.filename)) {
+    json = fs__default.default.readFileSync(err.filename, "utf-8");
   }
-  if (isIgnored(key)) {
-    return void 0;
+  return betterAjvErrors__default.default(err.schema, err.obj, err.errors, {
+    format: "cli",
+    indent: 2,
+    json
+  });
+}
+function handleSchemaValidationError(console, err) {
+  if (err.filename) {
+    const filename = path__default.default.relative(process.cwd(), err.filename);
+    console.error(kleur__default.default.red(`A configuration error was found in "${filename}":`));
+  } else {
+    console.error(kleur__default.default.red(`A configuration error was found:`));
   }
-  if (isFiltered(key, value)) {
-    return "[truncated]";
+  console.group();
+  {
+    console.error(prettyError(err));
   }
-  return value;
-}
-function eventFormatter(entry) {
-  const strdata = JSON.stringify(entry.data, eventReplacer, 2);
-  return `${entry.event}: ${strdata}`;
+  console.groupEnd();
 }
 
-async function dump(htmlvalidate, output, files, mode) {
-  let lines;
-  switch (mode) {
-    case Mode.DUMP_EVENTS:
-      lines = files.map(async (filename) => {
-        const lines2 = await htmlvalidate.dumpEvents(filename);
-        return lines2.map(eventFormatter);
-      });
-      break;
-    case Mode.DUMP_TOKENS:
-      lines = files.map(async (filename) => {
-        const lines2 = await htmlvalidate.dumpTokens(filename);
-        return lines2.map((entry) => {
-          const data = JSON.stringify(entry.data);
-          return `TOKEN: ${entry.token}
-  Data: ${data}
-  Location: ${entry.location}`;
-        });
-      });
-      break;
-    case Mode.DUMP_TREE:
-      lines = files.map((filename) => htmlvalidate.dumpTree(filename));
-      break;
-    case Mode.DUMP_SOURCE:
-      lines = files.map((filename) => htmlvalidate.dumpSource(filename));
-      break;
-    default:
-      throw new Error(`Unknown mode "${String(mode)}"`);
+class ImportResolveMissingError extends core.UserError {
+  constructor() {
+    const message = `import.meta.resolve(..) is not available on this system`;
+    super(message);
+    Error.captureStackTrace(this, ImportResolveMissingError);
+    this.name = ImportResolveMissingError.name;
+  }
+  prettyFormat() {
+    const { message } = this;
+    const currentVersion = process.version;
+    const requiredVersion = core.engines.node.split("||").map((it) => `v${it.replace(/^[^\d]+/, "").trim()}`);
+    return [
+      kleur__default.default.red(`Error: ${message}.`),
+      "",
+      `Either ensure you are running a supported NodeJS version:`,
+      `  Current:  ${currentVersion}`,
+      `  Required: ${requiredVersion.join(", ")} or later`,
+      `Or set NODE_OPTIONS="--experimental-import-meta-resolve"`
+    ].join("\n");
   }
-  const flat = (await Promise.all(lines)).reduce((s, c) => s.concat(c), []);
-  output.write(flat.join("\n"));
-  output.write("\n");
-  return Promise.resolve(true);
 }
 
 function haveImportMetaResolve() {