yarn-spinner-runner-ts 0.1.4 → 0.1.5

package/dist/tests/options.test.js

@@ -30,15 +30,15 @@ Narrator: Choose one
         strictEqual(c.text.includes("Picked B"), true, "Expected body of option B");
 });
 test("option markup is exposed", () => {
-    const script = `
-title: Start
----
-Narrator: Choose
--> [b]Bold[/b]
-    Narrator: Bold
--> [wave intensity=5]Custom[/wave]
-    Narrator: Custom
-===
+    const script = `
+title: Start
+---
+Narrator: Choose
+-> [b]Bold[/b]
+    Narrator: Bold
+-> [wave intensity=5]Custom[/wave]
+    Narrator: Custom
+===
   `;
     const doc = parseYarn(script);
     const ir = compile(doc);
@@ -58,4 +58,159 @@ Narrator: Choose
     ok(customWrapper, "Expected custom wrapper on second option");
     strictEqual(customWrapper.properties.intensity, 5);
 });
+test("option text interpolates variables", () => {
+    const script = `
+title: Start
+---
+<<set $cost to 150>>
+<<set $bribe to 300>>
+Narrator: Decide
+-> Pay {$cost}
+    Narrator: Paid
+ -> Haggle {$bribe}
+    Narrator: Haggle
+===
+`;
+    const doc = parseYarn(script);
+    const ir = compile(doc);
+    const runner = new YarnRunner(ir, { startAt: "Start" });
+    // First result is command for set
+    const initial = runner.currentResult;
+    strictEqual(initial?.type, "command", "Expected first <<set>> to emit a command result");
+    runner.advance(); // second <<set>> command
+    runner.advance(); // move to narration
+    runner.advance(); // move to options
+    const result = runner.currentResult;
+    if (!result || result.type !== "options") {
+        throw new Error("Expected to land on options");
+    }
+    const [pay, haggle] = result.options;
+    strictEqual(pay.text, "Pay 150", "Should replace placeholder with variable value");
+    strictEqual(haggle.text, "Haggle 300", "Should evaluate expressions inside placeholders");
+});
+test("conditional options respect once blocks and if statements", () => {
+    const script = `
+title: Start
+---
+<<declare $secret = false>>
+Narrator: Boot
+<<once>>
+    <<set $secret = true>>
+<<endonce>>
+Narrator: Menu
+<<if $secret>>
+    -> Secret Option
+        Narrator: Secret taken
+        <<set $secret = false>>
+        <<jump Start>>
+<<endif>>
+-> Regular Option
+    Narrator: Regular taken
+    <<jump Start>>
+===
+`;
+    const doc = parseYarn(script);
+    const ir = compile(doc);
+    const runner = new YarnRunner(ir, { startAt: "Start" });
+    const nextOptions = () => {
+        let guard = 25;
+        while (guard-- > 0) {
+            const result = runner.currentResult;
+            if (!result)
+                throw new Error("Expected runtime result");
+            if (result.type === "options") {
+                return result;
+            }
+            runner.advance();
+        }
+        throw new Error("Failed to reach options result");
+    };
+    const secretMenu = nextOptions();
+    strictEqual(secretMenu.options.length, 1, "First pass should expose the conditional secret option");
+    strictEqual(secretMenu.options[0].text, "Secret Option");
+    // Consume the secret option to flip the flag off
+    runner.advance(0);
+    const fallbackMenu = nextOptions();
+    strictEqual(fallbackMenu.options.length, 1, "After the secret path is used, only the regular option should remain");
+    strictEqual(fallbackMenu.options[0].text, "Regular Option");
+});
+test("options allow space-indented bodies", () => {
+    const script = `
+title: Start
+---
+-> Pay
+  <<jump Pay>>
+-> Run
+  <<jump Run>>
+===
+
+title: Pay
+---
+Narrator: Pay branch
+===
+
+title: Run
+---
+Narrator: Run branch
+===
+`;
+    const doc = parseYarn(script);
+    const ir = compile(doc);
+    const runner = new YarnRunner(ir, { startAt: "Start" });
+    const initial = runner.currentResult;
+    if (initial?.type !== "options") {
+        runner.advance();
+    }
+    const optionsResult = runner.currentResult;
+    strictEqual(optionsResult?.type, "options", "Expected to reach options");
+    if (optionsResult?.type !== "options")
+        throw new Error("Options not emitted");
+    strictEqual(optionsResult.options.length, 2, "Space indents should still group options together");
+    strictEqual(optionsResult.options[0].text, "Pay");
+    strictEqual(optionsResult.options[1].text, "Run");
+});
+test("inline [if] option condition filters options", () => {
+    const script = `
+title: StartFalse
+---
+<<declare $flag = false>>
+-> Hidden [if $flag]
+    Narrator: Hidden
+-> Visible
+    Narrator: Visible
+===
+
+title: StartTrue
+---
+<<declare $flag = true>>
+-> Hidden [if $flag]
+    Narrator: Hidden
+-> Visible
+    Narrator: Visible
+===
+`;
+    const doc = parseYarn(script);
+    const ir = compile(doc);
+    const getOptions = (startNode) => {
+        const runner = new YarnRunner(ir, { startAt: startNode });
+        let guard = 25;
+        while (guard-- > 0) {
+            const result = runner.currentResult;
+            if (!result)
+                break;
+            if (result.type === "options") {
+                return { runner, options: result };
+            }
+            runner.advance();
+        }
+        throw new Error("Failed to reach options");
+    };
+    const { options: optionsFalse } = getOptions("StartFalse");
+    strictEqual(optionsFalse.options.length, 1, "Hidden option should be filtered out when condition is false");
+    strictEqual(optionsFalse.options[0].text, "Visible");
+    const { options: optionsTrue } = getOptions("StartTrue");
+    strictEqual(optionsTrue.options.length, 2, "Both options should appear when condition is true");
+    strictEqual(optionsTrue.options[0].text, "Hidden");
+    strictEqual(optionsTrue.options[1].text, "Visible");
+});
 //# sourceMappingURL=options.test.js.map

package/dist/tests/options.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"options.test.js","sourceRoot":"","sources":["../../src/tests/options.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"options.test.js","sourceRoot":"","sources":["../../src/tests/options.test.ts"],"names":[],"mappings":"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"}

package/dist/tests/variables_flow_cmds.test.js

@@ -2,16 +2,16 @@ import { test } from "node:test";
 import { strictEqual } from "node:assert";
 import { parseYarn, compile, YarnRunner } from "../index.js";
 test("variables, flow control, and commands", () => {
-    const script = `
-title: Start
----
-<<set $score to 10>>
-<<if $score >= 10>>
-    Narrator: High
-<<else>>
-    Narrator: Low
-<<endif>>
-===
+    const script = `
+title: Start
+---
+<<set $score to 10>>
+<<if $score >= 10>>
+    Narrator: High
+<<else>>
+    Narrator: Low
+<<endif>>
+===
 `;
     const doc = parseYarn(script);
     const ir = compile(doc);
@@ -27,4 +27,46 @@ title: Start
         strictEqual(/High/.test(b.text), true, "Expected High branch");
     strictEqual(runner.getVariable("score"), 10, "Variable should be set");
 });
+test("equality operators support ==, !=, and single =", () => {
+    const script = `
+title: Start
+---
+<<set $doorOpen to true>>
+<<if $doorOpen = true>>
+    Narrator: Single equals ok
+<<endif>>
+<<if $doorOpen == true>>
+    Narrator: Double equals ok
+<<endif>>
+<<if $doorOpen != false>>
+    Narrator: Not equals ok
+<<endif>>
+===
+`;
+    const doc = parseYarn(script);
+    const ir = compile(doc);
+    const runner = new YarnRunner(ir, { startAt: "Start" });
+    const seen = [];
+    let guard = 25;
+    while (guard-- > 0) {
+        const result = runner.currentResult;
+        if (!result)
+            break;
+        if (result.type === "text" && result.text.trim()) {
+            seen.push(result.text.trim());
+        }
+        if (result.isDialogueEnd) {
+            break;
+        }
+        if (result.type === "options") {
+            runner.advance(0);
+        }
+        else {
+            runner.advance();
+        }
+    }
+    strictEqual(seen.includes("Single equals ok"), true, "Single equals comparison should succeed");
+    strictEqual(seen.includes("Double equals ok"), true, "Double equals comparison should succeed");
+    strictEqual(seen.includes("Not equals ok"), true, "Not equals comparison should succeed");
+});
 //# sourceMappingURL=variables_flow_cmds.test.js.map

package/dist/tests/variables_flow_cmds.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"variables_flow_cmds.test.js","sourceRoot":"","sources":["../../src/tests/variables_flow_cmds.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAE7D,IAAI,CAAC,uCAAuC,EAAE,GAAG,EAAE;IACjD,MAAM,MAAM,GAAG;;;;;;;;;;CAUhB,CAAC;IAEA,MAAM,GAAG,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC;IAC9B,MAAM,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;IACxB,MAAM,MAAM,GAAG,IAAI,UAAU,CAAC,EAAE,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;IAExD,yCAAyC;IACzC,0CAA0C;IAC1C,MAAM,CAAC,GAAG,MAAM,CAAC,aAAc,CAAC;IAChC,WAAW,CAAC,CAAC,CAAC,IAAI,EAAE,SAAS,EAAE,gCAAgC,CAAC,CAAC;IACjE,MAAM,CAAC,OAAO,EAAE,CAAC;IACjB,MAAM,CAAC,GAAG,MAAM,CAAC,aAAc,CAAC;IAChC,WAAW,CAAC,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,8BAA8B,CAAC,CAAC;IAC5D,IAAI,CAAC,CAAC,IAAI,KAAK,MAAM;QAAE,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,sBAAsB,CAAC,CAAC;IACtF,WAAW,CAAC,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,wBAAwB,CAAC,CAAC;AACzE,CAAC,CAAC,CAAC"}
+{"version":3,"file":"variables_flow_cmds.test.js","sourceRoot":"","sources":["../../src/tests/variables_flow_cmds.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAE7D,IAAI,CAAC,uCAAuC,EAAE,GAAG,EAAE;IACjD,MAAM,MAAM,GAAG;;;;;;;;;;CAUhB,CAAC;IAEA,MAAM,GAAG,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC;IAC9B,MAAM,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;IACxB,MAAM,MAAM,GAAG,IAAI,UAAU,CAAC,EAAE,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;IAExD,yCAAyC;IACzC,0CAA0C;IAC1C,MAAM,CAAC,GAAG,MAAM,CAAC,aAAc,CAAC;IAChC,WAAW,CAAC,CAAC,CAAC,IAAI,EAAE,SAAS,EAAE,gCAAgC,CAAC,CAAC;IACjE,MAAM,CAAC,OAAO,EAAE,CAAC;IACjB,MAAM,CAAC,GAAG,MAAM,CAAC,aAAc,CAAC;IAChC,WAAW,CAAC,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,8BAA8B,CAAC,CAAC;IAC5D,IAAI,CAAC,CAAC,IAAI,KAAK,MAAM;QAAE,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,sBAAsB,CAAC,CAAC;IACtF,WAAW,CAAC,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,wBAAwB,CAAC,CAAC;AACzE,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,iDAAiD,EAAE,GAAG,EAAE;IAC3D,MAAM,MAAM,GAAG;;;;;;;;;;;;;;CAchB,CAAC;IAEA,MAAM,GAAG,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC;IAC9B,MAAM,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;IACxB,MAAM,MAAM,GAAG,IAAI,UAAU,CAAC,EAAE,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;IAExD,MAAM,IAAI,GAAa,EAAE,CAAC;IAC1B,IAAI,KAAK,GAAG,EAAE,CAAC;IACf,OAAO,KAAK,EAAE,GAAG,CAAC,EAAE,CAAC;QACnB,MAAM,MAAM,GAAG,MAAM,CAAC,aAAa,CAAC;QACpC,IAAI,CAAC,MAAM;YAAE,MAAM;QACnB,IAAI,MAAM,CAAC,IAAI,KAAK,MAAM,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC;YACjD,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QAChC,CAAC;QACD,IAAI,MAAM,CAAC,aAAa,EAAE,CAAC;YACzB,MAAM;QACR,CAAC;QACD,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;YAC9B,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QACpB,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,OAAO,EAAE,CAAC;QACnB,CAAC;IACH,CAAC;IAED,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,kBAAkB,CAAC,EAAE,IAAI,EAAE,yCAAyC,CAAC,CAAC;IAChG,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,kBAAkB,CAAC,EAAE,IAAI,EAAE,yCAAyC,CAAC,CAAC;IAChG,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,EAAE,IAAI,EAAE,sCAAsC,CAAC,CAAC;AAC5F,CAAC,CAAC,CAAC"}

package/docs/markup.md

@@ -1,34 +1,34 @@
-## Markup (Yarn Spinner)
-
-Source: [docs.yarnspinner.dev � Markup](https://docs.yarnspinner.dev/write-yarn-scripts/advanced-scripting/markup)
-
-### Supported formatting
-
-The runtime now parses Yarn Spinner markup and surfaces it through `TextResult.markup` and option metadata. The React components (`DialogueView`, `TypingText`, and the option buttons) render this markup automatically.
-
-- The following tags map directly to native HTML elements: `b`, `strong`, `em`, `small`, `sub`, `sup`, `ins`, `del`, and `mark`.
-- Any other markup tag is rendered as a `<span>` with the class `yd-markup-<tagName>` so you can style or animate it via CSS.
-- Markup attributes are exposed as `data-markup-*` attributes on the rendered element. For example `[wave speed=2]` renders `<span class="yd-markup-wave" data-markup-speed="2">`.
-
-### Example
-
-```yarn
-title: Start
----
-Narrator: Plain [b]bold[/b] [wave speed=2]custom[/wave]
-===
-```
-
-The React renderer produces:
-
-```html
-Plain <b>bold</b> <span class="yd-markup-wave" data-markup-speed="2">custom</span>
-```
-
-### Integration notes
-
-- Markup data is available on `TextResult.markup` and on each option entry (`result.options[i].markup`).
-- `TypingText` respects markup while animating, so formatting stays intact during the typewriter effect.
-- When a markup tag is not recognised, it remains in the output (as a span) rather than being stripped, so you can add custom CSS in your host application.
-
+## Markup (Yarn Spinner)
+
+Source: [docs.yarnspinner.dev � Markup](https://docs.yarnspinner.dev/write-yarn-scripts/advanced-scripting/markup)
+
+### Supported formatting
+
+The runtime now parses Yarn Spinner markup and surfaces it through `TextResult.markup` and option metadata. The React components (`DialogueView`, `TypingText`, and the option buttons) render this markup automatically.
+
+- The following tags map directly to native HTML elements: `b`, `strong`, `em`, `small`, `sub`, `sup`, `ins`, `del`, `mark`, and the self-closing line break `br`.
+- Any other markup tag is rendered as a `<span>` with the class `yd-markup-<tagName>` so you can style or animate it via CSS.
+- Markup attributes are exposed as `data-markup-*` attributes on the rendered element. For example `[wave speed=2]` renders `<span class="yd-markup-wave" data-markup-speed="2">`.
+
+### Example
+
+```yarn
+title: Start
+---
+Narrator: Plain [b]bold[/b] [wave speed=2]custom[/wave]
+===
+```
+
+The React renderer produces:
+
+```html
+Plain <b>bold</b> <span class="yd-markup-wave" data-markup-speed="2">custom</span>
+```
+
+### Integration notes
+
+- Markup data is available on `TextResult.markup` and on each option entry (`result.options[i].markup`).
+- `TypingText` respects markup while animating, so formatting stays intact during the typewriter effect.
+- When a markup tag is not recognised, it remains in the output (as a span) rather than being stripped, so you can add custom CSS in your host application.
+
 For the full markup vocabulary see the official Yarn Spinner documentation.

package/eslint.config.cjs

@@ -1,39 +1,39 @@
-// ESLint v9 flat config
-const js = require("@eslint/js");
-const tsParser = require("@typescript-eslint/parser");
-const tsPlugin = require("@typescript-eslint/eslint-plugin");
-
-module.exports = [
-  {
-    ignores: ["dist/**", "node_modules/**", "examples/**", "src/examples/**", "src/tests/**"],
-  },
-  {
-    files: ["src/**/*.ts", "src/**/*.tsx"],
-    languageOptions: {
-      parser: tsParser,
-      ecmaVersion: "latest",
-      sourceType: "module",
-      globals: {
-        console: "readonly",
-        window: "readonly",
-        setTimeout: "readonly",
-        clearTimeout: "readonly",
-        setInterval: "readonly",
-        clearInterval: "readonly",
-        requestAnimationFrame: "readonly",
-      },
-    },
-    plugins: {
-      "@typescript-eslint": tsPlugin,
-    },
-    rules: {
-      ...js.configs.recommended.rules,
-      ...tsPlugin.configs.recommended.rules,
-      "@typescript-eslint/explicit-module-boundary-types": "off",
-      "@typescript-eslint/no-explicit-any": "off",
-      "no-console": ["warn", { allow: ["warn", "error", "assert", "log"] }],
-    },
-  },
-];
-
-
+// ESLint v9 flat config
+const js = require("@eslint/js");
+const tsParser = require("@typescript-eslint/parser");
+const tsPlugin = require("@typescript-eslint/eslint-plugin");
+
+module.exports = [
+  {
+    ignores: ["dist/**", "node_modules/**", "examples/**", "src/examples/**", "src/tests/**"],
+  },
+  {
+    files: ["src/**/*.ts", "src/**/*.tsx"],
+    languageOptions: {
+      parser: tsParser,
+      ecmaVersion: "latest",
+      sourceType: "module",
+      globals: {
+        console: "readonly",
+        window: "readonly",
+        setTimeout: "readonly",
+        clearTimeout: "readonly",
+        setInterval: "readonly",
+        clearInterval: "readonly",
+        requestAnimationFrame: "readonly",
+      },
+    },
+    plugins: {
+      "@typescript-eslint": tsPlugin,
+    },
+    rules: {
+      ...js.configs.recommended.rules,
+      ...tsPlugin.configs.recommended.rules,
+      "@typescript-eslint/explicit-module-boundary-types": "off",
+      "@typescript-eslint/no-explicit-any": "off",
+      "no-console": ["warn", { allow: ["warn", "error", "assert", "log"] }],
+    },
+  },
+];
+
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yarn-spinner-runner-ts",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "private": false,
   "description": "TypeScript parser, compiler, and runtime for Yarn Spinner 3.x with React adapter [NPM package](https://www.npmjs.com/package/yarn-spinner-runner-ts)",
   "license": "MIT",
@@ -37,20 +37,20 @@
     "js-yaml": "^4.1.0"
   },
   "devDependencies": {
-    "@eslint/js": "^9.12.0",
-    "@types/js-yaml": "^4.0.9",
     "@types/node": "^22.7.4",
+    "@types/js-yaml": "^4.0.9",
     "@types/react": "^18.3.3",
     "@types/react-dom": "^18.3.0",
-    "@typescript-eslint/eslint-plugin": "^8.8.1",
+    "@eslint/js": "^9.12.0",
     "@typescript-eslint/parser": "^8.8.1",
+    "@typescript-eslint/eslint-plugin": "^8.8.1",
     "@vitejs/plugin-react": "^4.3.1",
     "eslint": "^9.12.0",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "rimraf": "^6.0.1",
     "typescript": "^5.6.3",
-    "vite": "^5.4.3",
-    "vitest": "^4.0.7"
+    "vite": "^5.4.3"
   }
 }
+

package/src/compile/compiler.ts

@@ -72,7 +72,7 @@ export function compile(doc: YarnDocument, opts: CompileOptions = {}): IRProgram
             }
             block.push({
               op: "options",
-              options: s.options.map((o: Option) => ({ text: o.text, tags: ensureLineId(o.tags), css: (o as any).css, markup: o.markup, block: emitBlock(o.body) })),
+              options: s.options.map((o: Option) => ({ text: o.text, tags: ensureLineId(o.tags), css: (o as any).css, markup: o.markup, condition: o.condition, block: emitBlock(o.body) })),
             });
             break;
           }
@@ -141,7 +141,7 @@ export function compile(doc: YarnDocument, opts: CompileOptions = {}): IRProgram
                 }
                 block.push({
                   op: "options",
-                  options: s.options.map((o: Option) => ({ text: o.text, tags: ensureLineId(o.tags), css: (o as any).css, markup: o.markup, block: emitBlock(o.body) })),
+                  options: s.options.map((o: Option) => ({ text: o.text, tags: ensureLineId(o.tags), css: (o as any).css, markup: o.markup, condition: o.condition, block: emitBlock(o.body) })),
                 });
                 break;
               }

package/src/compile/ir.ts

@@ -22,7 +22,7 @@ export type IRInstruction =
   | { op: "command"; content: string }
   | { op: "jump"; target: string }
   | { op: "detour"; target: string }
-  | { op: "options"; options: Array<{ text: string; tags?: string[]; css?: string; markup?: MarkupParseResult; block: IRInstruction[] }> }
+  | { op: "options"; options: Array<{ text: string; tags?: string[]; css?: string; markup?: MarkupParseResult; condition?: string; block: IRInstruction[] }> }
   | { op: "if"; branches: Array<{ condition: string | null; block: IRInstruction[] }> }
   | { op: "once"; id: string; block: IRInstruction[] };
 

package/src/markup/parser.ts

@@ -1,6 +1,7 @@
-import type { MarkupParseResult, MarkupSegment, MarkupValue, MarkupWrapper } from "./types.js";
-
-const DEFAULT_HTML_TAGS = new Set(["b", "em", "small", "strong", "sub", "sup", "ins", "del", "mark"]);
+import type { MarkupParseResult, MarkupSegment, MarkupValue, MarkupWrapper } from "./types.js";
+
+const DEFAULT_HTML_TAGS = new Set(["b", "em", "small", "strong", "sub", "sup", "ins", "del", "mark", "br"]);
+const SELF_CLOSING_TAGS = new Set(["br"]);
 
 interface StackEntry {
   name: string;
@@ -125,8 +126,9 @@ export function parseMarkup(input: string): MarkupParseResult {
       rest = rest.slice(attrMatch[0].length).trim();
     }
 
-    return { kind, name, properties };
-  };
+    const finalKind: ParsedTag["kind"] = kind === "self" || SELF_CLOSING_TAGS.has(name) ? "self" : kind;
+    return { kind: finalKind, name, properties };
+  };
 
   const parseAttributeValue = (raw: string): MarkupValue => {
     const trimmed = raw.trim();
@@ -142,20 +144,20 @@ export function parseMarkup(input: string): MarkupParseResult {
     return trimmed;
   };
 
-  const handleSelfClosing = (tag: ParsedTag) => {
-    const wrapper: MarkupWrapper = {
-      name: tag.name,
-      type: DEFAULT_HTML_TAGS.has(tag.name) ? "default" : "custom",
-      properties: tag.properties,
-    };
-    const position = chars.length;
-    pushSegment({
-      start: position,
-      end: position,
-      wrappers: [wrapper],
-      selfClosing: true,
-    });
-  };
+  const handleSelfClosing = (tag: ParsedTag) => {
+    const wrapper: MarkupWrapper = {
+      name: tag.name,
+      type: DEFAULT_HTML_TAGS.has(tag.name) ? "default" : "custom",
+      properties: tag.properties,
+    };
+    const position = chars.length;
+    pushSegment({
+      start: position,
+      end: position,
+      wrappers: [wrapper],
+      selfClosing: true,
+    });
+  };
 
   let i = 0;
   while (i < input.length) {
@@ -215,30 +217,38 @@ export function parseMarkup(input: string): MarkupParseResult {
         continue;
       }
 
-      if (parsed.kind === "self") {
-        handleSelfClosing(parsed);
-        i = closeIndex + 1;
-        continue;
-      }
-
-      // closing tag
-      if (stack.length === 0) {
-        appendLiteral(originalText);
-        i = closeIndex + 1;
-        continue;
-      }
-      const top = stack[stack.length - 1];
-      if (top.name === parsed.name) {
-        flushCurrentSegment();
-        stack.pop();
-        i = closeIndex + 1;
-        continue;
-      }
-      // mismatched closing; treat as literal
-      appendLiteral(originalText);
-      i = closeIndex + 1;
-      continue;
-    }
+      if (parsed.kind === "self") {
+        handleSelfClosing(parsed);
+        i = closeIndex + 1;
+        continue;
+      }
+
+      // closing tag
+      if (stack.length === 0) {
+        if (SELF_CLOSING_TAGS.has(parsed.name)) {
+          i = closeIndex + 1;
+          continue;
+        }
+        appendLiteral(originalText);
+        i = closeIndex + 1;
+        continue;
+      }
+      const top = stack[stack.length - 1];
+      if (top.name === parsed.name) {
+        flushCurrentSegment();
+        stack.pop();
+        i = closeIndex + 1;
+        continue;
+      }
+      if (SELF_CLOSING_TAGS.has(parsed.name)) {
+        i = closeIndex + 1;
+        continue;
+      }
+      // mismatched closing; treat as literal
+      appendLiteral(originalText);
+      i = closeIndex + 1;
+      continue;
+    }
 
     appendChar(char);
     i += 1;

package/src/model/ast.ts

@@ -73,6 +73,7 @@ export interface Option {
   tags?: string[];
   css?: string; // Custom CSS style for option
   markup?: MarkupParseResult;
+  condition?: string;
 }
 
 export interface IfBlock {