html-validate 6.1.1 → 6.1.5

package/CHANGELOG.md

@@ -1,5 +1,31 @@
 # html-validate changelog
 
+### [6.1.5](https://gitlab.com/html-validate/html-validate/compare/v6.1.4...v6.1.5) (2021-12-28)
+
+### Bug Fixes
+
+- **config:** dont process extends multiple times ([f014311](https://gitlab.com/html-validate/html-validate/commit/f01431147a74272142dd6ddcfe5d53bf68c80aa9))
+- **config:** elements from extended configs should be loaded first not last ([d19519e](https://gitlab.com/html-validate/html-validate/commit/d19519e5ee97e7b5c375bca80f01dcbaa5eb0373))
+
+### [6.1.4](https://gitlab.com/html-validate/html-validate/compare/v6.1.3...v6.1.4) (2021-12-04)
+
+### Bug Fixes
+
+- handle multiline `srcset` attribute ([0bb92a7](https://gitlab.com/html-validate/html-validate/commit/0bb92a7c649d44281f530ea105aba55c9f3191ff)), closes [#138](https://gitlab.com/html-validate/html-validate/issues/138)
+
+### [6.1.3](https://gitlab.com/html-validate/html-validate/compare/v6.1.2...v6.1.3) (2021-11-19)
+
+### Bug Fixes
+
+- parse `<style>` content as text instead of markup ([0ab61e6](https://gitlab.com/html-validate/html-validate/commit/0ab61e6f9c875f76d0b7725f615808eedf1531fd)), closes [#137](https://gitlab.com/html-validate/html-validate/issues/137)
+- **rules:** handle malformed `style` attribute in `no-inline-style` rule ([7e12d50](https://gitlab.com/html-validate/html-validate/commit/7e12d507785eaf4fbbacf9b6ad53c31d5c6aece0))
+
+### [6.1.2](https://gitlab.com/html-validate/html-validate/compare/v6.1.1...v6.1.2) (2021-11-13)
+
+### Bug Fixes
+
+- fix .d.ts paths in package ([f24c2f4](https://gitlab.com/html-validate/html-validate/commit/f24c2f4752680edc6624d173599032cc5ed9830b))
+
 ### [6.1.1](https://gitlab.com/html-validate/html-validate/compare/v6.1.0...v6.1.1) (2021-11-10)
 
 ### Dependency upgrades

package/dist/cjs/{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/cjs/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/cjs/core.js

@@ -1242,12 +1242,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) {
@@ -2927,7 +2929,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 */
@@ -3613,10 +3615,11 @@ exports.TokenType = void 0;
     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";
 })(exports.TokenType || (exports.TokenType = {}));
 
 /* eslint-disable no-useless-escape */
@@ -3639,6 +3642,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 = /^<!\[([^\]]*?)\]>/;
@@ -3678,6 +3683,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);
@@ -3746,11 +3754,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;
             }
@@ -3776,6 +3787,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:
@@ -3787,11 +3799,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, exports.TokenType.TAG_CLOSE],
@@ -3829,6 +3844,12 @@ class Lexer {
             [MATCH_SCRIPT_DATA, State.SCRIPT, exports.TokenType.SCRIPT],
         ], "expected </script>");
     }
+    *tokenizeStyle(context) {
+        yield* this.match(context, [
+            [MATCH_STYLE_END, State.TAG, exports.TokenType.TAG_OPEN],
+            [MATCH_STYLE_DATA, State.STYLE, exports.TokenType.STYLE],
+        ], "expected </style>");
+    }
 }
 
 const whitespace = /(\s+)/;
@@ -6079,7 +6100,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 {
@@ -9769,9 +9790,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) {
@@ -9869,15 +9892,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.
@@ -9952,6 +9983,7 @@ class Config {
                 }
             });
         }
+        delete config.extends;
         return config;
     }
     /**