html-validate 6.1.2 → 6.1.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +30 -0
- package/dist/cjs/browser.js +0 -1
- package/dist/cjs/browser.js.map +1 -1
- package/dist/cjs/cli.js +0 -1
- package/dist/cjs/cli.js.map +1 -1
- package/dist/cjs/core.d.ts +5 -4
- package/dist/cjs/core.js +68 -26
- package/dist/cjs/core.js.map +1 -1
- package/dist/cjs/html-validate.js +0 -1
- package/dist/cjs/html-validate.js.map +1 -1
- package/dist/cjs/index.js +0 -1
- package/dist/cjs/index.js.map +1 -1
- package/dist/cjs/jest.js +0 -1
- package/dist/cjs/jest.js.map +1 -1
- package/dist/es/browser.js +0 -1
- package/dist/es/browser.js.map +1 -1
- package/dist/es/cli.js +0 -1
- package/dist/es/cli.js.map +1 -1
- package/dist/es/core.d.ts +5 -4
- package/dist/es/core.js +68 -25
- package/dist/es/core.js.map +1 -1
- package/dist/es/html-validate.js +0 -1
- package/dist/es/html-validate.js.map +1 -1
- package/dist/es/index.js +0 -1
- package/dist/es/index.js.map +1 -1
- package/dist/es/jest.js +0 -1
- package/dist/es/jest.js.map +1 -1
- package/dist/schema/elements.json +7 -1
- package/elements/html5.json +1 -2
- package/package.json +25 -28
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,35 @@
|
|
|
1
1
|
# html-validate changelog
|
|
2
2
|
|
|
3
|
+
### [6.1.6](https://gitlab.com/html-validate/html-validate/compare/v6.1.5...v6.1.6) (2022-01-07)
|
|
4
|
+
|
|
5
|
+
### Bug Fixes
|
|
6
|
+
|
|
7
|
+
- **meta:** disallow unknown element properties ([aca70fc](https://gitlab.com/html-validate/html-validate/commit/aca70fcff5848d91ab4c0c3194bcc44ffc0d2b5d))
|
|
8
|
+
|
|
9
|
+
### Dependency upgrades
|
|
10
|
+
|
|
11
|
+
- **deps:** drop json-merge-patch dependency ([5306b2d](https://gitlab.com/html-validate/html-validate/commit/5306b2d6314669e353f0500f3a5b6e6f395ca3cf))
|
|
12
|
+
|
|
13
|
+
### [6.1.5](https://gitlab.com/html-validate/html-validate/compare/v6.1.4...v6.1.5) (2021-12-28)
|
|
14
|
+
|
|
15
|
+
### Bug Fixes
|
|
16
|
+
|
|
17
|
+
- **config:** dont process extends multiple times ([f014311](https://gitlab.com/html-validate/html-validate/commit/f01431147a74272142dd6ddcfe5d53bf68c80aa9))
|
|
18
|
+
- **config:** elements from extended configs should be loaded first not last ([d19519e](https://gitlab.com/html-validate/html-validate/commit/d19519e5ee97e7b5c375bca80f01dcbaa5eb0373))
|
|
19
|
+
|
|
20
|
+
### [6.1.4](https://gitlab.com/html-validate/html-validate/compare/v6.1.3...v6.1.4) (2021-12-04)
|
|
21
|
+
|
|
22
|
+
### Bug Fixes
|
|
23
|
+
|
|
24
|
+
- 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)
|
|
25
|
+
|
|
26
|
+
### [6.1.3](https://gitlab.com/html-validate/html-validate/compare/v6.1.2...v6.1.3) (2021-11-19)
|
|
27
|
+
|
|
28
|
+
### Bug Fixes
|
|
29
|
+
|
|
30
|
+
- 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)
|
|
31
|
+
- **rules:** handle malformed `style` attribute in `no-inline-style` rule ([7e12d50](https://gitlab.com/html-validate/html-validate/commit/7e12d507785eaf4fbbacf9b6ad53c31d5c6aece0))
|
|
32
|
+
|
|
3
33
|
### [6.1.2](https://gitlab.com/html-validate/html-validate/compare/v6.1.1...v6.1.2) (2021-11-13)
|
|
4
34
|
|
|
5
35
|
### Bug Fixes
|
package/dist/cjs/browser.js
CHANGED
package/dist/cjs/browser.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"browser.js","sources":[],"sourcesContent":[],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"browser.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
|
package/dist/cjs/cli.js
CHANGED
package/dist/cjs/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sources":["../../../src/cli/expand-files.ts","../../../src/cli/formatter.ts","../../../src/cli/is-ignored.ts","../../../src/cli/init.ts","../../../src/cli/cli.ts","../../../src/cli/json.ts"],"sourcesContent":[null,null,null,null,null,null],"names":["fs","path","glob","formatterFactory","legacyRequire","UserError","ignore","deepmerge","prompts","FileSystemConfigLoader","HtmlValidate","readFileSync"],"mappings":"
|
|
1
|
+
{"version":3,"file":"cli.js","sources":["../../../src/cli/expand-files.ts","../../../src/cli/formatter.ts","../../../src/cli/is-ignored.ts","../../../src/cli/init.ts","../../../src/cli/cli.ts","../../../src/cli/json.ts"],"sourcesContent":[null,null,null,null,null,null],"names":["fs","path","glob","formatterFactory","legacyRequire","UserError","ignore","deepmerge","prompts","FileSystemConfigLoader","HtmlValidate","readFileSync"],"mappings":"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"}
|
package/dist/cjs/core.d.ts
CHANGED
|
@@ -51,10 +51,11 @@ declare enum TokenType {
|
|
|
51
51
|
TEXT = 11,
|
|
52
52
|
TEMPLATING = 12,
|
|
53
53
|
SCRIPT = 13,
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
54
|
+
STYLE = 14,
|
|
55
|
+
COMMENT = 15,
|
|
56
|
+
CONDITIONAL = 16,
|
|
57
|
+
DIRECTIVE = 17,
|
|
58
|
+
EOF = 18
|
|
58
59
|
}
|
|
59
60
|
interface Token {
|
|
60
61
|
type: TokenType;
|
package/dist/cjs/core.js
CHANGED
|
@@ -4,7 +4,6 @@ var fs = require('fs');
|
|
|
4
4
|
var betterAjvErrors = require('@sidvind/better-ajv-errors');
|
|
5
5
|
var Ajv = require('ajv');
|
|
6
6
|
var deepmerge = require('deepmerge');
|
|
7
|
-
var jsonMergePatch = require('json-merge-patch');
|
|
8
7
|
var path = require('path');
|
|
9
8
|
var semver = require('semver');
|
|
10
9
|
var kleur = require('kleur');
|
|
@@ -17,7 +16,6 @@ var fs__default = /*#__PURE__*/_interopDefaultLegacy(fs);
|
|
|
17
16
|
var betterAjvErrors__default = /*#__PURE__*/_interopDefaultLegacy(betterAjvErrors);
|
|
18
17
|
var Ajv__default = /*#__PURE__*/_interopDefaultLegacy(Ajv);
|
|
19
18
|
var deepmerge__default = /*#__PURE__*/_interopDefaultLegacy(deepmerge);
|
|
20
|
-
var jsonMergePatch__default = /*#__PURE__*/_interopDefaultLegacy(jsonMergePatch);
|
|
21
19
|
var path__default = /*#__PURE__*/_interopDefaultLegacy(path);
|
|
22
20
|
var semver__default = /*#__PURE__*/_interopDefaultLegacy(semver);
|
|
23
21
|
var kleur__default = /*#__PURE__*/_interopDefaultLegacy(kleur);
|
|
@@ -433,6 +431,18 @@ const patternProperties = {
|
|
|
433
431
|
title: "Mark element as a submittable form element",
|
|
434
432
|
type: "boolean"
|
|
435
433
|
},
|
|
434
|
+
labelable: {
|
|
435
|
+
title: "Mark this element as labelable",
|
|
436
|
+
description: "This element may contain an associated label element.",
|
|
437
|
+
anyOf: [
|
|
438
|
+
{
|
|
439
|
+
type: "boolean"
|
|
440
|
+
},
|
|
441
|
+
{
|
|
442
|
+
$ref: "#/definitions/expression"
|
|
443
|
+
}
|
|
444
|
+
]
|
|
445
|
+
},
|
|
436
446
|
deprecatedAttributes: {
|
|
437
447
|
title: "List of deprecated attributes",
|
|
438
448
|
type: "array",
|
|
@@ -484,7 +494,7 @@ const patternProperties = {
|
|
|
484
494
|
]
|
|
485
495
|
}
|
|
486
496
|
},
|
|
487
|
-
additionalProperties:
|
|
497
|
+
additionalProperties: false
|
|
488
498
|
}
|
|
489
499
|
};
|
|
490
500
|
const definitions = {
|
|
@@ -879,7 +889,7 @@ class MetaTable {
|
|
|
879
889
|
*/
|
|
880
890
|
extendValidationSchema(patch) {
|
|
881
891
|
if (patch.properties) {
|
|
882
|
-
this.schema =
|
|
892
|
+
this.schema = deepmerge__default["default"](this.schema, {
|
|
883
893
|
patternProperties: {
|
|
884
894
|
"^[^$].*$": {
|
|
885
895
|
properties: patch.properties,
|
|
@@ -888,7 +898,7 @@ class MetaTable {
|
|
|
888
898
|
});
|
|
889
899
|
}
|
|
890
900
|
if (patch.definitions) {
|
|
891
|
-
this.schema =
|
|
901
|
+
this.schema = deepmerge__default["default"](this.schema, {
|
|
892
902
|
definitions: patch.definitions,
|
|
893
903
|
});
|
|
894
904
|
}
|
|
@@ -1242,12 +1252,14 @@ var State;
|
|
|
1242
1252
|
State[State["ATTR"] = 5] = "ATTR";
|
|
1243
1253
|
State[State["CDATA"] = 6] = "CDATA";
|
|
1244
1254
|
State[State["SCRIPT"] = 7] = "SCRIPT";
|
|
1255
|
+
State[State["STYLE"] = 8] = "STYLE";
|
|
1245
1256
|
})(State || (State = {}));
|
|
1246
1257
|
|
|
1247
1258
|
var ContentModel;
|
|
1248
1259
|
(function (ContentModel) {
|
|
1249
1260
|
ContentModel[ContentModel["TEXT"] = 1] = "TEXT";
|
|
1250
1261
|
ContentModel[ContentModel["SCRIPT"] = 2] = "SCRIPT";
|
|
1262
|
+
ContentModel[ContentModel["STYLE"] = 3] = "STYLE";
|
|
1251
1263
|
})(ContentModel || (ContentModel = {}));
|
|
1252
1264
|
class Context {
|
|
1253
1265
|
constructor(source) {
|
|
@@ -2927,7 +2939,7 @@ var TRANSFORMER_API;
|
|
|
2927
2939
|
/** @public */
|
|
2928
2940
|
const name = "html-validate";
|
|
2929
2941
|
/** @public */
|
|
2930
|
-
const version = "6.1.
|
|
2942
|
+
const version = "6.1.6";
|
|
2931
2943
|
/** @public */
|
|
2932
2944
|
const homepage = "https://html-validate.org";
|
|
2933
2945
|
/** @public */
|
|
@@ -3613,10 +3625,11 @@ exports.TokenType = void 0;
|
|
|
3613
3625
|
TokenType[TokenType["TEXT"] = 11] = "TEXT";
|
|
3614
3626
|
TokenType[TokenType["TEMPLATING"] = 12] = "TEMPLATING";
|
|
3615
3627
|
TokenType[TokenType["SCRIPT"] = 13] = "SCRIPT";
|
|
3616
|
-
TokenType[TokenType["
|
|
3617
|
-
TokenType[TokenType["
|
|
3618
|
-
TokenType[TokenType["
|
|
3619
|
-
TokenType[TokenType["
|
|
3628
|
+
TokenType[TokenType["STYLE"] = 14] = "STYLE";
|
|
3629
|
+
TokenType[TokenType["COMMENT"] = 15] = "COMMENT";
|
|
3630
|
+
TokenType[TokenType["CONDITIONAL"] = 16] = "CONDITIONAL";
|
|
3631
|
+
TokenType[TokenType["DIRECTIVE"] = 17] = "DIRECTIVE";
|
|
3632
|
+
TokenType[TokenType["EOF"] = 18] = "EOF";
|
|
3620
3633
|
})(exports.TokenType || (exports.TokenType = {}));
|
|
3621
3634
|
|
|
3622
3635
|
/* eslint-disable no-useless-escape */
|
|
@@ -3639,6 +3652,8 @@ const MATCH_CDATA_BEGIN = /^<!\[CDATA\[/;
|
|
|
3639
3652
|
const MATCH_CDATA_END = /^[^]*?]]>/;
|
|
3640
3653
|
const MATCH_SCRIPT_DATA = /^[^]*?(?=<\/script)/;
|
|
3641
3654
|
const MATCH_SCRIPT_END = /^<(\/)(script)/;
|
|
3655
|
+
const MATCH_STYLE_DATA = /^[^]*?(?=<\/style)/;
|
|
3656
|
+
const MATCH_STYLE_END = /^<(\/)(style)/;
|
|
3642
3657
|
const MATCH_DIRECTIVE = /^<!--\s*\[html-validate-(.*?)]\s*-->/;
|
|
3643
3658
|
const MATCH_COMMENT = /^<!--([^]*?)-->/;
|
|
3644
3659
|
const MATCH_CONDITIONAL = /^<!\[([^\]]*?)\]>/;
|
|
@@ -3678,6 +3693,9 @@ class Lexer {
|
|
|
3678
3693
|
case State.SCRIPT:
|
|
3679
3694
|
yield* this.tokenizeScript(context);
|
|
3680
3695
|
break;
|
|
3696
|
+
case State.STYLE:
|
|
3697
|
+
yield* this.tokenizeStyle(context);
|
|
3698
|
+
break;
|
|
3681
3699
|
/* istanbul ignore next: sanity check: should not happen unless adding new states */
|
|
3682
3700
|
default:
|
|
3683
3701
|
this.unhandled(context);
|
|
@@ -3746,11 +3764,14 @@ class Lexer {
|
|
|
3746
3764
|
* Called when entering a new state.
|
|
3747
3765
|
*/
|
|
3748
3766
|
enter(context, state, data) {
|
|
3749
|
-
/* script tags require a different content model */
|
|
3767
|
+
/* script/style tags require a different content model */
|
|
3750
3768
|
if (state === State.TAG && data && data[0][0] === "<") {
|
|
3751
3769
|
if (data[0] === "<script") {
|
|
3752
3770
|
context.contentModel = ContentModel.SCRIPT;
|
|
3753
3771
|
}
|
|
3772
|
+
else if (data[0] === "<style") {
|
|
3773
|
+
context.contentModel = ContentModel.STYLE;
|
|
3774
|
+
}
|
|
3754
3775
|
else {
|
|
3755
3776
|
context.contentModel = ContentModel.TEXT;
|
|
3756
3777
|
}
|
|
@@ -3776,6 +3797,7 @@ class Lexer {
|
|
|
3776
3797
|
], "expected doctype name");
|
|
3777
3798
|
}
|
|
3778
3799
|
*tokenizeTag(context) {
|
|
3800
|
+
/* eslint-disable-next-line consistent-return -- exhaustive switch handled by typescript */
|
|
3779
3801
|
function nextState(token) {
|
|
3780
3802
|
switch (context.contentModel) {
|
|
3781
3803
|
case ContentModel.TEXT:
|
|
@@ -3787,11 +3809,14 @@ class Lexer {
|
|
|
3787
3809
|
else {
|
|
3788
3810
|
return State.TEXT; /* <script/> (not legal but handle it anyway so the lexer doesn't choke on it) */
|
|
3789
3811
|
}
|
|
3812
|
+
case ContentModel.STYLE:
|
|
3813
|
+
if (token && token.data[0][0] !== "/") {
|
|
3814
|
+
return State.STYLE;
|
|
3815
|
+
}
|
|
3816
|
+
else {
|
|
3817
|
+
return State.TEXT; /* <style/> */
|
|
3818
|
+
}
|
|
3790
3819
|
}
|
|
3791
|
-
/* istanbul ignore next: not covered by a test as there is currently no
|
|
3792
|
-
* way to trigger this unless new content models are added but this will
|
|
3793
|
-
* add a saner default if anyone ever does */
|
|
3794
|
-
return context.contentModel !== ContentModel.SCRIPT ? State.TEXT : State.SCRIPT;
|
|
3795
3820
|
}
|
|
3796
3821
|
yield* this.match(context, [
|
|
3797
3822
|
[MATCH_TAG_CLOSE, nextState, exports.TokenType.TAG_CLOSE],
|
|
@@ -3829,6 +3854,12 @@ class Lexer {
|
|
|
3829
3854
|
[MATCH_SCRIPT_DATA, State.SCRIPT, exports.TokenType.SCRIPT],
|
|
3830
3855
|
], "expected </script>");
|
|
3831
3856
|
}
|
|
3857
|
+
*tokenizeStyle(context) {
|
|
3858
|
+
yield* this.match(context, [
|
|
3859
|
+
[MATCH_STYLE_END, State.TAG, exports.TokenType.TAG_OPEN],
|
|
3860
|
+
[MATCH_STYLE_DATA, State.STYLE, exports.TokenType.STYLE],
|
|
3861
|
+
], "expected </style>");
|
|
3862
|
+
}
|
|
3832
3863
|
}
|
|
3833
3864
|
|
|
3834
3865
|
const whitespace = /(\s+)/;
|
|
@@ -6079,7 +6110,7 @@ function getCSSDeclarations(value) {
|
|
|
6079
6110
|
.filter(Boolean)
|
|
6080
6111
|
.map((it) => {
|
|
6081
6112
|
const [property, value] = it.split(":", 2);
|
|
6082
|
-
return { property: property.trim(), value: value.trim() };
|
|
6113
|
+
return { property: property.trim(), value: value ? value.trim() : undefined };
|
|
6083
6114
|
});
|
|
6084
6115
|
}
|
|
6085
6116
|
class NoInlineStyle extends Rule {
|
|
@@ -9769,9 +9800,11 @@ class Config {
|
|
|
9769
9800
|
this.configurations = this.loadConfigurations(this.plugins);
|
|
9770
9801
|
this.extendMeta(this.plugins);
|
|
9771
9802
|
/* process extended configs */
|
|
9772
|
-
|
|
9773
|
-
|
|
9774
|
-
|
|
9803
|
+
this.config = this.extendConfig((_a = this.config.extends) !== null && _a !== void 0 ? _a : []);
|
|
9804
|
+
/* reset extends as we already processed them, this prevents the next config
|
|
9805
|
+
* from reapplying config from extended config as well as duplicate entries
|
|
9806
|
+
* when merging arrays */
|
|
9807
|
+
this.config.extends = [];
|
|
9775
9808
|
/* rules explicitly set by passed options should have precedence over any
|
|
9776
9809
|
* extended rules, not the other way around. */
|
|
9777
9810
|
if (options && options.rules) {
|
|
@@ -9869,15 +9902,23 @@ class Config {
|
|
|
9869
9902
|
merge(rhs) {
|
|
9870
9903
|
return new Config(mergeInternal(this.config, rhs.config));
|
|
9871
9904
|
}
|
|
9872
|
-
extendConfig(
|
|
9873
|
-
|
|
9874
|
-
|
|
9875
|
-
base = this.configurations.get(entry);
|
|
9905
|
+
extendConfig(entries) {
|
|
9906
|
+
if (entries.length === 0) {
|
|
9907
|
+
return this.config;
|
|
9876
9908
|
}
|
|
9877
|
-
|
|
9878
|
-
|
|
9909
|
+
let base = {};
|
|
9910
|
+
for (let i = 0; i < entries.length; i++) {
|
|
9911
|
+
const entry = entries[i];
|
|
9912
|
+
let extended;
|
|
9913
|
+
if (this.configurations.has(entry)) {
|
|
9914
|
+
extended = this.configurations.get(entry);
|
|
9915
|
+
}
|
|
9916
|
+
else {
|
|
9917
|
+
extended = Config.fromFile(entry).config;
|
|
9918
|
+
}
|
|
9919
|
+
base = mergeInternal(base, extended);
|
|
9879
9920
|
}
|
|
9880
|
-
return mergeInternal(this.config
|
|
9921
|
+
return mergeInternal(base, this.config);
|
|
9881
9922
|
}
|
|
9882
9923
|
/**
|
|
9883
9924
|
* Get element metadata.
|
|
@@ -9952,6 +9993,7 @@ class Config {
|
|
|
9952
9993
|
}
|
|
9953
9994
|
});
|
|
9954
9995
|
}
|
|
9996
|
+
delete config.extends;
|
|
9955
9997
|
return config;
|
|
9956
9998
|
}
|
|
9957
9999
|
/**
|