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
|
@@ -2,19 +2,24 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.deadDefinitionsRule = exports.DEAD_DEFINITIONS_RULE_ID = void 0;
|
|
4
4
|
const schema_1 = require("@podlite/schema");
|
|
5
|
+
const markdown_1 = require("@podlite/markdown");
|
|
6
|
+
const assemble_1 = require("../../assemble");
|
|
5
7
|
exports.DEAD_DEFINITIONS_RULE_ID = 'dead-definitions';
|
|
6
8
|
const attr = (node, name) => {
|
|
7
9
|
const item = (Array.isArray(node.config) ? node.config : []).find(c => c && c.name === name);
|
|
8
10
|
return item && item.value !== undefined && item.value !== null ? String(item.value) : undefined;
|
|
9
11
|
};
|
|
10
12
|
// An alias node carries no location, so the line is read back from the source;
|
|
11
|
-
// a warning that cannot say where is a warning the author cannot act on.
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
const
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
13
|
+
// a warning that cannot say where is a warning the author cannot act on. The
|
|
14
|
+
// source is read once for all aliases, and the first line declaring a name wins.
|
|
15
|
+
const aliasLines = (source) => {
|
|
16
|
+
const lines = new Map();
|
|
17
|
+
source.split(/\r?\n/).forEach((line, at) => {
|
|
18
|
+
const found = /^\s*=alias\s+(\S+)(\s|$)/.exec(line);
|
|
19
|
+
if (found && !lines.has(found[1]))
|
|
20
|
+
lines.set(found[1], at + 1);
|
|
21
|
+
});
|
|
22
|
+
return lines;
|
|
18
23
|
};
|
|
19
24
|
const definitions = (ast) => {
|
|
20
25
|
const nodes = (0, schema_1.getFromTree)(ast, () => true);
|
|
@@ -46,16 +51,98 @@ const aliasUses = (ast) => {
|
|
|
46
51
|
}
|
|
47
52
|
return used;
|
|
48
53
|
};
|
|
49
|
-
//
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
54
|
+
// the text of a block as written: verbatim lines, or the text of the paragraph a directive holds
|
|
55
|
+
const textOf = (node) => (Array.isArray(node.content) ? node.content : [])
|
|
56
|
+
.map(c => (c && typeof c === 'object' ? (typeof c.value === 'string' ? c.value : textOf(c)) : ''))
|
|
57
|
+
.join('');
|
|
58
|
+
const firstLine = (text) => text.split('\n').find(line => line.trim() !== '') || '';
|
|
59
|
+
// the text of a code that may point somewhere: what follows a bar, or the opening of L, P or W
|
|
60
|
+
const codedTexts = (text) => text.match(/(?:\||[LPW](?:<+|«))\s*data:[^\n]*/g) || [];
|
|
61
|
+
// A key counts as used wherever a document may read it: a source, a table
|
|
62
|
+
// reference, a picture, a selector operand, a link. Prose, comments, code and
|
|
63
|
+
// other attributes never read it. The block that reads a reference replaces it
|
|
64
|
+
// while the tree is built, so the places of reading are found in the tree the
|
|
65
|
+
// parser writes before its plugins, and codes in the finished tree. What is
|
|
66
|
+
// gathered is the text at those places; a key is found in it whole, so a key
|
|
67
|
+
// with a space or a `#` in it is matched as the table reading it matches it.
|
|
68
|
+
const readingTexts = (ast, source, fileType) => {
|
|
69
|
+
const texts = [];
|
|
70
|
+
const add = (text) => typeof text === 'string' && texts.push(text);
|
|
71
|
+
const isComment = (n) => n.type === 'block' && n.name === 'comment';
|
|
72
|
+
// a Markdown document has no Podlite blocks to read before the plugins
|
|
73
|
+
const raw = fileType === 'md' ? [] : (0, schema_1.podlitePluggable)().parse(source, { podMode: fileType === 'default' ? 0 : 1, skipChain: 1 });
|
|
74
|
+
const walkRaw = (node) => {
|
|
75
|
+
if (Array.isArray(node))
|
|
76
|
+
return node.forEach(walkRaw);
|
|
77
|
+
if (!node || typeof node !== 'object')
|
|
78
|
+
return;
|
|
79
|
+
const n = node;
|
|
80
|
+
if (isComment(n))
|
|
81
|
+
return;
|
|
82
|
+
for (const item of Array.isArray(n.config) ? n.config : [])
|
|
83
|
+
if (item && (item.name === 'src' || item.name === 'link'))
|
|
84
|
+
add(item.value);
|
|
85
|
+
if (n.type === 'block' && n.name === 'table') {
|
|
86
|
+
const ref = (0, schema_1.detectSourceReference)(n);
|
|
87
|
+
if (ref && ref.scheme === 'data')
|
|
88
|
+
add(`data:${ref.target}`);
|
|
89
|
+
}
|
|
90
|
+
if (n.type === 'block' && n.name === 'picture') {
|
|
91
|
+
const [head = '', ...caption] = textOf(n)
|
|
92
|
+
.split('\n')
|
|
93
|
+
.filter(line => line.trim() !== '');
|
|
94
|
+
// the address may follow a description on the first line
|
|
95
|
+
add(head.trim());
|
|
96
|
+
codedTexts(caption.join('\n')).forEach(add);
|
|
97
|
+
}
|
|
98
|
+
// an alias spells its codes as text until it is called
|
|
99
|
+
if (n.type === 'alias')
|
|
100
|
+
codedTexts((Array.isArray(n.replacement) ? n.replacement : []).join('\n')).forEach(add);
|
|
101
|
+
if (n.type === 'block' && n.name === 'markdown')
|
|
102
|
+
(0, markdown_1.markdownLinkTargets)(textOf(n)).forEach(add);
|
|
103
|
+
const selected = (selector) => (0, schema_1.dataKeysOfSelector)(selector).forEach(key => add(`data:${key}`));
|
|
104
|
+
if (n.type === 'block' && n.name === 'include')
|
|
105
|
+
selected((0, assemble_1.splitDirective)(firstLine(textOf(n)).trim()).selector);
|
|
106
|
+
if (n.type === 'block' && n.name === 'toc')
|
|
107
|
+
selected(firstLine(textOf(n)).trim());
|
|
108
|
+
if (n.type === 'block' && n.name === 'assert')
|
|
109
|
+
selected(textOf(n).trim());
|
|
110
|
+
if (Array.isArray(n.content))
|
|
111
|
+
n.content.forEach(walkRaw);
|
|
112
|
+
};
|
|
113
|
+
walkRaw(raw);
|
|
114
|
+
const walk = (node) => {
|
|
115
|
+
if (Array.isArray(node))
|
|
116
|
+
return node.forEach(walk);
|
|
117
|
+
if (!node || typeof node !== 'object')
|
|
118
|
+
return;
|
|
119
|
+
const n = node;
|
|
120
|
+
if (isComment(n) || (n.type === 'fcode' && n.name === 'Z'))
|
|
121
|
+
return;
|
|
122
|
+
if (n.type === 'fcode' && (n.name === 'L' || n.name === 'W'))
|
|
123
|
+
add((0, schema_1.linkTarget)(n));
|
|
124
|
+
if (n.type === 'image')
|
|
125
|
+
add(n.src);
|
|
126
|
+
if (Array.isArray(n.content))
|
|
127
|
+
n.content.forEach(walk);
|
|
128
|
+
// a caption parsed from an attribute sits beside the content
|
|
129
|
+
if (n.caption && typeof n.caption === 'object')
|
|
130
|
+
walk(n.caption);
|
|
131
|
+
};
|
|
132
|
+
walk(ast);
|
|
133
|
+
return texts;
|
|
134
|
+
};
|
|
135
|
+
// `data:KEY` stands in the text, ending where an address or a code ends
|
|
136
|
+
const reads = (texts, key) => {
|
|
137
|
+
const address = `data:${key}`;
|
|
138
|
+
return texts.some(text => {
|
|
139
|
+
for (let at = text.indexOf(address); at >= 0; at = text.indexOf(address, at + 1)) {
|
|
140
|
+
const next = text[at + address.length];
|
|
141
|
+
if ((at === 0 || /[\s|<«(]/.test(text[at - 1])) && (next === undefined || /[\s#|>»)\]]/.test(next)))
|
|
142
|
+
return true;
|
|
143
|
+
}
|
|
144
|
+
return false;
|
|
145
|
+
});
|
|
59
146
|
};
|
|
60
147
|
exports.deadDefinitionsRule = {
|
|
61
148
|
id: exports.DEAD_DEFINITIONS_RULE_ID,
|
|
@@ -67,16 +154,24 @@ exports.deadDefinitionsRule = {
|
|
|
67
154
|
if (declared.length === 0)
|
|
68
155
|
return [];
|
|
69
156
|
const aliases = aliasUses(ast);
|
|
70
|
-
const
|
|
157
|
+
const texts = ctx.source === undefined ? [] : readingTexts(ast, ctx.source, ctx.fileType);
|
|
158
|
+
let lines;
|
|
159
|
+
const aliasLine = (name) => {
|
|
160
|
+
lines = lines || aliasLines(ctx.source || '');
|
|
161
|
+
const line = lines.get(name);
|
|
162
|
+
return line === undefined
|
|
163
|
+
? undefined
|
|
164
|
+
: { start: { line, column: 1, offset: 0 }, end: { line, column: 1, offset: 0 } };
|
|
165
|
+
};
|
|
71
166
|
return declared
|
|
72
|
-
.filter(item => !(item.kind === 'alias' ? aliases.has(item.name) :
|
|
167
|
+
.filter(item => !(item.kind === 'alias' ? aliases.has(item.name) : reads(texts, item.name)))
|
|
73
168
|
.map(item => ({
|
|
74
169
|
rule: exports.DEAD_DEFINITIONS_RULE_ID,
|
|
75
170
|
severity: 'warning',
|
|
76
171
|
message: item.kind === 'alias'
|
|
77
172
|
? `=alias ${item.name} is never used; A<${item.name}> appears nowhere in the document`
|
|
78
|
-
: `=data :key<${item.name}> is never used
|
|
79
|
-
location: item.location || (item.kind === 'alias' ? aliasLine(
|
|
173
|
+
: `=data :key<${item.name}> is never used`,
|
|
174
|
+
location: item.location || (item.kind === 'alias' ? aliasLine(item.name) : undefined),
|
|
80
175
|
}));
|
|
81
176
|
},
|
|
82
177
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dead-definitions.js","sourceRoot":"","sources":["../../../src/lint/rules/dead-definitions.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"dead-definitions.js","sourceRoot":"","sources":["../../../src/lint/rules/dead-definitions.ts"],"names":[],"mappings":"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"}
|
package/lib/lint/rules/index.js
CHANGED
|
@@ -13,6 +13,8 @@ const link_not_empty_1 = require("./link-not-empty");
|
|
|
13
13
|
const attr_value_dropped_1 = require("./attr-value-dropped");
|
|
14
14
|
const table_shape_1 = require("./table-shape");
|
|
15
15
|
const table_column_width_1 = require("./table-column-width");
|
|
16
|
+
const table_header_invalid_1 = require("./table-header-invalid");
|
|
17
|
+
const table_source_conflict_1 = require("./table-source-conflict");
|
|
16
18
|
const list_depth_1 = require("./list-depth");
|
|
17
19
|
const markup_code_too_deep_1 = require("./markup-code-too-deep");
|
|
18
20
|
const dead_definitions_1 = require("./dead-definitions");
|
|
@@ -20,6 +22,7 @@ const include_resolves_1 = require("./include-resolves");
|
|
|
20
22
|
const named_blocks_1 = require("./named-blocks");
|
|
21
23
|
const notify_attribute_1 = require("./notify-attribute");
|
|
22
24
|
const toc_title_attribute_1 = require("./toc-title-attribute");
|
|
25
|
+
const allow_value_1 = require("./allow-value");
|
|
23
26
|
exports.DEFAULT_RULES = [
|
|
24
27
|
syntax_valid_1.syntaxValidRule,
|
|
25
28
|
heading_hierarchy_1.headingHierarchyRule,
|
|
@@ -33,6 +36,8 @@ exports.DEFAULT_RULES = [
|
|
|
33
36
|
attr_value_dropped_1.attrValueDroppedRule,
|
|
34
37
|
table_shape_1.tableShapeRule,
|
|
35
38
|
table_column_width_1.tableColumnWidthRule,
|
|
39
|
+
table_header_invalid_1.tableHeaderInvalidRule,
|
|
40
|
+
table_source_conflict_1.tableSourceConflictRule,
|
|
36
41
|
list_depth_1.listDepthRule,
|
|
37
42
|
markup_code_too_deep_1.markupCodeTooDeepRule,
|
|
38
43
|
dead_definitions_1.deadDefinitionsRule,
|
|
@@ -41,5 +46,6 @@ exports.DEFAULT_RULES = [
|
|
|
41
46
|
named_blocks_1.imageNamedBlockRule,
|
|
42
47
|
notify_attribute_1.notifyAttributeRule,
|
|
43
48
|
toc_title_attribute_1.tocTitleAttributeRule,
|
|
49
|
+
allow_value_1.allowValueRule,
|
|
44
50
|
];
|
|
45
51
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lint/rules/index.ts"],"names":[],"mappings":";;;AACA,iDAAgD;AAChD,2DAA0D;AAC1D,qDAAoD;AACpD,uDAAqD;AACrD,2CAA0C;AAC1C,+DAA6D;AAC7D,iEAA+D;AAC/D,6DAA2D;AAC3D,qDAAmD;AACnD,6DAA2D;AAC3D,+CAA8C;AAC9C,6DAA2D;AAC3D,6CAA4C;AAC5C,iEAA8D;AAC9D,yDAAwD;AACxD,yDAAwD;AACxD,iDAA6E;AAC7E,yDAAwD;AACxD,+DAA6D;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lint/rules/index.ts"],"names":[],"mappings":";;;AACA,iDAAgD;AAChD,2DAA0D;AAC1D,qDAAoD;AACpD,uDAAqD;AACrD,2CAA0C;AAC1C,+DAA6D;AAC7D,iEAA+D;AAC/D,6DAA2D;AAC3D,qDAAmD;AACnD,6DAA2D;AAC3D,+CAA8C;AAC9C,6DAA2D;AAC3D,iEAA+D;AAC/D,mEAAiE;AACjE,6CAA4C;AAC5C,iEAA8D;AAC9D,yDAAwD;AACxD,yDAAwD;AACxD,iDAA6E;AAC7E,yDAAwD;AACxD,+DAA6D;AAC7D,+CAA8C;AAEjC,QAAA,aAAa,GAAW;IACnC,8BAAe;IACf,wCAAoB;IACpB,kCAAiB;IACjB,mCAAiB;IACjB,wBAAY;IACZ,2CAAqB;IACrB,6CAAsB;IACtB,yCAAoB;IACpB,iCAAgB;IAChB,yCAAoB;IACpB,4BAAc;IACd,yCAAoB;IACpB,6CAAsB;IACtB,+CAAuB;IACvB,0BAAa;IACb,4CAAqB;IACrB,sCAAmB;IACnB,sCAAmB;IACnB,sCAAuB;IACvB,kCAAmB;IACnB,sCAAmB;IACnB,2CAAqB;IACrB,4BAAc;CACf,CAAA"}
|
|
@@ -5,8 +5,11 @@ exports.readAddress = exports.collectLinks = void 0;
|
|
|
5
5
|
const textOf = (value) => {
|
|
6
6
|
if (typeof value === 'string')
|
|
7
7
|
return value;
|
|
8
|
-
if (value && typeof value === 'object'
|
|
9
|
-
|
|
8
|
+
if (value && typeof value === 'object') {
|
|
9
|
+
const inner = Reflect.get(value, 'value');
|
|
10
|
+
if (typeof inner === 'string')
|
|
11
|
+
return inner;
|
|
12
|
+
}
|
|
10
13
|
return '';
|
|
11
14
|
};
|
|
12
15
|
// A link without display text carries the target in its content instead of meta.
|
|
@@ -24,6 +27,9 @@ const collectLinks = (node, at) => {
|
|
|
24
27
|
if (!node || typeof node !== 'object')
|
|
25
28
|
return [];
|
|
26
29
|
const n = node;
|
|
30
|
+
// a comment is not rendered, so a link inside it leads nowhere and is not checked
|
|
31
|
+
if (n.type === 'block' && n.name === 'comment')
|
|
32
|
+
return [];
|
|
27
33
|
const here = n.location || at;
|
|
28
34
|
const found = isLink(n) ? [{ target: linkTarget(n), at: here }] : [];
|
|
29
35
|
return [...found, ...(0, exports.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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"}
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.markdownInPodRule = exports.MARKDOWN_IN_POD_RULE_ID = void 0;
|
|
4
4
|
exports.scanMarkdownInPod = scanMarkdownInPod;
|
|
5
5
|
const schema_1 = require("@podlite/schema");
|
|
6
|
+
const line_starts_1 = require("../line-starts");
|
|
6
7
|
exports.MARKDOWN_IN_POD_RULE_ID = 'markdown-in-pod';
|
|
7
8
|
exports.markdownInPodRule = {
|
|
8
9
|
id: exports.MARKDOWN_IN_POD_RULE_ID,
|
|
@@ -16,27 +17,59 @@ const FOREIGN = [
|
|
|
16
17
|
},
|
|
17
18
|
{ test: /\*\*[^*\s](?:[^*]*[^*\s])?\*\*/, says: 'a pair of asterisks is text here; bold is written as B<>' },
|
|
18
19
|
];
|
|
20
|
+
// A lone # as the first word of an item, a heading or a definition numbers it, and
|
|
21
|
+
// with :!numbered it is a literal #; either way it is not a Markdown heading.
|
|
22
|
+
const NUMBERABLE = /^(item\d*|head\d*|defn)$/;
|
|
23
|
+
const LONE_HASH = /^\s*#(\s|$)/;
|
|
24
|
+
// directives that set things up and add no text of their own
|
|
25
|
+
const SETUP = /^\s*=(config|alias|set)\b/;
|
|
19
26
|
// Talk about Markdown is legal: a line whose construct sits inside an inline
|
|
20
27
|
// code span is showing the markup, not using it.
|
|
21
28
|
const insideCode = (line) => /C<[^>]*>/.test(line) || /`[^`]+`/.test(line);
|
|
22
29
|
function scanMarkdownInPod(content) {
|
|
23
30
|
const lines = content.split(/\r?\n/);
|
|
31
|
+
const starts = (0, line_starts_1.lineStarts)(content);
|
|
24
32
|
const open = [];
|
|
25
33
|
const violations = [];
|
|
26
34
|
let abbreviatedTable = false;
|
|
35
|
+
// the first word of a numberable block is still to come: in a delimited block blank
|
|
36
|
+
// lines and setup directives come before it, in the other forms they end the block
|
|
37
|
+
let awaiting = null;
|
|
27
38
|
for (let i = 0; i < lines.length; i++) {
|
|
28
39
|
const line = lines[i];
|
|
29
40
|
const end = line.match(/^\s*=end\s+([\w-]+)/);
|
|
30
41
|
if (end) {
|
|
42
|
+
awaiting = null;
|
|
43
|
+
// a short table inside a block ends with the block
|
|
44
|
+
abbreviatedTable = false;
|
|
31
45
|
open.pop();
|
|
32
46
|
continue;
|
|
33
47
|
}
|
|
34
48
|
const begin = line.match(/^\s*=begin\s+([\w-]+)/);
|
|
35
49
|
if (begin) {
|
|
50
|
+
awaiting = NUMBERABLE.test(begin[1]) ? 'delimited' : null;
|
|
36
51
|
open.push(begin[1]);
|
|
37
52
|
abbreviatedTable = false;
|
|
38
53
|
continue;
|
|
39
54
|
}
|
|
55
|
+
// a continuation line belongs to the directive above it
|
|
56
|
+
if (awaiting && /^\s*=(\s|$)/.test(line))
|
|
57
|
+
continue;
|
|
58
|
+
if (awaiting === 'delimited' && SETUP.test(line))
|
|
59
|
+
continue;
|
|
60
|
+
if (/^\s*=/.test(line)) {
|
|
61
|
+
const marker = line.match(/^\s*=(?:for\s+)?([\w-]+)(.*)$/);
|
|
62
|
+
const named = marker ? marker[1] : '';
|
|
63
|
+
const shortForm = !/^\s*=for\s/.test(line);
|
|
64
|
+
awaiting = marker && NUMBERABLE.test(named) && (!shortForm || marker[2].trim() === '') ? 'paragraph' : null;
|
|
65
|
+
}
|
|
66
|
+
else if (line.trim() === '') {
|
|
67
|
+
if (awaiting === 'paragraph')
|
|
68
|
+
awaiting = null;
|
|
69
|
+
}
|
|
70
|
+
const first = awaiting !== null && line.trim() !== '' && !/^\s*=/.test(line);
|
|
71
|
+
if (first)
|
|
72
|
+
awaiting = null;
|
|
40
73
|
// a dash separator belongs to a table written the short way too, and that
|
|
41
74
|
// block runs to the first blank line
|
|
42
75
|
if (/^\s*=(?:for\s+)?table\b/.test(line)) {
|
|
@@ -54,14 +87,13 @@ function scanMarkdownInPod(content) {
|
|
|
54
87
|
for (const foreign of FOREIGN) {
|
|
55
88
|
if (!foreign.test.test(line))
|
|
56
89
|
continue;
|
|
90
|
+
if (first && foreign === FOREIGN[0] && LONE_HASH.test(line))
|
|
91
|
+
continue;
|
|
57
92
|
violations.push({
|
|
58
93
|
rule: exports.MARKDOWN_IN_POD_RULE_ID,
|
|
59
94
|
severity: 'warning',
|
|
60
95
|
message: foreign.says,
|
|
61
|
-
location:
|
|
62
|
-
start: { line: i + 1, column: 1, offset: 0 },
|
|
63
|
-
end: { line: i + 1, column: 1, offset: 0 },
|
|
64
|
-
},
|
|
96
|
+
location: (0, line_starts_1.placeAtLine)(starts, i + 1),
|
|
65
97
|
});
|
|
66
98
|
break;
|
|
67
99
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"markdown-in-pod.js","sourceRoot":"","sources":["../../../src/lint/rules/markdown-in-pod.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"markdown-in-pod.js","sourceRoot":"","sources":["../../../src/lint/rules/markdown-in-pod.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.tableHeaderInvalidRule = exports.TABLE_HEADER_INVALID_RULE_ID = void 0;
|
|
4
|
+
exports.TABLE_HEADER_INVALID_RULE_ID = 'table-header-invalid';
|
|
5
|
+
// passes on a `header` of CSV or TSV data that is neither present nor absent: an
|
|
6
|
+
// error the norm names, kept apart from table-shape so that silencing the shape of
|
|
7
|
+
// tables does not silence it
|
|
8
|
+
exports.tableHeaderInvalidRule = {
|
|
9
|
+
id: exports.TABLE_HEADER_INVALID_RULE_ID,
|
|
10
|
+
severity: 'error',
|
|
11
|
+
check: (ast, _ctx) => (ast.diagnostics || [])
|
|
12
|
+
.filter(d => d.code === 'table-header-invalid')
|
|
13
|
+
.map(d => ({
|
|
14
|
+
rule: exports.TABLE_HEADER_INVALID_RULE_ID,
|
|
15
|
+
severity: d.severity,
|
|
16
|
+
message: d.message,
|
|
17
|
+
location: d.location,
|
|
18
|
+
})),
|
|
19
|
+
};
|
|
20
|
+
//# sourceMappingURL=table-header-invalid.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"table-header-invalid.js","sourceRoot":"","sources":["../../../src/lint/rules/table-header-invalid.ts"],"names":[],"mappings":";;;AAGa,QAAA,4BAA4B,GAAG,sBAAsB,CAAA;AAElE,iFAAiF;AACjF,mFAAmF;AACnF,6BAA6B;AAChB,QAAA,sBAAsB,GAAS;IAC1C,EAAE,EAAE,oCAA4B;IAChC,QAAQ,EAAE,OAAO;IACjB,KAAK,EAAE,CAAC,GAAoB,EAAE,IAAiB,EAAe,EAAE,CAC9D,CAAC,GAAG,CAAC,WAAW,IAAI,EAAE,CAAC;SACpB,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,sBAAsB,CAAC;SAC9C,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QACT,IAAI,EAAE,oCAA4B;QAClC,QAAQ,EAAE,CAAC,CAAC,QAAQ;QACpB,OAAO,EAAE,CAAC,CAAC,OAAO;QAClB,QAAQ,EAAE,CAAC,CAAC,QAAQ;KACrB,CAAC,CAAC;CACR,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"table-shape.js","sourceRoot":"","sources":["../../../src/lint/rules/table-shape.ts"],"names":[],"mappings":";;;AAGa,QAAA,mBAAmB,GAAG,aAAa,CAAA;AAEhD,MAAM,WAAW,GAAG;IAClB,iBAAiB;IACjB,wBAAwB;IACxB,wBAAwB;IACxB,yBAAyB;IACzB,oBAAoB;
|
|
1
|
+
{"version":3,"file":"table-shape.js","sourceRoot":"","sources":["../../../src/lint/rules/table-shape.ts"],"names":[],"mappings":";;;AAGa,QAAA,mBAAmB,GAAG,aAAa,CAAA;AAEhD,MAAM,WAAW,GAAG;IAClB,iBAAiB;IACjB,wBAAwB;IACxB,wBAAwB;IACxB,yBAAyB;IACzB,oBAAoB;IACpB,sBAAsB;CACvB,CAAA;AAEY,QAAA,cAAc,GAAS;IAClC,EAAE,EAAE,2BAAmB;IACvB,QAAQ,EAAE,SAAS;IACnB,KAAK,EAAE,CAAC,GAAoB,EAAE,IAAiB,EAAe,EAAE,CAC9D,CAAC,GAAG,CAAC,WAAW,IAAI,EAAE,CAAC;SACpB,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;SACzC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QACT,IAAI,EAAE,2BAAmB;QACzB,QAAQ,EAAE,CAAC,CAAC,QAAQ;QACpB,OAAO,EAAE,CAAC,CAAC,OAAO;QAClB,QAAQ,EAAE,CAAC,CAAC,QAAQ;KACrB,CAAC,CAAC;CACR,CAAA"}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.tableSourceConflictRule = exports.TABLE_SOURCE_CONFLICT_RULE_ID = void 0;
|
|
4
|
+
exports.TABLE_SOURCE_CONFLICT_RULE_ID = 'table-source-conflict';
|
|
5
|
+
// an error the norm names, kept apart from table-shape so that silencing that rule does not silence it
|
|
6
|
+
exports.tableSourceConflictRule = {
|
|
7
|
+
id: exports.TABLE_SOURCE_CONFLICT_RULE_ID,
|
|
8
|
+
severity: 'error',
|
|
9
|
+
check: (ast, _ctx) => (ast.diagnostics || [])
|
|
10
|
+
.filter(d => d.code === 'table-source-conflict')
|
|
11
|
+
.map(d => ({
|
|
12
|
+
rule: exports.TABLE_SOURCE_CONFLICT_RULE_ID,
|
|
13
|
+
severity: d.severity,
|
|
14
|
+
message: d.message,
|
|
15
|
+
location: d.location,
|
|
16
|
+
})),
|
|
17
|
+
};
|
|
18
|
+
//# sourceMappingURL=table-source-conflict.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"table-source-conflict.js","sourceRoot":"","sources":["../../../src/lint/rules/table-source-conflict.ts"],"names":[],"mappings":";;;AAGa,QAAA,6BAA6B,GAAG,uBAAuB,CAAA;AAEpE,uGAAuG;AAC1F,QAAA,uBAAuB,GAAS;IAC3C,EAAE,EAAE,qCAA6B;IACjC,QAAQ,EAAE,OAAO;IACjB,KAAK,EAAE,CAAC,GAAoB,EAAE,IAAiB,EAAe,EAAE,CAC9D,CAAC,GAAG,CAAC,WAAW,IAAI,EAAE,CAAC;SACpB,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,uBAAuB,CAAC;SAC/C,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QACT,IAAI,EAAE,qCAA6B;QACnC,QAAQ,EAAE,CAAC,CAAC,QAAQ;QACpB,OAAO,EAAE,CAAC,CAAC,OAAO;QAClB,QAAQ,EAAE,CAAC,CAAC,QAAQ;KACrB,CAAC,CAAC;CACR,CAAA"}
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.unclosedMarkupCodeRule = exports.UNCLOSED_MARKUP_CODE_RULE_ID = void 0;
|
|
4
4
|
exports.scanUnclosedMarkupCodes = scanUnclosedMarkupCodes;
|
|
5
5
|
const schema_1 = require("@podlite/schema");
|
|
6
|
+
const line_starts_1 = require("../line-starts");
|
|
6
7
|
exports.UNCLOSED_MARKUP_CODE_RULE_ID = 'unclosed-markup-code';
|
|
7
8
|
exports.unclosedMarkupCodeRule = {
|
|
8
9
|
id: exports.UNCLOSED_MARKUP_CODE_RULE_ID,
|
|
@@ -25,15 +26,42 @@ exports.unclosedMarkupCodeRule = {
|
|
|
25
26
|
// code written inside a doubled one reads as unclosed, and correct markup gets
|
|
26
27
|
// reported — the worse of the two.
|
|
27
28
|
const OPENER = /(^|[^A-Za-z])([A-Z])(<+|«)/g;
|
|
29
|
+
// For each length of a run of closing brackets, the last place a closer of that
|
|
30
|
+
// length can start: a code opened with N brackets is closed if one starts after it.
|
|
31
|
+
// Built once per fragment, so a long paragraph is not searched again for every code.
|
|
32
|
+
const lastCloserStarts = (text) => {
|
|
33
|
+
const bestEnd = [-1, -1];
|
|
34
|
+
let at = 0;
|
|
35
|
+
while (at < text.length) {
|
|
36
|
+
if (text.charCodeAt(at) !== 62) {
|
|
37
|
+
at++;
|
|
38
|
+
continue;
|
|
39
|
+
}
|
|
40
|
+
const start = at;
|
|
41
|
+
while (at < text.length && text.charCodeAt(at) === 62)
|
|
42
|
+
at++;
|
|
43
|
+
const length = at - start;
|
|
44
|
+
while (bestEnd.length < length + 2)
|
|
45
|
+
bestEnd.push(-1);
|
|
46
|
+
bestEnd[length] = Math.max(bestEnd[length], at);
|
|
47
|
+
}
|
|
48
|
+
// a longer run holds every shorter closer, ending where it ends
|
|
49
|
+
for (let length = bestEnd.length - 2; length >= 1; length--) {
|
|
50
|
+
bestEnd[length] = Math.max(bestEnd[length], bestEnd[length + 1]);
|
|
51
|
+
}
|
|
52
|
+
return bestEnd.map((end, length) => (end === -1 ? -1 : end - length));
|
|
53
|
+
};
|
|
28
54
|
const unclosed = (text) => {
|
|
29
55
|
const missing = [];
|
|
56
|
+
const closerStarts = lastCloserStarts(text);
|
|
57
|
+
const lastGuillemet = text.lastIndexOf('»');
|
|
30
58
|
let match;
|
|
31
59
|
OPENER.lastIndex = 0;
|
|
32
60
|
while ((match = OPENER.exec(text)) !== null) {
|
|
33
61
|
const [whole, before, name, open] = match;
|
|
34
|
-
const
|
|
35
|
-
const
|
|
36
|
-
if (
|
|
62
|
+
const from = match.index + whole.length;
|
|
63
|
+
const closer = open === '«' ? lastGuillemet : closerStarts[open.length] ?? -1;
|
|
64
|
+
if (closer < from) {
|
|
37
65
|
missing.push({ name, at: match.index + before.length });
|
|
38
66
|
}
|
|
39
67
|
}
|
|
@@ -41,7 +69,9 @@ const unclosed = (text) => {
|
|
|
41
69
|
};
|
|
42
70
|
function scanUnclosedMarkupCodes(content) {
|
|
43
71
|
const lines = content.split(/\r?\n/);
|
|
72
|
+
const starts = (0, line_starts_1.lineStarts)(content);
|
|
44
73
|
const open = [];
|
|
74
|
+
let verbatimOpen = 0;
|
|
45
75
|
const violations = [];
|
|
46
76
|
let chunk = null;
|
|
47
77
|
let inAbbreviatedVerbatim = false;
|
|
@@ -49,17 +79,19 @@ function scanUnclosedMarkupCodes(content) {
|
|
|
49
79
|
if (!chunk)
|
|
50
80
|
return;
|
|
51
81
|
const at = chunk;
|
|
82
|
+
// the codes come in order, so the line is counted on from the one before
|
|
83
|
+
let line = at.line;
|
|
84
|
+
let counted = 0;
|
|
52
85
|
for (const found of unclosed(at.text)) {
|
|
53
86
|
const name = found.name;
|
|
54
|
-
|
|
87
|
+
for (; counted < found.at; counted++)
|
|
88
|
+
if (at.text.charCodeAt(counted) === 10)
|
|
89
|
+
line++;
|
|
55
90
|
violations.push({
|
|
56
91
|
rule: exports.UNCLOSED_MARKUP_CODE_RULE_ID,
|
|
57
92
|
severity: 'warning',
|
|
58
93
|
message: `${name}<> is closed by the end of the block, not by its own bracket; the text goes out as written`,
|
|
59
|
-
location:
|
|
60
|
-
start: { line, column: 1, offset: 0 },
|
|
61
|
-
end: { line, column: 1, offset: 0 },
|
|
62
|
-
},
|
|
94
|
+
location: (0, line_starts_1.placeAtLine)(starts, line),
|
|
63
95
|
});
|
|
64
96
|
}
|
|
65
97
|
chunk = null;
|
|
@@ -69,7 +101,9 @@ function scanUnclosedMarkupCodes(content) {
|
|
|
69
101
|
if (/^\s*=end\s+[\w-]+/.test(line)) {
|
|
70
102
|
close();
|
|
71
103
|
inAbbreviatedVerbatim = false;
|
|
72
|
-
open.pop();
|
|
104
|
+
const closed = open.pop();
|
|
105
|
+
if (closed !== undefined && (0, schema_1.isVerbatimBlock)(closed))
|
|
106
|
+
verbatimOpen--;
|
|
73
107
|
continue;
|
|
74
108
|
}
|
|
75
109
|
const begin = line.match(/^\s*=begin\s+([\w-]+)/);
|
|
@@ -77,9 +111,11 @@ function scanUnclosedMarkupCodes(content) {
|
|
|
77
111
|
close();
|
|
78
112
|
inAbbreviatedVerbatim = false;
|
|
79
113
|
open.push(begin[1]);
|
|
114
|
+
if ((0, schema_1.isVerbatimBlock)(begin[1]))
|
|
115
|
+
verbatimOpen++;
|
|
80
116
|
continue;
|
|
81
117
|
}
|
|
82
|
-
if (
|
|
118
|
+
if (verbatimOpen > 0)
|
|
83
119
|
continue;
|
|
84
120
|
// a directive starts a chunk of its own; a blank line ends the one running
|
|
85
121
|
if (/^\s*=/.test(line)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"unclosed-markup-code.js","sourceRoot":"","sources":["../../../src/lint/rules/unclosed-markup-code.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"unclosed-markup-code.js","sourceRoot":"","sources":["../../../src/lint/rules/unclosed-markup-code.ts"],"names":[],"mappings":"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"}
|
package/lib/test/documents.js
CHANGED
|
@@ -171,7 +171,9 @@ const prepareDocument = (input, opts) => {
|
|
|
171
171
|
markSections(tree, undefined);
|
|
172
172
|
const at = new Map();
|
|
173
173
|
for (const d of diagnostics) {
|
|
174
|
-
if (d.code === 'table-source-unreadable' ||
|
|
174
|
+
if (d.code === 'table-source-unreadable' ||
|
|
175
|
+
d.code === 'table-source-deferred' ||
|
|
176
|
+
d.code === 'table-source-conflict') {
|
|
175
177
|
at.set(d.location.start.offset, d.message);
|
|
176
178
|
}
|
|
177
179
|
}
|