html-validate 7.15.2 → 7.16.0

package/dist/es/core.js

@@ -1,18 +1,17 @@
 import fs from 'fs';
-import betterAjvErrors from '@sidvind/better-ajv-errors';
-import { i as isKeywordIgnored, C as CaseStyle, n as naturalJoin, c as classifyNodeText, T as TextClassification, h as hasAltText, p as partition, a as isHTMLHidden, b as isAriaHidden, d as hasAccessibleName, k as keywordPatternMatcher, e as inAccessibilityTree, f as hasAriaLabel } from './rules-helper.js';
-import Ajv from 'ajv';
-import deepmerge from 'deepmerge';
 import * as espree from 'espree';
 import * as walk from 'acorn-walk';
 import path from 'path';
-import 'url';
 import semver from 'semver';
 import kleur from 'kleur';
+import Ajv from 'ajv';
+import deepmerge from 'deepmerge';
 import { e as entities$1, h as html5, b as bundledElements } from './elements.js';
 import { createRequire } from 'module';
+import { i as isKeywordIgnored, C as CaseStyle, n as naturalJoin, c as classifyNodeText, T as TextClassification, h as hasAltText, p as partition, a as isHTMLHidden, b as isAriaHidden, d as hasAccessibleName, k as keywordPatternMatcher, e as inAccessibilityTree, f as hasAriaLabel } from './rules-helper.js';
+import betterAjvErrors from '@sidvind/better-ajv-errors';
 import { codeFrameColumns } from '@babel/code-frame';
-import stylishImpl from '@html-validate/stylish';
+import { stylish as stylish$2 } from '@html-validate/stylish';
 
 const $schema$2 = "http://json-schema.org/draft-06/schema#";
 const $id$2 = "http://json-schema.org/draft-06/schema#";
@@ -9369,6 +9368,7 @@ const bundledRules$1 = {
     "wcag/h67": H67,
     "wcag/h71": H71,
 };
+var WCAG = bundledRules$1;
 
 const bundledRules = {
     "allowed-links": AllowedLinks,
@@ -9447,8 +9447,9 @@ const bundledRules = {
     void: Void,
     "void-content": VoidContent,
     "void-style": VoidStyle,
-    ...bundledRules$1,
+    ...WCAG,
 };
+var rules = bundledRules;
 
 var defaultConfig = {};
 
@@ -9478,6 +9479,7 @@ const config$3 = {
         "wcag/h71": "error",
     },
 };
+var a11y = config$3;
 
 const config$2 = {
     rules: {
@@ -9488,6 +9490,7 @@ const config$2 = {
         "require-sri": "error",
     },
 };
+var document = config$2;
 
 const config$1 = {
     rules: {
@@ -9564,6 +9567,7 @@ const config$1 = {
         "wcag/h71": "error",
     },
 };
+var recommended = config$1;
 
 const config = {
     rules: {
@@ -9599,20 +9603,22 @@ const config = {
         "void-content": "error",
     },
 };
+var standard = config;
 
 /**
  * @internal
  */
 const presets = {
-    "html-validate:a11y": config$3,
-    "html-validate:document": config$2,
-    "html-validate:recommended": config$1,
-    "html-validate:standard": config,
+    "html-validate:a11y": a11y,
+    "html-validate:document": document,
+    "html-validate:recommended": recommended,
+    "html-validate:standard": standard,
     /* @deprecated aliases */
-    "htmlvalidate:recommended": config$1,
-    "htmlvalidate:document": config$2,
-    "html-validate:a17y": config$3,
+    "htmlvalidate:recommended": recommended,
+    "htmlvalidate:document": document,
+    "html-validate:a17y": a11y,
 };
+var Presets = presets;
 
 /**
  * A resolved configuration is a normalized configuration with all extends,
@@ -9621,11 +9627,22 @@ const presets = {
  * @public
  */
 class ResolvedConfig {
-    constructor({ metaTable, plugins, rules, transformers }) {
+    /**
+     * @internal
+     */
+    constructor({ metaTable, plugins, rules, transformers }, original) {
         this.metaTable = metaTable;
         this.plugins = plugins;
         this.rules = rules;
         this.transformers = transformers;
+        this.original = original;
+    }
+    /**
+     * Returns the (merged) configuration data used to create this resolved
+     * configuration.
+     */
+    getConfigData() {
+        return this.original;
     }
     getMetaTable() {
         return this.metaTable;
@@ -9816,7 +9833,7 @@ class Config {
         if (configData.rules) {
             const normalizedRules = Config.getRulesObject(configData.rules);
             for (const [ruleId, [, ruleOptions]] of normalizedRules.entries()) {
-                const cls = bundledRules[ruleId];
+                const cls = rules[ruleId];
                 const path = `/rules/${ruleId}/1`;
                 Rule.validateOptions(cls, ruleId, path, ruleOptions, filename, configData);
             }
@@ -10040,7 +10057,7 @@ class Config {
     loadConfigurations(plugins) {
         const configs = new Map();
         /* builtin presets */
-        for (const [name, config] of Object.entries(presets)) {
+        for (const [name, config] of Object.entries(Presets)) {
             Config.validate(config, name);
             configs.set(name, config);
         }
@@ -10089,7 +10106,7 @@ class Config {
      * @public
      */
     resolve() {
-        return new ResolvedConfig(this.resolveData());
+        return new ResolvedConfig(this.resolveData(), this.get());
     }
     /**
      * Same as [[resolve]] but returns the raw configuration data instead of
@@ -11125,7 +11142,7 @@ class Engine {
         /* initialize plugins and rules */
         const result = this.initPlugins(this.config);
         this.availableRules = {
-            ...bundledRules,
+            ...rules,
             ...result.availableRules,
         };
     }
@@ -11511,11 +11528,11 @@ class StaticConfigLoader extends ConfigLoader {
         const override = this.loadFromObject(configOverride || {});
         if (override.isRootFound()) {
             override.init();
-            return override;
+            return override.resolve();
         }
         const merged = this.globalConfig.merge(override);
         merged.init();
-        return merged;
+        return merged.resolve();
     }
     flushCache() {
         /* do nothing */
@@ -11575,9 +11592,8 @@ class HtmlValidate {
      */
     validateSource(input, configOverride) {
         const config = this.getConfigFor(input.filename, configOverride);
-        const resolved = config.resolve();
-        const source = resolved.transformSource(input);
-        const engine = new Engine(resolved, Parser);
+        const source = config.transformSource(input);
+        const engine = new Engine(config, Parser);
         return engine.lint(source);
     }
     /**
@@ -11589,9 +11605,8 @@ class HtmlValidate {
      */
     validateFile(filename) {
         const config = this.getConfigFor(filename);
-        const resolved = config.resolve();
-        const source = resolved.transformFilename(filename);
-        const engine = new Engine(resolved, Parser);
+        const source = config.transformFilename(filename);
+        const engine = new Engine(config, Parser);
         return engine.lint(source);
     }
     /**
@@ -11621,8 +11636,7 @@ class HtmlValidate {
         }
         /* test if there is a matching transformer */
         const config = this.getConfigFor(filename);
-        const resolved = config.resolve();
-        return resolved.canTransform(filename);
+        return config.canTransform(filename);
     }
     /**
      * Tokenize filename and output all tokens.
@@ -11634,9 +11648,8 @@ class HtmlValidate {
      */
     dumpTokens(filename) {
         const config = this.getConfigFor(filename);
-        const resolved = config.resolve();
-        const source = resolved.transformFilename(filename);
-        const engine = new Engine(resolved, Parser);
+        const source = config.transformFilename(filename);
+        const engine = new Engine(config, Parser);
         return engine.dumpTokens(source);
     }
     /**
@@ -11649,9 +11662,8 @@ class HtmlValidate {
      */
     dumpEvents(filename) {
         const config = this.getConfigFor(filename);
-        const resolved = config.resolve();
-        const source = resolved.transformFilename(filename);
-        const engine = new Engine(resolved, Parser);
+        const source = config.transformFilename(filename);
+        const engine = new Engine(config, Parser);
         return engine.dumpEvents(source);
     }
     /**
@@ -11664,9 +11676,8 @@ class HtmlValidate {
      */
     dumpTree(filename) {
         const config = this.getConfigFor(filename);
-        const resolved = config.resolve();
-        const source = resolved.transformFilename(filename);
-        const engine = new Engine(resolved, Parser);
+        const source = config.transformFilename(filename);
+        const engine = new Engine(config, Parser);
         return engine.dumpTree(source);
     }
     /**
@@ -11679,8 +11690,7 @@ class HtmlValidate {
      */
     dumpSource(filename) {
         const config = this.getConfigFor(filename);
-        const resolved = config.resolve();
-        const sources = resolved.transformFilename(filename);
+        const sources = config.transformFilename(filename);
         return sources.reduce((result, source) => {
             result.push(`Source ${source.filename}@${source.line}:${source.column} (offset: ${source.offset})`);
             if (source.transformedBy) {
@@ -11744,7 +11754,7 @@ class HtmlValidate {
      */
     getRuleDocumentation(ruleId, config = null, context = null) {
         const c = config || this.getConfigFor("inline");
-        const engine = new Engine(c.resolve(), Parser);
+        const engine = new Engine(c, Parser);
         return engine.getRuleDocumentation(ruleId, context);
     }
     /**
@@ -11755,7 +11765,7 @@ class HtmlValidate {
      */
     getParserFor(source) {
         const config = this.getConfigFor(source.filename);
-        return new Parser(config.resolve());
+        return new Parser(config);
     }
     /**
      * Get configuration for given filename.
@@ -11767,7 +11777,12 @@ class HtmlValidate {
      * @param configOverride - Configuration to apply last.
      */
     getConfigFor(filename, configOverride) {
-        return this.configLoader.getConfigFor(filename, configOverride);
+        const config = this.configLoader.getConfigFor(filename, configOverride);
+        /* for backwards compatibility only */
+        if (config instanceof Config) {
+            return config.resolve();
+        }
+        return config;
     }
     /**
      * Flush configuration cache. Clears full cache unless a filename is given.
@@ -11786,7 +11801,7 @@ class HtmlValidate {
 /** @public */
 const name = "html-validate";
 /** @public */
-const version = "7.15.2";
+const version = "7.16.0";
 /** @public */
 const bugs = "https://gitlab.com/html-validate/html-validate/issues/new";
 
@@ -11832,7 +11847,7 @@ function compatibilityCheck(name, declared, options) {
     return false;
 }
 
-const ruleIds = new Set(Object.keys(bundledRules));
+const ruleIds = new Set(Object.keys(rules));
 /**
  * Returns true if given ruleId is an existing builtin rule. It does not handle
  * rules loaded via plugins.
@@ -11904,19 +11919,19 @@ class FileSystemConfigLoader extends ConfigLoader {
         const override = this.loadFromObject(configOverride || {});
         if (override.isRootFound()) {
             override.init();
-            return override;
+            return override.resolve();
         }
         /* special case when the global configuration is marked as root, should not
          * try to load and more configuration files */
         if (this.globalConfig.isRootFound()) {
             const merged = this.globalConfig.merge(override);
             merged.init();
-            return merged;
+            return merged.resolve();
         }
         const config = this.fromFilename(filename);
         const merged = config ? config.merge(override) : this.globalConfig.merge(override);
         merged.init();
-        return merged;
+        return merged.resolve();
     }
     /**
      * Flush configuration cache.
@@ -12028,6 +12043,7 @@ function checkstyleFormatter(results) {
     return output;
 }
 const formatter$3 = checkstyleFormatter;
+var checkstyle = formatter$3;
 
 const defaults = {
     showLink: true,
@@ -12163,6 +12179,7 @@ function jsonFormatter(results) {
     return JSON.stringify(results);
 }
 const formatter$2 = jsonFormatter;
+var json = formatter$2;
 
 function linkSummary(results) {
     const urls = results.reduce((result, it) => {
@@ -12179,7 +12196,7 @@ function linkSummary(results) {
     return `\n${kleur.bold("More information")}:\n${lines.join("")}\n`;
 }
 function stylish(results) {
-    const errors = stylishImpl(results.map((it) => ({
+    const errors = stylish$2(results.map((it) => ({
         ...it,
         fixableErrorCount: 0,
         fixableWarningCount: 0,
@@ -12188,6 +12205,7 @@ function stylish(results) {
     return `${errors}${links}`;
 }
 const formatter$1 = stylish;
+var stylish$1 = formatter$1;
 
 function textFormatter(results) {
     let output = "";
@@ -12215,18 +12233,19 @@ function textFormatter(results) {
     return total > 0 ? output : "";
 }
 const formatter = textFormatter;
+var text = formatter;
 
 const availableFormatters = {
-    checkstyle: formatter$3,
+    checkstyle,
     codeframe,
-    json: formatter$2,
-    stylish: formatter$1,
-    text: formatter,
+    json,
+    stylish: stylish$1,
+    text,
 };
 function getFormatter(name) {
     var _a;
     return (_a = availableFormatters[name]) !== null && _a !== void 0 ? _a : null;
 }
 
-export { Attribute as A, isTextNode as B, Config as C, DynamicValue as D, EventHandler as E, FileSystemConfigLoader as F, isElementNode as G, HtmlValidate as H, generateIdSelector as I, name as J, bugs as K, MetaTable as M, NodeClosed as N, Parser as P, ResolvedConfig as R, Severity as S, TextNode as T, UserError as U, Validator as V, WrappedError as W, ConfigError as a, ConfigLoader as b, StaticConfigLoader as c, DOMTokenList as d, HtmlElement as e, DOMNode as f, DOMTree as g, NodeType as h, SchemaValidationError as i, NestedError as j, TextContent$1 as k, MetaCopyableProperty as l, Rule as m, Reporter as n, TemplateExtractor as o, presets as p, definePlugin as q, ruleExists as r, sliceLocation as s, getFormatter as t, legacyRequire as u, version as v, ensureError as w, configDataFromFile as x, compatibilityCheck as y, codeframe as z };
+export { Attribute as A, isTextNode as B, Config as C, DynamicValue as D, EventHandler as E, FileSystemConfigLoader as F, isElementNode as G, HtmlValidate as H, generateIdSelector as I, name as J, bugs as K, MetaTable as M, NodeClosed as N, Presets as P, ResolvedConfig as R, Severity as S, TextNode as T, UserError as U, Validator as V, WrappedError as W, ConfigError as a, ConfigLoader as b, StaticConfigLoader as c, DOMTokenList as d, HtmlElement as e, DOMNode as f, DOMTree as g, NodeType as h, SchemaValidationError as i, NestedError as j, TextContent$1 as k, MetaCopyableProperty as l, Rule as m, Reporter as n, TemplateExtractor as o, definePlugin as p, Parser as q, ruleExists as r, sliceLocation as s, getFormatter as t, legacyRequire as u, version as v, ensureError as w, configDataFromFile as x, compatibilityCheck as y, codeframe as z };
 //# sourceMappingURL=core.js.map