@herb-tools/linter 0.8.4 → 0.8.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/README.md +3 -3
- package/dist/herb-lint.js +122 -26
- package/dist/herb-lint.js.map +1 -1
- package/dist/index.cjs +29 -3
- package/dist/index.cjs.map +1 -1
- package/dist/index.js +29 -3
- package/dist/index.js.map +1 -1
- package/dist/loader.cjs +68 -7
- package/dist/loader.cjs.map +1 -1
- package/dist/loader.js +68 -7
- package/dist/loader.js.map +1 -1
- package/dist/package.json +9 -9
- package/dist/src/rules/html-no-duplicate-meta-names.js +11 -0
- package/dist/src/rules/html-no-duplicate-meta-names.js.map +1 -1
- package/dist/src/rules/html-tag-name-lowercase.js +22 -5
- package/dist/src/rules/html-tag-name-lowercase.js.map +1 -1
- package/package.json +9 -9
- package/src/rules/html-no-duplicate-meta-names.ts +13 -0
- package/src/rules/html-tag-name-lowercase.ts +22 -5
package/dist/package.json
CHANGED
|
@@ -1,20 +1,20 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@herb-tools/linter",
|
|
3
|
-
"version": "0.8.
|
|
3
|
+
"version": "0.8.6",
|
|
4
4
|
"description": "HTML+ERB linter for validating HTML structure and enforcing best practices",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"homepage": "https://herb-tools.dev",
|
|
7
7
|
"bugs": "https://github.com/marcoroth/herb/issues/new?title=Package%20%60@herb-tools/linter%60:%20",
|
|
8
8
|
"repository": {
|
|
9
9
|
"type": "git",
|
|
10
|
-
"url": "https://github.com/marcoroth/herb.git",
|
|
10
|
+
"url": "git+https://github.com/marcoroth/herb.git",
|
|
11
11
|
"directory": "javascript/packages/linter"
|
|
12
12
|
},
|
|
13
13
|
"main": "./dist/index.cjs",
|
|
14
14
|
"module": "./dist/index.js",
|
|
15
15
|
"types": "./dist/types/index.d.ts",
|
|
16
16
|
"bin": {
|
|
17
|
-
"herb-lint": "
|
|
17
|
+
"herb-lint": "bin/herb-lint"
|
|
18
18
|
},
|
|
19
19
|
"scripts": {
|
|
20
20
|
"clean": "rimraf dist",
|
|
@@ -45,12 +45,12 @@
|
|
|
45
45
|
}
|
|
46
46
|
},
|
|
47
47
|
"dependencies": {
|
|
48
|
-
"@herb-tools/config": "0.8.
|
|
49
|
-
"@herb-tools/core": "0.8.
|
|
50
|
-
"@herb-tools/highlighter": "0.8.
|
|
51
|
-
"@herb-tools/node-wasm": "0.8.
|
|
52
|
-
"@herb-tools/printer": "0.8.
|
|
53
|
-
"@herb-tools/rewriter": "0.8.
|
|
48
|
+
"@herb-tools/config": "0.8.6",
|
|
49
|
+
"@herb-tools/core": "0.8.6",
|
|
50
|
+
"@herb-tools/highlighter": "0.8.6",
|
|
51
|
+
"@herb-tools/node-wasm": "0.8.6",
|
|
52
|
+
"@herb-tools/printer": "0.8.6",
|
|
53
|
+
"@herb-tools/rewriter": "0.8.6",
|
|
54
54
|
"glob": "^13.0.0"
|
|
55
55
|
},
|
|
56
56
|
"files": [
|
|
@@ -78,6 +78,9 @@ class HTMLNoDuplicateMetaNamesVisitor extends ControlFlowTrackingVisitor {
|
|
|
78
78
|
else if (name === "http-equiv" && value) {
|
|
79
79
|
metaTag.httpEquivValue = value;
|
|
80
80
|
}
|
|
81
|
+
else if (name === "media" && value) {
|
|
82
|
+
metaTag.mediaValue = value;
|
|
83
|
+
}
|
|
81
84
|
});
|
|
82
85
|
}
|
|
83
86
|
}
|
|
@@ -109,6 +112,14 @@ class HTMLNoDuplicateMetaNamesVisitor extends ControlFlowTrackingVisitor {
|
|
|
109
112
|
}
|
|
110
113
|
}
|
|
111
114
|
areMetaTagsDuplicate(meta1, meta2) {
|
|
115
|
+
if (meta1.mediaValue && meta2.mediaValue) {
|
|
116
|
+
if (meta1.mediaValue.toLowerCase() !== meta2.mediaValue.toLowerCase()) {
|
|
117
|
+
return false;
|
|
118
|
+
}
|
|
119
|
+
}
|
|
120
|
+
if ((meta1.mediaValue && !meta2.mediaValue) || (!meta1.mediaValue && meta2.mediaValue)) {
|
|
121
|
+
return false;
|
|
122
|
+
}
|
|
112
123
|
if (meta1.nameValue && meta2.nameValue) {
|
|
113
124
|
return meta1.nameValue.toLowerCase() === meta2.nameValue.toLowerCase();
|
|
114
125
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"html-no-duplicate-meta-names.js","sourceRoot":"","sources":["../../../src/rules/html-no-duplicate-meta-names.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;AACpD,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAA;AAEhG,OAAO,EAAE,0BAA0B,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AAC1E,OAAO,EAAE,UAAU,EAAsB,MAAM,UAAU,CAAA;
|
|
1
|
+
{"version":3,"file":"html-no-duplicate-meta-names.js","sourceRoot":"","sources":["../../../src/rules/html-no-duplicate-meta-names.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { ParserRule } from "../types.js";
|
|
2
|
-
import { BaseRuleVisitor } from "./rule-utils.js";
|
|
3
|
-
import { isNode, getTagName, HTMLOpenTagNode } from "@herb-tools/core";
|
|
2
|
+
import { BaseRuleVisitor, findParent } from "./rule-utils.js";
|
|
3
|
+
import { isNode, getTagName, HTMLOpenTagNode, isHTMLElementNode } from "@herb-tools/core";
|
|
4
4
|
class XMLDeclarationChecker extends BaseRuleVisitor {
|
|
5
5
|
hasXMLDeclaration = false;
|
|
6
6
|
visitXMLDeclarationNode(_node) {
|
|
@@ -69,10 +69,27 @@ export class HTMLTagNameLowercaseRule extends ParserRule {
|
|
|
69
69
|
autofix(offense, result, _context) {
|
|
70
70
|
if (!offense.autofixContext)
|
|
71
71
|
return null;
|
|
72
|
-
const { node
|
|
73
|
-
if (!tag_name)
|
|
72
|
+
const { node, correctedTagName } = offense.autofixContext;
|
|
73
|
+
if (!node.tag_name)
|
|
74
74
|
return null;
|
|
75
|
-
tag_name.value = correctedTagName;
|
|
75
|
+
node.tag_name.value = correctedTagName;
|
|
76
|
+
const parentElement = findParent(result.value, node);
|
|
77
|
+
if (!parentElement || !isHTMLElementNode(parentElement))
|
|
78
|
+
return result;
|
|
79
|
+
switch (node.type) {
|
|
80
|
+
case "AST_HTML_OPEN_TAG_NODE":
|
|
81
|
+
if (!parentElement.close_tag)
|
|
82
|
+
break;
|
|
83
|
+
const closeTag = parentElement.close_tag;
|
|
84
|
+
closeTag.tag_name.value = correctedTagName;
|
|
85
|
+
break;
|
|
86
|
+
case "AST_HTML_CLOSE_TAG_NODE":
|
|
87
|
+
const openTag = parentElement.open_tag;
|
|
88
|
+
openTag.tag_name.value = correctedTagName;
|
|
89
|
+
break;
|
|
90
|
+
default:
|
|
91
|
+
break;
|
|
92
|
+
}
|
|
76
93
|
return result;
|
|
77
94
|
}
|
|
78
95
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"html-tag-name-lowercase.js","sourceRoot":"","sources":["../../../src/rules/html-tag-name-lowercase.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAA+B,MAAM,aAAa,CAAA;AACrE,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;
|
|
1
|
+
{"version":3,"file":"html-tag-name-lowercase.js","sourceRoot":"","sources":["../../../src/rules/html-tag-name-lowercase.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,20 +1,20 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@herb-tools/linter",
|
|
3
|
-
"version": "0.8.
|
|
3
|
+
"version": "0.8.6",
|
|
4
4
|
"description": "HTML+ERB linter for validating HTML structure and enforcing best practices",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"homepage": "https://herb-tools.dev",
|
|
7
7
|
"bugs": "https://github.com/marcoroth/herb/issues/new?title=Package%20%60@herb-tools/linter%60:%20",
|
|
8
8
|
"repository": {
|
|
9
9
|
"type": "git",
|
|
10
|
-
"url": "https://github.com/marcoroth/herb.git",
|
|
10
|
+
"url": "git+https://github.com/marcoroth/herb.git",
|
|
11
11
|
"directory": "javascript/packages/linter"
|
|
12
12
|
},
|
|
13
13
|
"main": "./dist/index.cjs",
|
|
14
14
|
"module": "./dist/index.js",
|
|
15
15
|
"types": "./dist/types/index.d.ts",
|
|
16
16
|
"bin": {
|
|
17
|
-
"herb-lint": "
|
|
17
|
+
"herb-lint": "bin/herb-lint"
|
|
18
18
|
},
|
|
19
19
|
"scripts": {
|
|
20
20
|
"clean": "rimraf dist",
|
|
@@ -45,12 +45,12 @@
|
|
|
45
45
|
}
|
|
46
46
|
},
|
|
47
47
|
"dependencies": {
|
|
48
|
-
"@herb-tools/config": "0.8.
|
|
49
|
-
"@herb-tools/core": "0.8.
|
|
50
|
-
"@herb-tools/highlighter": "0.8.
|
|
51
|
-
"@herb-tools/node-wasm": "0.8.
|
|
52
|
-
"@herb-tools/printer": "0.8.
|
|
53
|
-
"@herb-tools/rewriter": "0.8.
|
|
48
|
+
"@herb-tools/config": "0.8.6",
|
|
49
|
+
"@herb-tools/core": "0.8.6",
|
|
50
|
+
"@herb-tools/highlighter": "0.8.6",
|
|
51
|
+
"@herb-tools/node-wasm": "0.8.6",
|
|
52
|
+
"@herb-tools/printer": "0.8.6",
|
|
53
|
+
"@herb-tools/rewriter": "0.8.6",
|
|
54
54
|
"glob": "^13.0.0"
|
|
55
55
|
},
|
|
56
56
|
"files": [
|
|
@@ -11,6 +11,7 @@ interface MetaTag {
|
|
|
11
11
|
node: HTMLElementNode
|
|
12
12
|
nameValue?: string
|
|
13
13
|
httpEquivValue?: string
|
|
14
|
+
mediaValue?: string
|
|
14
15
|
}
|
|
15
16
|
|
|
16
17
|
interface ControlFlowState {
|
|
@@ -112,6 +113,8 @@ class HTMLNoDuplicateMetaNamesVisitor extends ControlFlowTrackingVisitor<BaseAut
|
|
|
112
113
|
metaTag.nameValue = value
|
|
113
114
|
} else if (name === "http-equiv" && value) {
|
|
114
115
|
metaTag.httpEquivValue = value
|
|
116
|
+
} else if (name === "media" && value) {
|
|
117
|
+
metaTag.mediaValue = value
|
|
115
118
|
}
|
|
116
119
|
})
|
|
117
120
|
}
|
|
@@ -155,6 +158,16 @@ class HTMLNoDuplicateMetaNamesVisitor extends ControlFlowTrackingVisitor<BaseAut
|
|
|
155
158
|
}
|
|
156
159
|
|
|
157
160
|
private areMetaTagsDuplicate(meta1: MetaTag, meta2: MetaTag): boolean {
|
|
161
|
+
if (meta1.mediaValue && meta2.mediaValue) {
|
|
162
|
+
if (meta1.mediaValue.toLowerCase() !== meta2.mediaValue.toLowerCase()) {
|
|
163
|
+
return false
|
|
164
|
+
}
|
|
165
|
+
}
|
|
166
|
+
|
|
167
|
+
if ((meta1.mediaValue && !meta2.mediaValue) || (!meta1.mediaValue && meta2.mediaValue)) {
|
|
168
|
+
return false
|
|
169
|
+
}
|
|
170
|
+
|
|
158
171
|
if (meta1.nameValue && meta2.nameValue) {
|
|
159
172
|
return meta1.nameValue.toLowerCase() === meta2.nameValue.toLowerCase()
|
|
160
173
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { ParserRule, BaseAutofixContext, Mutable } from "../types.js"
|
|
2
|
-
import { BaseRuleVisitor } from "./rule-utils.js"
|
|
3
|
-
import { isNode, getTagName, HTMLOpenTagNode } from "@herb-tools/core"
|
|
2
|
+
import { BaseRuleVisitor, findParent } from "./rule-utils.js"
|
|
3
|
+
import { isNode, getTagName, HTMLOpenTagNode, isHTMLElementNode } from "@herb-tools/core"
|
|
4
4
|
|
|
5
5
|
import type { UnboundLintOffense, LintOffense, LintContext, FullRuleConfig } from "../types.js"
|
|
6
6
|
import type { HTMLElementNode, HTMLCloseTagNode, ParseResult, XMLDeclarationNode, Node } from "@herb-tools/core"
|
|
@@ -99,11 +99,28 @@ export class HTMLTagNameLowercaseRule extends ParserRule<TagNameAutofixContext>
|
|
|
99
99
|
autofix(offense: LintOffense<TagNameAutofixContext>, result: ParseResult, _context?: Partial<LintContext>): ParseResult | null {
|
|
100
100
|
if (!offense.autofixContext) return null
|
|
101
101
|
|
|
102
|
-
const { node
|
|
102
|
+
const { node, correctedTagName } = offense.autofixContext
|
|
103
|
+
if (!node.tag_name) return null
|
|
103
104
|
|
|
104
|
-
|
|
105
|
+
node.tag_name.value = correctedTagName
|
|
105
106
|
|
|
106
|
-
|
|
107
|
+
const parentElement = findParent(result.value, node as any as Node)
|
|
108
|
+
if (!parentElement || !isHTMLElementNode(parentElement)) return result
|
|
109
|
+
|
|
110
|
+
switch (node.type) {
|
|
111
|
+
case "AST_HTML_OPEN_TAG_NODE":
|
|
112
|
+
if (!parentElement.close_tag) break
|
|
113
|
+
|
|
114
|
+
const closeTag = parentElement.close_tag as Mutable<HTMLCloseTagNode>
|
|
115
|
+
closeTag.tag_name!.value = correctedTagName
|
|
116
|
+
break
|
|
117
|
+
case "AST_HTML_CLOSE_TAG_NODE":
|
|
118
|
+
const openTag = parentElement.open_tag as Mutable<HTMLOpenTagNode>
|
|
119
|
+
openTag.tag_name!.value = correctedTagName
|
|
120
|
+
break
|
|
121
|
+
default:
|
|
122
|
+
break
|
|
123
|
+
}
|
|
107
124
|
|
|
108
125
|
return result
|
|
109
126
|
}
|