podlite 0.0.88 → 0.0.89
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 +16 -0
- package/esm/assemble/index.d.ts +1 -1
- package/esm/assemble/index.js +87 -7
- package/esm/assemble/index.js.map +1 -1
- package/esm/lint/engine.d.ts +1 -0
- package/esm/lint/engine.js +23 -1
- package/esm/lint/engine.js.map +1 -1
- package/esm/lint/grammar/lint.js +37 -7
- package/esm/lint/grammar/lint.js.map +1 -1
- package/esm/lint/rules/id-unique.d.ts +1 -0
- package/esm/lint/rules/id-unique.js +37 -14
- package/esm/lint/rules/id-unique.js.map +1 -1
- package/esm/lint/rules/include-resolves.d.ts +11 -1
- package/esm/lint/rules/include-resolves.js +91 -44
- package/esm/lint/rules/include-resolves.js.map +1 -1
- package/esm/lint/rules/index.js +2 -0
- package/esm/lint/rules/index.js.map +1 -1
- package/esm/lint/rules/toc-title-attribute.d.ts +3 -0
- package/esm/lint/rules/toc-title-attribute.js +37 -0
- package/esm/lint/rules/toc-title-attribute.js.map +1 -0
- package/esm/query.js +7 -4
- package/esm/query.js.map +1 -1
- package/esm/test/documents.js +2 -1
- package/esm/test/documents.js.map +1 -1
- package/esm/test/formatters/text.js +4 -1
- package/esm/test/formatters/text.js.map +1 -1
- package/esm/test/run.js +18 -3
- package/esm/test/run.js.map +1 -1
- package/esm/test/sources.d.ts +6 -1
- package/esm/test/sources.js +23 -6
- package/esm/test/sources.js.map +1 -1
- package/esm/version.d.ts +1 -1
- package/esm/version.js +1 -1
- package/lib/assemble/index.d.ts +1 -1
- package/lib/assemble/index.js +86 -6
- package/lib/assemble/index.js.map +1 -1
- package/lib/lint/engine.d.ts +1 -0
- package/lib/lint/engine.js +25 -1
- package/lib/lint/engine.js.map +1 -1
- package/lib/lint/grammar/lint.js +37 -7
- package/lib/lint/grammar/lint.js.map +1 -1
- package/lib/lint/rules/id-unique.d.ts +1 -0
- package/lib/lint/rules/id-unique.js +37 -14
- package/lib/lint/rules/id-unique.js.map +1 -1
- package/lib/lint/rules/include-resolves.d.ts +11 -1
- package/lib/lint/rules/include-resolves.js +94 -45
- package/lib/lint/rules/include-resolves.js.map +1 -1
- package/lib/lint/rules/index.js +2 -0
- package/lib/lint/rules/index.js.map +1 -1
- package/lib/lint/rules/toc-title-attribute.d.ts +3 -0
- package/lib/lint/rules/toc-title-attribute.js +40 -0
- package/lib/lint/rules/toc-title-attribute.js.map +1 -0
- package/lib/query.js +6 -3
- package/lib/query.js.map +1 -1
- package/lib/test/documents.js +2 -1
- package/lib/test/documents.js.map +1 -1
- package/lib/test/formatters/text.js +4 -1
- package/lib/test/formatters/text.js.map +1 -1
- package/lib/test/run.js +18 -3
- package/lib/test/run.js.map +1 -1
- package/lib/test/sources.d.ts +6 -1
- package/lib/test/sources.js +23 -6
- package/lib/test/sources.js.map +1 -1
- package/lib/version.d.ts +1 -1
- package/lib/version.js +1 -1
- package/package.json +7 -7
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.includeResolvesRule = exports.INCLUDE_RESOLVES_RULE_ID = exports.includePlugins = void 0;
|
|
3
|
+
exports.includeResolvesRule = exports.assembleForLint = exports.includedName = exports.INCLUDE_RESOLVES_RULE_ID = exports.includePlugins = void 0;
|
|
4
4
|
const path_1 = require("path");
|
|
5
5
|
const schema_1 = require("@podlite/schema");
|
|
6
6
|
const markdown_1 = require("@podlite/markdown");
|
|
@@ -9,6 +9,7 @@ const loader_1 = require("../loader");
|
|
|
9
9
|
const resolve_includes_1 = require("../../resolve-includes");
|
|
10
10
|
const assemble_1 = require("../../assemble");
|
|
11
11
|
const reader_1 = require("../../reader");
|
|
12
|
+
const engine_1 = require("../engine");
|
|
12
13
|
// The plugins that change what an include can select or address. The registry
|
|
13
14
|
// convert raises brings the diagram renderer, and the image plugin brings React:
|
|
14
15
|
// a check loads neither.
|
|
@@ -19,16 +20,30 @@ exports.INCLUDE_RESOLVES_RULE_ID = 'include-resolves';
|
|
|
19
20
|
// it came through, so the report and lint-ignore read offsets of this file only.
|
|
20
21
|
// A file of a host's own set is named as the host named it: from the root the
|
|
21
22
|
// paths of the document are resolved from.
|
|
22
|
-
|
|
23
|
+
/*
|
|
24
|
+
=begin pod :kind<export>
|
|
25
|
+
|
|
26
|
+
=head2 includedName
|
|
27
|
+
|
|
28
|
+
The name a lint message gives a file an include brought in: from the directory
|
|
29
|
+
of the document when it was read from disk, from the context the paths are
|
|
30
|
+
resolved from when a host gives the files, or as the host named it.
|
|
31
|
+
|
|
32
|
+
=end pod
|
|
33
|
+
*/
|
|
34
|
+
const includedName = (file, ctx) => {
|
|
35
|
+
const context = ctx.context ?? '';
|
|
36
|
+
return ctx.fromDisk && !ctx.sources
|
|
37
|
+
? (0, path_1.relative)((0, path_1.dirname)((0, path_1.resolve)(ctx.filePath)), file)
|
|
38
|
+
: typeof context === 'string'
|
|
39
|
+
? path_1.posix.relative(path_1.posix.join('/', context), path_1.posix.join('/', file))
|
|
40
|
+
: file;
|
|
41
|
+
};
|
|
42
|
+
exports.includedName = includedName;
|
|
43
|
+
const toViolation = (problem, ctx) => {
|
|
23
44
|
const first = problem.chain[0];
|
|
24
45
|
const last = problem.chain[problem.chain.length - 1];
|
|
25
|
-
const inner = problem.chain.length > 1 && last.location
|
|
26
|
-
? ` (in ${fromDisk
|
|
27
|
-
? (0, path_1.relative)((0, path_1.dirname)((0, path_1.resolve)(filePath)), last.file)
|
|
28
|
-
: typeof context === 'string'
|
|
29
|
-
? path_1.posix.relative(path_1.posix.join('/', context), path_1.posix.join('/', last.file))
|
|
30
|
-
: last.file}:${last.location.start.line})`
|
|
31
|
-
: '';
|
|
46
|
+
const inner = problem.chain.length > 1 && last.location ? ` (in ${(0, exports.includedName)(last.file, ctx)}:${last.location.start.line})` : '';
|
|
32
47
|
return {
|
|
33
48
|
rule: exports.INCLUDE_RESOLVES_RULE_ID,
|
|
34
49
|
// an include that loses its content is an error; one that still brings it in, a warning
|
|
@@ -39,54 +54,88 @@ const toViolation = (problem, filePath, fromDisk, context) => {
|
|
|
39
54
|
location: first?.location,
|
|
40
55
|
};
|
|
41
56
|
};
|
|
57
|
+
/*
|
|
58
|
+
=begin pod :kind<export>
|
|
59
|
+
|
|
60
|
+
=head2 assembleForLint
|
|
61
|
+
|
|
62
|
+
The document as its includes assemble it, for a rule that checks the whole
|
|
63
|
+
document. Undefined where includes are not assembled: a Markdown document, and
|
|
64
|
+
text handed in by name with no files given next to it. An assembly that fails is
|
|
65
|
+
returned as the error. The rules of one pass over a file share one assembly;
|
|
66
|
+
a rule checked on its own assembles anew each time.
|
|
67
|
+
|
|
68
|
+
=end pod
|
|
69
|
+
*/
|
|
70
|
+
const assembleForLint = (ast, ctx) => {
|
|
71
|
+
if (!(0, engine_1.isOnePass)(ctx))
|
|
72
|
+
return assemble(ast, ctx);
|
|
73
|
+
const known = assembledIn.get(ctx);
|
|
74
|
+
if (known && known.ast === ast)
|
|
75
|
+
return known.result;
|
|
76
|
+
const result = assemble(ast, ctx);
|
|
77
|
+
assembledIn.set(ctx, { ast, result });
|
|
78
|
+
return result;
|
|
79
|
+
};
|
|
80
|
+
exports.assembleForLint = assembleForLint;
|
|
81
|
+
const assembledIn = new WeakMap();
|
|
82
|
+
const assemble = (ast, ctx) => {
|
|
83
|
+
// A markdown document has no directives: an =include line there is text.
|
|
84
|
+
if (ctx.fileType === 'md')
|
|
85
|
+
return undefined;
|
|
86
|
+
// text handed in by name has nothing next to it to read, unless the host
|
|
87
|
+
// gives the sources itself
|
|
88
|
+
if (!ctx.fromDisk && !ctx.sources)
|
|
89
|
+
return undefined;
|
|
90
|
+
const problems = [];
|
|
91
|
+
const origin = new WeakMap();
|
|
92
|
+
const parse = (source, file, config, how) => (0, assemble_1.silently)(() => read(source, file, config, { format: how?.format }));
|
|
93
|
+
try {
|
|
94
|
+
const tree = ctx.sources
|
|
95
|
+
? (0, assemble_1.assembleIncludes)(ast, {
|
|
96
|
+
sources: ctx.sources,
|
|
97
|
+
context: ctx.context ?? '',
|
|
98
|
+
parse,
|
|
99
|
+
tolerant: true,
|
|
100
|
+
file: ctx.filePath,
|
|
101
|
+
self: ctx.self,
|
|
102
|
+
origin,
|
|
103
|
+
onError: problem => problems.push(problem),
|
|
104
|
+
onWarning: problem => problems.push(problem),
|
|
105
|
+
})
|
|
106
|
+
: (0, resolve_includes_1.resolveIncludes)(ast, {
|
|
107
|
+
baseDir: (0, path_1.dirname)((0, path_1.resolve)(ctx.filePath)),
|
|
108
|
+
parse,
|
|
109
|
+
tolerant: true,
|
|
110
|
+
file: (0, path_1.resolve)(ctx.filePath),
|
|
111
|
+
self: ctx.filePath,
|
|
112
|
+
origin,
|
|
113
|
+
onError: problem => problems.push(problem),
|
|
114
|
+
onWarning: problem => problems.push(problem),
|
|
115
|
+
});
|
|
116
|
+
return { tree, origin, problems };
|
|
117
|
+
}
|
|
118
|
+
catch (e) {
|
|
119
|
+
return e instanceof Error ? e : new Error(String(e));
|
|
120
|
+
}
|
|
121
|
+
};
|
|
42
122
|
exports.includeResolvesRule = {
|
|
43
123
|
id: exports.INCLUDE_RESOLVES_RULE_ID,
|
|
44
124
|
severity: 'error',
|
|
45
125
|
check: (ast, ctx) => {
|
|
46
|
-
|
|
47
|
-
if (
|
|
126
|
+
const assembled = (0, exports.assembleForLint)(ast, ctx);
|
|
127
|
+
if (assembled === undefined)
|
|
48
128
|
return [];
|
|
49
|
-
|
|
50
|
-
// gives the sources itself
|
|
51
|
-
if (!ctx.fromDisk && !ctx.sources)
|
|
52
|
-
return [];
|
|
53
|
-
const problems = [];
|
|
54
|
-
const parse = (source, file, config, how) => (0, assemble_1.silently)(() => read(source, file, config, { format: how?.format }));
|
|
55
|
-
try {
|
|
56
|
-
if (ctx.sources) {
|
|
57
|
-
(0, assemble_1.assembleIncludes)(ast, {
|
|
58
|
-
sources: ctx.sources,
|
|
59
|
-
context: ctx.context ?? '',
|
|
60
|
-
parse,
|
|
61
|
-
tolerant: true,
|
|
62
|
-
file: ctx.filePath,
|
|
63
|
-
self: ctx.self,
|
|
64
|
-
onError: problem => problems.push(problem),
|
|
65
|
-
onWarning: problem => problems.push(problem),
|
|
66
|
-
});
|
|
67
|
-
}
|
|
68
|
-
else {
|
|
69
|
-
(0, resolve_includes_1.resolveIncludes)(ast, {
|
|
70
|
-
baseDir: (0, path_1.dirname)((0, path_1.resolve)(ctx.filePath)),
|
|
71
|
-
parse,
|
|
72
|
-
tolerant: true,
|
|
73
|
-
file: (0, path_1.resolve)(ctx.filePath),
|
|
74
|
-
self: ctx.filePath,
|
|
75
|
-
onError: problem => problems.push(problem),
|
|
76
|
-
onWarning: problem => problems.push(problem),
|
|
77
|
-
});
|
|
78
|
-
}
|
|
79
|
-
}
|
|
80
|
-
catch (e) {
|
|
129
|
+
if (assembled instanceof Error) {
|
|
81
130
|
return [
|
|
82
131
|
{
|
|
83
132
|
rule: exports.INCLUDE_RESOLVES_RULE_ID,
|
|
84
133
|
severity: 'error',
|
|
85
|
-
message: `Includes could not be checked: ${
|
|
134
|
+
message: `Includes could not be checked: ${assembled.message}`,
|
|
86
135
|
},
|
|
87
136
|
];
|
|
88
137
|
}
|
|
89
|
-
return problems.map(problem => toViolation(problem, ctx
|
|
138
|
+
return assembled.problems.map(problem => toViolation(problem, ctx));
|
|
90
139
|
},
|
|
91
140
|
};
|
|
92
141
|
//# sourceMappingURL=include-resolves.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"include-resolves.js","sourceRoot":"","sources":["../../../src/lint/rules/include-resolves.ts"],"names":[],"mappings":";;;AAAA,+BAAwD;AACxD,4CAAmE;AACnE,gDAA8D;AAC9D,sCAAoD;AAEpD,sCAA0C;AAC1C,6DAAwE;AACxE,6CAA2D;
|
|
1
|
+
{"version":3,"file":"include-resolves.js","sourceRoot":"","sources":["../../../src/lint/rules/include-resolves.ts"],"names":[],"mappings":"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"}
|
package/lib/lint/rules/index.js
CHANGED
|
@@ -14,6 +14,7 @@ const dead_definitions_1 = require("./dead-definitions");
|
|
|
14
14
|
const include_resolves_1 = require("./include-resolves");
|
|
15
15
|
const named_blocks_1 = require("./named-blocks");
|
|
16
16
|
const notify_attribute_1 = require("./notify-attribute");
|
|
17
|
+
const toc_title_attribute_1 = require("./toc-title-attribute");
|
|
17
18
|
exports.DEFAULT_RULES = [
|
|
18
19
|
syntax_valid_1.syntaxValidRule,
|
|
19
20
|
heading_hierarchy_1.headingHierarchyRule,
|
|
@@ -29,5 +30,6 @@ exports.DEFAULT_RULES = [
|
|
|
29
30
|
named_blocks_1.directiveNamedBlockRule,
|
|
30
31
|
named_blocks_1.imageNamedBlockRule,
|
|
31
32
|
notify_attribute_1.notifyAttributeRule,
|
|
33
|
+
toc_title_attribute_1.tocTitleAttributeRule,
|
|
32
34
|
];
|
|
33
35
|
//# 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,2CAA0C;AAC1C,+DAA6D;AAC7D,iEAA+D;AAC/D,6DAA2D;AAC3D,qDAAmD;AACnD,6DAA2D;AAC3D,+CAA8C;AAC9C,yDAAwD;AACxD,yDAAwD;AACxD,iDAA6E;AAC7E,yDAAwD;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lint/rules/index.ts"],"names":[],"mappings":";;;AACA,iDAAgD;AAChD,2DAA0D;AAC1D,2CAA0C;AAC1C,+DAA6D;AAC7D,iEAA+D;AAC/D,6DAA2D;AAC3D,qDAAmD;AACnD,6DAA2D;AAC3D,+CAA8C;AAC9C,yDAAwD;AACxD,yDAAwD;AACxD,iDAA6E;AAC7E,yDAAwD;AACxD,+DAA6D;AAEhD,QAAA,aAAa,GAAW;IACnC,8BAAe;IACf,wCAAoB;IACpB,wBAAY;IACZ,2CAAqB;IACrB,6CAAsB;IACtB,yCAAoB;IACpB,iCAAgB;IAChB,yCAAoB;IACpB,4BAAc;IACd,sCAAmB;IACnB,sCAAmB;IACnB,sCAAuB;IACvB,kCAAmB;IACnB,sCAAmB;IACnB,2CAAqB;CACtB,CAAA"}
|
|
@@ -0,0 +1,40 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.tocTitleAttributeRule = exports.TOC_TITLE_ATTRIBUTE_RULE_ID = void 0;
|
|
4
|
+
const schema_1 = require("@podlite/schema");
|
|
5
|
+
exports.TOC_TITLE_ATTRIBUTE_RULE_ID = 'toc-title-attribute';
|
|
6
|
+
// Toc is the older spelling the module of the table of contents still reads
|
|
7
|
+
const isToc = (node) => typeof node === 'object' &&
|
|
8
|
+
node !== null &&
|
|
9
|
+
node.type === 'block' &&
|
|
10
|
+
(node.name === 'toc' || node.name === 'Toc');
|
|
11
|
+
// The specification captions a table of contents with :caption; the module of the
|
|
12
|
+
// table of contents also reads :title, and stops in the next release. The parser
|
|
13
|
+
// already puts on a block what =set and =config give it, marked by where it came
|
|
14
|
+
// from, so one reading of the block covers all three sources and gives one warning.
|
|
15
|
+
// The linter can assemble a document by its includes, and this rule does not: no
|
|
16
|
+
// document gives a table of contents :title through =set or =config, and a warning
|
|
17
|
+
// about a block of another file would have to stand at the line of =include. So a
|
|
18
|
+
// :title that reaches a table of contents only when the files are assembled is not
|
|
19
|
+
// reported, as with the notification attribute.
|
|
20
|
+
exports.tocTitleAttributeRule = {
|
|
21
|
+
id: exports.TOC_TITLE_ATTRIBUTE_RULE_ID,
|
|
22
|
+
severity: 'warning',
|
|
23
|
+
check: (ast, _ctx) => (0, schema_1.getFromTree)(ast, () => true).flatMap(node => {
|
|
24
|
+
if (!isToc(node))
|
|
25
|
+
return [];
|
|
26
|
+
const entry = (node.config || []).find(c => c.name === 'title');
|
|
27
|
+
if (!entry)
|
|
28
|
+
return [];
|
|
29
|
+
const source = entry.from === 'set' || entry.from === 'config' ? ` given by =${entry.from}` : '';
|
|
30
|
+
return [
|
|
31
|
+
{
|
|
32
|
+
rule: exports.TOC_TITLE_ATTRIBUTE_RULE_ID,
|
|
33
|
+
severity: 'warning',
|
|
34
|
+
message: `:title${source} as the caption of =${node.name} is deprecated; a caption is written :caption`,
|
|
35
|
+
location: node.location,
|
|
36
|
+
},
|
|
37
|
+
];
|
|
38
|
+
}),
|
|
39
|
+
};
|
|
40
|
+
//# sourceMappingURL=toc-title-attribute.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"toc-title-attribute.js","sourceRoot":"","sources":["../../../src/lint/rules/toc-title-attribute.ts"],"names":[],"mappings":";;;AAAA,4CAA8D;AAGjD,QAAA,2BAA2B,GAAG,qBAAqB,CAAA;AAKhE,4EAA4E;AAC5E,MAAM,KAAK,GAAG,CAAC,IAAa,EAAmB,EAAE,CAC/C,OAAO,IAAI,KAAK,QAAQ;IACxB,IAAI,KAAK,IAAI;IACZ,IAAgB,CAAC,IAAI,KAAK,OAAO;IAClC,CAAE,IAAgB,CAAC,IAAI,KAAK,KAAK,IAAK,IAAgB,CAAC,IAAI,KAAK,KAAK,CAAC,CAAA;AAExE,kFAAkF;AAClF,iFAAiF;AACjF,iFAAiF;AACjF,oFAAoF;AACpF,iFAAiF;AACjF,mFAAmF;AACnF,kFAAkF;AAClF,mFAAmF;AACnF,gDAAgD;AACnC,QAAA,qBAAqB,GAAS;IACzC,EAAE,EAAE,mCAA2B;IAC/B,QAAQ,EAAE,SAAS;IACnB,KAAK,EAAE,CAAC,GAAoB,EAAE,IAAiB,EAAe,EAAE,CAC9D,IAAA,oBAAW,EAAC,GAAG,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QAC1C,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;YAAE,OAAO,EAAE,CAAA;QAC3B,MAAM,KAAK,GAAG,CAAC,IAAI,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,OAAO,CAAC,CAAA;QAC/D,IAAI,CAAC,KAAK;YAAE,OAAO,EAAE,CAAA;QACrB,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,KAAK,KAAK,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,cAAc,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;QAChG,OAAO;YACL;gBACE,IAAI,EAAE,mCAA2B;gBACjC,QAAQ,EAAE,SAAkB;gBAC5B,OAAO,EAAE,SAAS,MAAM,uBAAuB,IAAI,CAAC,IAAI,+CAA+C;gBACvG,QAAQ,EAAE,IAAI,CAAC,QAAQ;aACxB;SACF,CAAA;IACH,CAAC,CAAC;CACL,CAAA"}
|
package/lib/query.js
CHANGED
|
@@ -85,9 +85,12 @@ const formatBlocks = (format, matches, sections) => {
|
|
|
85
85
|
throw new Error(`Unknown output format: ${format}`);
|
|
86
86
|
};
|
|
87
87
|
const runQuery = (opts) => {
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
88
|
+
let parsed;
|
|
89
|
+
try {
|
|
90
|
+
parsed = (0, schema_1.readSelector)(opts.selector);
|
|
91
|
+
}
|
|
92
|
+
catch (e) {
|
|
93
|
+
throw new Error(`Invalid selector: ${opts.selector}: ${e.message}`);
|
|
91
94
|
}
|
|
92
95
|
const sources = [];
|
|
93
96
|
const problems = [];
|
package/lib/query.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"query.js","sourceRoot":"","sources":["../src/query.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"query.js","sourceRoot":"","sources":["../src/query.ts"],"names":[],"mappings":"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"}
|
package/lib/test/documents.js
CHANGED
|
@@ -91,7 +91,8 @@ const isLosing = (problem) => problem.kind !== 'ambiguous' &&
|
|
|
91
91
|
problem.kind !== 'set-target' &&
|
|
92
92
|
problem.kind !== 'cycle' &&
|
|
93
93
|
problem.kind !== 'include-reading-differs' &&
|
|
94
|
-
problem.kind !== 'external'
|
|
94
|
+
problem.kind !== 'external' &&
|
|
95
|
+
problem.kind !== 'incomplete-selection';
|
|
95
96
|
const isObject = (value) => typeof value === 'object' && value !== null;
|
|
96
97
|
const isLocation = (value) => isObject(value) && isObject(value.start) && typeof value.start.offset === 'number';
|
|
97
98
|
// What in the assembled tree holds no data it should: a data table whose source
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"documents.js","sourceRoot":"","sources":["../../src/test/documents.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAwB;AACxB,2CAA4B;AAC5B,4CAA2C;AAS3C,oCAAkC;AAClC,kDAA6C;AAC7C,sCAAkD;AAClD,gDAA6C;AAE7C,0DAAoG;AAEpG,mCAAiC;AAkCjC,MAAM,QAAQ,GAAG,CAAC,aAAsB,EAAE,EAAE,CAAC,GAAW,EAAE;IACxD,MAAM,CAAC,GAAG,IAAA,eAAO,EAAC,EAAE,aAAa,EAAE,CAAC,CAAA;IACpC,MAAM,IAAI,GAAG,IAAA,kBAAS,EAAC,CAAC,CAAC,CAAA;IACzB,OAAO;QACL,MAAM,EAAE,CAAC,IAAI,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,EAAE,IAAI,GAAG,EAAE,EAAE,MAAM,EAAE,EAAE,CACpE,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,EAAE,CAAC;QAChE,OAAO,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,CAAC,IAAA,oBAAW,EAAC,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC;KACxD,CAAA;AACH,CAAC,CAAA;AAED;;;;;;;;;EASE;AACW,QAAA,WAAW,GAAY,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAA;AAE5E,oEAAoE;AACpE;;;;;;;;;EASE;AACW,QAAA,aAAa,GAAY,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAA;AAgC1E,MAAM,SAAS,GAAG,CAAC,IAAY,EAAU,EAAE;IAChD,IAAI,CAAC;QACH,OAAO,EAAE,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;IACrC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;IAC3B,CAAC;AACH,CAAC,CAAA;AANY,QAAA,SAAS,aAMrB;AAED,8EAA8E;AAC9E,4EAA4E;AAC5E,8EAA8E;AAC9E,+BAA+B;AAC/B,MAAM,QAAQ,GAAG,CAAC,OAAuB,EAAW,EAAE,CACpD,OAAO,CAAC,IAAI,KAAK,WAAW;IAC5B,OAAO,CAAC,IAAI,KAAK,YAAY;IAC7B,OAAO,CAAC,IAAI,KAAK,OAAO;IACxB,OAAO,CAAC,IAAI,KAAK,yBAAyB;IAC1C,OAAO,CAAC,IAAI,KAAK,UAAU,CAAA;
|
|
1
|
+
{"version":3,"file":"documents.js","sourceRoot":"","sources":["../../src/test/documents.ts"],"names":[],"mappings":"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"}
|
|
@@ -102,6 +102,7 @@ const describeTest = (t, cwd) => {
|
|
|
102
102
|
const reason = t.reason && t.reason.kind !== 'assertion' ? [` ${describeTestReason(t.reason, cwd)}`] : [];
|
|
103
103
|
return [head, ...reason, ...t.asserts.filter(a => !a.held).flatMap(a => describeAssertion(a, cwd))];
|
|
104
104
|
};
|
|
105
|
+
const FIXTURE_OWNER = /#fixture-\d+$/;
|
|
105
106
|
const describeProblem = (p, cwd) => {
|
|
106
107
|
switch (p.kind) {
|
|
107
108
|
case 'unreadable-source':
|
|
@@ -111,7 +112,9 @@ const describeProblem = (p, cwd) => {
|
|
|
111
112
|
case 'include': {
|
|
112
113
|
const step = p.problem.chain[p.problem.chain.length - 1];
|
|
113
114
|
const where = step ? at({ file: step.file, location: step.location }, cwd) : shown(p.source, cwd);
|
|
114
|
-
|
|
115
|
+
// the failure may sit in a resource the fixture includes: the test it belongs to comes first
|
|
116
|
+
const owner = FIXTURE_OWNER.test(p.source) ? `${shown(p.source, cwd)}: ` : '';
|
|
117
|
+
return `${p.severity}: ${owner}${where}: ${p.problem.message}`;
|
|
115
118
|
}
|
|
116
119
|
}
|
|
117
120
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"text.js","sourceRoot":"","sources":["../../../src/test/formatters/text.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"text.js","sourceRoot":"","sources":["../../../src/test/formatters/text.ts"],"names":[],"mappings":"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"}
|
package/lib/test/run.js
CHANGED
|
@@ -61,9 +61,23 @@ const runTests = (opts) => {
|
|
|
61
61
|
containing: (index) => collection.sources.find(s => s.index === index),
|
|
62
62
|
};
|
|
63
63
|
const sourceName = (index) => collection.sources.find(s => s.index === index)?.name ?? String(index);
|
|
64
|
+
// the same fixture read again for another run of its test is reported once
|
|
65
|
+
const fixtureProblems = [];
|
|
66
|
+
const reported = new Set();
|
|
67
|
+
const onFixture = ({ test, fixture, document }) => {
|
|
68
|
+
const line = test.place.location ? `:${test.place.location.start.line}` : '';
|
|
69
|
+
const owner = `${test.place.file}${line}#fixture-${fixture.index}`;
|
|
70
|
+
for (const problem of document.errors) {
|
|
71
|
+
const key = JSON.stringify([test.key, fixture.index, problem]);
|
|
72
|
+
if (reported.has(key))
|
|
73
|
+
continue;
|
|
74
|
+
reported.add(key);
|
|
75
|
+
fixtureProblems.push({ kind: 'include', severity: 'warning', source: owner, problem });
|
|
76
|
+
}
|
|
77
|
+
};
|
|
64
78
|
const results = (0, collect_1.planRuns)(collection.tests, against.length).map((run) => {
|
|
65
79
|
const { test, context } = run;
|
|
66
|
-
const input = (0, sources_1.inputsFor)(test, context, env);
|
|
80
|
+
const input = (0, sources_1.inputsFor)(test, context, env, onFixture);
|
|
67
81
|
const asserts = test.shape.kind === 'runnable' ? test.asserts.map(a => (0, evaluate_1.evaluateAssertion)(a, input(a), profile)) : [];
|
|
68
82
|
return {
|
|
69
83
|
id: test.id,
|
|
@@ -81,14 +95,15 @@ const runTests = (opts) => {
|
|
|
81
95
|
failed: results.filter(t => t.status === 'failed').length,
|
|
82
96
|
skipped: results.filter(t => t.status === 'skipped').length,
|
|
83
97
|
};
|
|
98
|
+
const problems = [...collection.problems, ...fixtureProblems];
|
|
84
99
|
return {
|
|
85
100
|
format: 'podlite-test-report',
|
|
86
101
|
version: 1,
|
|
87
102
|
profile: profile.name,
|
|
88
103
|
tests: results,
|
|
89
|
-
problems
|
|
104
|
+
problems,
|
|
90
105
|
counts,
|
|
91
|
-
exitCode: exitCodeOf(results,
|
|
106
|
+
exitCode: exitCodeOf(results, problems, opts.allowSkipped === true),
|
|
92
107
|
};
|
|
93
108
|
};
|
|
94
109
|
exports.runTests = runTests;
|
package/lib/test/run.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../src/test/run.ts"],"names":[],"mappings":";;;AAAA,uCAAkD;AAClD,2CAAyC;AAEzC,yCAA8C;AAE9C,uCAAsD;
|
|
1
|
+
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../src/test/run.ts"],"names":[],"mappings":"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"}
|
package/lib/test/sources.d.ts
CHANGED
|
@@ -39,10 +39,15 @@ export type InputFailure = {
|
|
|
39
39
|
message: string;
|
|
40
40
|
};
|
|
41
41
|
export type SuppliedDocument = Result<PreparedDocument, InputFailure>;
|
|
42
|
+
export type FixtureRead = {
|
|
43
|
+
test: CollectedTest;
|
|
44
|
+
fixture: FixtureDecl;
|
|
45
|
+
document: PreparedDocument;
|
|
46
|
+
};
|
|
42
47
|
export type InputEnvironment = {
|
|
43
48
|
profile: Profile;
|
|
44
49
|
supplied: SuppliedDocument[];
|
|
45
50
|
containing: (source: number) => PreparedDocument | undefined;
|
|
46
51
|
};
|
|
47
52
|
export declare const prepareSupplied: (file: string, profile: Profile) => SuppliedDocument;
|
|
48
|
-
export declare const inputsFor: (test: CollectedTest, context: RunContext, env: InputEnvironment) => (assert: AssertDecl) => Result<AssertionInput, InputFailure>;
|
|
53
|
+
export declare const inputsFor: (test: CollectedTest, context: RunContext, env: InputEnvironment, onFixture?: (read: FixtureRead) => void) => (assert: AssertDecl) => Result<AssertionInput, InputFailure>;
|
package/lib/test/sources.js
CHANGED
|
@@ -66,8 +66,18 @@ const whole = (document, input) => {
|
|
|
66
66
|
}
|
|
67
67
|
return (0, types_1.ok)(document);
|
|
68
68
|
};
|
|
69
|
-
// A
|
|
70
|
-
//
|
|
69
|
+
// A fixture whose include failed remains a document: its assertions read what
|
|
70
|
+
// was read, and the failure is reported apart. A table source it cannot read
|
|
71
|
+
// still keeps it from them.
|
|
72
|
+
const readable = (document, input) => {
|
|
73
|
+
const [unread] = document.unread;
|
|
74
|
+
if (unread)
|
|
75
|
+
return (0, types_1.err)({ kind: 'source-unsupported', input, source: unread.source, message: unread.message });
|
|
76
|
+
return (0, types_1.ok)(document);
|
|
77
|
+
};
|
|
78
|
+
// A supplied, named or containing document with an include that lost content is
|
|
79
|
+
// not the document the author wrote; nothing it lacks may pass for nothing having
|
|
80
|
+
// matched.
|
|
71
81
|
const complete = (prepared, input) => {
|
|
72
82
|
if (prepared.ok === false)
|
|
73
83
|
return (0, types_1.err)({ kind: 'implementation-error', input, message: prepared.error });
|
|
@@ -113,10 +123,12 @@ The document each assertion of one test run is read against: the source it names
|
|
|
113
123
|
else the supplied document, else the fixture nearest before it, else the document the
|
|
114
124
|
test is in. A fixture is read the first time it is needed, and the resources of the
|
|
115
125
|
test are seen by that fixture only.
|
|
126
|
+
C<onFixture> is told of each fixture read, with what it lost to an include: a
|
|
127
|
+
fixture whose include failed is still read by its assertions.
|
|
116
128
|
|
|
117
129
|
=end pod
|
|
118
130
|
*/
|
|
119
|
-
const inputsFor = (test, context, env) => {
|
|
131
|
+
const inputsFor = (test, context, env, onFixture) => {
|
|
120
132
|
const fixtures = new Map();
|
|
121
133
|
const named = new Map();
|
|
122
134
|
const provider = (0, resources_1.resourceProvider)(test.resources);
|
|
@@ -125,9 +137,14 @@ const inputsFor = (test, context, env) => {
|
|
|
125
137
|
if (known)
|
|
126
138
|
return known;
|
|
127
139
|
const name = `${test.place.file}#fixture-${fixture.index}`;
|
|
128
|
-
const prepared =
|
|
129
|
-
|
|
130
|
-
|
|
140
|
+
const prepared = (0, documents_1.prepareDocument)({ name, text: fixture.body, baseDir: resources_1.RESOURCE_ROOT }, { profile: env.profile, provider });
|
|
141
|
+
if (prepared.ok)
|
|
142
|
+
onFixture?.({ test, fixture, document: prepared.value });
|
|
143
|
+
const admitted = prepared.ok === false
|
|
144
|
+
? (0, types_1.err)({ kind: 'implementation-error', input: 'fixture', message: prepared.error })
|
|
145
|
+
: readable(prepared.value, 'fixture');
|
|
146
|
+
fixtures.set(fixture.index, admitted);
|
|
147
|
+
return admitted;
|
|
131
148
|
};
|
|
132
149
|
const readNamed = (document, source, base) => {
|
|
133
150
|
const file = path.resolve(base, document);
|