@podlite/schema 0.0.74 → 0.0.76
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 +48 -0
- package/esm/ast-helpers.d.ts +2 -1
- package/esm/ast-helpers.js +31 -2
- package/esm/ast-helpers.js.map +1 -1
- package/esm/codes/place.d.ts +13 -0
- package/esm/codes/place.js +105 -0
- package/esm/codes/place.js.map +1 -0
- package/esm/codes/read.d.ts +21 -0
- package/esm/codes/read.js +365 -0
- package/esm/codes/read.js.map +1 -0
- package/esm/codes/scan.d.ts +41 -0
- package/esm/codes/scan.js +332 -0
- package/esm/codes/scan.js.map +1 -0
- package/esm/exportHtml.js +44 -13
- package/esm/exportHtml.js.map +1 -1
- package/esm/exportMarkdown.js +32 -9
- package/esm/exportMarkdown.js.map +1 -1
- package/esm/guard.d.ts +9 -0
- package/esm/guard.js +100 -0
- package/esm/guard.js.map +1 -1
- package/esm/helpers/blockName.d.ts +1 -0
- package/esm/helpers/blockName.js +28 -2
- package/esm/helpers/blockName.js.map +1 -1
- package/esm/helpers/configPropagation.js +3 -1
- package/esm/helpers/configPropagation.js.map +1 -1
- package/esm/helpers/handlers.d.ts +3 -0
- package/esm/helpers/handlers.js +23 -0
- package/esm/helpers/handlers.js.map +1 -1
- package/esm/helpers/headingKeys.d.ts +2 -0
- package/esm/helpers/headingKeys.js +45 -0
- package/esm/helpers/headingKeys.js.map +1 -0
- package/esm/helpers/ids.js +1 -1
- package/esm/helpers/ids.js.map +1 -1
- package/esm/helpers/numberedShorthand.d.ts +1 -0
- package/esm/helpers/numberedShorthand.js +32 -0
- package/esm/helpers/numberedShorthand.js.map +1 -0
- package/esm/helpers/stripMarker.d.ts +1 -0
- package/esm/helpers/stripMarker.js +24 -0
- package/esm/helpers/stripMarker.js.map +1 -0
- package/esm/index.d.ts +5 -4
- package/esm/index.js +6 -5
- package/esm/index.js.map +1 -1
- package/esm/pluggableParser.js +35 -4
- package/esm/pluggableParser.js.map +1 -1
- package/esm/plugin-formatting-codes.js +44 -12
- package/esm/plugin-formatting-codes.js.map +1 -1
- package/esm/plugin-heading.js +3 -11
- package/esm/plugin-heading.js.map +1 -1
- package/esm/plugin-items.js +3 -32
- package/esm/plugin-items.js.map +1 -1
- package/esm/plugin-vmargin.js +16 -3
- package/esm/plugin-vmargin.js.map +1 -1
- package/esm/selectors.d.ts +3 -2
- package/esm/selectors.js +35 -4
- package/esm/selectors.js.map +1 -1
- package/esm/types.d.ts +30 -6
- package/esm/version.d.ts +1 -1
- package/esm/version.js +1 -1
- package/lib/ast-helpers.d.ts +2 -1
- package/lib/ast-helpers.js +31 -2
- package/lib/codes/place.d.ts +13 -0
- package/lib/codes/place.js +111 -0
- package/lib/codes/read.d.ts +21 -0
- package/lib/codes/read.js +369 -0
- package/lib/codes/scan.d.ts +41 -0
- package/lib/codes/scan.js +336 -0
- package/lib/exportHtml.js +43 -12
- package/lib/exportMarkdown.js +31 -8
- package/lib/guard.d.ts +9 -0
- package/lib/guard.js +104 -1
- package/lib/helpers/blockName.d.ts +1 -0
- package/lib/helpers/blockName.js +30 -3
- package/lib/helpers/configPropagation.js +3 -1
- package/lib/helpers/handlers.d.ts +3 -0
- package/lib/helpers/handlers.js +25 -1
- package/lib/helpers/headingKeys.d.ts +2 -0
- package/lib/helpers/headingKeys.js +50 -0
- package/lib/helpers/ids.js +1 -1
- package/lib/helpers/numberedShorthand.d.ts +1 -0
- package/lib/helpers/numberedShorthand.js +36 -0
- package/lib/helpers/stripMarker.d.ts +1 -0
- package/lib/helpers/stripMarker.js +28 -0
- package/lib/index.d.ts +5 -4
- package/lib/index.js +13 -3
- package/lib/pluggableParser.js +35 -4
- package/lib/plugin-formatting-codes.js +44 -45
- package/lib/plugin-heading.js +3 -11
- package/lib/plugin-items.js +4 -33
- package/lib/plugin-vmargin.js +16 -3
- package/lib/selectors.d.ts +3 -2
- package/lib/selectors.js +37 -5
- package/lib/types.d.ts +30 -6
- package/lib/version.d.ts +1 -1
- package/lib/version.js +1 -1
- package/package.json +2 -2
- package/schema/AstTree.json +174 -27
- package/schema/PodliteDocument.json +174 -27
- package/esm/grammarfc.d.ts +0 -14
- package/esm/grammarfc.js +0 -9824
- package/esm/grammarfc.js.map +0 -1
- package/lib/grammarfc.d.ts +0 -14
- package/lib/grammarfc.js +0 -9824
|
@@ -0,0 +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,8BAA8B;AAC9B,MAAM,CAAC,MAAM,sBAAsB,GAAG,IAAI,CAAC,EAAE;IAC3C,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA;IAC5B,MAAM,IAAI,GAAG,IAAI,IAAI,SAAS,CAAC,IAAI,CAAC,CAAA;IACpC,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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export declare const stripMarker: (para: any, re: RegExp) => void;
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
// At this point the leading content element is still an unparsed text node;
|
|
2
|
+
// formatting codes are built from its value further down the pipeline. Cut the
|
|
3
|
+
// marker out of that value and leave the node in place: replacing the array
|
|
4
|
+
// with a plain string ends the chain early and drops every L<>, C<> and B< >
|
|
5
|
+
// written on the same line. Only a paragraph has its content cut; code keeps it.
|
|
6
|
+
export const stripMarker = (para, re) => {
|
|
7
|
+
if (typeof para.text === 'string')
|
|
8
|
+
para.text = para.text.replace(re, '');
|
|
9
|
+
if (para.type !== 'para')
|
|
10
|
+
return;
|
|
11
|
+
if (!Array.isArray(para.content)) {
|
|
12
|
+
if (typeof para.text === 'string')
|
|
13
|
+
para.content = [para.text];
|
|
14
|
+
return;
|
|
15
|
+
}
|
|
16
|
+
const first = para.content[0];
|
|
17
|
+
if (typeof first === 'string') {
|
|
18
|
+
para.content[0] = first.replace(re, '');
|
|
19
|
+
}
|
|
20
|
+
else if (first && typeof first.value === 'string') {
|
|
21
|
+
first.value = first.value.replace(re, '');
|
|
22
|
+
}
|
|
23
|
+
};
|
|
24
|
+
//# sourceMappingURL=stripMarker.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"stripMarker.js","sourceRoot":"","sources":["../../src/helpers/stripMarker.ts"],"names":[],"mappings":"AAAA,4EAA4E;AAC5E,+EAA+E;AAC/E,4EAA4E;AAC5E,6EAA6E;AAC7E,iFAAiF;AACjF,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,IAAI,EAAE,EAAU,EAAE,EAAE;IAC9C,IAAI,OAAO,IAAI,CAAC,IAAI,KAAK,QAAQ;QAAE,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,CAAC,CAAA;IACxE,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM;QAAE,OAAM;IAChC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;QACjC,IAAI,OAAO,IAAI,CAAC,IAAI,KAAK,QAAQ;YAAE,IAAI,CAAC,OAAO,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAC7D,OAAM;IACR,CAAC;IACD,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA;IAC7B,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,CAAC,CAAA;IACzC,CAAC;SAAM,IAAI,KAAK,IAAI,OAAO,KAAK,CAAC,KAAK,KAAK,QAAQ,EAAE,CAAC;QACpD,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,CAAC,CAAA;IAC3C,CAAC;AACH,CAAC,CAAA"}
|
package/esm/index.d.ts
CHANGED
|
@@ -15,6 +15,7 @@ export { toAny } from './exportAny';
|
|
|
15
15
|
export { makeAttrs, codeConfigWithDefaults } from './helpers/config';
|
|
16
16
|
export { parseAttributes } from './helpers/parseAttributes';
|
|
17
17
|
export { readLinkConfig } from './helpers/link-config';
|
|
18
|
+
export { assignHeadingKeys, fingerprint } from './helpers/headingKeys';
|
|
18
19
|
export { quoteAttribute } from './helpers/html-attr';
|
|
19
20
|
export type { LinkConfig } from './helpers/link-config';
|
|
20
21
|
export { pluginCleanLocation } from './plugin-clean-location';
|
|
@@ -22,7 +23,7 @@ export { toAnyRules } from './helpers/plugins';
|
|
|
22
23
|
export { podlitePluggable, Podlite, PodliteExport, cleanIds, frozenIds, headingId } from './pluggableParser';
|
|
23
24
|
import { ConfigScope } from './helpers/configPropagation';
|
|
24
25
|
export { mergeConfigSettings, propagateConfigDefaults, walkConfigScopes } from './helpers/configPropagation';
|
|
25
|
-
export { blockNameOf, holderInside } from './helpers/blockName';
|
|
26
|
+
export { blockNameOf, holderInside, isDirectiveNode, isWrapper } from './helpers/blockName';
|
|
26
27
|
export type { ConfigScope, ScopedBlock } from './helpers/configPropagation';
|
|
27
28
|
export declare function toAst(): {};
|
|
28
29
|
export type SchemaValidationError = ErrorObject<string, Record<string, any>>;
|
|
@@ -91,14 +92,14 @@ declare const parse: Function;
|
|
|
91
92
|
export { parse as parse };
|
|
92
93
|
export declare const parseFormattingCodes: (text: string, options?: {
|
|
93
94
|
[key: string]: any;
|
|
94
|
-
}) => any
|
|
95
|
+
}) => any;
|
|
95
96
|
export { default as toHtml } from './exportHtml';
|
|
96
97
|
export { default as toMarkdown } from './exportMarkdown';
|
|
97
98
|
export { default as Writer } from './writer';
|
|
98
|
-
export { parseSelector, runSelector, outermost, filePathMatches, getDocIDs, SelectorError } from './selectors';
|
|
99
|
+
export { parseSelector, readSelector, runSelector, outermost, filePathMatches, getDocIDs, SelectorError, } from './selectors';
|
|
99
100
|
export { applySetToFirst, mergeSet, isSetTransparent, isSetTarget } from './set-assign';
|
|
100
101
|
export type { SetOutcome } from './set-assign';
|
|
101
|
-
export { markGuarded, isCovered } from './guard';
|
|
102
|
+
export { markGuarded, isCovered, guardedTextLeaves, getMaskedTextContent, renderCodeText } from './guard';
|
|
102
103
|
export { applyFoldedSections } from './folded-sections';
|
|
103
104
|
export { testCaption, testFoldedByAuthor } from './test-display';
|
|
104
105
|
export { tocTitleText } from './toc-caption';
|
package/esm/index.js
CHANGED
|
@@ -16,12 +16,13 @@ export { toAny } from './exportAny.js';
|
|
|
16
16
|
export { makeAttrs, codeConfigWithDefaults } from './helpers/config.js';
|
|
17
17
|
export { parseAttributes } from './helpers/parseAttributes.js';
|
|
18
18
|
export { readLinkConfig } from './helpers/link-config.js';
|
|
19
|
+
export { assignHeadingKeys, fingerprint } from './helpers/headingKeys.js';
|
|
19
20
|
export { quoteAttribute } from './helpers/html-attr.js';
|
|
20
21
|
export { pluginCleanLocation } from './plugin-clean-location.js';
|
|
21
22
|
export { toAnyRules } from './helpers/plugins.js';
|
|
22
23
|
export { podlitePluggable, cleanIds, frozenIds, headingId } from './pluggableParser.js';
|
|
23
24
|
import * as parser from './grammar.js';
|
|
24
|
-
import {
|
|
25
|
+
import { readCodes } from './codes/read.js';
|
|
25
26
|
import { parseAttributes } from './helpers/parseAttributes.js';
|
|
26
27
|
import vmargin_plug from './plugin-vmargin.js';
|
|
27
28
|
import formattingCodes_plug from './plugin-formatting-codes.js';
|
|
@@ -33,7 +34,7 @@ import defnTerms_plug from './plugin-defn-fill-term.js';
|
|
|
33
34
|
import set_plug from './plugin-set.js';
|
|
34
35
|
import { propagateConfigDefaults } from './helpers/configPropagation.js';
|
|
35
36
|
export { mergeConfigSettings, propagateConfigDefaults, walkConfigScopes } from './helpers/configPropagation.js';
|
|
36
|
-
export { blockNameOf, holderInside } from './helpers/blockName.js';
|
|
37
|
+
export { blockNameOf, holderInside, isDirectiveNode, isWrapper } from './helpers/blockName.js';
|
|
37
38
|
import table_plug from './plugin-tables.js';
|
|
38
39
|
import data_table_plug from './plugin-data-table.js';
|
|
39
40
|
export function toAst() {
|
|
@@ -163,13 +164,13 @@ function makeTree() {
|
|
|
163
164
|
export { makeTree as toTree };
|
|
164
165
|
const parse = makeTree().parse;
|
|
165
166
|
export { parse as parse };
|
|
166
|
-
export const parseFormattingCodes = (text, options = {}) =>
|
|
167
|
+
export const parseFormattingCodes = (text, options = {}) => readCodes(text, { parseAttributes, entityInCode: true, ...options });
|
|
167
168
|
export { default as toHtml } from './exportHtml.js';
|
|
168
169
|
export { default as toMarkdown } from './exportMarkdown.js';
|
|
169
170
|
export { default as Writer } from './writer.js';
|
|
170
|
-
export { parseSelector, runSelector, outermost, filePathMatches, getDocIDs, SelectorError } from './selectors.js';
|
|
171
|
+
export { parseSelector, readSelector, runSelector, outermost, filePathMatches, getDocIDs, SelectorError, } from './selectors.js';
|
|
171
172
|
export { applySetToFirst, mergeSet, isSetTransparent, isSetTarget } from './set-assign.js';
|
|
172
|
-
export { markGuarded, isCovered } from './guard.js';
|
|
173
|
+
export { markGuarded, isCovered, guardedTextLeaves, getMaskedTextContent, renderCodeText } from './guard.js';
|
|
173
174
|
export { applyFoldedSections } from './folded-sections.js';
|
|
174
175
|
export { testCaption, testFoldedByAuthor } from './test-display.js';
|
|
175
176
|
export { tocTitleText } from './toc-caption.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,cAAc,mBAAmB,CAAA;AACjC,cAAc,kBAAkB,CAAA;AAChC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,eAAe,CAAA;AAC7B,cAAc,oBAAoB,CAAA;AAElC,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAA;AAC9C,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAC1F,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AACnC,OAAO,EAAE,SAAS,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAA;AACpE,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AAEpD,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAA;AAC7D,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAE9C,OAAO,EAAE,gBAAgB,EAA0B,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAE5G,OAAO,KAAK,MAAM,MAAM,WAAW,CAAA;AACnC,OAAO,EAAE,
|
|
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,cAAc,mBAAmB,CAAA;AACjC,cAAc,kBAAkB,CAAA;AAChC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,eAAe,CAAA;AAC7B,cAAc,oBAAoB,CAAA;AAElC,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAA;AAC9C,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAC1F,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AACnC,OAAO,EAAE,SAAS,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAA;AACpE,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AACtD,OAAO,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAA;AACtE,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AAEpD,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAA;AAC7D,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAE9C,OAAO,EAAE,gBAAgB,EAA0B,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAE5G,OAAO,KAAK,MAAM,MAAM,WAAW,CAAA;AACnC,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AACxC,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAC3D,OAAO,YAAY,MAAM,kBAAkB,CAAA;AAC3C,OAAO,oBAAoB,MAAM,2BAA2B,CAAA;AAC5D,OAAO,mBAAmB,MAAM,gBAAgB,CAAA;AAChD,OAAO,YAAY,MAAM,kBAAkB,CAAA;AAC3C,OAAO,cAAc,MAAM,qBAAqB,CAAA;AAChD,OAAO,eAAe,MAAM,sBAAsB,CAAA;AAClD,OAAO,cAAc,MAAM,yBAAyB,CAAA;AACpD,OAAO,QAAQ,MAAM,cAAc,CAAA;AACnC,OAAO,EAAE,uBAAuB,EAAe,MAAM,6BAA6B,CAAA;AAClF,OAAO,EAAE,mBAAmB,EAAE,uBAAuB,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAA;AAC5G,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAE3F,OAAO,UAAU,MAAM,iBAAiB,CAAA;AACxC,OAAO,eAAe,MAAM,qBAAqB,CAAA;AAEjD,MAAM,UAAU,KAAK;IACnB,OAAO,EAAE,CAAA;AACX,CAAC;AAGD,kFAAkF;AAClF,oFAAoF;AACpF,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,YAAY,EAAE,KAAK,EAAE,CAAC,CAAA;AAEjF,MAAM,UAAU,sBAAsB,CAAC,IAAa;IAClD,IAAI,IAAI,GAAG,EAAE,CAAA;IACb,MAAM,KAAK,GAAG;QACZ,OAAO,EAAE,IAAI,CAAC,EAAE;YACd,IAAI,IAAI,IAAI,CAAC,KAAK,CAAA;QACpB,CAAC;QACD,WAAW,EAAE,IAAI,CAAC,EAAE;YAClB,IAAI,IAAI,IAAI,CAAC,KAAK,CAAA;QACpB,CAAC;KACF,CAAA;IACD,MAAM,WAAW,GAAG,aAAa,CAAC,KAAK,CAAC,CAAA;IACxC,MAAM,GAAG,GAAG,WAAW,CAAC,IAAI,EAAE,EAAE,CAAC,CAAA;IACjC,OAAO,IAAI,CAAA;AACb,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,IAAa;IACjD,IAAI,IAAI,GAAG,EAAE,CAAA;IACb,MAAM,KAAK,GAAG;QACZ,GAAG,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,EAAE;YAC1B,IAAI,IAAI,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;gBAC9B,IAAI,IAAI,IAAI,CAAA;gBACZ,OAAM;YACR,CAAC;YACD,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;gBACd,IAAI,IAAI,IAAI,CAAC,IAAI,CAAA;gBACjB,OAAM;YACR,CAAC;YAED,IAAI,IAAI,IAAI,IAAI,CAAC,IAAI,GAAG,CAAA;YACxB,IAAI,SAAS,IAAI,IAAI,EAAE,CAAC;gBACtB,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,CAAA;YAC5B,CAAC;YACD,OAAO,IAAI,CAAA;QACb,CAAC;KACF,CAAA;IACD,MAAM,WAAW,GAAG,aAAa,CAAC,KAAK,CAAC,CAAA;IACxC,MAAM,GAAG,GAAG,WAAW,CAAC,IAAI,EAAE,EAAE,CAAC,CAAA;IACjC,OAAO,IAAI,CAAA;AACb,CAAC;AACD,MAAM,UAAU,kBAAkB,CAAC,IAAa;IAC9C,OAAO,WAAW,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAA;AAC7C,CAAC;AACD,MAAM,UAAU,eAAe,CAAC,IAAa;IAC3C,OAAO,WAAW,CAAC,IAAI,EAAE,SAAS,CAAC,CAAA;AACrC,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,IAAa,EAAE,OAAe,SAAS;IACjE,MAAM,aAAa,GAA4B,UAAU,CAAC,IAAI,CAAC,CAAA;IAC/D,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,OAAO,CAAC,IAAI,CAAC,8BAA8B,IAAI,UAAU,CAAC,CAAA;IAC5D,CAAC;IAED,MAAM,QAAQ,GAAG,GAAG,CAAC,OAAO,CAAU,aAAa,CAAC,CAAA;IACpD,IAAI,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QACnB,OAAO,EAAE,CAAA;IACX,CAAC;IACD,OAAO,QAAQ,CAAC,MAAM,IAAI,EAAE,CAAA;AAC9B,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,MAA+B,EAAE,GAAQ;IACvE,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACtB,4BAA4B;QAC5B,IAAI,cAAc,GAAG,EAAE,CAAA;QACvB,MAAM,OAAO,GAAG,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;YAC7B,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAA;YACpD,OAAO,GAAG,CAAA;QACZ,CAAC,CAAA;QACD,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,cAAc,CAAC,CAAA;QACtD,MAAM,WAAW,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAA;QAC3F,OAAO,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,WAAW,CAAC,CAAA;IACtC,CAAC;IACD,OAAO,SAAS,CAAA;AAClB,CAAC;AAwDD,MAAM,mBAAmB,GAAiB,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,uBAAuB,CAAC,IAAI,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;AAElG,SAAS,QAAQ;IACf,IAAI,OAAO,GAAwB,EAAE,CAAA;IACrC,KAAK,CAAC,GAAG,GAAG,GAAG,CAAA;IACf,KAAK,CAAC,KAAK,GAAG,KAAK,CAAA;IACnB,KAAK,CAAC,GAAG,CAAC,YAAY,CAAC,CAAA;IACvB,6EAA6E;IAC7E,wCAAwC;IACxC,KAAK,CAAC,GAAG,CAAC,cAAc,CAAC,CAAA;IACzB,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;IACnB,KAAK,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAA;IAC9B,KAAK,CAAC,GAAG,CAAC,YAAY,CAAC,CAAA;IACvB,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;IACrB,8EAA8E;IAC9E,qEAAqE;IACrE,KAAK,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAA;IAC9B,KAAK,CAAC,GAAG,CAAC,eAAe,CAAC,CAAA;IAC1B,2EAA2E;IAC3E,6DAA6D;IAC7D,KAAK,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAA;IAC9B,KAAK,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAA;IAE/B,sCAAsC;IACtC,KAAK,CAAC,GAAG,CAAC,eAAe,CAAC,CAAA;IAC1B,KAAK,CAAC,GAAG,CAAC,cAAc,CAAC,CAAA;IACzB,OAAO,KAAK,CAAA;IAEZ,SAAS,KAAK;QACZ,OAAM;IACR,CAAC;IAED,SAAS,GAAG,CAAC,MAAoB;QAC/B,IAAI,CAAC,CAAC,UAAU,CAAC,CAAC,QAAQ,CAAC,OAAO,MAAM,CAAC,EAAE,CAAC;YAC1C,MAAM,MAAM,CAAA;QACd,CAAC;QAED,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QACpB,OAAO,KAAK,CAAA;IACd,CAAC;IAED,SAAS,KAAK,CAAC,GAAW,EAAE,MAAgB,EAAE,SAAS,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE;QACtE,MAAM,EAAE,SAAS,GAAG,CAAC,EAAE,OAAO,GAAG,CAAC,EAAE,WAAW,EAAE,WAAW,EAAE,GAAG,GAAG,CAAA;QACpE,IAAI,IAAI,GAAQ,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,UAAU,EAAE,WAAW,EAAE,CAAC,CAAA;QACjG,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;gBACxC,MAAM,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAAA;gBACzB,OAAO;gBACP,MAAM,OAAO,GAAG,MAAM,CAAC,GAAG,CAAC,CAAA;gBAC3B,eAAe;gBACf,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;YACtB,CAAC;QACH,CAAC;QACD,OAAO,IAAI,CAAA;IACb,CAAC;AACH,CAAC;AAED,OAAO,EAAE,QAAQ,IAAI,MAAM,EAAE,CAAA;AAC7B,MAAM,KAAK,GAAa,QAAQ,EAAE,CAAC,KAAK,CAAA;AACxC,OAAO,EAAE,KAAK,IAAI,KAAK,EAAE,CAAA;AACzB,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,IAAY,EAAE,UAAkC,EAAE,EAAO,EAAE,CAC9F,SAAS,CAAC,IAAI,EAAE,EAAE,eAAe,EAAE,YAAY,EAAE,IAAI,EAAE,GAAG,OAAO,EAAE,CAAC,CAAA;AACtE,OAAO,EAAE,OAAO,IAAI,MAAM,EAAE,MAAM,cAAc,CAAA;AAChD,OAAO,EAAE,OAAO,IAAI,UAAU,EAAE,MAAM,kBAAkB,CAAA;AACxD,OAAO,EAAE,OAAO,IAAI,MAAM,EAAE,MAAM,UAAU,CAAA;AAC5C,OAAO,EACL,aAAa,EACb,YAAY,EACZ,WAAW,EACX,SAAS,EACT,eAAe,EACf,SAAS,EACT,aAAa,GACd,MAAM,aAAa,CAAA;AACpB,OAAO,EAAE,eAAe,EAAE,QAAQ,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,cAAc,CAAA;AAEvF,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AACzG,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAA;AACvD,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAA;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA;AAE5C,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAC7C,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA"}
|
package/esm/pluggableParser.js
CHANGED
|
@@ -7,6 +7,8 @@ import { attachHeadingNumberPrefix } from './helpers/headingNumbering.js';
|
|
|
7
7
|
import { promoteOrderedLists } from './helpers/itemNumbering.js';
|
|
8
8
|
import { markGuarded } from './guard.js';
|
|
9
9
|
import { applyFoldedSections } from './folded-sections.js';
|
|
10
|
+
import { assignHeadingKeys } from './helpers/headingKeys.js';
|
|
11
|
+
import { placeInSource, lineStarts } from './codes/place.js';
|
|
10
12
|
export { cleanIds, frozenIds, headingId } from './helpers/ids.js';
|
|
11
13
|
export const podlitePluggable = ({ plugins = {} } = {}) => {
|
|
12
14
|
let instance = function () { };
|
|
@@ -28,13 +30,42 @@ export const podlitePluggable = ({ plugins = {} } = {}) => {
|
|
|
28
30
|
const rawTree = toTree()
|
|
29
31
|
.use(idMiddleware)
|
|
30
32
|
.parse(text, { ...opt, diagnostics });
|
|
33
|
+
// a warning about a markup code knows its place in the text it was read from;
|
|
34
|
+
// the source turns that into a place a reader can go to
|
|
35
|
+
const placed = new Set();
|
|
36
|
+
let starts = null;
|
|
37
|
+
for (let k = 0; k < diagnostics.length; k++) {
|
|
38
|
+
const d = diagnostics[k];
|
|
39
|
+
if (!d.pending)
|
|
40
|
+
continue;
|
|
41
|
+
starts = starts || lineStarts(text);
|
|
42
|
+
d.location = placeInSource(text, d.location, d.pending, starts);
|
|
43
|
+
// the same text read twice reports one warning for one place; two pieces of text
|
|
44
|
+
// placed at the same point, such as cells of one row, keep their warnings apart
|
|
45
|
+
const key = `${d.code}@${d.location.start.offset}@${d.pending.start}@${d.pending.fragment.text}`;
|
|
46
|
+
delete d.pending;
|
|
47
|
+
if (placed.has(key))
|
|
48
|
+
diagnostics.splice(k--, 1);
|
|
49
|
+
else
|
|
50
|
+
placed.add(key);
|
|
51
|
+
}
|
|
31
52
|
// one mistake inside a value reports twice: for the value and for the whole
|
|
32
|
-
// attribute around it. The narrower report names the place to fix
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
53
|
+
// attribute around it. The narrower report names the place to fix. Two reports of
|
|
54
|
+
// one place keep the first; a warning about a markup code is about the code, not
|
|
55
|
+
// a value, and stays
|
|
56
|
+
const isCodeWarning = (d) => d.code.startsWith('markup-code-');
|
|
57
|
+
const innermost = diagnostics.filter((d, k) => isCodeWarning(d) ||
|
|
58
|
+
!diagnostics.some((other, j) => other !== d &&
|
|
59
|
+
!isCodeWarning(other) &&
|
|
60
|
+
other.location.start.offset >= d.location.start.offset &&
|
|
61
|
+
other.location.end.offset <= d.location.end.offset &&
|
|
62
|
+
(other.location.start.offset !== d.location.start.offset ||
|
|
63
|
+
other.location.end.offset !== d.location.end.offset ||
|
|
64
|
+
j < k)));
|
|
36
65
|
diagnostics.splice(0, diagnostics.length, ...innermost);
|
|
37
66
|
const root = mkRootBlock({ margin: '' }, rawTree);
|
|
67
|
+
// the parse is the one place that has the text the keys are fingerprinted from
|
|
68
|
+
assignHeadingKeys(root, text);
|
|
38
69
|
return diagnostics.length ? { ...root, diagnostics } : root;
|
|
39
70
|
};
|
|
40
71
|
instance.toAst = (ast, opt) => {
|
|
@@ -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,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AA6B9D,MAAM,CAAC,MAAM,gBAAgB,GAA8C,CAAC,EAAE,OAAO,GAAG,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE;IACnG,IAAI,QAAQ,GAAY,cAAa,CAAC,CAAA;IACtC,IAAI,QAAQ,GAAc,EAAE,CAAA;IAE5B,QAAQ,CAAC,GAAG,GAAG,CAAC,GAAY,EAAE,EAAE;QAC9B,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;YACzC,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,MAAM,CAAA;YACzB,IAAI,OAAO,GAAG,KAAK,UAAU,EAAE,CAAC;gBAC9B,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE,CAAC,CAAA;YAC1C,CAAC;iBAAM,CAAC;gBACN,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,CAAC,CAAA;YAC/B,CAAC;QACH,CAAC;QACD,OAAO,QAAQ,CAAA;IACjB,CAAC,CAAA;IAED,QAAQ,CAAC,KAAK,GAAG,CAAC,IAAI,EAAE,MAAgB,EAAE,SAAS,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,EAAE,EAAE;QACtE,MAAM,WAAW,GAAG,GAAG,CAAC,WAAW,IAAI,EAAE,CAAA;QACzC,MAAM,OAAO,GAAG,MAAM,EAAE;aACrB,GAAG,CAAC,YAAY,CAAC;aACjB,KAAK,CAAC,IAAI,EAAE,EAAE,GAAG,GAAG,EAAE,WAAW,EAAE,CAAC,CAAA;QACvC,4EAA4E;QAC5E,
|
|
1
|
+
{"version":3,"file":"pluggableParser.js","sourceRoot":"","sources":["../src/pluggableParser.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import
|
|
1
|
+
import { readCodes } from './codes/read.js';
|
|
2
|
+
import { registerInline } from './codes/place.js';
|
|
2
3
|
import makeTransformer from './helpers/makeTransformer.js';
|
|
3
4
|
import { isNamedBlock } from './helpers/makeTransformer.js';
|
|
4
5
|
import makeAttrs from './helpers/config.js';
|
|
@@ -32,17 +33,33 @@ const allowOf = (node) => {
|
|
|
32
33
|
return conf.exists('allow') ? conf.getAllValues('allow') : undefined;
|
|
33
34
|
};
|
|
34
35
|
const middle = opt => tree => {
|
|
36
|
+
// the codes of one piece of text; a warning keeps the block it came from and its
|
|
37
|
+
// place in the text, and the parser turns that into a place in the source
|
|
38
|
+
const read = (text, allowed, allowedIn, block, inline = false) => {
|
|
39
|
+
const issues = [];
|
|
40
|
+
const content = readCodes(text, { allowed, allowedIn, parseAttributes, entityInCode: true, issues });
|
|
41
|
+
const location = block && block.location;
|
|
42
|
+
const fragment = { text, inline };
|
|
43
|
+
if (inline && block && block.location)
|
|
44
|
+
registerInline(block.location, fragment);
|
|
45
|
+
if (Array.isArray(opt.diagnostics) && location)
|
|
46
|
+
for (const issue of issues)
|
|
47
|
+
opt.diagnostics.push({
|
|
48
|
+
severity: 'warning',
|
|
49
|
+
code: issue.code,
|
|
50
|
+
message: issue.message,
|
|
51
|
+
location,
|
|
52
|
+
pending: { fragment, start: issue.start, end: issue.end },
|
|
53
|
+
});
|
|
54
|
+
return content;
|
|
55
|
+
};
|
|
35
56
|
const transformerBlocks = makeTransformer({
|
|
36
57
|
':para': (n, ctx, visiter) => {
|
|
37
58
|
const allowedIn = ctx.allowedIn;
|
|
38
59
|
const allowed = allowOf(n);
|
|
39
60
|
return makeTransformer({
|
|
40
|
-
':text': (
|
|
41
|
-
|
|
42
|
-
},
|
|
43
|
-
':verbatim': (n, ctx) => {
|
|
44
|
-
return fcparser.parse(n.value, { allowed, allowedIn, parseAttributes });
|
|
45
|
-
},
|
|
61
|
+
':text': (node, ctx) => read(node.value, allowed, allowedIn, n),
|
|
62
|
+
':verbatim': (node, ctx) => read(node.value, allowed, allowedIn, n),
|
|
46
63
|
})(n, { ...ctx });
|
|
47
64
|
return n;
|
|
48
65
|
},
|
|
@@ -53,7 +70,7 @@ const middle = opt => tree => {
|
|
|
53
70
|
return n;
|
|
54
71
|
const allowedIn = ctx.allowedIn;
|
|
55
72
|
return makeTransformer({
|
|
56
|
-
':verbatim': (node) =>
|
|
73
|
+
':verbatim': (node) => read(node.value, allowed, allowedIn, n),
|
|
57
74
|
})(n, { ...ctx });
|
|
58
75
|
},
|
|
59
76
|
':config': (n, ctx) => {
|
|
@@ -98,18 +115,33 @@ const middle = opt => tree => {
|
|
|
98
115
|
// their turn, since a cell may declare a set of its own
|
|
99
116
|
const literal = inheritsAllow && declared !== undefined && declared.length === 0;
|
|
100
117
|
const allowed = [...allowValues].sort();
|
|
101
|
-
|
|
118
|
+
// a warning about text with no place of its own, such as a table cell, points at this block
|
|
119
|
+
const inner = {
|
|
120
|
+
...ctx,
|
|
121
|
+
allowedIn,
|
|
122
|
+
allowFromTable: passesAllow,
|
|
123
|
+
block: n.location ? n : ctx.block,
|
|
124
|
+
inline: !n.location,
|
|
125
|
+
};
|
|
102
126
|
// code written without a marker is verbatim unless its own :allow names codes
|
|
103
127
|
const ownCode = (node, ctx) => transformerBlocks(node, { ...ctx, allowedIn });
|
|
104
128
|
// a paragraph written without a marker reads codes as an explicit =para does;
|
|
105
129
|
// the own text of a block, a term among them, and the text of a cell read the
|
|
106
130
|
// codes of the block they belong to
|
|
107
131
|
const ownPara = (node, ctx) => blockNameOf(node, n) !== 'para' || (inheritsAllow && allowOf(node) === undefined)
|
|
108
|
-
? {
|
|
132
|
+
? {
|
|
133
|
+
...node,
|
|
134
|
+
// text held by a node with no place of its own, such as a cell, stands inside a line
|
|
135
|
+
content: transformer(node.content, {
|
|
136
|
+
...ctx,
|
|
137
|
+
block: node.location ? node : ctx.block,
|
|
138
|
+
inline: !node.location,
|
|
139
|
+
}),
|
|
140
|
+
}
|
|
109
141
|
: transformerBlocks(node, { ...ctx, allowedIn });
|
|
110
142
|
const transformer = makeTransformer({
|
|
111
|
-
':verbatim': (node, ctx) => literal ? node :
|
|
112
|
-
':text': (node, ctx) => literal ? node :
|
|
143
|
+
':verbatim': (node, ctx) => literal ? node : read(node.value, allowed, allowedIn, ctx.block || n, Boolean(ctx.inline)),
|
|
144
|
+
':text': (node, ctx) => literal ? node : read(node.value, allowed, allowedIn, ctx.block || n, Boolean(ctx.inline)),
|
|
113
145
|
':para': ownPara,
|
|
114
146
|
':code': ownCode,
|
|
115
147
|
':config': (node, ctx) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin-formatting-codes.js","sourceRoot":"","sources":["../src/plugin-formatting-codes.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"plugin-formatting-codes.js","sourceRoot":"","sources":["../src/plugin-formatting-codes.ts"],"names":[],"mappings":"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"}
|
package/esm/plugin-heading.js
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { applyNumberedShorthand } from './helpers/numberedShorthand.js';
|
|
1
2
|
export default () => tree => {
|
|
2
3
|
const visit = node => {
|
|
3
4
|
if (Array.isArray(node)) {
|
|
@@ -11,17 +12,8 @@ export default () => tree => {
|
|
|
11
12
|
if (matchHead) {
|
|
12
13
|
node.name = 'head';
|
|
13
14
|
node.level = matchHead[1] || 1;
|
|
14
|
-
if (node.content[0])
|
|
15
|
-
|
|
16
|
-
if (startText.text) {
|
|
17
|
-
let re = /(\s*#\s*)/;
|
|
18
|
-
const match = re.exec(startText.text);
|
|
19
|
-
if (match) {
|
|
20
|
-
startText.text = startText.text.replace(re, '');
|
|
21
|
-
node.config = { ...node.config, ...{ numbered: true } };
|
|
22
|
-
}
|
|
23
|
-
}
|
|
24
|
-
}
|
|
15
|
+
if (node.content[0])
|
|
16
|
+
applyNumberedShorthand(node);
|
|
25
17
|
}
|
|
26
18
|
visit(node.content);
|
|
27
19
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin-heading.js","sourceRoot":"","sources":["../src/plugin-heading.ts"],"names":[],"mappings":"AAAA,eAAe,GAAG,EAAE,CAAC,IAAI,CAAC,EAAE;IAC1B,MAAM,KAAK,GAAG,IAAI,CAAC,EAAE;QACnB,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;YACxB,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;gBACf,KAAK,CAAC,CAAC,CAAC,CAAA;YACV,CAAC,CAAC,CAAA;QACJ,CAAC;aAAM,CAAC;YACN,IAAI,IAAI,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;gBAClC,MAAM,SAAS,GAAG,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;gBAC/C,IAAI,SAAS,EAAE,CAAC;oBACd,IAAI,CAAC,IAAI,GAAG,MAAM,CAAA;oBAClB,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAA;oBAC9B,IAAI,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC
|
|
1
|
+
{"version":3,"file":"plugin-heading.js","sourceRoot":"","sources":["../src/plugin-heading.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAA;AAEpE,eAAe,GAAG,EAAE,CAAC,IAAI,CAAC,EAAE;IAC1B,MAAM,KAAK,GAAG,IAAI,CAAC,EAAE;QACnB,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;YACxB,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;gBACf,KAAK,CAAC,CAAC,CAAC,CAAA;YACV,CAAC,CAAC,CAAA;QACJ,CAAC;aAAM,CAAC;YACN,IAAI,IAAI,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;gBAClC,MAAM,SAAS,GAAG,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;gBAC/C,IAAI,SAAS,EAAE,CAAC;oBACd,IAAI,CAAC,IAAI,GAAG,MAAM,CAAA;oBAClB,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAA;oBAC9B,IAAI,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;wBAAE,sBAAsB,CAAC,IAAI,CAAC,CAAA;gBACnD,CAAC;gBACD,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;YACrB,CAAC;QACH,CAAC;IACH,CAAC,CAAA;IACD,KAAK,CAAC,IAAI,CAAC,CAAA;IACX,OAAO,IAAI,CAAA;AACb,CAAC,CAAA"}
|
package/esm/plugin-items.js
CHANGED
|
@@ -1,24 +1,5 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
// marker out of that value and leave the node in place — replacing the array
|
|
4
|
-
// with a plain string ends the chain early and drops every L<>, C<> and B< >
|
|
5
|
-
// written on the same line.
|
|
6
|
-
const stripMarker = (para, re) => {
|
|
7
|
-
para.text = para.text.replace(re, '');
|
|
8
|
-
if (para.type !== 'para')
|
|
9
|
-
return;
|
|
10
|
-
if (!Array.isArray(para.content)) {
|
|
11
|
-
para.content = [para.text];
|
|
12
|
-
return;
|
|
13
|
-
}
|
|
14
|
-
const first = para.content[0];
|
|
15
|
-
if (typeof first === 'string') {
|
|
16
|
-
para.content[0] = first.replace(re, '');
|
|
17
|
-
}
|
|
18
|
-
else if (first && typeof first.value === 'string') {
|
|
19
|
-
first.value = first.value.replace(re, '');
|
|
20
|
-
}
|
|
21
|
-
};
|
|
1
|
+
import { applyNumberedShorthand } from './helpers/numberedShorthand.js';
|
|
2
|
+
import { stripMarker } from './helpers/stripMarker.js';
|
|
22
3
|
export default () => tree => {
|
|
23
4
|
const visit = node => {
|
|
24
5
|
if (Array.isArray(node)) {
|
|
@@ -55,17 +36,7 @@ export default () => tree => {
|
|
|
55
36
|
});
|
|
56
37
|
}
|
|
57
38
|
}
|
|
58
|
-
|
|
59
|
-
const match = re.exec(startText.text);
|
|
60
|
-
if (match) {
|
|
61
|
-
stripMarker(startText, re);
|
|
62
|
-
node.config = node.config || [];
|
|
63
|
-
node.config.push({
|
|
64
|
-
name: 'numbered',
|
|
65
|
-
value: true,
|
|
66
|
-
type: 'boolean',
|
|
67
|
-
});
|
|
68
|
-
}
|
|
39
|
+
applyNumberedShorthand(node);
|
|
69
40
|
}
|
|
70
41
|
}
|
|
71
42
|
}
|
package/esm/plugin-items.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin-items.js","sourceRoot":"","sources":["../src/plugin-items.ts"],"names":[],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"file":"plugin-items.js","sourceRoot":"","sources":["../src/plugin-items.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAA;AACpE,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAA;AAEnD,eAAe,GAAG,EAAE,CAAC,IAAI,CAAC,EAAE;IAC1B,MAAM,KAAK,GAAG,IAAI,CAAC,EAAE;QACnB,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;YACxB,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;gBACf,KAAK,CAAC,CAAC,CAAC,CAAA;YACV,CAAC,CAAC,CAAA;QACJ,CAAC;aAAM,CAAC;YACN,IAAI,IAAI,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;gBAClC,MAAM,SAAS,GAAG,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;gBAC/C,IAAI,SAAS,EAAE,CAAC;oBACd,IAAI,CAAC,IAAI,GAAG,MAAM,CAAA;oBAClB,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAA;oBAE9B,8CAA8C;oBAC9C,MAAM,aAAa,GAAG,CAAC,IAAI,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,SAAS,CAAC,CAAA;oBACzE,IAAI,aAAa,EAAE,CAAC;wBAClB,IAAI,CAAC,OAAO,GAAG,aAAa,CAAC,KAAK,KAAK,KAAK,IAAI,aAAa,CAAC,KAAK,KAAK,CAAC,IAAI,aAAa,CAAC,KAAK,KAAK,GAAG,CAAA;oBAC1G,CAAC;oBAED,IAAI,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;wBACpB,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA;wBACjC,IAAI,SAAS,CAAC,IAAI,EAAE,CAAC;4BACnB,wDAAwD;4BACxD,IAAI,CAAC,aAAa,EAAE,CAAC;gCACnB,MAAM,UAAU,GAAG,eAAe,CAAA;gCAClC,MAAM,aAAa,GAAG,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;gCACrD,IAAI,aAAa,EAAE,CAAC;oCAClB,IAAI,CAAC,OAAO,GAAG,aAAa,CAAC,CAAC,CAAC,KAAK,GAAG,CAAA;oCACvC,WAAW,CAAC,SAAS,EAAE,UAAU,CAAC,CAAA;oCAClC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,IAAI,EAAE,CAAA;oCAC/B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;wCACf,IAAI,EAAE,SAAS;wCACf,KAAK,EAAE,IAAI,CAAC,OAAO;wCACnB,IAAI,EAAE,SAAS;qCAChB,CAAC,CAAA;gCACJ,CAAC;4BACH,CAAC;4BAED,sBAAsB,CAAC,IAAI,CAAC,CAAA;wBAC9B,CAAC;oBACH,CAAC;gBACH,CAAC;gBACD,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;YACrB,CAAC;QACH,CAAC;IACH,CAAC,CAAA;IACD,KAAK,CAAC,IAAI,CAAC,CAAA;IACX,OAAO,IAAI,CAAA;AACb,CAAC,CAAA"}
|
package/esm/plugin-vmargin.js
CHANGED
|
@@ -1,3 +1,10 @@
|
|
|
1
|
+
// the characters the grammar reads as indent; a tab moves on to the next multiple of 8
|
|
2
|
+
const INDENT = /^[ \u00a0\u2001\t\u000C\u2008]*/gm;
|
|
3
|
+
const TABSTOP = 8;
|
|
4
|
+
const widthOf = (indent) => [...indent].reduce((column, ch) => (ch === '\t' ? (Math.floor(column / TABSTOP) + 1) * TABSTOP : column + 1), 0);
|
|
5
|
+
// every line loses as many columns as the first one was set in by; what is left of
|
|
6
|
+
// its indent keeps its width
|
|
7
|
+
const takeIndent = (text, width) => text.replace(INDENT, indent => ' '.repeat(Math.max(0, widthOf(indent) - width)));
|
|
1
8
|
const middle = () => tree => {
|
|
2
9
|
const visit_node = (node, context = {}) => {
|
|
3
10
|
// if( (node.type || "").match(/(code|text)/) ) {
|
|
@@ -7,9 +14,15 @@ const middle = () => tree => {
|
|
|
7
14
|
node.type = 'para';
|
|
8
15
|
}
|
|
9
16
|
if (node.type === 'code') {
|
|
10
|
-
//
|
|
11
|
-
|
|
12
|
-
node.text = node.text
|
|
17
|
+
// the indent that made the text code is its nesting, not part of it
|
|
18
|
+
const width = widthOf(node.margin);
|
|
19
|
+
node.text = takeIndent(node.text, width);
|
|
20
|
+
// the renderers write content, so it loses the indent text loses
|
|
21
|
+
const parts = node.content;
|
|
22
|
+
for (const part of parts) {
|
|
23
|
+
if (part.type === 'verbatim' && typeof part.value === 'string')
|
|
24
|
+
part.value = takeIndent(part.value, width);
|
|
25
|
+
}
|
|
13
26
|
}
|
|
14
27
|
}
|
|
15
28
|
if (node.type === 'block') {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin-vmargin.js","sourceRoot":"","sources":["../src/plugin-vmargin.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,GAAiB,GAAG,EAAE,CAAC,IAAI,CAAC,EAAE;IACxC,MAAM,UAAU,GAAG,CAAC,IAAU,EAAE,UAA2C,EAAE,EAAE,EAAE;QAC/E,iDAAiD;QACjD,IAAI,IAAI,CAAC,IAAI,IAAI,MAAM,IAAI,IAAI,CAAC,IAAI,IAAI,MAAM,EAAE,CAAC;YAC/C,IAAI,IAAI,CAAC,MAAM,IAAI,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,IAAI,OAAO,CAAC,MAAM,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;gBAC9G,CAAC;gBAAC,IAAY,CAAC,IAAI,GAAG,MAAM,CAAA;YAC9B,CAAC;YACD,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;gBACzB,
|
|
1
|
+
{"version":3,"file":"plugin-vmargin.js","sourceRoot":"","sources":["../src/plugin-vmargin.ts"],"names":[],"mappings":"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"}
|
package/esm/selectors.d.ts
CHANGED
|
@@ -37,12 +37,13 @@ export type ValueSpec = {
|
|
|
37
37
|
value: string;
|
|
38
38
|
};
|
|
39
39
|
export declare const parseSelector: (selector: string) => ParsedSelector | undefined;
|
|
40
|
+
export declare const readSelector: (selector: string) => ParsedSelector;
|
|
40
41
|
export declare const outermost: (blocks: PodNode[]) => PodNode[];
|
|
41
42
|
export declare const filePathMatches: (docFile: string, target: string) => boolean;
|
|
42
43
|
export declare const getDocIDs: (doc: SelectorDoc) => string[];
|
|
43
44
|
export declare class SelectorError extends Error {
|
|
44
|
-
readonly kind: 'resolution' | 'format' | 'address';
|
|
45
|
-
constructor(kind: 'resolution' | 'format' | 'address', message: string);
|
|
45
|
+
readonly kind: 'resolution' | 'format' | 'address' | 'syntax';
|
|
46
|
+
constructor(kind: 'resolution' | 'format' | 'address' | 'syntax', message: string);
|
|
46
47
|
}
|
|
47
48
|
export type SelectorOptions = {
|
|
48
49
|
home?: SelectorDoc[];
|
package/esm/selectors.js
CHANGED
|
@@ -177,10 +177,12 @@ const parseCondition = (raw) => {
|
|
|
177
177
|
const read = readAngleValue(s, i + 1);
|
|
178
178
|
if (!read || read.end !== s.length)
|
|
179
179
|
return undefined;
|
|
180
|
-
// an empty list occurs among any values, so the condition would test nothing
|
|
181
180
|
const operand = readOperand(read.value);
|
|
182
|
-
if (!operand
|
|
181
|
+
if (!operand)
|
|
183
182
|
return undefined;
|
|
183
|
+
// an empty list occurs among any values, so the condition would test nothing
|
|
184
|
+
if (valuesOf(operand).length === 0)
|
|
185
|
+
throw new SelectorError('syntax', `the operand of :${attrName}~<> is empty`);
|
|
184
186
|
return { modifier, attrName, valueSpec: { kind: 'contains', value: read.value } };
|
|
185
187
|
}
|
|
186
188
|
if (s[i] === '<') {
|
|
@@ -290,7 +292,7 @@ const parsePatternList = (filterPart) => {
|
|
|
290
292
|
}
|
|
291
293
|
return patterns;
|
|
292
294
|
};
|
|
293
|
-
|
|
295
|
+
const readParsed = (selector) => {
|
|
294
296
|
const trimmed = selector.trim();
|
|
295
297
|
if (!trimmed)
|
|
296
298
|
return undefined;
|
|
@@ -342,6 +344,34 @@ export const parseSelector = (selector) => {
|
|
|
342
344
|
}
|
|
343
345
|
return undefined;
|
|
344
346
|
};
|
|
347
|
+
export const parseSelector = (selector) => {
|
|
348
|
+
try {
|
|
349
|
+
return readParsed(selector);
|
|
350
|
+
}
|
|
351
|
+
catch (e) {
|
|
352
|
+
if (e instanceof SelectorError && e.kind === 'syntax')
|
|
353
|
+
return undefined;
|
|
354
|
+
throw e;
|
|
355
|
+
}
|
|
356
|
+
};
|
|
357
|
+
/*
|
|
358
|
+
=begin pod :kind<export>
|
|
359
|
+
|
|
360
|
+
=head2 readSelector
|
|
361
|
+
|
|
362
|
+
Reads a selector as C<parseSelector> does, and throws a C<SelectorError> of the
|
|
363
|
+
kind C<syntax> instead of returning nothing when the selector cannot be read.
|
|
364
|
+
The message names an empty operand of C<~<>>; for any other reason it is
|
|
365
|
+
C<the selector cannot be read>.
|
|
366
|
+
|
|
367
|
+
=end pod
|
|
368
|
+
*/
|
|
369
|
+
export const readSelector = (selector) => {
|
|
370
|
+
const parsed = readParsed(selector);
|
|
371
|
+
if (!parsed)
|
|
372
|
+
throw new SelectorError('syntax', 'the selector cannot be read');
|
|
373
|
+
return parsed;
|
|
374
|
+
};
|
|
345
375
|
// --- predicate matcher --------------------------------------------------
|
|
346
376
|
// The declared value with its kind kept. makeAttrs flattens a list into the
|
|
347
377
|
// surrounding values, which loses the very thing equality compares. What a
|
|
@@ -577,7 +607,8 @@ C<in>, cannot be read: its source does not resolve (C<resolution>), the format o
|
|
|
577
607
|
the source is not known (C<format>), or the address is not in it (C<address>).
|
|
578
608
|
Such a selection neither matches nor fails to match, so it returns nothing at all.
|
|
579
609
|
A mask that no document answers is an empty source, not an error, unless it
|
|
580
|
-
carries an address.
|
|
610
|
+
carries an address. C<readSelector> throws it with the kind C<syntax> when the
|
|
611
|
+
text of a selector cannot be read.
|
|
581
612
|
|
|
582
613
|
=end pod
|
|
583
614
|
*/
|