@podlite/schema 0.0.83 → 0.0.85
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 +30 -0
- package/esm/ast-inerator.js +1 -3
- package/esm/ast-inerator.js.map +1 -1
- package/esm/codes/scan.js +26 -22
- package/esm/codes/scan.js.map +1 -1
- package/esm/grammar.js +531 -416
- package/esm/grammar.js.map +1 -1
- package/esm/helpers/flatten-deep.d.ts +2 -0
- package/esm/helpers/flatten-deep.js +32 -0
- package/esm/helpers/flatten-deep.js.map +1 -0
- package/esm/helpers/itemNumbering.d.ts +2 -1
- package/esm/helpers/itemNumbering.js +3 -2
- package/esm/helpers/itemNumbering.js.map +1 -1
- package/esm/helpers/makeInterator.js +3 -6
- package/esm/helpers/makeInterator.js.map +1 -1
- package/esm/helpers/makeTransformer.js +1 -3
- package/esm/helpers/makeTransformer.js.map +1 -1
- package/esm/helpers/numberedShorthand.d.ts +2 -1
- package/esm/helpers/numberedShorthand.js +24 -4
- package/esm/helpers/numberedShorthand.js.map +1 -1
- package/esm/index.d.ts +3 -0
- package/esm/index.js +3 -0
- package/esm/index.js.map +1 -1
- package/esm/markup-code-letters.d.ts +2 -0
- package/esm/markup-code-letters.js +65 -0
- package/esm/markup-code-letters.js.map +1 -0
- package/esm/pluggableParser.js +13 -5
- package/esm/pluggableParser.js.map +1 -1
- package/esm/plugin-defn-fill-term.js +7 -0
- package/esm/plugin-defn-fill-term.js.map +1 -1
- package/esm/plugin-group-defn.js +6 -8
- package/esm/plugin-group-defn.js.map +1 -1
- package/esm/plugin-group-items.d.ts +4 -1
- package/esm/plugin-group-items.js +43 -9
- package/esm/plugin-group-items.js.map +1 -1
- package/esm/plugin-items.js +6 -5
- package/esm/plugin-items.js.map +1 -1
- package/esm/plugin-tables.js +33 -10
- package/esm/plugin-tables.js.map +1 -1
- package/esm/types.d.ts +1 -1
- package/esm/version.d.ts +1 -1
- package/esm/version.js +1 -1
- package/lib/ast-inerator.js +2 -4
- package/lib/codes/scan.js +26 -22
- package/lib/grammar.js +531 -416
- package/lib/helpers/flatten-deep.d.ts +2 -0
- package/lib/helpers/flatten-deep.js +35 -0
- package/lib/helpers/itemNumbering.d.ts +2 -1
- package/lib/helpers/itemNumbering.js +5 -3
- package/lib/helpers/makeInterator.js +3 -6
- package/lib/helpers/makeTransformer.js +2 -4
- package/lib/helpers/numberedShorthand.d.ts +2 -1
- package/lib/helpers/numberedShorthand.js +26 -5
- package/lib/index.d.ts +3 -0
- package/lib/index.js +7 -2
- package/lib/markup-code-letters.d.ts +2 -0
- package/lib/markup-code-letters.js +69 -0
- package/lib/pluggableParser.js +13 -5
- package/lib/plugin-defn-fill-term.js +7 -0
- package/lib/plugin-group-defn.js +6 -8
- package/lib/plugin-group-items.d.ts +4 -1
- package/lib/plugin-group-items.js +44 -12
- package/lib/plugin-items.js +5 -4
- package/lib/plugin-tables.js +37 -14
- package/lib/types.d.ts +1 -1
- package/lib/version.d.ts +1 -1
- package/lib/version.js +1 -1
- package/package.json +1 -1
- package/schema/AstTree.json +1 -0
- package/schema/PodliteDocument.json +1 -0
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
const isList = (item) => Array.isArray(item);
|
|
2
|
+
/*
|
|
3
|
+
=begin pod :kind<export>
|
|
4
|
+
|
|
5
|
+
=head2 flattenDeep
|
|
6
|
+
|
|
7
|
+
Puts the items of nested lists into one list, in order, in time that grows with
|
|
8
|
+
the number of items. Holes of a list are skipped. A value that is not a list is
|
|
9
|
+
taken the way C<concat> takes it: an object marked with
|
|
10
|
+
C<Symbol.isConcatSpreadable> gives its items one level deep, holes kept.
|
|
11
|
+
|
|
12
|
+
=end pod
|
|
13
|
+
*/
|
|
14
|
+
export function flattenDeep(items) {
|
|
15
|
+
const out = [];
|
|
16
|
+
const walk = (list) => list.forEach(item => {
|
|
17
|
+
if (isList(item))
|
|
18
|
+
return walk(item);
|
|
19
|
+
// concat on an empty list spreads what concat spreads, and copies nothing
|
|
20
|
+
const empty = [];
|
|
21
|
+
const parts = empty.concat(item);
|
|
22
|
+
for (let i = 0; i < parts.length; i++) {
|
|
23
|
+
if (Object.prototype.hasOwnProperty.call(parts, i))
|
|
24
|
+
out.push(parts[i]);
|
|
25
|
+
else
|
|
26
|
+
out.length++;
|
|
27
|
+
}
|
|
28
|
+
});
|
|
29
|
+
walk(items);
|
|
30
|
+
return out;
|
|
31
|
+
}
|
|
32
|
+
//# sourceMappingURL=flatten-deep.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"flatten-deep.js","sourceRoot":"","sources":["../../src/helpers/flatten-deep.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,GAAG,CAAI,IAAe,EAAoC,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;AAE5F;;;;;;;;;;;EAWE;AACF,MAAM,UAAU,WAAW,CAAI,KAA+B;IAC5D,MAAM,GAAG,GAAQ,EAAE,CAAA;IACnB,MAAM,IAAI,GAAG,CAAC,IAA8B,EAAQ,EAAE,CACpD,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QAClB,IAAI,MAAM,CAAC,IAAI,CAAC;YAAE,OAAO,IAAI,CAAC,IAAI,CAAC,CAAA;QACnC,0EAA0E;QAC1E,MAAM,KAAK,GAAQ,EAAE,CAAA;QACrB,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;QAChC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACtC,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;gBAAE,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;;gBACjE,GAAG,CAAC,MAAM,EAAE,CAAA;QACnB,CAAC;IACH,CAAC,CAAC,CAAA;IACJ,IAAI,CAAC,KAAK,CAAC,CAAA;IACX,OAAO,GAAG,CAAA;AACZ,CAAC"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
-
import { PodNode, PodliteDocument } from '../types';
|
|
1
|
+
import { ConfigItem, PodNode, PodliteDocument } from '../types';
|
|
2
|
+
export declare const numberedOf: (config: ConfigItem[] | undefined) => boolean | null;
|
|
2
3
|
export declare const promoteOrderedLists: <T extends PodliteDocument | PodNode>(ast: T) => T;
|
|
3
4
|
export default promoteOrderedLists;
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
const truthy = (v) => v === true || v === 1 || v === '1' || v === 'true';
|
|
2
|
-
|
|
2
|
+
// the last numbered entry decides; false, 0, '0' and 'false' say not numbered, no entry says nothing
|
|
3
|
+
export const numberedOf = (config) => {
|
|
3
4
|
if (!Array.isArray(config))
|
|
4
5
|
return null;
|
|
5
6
|
let result = null;
|
|
@@ -25,7 +26,7 @@ const allItemsNumbered = (listNode) => {
|
|
|
25
26
|
if (!c || c.type !== 'block' || c.name !== 'item')
|
|
26
27
|
continue;
|
|
27
28
|
hasAny = true;
|
|
28
|
-
if (
|
|
29
|
+
if (numberedOf(c.config) !== true)
|
|
29
30
|
return false;
|
|
30
31
|
}
|
|
31
32
|
return hasAny;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"itemNumbering.js","sourceRoot":"","sources":["../../src/helpers/itemNumbering.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,GAAG,CAAC,CAAU,EAAW,EAAE,CAAC,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,MAAM,CAAA;AAE1F,MAAM,UAAU,GAAG,CAAC,MAAgC,EAAkB,EAAE;
|
|
1
|
+
{"version":3,"file":"itemNumbering.js","sourceRoot":"","sources":["../../src/helpers/itemNumbering.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,GAAG,CAAC,CAAU,EAAW,EAAE,CAAC,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,MAAM,CAAA;AAE1F,qGAAqG;AACrG,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,MAAgC,EAAkB,EAAE;IAC7E,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC;QAAE,OAAO,IAAI,CAAA;IACvC,IAAI,MAAM,GAAmB,IAAI,CAAA;IACjC,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC3B,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,IAAI,KAAK,UAAU;YAAE,SAAQ;QACjD,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAA;QACzB,IAAI,KAAK,KAAK,KAAK,IAAI,KAAK,KAAK,CAAC,IAAI,KAAK,KAAK,GAAG,IAAI,KAAK,KAAK,OAAO,EAAE,CAAC;YACzE,MAAM,GAAG,KAAK,CAAA;QAChB,CAAC;aAAM,CAAC;YACN,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;QAC7E,CAAC;IACH,CAAC;IACD,OAAO,MAAM,CAAA;AACf,CAAC,CAAA;AAED,MAAM,gBAAgB,GAAG,CAAC,QAA+B,EAAW,EAAE;IACpE,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC;QAAE,OAAO,KAAK,CAAA;IAClD,IAAI,MAAM,GAAG,KAAK,CAAA;IAClB,KAAK,MAAM,KAAK,IAAI,QAAQ,CAAC,OAAO,EAAE,CAAC;QACrC,MAAM,CAAC,GAAG,KAAgE,CAAA;QAC1E,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,KAAK,OAAO,IAAI,CAAC,CAAC,IAAI,KAAK,MAAM;YAAE,SAAQ;QAC3D,MAAM,GAAG,IAAI,CAAA;QACb,IAAI,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,IAAI;YAAE,OAAO,KAAK,CAAA;IACjD,CAAC;IACD,OAAO,MAAM,CAAA;AACf,CAAC,CAAA;AAED,MAAM,IAAI,GAAG,CAAC,IAAa,EAAQ,EAAE;IACnC,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;QACxB,KAAK,MAAM,KAAK,IAAI,IAAI;YAAE,IAAI,CAAC,KAAgB,CAAC,CAAA;QAChD,OAAM;IACR,CAAC;IACD,IAAI,CAAC,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ;QAAE,OAAM;IAC7C,MAAM,OAAO,GAAG,IAIf,CAAA;IACD,IAAI,OAAO,CAAC,IAAI,KAAK,MAAM,IAAI,OAAO,CAAC,IAAI,KAAK,UAAU,IAAI,gBAAgB,CAAC,OAAO,CAAC,EAAE,CAAC;QACxF,OAAO,CAAC,IAAI,GAAG,SAAS,CAAA;IAC1B,CAAC;IACD,IAAI,OAAO,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;QAClC,IAAI,CAAC,OAAO,CAAC,OAAkB,CAAC,CAAA;IAClC,CAAC;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAsC,GAAM,EAAK,EAAE;IACpF,IAAI,CAAC,GAAc,CAAC,CAAA;IACpB,OAAO,GAAG,CAAA;AACZ,CAAC,CAAA;AAED,eAAe,mBAAmB,CAAA"}
|
|
@@ -1,9 +1,6 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
}
|
|
5
|
-
return arr.reduce((acc, val) => (Array.isArray(val) ? acc.concat(flattenDeep(val)) : acc.concat(val)), []);
|
|
6
|
-
}
|
|
1
|
+
import { flattenDeep as flattenItems } from './flatten-deep.js';
|
|
2
|
+
// a value that is not a list is passed on as it is
|
|
3
|
+
const flattenDeep = arr => (Array.isArray(arr) ? flattenItems(arr) : arr);
|
|
7
4
|
function thisFunc(rules) {
|
|
8
5
|
function interator(node, context) {
|
|
9
6
|
if (node == null) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"makeInterator.js","sourceRoot":"","sources":["../../src/helpers/makeInterator.ts"],"names":[],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"file":"makeInterator.js","sourceRoot":"","sources":["../../src/helpers/makeInterator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { makeRule, makePlug } from './makeQuery.js';
|
|
2
|
+
import { flattenDeep } from './flatten-deep.js';
|
|
2
3
|
// the following names: MyBlock, myBlock are use for extending pod6
|
|
3
4
|
export function isNamedBlock(name) {
|
|
4
5
|
return name && name !== name.toLowerCase() && name !== name.toUpperCase();
|
|
@@ -9,9 +10,6 @@ export function isSemanticBlock(node) {
|
|
|
9
10
|
const isTypeBlock = (node.type || '') === 'block';
|
|
10
11
|
return isTypeBlock && name === name.toUpperCase();
|
|
11
12
|
}
|
|
12
|
-
function flattenDeep(arr) {
|
|
13
|
-
return arr.reduce((acc, val) => (Array.isArray(val) ? acc.concat(flattenDeep(val)) : acc.concat(val)), []);
|
|
14
|
-
}
|
|
15
13
|
export const makeTransformer = rule => {
|
|
16
14
|
let rules = [];
|
|
17
15
|
function use(key, fn) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"makeTransformer.js","sourceRoot":"","sources":["../../src/helpers/makeTransformer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AAChD,mEAAmE;AACnE,MAAM,UAAU,YAAY,CAAC,IAAI;IAC/B,OAAO,IAAI,IAAI,IAAI,KAAK,IAAI,CAAC,WAAW,EAAE,IAAI,IAAI,KAAK,IAAI,CAAC,WAAW,EAAE,CAAA;AAC3E,CAAC;AAED,oCAAoC;AACpC,MAAM,UAAU,eAAe,CAAC,IAAI;IAClC,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,IAAI,EAAE,CAAA;IAC5B,MAAM,WAAW,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC,KAAK,OAAO,CAAA;IACjD,OAAO,WAAW,IAAI,IAAI,KAAK,IAAI,CAAC,WAAW,EAAE,CAAA;AACnD,CAAC;AAED,
|
|
1
|
+
{"version":3,"file":"makeTransformer.js","sourceRoot":"","sources":["../../src/helpers/makeTransformer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1,2 @@
|
|
|
1
|
-
export declare const
|
|
1
|
+
export declare const isBeforeText: (child: unknown) => boolean;
|
|
2
|
+
export declare const applyNumberedShorthand: (node: any, para?: any) => void;
|
|
@@ -9,12 +9,32 @@ const firstText = para => {
|
|
|
9
9
|
return first;
|
|
10
10
|
return typeof first?.value === 'string' ? first.value : undefined;
|
|
11
11
|
};
|
|
12
|
+
const BEFORE_TEXT = ['blankline', 'config', 'alias', 'set'];
|
|
13
|
+
/*
|
|
14
|
+
=begin pod :kind<export>
|
|
15
|
+
|
|
16
|
+
=head2 isBeforeText
|
|
17
|
+
|
|
18
|
+
Whether a node of a block's content can stand before the text of the block
|
|
19
|
+
without being its text: a blank line, or a C<=config>, C<=alias> or C<=set>
|
|
20
|
+
directive. The first node of the content that is not one of these is where the
|
|
21
|
+
text of an item, a heading or a definition starts — where a leading C<#> or a
|
|
22
|
+
check box is read and where a table of contents takes the entry of an item.
|
|
23
|
+
|
|
24
|
+
=end pod
|
|
25
|
+
*/
|
|
26
|
+
export const isBeforeText = (child) => {
|
|
27
|
+
const type = typeof child === 'object' && child !== null ? Reflect.get(child, 'type') : undefined;
|
|
28
|
+
return typeof type === 'string' && BEFORE_TEXT.includes(type);
|
|
29
|
+
};
|
|
12
30
|
// The shorthand counts as an option written on the block: one written there
|
|
13
31
|
// decides, one given by =set gives way, and =config comes later and skips a
|
|
14
|
-
// name the block already has.
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
32
|
+
// name the block already has. Only the first paragraph of text can carry it;
|
|
33
|
+
// indented code in its place keeps its #.
|
|
34
|
+
export const applyNumberedShorthand = (node, para = (Array.isArray(node.content) ? node.content : []).find(child => !isBeforeText(child))) => {
|
|
35
|
+
if (para?.type !== 'para')
|
|
36
|
+
return;
|
|
37
|
+
const text = firstText(para);
|
|
18
38
|
if (text === undefined || !SHORTHAND.test(text))
|
|
19
39
|
return;
|
|
20
40
|
const config = Array.isArray(node.config) ? node.config : [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"numberedShorthand.js","sourceRoot":"","sources":["../../src/helpers/numberedShorthand.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAE3C,yEAAyE;AACzE,MAAM,SAAS,GAAG,kBAAkB,CAAA;AAEpC,MAAM,SAAS,GAAG,IAAI,CAAC,EAAE;IACvB,IAAI,OAAO,IAAI,EAAE,IAAI,KAAK,QAAQ;QAAE,OAAO,IAAI,CAAC,IAAI,CAAA;IACpD,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IACxE,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAA;IAC3C,OAAO,OAAO,KAAK,EAAE,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAA;AACnE,CAAC,CAAA;AAED,4EAA4E;AAC5E,4EAA4E;AAC5E,
|
|
1
|
+
{"version":3,"file":"numberedShorthand.js","sourceRoot":"","sources":["../../src/helpers/numberedShorthand.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAE3C,yEAAyE;AACzE,MAAM,SAAS,GAAG,kBAAkB,CAAA;AAEpC,MAAM,SAAS,GAAG,IAAI,CAAC,EAAE;IACvB,IAAI,OAAO,IAAI,EAAE,IAAI,KAAK,QAAQ;QAAE,OAAO,IAAI,CAAC,IAAI,CAAA;IACpD,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IACxE,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAA;IAC3C,OAAO,OAAO,KAAK,EAAE,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAA;AACnE,CAAC,CAAA;AAED,MAAM,WAAW,GAAG,CAAC,WAAW,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,CAAC,CAAA;AAE3D;;;;;;;;;;;;EAYE;AACF,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,KAAc,EAAW,EAAE;IACtD,MAAM,IAAI,GAAY,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IAC1G,OAAO,OAAO,IAAI,KAAK,QAAQ,IAAI,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;AAC/D,CAAC,CAAA;AAED,4EAA4E;AAC5E,4EAA4E;AAC5E,6EAA6E;AAC7E,0CAA0C;AAC1C,MAAM,CAAC,MAAM,sBAAsB,GAAG,CACpC,IAAI,EACJ,IAAI,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,EAC5F,EAAE;IACF,IAAI,IAAI,EAAE,IAAI,KAAK,MAAM;QAAE,OAAM;IACjC,MAAM,IAAI,GAAG,SAAS,CAAC,IAAI,CAAC,CAAA;IAC5B,IAAI,IAAI,KAAK,SAAS,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC;QAAE,OAAM;IACvD,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAA;IAC5D,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,KAAK,UAAU,IAAI,CAAC,CAAC,IAAI,KAAK,SAAS,CAAC,CAAA;IACpF,IAAI,OAAO,IAAI,CAAC,KAAK,EAAE,CAAC,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC;QAAE,OAAM;IACvE,WAAW,CAAC,IAAI,EAAE,SAAS,CAAC,CAAA;IAC5B,IAAI,OAAO;QAAE,OAAM;IACnB,IAAI,CAAC,MAAM,GAAG;QACZ,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC;QACpD,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE;KACnD,CAAA;AACH,CAAC,CAAA"}
|
package/esm/index.d.ts
CHANGED
|
@@ -7,12 +7,14 @@ export * from './block-names';
|
|
|
7
7
|
export { titleParts, isTitleBlock } from './title';
|
|
8
8
|
export type { TitleEntry } from './title';
|
|
9
9
|
export * from './attribute-names';
|
|
10
|
+
export * from './markup-code-letters';
|
|
10
11
|
export * from './blocks-helpers';
|
|
11
12
|
export * from './query-helpers';
|
|
12
13
|
export * from './ast-helpers';
|
|
13
14
|
export { expandAlias, ALIAS_EXPANSION_DEPTH, ALIAS_EXPANSION_BUDGET } from './helpers/alias';
|
|
14
15
|
export { MARKUP_CODE_DEPTH_LIMIT } from './codes/read';
|
|
15
16
|
export * from './helpers/handlers';
|
|
17
|
+
export { isBeforeText } from './helpers/numberedShorthand';
|
|
16
18
|
export { makeInterator } from './ast-inerator';
|
|
17
19
|
export { makeTransformer, isNamedBlock, isSemanticBlock } from './helpers/makeTransformer';
|
|
18
20
|
export { toAny } from './exportAny';
|
|
@@ -25,6 +27,7 @@ export type { LinkConfig } from './helpers/link-config';
|
|
|
25
27
|
export { pluginCleanLocation } from './plugin-clean-location';
|
|
26
28
|
export { toAnyRules } from './helpers/plugins';
|
|
27
29
|
export { podlitePluggable, Podlite, PodliteExport, cleanIds, frozenIds, headingId } from './pluggableParser';
|
|
30
|
+
export { MAX_LIST_LEVEL } from './plugin-group-items';
|
|
28
31
|
import { ConfigScope } from './helpers/configPropagation';
|
|
29
32
|
export { mergeConfigSettings, propagateConfigDefaults, walkConfigScopes } from './helpers/configPropagation';
|
|
30
33
|
export { blockNameOf, holderInside, isDirectiveNode, isWrapper } from './helpers/blockName';
|
package/esm/index.js
CHANGED
|
@@ -7,12 +7,14 @@ export * from './types.js';
|
|
|
7
7
|
export * from './block-names.js';
|
|
8
8
|
export { titleParts, isTitleBlock } from './title.js';
|
|
9
9
|
export * from './attribute-names.js';
|
|
10
|
+
export * from './markup-code-letters.js';
|
|
10
11
|
export * from './blocks-helpers.js';
|
|
11
12
|
export * from './query-helpers.js';
|
|
12
13
|
export * from './ast-helpers.js';
|
|
13
14
|
export { expandAlias, ALIAS_EXPANSION_DEPTH, ALIAS_EXPANSION_BUDGET } from './helpers/alias.js';
|
|
14
15
|
export { MARKUP_CODE_DEPTH_LIMIT } from './codes/read.js';
|
|
15
16
|
export * from './helpers/handlers.js';
|
|
17
|
+
export { isBeforeText } from './helpers/numberedShorthand.js';
|
|
16
18
|
export { makeInterator } from './ast-inerator.js';
|
|
17
19
|
export { makeTransformer, isNamedBlock, isSemanticBlock } from './helpers/makeTransformer.js';
|
|
18
20
|
export { toAny } from './exportAny.js';
|
|
@@ -33,6 +35,7 @@ import itemsNumbering_plug from './plugin-items.js';
|
|
|
33
35
|
import heading_plug from './plugin-heading.js';
|
|
34
36
|
import defnGroup_plug from './plugin-group-defn.js';
|
|
35
37
|
import itemsGroup_plug from './plugin-group-items.js';
|
|
38
|
+
export { MAX_LIST_LEVEL } from './plugin-group-items.js';
|
|
36
39
|
import defnTerms_plug from './plugin-defn-fill-term.js';
|
|
37
40
|
import set_plug from './plugin-set.js';
|
|
38
41
|
import { propagateConfigDefaults } from './helpers/configPropagation.js';
|
package/esm/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,GAAoC,MAAM,KAAK,CAAA;AACtD,OAAO,KAAK,OAAO,MAAM,cAAc,CAAA;AAEvC,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAE3C,OAAO,KAAK,UAAU,MAAM,WAAW,CAAA;AACvC,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAA;AAE9C,cAAc,SAAS,CAAA;AACvB,cAAc,eAAe,CAAA;AAC7B,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AAElD,cAAc,mBAAmB,CAAA;AACjC,cAAc,kBAAkB,CAAA;AAChC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,eAAe,CAAA;AAC7B,OAAO,EAAE,WAAW,EAAE,qBAAqB,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAA;AAC5F,OAAO,EAAE,uBAAuB,EAAE,MAAM,cAAc,CAAA;AACtD,cAAc,oBAAoB,CAAA;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,65 @@
|
|
|
1
|
+
/*
|
|
2
|
+
=begin pod :kind<module>
|
|
3
|
+
|
|
4
|
+
=TITLE The letters of markup codes
|
|
5
|
+
|
|
6
|
+
The letters the specification names markup codes by, from its table of codes.
|
|
7
|
+
The reader of codes and the checker take a letter from here rather than each
|
|
8
|
+
deciding what one is.
|
|
9
|
+
|
|
10
|
+
=end pod
|
|
11
|
+
*/
|
|
12
|
+
/*
|
|
13
|
+
=begin pod :kind<export>
|
|
14
|
+
|
|
15
|
+
=head2 MARKUP_CODE_LETTERS
|
|
16
|
+
|
|
17
|
+
The 26 letters C<A> to C<Z>. C<Q> and C<Y> are reserved and still listed: a
|
|
18
|
+
reserved code written in a document is read as a code.
|
|
19
|
+
|
|
20
|
+
=end pod
|
|
21
|
+
*/
|
|
22
|
+
export const MARKUP_CODE_LETTERS = [
|
|
23
|
+
'A',
|
|
24
|
+
'B',
|
|
25
|
+
'C',
|
|
26
|
+
'D',
|
|
27
|
+
'E',
|
|
28
|
+
'F',
|
|
29
|
+
'G',
|
|
30
|
+
'H',
|
|
31
|
+
'I',
|
|
32
|
+
'J',
|
|
33
|
+
'K',
|
|
34
|
+
'L',
|
|
35
|
+
'M',
|
|
36
|
+
'N',
|
|
37
|
+
'O',
|
|
38
|
+
'P',
|
|
39
|
+
'Q',
|
|
40
|
+
'R',
|
|
41
|
+
'S',
|
|
42
|
+
'T',
|
|
43
|
+
'U',
|
|
44
|
+
'V',
|
|
45
|
+
'W',
|
|
46
|
+
'X',
|
|
47
|
+
'Y',
|
|
48
|
+
'Z',
|
|
49
|
+
];
|
|
50
|
+
// the reader asks this of every character, so a letter is found without searching the list
|
|
51
|
+
const LETTERS = new Set(MARKUP_CODE_LETTERS);
|
|
52
|
+
/*
|
|
53
|
+
=begin pod :kind<export>
|
|
54
|
+
|
|
55
|
+
=head2 isMarkupCodeLetter
|
|
56
|
+
|
|
57
|
+
Whether a value is one letter of a markup code: a string of exactly one
|
|
58
|
+
character from C<MARKUP_CODE_LETTERS>. C<"BI">, C<"B,I">, a lower-case letter and
|
|
59
|
+
anything not a string are not. It costs the same for every value, since the
|
|
60
|
+
reader of codes asks it of each character.
|
|
61
|
+
|
|
62
|
+
=end pod
|
|
63
|
+
*/
|
|
64
|
+
export const isMarkupCodeLetter = (value) => typeof value === 'string' && value.length === 1 && LETTERS.has(value);
|
|
65
|
+
//# sourceMappingURL=markup-code-letters.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"markup-code-letters.js","sourceRoot":"","sources":["../src/markup-code-letters.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;EAUE;AAEF;;;;;;;;;EASE;AACF,MAAM,CAAC,MAAM,mBAAmB,GAAG;IACjC,GAAG;IACH,GAAG;IACH,GAAG;IACH,GAAG;IACH,GAAG;IACH,GAAG;IACH,GAAG;IACH,GAAG;IACH,GAAG;IACH,GAAG;IACH,GAAG;IACH,GAAG;IACH,GAAG;IACH,GAAG;IACH,GAAG;IACH,GAAG;IACH,GAAG;IACH,GAAG;IACH,GAAG;IACH,GAAG;IACH,GAAG;IACH,GAAG;IACH,GAAG;IACH,GAAG;IACH,GAAG;IACH,GAAG;CACK,CAAA;AAEV,2FAA2F;AAC3F,MAAM,OAAO,GAAG,IAAI,GAAG,CAAS,mBAAmB,CAAC,CAAA;AAEpD;;;;;;;;;;;EAWE;AACF,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,KAAc,EAAW,EAAE,CAC5D,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA"}
|
package/esm/pluggableParser.js
CHANGED
|
@@ -10,6 +10,8 @@ import { applyFoldedSections } from './folded-sections.js';
|
|
|
10
10
|
import { assignHeadingKeys } from './helpers/headingKeys.js';
|
|
11
11
|
import { placeInSource, lineStarts } from './codes/place.js';
|
|
12
12
|
export { cleanIds, frozenIds, headingId } from './helpers/ids.js';
|
|
13
|
+
// what the parser did to a table; a report that something written is missing is not one of them
|
|
14
|
+
const TABLE_REPAIRS = ['table-row-cells', 'table-mixed-separators', 'table-cell-outside-row'];
|
|
13
15
|
export const podlitePluggable = ({ plugins = {} } = {}) => {
|
|
14
16
|
let instance = function () { };
|
|
15
17
|
let _plugins = [];
|
|
@@ -52,17 +54,23 @@ export const podlitePluggable = ({ plugins = {} } = {}) => {
|
|
|
52
54
|
// one mistake inside a value reports twice: for the value and for the whole
|
|
53
55
|
// attribute around it. The narrower report names the place to fix. Two reports of
|
|
54
56
|
// one place keep the first; a warning about a markup code is about the code, not
|
|
55
|
-
// a value, and stays
|
|
56
|
-
const
|
|
57
|
-
|
|
57
|
+
// a value, and stays, as do warnings about a row of a table, its source and a list too deep
|
|
58
|
+
const stays = (d) => d.code.startsWith('markup-code-') ||
|
|
59
|
+
d.code.startsWith('table-source-') ||
|
|
60
|
+
d.code === 'list-too-deep' ||
|
|
61
|
+
TABLE_REPAIRS.includes(d.code);
|
|
62
|
+
const innermost = diagnostics.filter((d, k) => stays(d) ||
|
|
58
63
|
!diagnostics.some((other, j) => other !== d &&
|
|
59
|
-
!
|
|
64
|
+
!stays(other) &&
|
|
60
65
|
other.location.start.offset >= d.location.start.offset &&
|
|
61
66
|
other.location.end.offset <= d.location.end.offset &&
|
|
62
67
|
(other.location.start.offset !== d.location.start.offset ||
|
|
63
68
|
other.location.end.offset !== d.location.end.offset ||
|
|
64
69
|
j < k)));
|
|
65
|
-
|
|
70
|
+
// the caller holds this array, so it is refilled in place
|
|
71
|
+
diagnostics.length = 0;
|
|
72
|
+
for (const d of innermost)
|
|
73
|
+
diagnostics.push(d);
|
|
66
74
|
const root = mkRootBlock({ margin: '' }, rawTree);
|
|
67
75
|
// the parse is the one place that has the text the keys are fingerprinted from
|
|
68
76
|
assignHeadingKeys(root, text);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pluggableParser.js","sourceRoot":"","sources":["../src/pluggableParser.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4B,WAAW,EAAY,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,CAAA;AACtG,OAAO,UAAU,MAAM,kBAAkB,CAAA;AACzC,OAAO,YAAY,MAAM,eAAe,CAAA;AACxC,OAAO,IAAI,MAAM,uBAAuB,CAAA;AACxC,OAAO,EAAE,uBAAuB,EAAe,MAAM,6BAA6B,CAAA;AAClF,OAAO,EAAE,yBAAyB,EAAE,MAAM,4BAA4B,CAAA;AACtE,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAA;AAC7D,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AACrC,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAA;AACvD,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAA;AACzD,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AACzD,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;
|
|
1
|
+
{"version":3,"file":"pluggableParser.js","sourceRoot":"","sources":["../src/pluggableParser.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,7 @@
|
|
|
4
4
|
* and the remaining content is treated as the definition for the term.
|
|
5
5
|
*/
|
|
6
6
|
import makeTransformer from './helpers/makeTransformer.js';
|
|
7
|
+
import { applyNumberedShorthand, isBeforeText } from './helpers/numberedShorthand.js';
|
|
7
8
|
export default () => tree => {
|
|
8
9
|
const transformer = makeTransformer({
|
|
9
10
|
defn: node => {
|
|
@@ -13,6 +14,8 @@ export default () => tree => {
|
|
|
13
14
|
const count = content.length;
|
|
14
15
|
let newContent = [];
|
|
15
16
|
let isFirstParaProcessed = false;
|
|
17
|
+
// a leading # numbers the definition only when the term is the first text of the block
|
|
18
|
+
let termComesFirst = true;
|
|
16
19
|
for (let i = 0; i < count; i++) {
|
|
17
20
|
const item = content[i];
|
|
18
21
|
if (item.type === 'para' && !isFirstParaProcessed) {
|
|
@@ -29,6 +32,8 @@ export default () => tree => {
|
|
|
29
32
|
text: term,
|
|
30
33
|
content: [{ type: 'text', value: term }],
|
|
31
34
|
};
|
|
35
|
+
if (termComesFirst)
|
|
36
|
+
applyNumberedShorthand(node, newTermPara);
|
|
32
37
|
newContent.push(newTermPara);
|
|
33
38
|
if (!(splited.length == 1 && splited[0] === '')) {
|
|
34
39
|
textNode.value = splited.join('\n');
|
|
@@ -38,6 +43,8 @@ export default () => tree => {
|
|
|
38
43
|
isFirstParaProcessed = true;
|
|
39
44
|
}
|
|
40
45
|
else {
|
|
46
|
+
if (!isFirstParaProcessed && !isBeforeText(item))
|
|
47
|
+
termComesFirst = false;
|
|
41
48
|
newContent.push(item);
|
|
42
49
|
}
|
|
43
50
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin-defn-fill-term.js","sourceRoot":"","sources":["../src/plugin-defn-fill-term.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,eAAe,MAAM,2BAA2B,CAAA;AACvD,eAAe,GAAG,EAAE,CAAC,IAAI,CAAC,EAAE;IAC1B,MAAM,WAAW,GAAG,eAAe,CAAC;QAClC,IAAI,EAAE,IAAI,CAAC,EAAE;YACX,4BAA4B;YAC5B,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAA;YAE5B,wBAAwB;YACxB,MAAM,KAAK,GAAG,OAAO,CAAC,MAAM,CAAA;YAC5B,IAAI,UAAU,GAAG,EAAE,CAAA;YACnB,IAAI,oBAAoB,GAAG,KAAK,CAAA;YAChC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC;gBAC/B,MAAM,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,CAAA;gBACvB,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,IAAI,CAAC,oBAAoB,EAAE,CAAC;oBAClD,mBAAmB;oBACnB,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA;oBAChC,MAAM,IAAI,GAAG,QAAQ,CAAC,KAAK,CAAA;oBAC3B,sBAAsB;oBACtB,iBAAiB;oBACjB,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;oBAChC,MAAM,IAAI,GAAG,OAAO,CAAC,KAAK,EAAE,CAAA;oBAC5B,MAAM,WAAW,GAAG;wBAClB,IAAI,EAAE,MAAM;wBACZ,IAAI,EAAE,MAAM;wBACZ,IAAI,EAAE,IAAI;wBACV,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;qBACzC,CAAA;oBACD,UAAU,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;oBAC5B,IAAI,CAAC,CAAC,OAAO,CAAC,MAAM,IAAI,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC;wBAChD,QAAQ,CAAC,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;wBACnC,IAAI,CAAC,IAAI,GAAG,QAAQ,CAAC,KAAK,CAAA;wBAC1B,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;oBACvB,CAAC;oBACD,oBAAoB,GAAG,IAAI,CAAA;gBAC7B,CAAC;qBAAM,CAAC;oBACN,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;gBACvB,CAAC;YACH,CAAC;YACD,IAAI,CAAC,OAAO,GAAG,UAAU,CAAA;YACzB,OAAO,IAAI,CAAA;QACb,CAAC;KACF,CAAC,CAAA;IACF,OAAO,WAAW,CAAC,IAAI,EAAE,EAAE,CAAC,CAAA;AAC9B,CAAC,CAAA"}
|
|
1
|
+
{"version":3,"file":"plugin-defn-fill-term.js","sourceRoot":"","sources":["../src/plugin-defn-fill-term.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,eAAe,MAAM,2BAA2B,CAAA;AACvD,OAAO,EAAE,sBAAsB,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAA;AAClF,eAAe,GAAG,EAAE,CAAC,IAAI,CAAC,EAAE;IAC1B,MAAM,WAAW,GAAG,eAAe,CAAC;QAClC,IAAI,EAAE,IAAI,CAAC,EAAE;YACX,4BAA4B;YAC5B,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAA;YAE5B,wBAAwB;YACxB,MAAM,KAAK,GAAG,OAAO,CAAC,MAAM,CAAA;YAC5B,IAAI,UAAU,GAAG,EAAE,CAAA;YACnB,IAAI,oBAAoB,GAAG,KAAK,CAAA;YAChC,uFAAuF;YACvF,IAAI,cAAc,GAAG,IAAI,CAAA;YACzB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC;gBAC/B,MAAM,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,CAAA;gBACvB,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,IAAI,CAAC,oBAAoB,EAAE,CAAC;oBAClD,mBAAmB;oBACnB,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA;oBAChC,MAAM,IAAI,GAAG,QAAQ,CAAC,KAAK,CAAA;oBAC3B,sBAAsB;oBACtB,iBAAiB;oBACjB,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;oBAChC,MAAM,IAAI,GAAG,OAAO,CAAC,KAAK,EAAE,CAAA;oBAC5B,MAAM,WAAW,GAAG;wBAClB,IAAI,EAAE,MAAM;wBACZ,IAAI,EAAE,MAAM;wBACZ,IAAI,EAAE,IAAI;wBACV,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;qBACzC,CAAA;oBACD,IAAI,cAAc;wBAAE,sBAAsB,CAAC,IAAI,EAAE,WAAW,CAAC,CAAA;oBAC7D,UAAU,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;oBAC5B,IAAI,CAAC,CAAC,OAAO,CAAC,MAAM,IAAI,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC;wBAChD,QAAQ,CAAC,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;wBACnC,IAAI,CAAC,IAAI,GAAG,QAAQ,CAAC,KAAK,CAAA;wBAC1B,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;oBACvB,CAAC;oBACD,oBAAoB,GAAG,IAAI,CAAA;gBAC7B,CAAC;qBAAM,CAAC;oBACN,IAAI,CAAC,oBAAoB,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC;wBAAE,cAAc,GAAG,KAAK,CAAA;oBACxE,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;gBACvB,CAAC;YACH,CAAC;YACD,IAAI,CAAC,OAAO,GAAG,UAAU,CAAA;YACzB,OAAO,IAAI,CAAA;QACb,CAAC;KACF,CAAC,CAAA;IACF,OAAO,WAAW,CAAC,IAAI,EAAE,EAAE,CAAC,CAAA;AAC9B,CAAC,CAAA"}
|
package/esm/plugin-group-defn.js
CHANGED
|
@@ -1,15 +1,13 @@
|
|
|
1
|
+
import { numberedOf } from './helpers/itemNumbering.js';
|
|
1
2
|
export default () => tree => {
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
(n1
|
|
5
|
-
|
|
6
|
-
n1['level'] === n2.level &&
|
|
7
|
-
isNumbered(n1) === isNumbered(n2);
|
|
8
|
-
const isNumbered = node => Boolean(node.config && node.config.numbered);
|
|
3
|
+
// a =config defn or =alias defn carries the name too, but it is a directive, not a definition
|
|
4
|
+
const isDefn = node => node.type === 'block' && node.name === 'defn';
|
|
5
|
+
const isNodesEqual = (n1, n2) => isDefn(n1) && isDefn(n2) && n1['level'] === n2.level && isNumbered(n1) === isNumbered(n2);
|
|
6
|
+
const isNumbered = node => numberedOf(node.config) === true;
|
|
9
7
|
const group = a => {
|
|
10
8
|
let lastItem = {};
|
|
11
9
|
let result = a.reduce((a, i) => {
|
|
12
|
-
if (i
|
|
10
|
+
if (isDefn(i)) {
|
|
13
11
|
if (isNodesEqual(lastItem, i)) {
|
|
14
12
|
// group items into arrays
|
|
15
13
|
a[a.length - 1].push(i);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin-group-defn.js","sourceRoot":"","sources":["../src/plugin-group-defn.ts"],"names":[],"mappings":"AAAA,eAAe,GAAG,EAAE,CAAC,IAAI,CAAC,EAAE;IAC1B,MAAM,
|
|
1
|
+
{"version":3,"file":"plugin-group-defn.js","sourceRoot":"","sources":["../src/plugin-group-defn.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAA;AAEpD,eAAe,GAAG,EAAE,CAAC,IAAI,CAAC,EAAE;IAC1B,8FAA8F;IAC9F,MAAM,MAAM,GAAG,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,OAAO,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,CAAA;IACpE,MAAM,YAAY,GAAG,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAC9B,MAAM,CAAC,EAAE,CAAC,IAAI,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,KAAK,IAAI,UAAU,CAAC,EAAE,CAAC,KAAK,UAAU,CAAC,EAAE,CAAC,CAAA;IAE3F,MAAM,UAAU,GAAG,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,IAAI,CAAA;IAE3D,MAAM,KAAK,GAAG,CAAC,CAAC,EAAE;QAChB,IAAI,QAAQ,GAAG,EAAE,CAAA;QACjB,IAAI,MAAM,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;YAC7B,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;gBACd,IAAI,YAAY,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC;oBAC9B,0BAA0B;oBAC1B,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;gBACzB,CAAC;qBAAM,CAAC;oBACN,0BAA0B;oBAC1B,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;gBACb,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,iCAAiC;gBACjC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;YACX,CAAC;YACD,QAAQ,GAAG,CAAC,CAAA;YACZ,OAAO,CAAC,CAAA;QACV,CAAC,EAAE,EAAE,CAAC,CAAA;QACN,+CAA+C;QAC/C;;;;;WAKG;QACH,OAAO,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;YACvB,IAAI,IAAI,YAAY,KAAK,EAAE,CAAC;gBAC1B,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;oBAC5B,OAAO,IAAI,CAAA;gBACb,CAAC;gBACD,mBAAmB;gBACnB,MAAM,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,CAAA;gBAChG,yBAAyB;gBACzB,OAAO;oBACL,IAAI,EAAE,MAAM;oBACZ,IAAI;oBACJ,KAAK,EAAE,CAAC,EAAE,2BAA2B;oBACrC,OAAO,EAAE,CAAC,GAAG,IAAI,CAAC;iBACnB,CAAA;YACH,CAAC;YACD,IAAI,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;gBAC1C,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;YACpC,CAAC;YACD,OAAO,IAAI,CAAA;QACb,CAAC,CAAC,CAAA;IACJ,CAAC,CAAA;IACD,MAAM,KAAK,GAAG,IAAI,CAAC,EAAE;QACnB,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;YACxB,OAAO,KAAK,CAAC,IAAI,CAAC,CAAA;QACpB,CAAC;aAAM,CAAC;YACN,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;gBACnD,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;YACpC,CAAC;QACH,CAAC;QACD,OAAO,IAAI,CAAA;IACb,CAAC,CAAA;IACD,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,CAAA;IAClB,OAAO,IAAI,CAAA;AACb,CAAC,CAAA"}
|
|
@@ -1,5 +1,7 @@
|
|
|
1
|
-
import
|
|
2
|
-
|
|
1
|
+
import { numberedOf } from './helpers/itemNumbering.js';
|
|
2
|
+
// lists nest no deeper than this: deeper trees overflow the stack of the renderers
|
|
3
|
+
export const MAX_LIST_LEVEL = 50;
|
|
4
|
+
export default (opt = {}) => tree => {
|
|
3
5
|
const isNodesEqual = (n1, n2) =>
|
|
4
6
|
// if nodes items
|
|
5
7
|
(n1.name === 'item' || n1.name === 'defn') &&
|
|
@@ -7,9 +9,39 @@ export default () => tree => {
|
|
|
7
9
|
n1['level'] === n2.level &&
|
|
8
10
|
isNumbered(n1) === isNumbered(n2) &&
|
|
9
11
|
isChecked(n1) === isChecked(n2);
|
|
10
|
-
const isNumbered = node =>
|
|
12
|
+
const isNumbered = node => numberedOf(node.config) === true;
|
|
11
13
|
const isChecked = node => node.checked !== undefined;
|
|
12
|
-
|
|
14
|
+
// the level a list is built at; the level the author wrote stays on the item
|
|
15
|
+
const nestAt = item => Math.min(Number(item.level), MAX_LIST_LEVEL);
|
|
16
|
+
const tooDeep = item => item.name === 'item' && item.type === 'block' && Number(item.level) > MAX_LIST_LEVEL;
|
|
17
|
+
const report = item => {
|
|
18
|
+
if (!Array.isArray(opt.diagnostics))
|
|
19
|
+
return;
|
|
20
|
+
opt.diagnostics.push({
|
|
21
|
+
severity: 'warning',
|
|
22
|
+
code: 'list-too-deep',
|
|
23
|
+
message: `list item at level ${Number(item.level)} is deeper than ${MAX_LIST_LEVEL} levels; it is shown at level ${MAX_LIST_LEVEL}`,
|
|
24
|
+
location: item.location,
|
|
25
|
+
});
|
|
26
|
+
};
|
|
27
|
+
// a list is the items of one content with nothing but blank lines between them
|
|
28
|
+
const reportDeepLists = content => {
|
|
29
|
+
let told = false;
|
|
30
|
+
content.forEach(node => {
|
|
31
|
+
if (node.type === 'blankline')
|
|
32
|
+
return;
|
|
33
|
+
if (node.name !== 'item' || node.type !== 'block')
|
|
34
|
+
told = false;
|
|
35
|
+
else if (!told && tooDeep(node)) {
|
|
36
|
+
report(node);
|
|
37
|
+
told = true;
|
|
38
|
+
}
|
|
39
|
+
});
|
|
40
|
+
};
|
|
41
|
+
// the content of a list is grouped again for its next level and is not told twice
|
|
42
|
+
const group = (a, level = 1, ofList = false) => {
|
|
43
|
+
if (!ofList)
|
|
44
|
+
reportDeepLists(a);
|
|
13
45
|
const isInListMode = a => {
|
|
14
46
|
return a.length > 0 && a[a.length - 1].type === 'list';
|
|
15
47
|
};
|
|
@@ -21,21 +53,23 @@ export default () => tree => {
|
|
|
21
53
|
let lastItem = {};
|
|
22
54
|
let result = a.reduce((a, i) => {
|
|
23
55
|
// skip items out of level
|
|
24
|
-
if (i.name === 'item' && i.type === 'block' && i
|
|
25
|
-
|
|
56
|
+
if (i.name === 'item' && i.type === 'block' && nestAt(i) < level) {
|
|
57
|
+
a.push(i);
|
|
58
|
+
return a;
|
|
26
59
|
}
|
|
27
60
|
if (i.name === 'item' &&
|
|
28
61
|
i.type === 'block' &&
|
|
29
62
|
(!isInListMode(a) ||
|
|
30
63
|
// different type of list and item
|
|
31
64
|
// at the same level
|
|
32
|
-
|
|
65
|
+
// and an item past the limit in a list that already stands at the limit
|
|
66
|
+
((nestAt(i) === level || (tooDeep(i) && Number(getList(a).level) === MAX_LIST_LEVEL)) &&
|
|
33
67
|
getList(a).list !== (isNumbered(i) ? 'ordered' : isChecked(i) ? 'task' : 'itemized')))) {
|
|
34
68
|
// create empty list
|
|
35
69
|
// list = ['ordered', 'variable', 'itemized']
|
|
36
70
|
a.push({
|
|
37
71
|
type: 'list',
|
|
38
|
-
level: i.level,
|
|
72
|
+
level: tooDeep(i) ? MAX_LIST_LEVEL : i.level,
|
|
39
73
|
content: [],
|
|
40
74
|
list: isNumbered(i) ? 'ordered' : isChecked(i) ? 'task' : 'itemized',
|
|
41
75
|
});
|
|
@@ -60,7 +94,7 @@ export default () => tree => {
|
|
|
60
94
|
return result.map(item => {
|
|
61
95
|
// process any item with content ( except formatting codes)
|
|
62
96
|
if (item.content && item.type !== 'fcode') {
|
|
63
|
-
item.content = group(item.content, Number(item.level || 0) + 1);
|
|
97
|
+
item.content = group(item.content, Number(item.level || 0) + 1, item.type === 'list');
|
|
64
98
|
}
|
|
65
99
|
return item;
|
|
66
100
|
});
|