@herb-tools/linter 0.9.0 → 0.9.2
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 +2 -2
- package/dist/herb-lint.js +1525 -98
- package/dist/herb-lint.js.map +1 -1
- package/dist/index.cjs +546 -87
- package/dist/index.cjs.map +1 -1
- package/dist/index.js +465 -87
- package/dist/index.js.map +1 -1
- package/dist/lint-worker.js +1523 -96
- package/dist/lint-worker.js.map +1 -1
- package/dist/loader.cjs +1078 -94
- package/dist/loader.cjs.map +1 -1
- package/dist/loader.js +1057 -95
- package/dist/loader.js.map +1 -1
- package/dist/rules/actionview-no-silent-render.js +31 -0
- package/dist/rules/actionview-no-silent-render.js.map +1 -0
- package/dist/rules/erb-no-case-node-children.js +3 -1
- package/dist/rules/erb-no-case-node-children.js.map +1 -1
- package/dist/rules/erb-no-duplicate-branch-elements.js +95 -11
- package/dist/rules/erb-no-duplicate-branch-elements.js.map +1 -1
- package/dist/rules/erb-no-empty-control-flow.js +190 -0
- package/dist/rules/erb-no-empty-control-flow.js.map +1 -0
- package/dist/rules/erb-no-silent-statement.js +44 -0
- package/dist/rules/erb-no-silent-statement.js.map +1 -0
- package/dist/rules/erb-no-unsafe-script-interpolation.js +37 -3
- package/dist/rules/erb-no-unsafe-script-interpolation.js.map +1 -1
- package/dist/rules/html-allowed-script-type.js +1 -1
- package/dist/rules/html-allowed-script-type.js.map +1 -1
- package/dist/rules/index.js +20 -16
- package/dist/rules/index.js.map +1 -1
- package/dist/rules/rule-utils.js +14 -23
- package/dist/rules/rule-utils.js.map +1 -1
- package/dist/rules.js +8 -2
- package/dist/rules.js.map +1 -1
- package/dist/types/index.d.ts +1 -0
- package/dist/types/rules/actionview-no-silent-render.d.ts +9 -0
- package/dist/types/rules/erb-no-duplicate-branch-elements.d.ts +1 -0
- package/dist/types/rules/erb-no-empty-control-flow.d.ts +8 -0
- package/dist/types/rules/erb-no-silent-statement.d.ts +9 -0
- package/dist/types/rules/erb-no-unsafe-script-interpolation.d.ts +2 -1
- package/dist/types/rules/index.d.ts +20 -16
- package/dist/types/rules/rule-utils.d.ts +8 -11
- package/dist/types/types.d.ts +4 -3
- package/dist/types.js +6 -3
- package/dist/types.js.map +1 -1
- package/docs/rules/README.md +3 -0
- package/docs/rules/actionview-no-silent-render.md +47 -0
- package/docs/rules/erb-no-empty-control-flow.md +83 -0
- package/docs/rules/erb-no-silent-statement.md +53 -0
- package/docs/rules/erb-no-unsafe-script-interpolation.md +70 -3
- package/package.json +8 -8
- package/src/index.ts +21 -0
- package/src/rules/actionview-no-silent-render.ts +44 -0
- package/src/rules/erb-no-case-node-children.ts +3 -1
- package/src/rules/erb-no-duplicate-branch-elements.ts +130 -14
- package/src/rules/erb-no-empty-control-flow.ts +255 -0
- package/src/rules/erb-no-silent-statement.ts +58 -0
- package/src/rules/erb-no-unsafe-script-interpolation.ts +51 -5
- package/src/rules/html-allowed-script-type.ts +1 -1
- package/src/rules/index.ts +21 -16
- package/src/rules/rule-utils.ts +15 -24
- package/src/rules.ts +8 -2
- package/src/types.ts +7 -3
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
import { ParserRule } from "../types.js";
|
|
2
|
+
import { BaseRuleVisitor } from "./rule-utils.js";
|
|
3
|
+
import { isERBOutputNode } from "@herb-tools/core";
|
|
4
|
+
class ActionViewNoSilentRenderVisitor extends BaseRuleVisitor {
|
|
5
|
+
visitERBRenderNode(node) {
|
|
6
|
+
if (!isERBOutputNode(node)) {
|
|
7
|
+
this.addOffense(`Avoid using \`${node.tag_opening?.value} %>\` with \`render\`. Use \`<%= %>\` to ensure the rendered content is output.`, node.location);
|
|
8
|
+
}
|
|
9
|
+
this.visitChildNodes(node);
|
|
10
|
+
}
|
|
11
|
+
}
|
|
12
|
+
export class ActionViewNoSilentRenderRule extends ParserRule {
|
|
13
|
+
static ruleName = "actionview-no-silent-render";
|
|
14
|
+
get defaultConfig() {
|
|
15
|
+
return {
|
|
16
|
+
enabled: true,
|
|
17
|
+
severity: "error"
|
|
18
|
+
};
|
|
19
|
+
}
|
|
20
|
+
get parserOptions() {
|
|
21
|
+
return {
|
|
22
|
+
render_nodes: true,
|
|
23
|
+
};
|
|
24
|
+
}
|
|
25
|
+
check(result, context) {
|
|
26
|
+
const visitor = new ActionViewNoSilentRenderVisitor(this.ruleName, context);
|
|
27
|
+
visitor.visit(result.value);
|
|
28
|
+
return visitor.offenses;
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
//# sourceMappingURL=actionview-no-silent-render.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"actionview-no-silent-render.js","sourceRoot":"","sources":["../../src/rules/actionview-no-silent-render.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AACxC,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAKlD,MAAM,+BAAgC,SAAQ,eAAe;IAC3D,kBAAkB,CAAC,IAAmB;QACpC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,CAAC;YAC3B,IAAI,CAAC,UAAU,CACb,iBAAiB,IAAI,CAAC,WAAW,EAAE,KAAK,iFAAiF,EACzH,IAAI,CAAC,QAAQ,CACd,CAAA;QACH,CAAC;QAED,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAA;IAC5B,CAAC;CACF;AAED,MAAM,OAAO,4BAA6B,SAAQ,UAAU;IAC1D,MAAM,CAAC,QAAQ,GAAG,6BAA6B,CAAA;IAE/C,IAAI,aAAa;QACf,OAAO;YACL,OAAO,EAAE,IAAI;YACb,QAAQ,EAAE,OAAO;SAClB,CAAA;IACH,CAAC;IAED,IAAI,aAAa;QACf,OAAO;YACL,YAAY,EAAE,IAAI;SACnB,CAAA;IACH,CAAC;IAED,KAAK,CAAC,MAAmB,EAAE,OAA8B;QACvD,MAAM,OAAO,GAAG,IAAI,+BAA+B,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;QAE3E,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;QAE3B,OAAO,OAAO,CAAC,QAAQ,CAAA;IACzB,CAAC"}
|
|
@@ -20,7 +20,9 @@ class ERBNoCaseNodeChildrenVisitor extends BaseRuleVisitor {
|
|
|
20
20
|
for (const child of node.children) {
|
|
21
21
|
if (!this.isAllowedContent(child)) {
|
|
22
22
|
const childCode = IdentityPrinter.print(child).trim();
|
|
23
|
-
this.
|
|
23
|
+
const offense = this.createOffense(`Do not place \`${childCode}\` between \`${caseCode}\` and \`${conditionCode}\`. Content here is not part of any branch and will not be rendered.`, child.location);
|
|
24
|
+
offense.tags = ["unnecessary"];
|
|
25
|
+
this.offenses.push(offense);
|
|
24
26
|
}
|
|
25
27
|
}
|
|
26
28
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"erb-no-case-node-children.js","sourceRoot":"","sources":["../../src/rules/erb-no-case-node-children.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AACxC,OAAO,EAAE,gBAAgB,EAAE,aAAa,EAAE,cAAc,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAC5G,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAKrD,MAAM,4BAA6B,SAAQ,eAAe;IACxD,gBAAgB,CAAC,IAAiB;QAChC,IAAI,CAAC,qBAAqB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;QACxC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAA;IAC5B,CAAC;IAED,qBAAqB,CAAC,IAAsB;QAC1C,IAAI,CAAC,qBAAqB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;QACtC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAA;IAC5B,CAAC;IAEO,qBAAqB,CAAC,IAAoC,EAAE,IAAY;QAC9E,IAAI,CAAC,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC;YAAE,OAAM;QAExD,MAAM,QAAQ,GAAG,eAAe,CAAC,YAAY,CAAC,IAAI,CAAC,CAAA;QACnD,MAAM,cAAc,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,CAAA;QAC3C,MAAM,aAAa,GAAG,cAAc,IAAI,SAAS,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,MAAM,IAAI,SAAS,CAAA;QAEtI,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAClC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,EAAE,CAAC;gBAClC,MAAM,SAAS,GAAG,eAAe,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,CAAA;gBAErD,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"erb-no-case-node-children.js","sourceRoot":"","sources":["../../src/rules/erb-no-case-node-children.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AACxC,OAAO,EAAE,gBAAgB,EAAE,aAAa,EAAE,cAAc,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAC5G,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAKrD,MAAM,4BAA6B,SAAQ,eAAe;IACxD,gBAAgB,CAAC,IAAiB;QAChC,IAAI,CAAC,qBAAqB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;QACxC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAA;IAC5B,CAAC;IAED,qBAAqB,CAAC,IAAsB;QAC1C,IAAI,CAAC,qBAAqB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;QACtC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAA;IAC5B,CAAC;IAEO,qBAAqB,CAAC,IAAoC,EAAE,IAAY;QAC9E,IAAI,CAAC,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC;YAAE,OAAM;QAExD,MAAM,QAAQ,GAAG,eAAe,CAAC,YAAY,CAAC,IAAI,CAAC,CAAA;QACnD,MAAM,cAAc,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,CAAA;QAC3C,MAAM,aAAa,GAAG,cAAc,IAAI,SAAS,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,MAAM,IAAI,SAAS,CAAA;QAEtI,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAClC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,EAAE,CAAC;gBAClC,MAAM,SAAS,GAAG,eAAe,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,CAAA;gBAErD,MAAM,OAAO,GAAG,IAAI,CAAC,aAAa,CAChC,kBAAkB,SAAS,gBAAgB,QAAQ,YAAY,aAAa,sEAAsE,EAClJ,KAAK,CAAC,QAAQ,CACf,CAAA;gBACD,OAAO,CAAC,IAAI,GAAG,CAAC,aAAa,CAAC,CAAA;gBAC9B,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;YAC7B,CAAC;QACH,CAAC;IACH,CAAC;IAEO,gBAAgB,CAAC,IAAU;QACjC,IAAI,gBAAgB,CAAC,IAAI,CAAC;YAAE,OAAO,IAAI,CAAA;QACvC,IAAI,aAAa,CAAC,IAAI,CAAC;YAAE,OAAO,IAAI,CAAA;QAEpC,IAAI,aAAa,CAAC,IAAI,CAAC,IAAI,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC;YAChD,OAAO,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QACnC,CAAC;QAED,OAAO,KAAK,CAAA;IACd,CAAC;CACF;AAED,MAAM,OAAO,yBAA0B,SAAQ,UAAU;IACvD,MAAM,CAAC,QAAQ,GAAG,2BAA2B,CAAA;IAE7C,IAAI,aAAa;QACf,OAAO;YACL,OAAO,EAAE,IAAI;YACb,QAAQ,EAAE,OAAO;SAClB,CAAA;IACH,CAAC;IAED,KAAK,CAAC,MAAmB,EAAE,OAA8B;QACvD,MAAM,OAAO,GAAG,IAAI,4BAA4B,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;QAExE,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;QAE3B,OAAO,OAAO,CAAC,QAAQ,CAAA;IACzB,CAAC"}
|
|
@@ -1,10 +1,19 @@
|
|
|
1
1
|
import { ParserRule } from "../types.js";
|
|
2
2
|
import { BaseRuleVisitor } from "./rule-utils.js";
|
|
3
3
|
import { IdentityPrinter } from "@herb-tools/printer";
|
|
4
|
-
import { isHTMLElementNode, isERBIfNode, isERBElseNode, isERBUnlessNode, isERBCaseNode, isERBWhenNode, isEquivalentElement, isPureWhitespaceNode, findParentArray, removeNodeFromArray, replaceNodeWithBody, createLiteral, HTMLElementNode, Location, } from "@herb-tools/core";
|
|
4
|
+
import { isHTMLElementNode, isHTMLOpenTagNode, isERBIfNode, isERBElseNode, isERBUnlessNode, isERBCaseNode, isERBWhenNode, isEquivalentElement, isPureWhitespaceNode, findParentArray, removeNodeFromArray, replaceNodeWithBody, createLiteral, HTMLElementNode, Location, } from "@herb-tools/core";
|
|
5
5
|
function getSignificantNodes(statements) {
|
|
6
6
|
return statements.filter(node => !isPureWhitespaceNode(node));
|
|
7
7
|
}
|
|
8
|
+
function trimWhitespaceNodes(nodes) {
|
|
9
|
+
let start = 0;
|
|
10
|
+
let end = nodes.length;
|
|
11
|
+
while (start < end && isPureWhitespaceNode(nodes[start]))
|
|
12
|
+
start++;
|
|
13
|
+
while (end > start && isPureWhitespaceNode(nodes[end - 1]))
|
|
14
|
+
end--;
|
|
15
|
+
return nodes.slice(start, end);
|
|
16
|
+
}
|
|
8
17
|
function allEquivalentElements(nodes) {
|
|
9
18
|
if (nodes.length < 2)
|
|
10
19
|
return false;
|
|
@@ -122,9 +131,19 @@ class ERBNoDuplicateBranchElementsVisitor extends BaseRuleVisitor {
|
|
|
122
131
|
if (isERBIfNode(node)) {
|
|
123
132
|
this.markSubsequentIfNodesAsProcessed(node);
|
|
124
133
|
}
|
|
134
|
+
if (this.allBranchesIdentical(branches)) {
|
|
135
|
+
this.addOffense("All branches of this conditional have identical content. The conditional can be removed.", node.location, { node: node, allIdentical: true }, "warning");
|
|
136
|
+
return;
|
|
137
|
+
}
|
|
125
138
|
const state = { isFirstOffense: true };
|
|
126
139
|
this.checkBranches(branches, node, state);
|
|
127
140
|
}
|
|
141
|
+
allBranchesIdentical(branches) {
|
|
142
|
+
if (branches.length < 2)
|
|
143
|
+
return false;
|
|
144
|
+
const first = branches[0].map(node => IdentityPrinter.print(node)).join("");
|
|
145
|
+
return branches.slice(1).every(branch => branch.map(node => IdentityPrinter.print(node)).join("") === first);
|
|
146
|
+
}
|
|
128
147
|
markSubsequentIfNodesAsProcessed(node) {
|
|
129
148
|
let current = node.subsequent;
|
|
130
149
|
while (current) {
|
|
@@ -158,11 +177,23 @@ class ERBNoDuplicateBranchElementsVisitor extends BaseRuleVisitor {
|
|
|
158
177
|
const bodiesMatch = elements.every(element => IdentityPrinter.print(element) === IdentityPrinter.print(elements[0]));
|
|
159
178
|
for (const element of elements) {
|
|
160
179
|
const printed = IdentityPrinter.print(element.open_tag);
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
180
|
+
if (bodiesMatch) {
|
|
181
|
+
const autofixContext = state.isFirstOffense
|
|
182
|
+
? { node: conditionalNode }
|
|
183
|
+
: undefined;
|
|
184
|
+
this.addOffense(`The \`${printed}\` element is duplicated across all branches of this conditional and can be moved outside.`, element.location, autofixContext);
|
|
185
|
+
state.isFirstOffense = false;
|
|
186
|
+
}
|
|
187
|
+
else {
|
|
188
|
+
const autofixContext = state.isFirstOffense
|
|
189
|
+
? { node: conditionalNode }
|
|
190
|
+
: undefined;
|
|
191
|
+
const tagNameLocation = isHTMLOpenTagNode(element.open_tag) && element.open_tag.tag_name?.location
|
|
192
|
+
? element.open_tag.tag_name.location
|
|
193
|
+
: element?.open_tag?.location || element.location;
|
|
194
|
+
this.addOffense(`The \`${printed}\` tag is repeated across all branches with different content. Consider extracting the shared tag outside the conditional.`, tagNameLocation, autofixContext, "hint");
|
|
195
|
+
state.isFirstOffense = false;
|
|
196
|
+
}
|
|
166
197
|
}
|
|
167
198
|
if (!bodiesMatch && bodies.every(body => body.length > 0)) {
|
|
168
199
|
this.checkBranches(bodies, conditionalNode, state);
|
|
@@ -191,6 +222,15 @@ export class ERBNoDuplicateBranchElementsRule extends ParserRule {
|
|
|
191
222
|
const branches = collectBranches(conditionalNode);
|
|
192
223
|
if (!branches)
|
|
193
224
|
return null;
|
|
225
|
+
if (offense.autofixContext.allIdentical) {
|
|
226
|
+
const parentInfo = findParentArray(result.value, conditionalNode);
|
|
227
|
+
if (!parentInfo)
|
|
228
|
+
return null;
|
|
229
|
+
const { array: parentArray, index: conditionalIndex } = parentInfo;
|
|
230
|
+
const firstBranchContent = trimWhitespaceNodes(branches[0]);
|
|
231
|
+
parentArray.splice(conditionalIndex, 1, ...firstBranchContent);
|
|
232
|
+
return result;
|
|
233
|
+
}
|
|
194
234
|
const significantBranches = branches.map(getSignificantNodes);
|
|
195
235
|
if (significantBranches.some(branch => branch.length === 0))
|
|
196
236
|
return null;
|
|
@@ -204,23 +244,51 @@ export class ERBNoDuplicateBranchElementsRule extends ParserRule {
|
|
|
204
244
|
return null;
|
|
205
245
|
let { array: parentArray, index: conditionalIndex } = parentInfo;
|
|
206
246
|
let hasWrapped = false;
|
|
247
|
+
let didMutate = false;
|
|
248
|
+
let failedToHoistPrefix = false;
|
|
249
|
+
let hoistedBefore = false;
|
|
207
250
|
const hoistElement = (elements, position) => {
|
|
251
|
+
const actualPosition = (position === "before" && failedToHoistPrefix) ? "after" : position;
|
|
208
252
|
const bodiesMatch = elements.every(element => IdentityPrinter.print(element) === IdentityPrinter.print(elements[0]));
|
|
209
253
|
if (bodiesMatch) {
|
|
254
|
+
if (actualPosition === "after") {
|
|
255
|
+
const currentLengths = branches.map(b => getSignificantNodes(b).length);
|
|
256
|
+
if (currentLengths.some(l => l !== currentLengths[0]))
|
|
257
|
+
return;
|
|
258
|
+
}
|
|
259
|
+
if (actualPosition === "after" && position === "before") {
|
|
260
|
+
const isAtEnd = branches.every((branch, index) => {
|
|
261
|
+
const nodes = getSignificantNodes(branch);
|
|
262
|
+
return nodes.length > 0 && nodes[nodes.length - 1] === elements[index];
|
|
263
|
+
});
|
|
264
|
+
if (!isAtEnd)
|
|
265
|
+
return;
|
|
266
|
+
}
|
|
210
267
|
for (let i = 0; i < branches.length; i++) {
|
|
211
268
|
removeNodeFromArray(branches[i], elements[i]);
|
|
212
269
|
}
|
|
213
|
-
if (
|
|
214
|
-
parentArray.splice(conditionalIndex, 0, elements[0]);
|
|
215
|
-
conditionalIndex
|
|
270
|
+
if (actualPosition === "before") {
|
|
271
|
+
parentArray.splice(conditionalIndex, 0, elements[0], createLiteral("\n"));
|
|
272
|
+
conditionalIndex += 2;
|
|
273
|
+
hoistedBefore = true;
|
|
216
274
|
}
|
|
217
275
|
else {
|
|
218
|
-
parentArray.splice(conditionalIndex + 1, 0, elements[0]);
|
|
276
|
+
parentArray.splice(conditionalIndex + 1, 0, createLiteral("\n"), elements[0]);
|
|
219
277
|
}
|
|
278
|
+
didMutate = true;
|
|
220
279
|
}
|
|
221
280
|
else {
|
|
222
281
|
if (hasWrapped)
|
|
223
282
|
return;
|
|
283
|
+
const canWrap = branches.every((branch, index) => {
|
|
284
|
+
const remaining = getSignificantNodes(branch);
|
|
285
|
+
return remaining.length === 1 && remaining[0] === elements[index];
|
|
286
|
+
});
|
|
287
|
+
if (!canWrap) {
|
|
288
|
+
if (position === "before")
|
|
289
|
+
failedToHoistPrefix = true;
|
|
290
|
+
return;
|
|
291
|
+
}
|
|
224
292
|
for (let i = 0; i < branches.length; i++) {
|
|
225
293
|
replaceNodeWithBody(branches[i], elements[i]);
|
|
226
294
|
}
|
|
@@ -229,6 +297,7 @@ export class ERBNoDuplicateBranchElementsRule extends ParserRule {
|
|
|
229
297
|
parentArray = wrapper.body;
|
|
230
298
|
conditionalIndex = 1;
|
|
231
299
|
hasWrapped = true;
|
|
300
|
+
didMutate = true;
|
|
232
301
|
}
|
|
233
302
|
};
|
|
234
303
|
for (let index = 0; index < prefixCount; index++) {
|
|
@@ -239,7 +308,22 @@ export class ERBNoDuplicateBranchElementsRule extends ParserRule {
|
|
|
239
308
|
const elements = significantBranches.map(branch => branch[branch.length - 1 - offset]);
|
|
240
309
|
hoistElement(elements, "after");
|
|
241
310
|
}
|
|
242
|
-
|
|
311
|
+
if (!hasWrapped && hoistedBefore) {
|
|
312
|
+
const remaining = branches.map(branch => getSignificantNodes(branch));
|
|
313
|
+
if (remaining.every(branch => branch.length === 1) && allEquivalentElements(remaining.map(b => b[0]))) {
|
|
314
|
+
const elements = remaining.map(b => b[0]);
|
|
315
|
+
const bodiesMatch = elements.every(el => IdentityPrinter.print(el) === IdentityPrinter.print(elements[0]));
|
|
316
|
+
if (!bodiesMatch && elements.every(el => el.body.length > 0)) {
|
|
317
|
+
for (let i = 0; i < branches.length; i++) {
|
|
318
|
+
replaceNodeWithBody(branches[i], elements[i]);
|
|
319
|
+
}
|
|
320
|
+
const wrapper = createWrapper(elements[0], [createLiteral("\n"), conditionalNode, createLiteral("\n")]);
|
|
321
|
+
parentArray[conditionalIndex] = wrapper;
|
|
322
|
+
didMutate = true;
|
|
323
|
+
}
|
|
324
|
+
}
|
|
325
|
+
}
|
|
326
|
+
return didMutate ? result : null;
|
|
243
327
|
}
|
|
244
328
|
}
|
|
245
329
|
//# sourceMappingURL=erb-no-duplicate-branch-elements.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"erb-no-duplicate-branch-elements.js","sourceRoot":"","sources":["../../src/rules/erb-no-duplicate-branch-elements.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"erb-no-duplicate-branch-elements.js","sourceRoot":"","sources":["../../src/rules/erb-no-duplicate-branch-elements.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,190 @@
|
|
|
1
|
+
import { BaseRuleVisitor } from "./rule-utils.js";
|
|
2
|
+
import { ParserRule } from "../types.js";
|
|
3
|
+
import { isHTMLTextNode, isERBIfNode, isERBElseNode, Location } from "@herb-tools/core";
|
|
4
|
+
class ERBNoEmptyControlFlowVisitor extends BaseRuleVisitor {
|
|
5
|
+
processedIfNodes = new Set();
|
|
6
|
+
processedElseNodes = new Set();
|
|
7
|
+
visitERBIfNode(node) {
|
|
8
|
+
if (this.processedIfNodes.has(node)) {
|
|
9
|
+
return;
|
|
10
|
+
}
|
|
11
|
+
this.markIfChainAsProcessed(node);
|
|
12
|
+
this.markElseNodesInIfChain(node);
|
|
13
|
+
const entireChainEmpty = this.isEntireIfChainEmpty(node);
|
|
14
|
+
if (entireChainEmpty) {
|
|
15
|
+
this.addEmptyBlockOffense(node, node.statements, "if");
|
|
16
|
+
}
|
|
17
|
+
else {
|
|
18
|
+
this.checkIfChainParts(node);
|
|
19
|
+
}
|
|
20
|
+
this.visitChildNodes(node);
|
|
21
|
+
}
|
|
22
|
+
visitERBElseNode(node) {
|
|
23
|
+
if (this.processedElseNodes.has(node)) {
|
|
24
|
+
this.visitChildNodes(node);
|
|
25
|
+
return;
|
|
26
|
+
}
|
|
27
|
+
this.addEmptyBlockOffense(node, node.statements, "else");
|
|
28
|
+
this.visitChildNodes(node);
|
|
29
|
+
}
|
|
30
|
+
visitERBUnlessNode(node) {
|
|
31
|
+
const unlessHasContent = this.statementsHaveContent(node.statements);
|
|
32
|
+
const elseHasContent = node.else_clause && this.statementsHaveContent(node.else_clause.statements);
|
|
33
|
+
if (node.else_clause) {
|
|
34
|
+
this.processedElseNodes.add(node.else_clause);
|
|
35
|
+
}
|
|
36
|
+
const entireBlockEmpty = !unlessHasContent && !elseHasContent;
|
|
37
|
+
if (entireBlockEmpty) {
|
|
38
|
+
this.addEmptyBlockOffense(node, node.statements, "unless");
|
|
39
|
+
}
|
|
40
|
+
else {
|
|
41
|
+
if (!unlessHasContent) {
|
|
42
|
+
this.addEmptyBlockOffenseWithEnd(node, node.statements, "unless", node.else_clause);
|
|
43
|
+
}
|
|
44
|
+
if (node.else_clause && !elseHasContent) {
|
|
45
|
+
this.addEmptyBlockOffense(node.else_clause, node.else_clause.statements, "else");
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
this.visitChildNodes(node);
|
|
49
|
+
}
|
|
50
|
+
visitERBForNode(node) {
|
|
51
|
+
this.addEmptyBlockOffense(node, node.statements, "for");
|
|
52
|
+
this.visitChildNodes(node);
|
|
53
|
+
}
|
|
54
|
+
visitERBWhileNode(node) {
|
|
55
|
+
this.addEmptyBlockOffense(node, node.statements, "while");
|
|
56
|
+
this.visitChildNodes(node);
|
|
57
|
+
}
|
|
58
|
+
visitERBUntilNode(node) {
|
|
59
|
+
this.addEmptyBlockOffense(node, node.statements, "until");
|
|
60
|
+
this.visitChildNodes(node);
|
|
61
|
+
}
|
|
62
|
+
visitERBWhenNode(node) {
|
|
63
|
+
if (!node.then_keyword) {
|
|
64
|
+
this.addEmptyBlockOffense(node, node.statements, "when");
|
|
65
|
+
}
|
|
66
|
+
this.visitChildNodes(node);
|
|
67
|
+
}
|
|
68
|
+
visitERBInNode(node) {
|
|
69
|
+
if (!node.then_keyword) {
|
|
70
|
+
this.addEmptyBlockOffense(node, node.statements, "in");
|
|
71
|
+
}
|
|
72
|
+
this.visitChildNodes(node);
|
|
73
|
+
}
|
|
74
|
+
visitERBBeginNode(node) {
|
|
75
|
+
this.addEmptyBlockOffense(node, node.statements, "begin");
|
|
76
|
+
this.visitChildNodes(node);
|
|
77
|
+
}
|
|
78
|
+
visitERBRescueNode(node) {
|
|
79
|
+
this.addEmptyBlockOffense(node, node.statements, "rescue");
|
|
80
|
+
this.visitChildNodes(node);
|
|
81
|
+
}
|
|
82
|
+
visitERBEnsureNode(node) {
|
|
83
|
+
this.addEmptyBlockOffense(node, node.statements, "ensure");
|
|
84
|
+
this.visitChildNodes(node);
|
|
85
|
+
}
|
|
86
|
+
visitERBBlockNode(node) {
|
|
87
|
+
this.addEmptyBlockOffense(node, node.body, "do");
|
|
88
|
+
this.visitChildNodes(node);
|
|
89
|
+
}
|
|
90
|
+
addEmptyBlockOffense(node, statements, blockType) {
|
|
91
|
+
this.addEmptyBlockOffenseWithEnd(node, statements, blockType, null);
|
|
92
|
+
}
|
|
93
|
+
addEmptyBlockOffenseWithEnd(node, statements, blockType, subsequentNode) {
|
|
94
|
+
if (this.statementsHaveContent(statements)) {
|
|
95
|
+
return;
|
|
96
|
+
}
|
|
97
|
+
const startLocation = node.location.start;
|
|
98
|
+
const endLocation = subsequentNode
|
|
99
|
+
? subsequentNode.location.start
|
|
100
|
+
: node.location.end;
|
|
101
|
+
const location = Location.from(startLocation.line, startLocation.column, endLocation.line, endLocation.column);
|
|
102
|
+
const offense = this.createOffense(`Empty ${blockType} block: this control flow statement has no content`, location);
|
|
103
|
+
offense.tags = ["unnecessary"];
|
|
104
|
+
this.offenses.push(offense);
|
|
105
|
+
}
|
|
106
|
+
statementsHaveContent(statements) {
|
|
107
|
+
return statements.some(statement => {
|
|
108
|
+
if (isHTMLTextNode(statement)) {
|
|
109
|
+
return statement.content.trim() !== "";
|
|
110
|
+
}
|
|
111
|
+
return true;
|
|
112
|
+
});
|
|
113
|
+
}
|
|
114
|
+
markIfChainAsProcessed(node) {
|
|
115
|
+
this.processedIfNodes.add(node);
|
|
116
|
+
this.traverseSubsequentNodes(node.subsequent, (current) => {
|
|
117
|
+
if (isERBIfNode(current)) {
|
|
118
|
+
this.processedIfNodes.add(current);
|
|
119
|
+
}
|
|
120
|
+
});
|
|
121
|
+
}
|
|
122
|
+
markElseNodesInIfChain(node) {
|
|
123
|
+
this.traverseSubsequentNodes(node.subsequent, (current) => {
|
|
124
|
+
if (isERBElseNode(current)) {
|
|
125
|
+
this.processedElseNodes.add(current);
|
|
126
|
+
}
|
|
127
|
+
});
|
|
128
|
+
}
|
|
129
|
+
traverseSubsequentNodes(startNode, callback) {
|
|
130
|
+
let current = startNode;
|
|
131
|
+
while (current) {
|
|
132
|
+
if (isERBIfNode(current)) {
|
|
133
|
+
callback(current);
|
|
134
|
+
current = current.subsequent;
|
|
135
|
+
}
|
|
136
|
+
else if (isERBElseNode(current)) {
|
|
137
|
+
callback(current);
|
|
138
|
+
break;
|
|
139
|
+
}
|
|
140
|
+
else {
|
|
141
|
+
break;
|
|
142
|
+
}
|
|
143
|
+
}
|
|
144
|
+
}
|
|
145
|
+
checkIfChainParts(node) {
|
|
146
|
+
if (!this.statementsHaveContent(node.statements)) {
|
|
147
|
+
this.addEmptyBlockOffenseWithEnd(node, node.statements, "if", node.subsequent);
|
|
148
|
+
}
|
|
149
|
+
this.traverseSubsequentNodes(node.subsequent, (current) => {
|
|
150
|
+
if (this.statementsHaveContent(current.statements)) {
|
|
151
|
+
return;
|
|
152
|
+
}
|
|
153
|
+
const blockType = isERBIfNode(current) ? "elsif" : "else";
|
|
154
|
+
const nextSubsequent = isERBIfNode(current) ? current.subsequent : null;
|
|
155
|
+
if (nextSubsequent) {
|
|
156
|
+
this.addEmptyBlockOffenseWithEnd(current, current.statements, blockType, nextSubsequent);
|
|
157
|
+
}
|
|
158
|
+
else {
|
|
159
|
+
this.addEmptyBlockOffense(current, current.statements, blockType);
|
|
160
|
+
}
|
|
161
|
+
});
|
|
162
|
+
}
|
|
163
|
+
isEntireIfChainEmpty(node) {
|
|
164
|
+
if (this.statementsHaveContent(node.statements)) {
|
|
165
|
+
return false;
|
|
166
|
+
}
|
|
167
|
+
let hasContent = false;
|
|
168
|
+
this.traverseSubsequentNodes(node.subsequent, (current) => {
|
|
169
|
+
if (this.statementsHaveContent(current.statements)) {
|
|
170
|
+
hasContent = true;
|
|
171
|
+
}
|
|
172
|
+
});
|
|
173
|
+
return !hasContent;
|
|
174
|
+
}
|
|
175
|
+
}
|
|
176
|
+
export class ERBNoEmptyControlFlowRule extends ParserRule {
|
|
177
|
+
static ruleName = "erb-no-empty-control-flow";
|
|
178
|
+
get defaultConfig() {
|
|
179
|
+
return {
|
|
180
|
+
enabled: true,
|
|
181
|
+
severity: "hint"
|
|
182
|
+
};
|
|
183
|
+
}
|
|
184
|
+
check(result, context) {
|
|
185
|
+
const visitor = new ERBNoEmptyControlFlowVisitor(this.ruleName, context);
|
|
186
|
+
visitor.visit(result.value);
|
|
187
|
+
return visitor.offenses;
|
|
188
|
+
}
|
|
189
|
+
}
|
|
190
|
+
//# sourceMappingURL=erb-no-empty-control-flow.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"erb-no-empty-control-flow.js","sourceRoot":"","sources":["../../src/rules/erb-no-empty-control-flow.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
import { BaseRuleVisitor } from "./rule-utils.js";
|
|
2
|
+
import { ParserRule } from "../types.js";
|
|
3
|
+
import { isERBOutputNode } from "@herb-tools/core";
|
|
4
|
+
function isAssignmentNode(prismNode) {
|
|
5
|
+
const type = prismNode?.constructor?.name;
|
|
6
|
+
if (!type)
|
|
7
|
+
return false;
|
|
8
|
+
return type.endsWith("WriteNode");
|
|
9
|
+
}
|
|
10
|
+
class ERBNoSilentStatementVisitor extends BaseRuleVisitor {
|
|
11
|
+
visitERBContentNode(node) {
|
|
12
|
+
if (isERBOutputNode(node))
|
|
13
|
+
return;
|
|
14
|
+
const prismNode = node.prismNode;
|
|
15
|
+
if (!prismNode)
|
|
16
|
+
return;
|
|
17
|
+
if (isAssignmentNode(prismNode))
|
|
18
|
+
return;
|
|
19
|
+
const content = node.content?.value?.trim();
|
|
20
|
+
if (!content)
|
|
21
|
+
return;
|
|
22
|
+
this.addOffense(`Avoid using silent ERB tags for statements. Move \`${content}\` to a controller, helper, or presenter.`, node.location);
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
export class ERBNoSilentStatementRule extends ParserRule {
|
|
26
|
+
static ruleName = "erb-no-silent-statement";
|
|
27
|
+
get defaultConfig() {
|
|
28
|
+
return {
|
|
29
|
+
enabled: false,
|
|
30
|
+
severity: "warning"
|
|
31
|
+
};
|
|
32
|
+
}
|
|
33
|
+
get parserOptions() {
|
|
34
|
+
return {
|
|
35
|
+
prism_nodes: true,
|
|
36
|
+
};
|
|
37
|
+
}
|
|
38
|
+
check(result, context) {
|
|
39
|
+
const visitor = new ERBNoSilentStatementVisitor(this.ruleName, context);
|
|
40
|
+
visitor.visit(result.value);
|
|
41
|
+
return visitor.offenses;
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
//# sourceMappingURL=erb-no-silent-statement.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"erb-no-silent-statement.js","sourceRoot":"","sources":["../../src/rules/erb-no-silent-statement.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAExC,OAAO,EAAE,eAAe,EAAa,MAAM,kBAAkB,CAAA;AAK7D,SAAS,gBAAgB,CAAC,SAAoB;IAC5C,MAAM,IAAI,GAAW,SAAS,EAAE,WAAW,EAAE,IAAI,CAAA;IACjD,IAAI,CAAC,IAAI;QAAE,OAAO,KAAK,CAAA;IAEvB,OAAO,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAA;AACnC,CAAC;AAED,MAAM,2BAA4B,SAAQ,eAAe;IACvD,mBAAmB,CAAC,IAAoB;QACtC,IAAI,eAAe,CAAC,IAAI,CAAC;YAAE,OAAM;QAEjC,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAA;QAChC,IAAI,CAAC,SAAS;YAAE,OAAM;QAEtB,IAAI,gBAAgB,CAAC,SAAS,CAAC;YAAE,OAAM;QAEvC,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,CAAA;QAC3C,IAAI,CAAC,OAAO;YAAE,OAAM;QAEpB,IAAI,CAAC,UAAU,CACb,sDAAsD,OAAO,2CAA2C,EACxG,IAAI,CAAC,QAAQ,CACd,CAAA;IACH,CAAC;CACF;AAED,MAAM,OAAO,wBAAyB,SAAQ,UAAU;IACtD,MAAM,CAAC,QAAQ,GAAG,yBAAyB,CAAA;IAE3C,IAAI,aAAa;QACf,OAAO;YACL,OAAO,EAAE,KAAK;YACd,QAAQ,EAAE,SAAS;SACpB,CAAA;IACH,CAAC;IAED,IAAI,aAAa;QACf,OAAO;YACL,WAAW,EAAE,IAAI;SAClB,CAAA;IACH,CAAC;IAED,KAAK,CAAC,MAAmB,EAAE,OAA8B;QACvD,MAAM,OAAO,GAAG,IAAI,2BAA2B,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;QAEvE,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;QAE3B,OAAO,OAAO,CAAC,QAAQ,CAAA;IACzB,CAAC"}
|
|
@@ -1,7 +1,28 @@
|
|
|
1
1
|
import { ParserRule } from "../types.js";
|
|
2
2
|
import { BaseRuleVisitor } from "./rule-utils.js";
|
|
3
|
+
import { PrismVisitor } from "@herb-tools/core";
|
|
3
4
|
import { getTagLocalName, getAttribute, getStaticAttributeValue, isERBNode, isERBOutputNode, isHTMLOpenTagNode, } from "@herb-tools/core";
|
|
4
|
-
const
|
|
5
|
+
const SAFE_METHOD_NAMES = new Set([
|
|
6
|
+
"to_json",
|
|
7
|
+
"json_escape",
|
|
8
|
+
]);
|
|
9
|
+
const ESCAPE_JAVASCRIPT_METHOD_NAMES = new Set([
|
|
10
|
+
"j",
|
|
11
|
+
"escape_javascript",
|
|
12
|
+
]);
|
|
13
|
+
class SafeCallDetector extends PrismVisitor {
|
|
14
|
+
hasSafeCall = false;
|
|
15
|
+
hasEscapeJavascriptCall = false;
|
|
16
|
+
visitCallNode(node) {
|
|
17
|
+
if (SAFE_METHOD_NAMES.has(node.name)) {
|
|
18
|
+
this.hasSafeCall = true;
|
|
19
|
+
}
|
|
20
|
+
if (ESCAPE_JAVASCRIPT_METHOD_NAMES.has(node.name)) {
|
|
21
|
+
this.hasEscapeJavascriptCall = true;
|
|
22
|
+
}
|
|
23
|
+
this.visitChildNodes(node);
|
|
24
|
+
}
|
|
25
|
+
}
|
|
5
26
|
class ERBNoUnsafeScriptInterpolationVisitor extends BaseRuleVisitor {
|
|
6
27
|
visitHTMLElementNode(node) {
|
|
7
28
|
if (!isHTMLOpenTagNode(node.open_tag)) {
|
|
@@ -30,9 +51,17 @@ class ERBNoUnsafeScriptInterpolationVisitor extends BaseRuleVisitor {
|
|
|
30
51
|
continue;
|
|
31
52
|
if (!isERBOutputNode(child))
|
|
32
53
|
continue;
|
|
33
|
-
const
|
|
34
|
-
|
|
54
|
+
const erbContent = child;
|
|
55
|
+
const prismNode = erbContent.prismNode;
|
|
56
|
+
const detector = new SafeCallDetector();
|
|
57
|
+
if (prismNode)
|
|
58
|
+
detector.visit(prismNode);
|
|
59
|
+
if (detector.hasSafeCall)
|
|
35
60
|
continue;
|
|
61
|
+
if (detector.hasEscapeJavascriptCall) {
|
|
62
|
+
this.addOffense("Avoid `j()` / `escape_javascript()` in `<script>` tags. It is only safe inside quoted string literals. Use `.to_json` instead, which is safe in any position.", child.location);
|
|
63
|
+
continue;
|
|
64
|
+
}
|
|
36
65
|
this.addOffense("Unsafe ERB output in `<script>` tag. Use `.to_json` to safely serialize values into JavaScript.", child.location);
|
|
37
66
|
}
|
|
38
67
|
}
|
|
@@ -45,6 +74,11 @@ export class ERBNoUnsafeScriptInterpolationRule extends ParserRule {
|
|
|
45
74
|
severity: "error"
|
|
46
75
|
};
|
|
47
76
|
}
|
|
77
|
+
get parserOptions() {
|
|
78
|
+
return {
|
|
79
|
+
prism_nodes: true,
|
|
80
|
+
};
|
|
81
|
+
}
|
|
48
82
|
check(result, context) {
|
|
49
83
|
const visitor = new ERBNoUnsafeScriptInterpolationVisitor(this.ruleName, context);
|
|
50
84
|
visitor.visit(result.value);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"erb-no-unsafe-script-interpolation.js","sourceRoot":"","sources":["../../src/rules/erb-no-unsafe-script-interpolation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AACxC,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AACjD,OAAO,EACL,eAAe,EACf,YAAY,EACZ,uBAAuB,EACvB,SAAS,EACT,eAAe,EACf,iBAAiB,GAClB,MAAM,kBAAkB,CAAA;AAKzB,MAAM,YAAY,GAAG,aAAa,CAAA;
|
|
1
|
+
{"version":3,"file":"erb-no-unsafe-script-interpolation.js","sourceRoot":"","sources":["../../src/rules/erb-no-unsafe-script-interpolation.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { ParserRule } from "../types.js";
|
|
2
2
|
import { BaseRuleVisitor } from "./rule-utils.js";
|
|
3
3
|
import { getTagLocalName, getAttribute, getStaticAttributeValue, hasAttributeValue } from "@herb-tools/core";
|
|
4
|
-
const ALLOWED_TYPES = ["text/javascript"];
|
|
5
4
|
// NOTE: Rules are not configurable for now, keep some sane defaults
|
|
6
5
|
// See https://github.com/marcoroth/herb/issues/1204
|
|
7
6
|
const ALLOW_BLANK = true;
|
|
7
|
+
const ALLOWED_TYPES = ["text/javascript", "module", "importmap", "speculationrules"];
|
|
8
8
|
class AllowedScriptTypeVisitor extends BaseRuleVisitor {
|
|
9
9
|
visitHTMLOpenTagNode(node) {
|
|
10
10
|
if (getTagLocalName(node) === "script") {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"html-allowed-script-type.js","sourceRoot":"","sources":["../../src/rules/html-allowed-script-type.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AACxC,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AACjD,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,uBAAuB,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;AAK5G,MAAM,aAAa,GAAG,CAAC,iBAAiB,
|
|
1
|
+
{"version":3,"file":"html-allowed-script-type.js","sourceRoot":"","sources":["../../src/rules/html-allowed-script-type.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AACxC,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AACjD,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,uBAAuB,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;AAK5G,oEAAoE;AACpE,sDAAsD;AACtD,MAAM,WAAW,GAAG,IAAI,CAAA;AACxB,MAAM,aAAa,GAAG,CAAC,iBAAiB,EAAE,QAAQ,EAAE,WAAW,EAAE,kBAAkB,CAAC,CAAA;AAEpF,MAAM,wBAAyB,SAAQ,eAAe;IACpD,oBAAoB,CAAC,IAAqB;QACxC,IAAI,eAAe,CAAC,IAAI,CAAC,KAAK,QAAQ,EAAE,CAAC;YACvC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAA;QAC5B,CAAC;IACH,CAAC;IAEO,eAAe,CAAC,IAAqB;QAC3C,MAAM,aAAa,GAAG,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;QAEhD,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,IAAI,CAAC,WAAW,EAAE,CAAC;gBACjB,IAAI,CAAC,UAAU,CAAC,+CAA+C,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAA;YACjF,CAAC;YAED,OAAM;QACR,CAAC;QAED,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,EAAE,CAAC;YACtC,IAAI,CAAC,UAAU,CACb,wHAAwH,EACxH,aAAa,CAAC,QAAQ,CACvB,CAAA;YAED,OAAM;QACR,CAAC;QAED,IAAI,CAAC,qBAAqB,CAAC,aAAa,CAAC,CAAA;IAC3C,CAAC;IAEO,qBAAqB,CAAC,aAAgC;QAC5D,MAAM,SAAS,GAAG,uBAAuB,CAAC,aAAa,CAAC,CAAA;QACxD,IAAI,SAAS,KAAK,IAAI;YAAE,OAAM;QAE9B,IAAI,SAAS,KAAK,EAAE,EAAE,CAAC;YACrB,IAAI,CAAC,UAAU,CACb,wHAAwH,EACxH,aAAa,CAAC,QAAQ,CACvB,CAAA;YAED,OAAM;QACR,CAAC;QAED,IAAI,aAAa,CAAC,QAAQ,CAAC,SAAS,CAAC;YAAE,OAAM;QAE7C,IAAI,CAAC,UAAU,CACb,iBAAiB,SAAS,yDAAyD;YACnF,mBAAmB,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;YAClE,GAAG,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,GAAG,EACpC,aAAa,CAAC,QAAQ,CACvB,CAAA;IACH,CAAC;CACF;AAED,MAAM,OAAO,yBAA0B,SAAQ,UAAU;IACvD,MAAM,CAAC,QAAQ,GAAG,0BAA0B,CAAA;IAE5C,IAAI,aAAa;QACf,OAAO;YACL,OAAO,EAAE,IAAI;YACb,QAAQ,EAAE,OAAO;SAClB,CAAA;IACH,CAAC;IAED,KAAK,CAAC,MAAmB,EAAE,OAA8B;QACvD,MAAM,OAAO,GAAG,IAAI,wBAAwB,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;QAEpE,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;QAE3B,OAAO,OAAO,CAAC,QAAQ,CAAA;IACzB,CAAC"}
|