yarn-spinner-runner-ts 0.1.2-b → 0.1.3
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/README.md +5 -2
- package/dist/compile/compiler.js +4 -4
- package/dist/compile/compiler.js.map +1 -1
- package/dist/compile/ir.d.ts +3 -0
- package/dist/index.d.ts +3 -0
- package/dist/index.js +3 -0
- package/dist/index.js.map +1 -1
- package/dist/markup/parser.d.ts +3 -0
- package/dist/markup/parser.js +332 -0
- package/dist/markup/parser.js.map +1 -0
- package/dist/markup/types.d.ts +17 -0
- package/dist/markup/types.js +2 -0
- package/dist/markup/types.js.map +1 -0
- package/dist/model/ast.d.ts +3 -0
- package/dist/parse/parser.js +57 -8
- package/dist/parse/parser.js.map +1 -1
- package/dist/react/DialogueExample.js +4 -3
- package/dist/react/DialogueExample.js.map +1 -1
- package/dist/react/DialogueScene.d.ts +2 -1
- package/dist/react/DialogueScene.js +95 -26
- package/dist/react/DialogueScene.js.map +1 -1
- package/dist/react/DialogueView.d.ts +2 -1
- package/dist/react/DialogueView.js +5 -4
- package/dist/react/DialogueView.js.map +1 -1
- package/dist/react/MarkupRenderer.d.ts +8 -0
- package/dist/react/MarkupRenderer.js +64 -0
- package/dist/react/MarkupRenderer.js.map +1 -0
- package/dist/react/TypingText.d.ts +3 -1
- package/dist/react/TypingText.js +16 -40
- package/dist/react/TypingText.js.map +1 -1
- package/dist/runtime/results.d.ts +3 -0
- package/dist/runtime/runner.d.ts +1 -0
- package/dist/runtime/runner.js +151 -14
- package/dist/runtime/runner.js.map +1 -1
- package/dist/tests/markup.test.d.ts +1 -0
- package/dist/tests/markup.test.js +46 -0
- package/dist/tests/markup.test.js.map +1 -0
- package/dist/tests/nodes_lines.test.js +25 -1
- package/dist/tests/nodes_lines.test.js.map +1 -1
- package/dist/tests/options.test.js +30 -1
- package/dist/tests/options.test.js.map +1 -1
- package/docs/actor-transition.md +34 -0
- package/docs/markup.md +34 -19
- package/docs/scenes-actors-setup.md +1 -0
- package/package.json +1 -1
- package/src/compile/compiler.ts +4 -4
- package/src/compile/ir.ts +3 -2
- package/src/index.ts +3 -0
- package/src/markup/parser.ts +372 -0
- package/src/markup/types.ts +22 -0
- package/src/model/ast.ts +17 -13
- package/src/parse/parser.ts +60 -8
- package/src/react/DialogueExample.tsx +4 -2
- package/src/react/DialogueScene.tsx +143 -44
- package/src/react/DialogueView.tsx +19 -5
- package/src/react/MarkupRenderer.tsx +110 -0
- package/src/react/TypingText.tsx +25 -30
- package/src/react/dialogue.css +26 -13
- package/src/runtime/results.ts +3 -1
- package/src/runtime/runner.ts +158 -14
- package/src/tests/markup.test.ts +62 -0
- package/src/tests/nodes_lines.test.ts +35 -1
- package/src/tests/options.test.ts +39 -1
package/README.md
CHANGED
|
@@ -20,9 +20,10 @@ TypeScript parser, compiler, and runtime for Yarn Spinner 3.x with React adapter
|
|
|
20
20
|
* ✅ React hook: `useYarnRunner()`
|
|
21
21
|
* ✅ React components: `<DialogueView />`, `<DialogueScene />`, `<DialogueExample />`
|
|
22
22
|
* ✅ Typing animation with configurable speeds, cursor styles, and auto-advance controls
|
|
23
|
+
* ✅ Markup parsing with HTML formatting tags and CSS-ready spans
|
|
23
24
|
* ✅ Expression evaluator for conditions
|
|
24
25
|
* ✅ Command system with built-in handlers (`<<set>>`, `<<declare>>`, etc.)
|
|
25
|
-
* ✅ Scene system with backgrounds and actor images
|
|
26
|
+
* ✅ Scene system with backgrounds and actor images (with configurable portrait cross-fades)
|
|
26
27
|
* ✅ Custom CSS styling via `&css{}` attributes
|
|
27
28
|
* ✅ Built-in functions (`visited`, `random`, `min`, `max`, etc.)
|
|
28
29
|
* ✅ Support for:
|
|
@@ -165,7 +166,7 @@ This starts a Vite dev server with a live Yarn script editor and dialogue system
|
|
|
165
166
|
* `useYarnRunner(program: IRProgram, options: RunnerOptions)` — React hook
|
|
166
167
|
* Returns: `{ result: RuntimeResult | null, advance: (optionIndex?: number) => void, runner: YarnRunner }`
|
|
167
168
|
* `<DialogueView result={...} onAdvance={...} scenes={...} />` — Ready-to-use dialogue component
|
|
168
|
-
* `<DialogueScene sceneName={...} speaker={...} scenes={...}
|
|
169
|
+
* `<DialogueScene sceneName={...} speaker={...} scenes={...} actorTransitionDuration={...} /> — Scene background, actor display, and portrait transitions` — Scene background and actor display
|
|
169
170
|
* `<DialogueExample />` — Full example with editor
|
|
170
171
|
|
|
171
172
|
### Scene System
|
|
@@ -364,6 +365,8 @@ Additional documentation is available in the `docs/` folder:
|
|
|
364
365
|
* [Tags and Metadata](./docs/tags-metadata.md)
|
|
365
366
|
* [CSS Attribute](./docs/css-attribute.md)
|
|
366
367
|
* [Typing Animation (React)](./docs/typing-animation.md)
|
|
368
|
+
* [Markup (Yarn Spinner)](./docs/markup.md)
|
|
369
|
+
* [Actor Image Transitions](./docs/actor-transition.md)
|
|
367
370
|
* [Scene and Actor Setup](./docs/scenes-actors-setup.md)
|
|
368
371
|
|
|
369
372
|
## License
|
package/dist/compile/compiler.js
CHANGED
|
@@ -34,7 +34,7 @@ export function compile(doc, opts = {}) {
|
|
|
34
34
|
case "Line":
|
|
35
35
|
{
|
|
36
36
|
const line = s;
|
|
37
|
-
block.push({ op: "line", speaker: line.speaker, text: line.text, tags: ensureLineId(line.tags) });
|
|
37
|
+
block.push({ op: "line", speaker: line.speaker, text: line.text, tags: ensureLineId(line.tags), markup: line.markup });
|
|
38
38
|
}
|
|
39
39
|
break;
|
|
40
40
|
case "Command":
|
|
@@ -63,7 +63,7 @@ export function compile(doc, opts = {}) {
|
|
|
63
63
|
}
|
|
64
64
|
block.push({
|
|
65
65
|
op: "options",
|
|
66
|
-
options: s.options.map((o) => ({ text: o.text, tags: ensureLineId(o.tags), css: o.css, block: emitBlock(o.body) })),
|
|
66
|
+
options: s.options.map((o) => ({ text: o.text, tags: ensureLineId(o.tags), css: o.css, markup: o.markup, block: emitBlock(o.body) })),
|
|
67
67
|
});
|
|
68
68
|
break;
|
|
69
69
|
}
|
|
@@ -106,7 +106,7 @@ export function compile(doc, opts = {}) {
|
|
|
106
106
|
case "Line":
|
|
107
107
|
{
|
|
108
108
|
const line = s;
|
|
109
|
-
block.push({ op: "line", speaker: line.speaker, text: line.text, tags: ensureLineId(line.tags) });
|
|
109
|
+
block.push({ op: "line", speaker: line.speaker, text: line.text, tags: ensureLineId(line.tags), markup: line.markup });
|
|
110
110
|
}
|
|
111
111
|
break;
|
|
112
112
|
case "Command":
|
|
@@ -134,7 +134,7 @@ export function compile(doc, opts = {}) {
|
|
|
134
134
|
}
|
|
135
135
|
block.push({
|
|
136
136
|
op: "options",
|
|
137
|
-
options: s.options.map((o) => ({ text: o.text, tags: ensureLineId(o.tags), css: o.css, block: emitBlock(o.body) })),
|
|
137
|
+
options: s.options.map((o) => ({ text: o.text, tags: ensureLineId(o.tags), css: o.css, markup: o.markup, block: emitBlock(o.body) })),
|
|
138
138
|
});
|
|
139
139
|
break;
|
|
140
140
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compiler.js","sourceRoot":"","sources":["../../src/compile/compiler.ts"],"names":[],"mappings":"AAOA,MAAM,UAAU,OAAO,CAAC,GAAiB,EAAE,OAAuB,EAAE;IAClE,MAAM,OAAO,GAAc,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC;IACpD,yBAAyB;IACzB,KAAK,MAAM,OAAO,IAAI,GAAG,CAAC,KAAK,EAAE,CAAC;QAChC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC;IAC9C,CAAC;IACD,MAAM,OAAO,GAAG,IAAI,CAAC,eAAe,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,SAAS,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC;IAC7E,IAAI,iBAAiB,GAAG,CAAC,CAAC;IAE1B,SAAS,YAAY,CAAC,IAAe;QACnC,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAChC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC;YAC1C,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,iBAAiB,EAAE,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;QACvD,CAAC;QACD,OAAO,CAAC,CAAC;IACX,CAAC;IAED,6CAA6C;IAC7C,MAAM,YAAY,GAAG,IAAI,GAAG,EAA4B,CAAC;IACzD,KAAK,MAAM,IAAI,IAAI,GAAG,CAAC,KAAK,EAAE,CAAC;QAC7B,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;YAClC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QACnC,CAAC;QACD,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC3C,CAAC;IAED,KAAK,MAAM,CAAC,KAAK,EAAE,kBAAkB,CAAC,IAAI,YAAY,EAAE,CAAC;QACvD,0DAA0D;QAC1D,IAAI,kBAAkB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACpC,MAAM,IAAI,GAAG,kBAAkB,CAAC,CAAC,CAAC,CAAC;YACnC,MAAM,YAAY,GAAoB,EAAE,CAAC;YACzC,IAAI,WAAW,GAAG,CAAC,CAAC;YACpB,SAAS,SAAS,CAAC,KAAkB;gBACrC,MAAM,KAAK,GAAoB,EAAE,CAAC;gBAClC,KAAK,MAAM,CAAC,IAAI,KAAK,EAAE,CAAC;oBACtB,QAAQ,CAAC,CAAC,IAAI,EAAE,CAAC;wBACf,KAAK,MAAM;4BACT,CAAC;gCACC,MAAM,IAAI,GAAG,CAAS,CAAC;gCACvB,KAAK,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"compiler.js","sourceRoot":"","sources":["../../src/compile/compiler.ts"],"names":[],"mappings":"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"}
|
package/dist/compile/ir.d.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { MarkupParseResult } from "../markup/types.js";
|
|
1
2
|
export type IRProgram = {
|
|
2
3
|
enums: Record<string, string[]>;
|
|
3
4
|
nodes: Record<string, IRNode | IRNodeGroup>;
|
|
@@ -18,6 +19,7 @@ export type IRInstruction = {
|
|
|
18
19
|
speaker?: string;
|
|
19
20
|
text: string;
|
|
20
21
|
tags?: string[];
|
|
22
|
+
markup?: MarkupParseResult;
|
|
21
23
|
} | {
|
|
22
24
|
op: "command";
|
|
23
25
|
content: string;
|
|
@@ -33,6 +35,7 @@ export type IRInstruction = {
|
|
|
33
35
|
text: string;
|
|
34
36
|
tags?: string[];
|
|
35
37
|
css?: string;
|
|
38
|
+
markup?: MarkupParseResult;
|
|
36
39
|
block: IRInstruction[];
|
|
37
40
|
}>;
|
|
38
41
|
} | {
|
package/dist/index.d.ts
CHANGED
|
@@ -3,6 +3,8 @@ export * from "./parse/lexer.js";
|
|
|
3
3
|
export * from "./parse/parser.js";
|
|
4
4
|
export * from "./compile/ir.js";
|
|
5
5
|
export * from "./compile/compiler.js";
|
|
6
|
+
export * from "./markup/types.js";
|
|
7
|
+
export * from "./markup/parser.js";
|
|
6
8
|
export * from "./runtime/results.js";
|
|
7
9
|
export * from "./runtime/evaluator.js";
|
|
8
10
|
export * from "./runtime/commands.js";
|
|
@@ -14,3 +16,4 @@ export * from "./react/useYarnRunner.js";
|
|
|
14
16
|
export * from "./react/DialogueView.js";
|
|
15
17
|
export * from "./react/DialogueExample.js";
|
|
16
18
|
export * from "./react/DialogueScene.js";
|
|
19
|
+
export * from "./react/MarkupRenderer.js";
|
package/dist/index.js
CHANGED
|
@@ -3,6 +3,8 @@ export * from "./parse/lexer.js";
|
|
|
3
3
|
export * from "./parse/parser.js";
|
|
4
4
|
export * from "./compile/ir.js";
|
|
5
5
|
export * from "./compile/compiler.js";
|
|
6
|
+
export * from "./markup/types.js";
|
|
7
|
+
export * from "./markup/parser.js";
|
|
6
8
|
export * from "./runtime/results.js";
|
|
7
9
|
export * from "./runtime/evaluator.js";
|
|
8
10
|
export * from "./runtime/commands.js";
|
|
@@ -14,4 +16,5 @@ export * from "./react/useYarnRunner.js";
|
|
|
14
16
|
export * from "./react/DialogueView.js";
|
|
15
17
|
export * from "./react/DialogueExample.js";
|
|
16
18
|
export * from "./react/DialogueScene.js";
|
|
19
|
+
export * from "./react/MarkupRenderer.js";
|
|
17
20
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC;AACjC,cAAc,mBAAmB,CAAC;AAClC,cAAc,iBAAiB,CAAC;AAChC,cAAc,uBAAuB,CAAC;AACtC,cAAc,sBAAsB,CAAC;AACrC,cAAc,wBAAwB,CAAC;AACvC,cAAc,uBAAuB,CAAC;AACtC,cAAc,qBAAqB,CAAC;AACpC,cAAc,YAAY,CAAC;AAC3B,cAAc,kBAAkB,CAAC;AACjC,cAAc,mBAAmB,CAAC;AAClC,cAAc,0BAA0B,CAAC;AACzC,cAAc,yBAAyB,CAAC;AACxC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,0BAA0B,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC;AACjC,cAAc,mBAAmB,CAAC;AAClC,cAAc,iBAAiB,CAAC;AAChC,cAAc,uBAAuB,CAAC;AACtC,cAAc,mBAAmB,CAAC;AAClC,cAAc,oBAAoB,CAAC;AACnC,cAAc,sBAAsB,CAAC;AACrC,cAAc,wBAAwB,CAAC;AACvC,cAAc,uBAAuB,CAAC;AACtC,cAAc,qBAAqB,CAAC;AACpC,cAAc,YAAY,CAAC;AAC3B,cAAc,kBAAkB,CAAC;AACjC,cAAc,mBAAmB,CAAC;AAClC,cAAc,0BAA0B,CAAC;AACzC,cAAc,yBAAyB,CAAC;AACxC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,0BAA0B,CAAC;AACzC,cAAc,2BAA2B,CAAC"}
|
|
@@ -0,0 +1,332 @@
|
|
|
1
|
+
const DEFAULT_HTML_TAGS = new Set(["b", "em", "small", "strong", "sub", "sup", "ins", "del", "mark"]);
|
|
2
|
+
const SELF_CLOSING_SPACE_REGEX = /\s+\/$/;
|
|
3
|
+
const ATTRIBUTE_REGEX = /^([a-zA-Z_][a-zA-Z0-9_-]*)(?:\s*=\s*(?:"([^"]*)"|'([^']*)'|([^\s"']+)))?/;
|
|
4
|
+
export function parseMarkup(input) {
|
|
5
|
+
const segments = [];
|
|
6
|
+
const stack = [];
|
|
7
|
+
const chars = [];
|
|
8
|
+
let currentSegment = null;
|
|
9
|
+
let nomarkupDepth = 0;
|
|
10
|
+
const pushSegment = (segment) => {
|
|
11
|
+
if (segment.selfClosing || segment.end > segment.start) {
|
|
12
|
+
segments.push(segment);
|
|
13
|
+
}
|
|
14
|
+
};
|
|
15
|
+
const wrappersEqual = (a, b) => {
|
|
16
|
+
if (a.length !== b.length)
|
|
17
|
+
return false;
|
|
18
|
+
for (let i = 0; i < a.length; i++) {
|
|
19
|
+
const wa = a[i];
|
|
20
|
+
const wb = b[i];
|
|
21
|
+
if (wa.name !== wb.name || wa.type !== wb.type)
|
|
22
|
+
return false;
|
|
23
|
+
const keysA = Object.keys(wa.properties);
|
|
24
|
+
const keysB = Object.keys(wb.properties);
|
|
25
|
+
if (keysA.length !== keysB.length)
|
|
26
|
+
return false;
|
|
27
|
+
for (const key of keysA) {
|
|
28
|
+
if (wa.properties[key] !== wb.properties[key])
|
|
29
|
+
return false;
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
return true;
|
|
33
|
+
};
|
|
34
|
+
const flushCurrentSegment = () => {
|
|
35
|
+
if (currentSegment) {
|
|
36
|
+
segments.push(currentSegment);
|
|
37
|
+
currentSegment = null;
|
|
38
|
+
}
|
|
39
|
+
};
|
|
40
|
+
const cloneWrappers = () => stack.map((entry) => ({
|
|
41
|
+
name: entry.name,
|
|
42
|
+
type: entry.type,
|
|
43
|
+
properties: { ...entry.properties },
|
|
44
|
+
}));
|
|
45
|
+
const appendChar = (char) => {
|
|
46
|
+
const index = chars.length;
|
|
47
|
+
chars.push(char);
|
|
48
|
+
const wrappers = cloneWrappers();
|
|
49
|
+
if (currentSegment && wrappersEqual(currentSegment.wrappers, wrappers)) {
|
|
50
|
+
currentSegment.end = index + 1;
|
|
51
|
+
}
|
|
52
|
+
else {
|
|
53
|
+
flushCurrentSegment();
|
|
54
|
+
currentSegment = {
|
|
55
|
+
start: index,
|
|
56
|
+
end: index + 1,
|
|
57
|
+
wrappers,
|
|
58
|
+
};
|
|
59
|
+
}
|
|
60
|
+
};
|
|
61
|
+
const appendLiteral = (literal) => {
|
|
62
|
+
for (const ch of literal) {
|
|
63
|
+
appendChar(ch);
|
|
64
|
+
}
|
|
65
|
+
};
|
|
66
|
+
const parseTag = (contentRaw) => {
|
|
67
|
+
let content = contentRaw.trim();
|
|
68
|
+
if (!content)
|
|
69
|
+
return null;
|
|
70
|
+
if (content.startsWith("/")) {
|
|
71
|
+
const name = content.slice(1).trim().toLowerCase();
|
|
72
|
+
if (!name)
|
|
73
|
+
return null;
|
|
74
|
+
return { kind: "close", name, properties: {} };
|
|
75
|
+
}
|
|
76
|
+
let kind = "open";
|
|
77
|
+
if (content.endsWith("/")) {
|
|
78
|
+
content = content.replace(SELF_CLOSING_SPACE_REGEX, "").trim();
|
|
79
|
+
if (content.endsWith("/")) {
|
|
80
|
+
content = content.slice(0, -1).trim();
|
|
81
|
+
}
|
|
82
|
+
kind = "self";
|
|
83
|
+
}
|
|
84
|
+
const nameMatch = content.match(/^([a-zA-Z_][a-zA-Z0-9_-]*)/);
|
|
85
|
+
if (!nameMatch)
|
|
86
|
+
return null;
|
|
87
|
+
const name = nameMatch[1].toLowerCase();
|
|
88
|
+
let rest = content.slice(nameMatch[0].length).trim();
|
|
89
|
+
const properties = {};
|
|
90
|
+
while (rest.length > 0) {
|
|
91
|
+
const attrMatch = rest.match(ATTRIBUTE_REGEX);
|
|
92
|
+
if (!attrMatch) {
|
|
93
|
+
break;
|
|
94
|
+
}
|
|
95
|
+
const [, keyRaw, doubleQuoted, singleQuoted, bare] = attrMatch;
|
|
96
|
+
const key = keyRaw.toLowerCase();
|
|
97
|
+
let value = true;
|
|
98
|
+
const rawValue = doubleQuoted ?? singleQuoted ?? bare;
|
|
99
|
+
if (rawValue !== undefined) {
|
|
100
|
+
value = parseAttributeValue(rawValue);
|
|
101
|
+
}
|
|
102
|
+
properties[key] = value;
|
|
103
|
+
rest = rest.slice(attrMatch[0].length).trim();
|
|
104
|
+
}
|
|
105
|
+
return { kind, name, properties };
|
|
106
|
+
};
|
|
107
|
+
const parseAttributeValue = (raw) => {
|
|
108
|
+
const trimmed = raw.trim();
|
|
109
|
+
if (/^(true|false)$/i.test(trimmed)) {
|
|
110
|
+
return /^true$/i.test(trimmed);
|
|
111
|
+
}
|
|
112
|
+
if (/^[+-]?\d+(\.\d+)?$/.test(trimmed)) {
|
|
113
|
+
const num = Number(trimmed);
|
|
114
|
+
if (!Number.isNaN(num)) {
|
|
115
|
+
return num;
|
|
116
|
+
}
|
|
117
|
+
}
|
|
118
|
+
return trimmed;
|
|
119
|
+
};
|
|
120
|
+
const handleSelfClosing = (tag) => {
|
|
121
|
+
const wrapper = {
|
|
122
|
+
name: tag.name,
|
|
123
|
+
type: DEFAULT_HTML_TAGS.has(tag.name) ? "default" : "custom",
|
|
124
|
+
properties: tag.properties,
|
|
125
|
+
};
|
|
126
|
+
const position = chars.length;
|
|
127
|
+
pushSegment({
|
|
128
|
+
start: position,
|
|
129
|
+
end: position,
|
|
130
|
+
wrappers: [wrapper],
|
|
131
|
+
selfClosing: true,
|
|
132
|
+
});
|
|
133
|
+
};
|
|
134
|
+
let i = 0;
|
|
135
|
+
while (i < input.length) {
|
|
136
|
+
const char = input[i];
|
|
137
|
+
if (char === "\\" && i + 1 < input.length) {
|
|
138
|
+
const next = input[i + 1];
|
|
139
|
+
if (next === "[" || next === "]" || next === "\\") {
|
|
140
|
+
appendChar(next);
|
|
141
|
+
i += 2;
|
|
142
|
+
continue;
|
|
143
|
+
}
|
|
144
|
+
}
|
|
145
|
+
if (char === "[") {
|
|
146
|
+
const closeIndex = findClosingBracket(input, i + 1);
|
|
147
|
+
if (closeIndex === -1) {
|
|
148
|
+
appendChar(char);
|
|
149
|
+
i += 1;
|
|
150
|
+
continue;
|
|
151
|
+
}
|
|
152
|
+
const content = input.slice(i + 1, closeIndex);
|
|
153
|
+
const originalText = input.slice(i, closeIndex + 1);
|
|
154
|
+
const parsed = parseTag(content);
|
|
155
|
+
if (!parsed) {
|
|
156
|
+
appendLiteral(originalText);
|
|
157
|
+
i = closeIndex + 1;
|
|
158
|
+
continue;
|
|
159
|
+
}
|
|
160
|
+
if (parsed.name === "nomarkup") {
|
|
161
|
+
if (parsed.kind === "open") {
|
|
162
|
+
nomarkupDepth += 1;
|
|
163
|
+
}
|
|
164
|
+
else if (parsed.kind === "close" && nomarkupDepth > 0) {
|
|
165
|
+
nomarkupDepth -= 1;
|
|
166
|
+
}
|
|
167
|
+
i = closeIndex + 1;
|
|
168
|
+
continue;
|
|
169
|
+
}
|
|
170
|
+
if (nomarkupDepth > 0) {
|
|
171
|
+
appendLiteral(originalText);
|
|
172
|
+
i = closeIndex + 1;
|
|
173
|
+
continue;
|
|
174
|
+
}
|
|
175
|
+
if (parsed.kind === "open") {
|
|
176
|
+
const entry = {
|
|
177
|
+
name: parsed.name,
|
|
178
|
+
type: DEFAULT_HTML_TAGS.has(parsed.name) ? "default" : "custom",
|
|
179
|
+
properties: parsed.properties,
|
|
180
|
+
originalText,
|
|
181
|
+
};
|
|
182
|
+
stack.push(entry);
|
|
183
|
+
flushCurrentSegment();
|
|
184
|
+
i = closeIndex + 1;
|
|
185
|
+
continue;
|
|
186
|
+
}
|
|
187
|
+
if (parsed.kind === "self") {
|
|
188
|
+
handleSelfClosing(parsed);
|
|
189
|
+
i = closeIndex + 1;
|
|
190
|
+
continue;
|
|
191
|
+
}
|
|
192
|
+
// closing tag
|
|
193
|
+
if (stack.length === 0) {
|
|
194
|
+
appendLiteral(originalText);
|
|
195
|
+
i = closeIndex + 1;
|
|
196
|
+
continue;
|
|
197
|
+
}
|
|
198
|
+
const top = stack[stack.length - 1];
|
|
199
|
+
if (top.name === parsed.name) {
|
|
200
|
+
flushCurrentSegment();
|
|
201
|
+
stack.pop();
|
|
202
|
+
i = closeIndex + 1;
|
|
203
|
+
continue;
|
|
204
|
+
}
|
|
205
|
+
// mismatched closing; treat as literal
|
|
206
|
+
appendLiteral(originalText);
|
|
207
|
+
i = closeIndex + 1;
|
|
208
|
+
continue;
|
|
209
|
+
}
|
|
210
|
+
appendChar(char);
|
|
211
|
+
i += 1;
|
|
212
|
+
}
|
|
213
|
+
flushCurrentSegment();
|
|
214
|
+
// If any tags remain open, treat them as literal text appended at end
|
|
215
|
+
while (stack.length > 0) {
|
|
216
|
+
const entry = stack.pop();
|
|
217
|
+
appendLiteral(entry.originalText);
|
|
218
|
+
}
|
|
219
|
+
flushCurrentSegment();
|
|
220
|
+
const text = chars.join("");
|
|
221
|
+
return {
|
|
222
|
+
text,
|
|
223
|
+
segments: mergeSegments(segments, text.length),
|
|
224
|
+
};
|
|
225
|
+
}
|
|
226
|
+
function mergeSegments(segments, textLength) {
|
|
227
|
+
const sorted = [...segments].sort((a, b) => a.start - b.start || a.end - b.end);
|
|
228
|
+
const merged = [];
|
|
229
|
+
let last = null;
|
|
230
|
+
for (const seg of sorted) {
|
|
231
|
+
if (seg.start === seg.end && !seg.selfClosing) {
|
|
232
|
+
continue;
|
|
233
|
+
}
|
|
234
|
+
if (last && !seg.selfClosing && last.end === seg.start && wrappersMatch(last.wrappers, seg.wrappers)) {
|
|
235
|
+
last.end = seg.end;
|
|
236
|
+
}
|
|
237
|
+
else {
|
|
238
|
+
last = {
|
|
239
|
+
start: seg.start,
|
|
240
|
+
end: seg.end,
|
|
241
|
+
wrappers: seg.wrappers,
|
|
242
|
+
selfClosing: seg.selfClosing,
|
|
243
|
+
};
|
|
244
|
+
merged.push(last);
|
|
245
|
+
}
|
|
246
|
+
}
|
|
247
|
+
if (merged.length === 0 && textLength > 0) {
|
|
248
|
+
merged.push({
|
|
249
|
+
start: 0,
|
|
250
|
+
end: textLength,
|
|
251
|
+
wrappers: [],
|
|
252
|
+
});
|
|
253
|
+
}
|
|
254
|
+
return merged;
|
|
255
|
+
}
|
|
256
|
+
function wrappersMatch(a, b) {
|
|
257
|
+
if (a.length !== b.length)
|
|
258
|
+
return false;
|
|
259
|
+
for (let i = 0; i < a.length; i++) {
|
|
260
|
+
if (a[i].name !== b[i].name || a[i].type !== b[i].type)
|
|
261
|
+
return false;
|
|
262
|
+
const keysA = Object.keys(a[i].properties);
|
|
263
|
+
const keysB = Object.keys(b[i].properties);
|
|
264
|
+
if (keysA.length !== keysB.length)
|
|
265
|
+
return false;
|
|
266
|
+
for (const key of keysA) {
|
|
267
|
+
if (a[i].properties[key] !== b[i].properties[key])
|
|
268
|
+
return false;
|
|
269
|
+
}
|
|
270
|
+
}
|
|
271
|
+
return true;
|
|
272
|
+
}
|
|
273
|
+
function findClosingBracket(text, start) {
|
|
274
|
+
for (let i = start; i < text.length; i++) {
|
|
275
|
+
if (text[i] === "]") {
|
|
276
|
+
let backslashCount = 0;
|
|
277
|
+
let j = i - 1;
|
|
278
|
+
while (j >= 0 && text[j] === "\\") {
|
|
279
|
+
backslashCount++;
|
|
280
|
+
j--;
|
|
281
|
+
}
|
|
282
|
+
if (backslashCount % 2 === 0) {
|
|
283
|
+
return i;
|
|
284
|
+
}
|
|
285
|
+
}
|
|
286
|
+
}
|
|
287
|
+
return -1;
|
|
288
|
+
}
|
|
289
|
+
export function sliceMarkup(result, start, end) {
|
|
290
|
+
const textLength = result.text.length;
|
|
291
|
+
const sliceStart = Math.max(0, Math.min(start, textLength));
|
|
292
|
+
const sliceEnd = end === undefined ? textLength : Math.max(sliceStart, Math.min(end, textLength));
|
|
293
|
+
const slicedSegments = [];
|
|
294
|
+
for (const seg of result.segments) {
|
|
295
|
+
const segStart = Math.max(seg.start, sliceStart);
|
|
296
|
+
const segEnd = Math.min(seg.end, sliceEnd);
|
|
297
|
+
if (seg.selfClosing) {
|
|
298
|
+
if (segStart >= sliceStart && segStart <= sliceEnd) {
|
|
299
|
+
slicedSegments.push({
|
|
300
|
+
start: segStart - sliceStart,
|
|
301
|
+
end: segStart - sliceStart,
|
|
302
|
+
wrappers: seg.wrappers,
|
|
303
|
+
selfClosing: true,
|
|
304
|
+
});
|
|
305
|
+
}
|
|
306
|
+
continue;
|
|
307
|
+
}
|
|
308
|
+
if (segEnd <= segStart)
|
|
309
|
+
continue;
|
|
310
|
+
slicedSegments.push({
|
|
311
|
+
start: segStart - sliceStart,
|
|
312
|
+
end: segEnd - sliceStart,
|
|
313
|
+
wrappers: seg.wrappers.map((wrapper) => ({
|
|
314
|
+
name: wrapper.name,
|
|
315
|
+
type: wrapper.type,
|
|
316
|
+
properties: { ...wrapper.properties },
|
|
317
|
+
})),
|
|
318
|
+
});
|
|
319
|
+
}
|
|
320
|
+
if (slicedSegments.length === 0 && sliceEnd - sliceStart > 0) {
|
|
321
|
+
slicedSegments.push({
|
|
322
|
+
start: 0,
|
|
323
|
+
end: sliceEnd - sliceStart,
|
|
324
|
+
wrappers: [],
|
|
325
|
+
});
|
|
326
|
+
}
|
|
327
|
+
return {
|
|
328
|
+
text: result.text.slice(sliceStart, sliceEnd),
|
|
329
|
+
segments: mergeSegments(slicedSegments, sliceEnd - sliceStart),
|
|
330
|
+
};
|
|
331
|
+
}
|
|
332
|
+
//# sourceMappingURL=parser.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"parser.js","sourceRoot":"","sources":["../../src/markup/parser.ts"],"names":[],"mappings":"AAEA,MAAM,iBAAiB,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC;AAetG,MAAM,wBAAwB,GAAG,QAAQ,CAAC;AAC1C,MAAM,eAAe,GACnB,0EAA0E,CAAC;AAE7E,MAAM,UAAU,WAAW,CAAC,KAAa;IACvC,MAAM,QAAQ,GAAoB,EAAE,CAAC;IACrC,MAAM,KAAK,GAAiB,EAAE,CAAC;IAC/B,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,IAAI,cAAc,GAAyB,IAAI,CAAC;IAChD,IAAI,aAAa,GAAG,CAAC,CAAC;IAEtB,MAAM,WAAW,GAAG,CAAC,OAAsB,EAAE,EAAE;QAC7C,IAAI,OAAO,CAAC,WAAW,IAAI,OAAO,CAAC,GAAG,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;YACvD,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACzB,CAAC;IACH,CAAC,CAAC;IAEF,MAAM,aAAa,GAAG,CAAC,CAAkB,EAAE,CAAkB,EAAE,EAAE;QAC/D,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM;YAAE,OAAO,KAAK,CAAC;QACxC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAClC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;YAChB,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;YAChB,IAAI,EAAE,CAAC,IAAI,KAAK,EAAE,CAAC,IAAI,IAAI,EAAE,CAAC,IAAI,KAAK,EAAE,CAAC,IAAI;gBAAE,OAAO,KAAK,CAAC;YAC7D,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC;YACzC,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC;YACzC,IAAI,KAAK,CAAC,MAAM,KAAK,KAAK,CAAC,MAAM;gBAAE,OAAO,KAAK,CAAC;YAChD,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE,CAAC;gBACxB,IAAI,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC;oBAAE,OAAO,KAAK,CAAC;YAC9D,CAAC;QACH,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;IAEF,MAAM,mBAAmB,GAAG,GAAG,EAAE;QAC/B,IAAI,cAAc,EAAE,CAAC;YACnB,QAAQ,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;YAC9B,cAAc,GAAG,IAAI,CAAC;QACxB,CAAC;IACH,CAAC,CAAC;IAEF,MAAM,aAAa,GAAG,GAAoB,EAAE,CAC1C,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QACpB,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,UAAU,EAAE,EAAE,GAAG,KAAK,CAAC,UAAU,EAAE;KACpC,CAAC,CAAC,CAAC;IAEN,MAAM,UAAU,GAAG,CAAC,IAAY,EAAE,EAAE;QAClC,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC;QAC3B,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACjB,MAAM,QAAQ,GAAG,aAAa,EAAE,CAAC;QACjC,IAAI,cAAc,IAAI,aAAa,CAAC,cAAc,CAAC,QAAQ,EAAE,QAAQ,CAAC,EAAE,CAAC;YACvE,cAAc,CAAC,GAAG,GAAG,KAAK,GAAG,CAAC,CAAC;QACjC,CAAC;aAAM,CAAC;YACN,mBAAmB,EAAE,CAAC;YACtB,cAAc,GAAG;gBACf,KAAK,EAAE,KAAK;gBACZ,GAAG,EAAE,KAAK,GAAG,CAAC;gBACd,QAAQ;aACT,CAAC;QACJ,CAAC;IACH,CAAC,CAAC;IAEF,MAAM,aAAa,GAAG,CAAC,OAAe,EAAE,EAAE;QACxC,KAAK,MAAM,EAAE,IAAI,OAAO,EAAE,CAAC;YACzB,UAAU,CAAC,EAAE,CAAC,CAAC;QACjB,CAAC;IACH,CAAC,CAAC;IAEF,MAAM,QAAQ,GAAG,CAAC,UAAkB,EAAoB,EAAE;QACxD,IAAI,OAAO,GAAG,UAAU,CAAC,IAAI,EAAE,CAAC;QAChC,IAAI,CAAC,OAAO;YAAE,OAAO,IAAI,CAAC;QAE1B,IAAI,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;YAC5B,MAAM,IAAI,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;YACnD,IAAI,CAAC,IAAI;gBAAE,OAAO,IAAI,CAAC;YACvB,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC;QACjD,CAAC;QAED,IAAI,IAAI,GAAsB,MAAM,CAAC;QACrC,IAAI,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YAC1B,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,wBAAwB,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;YAC/D,IAAI,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC1B,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;YACxC,CAAC;YACD,IAAI,GAAG,MAAM,CAAC;QAChB,CAAC;QAED,MAAM,SAAS,GAAG,OAAO,CAAC,KAAK,CAAC,4BAA4B,CAAC,CAAC;QAC9D,IAAI,CAAC,SAAS;YAAE,OAAO,IAAI,CAAC;QAC5B,MAAM,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;QACxC,IAAI,IAAI,GAAG,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC;QAErD,MAAM,UAAU,GAAgC,EAAE,CAAC;QACnD,OAAO,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACvB,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;YAC9C,IAAI,CAAC,SAAS,EAAE,CAAC;gBACf,MAAM;YACR,CAAC;YACD,MAAM,CAAC,EAAE,MAAM,EAAE,YAAY,EAAE,YAAY,EAAE,IAAI,CAAC,GAAG,SAAS,CAAC;YAC/D,MAAM,GAAG,GAAG,MAAM,CAAC,WAAW,EAAE,CAAC;YACjC,IAAI,KAAK,GAAgB,IAAI,CAAC;YAC9B,MAAM,QAAQ,GAAG,YAAY,IAAI,YAAY,IAAI,IAAI,CAAC;YACtD,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;gBAC3B,KAAK,GAAG,mBAAmB,CAAC,QAAQ,CAAC,CAAC;YACxC,CAAC;YACD,UAAU,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;YACxB,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC;QAChD,CAAC;QAED,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC;IACpC,CAAC,CAAC;IAEF,MAAM,mBAAmB,GAAG,CAAC,GAAW,EAAe,EAAE;QACvD,MAAM,OAAO,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC;QAC3B,IAAI,iBAAiB,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;YACpC,OAAO,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACjC,CAAC;QACD,IAAI,oBAAoB,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;YACvC,MAAM,GAAG,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC;YAC5B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;gBACvB,OAAO,GAAG,CAAC;YACb,CAAC;QACH,CAAC;QACD,OAAO,OAAO,CAAC;IACjB,CAAC,CAAC;IAEF,MAAM,iBAAiB,GAAG,CAAC,GAAc,EAAE,EAAE;QAC3C,MAAM,OAAO,GAAkB;YAC7B,IAAI,EAAE,GAAG,CAAC,IAAI;YACd,IAAI,EAAE,iBAAiB,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ;YAC5D,UAAU,EAAE,GAAG,CAAC,UAAU;SAC3B,CAAC;QACF,MAAM,QAAQ,GAAG,KAAK,CAAC,MAAM,CAAC;QAC9B,WAAW,CAAC;YACV,KAAK,EAAE,QAAQ;YACf,GAAG,EAAE,QAAQ;YACb,QAAQ,EAAE,CAAC,OAAO,CAAC;YACnB,WAAW,EAAE,IAAI;SAClB,CAAC,CAAC;IACL,CAAC,CAAC;IAEF,IAAI,CAAC,GAAG,CAAC,CAAC;IACV,OAAO,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC;QACxB,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;QACtB,IAAI,IAAI,KAAK,IAAI,IAAI,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC;YAC1C,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;YAC1B,IAAI,IAAI,KAAK,GAAG,IAAI,IAAI,KAAK,GAAG,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;gBAClD,UAAU,CAAC,IAAI,CAAC,CAAC;gBACjB,CAAC,IAAI,CAAC,CAAC;gBACP,SAAS;YACX,CAAC;QACH,CAAC;QAED,IAAI,IAAI,KAAK,GAAG,EAAE,CAAC;YACjB,MAAM,UAAU,GAAG,kBAAkB,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;YACpD,IAAI,UAAU,KAAK,CAAC,CAAC,EAAE,CAAC;gBACtB,UAAU,CAAC,IAAI,CAAC,CAAC;gBACjB,CAAC,IAAI,CAAC,CAAC;gBACP,SAAS;YACX,CAAC;YACD,MAAM,OAAO,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,EAAE,UAAU,CAAC,CAAC;YAC/C,MAAM,YAAY,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,UAAU,GAAG,CAAC,CAAC,CAAC;YAEpD,MAAM,MAAM,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC;YACjC,IAAI,CAAC,MAAM,EAAE,CAAC;gBACZ,aAAa,CAAC,YAAY,CAAC,CAAC;gBAC5B,CAAC,GAAG,UAAU,GAAG,CAAC,CAAC;gBACnB,SAAS;YACX,CAAC;YAED,IAAI,MAAM,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;gBAC/B,IAAI,MAAM,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;oBAC3B,aAAa,IAAI,CAAC,CAAC;gBACrB,CAAC;qBAAM,IAAI,MAAM,CAAC,IAAI,KAAK,OAAO,IAAI,aAAa,GAAG,CAAC,EAAE,CAAC;oBACxD,aAAa,IAAI,CAAC,CAAC;gBACrB,CAAC;gBACD,CAAC,GAAG,UAAU,GAAG,CAAC,CAAC;gBACnB,SAAS;YACX,CAAC;YAED,IAAI,aAAa,GAAG,CAAC,EAAE,CAAC;gBACtB,aAAa,CAAC,YAAY,CAAC,CAAC;gBAC5B,CAAC,GAAG,UAAU,GAAG,CAAC,CAAC;gBACnB,SAAS;YACX,CAAC;YAED,IAAI,MAAM,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;gBAC3B,MAAM,KAAK,GAAe;oBACxB,IAAI,EAAE,MAAM,CAAC,IAAI;oBACjB,IAAI,EAAE,iBAAiB,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ;oBAC/D,UAAU,EAAE,MAAM,CAAC,UAAU;oBAC7B,YAAY;iBACb,CAAC;gBACF,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBAClB,mBAAmB,EAAE,CAAC;gBACtB,CAAC,GAAG,UAAU,GAAG,CAAC,CAAC;gBACnB,SAAS;YACX,CAAC;YAED,IAAI,MAAM,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;gBAC3B,iBAAiB,CAAC,MAAM,CAAC,CAAC;gBAC1B,CAAC,GAAG,UAAU,GAAG,CAAC,CAAC;gBACnB,SAAS;YACX,CAAC;YAED,cAAc;YACd,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACvB,aAAa,CAAC,YAAY,CAAC,CAAC;gBAC5B,CAAC,GAAG,UAAU,GAAG,CAAC,CAAC;gBACnB,SAAS;YACX,CAAC;YACD,MAAM,GAAG,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;YACpC,IAAI,GAAG,CAAC,IAAI,KAAK,MAAM,CAAC,IAAI,EAAE,CAAC;gBAC7B,mBAAmB,EAAE,CAAC;gBACtB,KAAK,CAAC,GAAG,EAAE,CAAC;gBACZ,CAAC,GAAG,UAAU,GAAG,CAAC,CAAC;gBACnB,SAAS;YACX,CAAC;YACD,uCAAuC;YACvC,aAAa,CAAC,YAAY,CAAC,CAAC;YAC5B,CAAC,GAAG,UAAU,GAAG,CAAC,CAAC;YACnB,SAAS;QACX,CAAC;QAED,UAAU,CAAC,IAAI,CAAC,CAAC;QACjB,CAAC,IAAI,CAAC,CAAC;IACT,CAAC;IAED,mBAAmB,EAAE,CAAC;IAEtB,sEAAsE;IACtE,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACxB,MAAM,KAAK,GAAG,KAAK,CAAC,GAAG,EAAG,CAAC;QAC3B,aAAa,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;IACpC,CAAC;IACD,mBAAmB,EAAE,CAAC;IAEtB,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC5B,OAAO;QACL,IAAI;QACJ,QAAQ,EAAE,aAAa,CAAC,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC;KAC/C,CAAC;AACJ,CAAC;AAED,SAAS,aAAa,CAAC,QAAyB,EAAE,UAAkB;IAClE,MAAM,MAAM,GAAG,CAAC,GAAG,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;IAChF,MAAM,MAAM,GAAoB,EAAE,CAAC;IACnC,IAAI,IAAI,GAAyB,IAAI,CAAC;IAEtC,KAAK,MAAM,GAAG,IAAI,MAAM,EAAE,CAAC;QACzB,IAAI,GAAG,CAAC,KAAK,KAAK,GAAG,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC;YAC9C,SAAS;QACX,CAAC;QACD,IAAI,IAAI,IAAI,CAAC,GAAG,CAAC,WAAW,IAAI,IAAI,CAAC,GAAG,KAAK,GAAG,CAAC,KAAK,IAAI,aAAa,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC;YACrG,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC,GAAG,CAAC;QACrB,CAAC;aAAM,CAAC;YACN,IAAI,GAAG;gBACL,KAAK,EAAE,GAAG,CAAC,KAAK;gBAChB,GAAG,EAAE,GAAG,CAAC,GAAG;gBACZ,QAAQ,EAAE,GAAG,CAAC,QAAQ;gBACtB,WAAW,EAAE,GAAG,CAAC,WAAW;aAC7B,CAAC;YACF,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACpB,CAAC;IACH,CAAC;IAED,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,IAAI,UAAU,GAAG,CAAC,EAAE,CAAC;QAC1C,MAAM,CAAC,IAAI,CAAC;YACV,KAAK,EAAE,CAAC;YACR,GAAG,EAAE,UAAU;YACf,QAAQ,EAAE,EAAE;SACb,CAAC,CAAC;IACL,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,aAAa,CAAC,CAAkB,EAAE,CAAkB;IAC3D,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM;QAAE,OAAO,KAAK,CAAC;IACxC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAClC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI;YAAE,OAAO,KAAK,CAAC;QACrE,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;QAC3C,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;QAC3C,IAAI,KAAK,CAAC,MAAM,KAAK,KAAK,CAAC,MAAM;YAAE,OAAO,KAAK,CAAC;QAChD,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE,CAAC;YACxB,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC;gBAAE,OAAO,KAAK,CAAC;QAClE,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,kBAAkB,CAAC,IAAY,EAAE,KAAa;IACrD,KAAK,IAAI,CAAC,GAAG,KAAK,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACzC,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE,CAAC;YACpB,IAAI,cAAc,GAAG,CAAC,CAAC;YACvB,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YACd,OAAO,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;gBAClC,cAAc,EAAE,CAAC;gBACjB,CAAC,EAAE,CAAC;YACN,CAAC;YACD,IAAI,cAAc,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC7B,OAAO,CAAC,CAAC;YACX,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,CAAC,CAAC,CAAC;AACZ,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,MAAyB,EAAE,KAAa,EAAE,GAAY;IAChF,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC;IACtC,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC;IAC5D,MAAM,QAAQ,GAAG,GAAG,KAAK,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC,CAAC;IAClG,MAAM,cAAc,GAAoB,EAAE,CAAC;IAE3C,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;QAClC,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;QACjD,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QAC3C,IAAI,GAAG,CAAC,WAAW,EAAE,CAAC;YACpB,IAAI,QAAQ,IAAI,UAAU,IAAI,QAAQ,IAAI,QAAQ,EAAE,CAAC;gBACnD,cAAc,CAAC,IAAI,CAAC;oBAClB,KAAK,EAAE,QAAQ,GAAG,UAAU;oBAC5B,GAAG,EAAE,QAAQ,GAAG,UAAU;oBAC1B,QAAQ,EAAE,GAAG,CAAC,QAAQ;oBACtB,WAAW,EAAE,IAAI;iBAClB,CAAC,CAAC;YACL,CAAC;YACD,SAAS;QACX,CAAC;QACD,IAAI,MAAM,IAAI,QAAQ;YAAE,SAAS;QACjC,cAAc,CAAC,IAAI,CAAC;YAClB,KAAK,EAAE,QAAQ,GAAG,UAAU;YAC5B,GAAG,EAAE,MAAM,GAAG,UAAU;YACxB,QAAQ,EAAE,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;gBACvC,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,UAAU,EAAE,EAAE,GAAG,OAAO,CAAC,UAAU,EAAE;aACtC,CAAC,CAAC;SACJ,CAAC,CAAC;IACL,CAAC;IAED,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC,IAAI,QAAQ,GAAG,UAAU,GAAG,CAAC,EAAE,CAAC;QAC7D,cAAc,CAAC,IAAI,CAAC;YAClB,KAAK,EAAE,CAAC;YACR,GAAG,EAAE,QAAQ,GAAG,UAAU;YAC1B,QAAQ,EAAE,EAAE;SACb,CAAC,CAAC;IACL,CAAC;IAED,OAAO;QACL,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,QAAQ,CAAC;QAC7C,QAAQ,EAAE,aAAa,CAAC,cAAc,EAAE,QAAQ,GAAG,UAAU,CAAC;KAC/D,CAAC;AACJ,CAAC"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
export type MarkupValue = string | number | boolean;
|
|
2
|
+
export type MarkupWrapperType = "default" | "custom";
|
|
3
|
+
export interface MarkupWrapper {
|
|
4
|
+
name: string;
|
|
5
|
+
type: MarkupWrapperType;
|
|
6
|
+
properties: Record<string, MarkupValue>;
|
|
7
|
+
}
|
|
8
|
+
export interface MarkupSegment {
|
|
9
|
+
start: number;
|
|
10
|
+
end: number;
|
|
11
|
+
wrappers: MarkupWrapper[];
|
|
12
|
+
selfClosing?: boolean;
|
|
13
|
+
}
|
|
14
|
+
export interface MarkupParseResult {
|
|
15
|
+
text: string;
|
|
16
|
+
segments: MarkupSegment[];
|
|
17
|
+
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/markup/types.ts"],"names":[],"mappings":""}
|
package/dist/model/ast.d.ts
CHANGED
|
@@ -25,11 +25,13 @@ export interface YarnNode {
|
|
|
25
25
|
body: Statement[];
|
|
26
26
|
}
|
|
27
27
|
export type Statement = Line | Command | OptionGroup | IfBlock | OnceBlock | Jump | Detour | EnumBlock;
|
|
28
|
+
import type { MarkupParseResult } from "../markup/types.js";
|
|
28
29
|
export interface Line {
|
|
29
30
|
type: "Line";
|
|
30
31
|
speaker?: string;
|
|
31
32
|
text: string;
|
|
32
33
|
tags?: string[];
|
|
34
|
+
markup?: MarkupParseResult;
|
|
33
35
|
}
|
|
34
36
|
export interface Command {
|
|
35
37
|
type: "Command";
|
|
@@ -53,6 +55,7 @@ export interface Option {
|
|
|
53
55
|
body: Statement[];
|
|
54
56
|
tags?: string[];
|
|
55
57
|
css?: string;
|
|
58
|
+
markup?: MarkupParseResult;
|
|
56
59
|
}
|
|
57
60
|
export interface IfBlock {
|
|
58
61
|
type: "If";
|