@openuji/speculator 0.7.5 → 0.9.0
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/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -1
- package/dist/index.js.map +1 -1
- package/dist/parse/assembler.d.ts +1 -1
- package/dist/parse/assembler.d.ts.map +1 -1
- package/dist/parse/assembler.js +69 -27
- package/dist/parse/assembler.js.map +1 -1
- package/dist/parse/html/AsideHtmlParser.d.ts.map +1 -1
- package/dist/parse/html/AsideHtmlParser.js +85 -3
- package/dist/parse/html/AsideHtmlParser.js.map +1 -1
- package/dist/parse/html/CodeHtmlParser.d.ts.map +1 -1
- package/dist/parse/html/CodeHtmlParser.js +6 -2
- package/dist/parse/html/CodeHtmlParser.js.map +1 -1
- package/dist/parse/html/HeadingsHtmlParser.d.ts.map +1 -1
- package/dist/parse/html/HeadingsHtmlParser.js +3 -4
- package/dist/parse/html/HeadingsHtmlParser.js.map +1 -1
- package/dist/parse/html/IdlHtmlParser.d.ts +0 -4
- package/dist/parse/html/IdlHtmlParser.d.ts.map +1 -1
- package/dist/parse/html/IdlHtmlParser.js +2 -138
- package/dist/parse/html/IdlHtmlParser.js.map +1 -1
- package/dist/parse/html/MiscHtmlParser.d.ts.map +1 -1
- package/dist/parse/html/MiscHtmlParser.js +2 -42
- package/dist/parse/html/MiscHtmlParser.js.map +1 -1
- package/dist/parse/html/SectionsHtmlParser.d.ts.map +1 -1
- package/dist/parse/html/SectionsHtmlParser.js +17 -26
- package/dist/parse/html/SectionsHtmlParser.js.map +1 -1
- package/dist/parse/html/VocabHtmlParser.js +2 -2
- package/dist/parse/html/VocabHtmlParser.js.map +1 -1
- package/dist/parse/html/parser.d.ts +13 -4
- package/dist/parse/html/parser.d.ts.map +1 -1
- package/dist/parse/html/parser.js +96 -99
- package/dist/parse/html/parser.js.map +1 -1
- package/dist/parse/index.d.ts +1 -2
- package/dist/parse/index.d.ts.map +1 -1
- package/dist/parse/index.js +0 -1
- package/dist/parse/index.js.map +1 -1
- package/dist/parse/markdown/CodeMarkdownParser.d.ts.map +1 -1
- package/dist/parse/markdown/CodeMarkdownParser.js +20 -2
- package/dist/parse/markdown/CodeMarkdownParser.js.map +1 -1
- package/dist/parse/markdown/HeadingsMarkdownParser.d.ts.map +1 -1
- package/dist/parse/markdown/HeadingsMarkdownParser.js +6 -3
- package/dist/parse/markdown/HeadingsMarkdownParser.js.map +1 -1
- package/dist/parse/markdown/MdxMarkdownParser.d.ts.map +1 -1
- package/dist/parse/markdown/MdxMarkdownParser.js +54 -13
- package/dist/parse/markdown/MdxMarkdownParser.js.map +1 -1
- package/dist/parse/markdown/ShorthandsMarkdownParser.d.ts.map +1 -1
- package/dist/parse/markdown/ShorthandsMarkdownParser.js +57 -2
- package/dist/parse/markdown/ShorthandsMarkdownParser.js.map +1 -1
- package/dist/parse/markdown/parser.d.ts +12 -3
- package/dist/parse/markdown/parser.d.ts.map +1 -1
- package/dist/parse/markdown/parser.js +71 -80
- package/dist/parse/markdown/parser.js.map +1 -1
- package/dist/parse/markdown/plugins.d.ts.map +1 -1
- package/dist/parse/markdown/plugins.js +9 -2
- package/dist/parse/markdown/plugins.js.map +1 -1
- package/dist/parse/pipeline.d.ts.map +1 -1
- package/dist/parse/pipeline.js +35 -14
- package/dist/parse/pipeline.js.map +1 -1
- package/dist/parse/registry.d.ts +5 -5
- package/dist/parse/registry.d.ts.map +1 -1
- package/dist/parse/registry.js +12 -12
- package/dist/parse/registry.js.map +1 -1
- package/dist/parse/source-mapper.d.ts +42 -0
- package/dist/parse/source-mapper.d.ts.map +1 -0
- package/dist/parse/source-mapper.js +117 -0
- package/dist/parse/source-mapper.js.map +1 -0
- package/dist/parse/types.d.ts +20 -9
- package/dist/parse/types.d.ts.map +1 -1
- package/dist/parse/types.js +2 -13
- package/dist/parse/types.js.map +1 -1
- package/dist/parse/utils/hast-utils.d.ts.map +1 -1
- package/dist/parse/utils/hast-utils.js +63 -28
- package/dist/parse/utils/hast-utils.js.map +1 -1
- package/dist/parse/utils/idl-tokenizer.d.ts +7 -0
- package/dist/parse/utils/idl-tokenizer.d.ts.map +1 -0
- package/dist/parse/utils/idl-tokenizer.js +137 -0
- package/dist/parse/utils/idl-tokenizer.js.map +1 -0
- package/dist/pipeline/index.d.ts.map +1 -1
- package/dist/pipeline/index.js +1 -0
- package/dist/pipeline/index.js.map +1 -1
- package/dist/pipeline/runner.d.ts.map +1 -1
- package/dist/pipeline/runner.js +10 -4
- package/dist/pipeline/runner.js.map +1 -1
- package/dist/pipeline/types.d.ts +2 -0
- package/dist/pipeline/types.d.ts.map +1 -1
- package/dist/postprocess/index.d.ts +3 -1
- package/dist/postprocess/index.d.ts.map +1 -1
- package/dist/postprocess/index.js +9 -3
- package/dist/postprocess/index.js.map +1 -1
- package/dist/postprocess/plugins/biblio-index.d.ts.map +1 -1
- package/dist/postprocess/plugins/biblio-index.js +2 -2
- package/dist/postprocess/plugins/biblio-index.js.map +1 -1
- package/dist/postprocess/plugins/bibliography-generator.d.ts.map +1 -1
- package/dist/postprocess/plugins/bibliography-generator.js +46 -5
- package/dist/postprocess/plugins/bibliography-generator.js.map +1 -1
- package/dist/postprocess/plugins/citation-resolve.d.ts.map +1 -1
- package/dist/postprocess/plugins/citation-resolve.js +255 -11
- package/dist/postprocess/plugins/citation-resolve.js.map +1 -1
- package/dist/postprocess/plugins/example-index.d.ts +16 -0
- package/dist/postprocess/plugins/example-index.d.ts.map +1 -0
- package/dist/postprocess/plugins/example-index.js +131 -0
- package/dist/postprocess/plugins/example-index.js.map +1 -0
- package/dist/postprocess/plugins/note-index.d.ts +14 -0
- package/dist/postprocess/plugins/note-index.d.ts.map +1 -0
- package/dist/postprocess/plugins/note-index.js +103 -0
- package/dist/postprocess/plugins/note-index.js.map +1 -0
- package/dist/postprocess/plugins/note-shorthands.d.ts +11 -0
- package/dist/postprocess/plugins/note-shorthands.d.ts.map +1 -0
- package/dist/postprocess/plugins/note-shorthands.js +298 -0
- package/dist/postprocess/plugins/note-shorthands.js.map +1 -0
- package/dist/postprocess/plugins/reference-resolve.d.ts.map +1 -1
- package/dist/postprocess/plugins/reference-resolve.js +46 -1
- package/dist/postprocess/plugins/reference-resolve.js.map +1 -1
- package/dist/postprocess/plugins/toc.d.ts.map +1 -1
- package/dist/postprocess/plugins/toc.js +20 -16
- package/dist/postprocess/plugins/toc.js.map +1 -1
- package/dist/postprocess/walk-ast.d.ts +5 -1
- package/dist/postprocess/walk-ast.d.ts.map +1 -1
- package/dist/postprocess/walk-ast.js +8 -0
- package/dist/postprocess/walk-ast.js.map +1 -1
- package/dist/preprocess/config/doc-config.d.ts +4 -1
- package/dist/preprocess/config/doc-config.d.ts.map +1 -1
- package/dist/preprocess/config/doc-config.js +6 -3
- package/dist/preprocess/config/doc-config.js.map +1 -1
- package/dist/preprocess/config/index.d.ts +1 -1
- package/dist/preprocess/config/index.d.ts.map +1 -1
- package/dist/preprocess/config/normalize.d.ts +2 -2
- package/dist/preprocess/config/normalize.d.ts.map +1 -1
- package/dist/preprocess/config/normalize.js +129 -85
- package/dist/preprocess/config/normalize.js.map +1 -1
- package/dist/preprocess/config/types.d.ts +31 -15
- package/dist/preprocess/config/types.d.ts.map +1 -1
- package/dist/preprocess/config/verify-person.d.ts +2 -0
- package/dist/preprocess/config/verify-person.d.ts.map +1 -0
- package/dist/preprocess/config/verify-person.js +17 -0
- package/dist/preprocess/config/verify-person.js.map +1 -0
- package/dist/preprocess/include/resolver.d.ts.map +1 -1
- package/dist/preprocess/include/resolver.js +86 -32
- package/dist/preprocess/include/resolver.js.map +1 -1
- package/dist/preprocess/include/scan-html.js +1 -1
- package/dist/preprocess/include/scan-html.js.map +1 -1
- package/dist/preprocess/index.d.ts +2 -2
- package/dist/preprocess/index.d.ts.map +1 -1
- package/dist/preprocess/index.js.map +1 -1
- package/dist/preprocess/pipeline.d.ts.map +1 -1
- package/dist/preprocess/pipeline.js +1 -1
- package/dist/preprocess/pipeline.js.map +1 -1
- package/dist/preprocess/types.d.ts +26 -14
- package/dist/preprocess/types.d.ts.map +1 -1
- package/dist/types/ast.generated.d.ts +44 -25
- package/dist/types/ast.generated.d.ts.map +1 -1
- package/dist/types/ast.generated.js +1 -1
- package/dist/types/ast.generated.js.map +1 -1
- package/dist/workspace/sort.js +1 -1
- package/dist/workspace/sort.js.map +1 -1
- package/package.json +2 -2
- package/schema/spec-ast.schema.json +41 -8
|
@@ -3,6 +3,38 @@
|
|
|
3
3
|
*
|
|
4
4
|
* Detects ReSpec-like shorthands in text nodes and transforms them to Speculator AST nodes.
|
|
5
5
|
*/
|
|
6
|
+
/**
|
|
7
|
+
* Parse shorthand citation target syntax:
|
|
8
|
+
* - REF
|
|
9
|
+
* - REF/path
|
|
10
|
+
* - REF#fragment
|
|
11
|
+
* - REF/path#fragment
|
|
12
|
+
*
|
|
13
|
+
* Unlike data-cite parsing, this keeps key casing as-authored so it
|
|
14
|
+
* remains compatible with localBiblio keys.
|
|
15
|
+
*/
|
|
16
|
+
function parseShorthandCitationTarget(rawTarget) {
|
|
17
|
+
const target = rawTarget.trim();
|
|
18
|
+
let base = target;
|
|
19
|
+
let fragment;
|
|
20
|
+
const hashIdx = base.indexOf('#');
|
|
21
|
+
if (hashIdx !== -1) {
|
|
22
|
+
const parsedFragment = base.slice(hashIdx + 1).trim();
|
|
23
|
+
if (parsedFragment)
|
|
24
|
+
fragment = parsedFragment;
|
|
25
|
+
base = base.slice(0, hashIdx);
|
|
26
|
+
}
|
|
27
|
+
let key = base.trim();
|
|
28
|
+
let path;
|
|
29
|
+
const slashIdx = base.indexOf('/');
|
|
30
|
+
if (slashIdx !== -1) {
|
|
31
|
+
key = base.slice(0, slashIdx).trim();
|
|
32
|
+
const parsedPath = base.slice(slashIdx + 1).trim();
|
|
33
|
+
if (parsedPath)
|
|
34
|
+
path = parsedPath;
|
|
35
|
+
}
|
|
36
|
+
return { key: key || target, path, fragment };
|
|
37
|
+
}
|
|
6
38
|
/**
|
|
7
39
|
* Registry of supported shorthands.
|
|
8
40
|
* This satisfies the requirement to track what shorthands are implemented.
|
|
@@ -35,15 +67,38 @@ export const SHORTHAND_REGISTRY = [
|
|
|
35
67
|
status: 'implemented',
|
|
36
68
|
handler: (match, ctx, node) => {
|
|
37
69
|
const forced = match[1];
|
|
38
|
-
const
|
|
70
|
+
const rawTarget = match[2].trim();
|
|
71
|
+
const target = parseShorthandCitationTarget(match[2]);
|
|
72
|
+
const alias = match[3]?.trim();
|
|
73
|
+
// ReSpec-style section links: [[#section-id]]
|
|
74
|
+
if (rawTarget.startsWith('#')) {
|
|
75
|
+
const result = {
|
|
76
|
+
type: 'sectionReference',
|
|
77
|
+
targetId: rawTarget.slice(1),
|
|
78
|
+
};
|
|
79
|
+
if (alias) {
|
|
80
|
+
result.children = [{ type: 'text', value: alias }];
|
|
81
|
+
}
|
|
82
|
+
const sourcePos = ctx.createSourcePos(node);
|
|
83
|
+
if (sourcePos)
|
|
84
|
+
result.sourcePos = sourcePos;
|
|
85
|
+
return result;
|
|
86
|
+
}
|
|
39
87
|
const result = {
|
|
40
88
|
type: 'cite',
|
|
41
|
-
key: key,
|
|
89
|
+
key: target.key,
|
|
42
90
|
};
|
|
43
91
|
if (forced === '!')
|
|
44
92
|
result.forcedNormative = true;
|
|
45
93
|
if (forced === '?')
|
|
46
94
|
result.forcedInformative = true;
|
|
95
|
+
if (target.path)
|
|
96
|
+
result.path = target.path;
|
|
97
|
+
if (target.fragment)
|
|
98
|
+
result.fragment = target.fragment;
|
|
99
|
+
if (alias) {
|
|
100
|
+
result.children = [{ type: 'text', value: alias }];
|
|
101
|
+
}
|
|
47
102
|
const sourcePos = ctx.createSourcePos(node);
|
|
48
103
|
if (sourcePos)
|
|
49
104
|
result.sourcePos = sourcePos;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ShorthandsMarkdownParser.js","sourceRoot":"","sources":["../../../src/parse/markdown/ShorthandsMarkdownParser.ts"],"names":[],"mappings":"AAAA;;;;GAIG;
|
|
1
|
+
{"version":3,"file":"ShorthandsMarkdownParser.js","sourceRoot":"","sources":["../../../src/parse/markdown/ShorthandsMarkdownParser.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,8 +4,8 @@
|
|
|
4
4
|
* Parses markdown content using remark and transforms to Speculator AST
|
|
5
5
|
* using the modular handler registry.
|
|
6
6
|
*/
|
|
7
|
-
import type { SourceUnit } from '#src/preprocess/types';
|
|
8
7
|
import type { UnitParser } from '#src/parse/types';
|
|
8
|
+
import { SourceMapper } from '#src/parse/source-mapper';
|
|
9
9
|
import type { Section, Block } from '#src/types/ast.generated';
|
|
10
10
|
import { ParseHandlerRegistry } from '#src/parse/registry';
|
|
11
11
|
/**
|
|
@@ -17,9 +17,18 @@ export declare class MarkdownUnitParser implements UnitParser {
|
|
|
17
17
|
private registry;
|
|
18
18
|
constructor(registry?: ParseHandlerRegistry);
|
|
19
19
|
/**
|
|
20
|
-
* Parse markdown
|
|
20
|
+
* Parse markdown composed string to AST blocks
|
|
21
|
+
* Overload 1: New API with content string and SourceMapper
|
|
22
|
+
* Overload 2: Legacy API with SourceUnit-like object (backwards compat for tests)
|
|
21
23
|
*/
|
|
22
|
-
parse(
|
|
24
|
+
parse(content: string, sourceMapper: SourceMapper): (Section | Block)[];
|
|
25
|
+
parse(unit: {
|
|
26
|
+
content: string;
|
|
27
|
+
file: string;
|
|
28
|
+
format: string;
|
|
29
|
+
startLine: number;
|
|
30
|
+
sideFiles?: Record<string, string>;
|
|
31
|
+
}): (Section | Block)[];
|
|
23
32
|
/**
|
|
24
33
|
* Create parse context for handlers
|
|
25
34
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["../../../src/parse/markdown/parser.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAOH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["../../../src/parse/markdown/parser.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAOH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAExD,OAAO,KAAK,EACR,OAAO,EACP,KAAK,EAER,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACH,oBAAoB,EAIvB,MAAM,qBAAqB,CAAC;AAM7B;;GAEG;AACH,qBAAa,kBAAmB,YAAW,UAAU;IACjD,QAAQ,CAAC,MAAM,EAAG,UAAU,CAAU;IAEtC,OAAO,CAAC,SAAS,CAIiB;IAElC,OAAO,CAAC,QAAQ,CAAuB;gBAE3B,QAAQ,GAAE,oBAAsC;IAI5D;;;;OAIG;IACH,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,YAAY,GAAG,CAAC,OAAO,GAAG,KAAK,CAAC,EAAE;IACvE,KAAK,CAAC,IAAI,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;KAAE,GAAG,CAAC,OAAO,GAAG,KAAK,CAAC,EAAE;IAsF1I;;OAEG;IACH,OAAO,CAAC,aAAa;IAuCrB;;OAEG;IACH,OAAO,CAAC,cAAc;IAiBtB;;OAEG;IACH,OAAO,CAAC,eAAe;IAkBvB;;OAEG;IACH,OAAO,CAAC,uBAAuB;CAgBlC"}
|
|
@@ -8,52 +8,10 @@ import { unified } from 'unified';
|
|
|
8
8
|
import remarkParse from 'remark-parse';
|
|
9
9
|
import remarkGfm from 'remark-gfm';
|
|
10
10
|
import { remarkMdxAgnostic, remarkHeadingAttrBlocks } from './plugins.js';
|
|
11
|
+
import { SourceMapper } from '#src/parse/source-mapper';
|
|
11
12
|
import { defaultRegistry, } from '#src/parse/registry';
|
|
12
13
|
import { escapeShorthandPipesInTables, normalizeMdxTags } from '../utils/markdown-utils.js';
|
|
13
|
-
|
|
14
|
-
* Create source position from mdast node position
|
|
15
|
-
*/
|
|
16
|
-
function createSourcePos(unit, node) {
|
|
17
|
-
if (!node.position) {
|
|
18
|
-
return {
|
|
19
|
-
file: unit.file,
|
|
20
|
-
line: unit.startLine,
|
|
21
|
-
column: 1,
|
|
22
|
-
};
|
|
23
|
-
}
|
|
24
|
-
const pos = node.position;
|
|
25
|
-
const result = {
|
|
26
|
-
file: unit.file,
|
|
27
|
-
line: unit.startLine + pos.start.line - 1,
|
|
28
|
-
column: pos.start.column,
|
|
29
|
-
};
|
|
30
|
-
if (pos.start.offset !== undefined) {
|
|
31
|
-
result.offset = pos.start.offset;
|
|
32
|
-
}
|
|
33
|
-
if (pos.end) {
|
|
34
|
-
result.endLine = unit.startLine + pos.end.line - 1;
|
|
35
|
-
result.endColumn = pos.end.column;
|
|
36
|
-
if (pos.end.offset !== undefined) {
|
|
37
|
-
result.endOffset = pos.end.offset;
|
|
38
|
-
}
|
|
39
|
-
}
|
|
40
|
-
return result;
|
|
41
|
-
}
|
|
42
|
-
function adjustErrorLineNumbers(error, startLine) {
|
|
43
|
-
if (!(error instanceof Error) || startLine <= 1)
|
|
44
|
-
return;
|
|
45
|
-
const startOff = startLine - 1;
|
|
46
|
-
// Match (L:C), (L:C-L:C), or even just L:C if MDX format changes
|
|
47
|
-
const posRegex = /(\(?|)(\d+):(\d+)(?:-(\d+):(\d+))?(\)?|)/g;
|
|
48
|
-
error.message = error.message.replace(posRegex, (_match, openParen = '', l1, c1, l2, c2, closeParen = '') => {
|
|
49
|
-
const nl1 = parseInt(l1) + startOff;
|
|
50
|
-
if (l2 && c2) {
|
|
51
|
-
const nl2 = parseInt(l2) + startOff;
|
|
52
|
-
return `${openParen}${nl1}:${c1}-${nl2}:${c2}${closeParen}`;
|
|
53
|
-
}
|
|
54
|
-
return `${openParen}${nl1}:${c1}${closeParen}`;
|
|
55
|
-
});
|
|
56
|
-
}
|
|
14
|
+
// No longer need createSourcePos wrapper here, SourceMapper handles it natively
|
|
57
15
|
/**
|
|
58
16
|
* Markdown unit parser implementation using handler registry
|
|
59
17
|
*/
|
|
@@ -68,43 +26,72 @@ export class MarkdownUnitParser {
|
|
|
68
26
|
constructor(registry = defaultRegistry) {
|
|
69
27
|
this.registry = registry;
|
|
70
28
|
}
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
29
|
+
parse(contentOrUnit, sourceMapper) {
|
|
30
|
+
let content;
|
|
31
|
+
if (typeof contentOrUnit === 'string') {
|
|
32
|
+
content = contentOrUnit;
|
|
33
|
+
}
|
|
34
|
+
else {
|
|
35
|
+
// Legacy SourceUnit-like object
|
|
36
|
+
content = contentOrUnit.content;
|
|
37
|
+
sourceMapper = new SourceMapper(content, {
|
|
38
|
+
fragments: [{
|
|
39
|
+
startOffset: 0,
|
|
40
|
+
endOffset: content.length,
|
|
41
|
+
file: contentOrUnit.file,
|
|
42
|
+
format: contentOrUnit.format,
|
|
43
|
+
originalStartLine: contentOrUnit.startLine,
|
|
44
|
+
sideFiles: contentOrUnit.sideFiles,
|
|
45
|
+
}]
|
|
46
|
+
});
|
|
47
|
+
}
|
|
48
|
+
if (!sourceMapper) {
|
|
49
|
+
throw new Error('sourceMapper is required in non-legacy mode');
|
|
50
|
+
}
|
|
76
51
|
// Refined pre-processing for MDX:
|
|
77
52
|
// 1. Escape shorthand pipes in tables (GFM compat)
|
|
78
53
|
content = escapeShorthandPipesInTables(content);
|
|
79
|
-
// Parse to mdast tree
|
|
80
|
-
let tree;
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
54
|
+
// Parse to mdast tree with retry logic for MDX strictness
|
|
55
|
+
let tree = null;
|
|
56
|
+
let retryCount = 0;
|
|
57
|
+
const maxRetries = 20;
|
|
58
|
+
while (retryCount <= maxRetries) {
|
|
59
|
+
try {
|
|
60
|
+
tree = this.processor.parse(content);
|
|
61
|
+
break;
|
|
62
|
+
}
|
|
63
|
+
catch (error) {
|
|
64
|
+
if (retryCount >= maxRetries)
|
|
65
|
+
throw error;
|
|
66
|
+
retryCount++;
|
|
67
|
+
const message = error instanceof Error ? error.message : String(error);
|
|
68
|
+
// Strategy 1: Normalize Speculator custom tags (e.g. crossing block boundaries)
|
|
69
|
+
const normalized = normalizeMdxTags(content);
|
|
70
|
+
if (normalized !== content) {
|
|
71
|
+
content = normalized;
|
|
72
|
+
continue;
|
|
92
73
|
}
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
74
|
+
// Strategy 2: Escape unclosed common HTML tags used as literal text
|
|
75
|
+
// Search for "Expected a closing tag for <tag>" (modern MDX)
|
|
76
|
+
// or similar errors that indicate unclosed tags.
|
|
77
|
+
const tagMatch = message.match(/Expected a closing tag for `<([^>]+)>`/);
|
|
78
|
+
if (tagMatch) {
|
|
79
|
+
const tagName = tagMatch[1];
|
|
80
|
+
// Escape all occurrences of this opening tag to <tag
|
|
81
|
+
// but ONLY if they don't look self-closing or have a close tag.
|
|
82
|
+
// (Actually, if MDX is complaining, it's safer to just escape them).
|
|
83
|
+
content = content.replace(new RegExp(`<${tagName}(?![^>]*/>)`, 'g'), `<${tagName}`);
|
|
84
|
+
continue;
|
|
96
85
|
}
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
adjustErrorLineNumbers(initialError, unit.startLine);
|
|
100
|
-
throw initialError;
|
|
86
|
+
// Strategy 3: Unclosed block handlers or other JSX errors
|
|
87
|
+
throw error;
|
|
101
88
|
}
|
|
102
89
|
}
|
|
103
90
|
// Run transformers (like remarkHeadingAttrBlocks)
|
|
104
91
|
// We use runSync because our plugins are currently synchronous
|
|
105
92
|
const transformedTree = this.processor.runSync(tree);
|
|
106
93
|
// Create context for handlers
|
|
107
|
-
const ctx = this.createContext(
|
|
94
|
+
const ctx = this.createContext(sourceMapper);
|
|
108
95
|
const blocks = [];
|
|
109
96
|
for (const child of transformedTree.children) {
|
|
110
97
|
const blocksResult = this.transformBlock(child, ctx);
|
|
@@ -115,14 +102,18 @@ export class MarkdownUnitParser {
|
|
|
115
102
|
/**
|
|
116
103
|
* Create parse context for handlers
|
|
117
104
|
*/
|
|
118
|
-
createContext(
|
|
105
|
+
createContext(sourceMapper) {
|
|
119
106
|
return {
|
|
120
|
-
|
|
121
|
-
createSourcePos: (node) =>
|
|
122
|
-
|
|
107
|
+
sourceMapper,
|
|
108
|
+
createSourcePos: (node) => {
|
|
109
|
+
if (!node || !node.position)
|
|
110
|
+
return { file: 'unknown', line: 1, column: 1 };
|
|
111
|
+
return sourceMapper.createSourcePos(node.position) || { file: 'unknown', line: 1, column: 1 };
|
|
112
|
+
},
|
|
113
|
+
transformInlineChildren: (children) => this.transformInlineChildren(children, sourceMapper),
|
|
123
114
|
transformBlockChildren: (children) => {
|
|
124
115
|
const results = [];
|
|
125
|
-
const ctx = this.createContext(
|
|
116
|
+
const ctx = this.createContext(sourceMapper);
|
|
126
117
|
for (const child of children) {
|
|
127
118
|
const blocksResult = this.transformBlock(child, ctx);
|
|
128
119
|
results.push(...blocksResult);
|
|
@@ -137,7 +128,7 @@ export class MarkdownUnitParser {
|
|
|
137
128
|
text += child.value;
|
|
138
129
|
}
|
|
139
130
|
else if (child.type === 'element') {
|
|
140
|
-
text += this.createContext(
|
|
131
|
+
text += this.createContext(sourceMapper).getTextContent(child);
|
|
141
132
|
}
|
|
142
133
|
}
|
|
143
134
|
return text;
|
|
@@ -174,8 +165,8 @@ export class MarkdownUnitParser {
|
|
|
174
165
|
/**
|
|
175
166
|
* Transform mdast inline node to Speculator inline(s)
|
|
176
167
|
*/
|
|
177
|
-
transformInline(node,
|
|
178
|
-
const ctx = this.createContext(
|
|
168
|
+
transformInline(node, sourceMapper) {
|
|
169
|
+
const ctx = this.createContext(sourceMapper);
|
|
179
170
|
// Look up handlers in registry
|
|
180
171
|
const handlers = this.registry.getMdInlineHandlers(node.type);
|
|
181
172
|
for (const handler of handlers) {
|
|
@@ -191,10 +182,10 @@ export class MarkdownUnitParser {
|
|
|
191
182
|
/**
|
|
192
183
|
* Transform array of inline children
|
|
193
184
|
*/
|
|
194
|
-
transformInlineChildren(children,
|
|
185
|
+
transformInlineChildren(children, sourceMapper) {
|
|
195
186
|
const results = [];
|
|
196
187
|
for (const child of children) {
|
|
197
|
-
const result = this.transformInline(child,
|
|
188
|
+
const result = this.transformInline(child, sourceMapper);
|
|
198
189
|
if (result === null)
|
|
199
190
|
continue;
|
|
200
191
|
if (Array.isArray(result)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parser.js","sourceRoot":"","sources":["../../../src/parse/markdown/parser.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,WAAW,MAAM,cAAc,CAAC;AACvC,OAAO,SAAS,MAAM,YAAY,CAAC;AACnC,OAAO,EAAE,iBAAiB,EAAE,uBAAuB,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"parser.js","sourceRoot":"","sources":["../../../src/parse/markdown/parser.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugins.d.ts","sourceRoot":"","sources":["../../../src/parse/markdown/plugins.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AACzC,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC;AAIlC,KAAK,qBAAqB,GAAG,MAAM,GAAG,OAAO,CAAC;AAC9C,KAAK,mBAAmB,GAAG,MAAM,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAC;AASjE;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,SAAS,QAmBhD;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"plugins.d.ts","sourceRoot":"","sources":["../../../src/parse/markdown/plugins.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AACzC,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC;AAIlC,KAAK,qBAAqB,GAAG,MAAM,GAAG,OAAO,CAAC;AAC9C,KAAK,mBAAmB,GAAG,MAAM,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAC;AASjE;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,SAAS,QAmBhD;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,uBAyBzC;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,KAC7B,MAAM,IAAI,UA+BnB"}
|
|
@@ -46,6 +46,10 @@ export function parseAttrText(text) {
|
|
|
46
46
|
v = v.replace(/^['"]|['"]$/g, "");
|
|
47
47
|
props[k] = v;
|
|
48
48
|
}
|
|
49
|
+
else {
|
|
50
|
+
// Treat as boolean flag (e.g. data-no-toc)
|
|
51
|
+
props[p] = true;
|
|
52
|
+
}
|
|
49
53
|
}
|
|
50
54
|
return props;
|
|
51
55
|
}
|
|
@@ -64,8 +68,11 @@ export function remarkHeadingAttrBlocks() {
|
|
|
64
68
|
return;
|
|
65
69
|
if (last.type !== "mdxTextExpression" && last.type !== "text")
|
|
66
70
|
return;
|
|
67
|
-
const
|
|
68
|
-
|
|
71
|
+
const rawText = String(last.value ?? "").trim();
|
|
72
|
+
const raw = rawText.startsWith("{") && rawText.endsWith("}")
|
|
73
|
+
? rawText.slice(1, -1).trim()
|
|
74
|
+
: rawText;
|
|
75
|
+
if (!raw.startsWith("#") && !raw.startsWith(".") && !raw.includes("=") && !raw.startsWith("data-"))
|
|
69
76
|
return;
|
|
70
77
|
const props = parseAttrText(raw);
|
|
71
78
|
// Remove the attribute expression from children
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugins.js","sourceRoot":"","sources":["../../../src/parse/markdown/plugins.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,GAAG,EAAE,MAAM,yBAAyB,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAChE,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAgBzC;;;GAGG;AACH,MAAM,UAAU,iBAAiB;IAC/B,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,EAAsB,CAAC;IAE7C,MAAM,mBAAmB,GACtB,IAAI,CAAC,mBAAiD,IAAI,EAAE,CAAC;IAChE,MAAM,sBAAsB,GACzB,IAAI,CAAC,sBAAoD,IAAI,EAAE,CAAC;IACnE,MAAM,oBAAoB,GACvB,IAAI,CAAC,oBAAkD,IAAI,EAAE,CAAC;IAEjE,mBAAmB,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;IAChC,sBAAsB,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC,CAAC;IAE/C,wDAAwD;IACxD,oBAAoB,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC;IAE3C,IAAI,CAAC,mBAAmB,GAAG,mBAAmB,CAAC;IAC/C,IAAI,CAAC,sBAAsB,GAAG,sBAAsB,CAAC;IACrD,IAAI,CAAC,oBAAoB,GAAG,oBAAoB,CAAC;AACnD,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,aAAa,CAAC,IAAY;IACxC,kFAAkF;IAClF,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,gCAAgC,CAAC,IAAI,EAAE,CAAC;IAEjE,MAAM,KAAK,GAAwB,EAAE,CAAC;IACtC,KAAK,MAAM,CAAC,IAAI,KAAK,EAAE,CAAC;QACtB,IAAI,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;YACtB,KAAK,CAAC,EAAE,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YACtB,SAAS;QACX,CAAC;QACD,IAAI,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;YACtB,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;YACzB,SAAS;QACX,CAAC;QACD,IAAI,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YACpB,MAAM,CAAC,CAAC,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAClC,IAAI,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACvB,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,cAAc,EAAE,EAAE,CAAC,CAAC;YAClC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;QACf,CAAC;IACH,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,uBAAuB;IACrC,OAAO,CAAC,IAAU,EAAE,EAAE;QACpB,IAAI,CAAC,IAAI;YAAE,OAAO;QAElB,KAAK,CAAC,IAAI,EAAE,SAAS,EAAE,CAAC,IAAa,EAAE,EAAE;YACvC,MAAM,OAAO,GAAG,IAAuB,CAAC;YACxC,MAAM,IAAI,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;YAC7D,IAAI,CAAC,IAAI;gBAAE,OAAO;YAClB,IAAI,IAAI,CAAC,IAAI,KAAK,mBAAmB,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM;gBAAE,OAAO;YAEtE,MAAM,
|
|
1
|
+
{"version":3,"file":"plugins.js","sourceRoot":"","sources":["../../../src/parse/markdown/plugins.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pipeline.d.ts","sourceRoot":"","sources":["../../src/parse/pipeline.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,gBAAgB,
|
|
1
|
+
{"version":3,"file":"pipeline.d.ts","sourceRoot":"","sources":["../../src/parse/pipeline.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,gBAAgB,EAAgB,MAAM,uBAAuB,CAAC;AAE5E,OAAO,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAIhE,OAAO,EAAE,oBAAoB,EAAmB,MAAM,qBAAqB,CAAC;AAyH5E;;;;;;;GAOG;AACH,wBAAgB,KAAK,CAAC,YAAY,EAAE,gBAAgB,GAAG,WAAW,CAEjE;AAED;;;;;;;;GAQG;AACH,wBAAgB,iBAAiB,CAC7B,YAAY,EAAE,gBAAgB,EAC9B,QAAQ,EAAE,oBAAoB,GAC/B,WAAW,CAGb;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,UAAU,GAAG,IAAI,CAEvD;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAChC,MAAM,EAAE,gBAAgB,CAAC,QAAQ,CAAC,EAClC,MAAM,GAAE,gBAAgB,CAAC,QAAQ,CAA8C,GAChF,WAAW,CAEb"}
|
package/dist/parse/pipeline.js
CHANGED
|
@@ -8,6 +8,7 @@ import { MarkdownUnitParser } from '#src/parse/markdown/index';
|
|
|
8
8
|
import { HtmlUnitParser } from '#src/parse/html/index';
|
|
9
9
|
import { assembleDocument } from '#src/parse/assembler';
|
|
10
10
|
import { defaultRegistry } from '#src/parse/registry';
|
|
11
|
+
import { SourceMapper } from '#src/parse/source-mapper';
|
|
11
12
|
/**
|
|
12
13
|
* Parser registry - maps format to parser factory
|
|
13
14
|
*/
|
|
@@ -30,22 +31,36 @@ function getParser(parsers, format) {
|
|
|
30
31
|
return parser;
|
|
31
32
|
}
|
|
32
33
|
/**
|
|
33
|
-
*
|
|
34
|
+
* Helper to parse content with error handling
|
|
34
35
|
*/
|
|
35
|
-
function
|
|
36
|
+
function parseContent(content, format, sourceMapper, entryFile, parsers, errors) {
|
|
36
37
|
try {
|
|
37
|
-
const parser = getParser(parsers,
|
|
38
|
-
return parser.parse(
|
|
38
|
+
const parser = getParser(parsers, format);
|
|
39
|
+
return parser.parse(content, sourceMapper);
|
|
39
40
|
}
|
|
40
41
|
catch (error) {
|
|
41
42
|
const message = error instanceof Error ? error.message : String(error);
|
|
42
43
|
// Extract position from message if adjusted by parser (e.g. "(99:1)")
|
|
43
44
|
const posMatch = message.match(/\((\d+):(\d+)(?:-[\d:]+)?\)/);
|
|
44
45
|
let posSuffix = "";
|
|
46
|
+
let reportedFile = entryFile;
|
|
45
47
|
if (posMatch) {
|
|
46
|
-
|
|
48
|
+
const startLineOffset = parseInt(posMatch[1], 10);
|
|
49
|
+
// Convert remark's global line to actual source line via mapper
|
|
50
|
+
const srcPos = sourceMapper.createSourcePos({ start: { line: startLineOffset, column: parseInt(posMatch[2], 10), offset: 0 } });
|
|
51
|
+
if (srcPos) {
|
|
52
|
+
reportedFile = srcPos.file;
|
|
53
|
+
posSuffix = `:${srcPos.line}:${srcPos.column}`;
|
|
54
|
+
}
|
|
55
|
+
else {
|
|
56
|
+
posSuffix = `:${posMatch[1]}:${posMatch[2]}`;
|
|
57
|
+
}
|
|
47
58
|
}
|
|
48
|
-
|
|
59
|
+
const formattedError = `${reportedFile}${posSuffix}: ${message}`;
|
|
60
|
+
errors.push(formattedError);
|
|
61
|
+
console.error(formattedError);
|
|
62
|
+
if (error instanceof Error)
|
|
63
|
+
console.error(error);
|
|
49
64
|
return [];
|
|
50
65
|
}
|
|
51
66
|
}
|
|
@@ -53,22 +68,28 @@ function parseUnit(unit, parsers) {
|
|
|
53
68
|
* Internal parse implementation
|
|
54
69
|
*/
|
|
55
70
|
function parseInternal(preprocessed, parsers) {
|
|
56
|
-
const
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
71
|
+
const errors = [];
|
|
72
|
+
const source = preprocessed.source;
|
|
73
|
+
const sourceMapper = new SourceMapper(source.content, source.sourceMap);
|
|
74
|
+
// If entry is HTML but we have markdown fragments, we MUST use the Markdown/MDX
|
|
75
|
+
// parser for the whole thing to allow markdown-inside-tags. MDX is a superset
|
|
76
|
+
// of HTML for our purposes.
|
|
77
|
+
let effectiveFormat = source.entryFormat;
|
|
78
|
+
if (effectiveFormat === 'html' && source.sourceMap.fragments.some(f => f.format === 'markdown')) {
|
|
79
|
+
effectiveFormat = 'markdown';
|
|
61
80
|
}
|
|
62
|
-
|
|
63
|
-
|
|
81
|
+
const blocks = parseContent(source.content, effectiveFormat, sourceMapper, source.entryFile, parsers, errors);
|
|
82
|
+
if (blocks.length === 0) {
|
|
83
|
+
return { errors: errors.length > 0 ? errors : undefined };
|
|
64
84
|
}
|
|
65
85
|
// Assemble document
|
|
66
|
-
const document = assembleDocument(
|
|
86
|
+
const document = assembleDocument(blocks, preprocessed.config, preprocessed.source.entryFile);
|
|
67
87
|
return {
|
|
68
88
|
result: {
|
|
69
89
|
config: preprocessed.config,
|
|
70
90
|
document,
|
|
71
91
|
},
|
|
92
|
+
errors: errors.length > 0 ? errors : undefined
|
|
72
93
|
};
|
|
73
94
|
}
|
|
74
95
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pipeline.js","sourceRoot":"","sources":["../../src/parse/pipeline.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAKH,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAwB,eAAe,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"pipeline.js","sourceRoot":"","sources":["../../src/parse/pipeline.ts"],"names":[],"mappings":"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"}
|
package/dist/parse/registry.d.ts
CHANGED
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
import type { Element, RootContent as HastRootContent } from 'hast';
|
|
7
7
|
import type { RootContent as MdastRootContent } from 'mdast';
|
|
8
8
|
import type { Block, Inline, Section, SourcePos } from '#src/types/ast.generated';
|
|
9
|
-
import type {
|
|
9
|
+
import type { SourceMapper } from '#src/parse/source-mapper';
|
|
10
10
|
/** Node with position info from standard parsers */
|
|
11
11
|
export interface NodeWithPosition {
|
|
12
12
|
position?: {
|
|
@@ -36,8 +36,8 @@ export type ParseContextChildren = HastRootContent[] | MdastRootContent[];
|
|
|
36
36
|
* Context provided to parser modules during transformation.
|
|
37
37
|
*/
|
|
38
38
|
export interface ParseContext {
|
|
39
|
-
/** The source
|
|
40
|
-
readonly
|
|
39
|
+
/** The source mapper for absolute coordinates */
|
|
40
|
+
readonly sourceMapper: SourceMapper;
|
|
41
41
|
/** Create a source position for the AST node */
|
|
42
42
|
createSourcePos(node: NodeWithPosition): SourcePos;
|
|
43
43
|
/** Transform an array of mdast/hast inline children */
|
|
@@ -106,11 +106,11 @@ export declare class ParseHandlerRegistry {
|
|
|
106
106
|
/**
|
|
107
107
|
* Get block handler for an HTML tag
|
|
108
108
|
*/
|
|
109
|
-
|
|
109
|
+
getHtmlBlockHandlers(tagName: string): HtmlParserModule[];
|
|
110
110
|
/**
|
|
111
111
|
* Get inline handler for an HTML tag
|
|
112
112
|
*/
|
|
113
|
-
|
|
113
|
+
getHtmlInlineHandlers(tagName: string): HtmlParserModule[];
|
|
114
114
|
}
|
|
115
115
|
/**
|
|
116
116
|
* Default global registry used by the application.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../src/parse/registry.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,WAAW,IAAI,eAAe,EAAE,MAAM,MAAM,CAAC;AACpE,OAAO,KAAK,EAAE,WAAW,IAAI,gBAAgB,EAAE,MAAM,OAAO,CAAC;AAC7D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAClF,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../src/parse/registry.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,WAAW,IAAI,eAAe,EAAE,MAAM,MAAM,CAAC;AACpE,OAAO,KAAK,EAAE,WAAW,IAAI,gBAAgB,EAAE,MAAM,OAAO,CAAC;AAC7D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAClF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAO7D,oDAAoD;AACpD,MAAM,WAAW,gBAAgB;IAC7B,QAAQ,CAAC,EAAE;QACP,KAAK,EAAE;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,MAAM,EAAE,MAAM,CAAC;YAAC,MAAM,CAAC,EAAE,MAAM,CAAA;SAAE,CAAC;QACzD,GAAG,EAAE;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,MAAM,EAAE,MAAM,CAAC;YAAC,MAAM,CAAC,EAAE,MAAM,CAAA;SAAE,CAAC;KAC1D,CAAC;CACL;AAED,4CAA4C;AAC5C,MAAM,MAAM,kBAAkB,GAAG,KAAK,GAAG,OAAO,GAAG,CAAC,KAAK,GAAG,OAAO,CAAC,EAAE,GAAG,IAAI,CAAC;AAE9E,8CAA8C;AAC9C,MAAM,MAAM,mBAAmB,GAAG,MAAM,GAAG,MAAM,EAAE,GAAG,IAAI,CAAC;AAE3D,6DAA6D;AAC7D,MAAM,MAAM,aAAa,GAAG,kBAAkB,GAAG,mBAAmB,CAAC;AAErE;;GAEG;AACH,MAAM,MAAM,oBAAoB,GAAG,eAAe,EAAE,GAAG,gBAAgB,EAAE,CAAC;AAE1E;;GAEG;AACH,MAAM,WAAW,YAAY;IACzB,iDAAiD;IACjD,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;IAEpC,gDAAgD;IAChD,eAAe,CAAC,IAAI,EAAE,gBAAgB,GAAG,SAAS,CAAC;IAEnD,uDAAuD;IACvD,uBAAuB,CAAC,QAAQ,EAAE,oBAAoB,GAAG,MAAM,EAAE,CAAC;IAElE,sDAAsD;IACtD,sBAAsB,CAAC,QAAQ,EAAE,oBAAoB,GAAG,CAAC,OAAO,GAAG,KAAK,CAAC,EAAE,CAAC;IAE5E,yCAAyC;IACzC,cAAc,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,CAAC;IAEzC,iCAAiC;IACjC,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;IAE5D,sCAAsC;IACtC,QAAQ,CAAC,QAAQ,EAAE,oBAAoB,CAAC;CAC3C;AAMD;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACjC,IAAI,EAAE,MAAM,CAAC;IAEb,4EAA4E;IAC5E,OAAO,EAAE,MAAM,EAAE,CAAC;IAElB,oEAAoE;IACpE,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,wCAAwC;IACxC,WAAW,CAAC,CAAC,IAAI,EAAE,gBAAgB,EAAE,GAAG,EAAE,YAAY,GAAG,kBAAkB,CAAC;IAE5E,yCAAyC;IACzC,YAAY,CAAC,CAAC,IAAI,EAAE,gBAAgB,EAAE,GAAG,EAAE,YAAY,GAAG,mBAAmB,CAAC;CACjF;AAED;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC7B,IAAI,EAAE,MAAM,CAAC;IAEb,qEAAqE;IACrE,OAAO,EAAE,MAAM,EAAE,CAAC;IAElB,oEAAoE;IACpE,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,gDAAgD;IAChD,WAAW,CAAC,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,YAAY,GAAG,kBAAkB,CAAC;IAEtE,iDAAiD;IACjD,YAAY,CAAC,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,YAAY,GAAG,mBAAmB,CAAC;CAC3E;AAMD;;GAEG;AACH,qBAAa,oBAAoB;IAC7B,OAAO,CAAC,eAAe,CAA6C;IACpE,OAAO,CAAC,gBAAgB,CAA6C;IACrE,OAAO,CAAC,iBAAiB,CAAyC;IAClE,OAAO,CAAC,kBAAkB,CAAyC;IAEnE;;OAEG;IACH,sBAAsB,CAAC,MAAM,EAAE,oBAAoB,GAAG,IAAI;IAiB1D;;OAEG;IACH,kBAAkB,CAAC,QAAQ,EAAE,MAAM,GAAG,oBAAoB,EAAE;IAI5D;;OAEG;IACH,mBAAmB,CAAC,QAAQ,EAAE,MAAM,GAAG,oBAAoB,EAAE;IAI7D;;OAEG;IACH,kBAAkB,CAAC,MAAM,EAAE,gBAAgB,GAAG,IAAI;IAoBlD;;OAEG;IACH,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG,gBAAgB,EAAE;IAIzD;;OAEG;IACH,qBAAqB,CAAC,OAAO,EAAE,MAAM,GAAG,gBAAgB,EAAE;CAG7D;AAED;;GAEG;AACH,eAAO,MAAM,eAAe,sBAA6B,CAAC"}
|