podlite 0.0.97 → 0.0.99
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.podlite +38 -0
- package/esm/assemble/index.d.ts +5 -0
- package/esm/assemble/index.js +6 -5
- package/esm/assemble/index.js.map +1 -1
- package/esm/cli.js +3 -0
- package/esm/cli.js.map +1 -1
- package/esm/lint/grammar/lint.js +47 -22
- package/esm/lint/grammar/lint.js.map +1 -1
- package/esm/lint/grammar/scan.js +6 -3
- package/esm/lint/grammar/scan.js.map +1 -1
- package/esm/lint/implicit-code.d.ts +3 -0
- package/esm/lint/implicit-code.js +83 -0
- package/esm/lint/implicit-code.js.map +1 -0
- package/esm/lint/index.js +4 -2
- package/esm/lint/index.js.map +1 -1
- package/esm/lint/line-starts.d.ts +3 -0
- package/esm/lint/line-starts.js +14 -0
- package/esm/lint/line-starts.js.map +1 -0
- package/esm/lint/rules/abbreviated-attrs.js +6 -4
- package/esm/lint/rules/abbreviated-attrs.js.map +1 -1
- package/esm/lint/rules/allow-value.d.ts +3 -0
- package/esm/lint/rules/allow-value.js +42 -0
- package/esm/lint/rules/allow-value.js.map +1 -0
- package/esm/lint/rules/dead-definitions.js +117 -22
- package/esm/lint/rules/dead-definitions.js.map +1 -1
- package/esm/lint/rules/index.js +6 -0
- package/esm/lint/rules/index.js.map +1 -1
- package/esm/lint/rules/link-targets.js +8 -2
- package/esm/lint/rules/link-targets.js.map +1 -1
- package/esm/lint/rules/markdown-in-pod.js +36 -4
- package/esm/lint/rules/markdown-in-pod.js.map +1 -1
- package/esm/lint/rules/table-header-invalid.d.ts +3 -0
- package/esm/lint/rules/table-header-invalid.js +17 -0
- package/esm/lint/rules/table-header-invalid.js.map +1 -0
- package/esm/lint/rules/table-shape.js +1 -0
- package/esm/lint/rules/table-shape.js.map +1 -1
- package/esm/lint/rules/table-source-conflict.d.ts +3 -0
- package/esm/lint/rules/table-source-conflict.js +15 -0
- package/esm/lint/rules/table-source-conflict.js.map +1 -0
- package/esm/lint/rules/unclosed-markup-code.js +46 -10
- package/esm/lint/rules/unclosed-markup-code.js.map +1 -1
- package/esm/test/documents.js +3 -1
- package/esm/test/documents.js.map +1 -1
- package/esm/version.d.ts +1 -1
- package/esm/version.js +1 -1
- package/lib/assemble/index.d.ts +5 -0
- package/lib/assemble/index.js +9 -7
- package/lib/assemble/index.js.map +1 -1
- package/lib/cli.js +3 -0
- package/lib/cli.js.map +1 -1
- package/lib/lint/grammar/lint.js +47 -22
- package/lib/lint/grammar/lint.js.map +1 -1
- package/lib/lint/grammar/scan.js +6 -3
- package/lib/lint/grammar/scan.js.map +1 -1
- package/lib/lint/implicit-code.d.ts +3 -0
- package/lib/lint/implicit-code.js +86 -0
- package/lib/lint/implicit-code.js.map +1 -0
- package/lib/lint/index.js +4 -2
- package/lib/lint/index.js.map +1 -1
- package/lib/lint/line-starts.d.ts +3 -0
- package/lib/lint/line-starts.js +19 -0
- package/lib/lint/line-starts.js.map +1 -0
- package/lib/lint/rules/abbreviated-attrs.js +6 -4
- package/lib/lint/rules/abbreviated-attrs.js.map +1 -1
- package/lib/lint/rules/allow-value.d.ts +3 -0
- package/lib/lint/rules/allow-value.js +45 -0
- package/lib/lint/rules/allow-value.js.map +1 -0
- package/lib/lint/rules/dead-definitions.js +116 -21
- package/lib/lint/rules/dead-definitions.js.map +1 -1
- package/lib/lint/rules/index.js +6 -0
- package/lib/lint/rules/index.js.map +1 -1
- package/lib/lint/rules/link-targets.js +8 -2
- package/lib/lint/rules/link-targets.js.map +1 -1
- package/lib/lint/rules/markdown-in-pod.js +36 -4
- package/lib/lint/rules/markdown-in-pod.js.map +1 -1
- package/lib/lint/rules/table-header-invalid.d.ts +3 -0
- package/lib/lint/rules/table-header-invalid.js +20 -0
- package/lib/lint/rules/table-header-invalid.js.map +1 -0
- package/lib/lint/rules/table-shape.js +1 -0
- package/lib/lint/rules/table-shape.js.map +1 -1
- package/lib/lint/rules/table-source-conflict.d.ts +3 -0
- package/lib/lint/rules/table-source-conflict.js +18 -0
- package/lib/lint/rules/table-source-conflict.js.map +1 -0
- package/lib/lint/rules/unclosed-markup-code.js +46 -10
- package/lib/lint/rules/unclosed-markup-code.js.map +1 -1
- package/lib/test/documents.js +3 -1
- package/lib/test/documents.js.map +1 -1
- package/lib/version.d.ts +1 -1
- package/lib/version.js +1 -1
- package/package.json +8 -8
|
@@ -0,0 +1,83 @@
|
|
|
1
|
+
import { getFromTree, isVerbatimBlock } from '@podlite/schema';
|
|
2
|
+
import { MARKDOWN_IN_POD_RULE_ID } from './rules/markdown-in-pod.js';
|
|
3
|
+
import { UNCLOSED_MARKUP_CODE_RULE_ID } from './rules/unclosed-markup-code.js';
|
|
4
|
+
/*
|
|
5
|
+
=begin pod :kind<export>
|
|
6
|
+
|
|
7
|
+
=head2 dropSourceWarningsInCode
|
|
8
|
+
|
|
9
|
+
Takes out the C<markdown-in-pod> and C<unclosed-markup-code> warnings that stand on
|
|
10
|
+
lines the parser read as code: implicit code, and the body of a verbatim block in
|
|
11
|
+
any form (C<=begin code>, C<=for code>, C<=code>, C<=for markdown> and the like).
|
|
12
|
+
The header of a block and its configuration lines keep their warnings (the body is
|
|
13
|
+
counted back from the end of the block by the lines of its text), a table is left
|
|
14
|
+
to the scanners, and an open code in a block whose C<:allow> lets
|
|
15
|
+
codes through is still reported.
|
|
16
|
+
Those lines are shown as written, with no markup codes read, so Markdown or an open
|
|
17
|
+
code in them is an example rather than a slip. The two rules read the source line by
|
|
18
|
+
line and cannot tell where the parser puts a block; the tree can. Every other warning
|
|
19
|
+
is kept, in its order. The tree is the one the caller has already parsed; it is
|
|
20
|
+
walked once. A document with a lone carriage return is left as it is: the parser
|
|
21
|
+
ends a line there without counting it, so its line numbers and the scanner's do not
|
|
22
|
+
meet.
|
|
23
|
+
|
|
24
|
+
=end pod
|
|
25
|
+
*/
|
|
26
|
+
// the rules that read the source and so cannot see that a line is code
|
|
27
|
+
const readsSource = (v) => v.rule === MARKDOWN_IN_POD_RULE_ID || v.rule === UNCLOSED_MARKUP_CODE_RULE_ID;
|
|
28
|
+
// a table is verbatim to the scanners, but its cells are read as text: the scanners keep deciding there
|
|
29
|
+
const TABLES = ['table', 'data-table'];
|
|
30
|
+
const isCode = (node) => node.type === 'code' ||
|
|
31
|
+
(node.type === 'block' && typeof node.name === 'string' && isVerbatimBlock(node.name) && !TABLES.includes(node.name));
|
|
32
|
+
// codes an :allow lets through are read in code, so an open one there is a real slip
|
|
33
|
+
const allowsCodes = (node) => {
|
|
34
|
+
const config = Reflect.get(Object(node), 'config');
|
|
35
|
+
return Array.isArray(config) && config.some(c => c && c.name === 'allow');
|
|
36
|
+
};
|
|
37
|
+
// the text a node holds, with the codes in it read as their text
|
|
38
|
+
const textOf = (node) => {
|
|
39
|
+
if (typeof node === 'string')
|
|
40
|
+
return node;
|
|
41
|
+
const value = Reflect.get(Object(node), 'value');
|
|
42
|
+
const content = Reflect.get(Object(node), 'content');
|
|
43
|
+
return (typeof value === 'string' ? value : '') + (Array.isArray(content) ? content.map(textOf).join('') : '');
|
|
44
|
+
};
|
|
45
|
+
// The body of a verbatim block is the last lines of the block, as many as its text has, before
|
|
46
|
+
// an =end of a delimited one; the header and its continuations come before. The parser keeps the
|
|
47
|
+
// body, not its place, so the place is counted back from the end, and the header is never read.
|
|
48
|
+
const bodyLines = (node, last) => {
|
|
49
|
+
if (node.type === 'code')
|
|
50
|
+
return [-Infinity, last];
|
|
51
|
+
const body = textOf({ content: node.content });
|
|
52
|
+
const count = body === '' ? 0 : body.split('\n').length - (body.endsWith('\n') ? 1 : 0);
|
|
53
|
+
const end = typeof node.text === 'string' && /^\s*=begin\b/.test(node.text) ? last - 1 : last;
|
|
54
|
+
return [end - count + 1, end];
|
|
55
|
+
};
|
|
56
|
+
export function dropSourceWarningsInCode(violations, ast, source) {
|
|
57
|
+
if (!violations.some(readsSource))
|
|
58
|
+
return violations;
|
|
59
|
+
if (/\r(?!\n)/.test(source))
|
|
60
|
+
return violations;
|
|
61
|
+
// lines of code for each rule: an open code under :allow is still reported
|
|
62
|
+
const markdown = new Set();
|
|
63
|
+
const unclosed = new Set();
|
|
64
|
+
for (const node of getFromTree(ast, () => true)) {
|
|
65
|
+
if (typeof node !== 'object' || node === null || !isCode(node))
|
|
66
|
+
continue;
|
|
67
|
+
const place = Reflect.get(node, 'location');
|
|
68
|
+
if (!place)
|
|
69
|
+
continue;
|
|
70
|
+
// a node that ends at the first column of a line does not hold that line
|
|
71
|
+
const last = place.end.column > 1 ? place.end.line : place.end.line - 1;
|
|
72
|
+
const allowed = allowsCodes(node);
|
|
73
|
+
const [from, to] = bodyLines(node, last);
|
|
74
|
+
for (let line = Math.max(from, place.start.line); line <= to; line++) {
|
|
75
|
+
markdown.add(line);
|
|
76
|
+
if (!allowed)
|
|
77
|
+
unclosed.add(line);
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
const quietFor = (v) => (v.rule === MARKDOWN_IN_POD_RULE_ID ? markdown : unclosed);
|
|
81
|
+
return violations.filter(v => !(readsSource(v) && v.location && quietFor(v).has(v.location.start.line)));
|
|
82
|
+
}
|
|
83
|
+
//# sourceMappingURL=implicit-code.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"implicit-code.js","sourceRoot":"","sources":["../../src/lint/implicit-code.ts"],"names":[],"mappings":"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"}
|
package/esm/lint/index.js
CHANGED
|
@@ -5,6 +5,7 @@ import { runRules } from './engine.js';
|
|
|
5
5
|
import { detectFileType, readFile, parseContent } from './loader.js';
|
|
6
6
|
import { formatText } from './formatters/text.js';
|
|
7
7
|
import { formatJson } from './formatters/json.js';
|
|
8
|
+
import { dropSourceWarningsInCode } from './implicit-code.js';
|
|
8
9
|
import { scanSourceRules } from './grammar/scan.js';
|
|
9
10
|
import { applyConfig, applyRuleFlags, ConfigError, findConfig, readConfig } from './config.js';
|
|
10
11
|
import { STDIN_NAME } from './types.js';
|
|
@@ -17,8 +18,9 @@ export function lintSource(content, filePath, config, fromDisk = false) {
|
|
|
17
18
|
try {
|
|
18
19
|
const ast = parseContent(content, fileType);
|
|
19
20
|
const ctx = { filePath, fileType, config, source: content, fromDisk };
|
|
20
|
-
|
|
21
|
-
|
|
21
|
+
for (const violation of runRules(ast, DEFAULT_RULES, ctx))
|
|
22
|
+
violations.push(violation);
|
|
23
|
+
const muted = applyMutes(dropSourceWarningsInCode(violations, ast, content), ast);
|
|
22
24
|
return { filePath, violations: applyConfig(muted.kept, config), silenced: muted.silenced };
|
|
23
25
|
}
|
|
24
26
|
catch (e) {
|
package/esm/lint/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/lint/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,MAAM,CAAA;AAE5B,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAA;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAA;AACvC,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAA;AACnC,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,UAAU,CAAA;AACjE,OAAO,EAAE,UAAU,EAAc,MAAM,mBAAmB,CAAA;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAChD,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,WAAW,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AAC3F,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AACpC,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAA;AAMnC,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AAa9D,2EAA2E;AAE3E,MAAM,UAAU,UAAU,CAAC,OAAe,EAAE,QAAgB,EAAE,MAAkB,EAAE,QAAQ,GAAG,KAAK;IAChG,MAAM,QAAQ,GAAG,cAAc,CAAC,QAAQ,CAAC,CAAA;IACzC,MAAM,UAAU,GAAgB,CAAC,GAAG,WAAW,CAAC,eAAe,CAAC,OAAO,EAAE,QAAQ,CAAC,EAAE,MAAM,CAAC,CAAC,CAAA;IAC5F,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,YAAY,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;QAC3C,MAAM,GAAG,GAAgB,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAA;QAClF,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/lint/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
// where each line begins, counted the way the rules split lines: by \n, a \r before it stays on its line
|
|
2
|
+
export const lineStarts = (source) => {
|
|
3
|
+
const starts = [0];
|
|
4
|
+
for (let i = 0; i < source.length; i++)
|
|
5
|
+
if (source[i] === '\n')
|
|
6
|
+
starts.push(i + 1);
|
|
7
|
+
return starts;
|
|
8
|
+
};
|
|
9
|
+
// the start of a line, as the parser places a block: a mute compares these offsets
|
|
10
|
+
export const placeAtLine = (starts, line) => {
|
|
11
|
+
const at = { line, column: 1, offset: starts[line - 1] ?? 0 };
|
|
12
|
+
return { start: at, end: { ...at } };
|
|
13
|
+
};
|
|
14
|
+
//# sourceMappingURL=line-starts.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"line-starts.js","sourceRoot":"","sources":["../../src/lint/line-starts.ts"],"names":[],"mappings":"AAEA,yGAAyG;AACzG,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,MAAc,EAAY,EAAE;IACrD,MAAM,MAAM,GAAG,CAAC,CAAC,CAAC,CAAA;IAClB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE;QAAE,IAAI,MAAM,CAAC,CAAC,CAAC,KAAK,IAAI;YAAE,MAAM,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAA;IAClF,OAAO,MAAM,CAAA;AACf,CAAC,CAAA;AAED,mFAAmF;AACnF,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,MAAgB,EAAE,IAAY,EAAsC,EAAE;IAChG,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,CAAA;IAC7D,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,CAAA;AACtC,CAAC,CAAA"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { isVerbatimBlock } from '@podlite/schema';
|
|
2
|
+
import { lineStarts, placeAtLine } from '../line-starts.js';
|
|
2
3
|
export const ABBREVIATED_ATTRS_RULE_ID = 'abbreviated-attrs';
|
|
3
4
|
export const abbreviatedAttrsRule = {
|
|
4
5
|
id: ABBREVIATED_ATTRS_RULE_ID,
|
|
@@ -23,6 +24,7 @@ const allEmpty = (rest) => rest
|
|
|
23
24
|
.every(part => EMPTY_VALUE.test(part));
|
|
24
25
|
export function scanAbbreviatedAttrs(content) {
|
|
25
26
|
const lines = content.split(/\r?\n/);
|
|
27
|
+
const starts = lineStarts(content);
|
|
26
28
|
const open = [];
|
|
27
29
|
const violations = [];
|
|
28
30
|
for (let i = 0; i < lines.length; i++) {
|
|
@@ -43,6 +45,9 @@ export function scanAbbreviatedAttrs(content) {
|
|
|
43
45
|
const [, name, rest] = abbreviated;
|
|
44
46
|
if (isVerbatimBlock(name))
|
|
45
47
|
continue;
|
|
48
|
+
// the first line of a definition is the term being defined, and a term may look like an attribute
|
|
49
|
+
if (name === 'defn')
|
|
50
|
+
continue;
|
|
46
51
|
if (!ONLY_ATTRIBUTES.test(rest.trim()))
|
|
47
52
|
continue;
|
|
48
53
|
if (allEmpty(rest))
|
|
@@ -56,10 +61,7 @@ export function scanAbbreviatedAttrs(content) {
|
|
|
56
61
|
rule: ABBREVIATED_ATTRS_RULE_ID,
|
|
57
62
|
severity: 'warning',
|
|
58
63
|
message: `=${name} takes the rest of its line as data, so ${rest.trim()} arrives as text; write =for ${name} to pass configuration`,
|
|
59
|
-
location:
|
|
60
|
-
start: { line: i + 1, column: 1, offset: 0 },
|
|
61
|
-
end: { line: i + 1, column: 1, offset: 0 },
|
|
62
|
-
},
|
|
64
|
+
location: placeAtLine(starts, i + 1),
|
|
63
65
|
});
|
|
64
66
|
}
|
|
65
67
|
return violations;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"abbreviated-attrs.js","sourceRoot":"","sources":["../../../src/lint/rules/abbreviated-attrs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;
|
|
1
|
+
{"version":3,"file":"abbreviated-attrs.js","sourceRoot":"","sources":["../../../src/lint/rules/abbreviated-attrs.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,42 @@
|
|
|
1
|
+
import { getFromTree, isMarkupCodeLetter, isNamedBlockName } from '@podlite/schema';
|
|
2
|
+
export const ALLOW_VALUE_RULE_ID = 'allow-value';
|
|
3
|
+
const shown = (item) => (typeof item === 'string' ? JSON.stringify(item) : String(item));
|
|
4
|
+
// what is wrong with one :allow value, or nothing; a string is one item, since the
|
|
5
|
+
// parser keeps a value it could not split as it was written
|
|
6
|
+
const problemOf = (value) => {
|
|
7
|
+
// :!allow and an empty list name no code
|
|
8
|
+
if (value === false)
|
|
9
|
+
return null;
|
|
10
|
+
const items = Array.isArray(value) ? value : typeof value === 'string' ? [value] : null;
|
|
11
|
+
if (!items)
|
|
12
|
+
return ':allow takes a list of markup code letters, as in :allow<B I>; this value allows no code';
|
|
13
|
+
const wrong = items.filter(item => !isMarkupCodeLetter(item));
|
|
14
|
+
if (wrong.length === 0)
|
|
15
|
+
return null;
|
|
16
|
+
const named = wrong.map(shown).join(', ');
|
|
17
|
+
return `:allow holds ${named}: a markup code is named by one letter, and the codes are listed with spaces, as in :allow<B I>; ${named} allows no code`;
|
|
18
|
+
};
|
|
19
|
+
// =config and =set keep no place of their own, so the blocks they reached carry the report
|
|
20
|
+
const sources = [undefined, 'config', 'set'];
|
|
21
|
+
// the handler of a named block decides what its :allow means
|
|
22
|
+
const receives = (node) => node.type === 'para' || node.type === 'code' || (node.type === 'block' && !isNamedBlockName(node.name || ''));
|
|
23
|
+
export const allowValueRule = {
|
|
24
|
+
id: ALLOW_VALUE_RULE_ID,
|
|
25
|
+
severity: 'warning',
|
|
26
|
+
check: (ast, _ctx) => getFromTree(ast, () => true).flatMap(node => {
|
|
27
|
+
const block = node;
|
|
28
|
+
// the cells a table makes carry a copy of :allow with no place of their own
|
|
29
|
+
if (!block || !block.location || !Array.isArray(block.config) || !receives(block))
|
|
30
|
+
return [];
|
|
31
|
+
return block.config
|
|
32
|
+
.filter(entry => entry && entry.name === 'allow' && !entry.dropped && sources.includes(entry.from))
|
|
33
|
+
.flatMap(entry => {
|
|
34
|
+
const problem = problemOf(entry.value);
|
|
35
|
+
if (!problem)
|
|
36
|
+
return [];
|
|
37
|
+
const message = entry.from ? problem.replace(/^:allow/, `:allow given by =${entry.from}`) : problem;
|
|
38
|
+
return [{ rule: ALLOW_VALUE_RULE_ID, severity: 'warning', message, location: block.location }];
|
|
39
|
+
});
|
|
40
|
+
}),
|
|
41
|
+
};
|
|
42
|
+
//# sourceMappingURL=allow-value.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"allow-value.js","sourceRoot":"","sources":["../../../src/lint/rules/allow-value.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,17 +1,22 @@
|
|
|
1
|
-
import { getFromTree, getTextContentFromNode } from '@podlite/schema';
|
|
1
|
+
import { dataKeysOfSelector, detectSourceReference, getFromTree, getTextContentFromNode, linkTarget, podlitePluggable, } from '@podlite/schema';
|
|
2
|
+
import { markdownLinkTargets } from '@podlite/markdown';
|
|
3
|
+
import { splitDirective } from '../../assemble/index.js';
|
|
2
4
|
export const DEAD_DEFINITIONS_RULE_ID = 'dead-definitions';
|
|
3
5
|
const attr = (node, name) => {
|
|
4
6
|
const item = (Array.isArray(node.config) ? node.config : []).find(c => c && c.name === name);
|
|
5
7
|
return item && item.value !== undefined && item.value !== null ? String(item.value) : undefined;
|
|
6
8
|
};
|
|
7
9
|
// An alias node carries no location, so the line is read back from the source;
|
|
8
|
-
// a warning that cannot say where is a warning the author cannot act on.
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
const
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
10
|
+
// a warning that cannot say where is a warning the author cannot act on. The
|
|
11
|
+
// source is read once for all aliases, and the first line declaring a name wins.
|
|
12
|
+
const aliasLines = (source) => {
|
|
13
|
+
const lines = new Map();
|
|
14
|
+
source.split(/\r?\n/).forEach((line, at) => {
|
|
15
|
+
const found = /^\s*=alias\s+(\S+)(\s|$)/.exec(line);
|
|
16
|
+
if (found && !lines.has(found[1]))
|
|
17
|
+
lines.set(found[1], at + 1);
|
|
18
|
+
});
|
|
19
|
+
return lines;
|
|
15
20
|
};
|
|
16
21
|
const definitions = (ast) => {
|
|
17
22
|
const nodes = getFromTree(ast, () => true);
|
|
@@ -43,16 +48,98 @@ const aliasUses = (ast) => {
|
|
|
43
48
|
}
|
|
44
49
|
return used;
|
|
45
50
|
};
|
|
46
|
-
//
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
51
|
+
// the text of a block as written: verbatim lines, or the text of the paragraph a directive holds
|
|
52
|
+
const textOf = (node) => (Array.isArray(node.content) ? node.content : [])
|
|
53
|
+
.map(c => (c && typeof c === 'object' ? (typeof c.value === 'string' ? c.value : textOf(c)) : ''))
|
|
54
|
+
.join('');
|
|
55
|
+
const firstLine = (text) => text.split('\n').find(line => line.trim() !== '') || '';
|
|
56
|
+
// the text of a code that may point somewhere: what follows a bar, or the opening of L, P or W
|
|
57
|
+
const codedTexts = (text) => text.match(/(?:\||[LPW](?:<+|«))\s*data:[^\n]*/g) || [];
|
|
58
|
+
// A key counts as used wherever a document may read it: a source, a table
|
|
59
|
+
// reference, a picture, a selector operand, a link. Prose, comments, code and
|
|
60
|
+
// other attributes never read it. The block that reads a reference replaces it
|
|
61
|
+
// while the tree is built, so the places of reading are found in the tree the
|
|
62
|
+
// parser writes before its plugins, and codes in the finished tree. What is
|
|
63
|
+
// gathered is the text at those places; a key is found in it whole, so a key
|
|
64
|
+
// with a space or a `#` in it is matched as the table reading it matches it.
|
|
65
|
+
const readingTexts = (ast, source, fileType) => {
|
|
66
|
+
const texts = [];
|
|
67
|
+
const add = (text) => typeof text === 'string' && texts.push(text);
|
|
68
|
+
const isComment = (n) => n.type === 'block' && n.name === 'comment';
|
|
69
|
+
// a Markdown document has no Podlite blocks to read before the plugins
|
|
70
|
+
const raw = fileType === 'md' ? [] : podlitePluggable().parse(source, { podMode: fileType === 'default' ? 0 : 1, skipChain: 1 });
|
|
71
|
+
const walkRaw = (node) => {
|
|
72
|
+
if (Array.isArray(node))
|
|
73
|
+
return node.forEach(walkRaw);
|
|
74
|
+
if (!node || typeof node !== 'object')
|
|
75
|
+
return;
|
|
76
|
+
const n = node;
|
|
77
|
+
if (isComment(n))
|
|
78
|
+
return;
|
|
79
|
+
for (const item of Array.isArray(n.config) ? n.config : [])
|
|
80
|
+
if (item && (item.name === 'src' || item.name === 'link'))
|
|
81
|
+
add(item.value);
|
|
82
|
+
if (n.type === 'block' && n.name === 'table') {
|
|
83
|
+
const ref = detectSourceReference(n);
|
|
84
|
+
if (ref && ref.scheme === 'data')
|
|
85
|
+
add(`data:${ref.target}`);
|
|
86
|
+
}
|
|
87
|
+
if (n.type === 'block' && n.name === 'picture') {
|
|
88
|
+
const [head = '', ...caption] = textOf(n)
|
|
89
|
+
.split('\n')
|
|
90
|
+
.filter(line => line.trim() !== '');
|
|
91
|
+
// the address may follow a description on the first line
|
|
92
|
+
add(head.trim());
|
|
93
|
+
codedTexts(caption.join('\n')).forEach(add);
|
|
94
|
+
}
|
|
95
|
+
// an alias spells its codes as text until it is called
|
|
96
|
+
if (n.type === 'alias')
|
|
97
|
+
codedTexts((Array.isArray(n.replacement) ? n.replacement : []).join('\n')).forEach(add);
|
|
98
|
+
if (n.type === 'block' && n.name === 'markdown')
|
|
99
|
+
markdownLinkTargets(textOf(n)).forEach(add);
|
|
100
|
+
const selected = (selector) => dataKeysOfSelector(selector).forEach(key => add(`data:${key}`));
|
|
101
|
+
if (n.type === 'block' && n.name === 'include')
|
|
102
|
+
selected(splitDirective(firstLine(textOf(n)).trim()).selector);
|
|
103
|
+
if (n.type === 'block' && n.name === 'toc')
|
|
104
|
+
selected(firstLine(textOf(n)).trim());
|
|
105
|
+
if (n.type === 'block' && n.name === 'assert')
|
|
106
|
+
selected(textOf(n).trim());
|
|
107
|
+
if (Array.isArray(n.content))
|
|
108
|
+
n.content.forEach(walkRaw);
|
|
109
|
+
};
|
|
110
|
+
walkRaw(raw);
|
|
111
|
+
const walk = (node) => {
|
|
112
|
+
if (Array.isArray(node))
|
|
113
|
+
return node.forEach(walk);
|
|
114
|
+
if (!node || typeof node !== 'object')
|
|
115
|
+
return;
|
|
116
|
+
const n = node;
|
|
117
|
+
if (isComment(n) || (n.type === 'fcode' && n.name === 'Z'))
|
|
118
|
+
return;
|
|
119
|
+
if (n.type === 'fcode' && (n.name === 'L' || n.name === 'W'))
|
|
120
|
+
add(linkTarget(n));
|
|
121
|
+
if (n.type === 'image')
|
|
122
|
+
add(n.src);
|
|
123
|
+
if (Array.isArray(n.content))
|
|
124
|
+
n.content.forEach(walk);
|
|
125
|
+
// a caption parsed from an attribute sits beside the content
|
|
126
|
+
if (n.caption && typeof n.caption === 'object')
|
|
127
|
+
walk(n.caption);
|
|
128
|
+
};
|
|
129
|
+
walk(ast);
|
|
130
|
+
return texts;
|
|
131
|
+
};
|
|
132
|
+
// `data:KEY` stands in the text, ending where an address or a code ends
|
|
133
|
+
const reads = (texts, key) => {
|
|
134
|
+
const address = `data:${key}`;
|
|
135
|
+
return texts.some(text => {
|
|
136
|
+
for (let at = text.indexOf(address); at >= 0; at = text.indexOf(address, at + 1)) {
|
|
137
|
+
const next = text[at + address.length];
|
|
138
|
+
if ((at === 0 || /[\s|<«(]/.test(text[at - 1])) && (next === undefined || /[\s#|>»)\]]/.test(next)))
|
|
139
|
+
return true;
|
|
140
|
+
}
|
|
141
|
+
return false;
|
|
142
|
+
});
|
|
56
143
|
};
|
|
57
144
|
export const deadDefinitionsRule = {
|
|
58
145
|
id: DEAD_DEFINITIONS_RULE_ID,
|
|
@@ -64,16 +151,24 @@ export const deadDefinitionsRule = {
|
|
|
64
151
|
if (declared.length === 0)
|
|
65
152
|
return [];
|
|
66
153
|
const aliases = aliasUses(ast);
|
|
67
|
-
const
|
|
154
|
+
const texts = ctx.source === undefined ? [] : readingTexts(ast, ctx.source, ctx.fileType);
|
|
155
|
+
let lines;
|
|
156
|
+
const aliasLine = (name) => {
|
|
157
|
+
lines = lines || aliasLines(ctx.source || '');
|
|
158
|
+
const line = lines.get(name);
|
|
159
|
+
return line === undefined
|
|
160
|
+
? undefined
|
|
161
|
+
: { start: { line, column: 1, offset: 0 }, end: { line, column: 1, offset: 0 } };
|
|
162
|
+
};
|
|
68
163
|
return declared
|
|
69
|
-
.filter(item => !(item.kind === 'alias' ? aliases.has(item.name) :
|
|
164
|
+
.filter(item => !(item.kind === 'alias' ? aliases.has(item.name) : reads(texts, item.name)))
|
|
70
165
|
.map(item => ({
|
|
71
166
|
rule: DEAD_DEFINITIONS_RULE_ID,
|
|
72
167
|
severity: 'warning',
|
|
73
168
|
message: item.kind === 'alias'
|
|
74
169
|
? `=alias ${item.name} is never used; A<${item.name}> appears nowhere in the document`
|
|
75
|
-
: `=data :key<${item.name}> is never used
|
|
76
|
-
location: item.location || (item.kind === 'alias' ? aliasLine(
|
|
170
|
+
: `=data :key<${item.name}> is never used`,
|
|
171
|
+
location: item.location || (item.kind === 'alias' ? aliasLine(item.name) : undefined),
|
|
77
172
|
}));
|
|
78
173
|
},
|
|
79
174
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dead-definitions.js","sourceRoot":"","sources":["../../../src/lint/rules/dead-definitions.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"dead-definitions.js","sourceRoot":"","sources":["../../../src/lint/rules/dead-definitions.ts"],"names":[],"mappings":"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"}
|
package/esm/lint/rules/index.js
CHANGED
|
@@ -10,6 +10,8 @@ import { linkNotEmptyRule } from './link-not-empty.js';
|
|
|
10
10
|
import { attrValueDroppedRule } from './attr-value-dropped.js';
|
|
11
11
|
import { tableShapeRule } from './table-shape.js';
|
|
12
12
|
import { tableColumnWidthRule } from './table-column-width.js';
|
|
13
|
+
import { tableHeaderInvalidRule } from './table-header-invalid.js';
|
|
14
|
+
import { tableSourceConflictRule } from './table-source-conflict.js';
|
|
13
15
|
import { listDepthRule } from './list-depth.js';
|
|
14
16
|
import { markupCodeTooDeepRule } from './markup-code-too-deep.js';
|
|
15
17
|
import { deadDefinitionsRule } from './dead-definitions.js';
|
|
@@ -17,6 +19,7 @@ import { includeResolvesRule } from './include-resolves.js';
|
|
|
17
19
|
import { directiveNamedBlockRule, imageNamedBlockRule } from './named-blocks.js';
|
|
18
20
|
import { notifyAttributeRule } from './notify-attribute.js';
|
|
19
21
|
import { tocTitleAttributeRule } from './toc-title-attribute.js';
|
|
22
|
+
import { allowValueRule } from './allow-value.js';
|
|
20
23
|
export const DEFAULT_RULES = [
|
|
21
24
|
syntaxValidRule,
|
|
22
25
|
headingHierarchyRule,
|
|
@@ -30,6 +33,8 @@ export const DEFAULT_RULES = [
|
|
|
30
33
|
attrValueDroppedRule,
|
|
31
34
|
tableShapeRule,
|
|
32
35
|
tableColumnWidthRule,
|
|
36
|
+
tableHeaderInvalidRule,
|
|
37
|
+
tableSourceConflictRule,
|
|
33
38
|
listDepthRule,
|
|
34
39
|
markupCodeTooDeepRule,
|
|
35
40
|
deadDefinitionsRule,
|
|
@@ -38,5 +43,6 @@ export const DEFAULT_RULES = [
|
|
|
38
43
|
imageNamedBlockRule,
|
|
39
44
|
notifyAttributeRule,
|
|
40
45
|
tocTitleAttributeRule,
|
|
46
|
+
allowValueRule,
|
|
41
47
|
];
|
|
42
48
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lint/rules/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAChD,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAA;AAC1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;AACpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAA;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAC1C,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAA;AAC7D,OAAO,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAA;AAC/D,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAA;AAC3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAA;AACnD,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAA;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAA;AAC9C,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAA;AAC3D,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;AAC5C,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAA;AAC9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAA;AACxD,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAA;AACxD,OAAO,EAAE,uBAAuB,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAA;AAC7E,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAA;AACxD,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAA;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lint/rules/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAChD,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAA;AAC1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;AACpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAA;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAC1C,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAA;AAC7D,OAAO,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAA;AAC/D,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAA;AAC3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAA;AACnD,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAA;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAA;AAC9C,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAA;AAC3D,OAAO,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAA;AAC/D,OAAO,EAAE,uBAAuB,EAAE,MAAM,yBAAyB,CAAA;AACjE,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;AAC5C,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAA;AAC9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAA;AACxD,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAA;AACxD,OAAO,EAAE,uBAAuB,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAA;AAC7E,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAA;AACxD,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAA;AAC7D,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAA;AAE9C,MAAM,CAAC,MAAM,aAAa,GAAW;IACnC,eAAe;IACf,oBAAoB;IACpB,iBAAiB;IACjB,iBAAiB;IACjB,YAAY;IACZ,qBAAqB;IACrB,sBAAsB;IACtB,oBAAoB;IACpB,gBAAgB;IAChB,oBAAoB;IACpB,cAAc;IACd,oBAAoB;IACpB,sBAAsB;IACtB,uBAAuB;IACvB,aAAa;IACb,qBAAqB;IACrB,mBAAmB;IACnB,mBAAmB;IACnB,uBAAuB;IACvB,mBAAmB;IACnB,mBAAmB;IACnB,qBAAqB;IACrB,cAAc;CACf,CAAA"}
|
|
@@ -2,8 +2,11 @@
|
|
|
2
2
|
const textOf = (value) => {
|
|
3
3
|
if (typeof value === 'string')
|
|
4
4
|
return value;
|
|
5
|
-
if (value && typeof value === 'object'
|
|
6
|
-
|
|
5
|
+
if (value && typeof value === 'object') {
|
|
6
|
+
const inner = Reflect.get(value, 'value');
|
|
7
|
+
if (typeof inner === 'string')
|
|
8
|
+
return inner;
|
|
9
|
+
}
|
|
7
10
|
return '';
|
|
8
11
|
};
|
|
9
12
|
// A link without display text carries the target in its content instead of meta.
|
|
@@ -21,6 +24,9 @@ export const collectLinks = (node, at) => {
|
|
|
21
24
|
if (!node || typeof node !== 'object')
|
|
22
25
|
return [];
|
|
23
26
|
const n = node;
|
|
27
|
+
// a comment is not rendered, so a link inside it leads nowhere and is not checked
|
|
28
|
+
if (n.type === 'block' && n.name === 'comment')
|
|
29
|
+
return [];
|
|
24
30
|
const here = n.location || at;
|
|
25
31
|
const found = isLink(n) ? [{ target: linkTarget(n), at: here }] : [];
|
|
26
32
|
return [...found, ...collectLinks(n.content, here)];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"link-targets.js","sourceRoot":"","sources":["../../../src/lint/rules/link-targets.ts"],"names":[],"mappings":"AAcA,6EAA6E;AAC7E,MAAM,MAAM,GAAG,CAAC,KAAc,EAAU,EAAE;IACxC,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAA;IAC3C,IAAI,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,
|
|
1
|
+
{"version":3,"file":"link-targets.js","sourceRoot":"","sources":["../../../src/lint/rules/link-targets.ts"],"names":[],"mappings":"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"}
|