podlite 0.0.97 → 0.0.98
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 +28 -0
- package/esm/assemble/index.js +5 -4
- package/esm/assemble/index.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 +19 -8
- package/esm/lint/rules/dead-definitions.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/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/unclosed-markup-code.js +46 -10
- package/esm/lint/rules/unclosed-markup-code.js.map +1 -1
- package/esm/version.d.ts +1 -1
- package/esm/version.js +1 -1
- package/lib/assemble/index.js +5 -4
- package/lib/assemble/index.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 +19 -8
- package/lib/lint/rules/dead-definitions.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/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/unclosed-markup-code.js +46 -10
- package/lib/lint/rules/unclosed-markup-code.js.map +1 -1
- package/lib/version.d.ts +1 -1
- package/lib/version.js +1 -1
- package/package.json +7 -7
|
@@ -5,13 +5,16 @@ const attr = (node, name) => {
|
|
|
5
5
|
return item && item.value !== undefined && item.value !== null ? String(item.value) : undefined;
|
|
6
6
|
};
|
|
7
7
|
// 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
|
-
|
|
8
|
+
// a warning that cannot say where is a warning the author cannot act on. The
|
|
9
|
+
// source is read once for all aliases, and the first line declaring a name wins.
|
|
10
|
+
const aliasLines = (source) => {
|
|
11
|
+
const lines = new Map();
|
|
12
|
+
source.split(/\r?\n/).forEach((line, at) => {
|
|
13
|
+
const found = /^\s*=alias\s+(\S+)(\s|$)/.exec(line);
|
|
14
|
+
if (found && !lines.has(found[1]))
|
|
15
|
+
lines.set(found[1], at + 1);
|
|
16
|
+
});
|
|
17
|
+
return lines;
|
|
15
18
|
};
|
|
16
19
|
const definitions = (ast) => {
|
|
17
20
|
const nodes = getFromTree(ast, () => true);
|
|
@@ -65,6 +68,14 @@ export const deadDefinitionsRule = {
|
|
|
65
68
|
return [];
|
|
66
69
|
const aliases = aliasUses(ast);
|
|
67
70
|
const keys = dataUses(ctx.source || '');
|
|
71
|
+
let lines;
|
|
72
|
+
const aliasLine = (name) => {
|
|
73
|
+
lines = lines || aliasLines(ctx.source || '');
|
|
74
|
+
const line = lines.get(name);
|
|
75
|
+
return line === undefined
|
|
76
|
+
? undefined
|
|
77
|
+
: { start: { line, column: 1, offset: 0 }, end: { line, column: 1, offset: 0 } };
|
|
78
|
+
};
|
|
68
79
|
return declared
|
|
69
80
|
.filter(item => !(item.kind === 'alias' ? aliases.has(item.name) : keys.has(item.name)))
|
|
70
81
|
.map(item => ({
|
|
@@ -73,7 +84,7 @@ export const deadDefinitionsRule = {
|
|
|
73
84
|
message: item.kind === 'alias'
|
|
74
85
|
? `=alias ${item.name} is never used; A<${item.name}> appears nowhere in the document`
|
|
75
86
|
: `=data :key<${item.name}> is never used; data:${item.name} appears nowhere in the document`,
|
|
76
|
-
location: item.location || (item.kind === 'alias' ? aliasLine(
|
|
87
|
+
location: item.location || (item.kind === 'alias' ? aliasLine(item.name) : undefined),
|
|
77
88
|
}));
|
|
78
89
|
},
|
|
79
90
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dead-definitions.js","sourceRoot":"","sources":["../../../src/lint/rules/dead-definitions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,sBAAsB,EAAmB,MAAM,iBAAiB,CAAA;AAGtF,MAAM,CAAC,MAAM,wBAAwB,GAAG,kBAAkB,CAAA;AAY1D,MAAM,IAAI,GAAG,CAAC,IAAa,EAAE,IAAY,EAAsB,EAAE;IAC/D,MAAM,IAAI,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,CAAA;IAC5F,OAAO,IAAI,IAAI,IAAI,CAAC,KAAK,KAAK,SAAS,IAAI,IAAI,CAAC,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;AACjG,CAAC,CAAA;AAED,+EAA+E;AAC/E,
|
|
1
|
+
{"version":3,"file":"dead-definitions.js","sourceRoot":"","sources":["../../../src/lint/rules/dead-definitions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,sBAAsB,EAAmB,MAAM,iBAAiB,CAAA;AAGtF,MAAM,CAAC,MAAM,wBAAwB,GAAG,kBAAkB,CAAA;AAY1D,MAAM,IAAI,GAAG,CAAC,IAAa,EAAE,IAAY,EAAsB,EAAE;IAC/D,MAAM,IAAI,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,CAAA;IAC5F,OAAO,IAAI,IAAI,IAAI,CAAC,KAAK,KAAK,SAAS,IAAI,IAAI,CAAC,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;AACjG,CAAC,CAAA;AAED,+EAA+E;AAC/E,6EAA6E;AAC7E,iFAAiF;AACjF,MAAM,UAAU,GAAG,CAAC,MAAc,EAAuB,EAAE;IACzD,MAAM,KAAK,GAAG,IAAI,GAAG,EAAkB,CAAA;IACvC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,EAAE,EAAE;QACzC,MAAM,KAAK,GAAG,0BAA0B,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACnD,IAAI,KAAK,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YAAE,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC,CAAA;IAChE,CAAC,CAAC,CAAA;IACF,OAAO,KAAK,CAAA;AACd,CAAC,CAAA;AAED,MAAM,WAAW,GAAG,CAAC,GAAoB,EAAgB,EAAE;IACzD,MAAM,KAAK,GAAG,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,IAAI,CAAc,CAAA;IACvD,MAAM,KAAK,GAAiB,EAAE,CAAA;IAC9B,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;YACvC,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAA;YACvE,SAAQ;QACV,CAAC;QACD,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;YACzB,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAA;YAC7B,IAAI,GAAG;gBAAE,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAA;QAC3E,CAAC;IACH,CAAC;IACD,OAAO,KAAK,CAAA;AACd,CAAC,CAAA;AAED,MAAM,SAAS,GAAG,CAAC,GAAoB,EAAe,EAAE;IACtD,MAAM,KAAK,GAAG,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,IAAI,CAAc,CAAA;IACvD,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAA;IAC9B,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO,IAAI,IAAI,CAAC,IAAI,KAAK,GAAG;YAAE,SAAQ;QACxD,MAAM,IAAI,GAAG,sBAAsB,CAAC,IAAa,CAAC;YAChD,EAAE,QAAQ,EAAE;aACX,IAAI,EAAE,CAAA;QACT,IAAI,IAAI;YAAE,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;IAC1B,CAAC;IACD,OAAO,IAAI,CAAA;AACb,CAAC,CAAA;AAED,gFAAgF;AAChF,6EAA6E;AAC7E,yDAAyD;AACzD,MAAM,QAAQ,GAAG,CAAC,MAAc,EAAe,EAAE;IAC/C,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAA;IAC9B,MAAM,SAAS,GAAG,wBAAwB,CAAA;IAC1C,IAAI,KAA6B,CAAA;IACjC,OAAO,CAAC,KAAK,GAAG,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,KAAK,IAAI;QAAE,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;IACpE,OAAO,IAAI,CAAA;AACb,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,mBAAmB,GAAS;IACvC,EAAE,EAAE,wBAAwB;IAC5B,QAAQ,EAAE,SAAS;IACnB,KAAK,EAAE,CAAC,GAAoB,EAAE,GAAgB,EAAe,EAAE;QAC7D,4EAA4E;QAC5E,+DAA+D;QAC/D,MAAM,QAAQ,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,OAAO,IAAI,GAAG,CAAC,MAAM,KAAK,SAAS,CAAC,CAAA;QACnG,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,EAAE,CAAA;QAEpC,MAAM,OAAO,GAAG,SAAS,CAAC,GAAG,CAAC,CAAA;QAC9B,MAAM,IAAI,GAAG,QAAQ,CAAC,GAAG,CAAC,MAAM,IAAI,EAAE,CAAC,CAAA;QACvC,IAAI,KAAsC,CAAA;QAC1C,MAAM,SAAS,GAAG,CAAC,IAAY,EAAqC,EAAE;YACpE,KAAK,GAAG,KAAK,IAAI,UAAU,CAAC,GAAG,CAAC,MAAM,IAAI,EAAE,CAAC,CAAA;YAC7C,MAAM,IAAI,GAAG,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;YAC5B,OAAO,IAAI,KAAK,SAAS;gBACvB,CAAC,CAAC,SAAS;gBACX,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,EAAE,CAAA;QACpF,CAAC,CAAA;QAED,OAAO,QAAQ;aACZ,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;aACvF,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACZ,IAAI,EAAE,wBAAwB;YAC9B,QAAQ,EAAE,SAAkB;YAC5B,OAAO,EACL,IAAI,CAAC,IAAI,KAAK,OAAO;gBACnB,CAAC,CAAC,UAAU,IAAI,CAAC,IAAI,qBAAqB,IAAI,CAAC,IAAI,mCAAmC;gBACtF,CAAC,CAAC,cAAc,IAAI,CAAC,IAAI,yBAAyB,IAAI,CAAC,IAAI,kCAAkC;YACjG,QAAQ,EAAE,IAAI,CAAC,QAAQ,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;SACtF,CAAC,CAAC,CAAA;IACP,CAAC;CACF,CAAA"}
|
package/esm/lint/rules/index.js
CHANGED
|
@@ -17,6 +17,7 @@ import { includeResolvesRule } from './include-resolves.js';
|
|
|
17
17
|
import { directiveNamedBlockRule, imageNamedBlockRule } from './named-blocks.js';
|
|
18
18
|
import { notifyAttributeRule } from './notify-attribute.js';
|
|
19
19
|
import { tocTitleAttributeRule } from './toc-title-attribute.js';
|
|
20
|
+
import { allowValueRule } from './allow-value.js';
|
|
20
21
|
export const DEFAULT_RULES = [
|
|
21
22
|
syntaxValidRule,
|
|
22
23
|
headingHierarchyRule,
|
|
@@ -38,5 +39,6 @@ export const DEFAULT_RULES = [
|
|
|
38
39
|
imageNamedBlockRule,
|
|
39
40
|
notifyAttributeRule,
|
|
40
41
|
tocTitleAttributeRule,
|
|
42
|
+
allowValueRule,
|
|
41
43
|
];
|
|
42
44
|
//# 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,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,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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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { isVerbatimBlock } from '@podlite/schema';
|
|
2
|
+
import { lineStarts, placeAtLine } from '../line-starts.js';
|
|
2
3
|
export const MARKDOWN_IN_POD_RULE_ID = 'markdown-in-pod';
|
|
3
4
|
export const markdownInPodRule = {
|
|
4
5
|
id: MARKDOWN_IN_POD_RULE_ID,
|
|
@@ -12,27 +13,59 @@ const FOREIGN = [
|
|
|
12
13
|
},
|
|
13
14
|
{ test: /\*\*[^*\s](?:[^*]*[^*\s])?\*\*/, says: 'a pair of asterisks is text here; bold is written as B<>' },
|
|
14
15
|
];
|
|
16
|
+
// A lone # as the first word of an item, a heading or a definition numbers it, and
|
|
17
|
+
// with :!numbered it is a literal #; either way it is not a Markdown heading.
|
|
18
|
+
const NUMBERABLE = /^(item\d*|head\d*|defn)$/;
|
|
19
|
+
const LONE_HASH = /^\s*#(\s|$)/;
|
|
20
|
+
// directives that set things up and add no text of their own
|
|
21
|
+
const SETUP = /^\s*=(config|alias|set)\b/;
|
|
15
22
|
// Talk about Markdown is legal: a line whose construct sits inside an inline
|
|
16
23
|
// code span is showing the markup, not using it.
|
|
17
24
|
const insideCode = (line) => /C<[^>]*>/.test(line) || /`[^`]+`/.test(line);
|
|
18
25
|
export function scanMarkdownInPod(content) {
|
|
19
26
|
const lines = content.split(/\r?\n/);
|
|
27
|
+
const starts = lineStarts(content);
|
|
20
28
|
const open = [];
|
|
21
29
|
const violations = [];
|
|
22
30
|
let abbreviatedTable = false;
|
|
31
|
+
// the first word of a numberable block is still to come: in a delimited block blank
|
|
32
|
+
// lines and setup directives come before it, in the other forms they end the block
|
|
33
|
+
let awaiting = null;
|
|
23
34
|
for (let i = 0; i < lines.length; i++) {
|
|
24
35
|
const line = lines[i];
|
|
25
36
|
const end = line.match(/^\s*=end\s+([\w-]+)/);
|
|
26
37
|
if (end) {
|
|
38
|
+
awaiting = null;
|
|
39
|
+
// a short table inside a block ends with the block
|
|
40
|
+
abbreviatedTable = false;
|
|
27
41
|
open.pop();
|
|
28
42
|
continue;
|
|
29
43
|
}
|
|
30
44
|
const begin = line.match(/^\s*=begin\s+([\w-]+)/);
|
|
31
45
|
if (begin) {
|
|
46
|
+
awaiting = NUMBERABLE.test(begin[1]) ? 'delimited' : null;
|
|
32
47
|
open.push(begin[1]);
|
|
33
48
|
abbreviatedTable = false;
|
|
34
49
|
continue;
|
|
35
50
|
}
|
|
51
|
+
// a continuation line belongs to the directive above it
|
|
52
|
+
if (awaiting && /^\s*=(\s|$)/.test(line))
|
|
53
|
+
continue;
|
|
54
|
+
if (awaiting === 'delimited' && SETUP.test(line))
|
|
55
|
+
continue;
|
|
56
|
+
if (/^\s*=/.test(line)) {
|
|
57
|
+
const marker = line.match(/^\s*=(?:for\s+)?([\w-]+)(.*)$/);
|
|
58
|
+
const named = marker ? marker[1] : '';
|
|
59
|
+
const shortForm = !/^\s*=for\s/.test(line);
|
|
60
|
+
awaiting = marker && NUMBERABLE.test(named) && (!shortForm || marker[2].trim() === '') ? 'paragraph' : null;
|
|
61
|
+
}
|
|
62
|
+
else if (line.trim() === '') {
|
|
63
|
+
if (awaiting === 'paragraph')
|
|
64
|
+
awaiting = null;
|
|
65
|
+
}
|
|
66
|
+
const first = awaiting !== null && line.trim() !== '' && !/^\s*=/.test(line);
|
|
67
|
+
if (first)
|
|
68
|
+
awaiting = null;
|
|
36
69
|
// a dash separator belongs to a table written the short way too, and that
|
|
37
70
|
// block runs to the first blank line
|
|
38
71
|
if (/^\s*=(?:for\s+)?table\b/.test(line)) {
|
|
@@ -50,14 +83,13 @@ export function scanMarkdownInPod(content) {
|
|
|
50
83
|
for (const foreign of FOREIGN) {
|
|
51
84
|
if (!foreign.test.test(line))
|
|
52
85
|
continue;
|
|
86
|
+
if (first && foreign === FOREIGN[0] && LONE_HASH.test(line))
|
|
87
|
+
continue;
|
|
53
88
|
violations.push({
|
|
54
89
|
rule: MARKDOWN_IN_POD_RULE_ID,
|
|
55
90
|
severity: 'warning',
|
|
56
91
|
message: foreign.says,
|
|
57
|
-
location:
|
|
58
|
-
start: { line: i + 1, column: 1, offset: 0 },
|
|
59
|
-
end: { line: i + 1, column: 1, offset: 0 },
|
|
60
|
-
},
|
|
92
|
+
location: placeAtLine(starts, i + 1),
|
|
61
93
|
});
|
|
62
94
|
break;
|
|
63
95
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"markdown-in-pod.js","sourceRoot":"","sources":["../../../src/lint/rules/markdown-in-pod.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;
|
|
1
|
+
{"version":3,"file":"markdown-in-pod.js","sourceRoot":"","sources":["../../../src/lint/rules/markdown-in-pod.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { isVerbatimBlock } from '@podlite/schema';
|
|
2
|
+
import { lineStarts, placeAtLine } from '../line-starts.js';
|
|
2
3
|
export const UNCLOSED_MARKUP_CODE_RULE_ID = 'unclosed-markup-code';
|
|
3
4
|
export const unclosedMarkupCodeRule = {
|
|
4
5
|
id: UNCLOSED_MARKUP_CODE_RULE_ID,
|
|
@@ -21,15 +22,42 @@ export const unclosedMarkupCodeRule = {
|
|
|
21
22
|
// code written inside a doubled one reads as unclosed, and correct markup gets
|
|
22
23
|
// reported — the worse of the two.
|
|
23
24
|
const OPENER = /(^|[^A-Za-z])([A-Z])(<+|«)/g;
|
|
25
|
+
// For each length of a run of closing brackets, the last place a closer of that
|
|
26
|
+
// length can start: a code opened with N brackets is closed if one starts after it.
|
|
27
|
+
// Built once per fragment, so a long paragraph is not searched again for every code.
|
|
28
|
+
const lastCloserStarts = (text) => {
|
|
29
|
+
const bestEnd = [-1, -1];
|
|
30
|
+
let at = 0;
|
|
31
|
+
while (at < text.length) {
|
|
32
|
+
if (text.charCodeAt(at) !== 62) {
|
|
33
|
+
at++;
|
|
34
|
+
continue;
|
|
35
|
+
}
|
|
36
|
+
const start = at;
|
|
37
|
+
while (at < text.length && text.charCodeAt(at) === 62)
|
|
38
|
+
at++;
|
|
39
|
+
const length = at - start;
|
|
40
|
+
while (bestEnd.length < length + 2)
|
|
41
|
+
bestEnd.push(-1);
|
|
42
|
+
bestEnd[length] = Math.max(bestEnd[length], at);
|
|
43
|
+
}
|
|
44
|
+
// a longer run holds every shorter closer, ending where it ends
|
|
45
|
+
for (let length = bestEnd.length - 2; length >= 1; length--) {
|
|
46
|
+
bestEnd[length] = Math.max(bestEnd[length], bestEnd[length + 1]);
|
|
47
|
+
}
|
|
48
|
+
return bestEnd.map((end, length) => (end === -1 ? -1 : end - length));
|
|
49
|
+
};
|
|
24
50
|
const unclosed = (text) => {
|
|
25
51
|
const missing = [];
|
|
52
|
+
const closerStarts = lastCloserStarts(text);
|
|
53
|
+
const lastGuillemet = text.lastIndexOf('»');
|
|
26
54
|
let match;
|
|
27
55
|
OPENER.lastIndex = 0;
|
|
28
56
|
while ((match = OPENER.exec(text)) !== null) {
|
|
29
57
|
const [whole, before, name, open] = match;
|
|
30
|
-
const
|
|
31
|
-
const
|
|
32
|
-
if (
|
|
58
|
+
const from = match.index + whole.length;
|
|
59
|
+
const closer = open === '«' ? lastGuillemet : closerStarts[open.length] ?? -1;
|
|
60
|
+
if (closer < from) {
|
|
33
61
|
missing.push({ name, at: match.index + before.length });
|
|
34
62
|
}
|
|
35
63
|
}
|
|
@@ -37,7 +65,9 @@ const unclosed = (text) => {
|
|
|
37
65
|
};
|
|
38
66
|
export function scanUnclosedMarkupCodes(content) {
|
|
39
67
|
const lines = content.split(/\r?\n/);
|
|
68
|
+
const starts = lineStarts(content);
|
|
40
69
|
const open = [];
|
|
70
|
+
let verbatimOpen = 0;
|
|
41
71
|
const violations = [];
|
|
42
72
|
let chunk = null;
|
|
43
73
|
let inAbbreviatedVerbatim = false;
|
|
@@ -45,17 +75,19 @@ export function scanUnclosedMarkupCodes(content) {
|
|
|
45
75
|
if (!chunk)
|
|
46
76
|
return;
|
|
47
77
|
const at = chunk;
|
|
78
|
+
// the codes come in order, so the line is counted on from the one before
|
|
79
|
+
let line = at.line;
|
|
80
|
+
let counted = 0;
|
|
48
81
|
for (const found of unclosed(at.text)) {
|
|
49
82
|
const name = found.name;
|
|
50
|
-
|
|
83
|
+
for (; counted < found.at; counted++)
|
|
84
|
+
if (at.text.charCodeAt(counted) === 10)
|
|
85
|
+
line++;
|
|
51
86
|
violations.push({
|
|
52
87
|
rule: UNCLOSED_MARKUP_CODE_RULE_ID,
|
|
53
88
|
severity: 'warning',
|
|
54
89
|
message: `${name}<> is closed by the end of the block, not by its own bracket; the text goes out as written`,
|
|
55
|
-
location:
|
|
56
|
-
start: { line, column: 1, offset: 0 },
|
|
57
|
-
end: { line, column: 1, offset: 0 },
|
|
58
|
-
},
|
|
90
|
+
location: placeAtLine(starts, line),
|
|
59
91
|
});
|
|
60
92
|
}
|
|
61
93
|
chunk = null;
|
|
@@ -65,7 +97,9 @@ export function scanUnclosedMarkupCodes(content) {
|
|
|
65
97
|
if (/^\s*=end\s+[\w-]+/.test(line)) {
|
|
66
98
|
close();
|
|
67
99
|
inAbbreviatedVerbatim = false;
|
|
68
|
-
open.pop();
|
|
100
|
+
const closed = open.pop();
|
|
101
|
+
if (closed !== undefined && isVerbatimBlock(closed))
|
|
102
|
+
verbatimOpen--;
|
|
69
103
|
continue;
|
|
70
104
|
}
|
|
71
105
|
const begin = line.match(/^\s*=begin\s+([\w-]+)/);
|
|
@@ -73,9 +107,11 @@ export function scanUnclosedMarkupCodes(content) {
|
|
|
73
107
|
close();
|
|
74
108
|
inAbbreviatedVerbatim = false;
|
|
75
109
|
open.push(begin[1]);
|
|
110
|
+
if (isVerbatimBlock(begin[1]))
|
|
111
|
+
verbatimOpen++;
|
|
76
112
|
continue;
|
|
77
113
|
}
|
|
78
|
-
if (
|
|
114
|
+
if (verbatimOpen > 0)
|
|
79
115
|
continue;
|
|
80
116
|
// a directive starts a chunk of its own; a blank line ends the one running
|
|
81
117
|
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":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;
|
|
1
|
+
{"version":3,"file":"unclosed-markup-code.js","sourceRoot":"","sources":["../../../src/lint/rules/unclosed-markup-code.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAEjD,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAExD,MAAM,CAAC,MAAM,4BAA4B,GAAG,sBAAsB,CAAA;AAElE,MAAM,CAAC,MAAM,sBAAsB,GAAe;IAChD,EAAE,EAAE,4BAA4B;IAChC,QAAQ,EAAE,SAAS;CACpB,CAAA;AAED,gFAAgF;AAChF,2EAA2E;AAC3E,8EAA8E;AAC9E,uEAAuE;AACvE,EAAE;AACF,gFAAgF;AAChF,wEAAwE;AACxE,6EAA6E;AAC7E,6EAA6E;AAC7E,2EAA2E;AAC3E,EAAE;AACF,gFAAgF;AAChF,4EAA4E;AAC5E,gFAAgF;AAChF,+EAA+E;AAC/E,mCAAmC;AACnC,MAAM,MAAM,GAAG,6BAA6B,CAAA;AAE5C,gFAAgF;AAChF,oFAAoF;AACpF,qFAAqF;AACrF,MAAM,gBAAgB,GAAG,CAAC,IAAY,EAAY,EAAE;IAClD,MAAM,OAAO,GAAa,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;IAClC,IAAI,EAAE,GAAG,CAAC,CAAA;IACV,OAAO,EAAE,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;QACxB,IAAI,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC;YAC/B,EAAE,EAAE,CAAA;YACJ,SAAQ;QACV,CAAC;QACD,MAAM,KAAK,GAAG,EAAE,CAAA;QAChB,OAAO,EAAE,GAAG,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,KAAK,EAAE;YAAE,EAAE,EAAE,CAAA;QAC3D,MAAM,MAAM,GAAG,EAAE,GAAG,KAAK,CAAA;QACzB,OAAO,OAAO,CAAC,MAAM,GAAG,MAAM,GAAG,CAAC;YAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA;QACpD,OAAO,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC,CAAA;IACjD,CAAC;IACD,gEAAgE;IAChE,KAAK,IAAI,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,MAAM,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC;QAC5D,OAAO,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAA;IAClE,CAAC;IACD,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,MAAM,CAAC,CAAC,CAAA;AACvE,CAAC,CAAA;AAED,MAAM,QAAQ,GAAG,CAAC,IAAY,EAAuC,EAAE;IACrE,MAAM,OAAO,GAAwC,EAAE,CAAA;IACvD,MAAM,YAAY,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAA;IAC3C,MAAM,aAAa,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAA;IAC3C,IAAI,KAA6B,CAAA;IACjC,MAAM,CAAC,SAAS,GAAG,CAAC,CAAA;IACpB,OAAO,CAAC,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;QAC5C,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,GAAG,KAAK,CAAA;QACzC,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC,MAAM,CAAA;QACvC,MAAM,MAAM,GAAG,IAAI,KAAK,GAAG,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAA;QAC7E,IAAI,MAAM,GAAG,IAAI,EAAE,CAAC;YAClB,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,KAAK,CAAC,KAAK,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,CAAA;QACzD,CAAC;IACH,CAAC;IACD,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA;AAID,MAAM,UAAU,uBAAuB,CAAC,OAAe;IACrD,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;IACpC,MAAM,MAAM,GAAG,UAAU,CAAC,OAAO,CAAC,CAAA;IAClC,MAAM,IAAI,GAAa,EAAE,CAAA;IACzB,IAAI,YAAY,GAAG,CAAC,CAAA;IACpB,MAAM,UAAU,GAAgB,EAAE,CAAA;IAClC,IAAI,KAAK,GAAiB,IAAI,CAAA;IAC9B,IAAI,qBAAqB,GAAG,KAAK,CAAA;IAEjC,MAAM,KAAK,GAAG,GAAG,EAAE;QACjB,IAAI,CAAC,KAAK;YAAE,OAAM;QAClB,MAAM,EAAE,GAAG,KAAK,CAAA;QAChB,yEAAyE;QACzE,IAAI,IAAI,GAAG,EAAE,CAAC,IAAI,CAAA;QAClB,IAAI,OAAO,GAAG,CAAC,CAAA;QACf,KAAK,MAAM,KAAK,IAAI,QAAQ,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;YACtC,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAA;YACvB,OAAO,OAAO,GAAG,KAAK,CAAC,EAAE,EAAE,OAAO,EAAE;gBAAE,IAAI,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,KAAK,EAAE;oBAAE,IAAI,EAAE,CAAA;YACpF,UAAU,CAAC,IAAI,CAAC;gBACd,IAAI,EAAE,4BAA4B;gBAClC,QAAQ,EAAE,SAAS;gBACnB,OAAO,EAAE,GAAG,IAAI,4FAA4F;gBAC5G,QAAQ,EAAE,WAAW,CAAC,MAAM,EAAE,IAAI,CAAC;aACpC,CAAC,CAAA;QACJ,CAAC;QACD,KAAK,GAAG,IAAI,CAAA;IACd,CAAC,CAAA;IAED,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACtC,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAA;QAErB,IAAI,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YACnC,KAAK,EAAE,CAAA;YACP,qBAAqB,GAAG,KAAK,CAAA;YAC7B,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;YACzB,IAAI,MAAM,KAAK,SAAS,IAAI,eAAe,CAAC,MAAM,CAAC;gBAAE,YAAY,EAAE,CAAA;YACnE,SAAQ;QACV,CAAC;QACD,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAA;QACjD,IAAI,KAAK,EAAE,CAAC;YACV,KAAK,EAAE,CAAA;YACP,qBAAqB,GAAG,KAAK,CAAA;YAC7B,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;YACnB,IAAI,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gBAAE,YAAY,EAAE,CAAA;YAC7C,SAAQ;QACV,CAAC;QACD,IAAI,YAAY,GAAG,CAAC;YAAE,SAAQ;QAE9B,2EAA2E;QAC3E,IAAI,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YACvB,KAAK,EAAE,CAAA;YACP,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAA;YACpD,iEAAiE;YACjE,qBAAqB,GAAG,OAAO,CAAC,KAAK,IAAI,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;YACnE,IAAI,CAAC,qBAAqB;gBAAE,KAAK,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,GAAG,CAAC,EAAE,CAAA;YAC/D,SAAQ;QACV,CAAC;QACD,IAAI,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;YACvB,KAAK,EAAE,CAAA;YACP,qBAAqB,GAAG,KAAK,CAAA;YAC7B,SAAQ;QACV,CAAC;QACD,IAAI,qBAAqB;YAAE,SAAQ;QACnC,IAAI,KAAK;YAAE,KAAK,CAAC,IAAI,IAAI,IAAI,GAAG,IAAI,CAAA;;YAC/B,KAAK,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,GAAG,CAAC,EAAE,CAAA;IAC1C,CAAC;IACD,KAAK,EAAE,CAAA;IAEP,OAAO,UAAU,CAAA;AACnB,CAAC"}
|
package/esm/version.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export declare const version = "0.0.
|
|
1
|
+
export declare const version = "0.0.98";
|
package/esm/version.js
CHANGED
package/lib/assemble/index.js
CHANGED
|
@@ -290,10 +290,11 @@ const assembleIncludes = (tree, opts) => {
|
|
|
290
290
|
}
|
|
291
291
|
const slot = slots[0];
|
|
292
292
|
const at = slot ? held.indexOf(slot) : -1;
|
|
293
|
-
|
|
294
|
-
|
|
295
|
-
|
|
296
|
-
|
|
293
|
+
const tail = at >= 0 ? held.splice(at) : [];
|
|
294
|
+
for (const entry of entries)
|
|
295
|
+
held.push(entry);
|
|
296
|
+
for (const entry of tail)
|
|
297
|
+
held.push(entry);
|
|
297
298
|
};
|
|
298
299
|
const report = (problem) => hold([{ problem, shown: true }]);
|
|
299
300
|
const flush = () => {
|