@markdy/core 0.7.8 → 0.7.10

package/dist/index.js

@@ -235,16 +235,17 @@ var ParseError = class extends Error {
 };
 function stripComment(line) {
   let depth = 0;
-  let inString = false;
+  let stringQuote = null;
   let lastNonSpace = "";
   for (let i = 0; i < line.length; i++) {
     const ch = line[i];
-    if (ch === '"') {
-      inString = !inString;
+    if ((ch === '"' || ch === "'") && !isEscapedChar(line, i)) {
+      if (stringQuote === ch) stringQuote = null;
+      else if (stringQuote === null) stringQuote = ch;
       lastNonSpace = ch;
       continue;
     }
-    if (inString) continue;
+    if (stringQuote !== null) continue;
     if (ch === "(") {
       depth++;
       lastNonSpace = ch;
@@ -263,15 +264,16 @@ function stripComment(line) {
 function splitByComma(s) {
   const parts = [];
   let depth = 0;
-  let inString = false;
+  let stringQuote = null;
   let start = 0;
   for (let i = 0; i < s.length; i++) {
     const ch = s[i];
-    if (ch === '"') {
-      inString = !inString;
+    if ((ch === '"' || ch === "'") && !isEscapedChar(s, i)) {
+      if (stringQuote === ch) stringQuote = null;
+      else if (stringQuote === null) stringQuote = ch;
       continue;
     }
-    if (inString) continue;
+    if (stringQuote !== null) continue;
     if (ch === "(") depth++;
     else if (ch === ")") depth--;
     else if (ch === "," && depth === 0) {
@@ -284,8 +286,9 @@ function splitByComma(s) {
 }
 function parseValue(s) {
   const t = s.trim();
-  if (t.startsWith('"') && t.endsWith('"')) {
-    return t.slice(1, -1);
+  const quoted = parseQuotedLiteral(t);
+  if (quoted !== null) {
+    return quoted;
   }
   if (t.startsWith("(") && t.endsWith(")")) {
     const inner = t.slice(1, -1);
@@ -299,6 +302,47 @@ function parseValue(s) {
   if (!Number.isNaN(n) && t !== "") return n;
   return t;
 }
+function isEscapedChar(s, idx) {
+  let slashCount = 0;
+  for (let i = idx - 1; i >= 0 && s[i] === "\\"; i--) {
+    slashCount++;
+  }
+  return slashCount % 2 === 1;
+}
+function parseQuotedLiteral(token) {
+  if (token.length < 2) return null;
+  const quote2 = token[0];
+  if (quote2 !== '"' && quote2 !== "'" || token[token.length - 1] !== quote2) {
+    return null;
+  }
+  if (isEscapedChar(token, token.length - 1)) {
+    return null;
+  }
+  return unescapeQuotedContent(token.slice(1, -1), quote2);
+}
+function unescapeQuotedContent(content, quote2) {
+  let out = "";
+  for (let i = 0; i < content.length; i++) {
+    const ch = content[i];
+    if (ch !== "\\") {
+      out += ch;
+      continue;
+    }
+    if (i + 1 >= content.length) {
+      out += "\\";
+      continue;
+    }
+    const next = content[++i];
+    if (next === "n") out += "\n";
+    else if (next === "r") out += "\r";
+    else if (next === "t") out += "	";
+    else if (next === "\\") out += "\\";
+    else if (next === quote2) out += quote2;
+    else if (next === '"' || next === "'") out += next;
+    else out += `\\${next}`;
+  }
+  return out;
+}
 var POSITIONAL_KEYS = {
   say: ["text"],
   throw: ["asset"]
@@ -729,7 +773,8 @@ function parseActorCallArgs(argsRaw) {
   if (!argsRaw.trim()) return [];
   return splitByComma(argsRaw).map((a) => {
     const t = a.trim();
-    return t.startsWith('"') && t.endsWith('"') ? t.slice(1, -1) : t;
+    const q = parseQuotedLiteral(t);
+    return q ?? t;
   });
 }
 function parseActorLine(raw, lineNum, ast) {
@@ -993,7 +1038,8 @@ function tryExpandSolePreset(source) {
   if (!fn) return null;
   const args = argsRaw ? splitByComma(argsRaw).map((a) => {
     const t = a.trim();
-    return t.startsWith('"') && t.endsWith('"') ? t.slice(1, -1) : t;
+    const q = parseQuotedLiteral(t);
+    return q ?? t;
   }) : [];
   return fn(args);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@markdy/core",
-  "version": "0.7.8",
+  "version": "0.7.10",
   "description": "MarkdyScript parser and AST types — zero runtime dependencies.",
   "license": "MIT",
   "type": "module",