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.
Files changed (90) hide show
  1. package/CHANGELOG.podlite +38 -0
  2. package/esm/assemble/index.d.ts +5 -0
  3. package/esm/assemble/index.js +6 -5
  4. package/esm/assemble/index.js.map +1 -1
  5. package/esm/cli.js +3 -0
  6. package/esm/cli.js.map +1 -1
  7. package/esm/lint/grammar/lint.js +47 -22
  8. package/esm/lint/grammar/lint.js.map +1 -1
  9. package/esm/lint/grammar/scan.js +6 -3
  10. package/esm/lint/grammar/scan.js.map +1 -1
  11. package/esm/lint/implicit-code.d.ts +3 -0
  12. package/esm/lint/implicit-code.js +83 -0
  13. package/esm/lint/implicit-code.js.map +1 -0
  14. package/esm/lint/index.js +4 -2
  15. package/esm/lint/index.js.map +1 -1
  16. package/esm/lint/line-starts.d.ts +3 -0
  17. package/esm/lint/line-starts.js +14 -0
  18. package/esm/lint/line-starts.js.map +1 -0
  19. package/esm/lint/rules/abbreviated-attrs.js +6 -4
  20. package/esm/lint/rules/abbreviated-attrs.js.map +1 -1
  21. package/esm/lint/rules/allow-value.d.ts +3 -0
  22. package/esm/lint/rules/allow-value.js +42 -0
  23. package/esm/lint/rules/allow-value.js.map +1 -0
  24. package/esm/lint/rules/dead-definitions.js +117 -22
  25. package/esm/lint/rules/dead-definitions.js.map +1 -1
  26. package/esm/lint/rules/index.js +6 -0
  27. package/esm/lint/rules/index.js.map +1 -1
  28. package/esm/lint/rules/link-targets.js +8 -2
  29. package/esm/lint/rules/link-targets.js.map +1 -1
  30. package/esm/lint/rules/markdown-in-pod.js +36 -4
  31. package/esm/lint/rules/markdown-in-pod.js.map +1 -1
  32. package/esm/lint/rules/table-header-invalid.d.ts +3 -0
  33. package/esm/lint/rules/table-header-invalid.js +17 -0
  34. package/esm/lint/rules/table-header-invalid.js.map +1 -0
  35. package/esm/lint/rules/table-shape.js +1 -0
  36. package/esm/lint/rules/table-shape.js.map +1 -1
  37. package/esm/lint/rules/table-source-conflict.d.ts +3 -0
  38. package/esm/lint/rules/table-source-conflict.js +15 -0
  39. package/esm/lint/rules/table-source-conflict.js.map +1 -0
  40. package/esm/lint/rules/unclosed-markup-code.js +46 -10
  41. package/esm/lint/rules/unclosed-markup-code.js.map +1 -1
  42. package/esm/test/documents.js +3 -1
  43. package/esm/test/documents.js.map +1 -1
  44. package/esm/version.d.ts +1 -1
  45. package/esm/version.js +1 -1
  46. package/lib/assemble/index.d.ts +5 -0
  47. package/lib/assemble/index.js +9 -7
  48. package/lib/assemble/index.js.map +1 -1
  49. package/lib/cli.js +3 -0
  50. package/lib/cli.js.map +1 -1
  51. package/lib/lint/grammar/lint.js +47 -22
  52. package/lib/lint/grammar/lint.js.map +1 -1
  53. package/lib/lint/grammar/scan.js +6 -3
  54. package/lib/lint/grammar/scan.js.map +1 -1
  55. package/lib/lint/implicit-code.d.ts +3 -0
  56. package/lib/lint/implicit-code.js +86 -0
  57. package/lib/lint/implicit-code.js.map +1 -0
  58. package/lib/lint/index.js +4 -2
  59. package/lib/lint/index.js.map +1 -1
  60. package/lib/lint/line-starts.d.ts +3 -0
  61. package/lib/lint/line-starts.js +19 -0
  62. package/lib/lint/line-starts.js.map +1 -0
  63. package/lib/lint/rules/abbreviated-attrs.js +6 -4
  64. package/lib/lint/rules/abbreviated-attrs.js.map +1 -1
  65. package/lib/lint/rules/allow-value.d.ts +3 -0
  66. package/lib/lint/rules/allow-value.js +45 -0
  67. package/lib/lint/rules/allow-value.js.map +1 -0
  68. package/lib/lint/rules/dead-definitions.js +116 -21
  69. package/lib/lint/rules/dead-definitions.js.map +1 -1
  70. package/lib/lint/rules/index.js +6 -0
  71. package/lib/lint/rules/index.js.map +1 -1
  72. package/lib/lint/rules/link-targets.js +8 -2
  73. package/lib/lint/rules/link-targets.js.map +1 -1
  74. package/lib/lint/rules/markdown-in-pod.js +36 -4
  75. package/lib/lint/rules/markdown-in-pod.js.map +1 -1
  76. package/lib/lint/rules/table-header-invalid.d.ts +3 -0
  77. package/lib/lint/rules/table-header-invalid.js +20 -0
  78. package/lib/lint/rules/table-header-invalid.js.map +1 -0
  79. package/lib/lint/rules/table-shape.js +1 -0
  80. package/lib/lint/rules/table-shape.js.map +1 -1
  81. package/lib/lint/rules/table-source-conflict.d.ts +3 -0
  82. package/lib/lint/rules/table-source-conflict.js +18 -0
  83. package/lib/lint/rules/table-source-conflict.js.map +1 -0
  84. package/lib/lint/rules/unclosed-markup-code.js +46 -10
  85. package/lib/lint/rules/unclosed-markup-code.js.map +1 -1
  86. package/lib/test/documents.js +3 -1
  87. package/lib/test/documents.js.map +1 -1
  88. package/lib/version.d.ts +1 -1
  89. package/lib/version.js +1 -1
  90. package/package.json +8 -8
@@ -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":"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"}
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,3 @@
1
+ import type { Rule } from '../types';
2
+ export declare const TABLE_HEADER_INVALID_RULE_ID = "table-header-invalid";
3
+ export declare const tableHeaderInvalidRule: Rule;
@@ -0,0 +1,17 @@
1
+ export const TABLE_HEADER_INVALID_RULE_ID = 'table-header-invalid';
2
+ // passes on a `header` of CSV or TSV data that is neither present nor absent: an
3
+ // error the norm names, kept apart from table-shape so that silencing the shape of
4
+ // tables does not silence it
5
+ export const tableHeaderInvalidRule = {
6
+ id: TABLE_HEADER_INVALID_RULE_ID,
7
+ severity: 'error',
8
+ check: (ast, _ctx) => (ast.diagnostics || [])
9
+ .filter(d => d.code === 'table-header-invalid')
10
+ .map(d => ({
11
+ rule: TABLE_HEADER_INVALID_RULE_ID,
12
+ severity: d.severity,
13
+ message: d.message,
14
+ location: d.location,
15
+ })),
16
+ };
17
+ //# 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,MAAM,CAAC,MAAM,4BAA4B,GAAG,sBAAsB,CAAA;AAElE,iFAAiF;AACjF,mFAAmF;AACnF,6BAA6B;AAC7B,MAAM,CAAC,MAAM,sBAAsB,GAAS;IAC1C,EAAE,EAAE,4BAA4B;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,4BAA4B;QAClC,QAAQ,EAAE,CAAC,CAAC,QAAQ;QACpB,OAAO,EAAE,CAAC,CAAC,OAAO;QAClB,QAAQ,EAAE,CAAC,CAAC,QAAQ;KACrB,CAAC,CAAC;CACR,CAAA"}
@@ -5,6 +5,7 @@ const TABLE_CODES = [
5
5
  'table-mixed-separators',
6
6
  'table-source-unreadable',
7
7
  'table-source-empty',
8
+ 'table-source-not-csv',
8
9
  ];
9
10
  export const tableShapeRule = {
10
11
  id: TABLE_SHAPE_RULE_ID,
@@ -1 +1 @@
1
- {"version":3,"file":"table-shape.js","sourceRoot":"","sources":["../../../src/lint/rules/table-shape.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,MAAM,mBAAmB,GAAG,aAAa,CAAA;AAEhD,MAAM,WAAW,GAAG;IAClB,iBAAiB;IACjB,wBAAwB;IACxB,wBAAwB;IACxB,yBAAyB;IACzB,oBAAoB;CACrB,CAAA;AAED,MAAM,CAAC,MAAM,cAAc,GAAS;IAClC,EAAE,EAAE,mBAAmB;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,mBAAmB;QACzB,QAAQ,EAAE,CAAC,CAAC,QAAQ;QACpB,OAAO,EAAE,CAAC,CAAC,OAAO;QAClB,QAAQ,EAAE,CAAC,CAAC,QAAQ;KACrB,CAAC,CAAC;CACR,CAAA"}
1
+ {"version":3,"file":"table-shape.js","sourceRoot":"","sources":["../../../src/lint/rules/table-shape.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,MAAM,mBAAmB,GAAG,aAAa,CAAA;AAEhD,MAAM,WAAW,GAAG;IAClB,iBAAiB;IACjB,wBAAwB;IACxB,wBAAwB;IACxB,yBAAyB;IACzB,oBAAoB;IACpB,sBAAsB;CACvB,CAAA;AAED,MAAM,CAAC,MAAM,cAAc,GAAS;IAClC,EAAE,EAAE,mBAAmB;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,mBAAmB;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,3 @@
1
+ import type { Rule } from '../types';
2
+ export declare const TABLE_SOURCE_CONFLICT_RULE_ID = "table-source-conflict";
3
+ export declare const tableSourceConflictRule: Rule;
@@ -0,0 +1,15 @@
1
+ export const TABLE_SOURCE_CONFLICT_RULE_ID = 'table-source-conflict';
2
+ // an error the norm names, kept apart from table-shape so that silencing that rule does not silence it
3
+ export const tableSourceConflictRule = {
4
+ id: TABLE_SOURCE_CONFLICT_RULE_ID,
5
+ severity: 'error',
6
+ check: (ast, _ctx) => (ast.diagnostics || [])
7
+ .filter(d => d.code === 'table-source-conflict')
8
+ .map(d => ({
9
+ rule: TABLE_SOURCE_CONFLICT_RULE_ID,
10
+ severity: d.severity,
11
+ message: d.message,
12
+ location: d.location,
13
+ })),
14
+ };
15
+ //# 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,MAAM,CAAC,MAAM,6BAA6B,GAAG,uBAAuB,CAAA;AAEpE,uGAAuG;AACvG,MAAM,CAAC,MAAM,uBAAuB,GAAS;IAC3C,EAAE,EAAE,6BAA6B;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,6BAA6B;QACnC,QAAQ,EAAE,CAAC,CAAC,QAAQ;QACpB,OAAO,EAAE,CAAC,CAAC,OAAO;QAClB,QAAQ,EAAE,CAAC,CAAC,QAAQ;KACrB,CAAC,CAAC;CACR,CAAA"}
@@ -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 rest = text.slice(match.index + whole.length);
31
- const closed = open === '«' ? rest.includes('»') : rest.includes('>'.repeat(open.length));
32
- if (!closed) {
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
- const line = at.line + at.text.slice(0, found.at).split('\n').length - 1;
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 (open.some(isVerbatimBlock))
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":"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"}
1
+ {"version":3,"file":"unclosed-markup-code.js","sourceRoot":"","sources":["../../../src/lint/rules/unclosed-markup-code.ts"],"names":[],"mappings":"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"}
@@ -134,7 +134,9 @@ export const prepareDocument = (input, opts) => {
134
134
  markSections(tree, undefined);
135
135
  const at = new Map();
136
136
  for (const d of diagnostics) {
137
- if (d.code === 'table-source-unreadable' || d.code === 'table-source-deferred') {
137
+ if (d.code === 'table-source-unreadable' ||
138
+ d.code === 'table-source-deferred' ||
139
+ d.code === 'table-source-conflict') {
138
140
  at.set(d.location.start.offset, d.message);
139
141
  }
140
142
  }
@@ -1 +1 @@
1
- {"version":3,"file":"documents.js","sourceRoot":"","sources":["../../src/test/documents.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"documents.js","sourceRoot":"","sources":["../../src/test/documents.ts"],"names":[],"mappings":"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"}
package/esm/version.d.ts CHANGED
@@ -1 +1 @@
1
- export declare const version = "0.0.97";
1
+ export declare const version = "0.0.99";
package/esm/version.js CHANGED
@@ -1,3 +1,3 @@
1
1
  // generated by scripts/inject-version.mjs — do not edit by hand
2
- export const version = '0.0.97';
2
+ export const version = '0.0.99';
3
3
  //# sourceMappingURL=version.js.map
@@ -53,6 +53,11 @@ export type AssembleOptions = {
53
53
  onlySameDocument?: boolean;
54
54
  };
55
55
  export declare const isWarning: (problem: IncludeProblem) => boolean;
56
+ export declare const splitDirective: (line: string) => {
57
+ selector: string;
58
+ mimeType?: string;
59
+ unread?: boolean;
60
+ };
56
61
  export declare const externalMessage: (sources: Source[], written: string) => string;
57
62
  export declare const silently: <T>(work: () => T) => T;
58
63
  export declare const hasSameDocumentInclude: (tree: any) => boolean;
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.createSourceStore = exports.assembleAsync = exports.sourcesFromFiles = exports.assembleIncludes = exports.hasSameDocumentInclude = exports.silently = exports.externalMessage = exports.isWarning = void 0;
3
+ exports.createSourceStore = exports.assembleAsync = exports.sourcesFromFiles = exports.assembleIncludes = exports.hasSameDocumentInclude = exports.silently = exports.externalMessage = exports.splitDirective = exports.isWarning = void 0;
4
4
  const schema_1 = require("@podlite/schema");
5
5
  const toc_1 = require("@podlite/toc");
6
6
  const file_format_1 = require("../file-format");
@@ -97,6 +97,7 @@ const splitDirective = (line) => {
97
97
  }
98
98
  return { selector: line, unread: true };
99
99
  };
100
+ exports.splitDirective = splitDirective;
100
101
  /*
101
102
  =begin pod :kind<export>
102
103
 
@@ -172,7 +173,7 @@ const hasSameDocumentInclude = (tree) => {
172
173
  }
173
174
  if (isIncludeBlock(node)) {
174
175
  const line = (0, schema_1.getTextContentFromNode)(node.content)?.toString().trim() ?? '';
175
- const { selector, unread } = splitDirective(line);
176
+ const { selector, unread } = (0, exports.splitDirective)(line);
176
177
  if (!selector || unread)
177
178
  continue;
178
179
  try {
@@ -290,10 +291,11 @@ const assembleIncludes = (tree, opts) => {
290
291
  }
291
292
  const slot = slots[0];
292
293
  const at = slot ? held.indexOf(slot) : -1;
293
- if (at >= 0)
294
- held.splice(at, 0, ...entries);
295
- else
296
- held.push(...entries);
294
+ const tail = at >= 0 ? held.splice(at) : [];
295
+ for (const entry of entries)
296
+ held.push(entry);
297
+ for (const entry of tail)
298
+ held.push(entry);
297
299
  };
298
300
  const report = (problem) => hold([{ problem, shown: true }]);
299
301
  const flush = () => {
@@ -1087,7 +1089,7 @@ const assembleIncludes = (tree, opts) => {
1087
1089
  written: parsed?.document ?? selector,
1088
1090
  });
1089
1091
  const line = (0, schema_1.getTextContentFromNode)(node.content)?.toString().trim() ?? '';
1090
- const split = splitDirective(line);
1092
+ const split = (0, exports.splitDirective)(line);
1091
1093
  const selector = split.selector;
1092
1094
  let parsed;
1093
1095
  let reason = '';