podlite 0.0.88 → 0.0.90
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 +20 -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 +36 -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 +39 -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
package/esm/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/esm/test/documents.js
CHANGED
|
@@ -54,7 +54,8 @@ const isLosing = (problem) => problem.kind !== 'ambiguous' &&
|
|
|
54
54
|
problem.kind !== 'set-target' &&
|
|
55
55
|
problem.kind !== 'cycle' &&
|
|
56
56
|
problem.kind !== 'include-reading-differs' &&
|
|
57
|
-
problem.kind !== 'external'
|
|
57
|
+
problem.kind !== 'external' &&
|
|
58
|
+
problem.kind !== 'incomplete-selection';
|
|
58
59
|
const isObject = (value) => typeof value === 'object' && value !== null;
|
|
59
60
|
const isLocation = (value) => isObject(value) && isObject(value.start) && typeof value.start.offset === 'number';
|
|
60
61
|
// 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,OAAO,KAAK,EAAE,MAAM,IAAI,CAAA;AACxB,OAAO,KAAK,IAAI,MAAM,MAAM,CAAA;AAC5B,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAS3C,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAA;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAA;AAC7C,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,WAAW,CAAA;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAE7C,OAAO,EAAE,eAAe,EAAiD,MAAM,qBAAqB,CAAA;AAEpG,OAAO,EAAE,GAAG,EAAE,EAAE,EAAE,MAAM,SAAS,CAAA;AAkCjC,MAAM,QAAQ,GAAG,CAAC,aAAsB,EAAE,EAAE,CAAC,GAAW,EAAE;IACxD,MAAM,CAAC,GAAG,OAAO,CAAC,EAAE,aAAa,EAAE,CAAC,CAAA;IACpC,MAAM,IAAI,GAAG,SAAS,CAAC,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,WAAW,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC;KACxD,CAAA;AACH,CAAC,CAAA;AAED;;;;;;;;;EASE;AACF,MAAM,CAAC,MAAM,WAAW,GAAY,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAA;AAE5E,oEAAoE;AACpE;;;;;;;;;EASE;AACF,MAAM,CAAC,MAAM,aAAa,GAAY,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAA;AAgCjF,MAAM,CAAC,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;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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"}
|
|
@@ -66,6 +66,7 @@ const describeTest = (t, cwd) => {
|
|
|
66
66
|
const reason = t.reason && t.reason.kind !== 'assertion' ? [` ${describeTestReason(t.reason, cwd)}`] : [];
|
|
67
67
|
return [head, ...reason, ...t.asserts.filter(a => !a.held).flatMap(a => describeAssertion(a, cwd))];
|
|
68
68
|
};
|
|
69
|
+
const FIXTURE_OWNER = /#fixture-\d+$/;
|
|
69
70
|
const describeProblem = (p, cwd) => {
|
|
70
71
|
switch (p.kind) {
|
|
71
72
|
case 'unreadable-source':
|
|
@@ -75,7 +76,9 @@ const describeProblem = (p, cwd) => {
|
|
|
75
76
|
case 'include': {
|
|
76
77
|
const step = p.problem.chain[p.problem.chain.length - 1];
|
|
77
78
|
const where = step ? at({ file: step.file, location: step.location }, cwd) : shown(p.source, cwd);
|
|
78
|
-
|
|
79
|
+
// the failure may sit in a resource the fixture includes: the test it belongs to comes first
|
|
80
|
+
const owner = FIXTURE_OWNER.test(p.source) ? `${shown(p.source, cwd)}: ` : '';
|
|
81
|
+
return `${p.severity}: ${owner}${where}: ${p.problem.message}`;
|
|
79
82
|
}
|
|
80
83
|
}
|
|
81
84
|
};
|
|
@@ -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/esm/test/run.js
CHANGED
|
@@ -58,9 +58,23 @@ export const runTests = (opts) => {
|
|
|
58
58
|
containing: (index) => collection.sources.find(s => s.index === index),
|
|
59
59
|
};
|
|
60
60
|
const sourceName = (index) => collection.sources.find(s => s.index === index)?.name ?? String(index);
|
|
61
|
+
// the same fixture read again for another run of its test is reported once
|
|
62
|
+
const fixtureProblems = [];
|
|
63
|
+
const reported = new Set();
|
|
64
|
+
const onFixture = ({ test, fixture, document }) => {
|
|
65
|
+
const line = test.place.location ? `:${test.place.location.start.line}` : '';
|
|
66
|
+
const owner = `${test.place.file}${line}#fixture-${fixture.index}`;
|
|
67
|
+
for (const problem of document.errors) {
|
|
68
|
+
const key = JSON.stringify([test.key, fixture.index, problem]);
|
|
69
|
+
if (reported.has(key))
|
|
70
|
+
continue;
|
|
71
|
+
reported.add(key);
|
|
72
|
+
fixtureProblems.push({ kind: 'include', severity: 'warning', source: owner, problem });
|
|
73
|
+
}
|
|
74
|
+
};
|
|
61
75
|
const results = planRuns(collection.tests, against.length).map((run) => {
|
|
62
76
|
const { test, context } = run;
|
|
63
|
-
const input = inputsFor(test, context, env);
|
|
77
|
+
const input = inputsFor(test, context, env, onFixture);
|
|
64
78
|
const asserts = test.shape.kind === 'runnable' ? test.asserts.map(a => evaluateAssertion(a, input(a), profile)) : [];
|
|
65
79
|
return {
|
|
66
80
|
id: test.id,
|
|
@@ -78,14 +92,15 @@ export const runTests = (opts) => {
|
|
|
78
92
|
failed: results.filter(t => t.status === 'failed').length,
|
|
79
93
|
skipped: results.filter(t => t.status === 'skipped').length,
|
|
80
94
|
};
|
|
95
|
+
const problems = [...collection.problems, ...fixtureProblems];
|
|
81
96
|
return {
|
|
82
97
|
format: 'podlite-test-report',
|
|
83
98
|
version: 1,
|
|
84
99
|
profile: profile.name,
|
|
85
100
|
tests: results,
|
|
86
|
-
problems
|
|
101
|
+
problems,
|
|
87
102
|
counts,
|
|
88
|
-
exitCode: exitCodeOf(results,
|
|
103
|
+
exitCode: exitCodeOf(results, problems, opts.allowSkipped === true),
|
|
89
104
|
};
|
|
90
105
|
};
|
|
91
106
|
//# sourceMappingURL=run.js.map
|
package/esm/test/run.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../src/test/run.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAA;AAClD,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AAEzC,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAA;AAE9C,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,WAAW,CAAA;
|
|
1
|
+
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../src/test/run.ts"],"names":[],"mappings":"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"}
|
package/esm/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/esm/test/sources.js
CHANGED
|
@@ -30,8 +30,18 @@ const whole = (document, input) => {
|
|
|
30
30
|
}
|
|
31
31
|
return ok(document);
|
|
32
32
|
};
|
|
33
|
-
// A
|
|
34
|
-
//
|
|
33
|
+
// A fixture whose include failed remains a document: its assertions read what
|
|
34
|
+
// was read, and the failure is reported apart. A table source it cannot read
|
|
35
|
+
// still keeps it from them.
|
|
36
|
+
const readable = (document, input) => {
|
|
37
|
+
const [unread] = document.unread;
|
|
38
|
+
if (unread)
|
|
39
|
+
return err({ kind: 'source-unsupported', input, source: unread.source, message: unread.message });
|
|
40
|
+
return ok(document);
|
|
41
|
+
};
|
|
42
|
+
// A supplied, named or containing document with an include that lost content is
|
|
43
|
+
// not the document the author wrote; nothing it lacks may pass for nothing having
|
|
44
|
+
// matched.
|
|
35
45
|
const complete = (prepared, input) => {
|
|
36
46
|
if (prepared.ok === false)
|
|
37
47
|
return err({ kind: 'implementation-error', input, message: prepared.error });
|
|
@@ -76,10 +86,12 @@ The document each assertion of one test run is read against: the source it names
|
|
|
76
86
|
else the supplied document, else the fixture nearest before it, else the document the
|
|
77
87
|
test is in. A fixture is read the first time it is needed, and the resources of the
|
|
78
88
|
test are seen by that fixture only.
|
|
89
|
+
C<onFixture> is told of each fixture read, with what it lost to an include: a
|
|
90
|
+
fixture whose include failed is still read by its assertions.
|
|
79
91
|
|
|
80
92
|
=end pod
|
|
81
93
|
*/
|
|
82
|
-
export const inputsFor = (test, context, env) => {
|
|
94
|
+
export const inputsFor = (test, context, env, onFixture) => {
|
|
83
95
|
const fixtures = new Map();
|
|
84
96
|
const named = new Map();
|
|
85
97
|
const provider = resourceProvider(test.resources);
|
|
@@ -88,9 +100,14 @@ export const inputsFor = (test, context, env) => {
|
|
|
88
100
|
if (known)
|
|
89
101
|
return known;
|
|
90
102
|
const name = `${test.place.file}#fixture-${fixture.index}`;
|
|
91
|
-
const prepared =
|
|
92
|
-
|
|
93
|
-
|
|
103
|
+
const prepared = prepareDocument({ name, text: fixture.body, baseDir: RESOURCE_ROOT }, { profile: env.profile, provider });
|
|
104
|
+
if (prepared.ok)
|
|
105
|
+
onFixture?.({ test, fixture, document: prepared.value });
|
|
106
|
+
const admitted = prepared.ok === false
|
|
107
|
+
? err({ kind: 'implementation-error', input: 'fixture', message: prepared.error })
|
|
108
|
+
: readable(prepared.value, 'fixture');
|
|
109
|
+
fixtures.set(fixture.index, admitted);
|
|
110
|
+
return admitted;
|
|
94
111
|
};
|
|
95
112
|
const readNamed = (document, source, base) => {
|
|
96
113
|
const file = path.resolve(base, document);
|
package/esm/test/sources.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sources.js","sourceRoot":"","sources":["../../src/test/sources.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,MAAM,CAAA;AAC5B,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AAE/D,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAE7C,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAEtE,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAE7D,OAAO,EAAE,GAAG,EAAE,EAAE,EAAE,MAAM,SAAS,CAAA;
|
|
1
|
+
{"version":3,"file":"sources.js","sourceRoot":"","sources":["../../src/test/sources.ts"],"names":[],"mappings":"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"}
|
package/esm/version.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export declare const version = "0.0.
|
|
1
|
+
export declare const version = "0.0.90";
|
package/esm/version.js
CHANGED
package/lib/assemble/index.d.ts
CHANGED
|
@@ -5,7 +5,7 @@ export type IncludeStep = {
|
|
|
5
5
|
location?: Location;
|
|
6
6
|
};
|
|
7
7
|
export type IncludeProblem = {
|
|
8
|
-
kind: 'source' | 'address' | 'ambiguous' | 'unparsed-selector' | 'unsupported-scheme' | 'operand' | 'cycle' | 'set-target' | 'include-reading-differs' | 'external' | 'format';
|
|
8
|
+
kind: 'source' | 'address' | 'ambiguous' | 'unparsed-selector' | 'unsupported-scheme' | 'operand' | 'cycle' | 'set-target' | 'include-reading-differs' | 'external' | 'format' | 'incomplete-selection';
|
|
9
9
|
target: string;
|
|
10
10
|
message: string;
|
|
11
11
|
lost?: string[];
|
package/lib/assemble/index.js
CHANGED
|
@@ -10,7 +10,8 @@ const isWarning = (problem) => problem.kind === 'ambiguous' ||
|
|
|
10
10
|
problem.kind === 'cycle' ||
|
|
11
11
|
problem.kind === 'set-target' ||
|
|
12
12
|
problem.kind === 'include-reading-differs' ||
|
|
13
|
-
problem.kind === 'external'
|
|
13
|
+
problem.kind === 'external' ||
|
|
14
|
+
problem.kind === 'incomplete-selection';
|
|
14
15
|
exports.isWarning = isWarning;
|
|
15
16
|
// The configuration as the parser reads it on a block, when it reads the text
|
|
16
17
|
// whole: no value is dropped and nothing spills into the body.
|
|
@@ -229,6 +230,10 @@ const assembleIncludes = (tree, opts) => {
|
|
|
229
230
|
// the tree is known by its node, one that left nothing by a mark put in its
|
|
230
231
|
// place and taken out when the walk ends.
|
|
231
232
|
const failedAt = new WeakMap();
|
|
233
|
+
// An include left to wait for a later pass carries this mark on itself, so a
|
|
234
|
+
// copy of it, wherever it is made, waits as well. The mark is this call's own:
|
|
235
|
+
// a later pass does not read it.
|
|
236
|
+
const WAITING = Symbol('waiting include');
|
|
232
237
|
const FAILED = 'include-failed';
|
|
233
238
|
const isMark = (node) => node && typeof node === 'object' && node.type === FAILED;
|
|
234
239
|
const firstStop = (nodes, holder) => {
|
|
@@ -396,10 +401,11 @@ const assembleIncludes = (tree, opts) => {
|
|
|
396
401
|
reached.length = at;
|
|
397
402
|
}
|
|
398
403
|
if (resolved.waiting) {
|
|
399
|
-
const kept = set.length ? {
|
|
404
|
+
const kept = { ...n, ...(set.length ? { set } : {}), [WAITING]: true };
|
|
400
405
|
const known = origin.get(n);
|
|
401
|
-
if (
|
|
406
|
+
if (known)
|
|
402
407
|
origin.set(kept, known);
|
|
408
|
+
opts.onCopy?.(n, kept);
|
|
403
409
|
out.push(kept);
|
|
404
410
|
return;
|
|
405
411
|
}
|
|
@@ -604,6 +610,8 @@ const assembleIncludes = (tree, opts) => {
|
|
|
604
610
|
const copy = {};
|
|
605
611
|
for (const key of Object.keys(node))
|
|
606
612
|
copy[key] = key === 'location' ? node[key] : copyDeep(node[key]);
|
|
613
|
+
if (node[WAITING])
|
|
614
|
+
copy[WAITING] = true;
|
|
607
615
|
const known = origin.get(node);
|
|
608
616
|
if (known)
|
|
609
617
|
origin.set(copy, known);
|
|
@@ -613,6 +621,28 @@ const assembleIncludes = (tree, opts) => {
|
|
|
613
621
|
// A block placed as its file reads on its own, and where it was found: the
|
|
614
622
|
// files read with the settings at the directive do not hold it.
|
|
615
623
|
const readAlone = new WeakMap();
|
|
624
|
+
// An inclusion brings blocks: a directive that stands among them, outside
|
|
625
|
+
// every block it brings, stays behind. Only the wrappers the tree adds are
|
|
626
|
+
// walked; a block keeps what is written in it. An include that waits for a
|
|
627
|
+
// later pass is not yet a directive left behind: it stays to be resolved.
|
|
628
|
+
const withoutLooseDirectives = (nodes) => nodes.flatMap(node => {
|
|
629
|
+
if ((0, schema_1.isDirectiveNode)(node) && (node.name !== 'include' || failedAt.has(node)))
|
|
630
|
+
return [];
|
|
631
|
+
if (!(0, schema_1.isWrapper)(node) || !Array.isArray(node.content))
|
|
632
|
+
return [node];
|
|
633
|
+
const content = withoutLooseDirectives(node.content);
|
|
634
|
+
if (content.length === node.content.length && content.every((n, i) => n === node.content[i]))
|
|
635
|
+
return [node];
|
|
636
|
+
const copy = { ...node, content };
|
|
637
|
+
const known = origin.get(node);
|
|
638
|
+
if (known)
|
|
639
|
+
origin.set(copy, known);
|
|
640
|
+
const alone = readAlone.get(node);
|
|
641
|
+
if (alone)
|
|
642
|
+
readAlone.set(copy, alone);
|
|
643
|
+
opts.onCopy?.(node, copy);
|
|
644
|
+
return [copy];
|
|
645
|
+
});
|
|
616
646
|
const isToc = (node) => node && typeof node === 'object' && node.type === 'block' && (node.name === 'toc' || node.name === 'Toc');
|
|
617
647
|
// A table of contents is built while its file is parsed, before the includes
|
|
618
648
|
// of that file are in. The tables written in an included file are built again
|
|
@@ -689,7 +719,18 @@ const assembleIncludes = (tree, opts) => {
|
|
|
689
719
|
const line = (0, schema_1.getTextContentFromNode)(node.content)?.toString().trim() ?? '';
|
|
690
720
|
const split = splitDirective(line);
|
|
691
721
|
const selector = split.selector;
|
|
692
|
-
|
|
722
|
+
let parsed;
|
|
723
|
+
let reason = '';
|
|
724
|
+
if (selector && !split.unread) {
|
|
725
|
+
try {
|
|
726
|
+
parsed = (0, schema_1.readSelector)(selector);
|
|
727
|
+
}
|
|
728
|
+
catch (e) {
|
|
729
|
+
if (!(e instanceof schema_1.SelectorError))
|
|
730
|
+
throw e;
|
|
731
|
+
reason = `: ${e.message}`;
|
|
732
|
+
}
|
|
733
|
+
}
|
|
693
734
|
if (parsed?.anchor)
|
|
694
735
|
reached[reached.length - 1] = true;
|
|
695
736
|
// The directive stays in the tree as before when its selector is not read;
|
|
@@ -700,7 +741,7 @@ const assembleIncludes = (tree, opts) => {
|
|
|
700
741
|
return fail({
|
|
701
742
|
kind: 'unparsed-selector',
|
|
702
743
|
target: line,
|
|
703
|
-
message: `include selector cannot be read: ${line || '(empty)'}`,
|
|
744
|
+
message: `include selector cannot be read: ${line || '(empty)'}${reason}`,
|
|
704
745
|
chain: here,
|
|
705
746
|
}, true);
|
|
706
747
|
}
|
|
@@ -963,11 +1004,50 @@ const assembleIncludes = (tree, opts) => {
|
|
|
963
1004
|
},
|
|
964
1005
|
];
|
|
965
1006
|
};
|
|
1007
|
+
// An include that waits for a later pass stands for blocks not yet known. The
|
|
1008
|
+
// universal pattern without a predicate would find every one of them, so the
|
|
1009
|
+
// include stays where it is written, among the found blocks; under other
|
|
1010
|
+
// patterns the selection may come out short of what it brings, and that is
|
|
1011
|
+
// said. One inside a found block comes with that block.
|
|
1012
|
+
const withWaiting = (found) => {
|
|
1013
|
+
const chosen = new Set(found);
|
|
1014
|
+
const merged = [];
|
|
1015
|
+
let short = false;
|
|
1016
|
+
const visit = (node, open) => {
|
|
1017
|
+
if (!node || typeof node !== 'object')
|
|
1018
|
+
return;
|
|
1019
|
+
if (Array.isArray(node))
|
|
1020
|
+
return node.forEach(n => visit(n, open));
|
|
1021
|
+
if (chosen.has(node))
|
|
1022
|
+
return void merged.push(node);
|
|
1023
|
+
if (node[WAITING]) {
|
|
1024
|
+
short = true;
|
|
1025
|
+
if (open)
|
|
1026
|
+
merged.push(node);
|
|
1027
|
+
return;
|
|
1028
|
+
}
|
|
1029
|
+
if (node.content !== undefined)
|
|
1030
|
+
visit(node.content, open && (0, schema_1.isWrapper)(node));
|
|
1031
|
+
};
|
|
1032
|
+
docs.forEach(doc => visit(doc.node, true));
|
|
1033
|
+
if (!short)
|
|
1034
|
+
return found;
|
|
1035
|
+
if (!parsed.patterns.some(pattern => pattern.blockType === '*' && !pattern.predicate)) {
|
|
1036
|
+
report({
|
|
1037
|
+
kind: 'incomplete-selection',
|
|
1038
|
+
target: selector,
|
|
1039
|
+
message: `include selection may be incomplete until an include in its source resolves: ${selector}`,
|
|
1040
|
+
chain: here,
|
|
1041
|
+
});
|
|
1042
|
+
return found;
|
|
1043
|
+
}
|
|
1044
|
+
return merged.filter(node => chosen.has(node)).length === found.length ? merged : found;
|
|
1045
|
+
};
|
|
966
1046
|
try {
|
|
967
1047
|
const found = (0, schema_1.outermost)(keepBlocks((0, schema_1.runSelector)(selector, docs, { home: [{ file, node: asDocument(home) }], readSource })));
|
|
968
1048
|
if (operandWaits)
|
|
969
1049
|
return wait();
|
|
970
|
-
return done(placedFor(found));
|
|
1050
|
+
return done(withoutLooseDirectives(placedFor(withWaiting(found))));
|
|
971
1051
|
}
|
|
972
1052
|
catch (e) {
|
|
973
1053
|
if (!(e instanceof schema_1.SelectorError))
|