yarn-spinner-runner-ts 0.1.4-c → 0.1.5-a

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,111 @@ 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");
+});
+test("set command supports equals syntax with arithmetic reassignment", () => {
+    const script = `
+title: StreetCred
+---
+<<set $reputation = 100>>
+<<set $reputation = $reputation - 25 >>
+Narrator: Current street cred: {$reputation}
+===
+`;
+    const doc = parseYarn(script);
+    const ir = compile(doc);
+    const runner = new YarnRunner(ir, { startAt: "StreetCred" });
+    const seen = [];
+    for (let guard = 0; guard < 20; guard++) {
+        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("Current street cred: 75"), true, "Should reflect arithmetic subtraction");
+    strictEqual(runner.getVariable("reputation"), 75, "Variable should store updated numeric value");
+});
+test("set command respects arithmetic precedence and parentheses", () => {
+    const script = `
+title: MathChecks
+---
+<<set $score = 10>>
+<<set $score = $score + 10 * 2>>
+<<set $score = ($score + 10) / 2>>
+Narrator: Score now {$score}
+===
+`;
+    const doc = parseYarn(script);
+    const ir = compile(doc);
+    const runner = new YarnRunner(ir, { startAt: "MathChecks" });
+    const lines = [];
+    for (let guard = 0; guard < 20; guard++) {
+        const result = runner.currentResult;
+        if (!result)
+            break;
+        if (result.type === "text" && result.text.trim()) {
+            lines.push(result.text.trim());
+        }
+        if (result.isDialogueEnd)
+            break;
+        if (result.type === "options") {
+            runner.advance(0);
+        }
+        else {
+            runner.advance();
+        }
+    }
+    strictEqual(lines.includes("Score now 20"), true, "Should honor operator precedence and parentheses");
+    strictEqual(runner.getVariable("score"), 20, "Final numeric value should be 20");
+});
 //# 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":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yarn-spinner-runner-ts",
-  "version": "0.1.4-c",
+  "version": "0.1.5-a",
   "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",

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

@@ -145,9 +145,6 @@ export function parseMarkup(input: string): MarkupParseResult {
   };
 
   const handleSelfClosing = (tag: ParsedTag) => {
-    if (tag.name === "br") {
-      appendChar("\n");
-    }
     const wrapper: MarkupWrapper = {
       name: tag.name,
       type: DEFAULT_HTML_TAGS.has(tag.name) ? "default" : "custom",

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 {

package/src/parse/lexer.ts

@@ -34,24 +34,24 @@ export function lex(input: string): Token[] {
     const indent = raw.match(/^[ \t]*/)?.[0] ?? "";
     const content = raw.slice(indent.length);
 
-    // Manage indentation tokens only within node bodies
-    if (!inHeaders) {
-      const prev = indentStack[indentStack.length - 1];
-      if (indent.length > prev) {
-        indentStack.push(indent.length);
-        push("INDENT", "", lineNum, 1);
-      } else if (indent.length < prev) {
-        while (indentStack.length && indent.length < indentStack[indentStack.length - 1]) {
-          indentStack.pop();
-          push("DEDENT", "", lineNum, 1);
-        }
-      }
-    }
-
-    if (content.trim() === "") {
-      push("EMPTY", "", lineNum, 1);
-      continue;
-    }
+    if (content.trim() === "") {
+      push("EMPTY", "", lineNum, 1);
+      continue;
+    }
+
+    // Manage indentation tokens only within node bodies and on non-empty lines
+    if (!inHeaders) {
+      const prev = indentStack[indentStack.length - 1];
+      if (indent.length > prev) {
+        indentStack.push(indent.length);
+        push("INDENT", "", lineNum, 1);
+      } else if (indent.length < prev) {
+        while (indentStack.length && indent.length < indentStack[indentStack.length - 1]) {
+          indentStack.pop();
+          push("DEDENT", "", lineNum, 1);
+        }
+      }
+    }
 
     if (content === "---") {
       inHeaders = false;

package/src/parse/parser.ts

@@ -215,24 +215,26 @@ class Parser {
     // One or more OPTION lines, with bodies under INDENT
     while (this.at("OPTION")) {
       const raw = this.take("OPTION").text;
-      const { cleanText: textWithAttrs, tags } = this.extractTags(raw);
-      const { text: textWithoutCss, css } = this.extractCss(textWithAttrs);
-      const markup = parseMarkup(textWithoutCss);
-      let body: Statement[] = [];
-      if (this.at("INDENT")) {
-        this.take("INDENT");
-        body = this.parseStatementsUntil("DEDENT");
+      const { cleanText: textWithAttrs, tags } = this.extractTags(raw);
+      const { text: textWithCondition, css } = this.extractCss(textWithAttrs);
+      const { text: optionText, condition } = this.extractOptionCondition(textWithCondition);
+      const markup = parseMarkup(optionText);
+      let body: Statement[] = [];
+      if (this.at("INDENT")) {
+        this.take("INDENT");
+        body = this.parseStatementsUntil("DEDENT");
         this.take("DEDENT");
         while (this.at("EMPTY")) this.i++;
       }
-      options.push({
-        type: "Option",
-        text: markup.text,
-        body,
-        tags,
-        css,
-        markup: this.normalizeMarkup(markup),
-      });
+      options.push({
+        type: "Option",
+        text: markup.text,
+        body,
+        tags,
+        css,
+        markup: this.normalizeMarkup(markup),
+        condition,
+      });
       // Consecutive options belong to the same group; break on non-OPTION
       while (this.at("EMPTY")) this.i++;
     }
@@ -283,15 +285,24 @@ class Parser {
     return { cleanText: input };
   }
 
-  private extractCss(input: string): { text: string; css?: string } {
-    const cssMatch = input.match(/\s*&css\{([^}]*)\}\s*$/);
-    if (cssMatch) {
-      const css = cssMatch[1].trim();
-      const text = input.replace(cssMatch[0], "").trimEnd();
+  private extractCss(input: string): { text: string; css?: string } {
+    const cssMatch = input.match(/\s*&css\{([^}]*)\}\s*$/);
+    if (cssMatch) {
+      const css = cssMatch[1].trim();
+      const text = input.replace(cssMatch[0], "").trimEnd();
       return { text, css };
     }
-    return { text: input };
-  }
+    return { text: input };
+  }
+
+  private extractOptionCondition(input: string): { text: string; condition?: string } {
+    const match = input.match(/\s\[\s*if\s+([^\]]+)\]\s*$/i);
+    if (match) {
+      const text = input.slice(0, match.index).trimEnd();
+      return { text, condition: match[1].trim() };
+    }
+    return { text: input };
+  }
 
   private parseStatementsUntilStop(shouldStop: () => boolean): Statement[] {
     const out: Statement[] = [];

package/src/react/DialogueExample.tsx

@@ -8,11 +8,12 @@ import type { SceneCollection } from "../scene/types.js";
 const DEFAULT_YARN = `title: Start
 scene: scene1
 ---
-Narrator: Welcome to [b]yarn-spinner-ts[/b], {$playerName}!
-Narrator: Current street cred: {$reputation}
+<< declare $hasBadge = false >>
+Narrator: Welcome to [b]yarn-spinner-ts[/b], {$playerName}!
+Narrator: Current street cred: {$reputation}
 npc: This is a dialogue system powered by Yarn Spinner.
 Narrator: Click anywhere to continue, or choose an option below.
--> Start the adventure &css{backgroundColor: #4a9eff; color: white;}
+-> Start the adventure &css{backgroundColor: #4a9eff; color: white;} [if $hasBadge]
     Narrator: Great! Let's begin your journey.
     <<jump NextScene>>
 -> Learn more &css{backgroundColor: #2ecc71; color: red;}
@@ -101,13 +102,13 @@ export function DialogueExample() {
           </div>
         )}
 
-        <DialogueView 
-          program={program || { nodes: {}, enums: {} }}
-          startNode="Start"
-          scenes={scenes}
-          variables={{ playerName: "V", reputation: 3 }}
-          enableTypingAnimation={enableTypingAnimation}
-          showTypingCursor={true}
+        <DialogueView 
+          program={program || { nodes: {}, enums: {} }}
+          startNode="Start"
+          scenes={scenes}
+          variables={{ playerName: "V", reputation: 3 }}
+          enableTypingAnimation={enableTypingAnimation}
+          showTypingCursor={true}
           typingSpeed={20}
           cursorCharacter="$"
           autoAdvanceAfterTyping={true}

package/src/runtime/evaluator.ts

@@ -27,33 +27,38 @@ export class ExpressionEvaluator {
   /**
    * Evaluate an expression that can return any value (not just boolean).
    */
-  evaluateExpression(expr: string): unknown {
-    const trimmed = this.preprocess(expr.trim());
-    if (!trimmed) return false;
-
-    // Handle function calls like `functionName(arg1, arg2)`
-    if (trimmed.includes("(") && trimmed.includes(")")) {
-      return this.evaluateFunctionCall(trimmed);
-    }
-
-    // Handle comparisons
-    if (this.containsComparison(trimmed)) {
-      return this.evaluateComparison(trimmed);
-    }
-
-    // Handle logical operators
-    if (trimmed.includes("&&") || trimmed.includes("||")) {
-      return this.evaluateLogical(trimmed);
-    }
-
-    // Handle negation
-    if (trimmed.startsWith("!")) {
-      return !this.evaluateExpression(trimmed.slice(1).trim());
-    }
-
-    // Simple variable or literal
-    return this.resolveValue(trimmed);
-  }
+  evaluateExpression(expr: string): unknown {
+    const trimmed = this.preprocess(expr.trim());
+    if (!trimmed) return false;
+
+    // Handle function calls like `functionName(arg1, arg2)`
+    if (this.looksLikeFunctionCall(trimmed)) {
+      return this.evaluateFunctionCall(trimmed);
+    }
+
+    // Handle comparisons
+    if (this.containsComparison(trimmed)) {
+      return this.evaluateComparison(trimmed);
+    }
+
+    // Handle logical operators
+    if (trimmed.includes("&&") || trimmed.includes("||")) {
+      return this.evaluateLogical(trimmed);
+    }
+
+    // Handle negation
+    if (trimmed.startsWith("!")) {
+      return !this.evaluateExpression(trimmed.slice(1).trim());
+    }
+
+     // Handle arithmetic expressions (+, -, *, /, %)
+     if (this.containsArithmetic(trimmed)) {
+       return this.evaluateArithmetic(trimmed);
+     }
+
+    // Simple variable or literal
+    return this.resolveValue(trimmed);
+  }
 
   private preprocess(expr: string): string {
     // Normalize operator word aliases to JS-like symbols
@@ -71,9 +76,9 @@ export class ExpressionEvaluator {
       .replace(/\blt\b/gi, "<");
   }
 
-  private evaluateFunctionCall(expr: string): unknown {
-    const match = expr.match(/^([a-zA-Z_][a-zA-Z0-9_]*)\s*\((.*)\)$/);
-    if (!match) throw new Error(`Invalid function call: ${expr}`);
+  private evaluateFunctionCall(expr: string): unknown {
+    const match = expr.match(/^([a-zA-Z_][a-zA-Z0-9_]*)\s*\((.*)\)$/);
+    if (!match) throw new Error(`Invalid function call: ${expr}`);
 
     const [, name, argsStr] = match;
     const func = this.functions[name];
@@ -104,26 +109,198 @@ export class ExpressionEvaluator {
     return args;
   }
 
-  private containsComparison(expr: string): boolean {
-    return /[<>=!]/.test(expr);
-  }
+  private containsComparison(expr: string): boolean {
+    return /[<>=!]/.test(expr);
+  }
+
+  private looksLikeFunctionCall(expr: string): boolean {
+    return /^([a-zA-Z_][a-zA-Z0-9_]*)\s*\(.*\)$/.test(expr);
+  }
+
+  private containsArithmetic(expr: string): boolean {
+    // Remove quoted strings to avoid false positives on "-" or "+" inside literals
+    const unquoted = expr.replace(/"[^"]*"|'[^']*'/g, "");
+    return /[+\-*/%]/.test(unquoted);
+  }
+
+  private evaluateArithmetic(expr: string): number {
+    const input = expr;
+    let index = 0;
+
+    const skipWhitespace = () => {
+      while (index < input.length && /\s/.test(input[index])) {
+        index++;
+      }
+    };
+
+    const toNumber = (value: unknown): number => {
+      if (typeof value === "number") return value;
+      if (typeof value === "boolean") return value ? 1 : 0;
+      if (value == null || value === "") return 0;
+      const num = Number(value);
+      if (Number.isNaN(num)) {
+        throw new Error(`Cannot convert ${String(value)} to number`);
+      }
+      return num;
+    };
+
+    const readToken = (): string => {
+      skipWhitespace();
+      const start = index;
+      let depth = 0;
+      let inQuotes = false;
+      let quoteChar = "";
+
+      while (index < input.length) {
+        const char = input[index];
+        if (inQuotes) {
+          if (char === quoteChar) {
+            inQuotes = false;
+            quoteChar = "";
+          }
+          index++;
+          continue;
+        }
+
+        if (char === '"' || char === "'") {
+          inQuotes = true;
+          quoteChar = char;
+          index++;
+          continue;
+        }
+
+        if (char === "(") {
+          depth++;
+          index++;
+          continue;
+        }
+
+        if (char === ")") {
+          if (depth === 0) break;
+          depth--;
+          index++;
+          continue;
+        }
+
+        if (depth === 0 && "+-*/%".includes(char)) {
+          break;
+        }
+
+        if (depth === 0 && /\s/.test(char)) {
+          break;
+        }
+
+        index++;
+      }
+
+      return input.slice(start, index).trim();
+    };
+
+    const parsePrimary = (): unknown => {
+      skipWhitespace();
+      if (index >= input.length) {
+        throw new Error("Unexpected end of expression");
+      }
+
+      const char = input[index];
+      if (char === "(") {
+        index++;
+        const value = parseAddSub();
+        skipWhitespace();
+        if (input[index] !== ")") {
+          throw new Error("Unmatched parenthesis in expression");
+        }
+        index++;
+        return value;
+      }
+
+      const token = readToken();
+      if (!token) {
+        throw new Error("Invalid expression token");
+      }
+      return this.evaluateExpression(token);
+    };
+
+    const parseUnary = (): number => {
+      skipWhitespace();
+      if (input[index] === "+") {
+        index++;
+        return parseUnary();
+      }
+      if (input[index] === "-") {
+        index++;
+        return -parseUnary();
+      }
+      return toNumber(parsePrimary());
+    };
+
+    const parseMulDiv = (): number => {
+      let value = parseUnary();
+      while (true) {
+        skipWhitespace();
+        const char = input[index];
+        if (char === "*" || char === "/" || char === "%") {
+          index++;
+          const right = parseUnary();
+          if (char === "*") {
+            value = value * right;
+          } else if (char === "/") {
+            value = value / right;
+          } else {
+            value = value % right;
+          }
+          continue;
+        }
+        break;
+      }
+      return value;
+    };
+
+    const parseAddSub = (): number => {
+      let value = parseMulDiv();
+      while (true) {
+        skipWhitespace();
+        const char = input[index];
+        if (char === "+" || char === "-") {
+          index++;
+          const right = parseMulDiv();
+          if (char === "+") {
+            value = value + right;
+          } else {
+            value = value - right;
+          }
+          continue;
+        }
+        break;
+      }
+      return value;
+    };
+
+    const result = parseAddSub();
+    skipWhitespace();
+    if (index < input.length) {
+      throw new Error(`Unexpected token "${input.slice(index)}" in expression`);
+    }
+    return result;
+  }
 
   private evaluateComparison(expr: string): boolean {
     // Match comparison operators (avoid matching !=, <=, >=)
-    const match = expr.match(/^(.+?)\s*(===|!==|<=|>=|<|>)\s*(.+)$/);
-    if (!match) throw new Error(`Invalid comparison: ${expr}`);
-
-    const [, left, op, right] = match;
-    const leftVal = this.evaluateExpression(left.trim());
-    const rightVal = this.evaluateExpression(right.trim());
-
-    switch (op) {
-      case "===":
-      case "==":
-        return this.deepEquals(leftVal, rightVal);
-      case "!==":
-      case "!=":
-        return !this.deepEquals(leftVal, rightVal);
+    const match = expr.match(/^(.+?)\s*(===|==|!==|!=|=|<=|>=|<|>)\s*(.+)$/);
+    if (!match) throw new Error(`Invalid comparison: ${expr}`);
+
+    const [, left, rawOp, right] = match;
+    const op = rawOp === "=" ? "==" : rawOp;
+    const leftVal = this.evaluateExpression(left.trim());
+    const rightVal = this.evaluateExpression(right.trim());
+
+    switch (op) {
+      case "===":
+      case "==":
+        return this.deepEquals(leftVal, rightVal);
+      case "!==":
+      case "!=":
+        return !this.deepEquals(leftVal, rightVal);
       case "<":
         return Number(leftVal) < Number(rightVal);
       case ">":