html-validate 6.1.1 → 6.1.5

package/dist/{es/dist/types → cjs}/index.d.ts

@@ -1,5 +1,5 @@
-import { m as Report, c as ConfigLoader, H as HtmlValidate, a as ConfigData } from '../../core';
-export { A as AttributeData, X as AttributeEvent, a8 as CompatibilityOptions, Z as ConditionalEvent, C as Config, a as ConfigData, b as ConfigError, c as ConfigLoader, F as ConfigReadyEvent, a0 as DOMLoadEvent, a1 as DOMReadyEvent, _ as DirectiveEvent, $ as DoctypeEvent, D as DynamicValue, W as ElementReadyEvent, B as Event, z as EventCallback, E as EventDump, y as EventHandler, a4 as FileSystemConfigLoader, a5 as Formatter, e as HtmlElement, H as HtmlValidate, a3 as ListenEventMap, L as Location, o as Message, j as MetaCopyableProperty, M as MetaData, h as MetaElement, i as MetaTable, N as NodeClosed, w as Parser, u as Plugin, P as ProcessElementContext, m as Report, n as Reporter, q as Result, R as Rule, k as RuleDocumentation, g as SchemaValidationError, S as Severity, l as Source, G as SourceReadyEvent, d as StaticConfigLoader, Q as TagCloseEvent, O as TagEndEvent, K as TagOpenEvent, V as TagReadyEvent, J as TagStartEvent, t as TemplateExtractor, T as TextNode, f as TokenDump, I as TokenEvent, r as TransformContext, s as Transformer, a2 as TriggerEventMap, U as UserError, Y as WhitespaceEvent, a7 as compatibilityCheck, p as configPresets, a6 as formatterFactory, x as ruleExists, v as version } from '../../core';
+import { m as Report, c as ConfigLoader, H as HtmlValidate, a as ConfigData } from './core';
+export { A as AttributeData, X as AttributeEvent, a8 as CompatibilityOptions, Z as ConditionalEvent, C as Config, a as ConfigData, b as ConfigError, c as ConfigLoader, F as ConfigReadyEvent, a0 as DOMLoadEvent, a1 as DOMReadyEvent, _ as DirectiveEvent, $ as DoctypeEvent, D as DynamicValue, W as ElementReadyEvent, B as Event, z as EventCallback, E as EventDump, y as EventHandler, a4 as FileSystemConfigLoader, a5 as Formatter, e as HtmlElement, H as HtmlValidate, a3 as ListenEventMap, L as Location, o as Message, j as MetaCopyableProperty, M as MetaData, h as MetaElement, i as MetaTable, N as NodeClosed, w as Parser, u as Plugin, P as ProcessElementContext, m as Report, n as Reporter, q as Result, R as Rule, k as RuleDocumentation, g as SchemaValidationError, S as Severity, l as Source, G as SourceReadyEvent, d as StaticConfigLoader, Q as TagCloseEvent, O as TagEndEvent, K as TagOpenEvent, V as TagReadyEvent, J as TagStartEvent, t as TemplateExtractor, T as TextNode, f as TokenDump, I as TokenEvent, r as TransformContext, s as Transformer, a2 as TriggerEventMap, U as UserError, Y as WhitespaceEvent, a7 as compatibilityCheck, p as configPresets, a6 as formatterFactory, x as ruleExists, v as version } from './core';
 import 'ajv';
 import 'ajv/dist/types';
 

package/dist/cjs/jest.d.ts

@@ -0,0 +1,4 @@
+import './jest-lib';
+import './core';
+import 'ajv';
+import 'ajv/dist/types';

package/dist/{es/dist/types/transform → cjs}/test-utils.d.ts

@@ -1,4 +1,4 @@
-import { s as Transformer, l as Source } from '../../../core';
+import { s as Transformer, l as Source } from './core';
 import 'ajv';
 import 'ajv/dist/types';
 

package/dist/es/{dist/types/browser.d.ts → browser.d.ts}

@@ -1,3 +1,3 @@
-export { A as AttributeData, X as AttributeEvent, Z as ConditionalEvent, C as Config, a as ConfigData, b as ConfigError, c as ConfigLoader, F as ConfigReadyEvent, a0 as DOMLoadEvent, a1 as DOMReadyEvent, _ as DirectiveEvent, $ as DoctypeEvent, D as DynamicValue, W as ElementReadyEvent, B as Event, z as EventCallback, E as EventDump, y as EventHandler, e as HtmlElement, H as HtmlValidate, a3 as ListenEventMap, L as Location, o as Message, j as MetaCopyableProperty, M as MetaData, h as MetaElement, i as MetaTable, N as NodeClosed, w as Parser, u as Plugin, P as ProcessElementContext, m as Report, n as Reporter, q as Result, R as Rule, k as RuleDocumentation, g as SchemaValidationError, S as Severity, l as Source, G as SourceReadyEvent, d as StaticConfigLoader, Q as TagCloseEvent, O as TagEndEvent, K as TagOpenEvent, V as TagReadyEvent, J as TagStartEvent, t as TemplateExtractor, T as TextNode, f as TokenDump, I as TokenEvent, r as TransformContext, s as Transformer, a2 as TriggerEventMap, U as UserError, Y as WhitespaceEvent, p as configPresets, x as ruleExists, v as version } from '../../core';
+export { A as AttributeData, X as AttributeEvent, Z as ConditionalEvent, C as Config, a as ConfigData, b as ConfigError, c as ConfigLoader, F as ConfigReadyEvent, a0 as DOMLoadEvent, a1 as DOMReadyEvent, _ as DirectiveEvent, $ as DoctypeEvent, D as DynamicValue, W as ElementReadyEvent, B as Event, z as EventCallback, E as EventDump, y as EventHandler, e as HtmlElement, H as HtmlValidate, a3 as ListenEventMap, L as Location, o as Message, j as MetaCopyableProperty, M as MetaData, h as MetaElement, i as MetaTable, N as NodeClosed, w as Parser, u as Plugin, P as ProcessElementContext, m as Report, n as Reporter, q as Result, R as Rule, k as RuleDocumentation, g as SchemaValidationError, S as Severity, l as Source, G as SourceReadyEvent, d as StaticConfigLoader, Q as TagCloseEvent, O as TagEndEvent, K as TagOpenEvent, V as TagReadyEvent, J as TagStartEvent, t as TemplateExtractor, T as TextNode, f as TokenDump, I as TokenEvent, r as TransformContext, s as Transformer, a2 as TriggerEventMap, U as UserError, Y as WhitespaceEvent, p as configPresets, x as ruleExists, v as version } from './core';
 import 'ajv';
 import 'ajv/dist/types';

package/dist/es/core.d.ts

@@ -51,10 +51,11 @@ declare enum TokenType {
     TEXT = 11,
     TEMPLATING = 12,
     SCRIPT = 13,
-    COMMENT = 14,
-    CONDITIONAL = 15,
-    DIRECTIVE = 16,
-    EOF = 17
+    STYLE = 14,
+    COMMENT = 15,
+    CONDITIONAL = 16,
+    DIRECTIVE = 17,
+    EOF = 18
 }
 interface Token {
     type: TokenType;

package/dist/es/core.js

@@ -1230,12 +1230,14 @@ var State;
     State[State["ATTR"] = 5] = "ATTR";
     State[State["CDATA"] = 6] = "CDATA";
     State[State["SCRIPT"] = 7] = "SCRIPT";
+    State[State["STYLE"] = 8] = "STYLE";
 })(State || (State = {}));
 
 var ContentModel;
 (function (ContentModel) {
     ContentModel[ContentModel["TEXT"] = 1] = "TEXT";
     ContentModel[ContentModel["SCRIPT"] = 2] = "SCRIPT";
+    ContentModel[ContentModel["STYLE"] = 3] = "STYLE";
 })(ContentModel || (ContentModel = {}));
 class Context {
     constructor(source) {
@@ -2915,7 +2917,7 @@ var TRANSFORMER_API;
 /** @public */
 const name = "html-validate";
 /** @public */
-const version = "6.1.1";
+const version = "6.1.5";
 /** @public */
 const homepage = "https://html-validate.org";
 /** @public */
@@ -3601,10 +3603,11 @@ var TokenType;
     TokenType[TokenType["TEXT"] = 11] = "TEXT";
     TokenType[TokenType["TEMPLATING"] = 12] = "TEMPLATING";
     TokenType[TokenType["SCRIPT"] = 13] = "SCRIPT";
-    TokenType[TokenType["COMMENT"] = 14] = "COMMENT";
-    TokenType[TokenType["CONDITIONAL"] = 15] = "CONDITIONAL";
-    TokenType[TokenType["DIRECTIVE"] = 16] = "DIRECTIVE";
-    TokenType[TokenType["EOF"] = 17] = "EOF";
+    TokenType[TokenType["STYLE"] = 14] = "STYLE";
+    TokenType[TokenType["COMMENT"] = 15] = "COMMENT";
+    TokenType[TokenType["CONDITIONAL"] = 16] = "CONDITIONAL";
+    TokenType[TokenType["DIRECTIVE"] = 17] = "DIRECTIVE";
+    TokenType[TokenType["EOF"] = 18] = "EOF";
 })(TokenType || (TokenType = {}));
 
 /* eslint-disable no-useless-escape */
@@ -3627,6 +3630,8 @@ const MATCH_CDATA_BEGIN = /^<!\[CDATA\[/;
 const MATCH_CDATA_END = /^[^]*?]]>/;
 const MATCH_SCRIPT_DATA = /^[^]*?(?=<\/script)/;
 const MATCH_SCRIPT_END = /^<(\/)(script)/;
+const MATCH_STYLE_DATA = /^[^]*?(?=<\/style)/;
+const MATCH_STYLE_END = /^<(\/)(style)/;
 const MATCH_DIRECTIVE = /^<!--\s*\[html-validate-(.*?)]\s*-->/;
 const MATCH_COMMENT = /^<!--([^]*?)-->/;
 const MATCH_CONDITIONAL = /^<!\[([^\]]*?)\]>/;
@@ -3666,6 +3671,9 @@ class Lexer {
                 case State.SCRIPT:
                     yield* this.tokenizeScript(context);
                     break;
+                case State.STYLE:
+                    yield* this.tokenizeStyle(context);
+                    break;
                 /* istanbul ignore next: sanity check: should not happen unless adding new states */
                 default:
                     this.unhandled(context);
@@ -3734,11 +3742,14 @@ class Lexer {
      * Called when entering a new state.
      */
     enter(context, state, data) {
-        /* script tags require a different content model */
+        /* script/style tags require a different content model */
         if (state === State.TAG && data && data[0][0] === "<") {
             if (data[0] === "<script") {
                 context.contentModel = ContentModel.SCRIPT;
             }
+            else if (data[0] === "<style") {
+                context.contentModel = ContentModel.STYLE;
+            }
             else {
                 context.contentModel = ContentModel.TEXT;
             }
@@ -3764,6 +3775,7 @@ class Lexer {
         ], "expected doctype name");
     }
     *tokenizeTag(context) {
+        /* eslint-disable-next-line consistent-return -- exhaustive switch handled by typescript */
         function nextState(token) {
             switch (context.contentModel) {
                 case ContentModel.TEXT:
@@ -3775,11 +3787,14 @@ class Lexer {
                     else {
                         return State.TEXT; /* <script/> (not legal but handle it anyway so the lexer doesn't choke on it) */
                     }
+                case ContentModel.STYLE:
+                    if (token && token.data[0][0] !== "/") {
+                        return State.STYLE;
+                    }
+                    else {
+                        return State.TEXT; /* <style/> */
+                    }
             }
-            /* istanbul ignore next: not covered by a test as there is currently no
-             * way to trigger this unless new content models are added but this will
-             * add a saner default if anyone ever does */
-            return context.contentModel !== ContentModel.SCRIPT ? State.TEXT : State.SCRIPT;
         }
         yield* this.match(context, [
             [MATCH_TAG_CLOSE, nextState, TokenType.TAG_CLOSE],
@@ -3817,6 +3832,12 @@ class Lexer {
             [MATCH_SCRIPT_DATA, State.SCRIPT, TokenType.SCRIPT],
         ], "expected </script>");
     }
+    *tokenizeStyle(context) {
+        yield* this.match(context, [
+            [MATCH_STYLE_END, State.TAG, TokenType.TAG_OPEN],
+            [MATCH_STYLE_DATA, State.STYLE, TokenType.STYLE],
+        ], "expected </style>");
+    }
 }
 
 const whitespace = /(\s+)/;
@@ -6067,7 +6088,7 @@ function getCSSDeclarations(value) {
         .filter(Boolean)
         .map((it) => {
         const [property, value] = it.split(":", 2);
-        return { property: property.trim(), value: value.trim() };
+        return { property: property.trim(), value: value ? value.trim() : undefined };
     });
 }
 class NoInlineStyle extends Rule {
@@ -9757,9 +9778,11 @@ class Config {
         this.configurations = this.loadConfigurations(this.plugins);
         this.extendMeta(this.plugins);
         /* process extended configs */
-        for (const extend of (_a = this.config.extends) !== null && _a !== void 0 ? _a : []) {
-            this.config = this.extendConfig(extend);
-        }
+        this.config = this.extendConfig((_a = this.config.extends) !== null && _a !== void 0 ? _a : []);
+        /* reset extends as we already processed them, this prevents the next config
+         * from reapplying config from extended config as well as duplicate entries
+         * when merging arrays */
+        this.config.extends = [];
         /* rules explicitly set by passed options should have precedence over any
          * extended rules, not the other way around. */
         if (options && options.rules) {
@@ -9857,15 +9880,23 @@ class Config {
     merge(rhs) {
         return new Config(mergeInternal(this.config, rhs.config));
     }
-    extendConfig(entry) {
-        let base;
-        if (this.configurations.has(entry)) {
-            base = this.configurations.get(entry);
+    extendConfig(entries) {
+        if (entries.length === 0) {
+            return this.config;
         }
-        else {
-            base = Config.fromFile(entry).config;
+        let base = {};
+        for (let i = 0; i < entries.length; i++) {
+            const entry = entries[i];
+            let extended;
+            if (this.configurations.has(entry)) {
+                extended = this.configurations.get(entry);
+            }
+            else {
+                extended = Config.fromFile(entry).config;
+            }
+            base = mergeInternal(base, extended);
         }
-        return mergeInternal(this.config, base);
+        return mergeInternal(base, this.config);
     }
     /**
      * Get element metadata.
@@ -9940,6 +9971,7 @@ class Config {
                 }
             });
         }
+        delete config.extends;
         return config;
     }
     /**