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
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"html-validate.js","sources":["../../../src/cli/html-validate.ts"],"sourcesContent":[null],"names":["kleur","Reporter","eventFormatter","path","pkgBugs","name","version","minimist","CLI","SchemaValidationError","UserError"],"mappings":"
|
|
1
|
+
{"version":3,"file":"html-validate.js","sources":["../../../src/cli/html-validate.ts"],"sourcesContent":[null],"names":["kleur","Reporter","eventFormatter","path","pkgBugs","name","version","minimist","CLI","SchemaValidationError","UserError"],"mappings":"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"}
|
package/dist/cjs/index.js
CHANGED
package/dist/cjs/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sources":[],"sourcesContent":[],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
|
package/dist/cjs/jest.js
CHANGED
package/dist/cjs/jest.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jest.js","sources":[],"sourcesContent":[],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"jest.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;"}
|
package/dist/es/browser.js
CHANGED
package/dist/es/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/es/cli.js
CHANGED
package/dist/es/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":["formatterFactory"],"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":["formatterFactory"],"mappings":"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"}
|
package/dist/es/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/es/core.js
CHANGED
|
@@ -2,7 +2,6 @@ import fs from 'fs';
|
|
|
2
2
|
import betterAjvErrors from '@sidvind/better-ajv-errors';
|
|
3
3
|
import Ajv from 'ajv';
|
|
4
4
|
import deepmerge from 'deepmerge';
|
|
5
|
-
import jsonMergePatch from 'json-merge-patch';
|
|
6
5
|
import path from 'path';
|
|
7
6
|
import semver from 'semver';
|
|
8
7
|
import kleur from 'kleur';
|
|
@@ -421,6 +420,18 @@ const patternProperties = {
|
|
|
421
420
|
title: "Mark element as a submittable form element",
|
|
422
421
|
type: "boolean"
|
|
423
422
|
},
|
|
423
|
+
labelable: {
|
|
424
|
+
title: "Mark this element as labelable",
|
|
425
|
+
description: "This element may contain an associated label element.",
|
|
426
|
+
anyOf: [
|
|
427
|
+
{
|
|
428
|
+
type: "boolean"
|
|
429
|
+
},
|
|
430
|
+
{
|
|
431
|
+
$ref: "#/definitions/expression"
|
|
432
|
+
}
|
|
433
|
+
]
|
|
434
|
+
},
|
|
424
435
|
deprecatedAttributes: {
|
|
425
436
|
title: "List of deprecated attributes",
|
|
426
437
|
type: "array",
|
|
@@ -472,7 +483,7 @@ const patternProperties = {
|
|
|
472
483
|
]
|
|
473
484
|
}
|
|
474
485
|
},
|
|
475
|
-
additionalProperties:
|
|
486
|
+
additionalProperties: false
|
|
476
487
|
}
|
|
477
488
|
};
|
|
478
489
|
const definitions = {
|
|
@@ -867,7 +878,7 @@ class MetaTable {
|
|
|
867
878
|
*/
|
|
868
879
|
extendValidationSchema(patch) {
|
|
869
880
|
if (patch.properties) {
|
|
870
|
-
this.schema =
|
|
881
|
+
this.schema = deepmerge(this.schema, {
|
|
871
882
|
patternProperties: {
|
|
872
883
|
"^[^$].*$": {
|
|
873
884
|
properties: patch.properties,
|
|
@@ -876,7 +887,7 @@ class MetaTable {
|
|
|
876
887
|
});
|
|
877
888
|
}
|
|
878
889
|
if (patch.definitions) {
|
|
879
|
-
this.schema =
|
|
890
|
+
this.schema = deepmerge(this.schema, {
|
|
880
891
|
definitions: patch.definitions,
|
|
881
892
|
});
|
|
882
893
|
}
|
|
@@ -1230,12 +1241,14 @@ var State;
|
|
|
1230
1241
|
State[State["ATTR"] = 5] = "ATTR";
|
|
1231
1242
|
State[State["CDATA"] = 6] = "CDATA";
|
|
1232
1243
|
State[State["SCRIPT"] = 7] = "SCRIPT";
|
|
1244
|
+
State[State["STYLE"] = 8] = "STYLE";
|
|
1233
1245
|
})(State || (State = {}));
|
|
1234
1246
|
|
|
1235
1247
|
var ContentModel;
|
|
1236
1248
|
(function (ContentModel) {
|
|
1237
1249
|
ContentModel[ContentModel["TEXT"] = 1] = "TEXT";
|
|
1238
1250
|
ContentModel[ContentModel["SCRIPT"] = 2] = "SCRIPT";
|
|
1251
|
+
ContentModel[ContentModel["STYLE"] = 3] = "STYLE";
|
|
1239
1252
|
})(ContentModel || (ContentModel = {}));
|
|
1240
1253
|
class Context {
|
|
1241
1254
|
constructor(source) {
|
|
@@ -2915,7 +2928,7 @@ var TRANSFORMER_API;
|
|
|
2915
2928
|
/** @public */
|
|
2916
2929
|
const name = "html-validate";
|
|
2917
2930
|
/** @public */
|
|
2918
|
-
const version = "6.1.
|
|
2931
|
+
const version = "6.1.6";
|
|
2919
2932
|
/** @public */
|
|
2920
2933
|
const homepage = "https://html-validate.org";
|
|
2921
2934
|
/** @public */
|
|
@@ -3601,10 +3614,11 @@ var TokenType;
|
|
|
3601
3614
|
TokenType[TokenType["TEXT"] = 11] = "TEXT";
|
|
3602
3615
|
TokenType[TokenType["TEMPLATING"] = 12] = "TEMPLATING";
|
|
3603
3616
|
TokenType[TokenType["SCRIPT"] = 13] = "SCRIPT";
|
|
3604
|
-
TokenType[TokenType["
|
|
3605
|
-
TokenType[TokenType["
|
|
3606
|
-
TokenType[TokenType["
|
|
3607
|
-
TokenType[TokenType["
|
|
3617
|
+
TokenType[TokenType["STYLE"] = 14] = "STYLE";
|
|
3618
|
+
TokenType[TokenType["COMMENT"] = 15] = "COMMENT";
|
|
3619
|
+
TokenType[TokenType["CONDITIONAL"] = 16] = "CONDITIONAL";
|
|
3620
|
+
TokenType[TokenType["DIRECTIVE"] = 17] = "DIRECTIVE";
|
|
3621
|
+
TokenType[TokenType["EOF"] = 18] = "EOF";
|
|
3608
3622
|
})(TokenType || (TokenType = {}));
|
|
3609
3623
|
|
|
3610
3624
|
/* eslint-disable no-useless-escape */
|
|
@@ -3627,6 +3641,8 @@ const MATCH_CDATA_BEGIN = /^<!\[CDATA\[/;
|
|
|
3627
3641
|
const MATCH_CDATA_END = /^[^]*?]]>/;
|
|
3628
3642
|
const MATCH_SCRIPT_DATA = /^[^]*?(?=<\/script)/;
|
|
3629
3643
|
const MATCH_SCRIPT_END = /^<(\/)(script)/;
|
|
3644
|
+
const MATCH_STYLE_DATA = /^[^]*?(?=<\/style)/;
|
|
3645
|
+
const MATCH_STYLE_END = /^<(\/)(style)/;
|
|
3630
3646
|
const MATCH_DIRECTIVE = /^<!--\s*\[html-validate-(.*?)]\s*-->/;
|
|
3631
3647
|
const MATCH_COMMENT = /^<!--([^]*?)-->/;
|
|
3632
3648
|
const MATCH_CONDITIONAL = /^<!\[([^\]]*?)\]>/;
|
|
@@ -3666,6 +3682,9 @@ class Lexer {
|
|
|
3666
3682
|
case State.SCRIPT:
|
|
3667
3683
|
yield* this.tokenizeScript(context);
|
|
3668
3684
|
break;
|
|
3685
|
+
case State.STYLE:
|
|
3686
|
+
yield* this.tokenizeStyle(context);
|
|
3687
|
+
break;
|
|
3669
3688
|
/* istanbul ignore next: sanity check: should not happen unless adding new states */
|
|
3670
3689
|
default:
|
|
3671
3690
|
this.unhandled(context);
|
|
@@ -3734,11 +3753,14 @@ class Lexer {
|
|
|
3734
3753
|
* Called when entering a new state.
|
|
3735
3754
|
*/
|
|
3736
3755
|
enter(context, state, data) {
|
|
3737
|
-
/* script tags require a different content model */
|
|
3756
|
+
/* script/style tags require a different content model */
|
|
3738
3757
|
if (state === State.TAG && data && data[0][0] === "<") {
|
|
3739
3758
|
if (data[0] === "<script") {
|
|
3740
3759
|
context.contentModel = ContentModel.SCRIPT;
|
|
3741
3760
|
}
|
|
3761
|
+
else if (data[0] === "<style") {
|
|
3762
|
+
context.contentModel = ContentModel.STYLE;
|
|
3763
|
+
}
|
|
3742
3764
|
else {
|
|
3743
3765
|
context.contentModel = ContentModel.TEXT;
|
|
3744
3766
|
}
|
|
@@ -3764,6 +3786,7 @@ class Lexer {
|
|
|
3764
3786
|
], "expected doctype name");
|
|
3765
3787
|
}
|
|
3766
3788
|
*tokenizeTag(context) {
|
|
3789
|
+
/* eslint-disable-next-line consistent-return -- exhaustive switch handled by typescript */
|
|
3767
3790
|
function nextState(token) {
|
|
3768
3791
|
switch (context.contentModel) {
|
|
3769
3792
|
case ContentModel.TEXT:
|
|
@@ -3775,11 +3798,14 @@ class Lexer {
|
|
|
3775
3798
|
else {
|
|
3776
3799
|
return State.TEXT; /* <script/> (not legal but handle it anyway so the lexer doesn't choke on it) */
|
|
3777
3800
|
}
|
|
3801
|
+
case ContentModel.STYLE:
|
|
3802
|
+
if (token && token.data[0][0] !== "/") {
|
|
3803
|
+
return State.STYLE;
|
|
3804
|
+
}
|
|
3805
|
+
else {
|
|
3806
|
+
return State.TEXT; /* <style/> */
|
|
3807
|
+
}
|
|
3778
3808
|
}
|
|
3779
|
-
/* istanbul ignore next: not covered by a test as there is currently no
|
|
3780
|
-
* way to trigger this unless new content models are added but this will
|
|
3781
|
-
* add a saner default if anyone ever does */
|
|
3782
|
-
return context.contentModel !== ContentModel.SCRIPT ? State.TEXT : State.SCRIPT;
|
|
3783
3809
|
}
|
|
3784
3810
|
yield* this.match(context, [
|
|
3785
3811
|
[MATCH_TAG_CLOSE, nextState, TokenType.TAG_CLOSE],
|
|
@@ -3817,6 +3843,12 @@ class Lexer {
|
|
|
3817
3843
|
[MATCH_SCRIPT_DATA, State.SCRIPT, TokenType.SCRIPT],
|
|
3818
3844
|
], "expected </script>");
|
|
3819
3845
|
}
|
|
3846
|
+
*tokenizeStyle(context) {
|
|
3847
|
+
yield* this.match(context, [
|
|
3848
|
+
[MATCH_STYLE_END, State.TAG, TokenType.TAG_OPEN],
|
|
3849
|
+
[MATCH_STYLE_DATA, State.STYLE, TokenType.STYLE],
|
|
3850
|
+
], "expected </style>");
|
|
3851
|
+
}
|
|
3820
3852
|
}
|
|
3821
3853
|
|
|
3822
3854
|
const whitespace = /(\s+)/;
|
|
@@ -6067,7 +6099,7 @@ function getCSSDeclarations(value) {
|
|
|
6067
6099
|
.filter(Boolean)
|
|
6068
6100
|
.map((it) => {
|
|
6069
6101
|
const [property, value] = it.split(":", 2);
|
|
6070
|
-
return { property: property.trim(), value: value.trim() };
|
|
6102
|
+
return { property: property.trim(), value: value ? value.trim() : undefined };
|
|
6071
6103
|
});
|
|
6072
6104
|
}
|
|
6073
6105
|
class NoInlineStyle extends Rule {
|
|
@@ -9757,9 +9789,11 @@ class Config {
|
|
|
9757
9789
|
this.configurations = this.loadConfigurations(this.plugins);
|
|
9758
9790
|
this.extendMeta(this.plugins);
|
|
9759
9791
|
/* process extended configs */
|
|
9760
|
-
|
|
9761
|
-
|
|
9762
|
-
|
|
9792
|
+
this.config = this.extendConfig((_a = this.config.extends) !== null && _a !== void 0 ? _a : []);
|
|
9793
|
+
/* reset extends as we already processed them, this prevents the next config
|
|
9794
|
+
* from reapplying config from extended config as well as duplicate entries
|
|
9795
|
+
* when merging arrays */
|
|
9796
|
+
this.config.extends = [];
|
|
9763
9797
|
/* rules explicitly set by passed options should have precedence over any
|
|
9764
9798
|
* extended rules, not the other way around. */
|
|
9765
9799
|
if (options && options.rules) {
|
|
@@ -9857,15 +9891,23 @@ class Config {
|
|
|
9857
9891
|
merge(rhs) {
|
|
9858
9892
|
return new Config(mergeInternal(this.config, rhs.config));
|
|
9859
9893
|
}
|
|
9860
|
-
extendConfig(
|
|
9861
|
-
|
|
9862
|
-
|
|
9863
|
-
base = this.configurations.get(entry);
|
|
9894
|
+
extendConfig(entries) {
|
|
9895
|
+
if (entries.length === 0) {
|
|
9896
|
+
return this.config;
|
|
9864
9897
|
}
|
|
9865
|
-
|
|
9866
|
-
|
|
9898
|
+
let base = {};
|
|
9899
|
+
for (let i = 0; i < entries.length; i++) {
|
|
9900
|
+
const entry = entries[i];
|
|
9901
|
+
let extended;
|
|
9902
|
+
if (this.configurations.has(entry)) {
|
|
9903
|
+
extended = this.configurations.get(entry);
|
|
9904
|
+
}
|
|
9905
|
+
else {
|
|
9906
|
+
extended = Config.fromFile(entry).config;
|
|
9907
|
+
}
|
|
9908
|
+
base = mergeInternal(base, extended);
|
|
9867
9909
|
}
|
|
9868
|
-
return mergeInternal(this.config
|
|
9910
|
+
return mergeInternal(base, this.config);
|
|
9869
9911
|
}
|
|
9870
9912
|
/**
|
|
9871
9913
|
* Get element metadata.
|
|
@@ -9940,6 +9982,7 @@ class Config {
|
|
|
9940
9982
|
}
|
|
9941
9983
|
});
|
|
9942
9984
|
}
|
|
9985
|
+
delete config.extends;
|
|
9943
9986
|
return config;
|
|
9944
9987
|
}
|
|
9945
9988
|
/**
|