openzca 0.1.38 → 0.1.40

package/dist/cli.js

@@ -603,8 +603,6 @@ var INLINE_MARKERS = [
 ];
 function parseTextStyles(input) {
   const allStyles = [];
-  const codeLineIndices = extractCodeBlockLines(input);
-  input = stripCodeFences(input);
   const escapeMap = [];
   const escapedInput = input.replace(/\\([*_~#\\{}>+\-])/g, (_match, ch) => {
     const index = escapeMap.length;
@@ -614,10 +612,18 @@ function parseTextStyles(input) {
   const lines = escapedInput.split("\n");
   const lineStyles = [];
   const processedLines = [];
+  const codeOutputLineIndices = /* @__PURE__ */ new Set();
+  let inCodeBlock = false;
   for (let lineIndex = 0; lineIndex < lines.length; lineIndex += 1) {
     let line = lines[lineIndex];
-    if (codeLineIndices.has(lineIndex)) {
-      processedLines.push(line);
+    let baseIndent = 0;
+    if (/^```/.test(line)) {
+      inCodeBlock = !inCodeBlock;
+      continue;
+    }
+    if (inCodeBlock) {
+      codeOutputLineIndices.add(processedLines.length);
+      processedLines.push(normalizeCodeBlockLeadingWhitespace(line));
       continue;
     }
     const headingMatch = line.match(/^(#{1,4})\s(.*)$/);
@@ -634,11 +640,7 @@ function parseTextStyles(input) {
     }
     const quoteMatch = line.match(/^(>+)\s?(.*)$/);
     if (quoteMatch) {
-      lineStyles.push({
-        lineIndex,
-        style: TextStyle.Indent,
-        indentSize: Math.min(5, quoteMatch[1].length)
-      });
+      baseIndent = Math.min(5, quoteMatch[1].length);
       line = quoteMatch[2];
     }
     const indentMatch = line.match(/^(\s+)(.*)$/);
@@ -648,17 +650,18 @@ function parseTextStyles(input) {
       indentLevel = clampIndent(indentMatch[1].length);
       content = indentMatch[2];
     }
+    const totalIndent = Math.min(5, baseIndent + indentLevel);
     if (/^[-*+]\s\[[ xX]\]\s/.test(content)) {
-      if (indentLevel > 0) {
-        lineStyles.push({ lineIndex, style: TextStyle.Indent, indentSize: indentLevel });
+      if (totalIndent > 0) {
+        lineStyles.push({ lineIndex, style: TextStyle.Indent, indentSize: totalIndent });
       }
       processedLines.push(content);
       continue;
     }
     const orderedListMatch = content.match(/^(\d+)\.\s(.*)$/);
     if (orderedListMatch) {
-      if (indentLevel > 0) {
-        lineStyles.push({ lineIndex, style: TextStyle.Indent, indentSize: indentLevel });
+      if (totalIndent > 0) {
+        lineStyles.push({ lineIndex, style: TextStyle.Indent, indentSize: totalIndent });
       }
       lineStyles.push({ lineIndex, style: TextStyle.OrderedList });
       processedLines.push(orderedListMatch[2]);
@@ -666,21 +669,21 @@ function parseTextStyles(input) {
     }
     const unorderedListMatch = content.match(/^[-*+]\s(.*)$/);
     if (unorderedListMatch) {
-      if (indentLevel > 0) {
-        lineStyles.push({ lineIndex, style: TextStyle.Indent, indentSize: indentLevel });
+      if (totalIndent > 0) {
+        lineStyles.push({ lineIndex, style: TextStyle.Indent, indentSize: totalIndent });
       }
       lineStyles.push({ lineIndex, style: TextStyle.UnorderedList });
       processedLines.push(unorderedListMatch[1]);
       continue;
     }
-    if (indentLevel > 0) {
-      lineStyles.push({ lineIndex, style: TextStyle.Indent, indentSize: indentLevel });
+    if (totalIndent > 0) {
+      lineStyles.push({ lineIndex, style: TextStyle.Indent, indentSize: totalIndent });
       processedLines.push(content);
       continue;
     }
     processedLines.push(line);
   }
-  for (const codeLineIndex of codeLineIndices) {
+  for (const codeLineIndex of codeOutputLineIndices) {
     if (codeLineIndex >= processedLines.length) {
       continue;
     }
@@ -812,38 +815,15 @@ function parseTextStyles(input) {
   }
   return { text: plainText, styles: allStyles };
 }
-function extractCodeBlockLines(input) {
-  const codeLineIndices = /* @__PURE__ */ new Set();
-  const rawLines = input.split("\n");
-  let lineIndex = 0;
-  let inCodeBlock = false;
-  for (const rawLine of rawLines) {
-    if (/^```/.test(rawLine)) {
-      inCodeBlock = !inCodeBlock;
-      continue;
-    }
-    if (inCodeBlock) {
-      codeLineIndices.add(lineIndex);
-    }
-    lineIndex += 1;
-  }
-  return codeLineIndices;
-}
-function stripCodeFences(input) {
-  const keptLines = [];
-  let inCodeBlock = false;
-  for (const rawLine of input.split("\n")) {
-    if (/^```/.test(rawLine)) {
-      inCodeBlock = !inCodeBlock;
-      continue;
-    }
-    keptLines.push(rawLine);
-  }
-  return keptLines.join("\n");
-}
 function clampIndent(spaceCount) {
   return Math.min(5, Math.max(1, Math.floor(spaceCount / 2)));
 }
+function normalizeCodeBlockLeadingWhitespace(line) {
+  return line.replace(
+    /^[ \t]+/,
+    (leadingWhitespace) => leadingWhitespace.replace(/\t/g, "\xA0\xA0\xA0\xA0").replace(/ /g, "\xA0")
+  );
+}
 
 // src/cli.ts
 var require2 = createRequire(import.meta.url);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openzca",
-  "version": "0.1.38",
+  "version": "0.1.40",
   "description": "Open-source zca-compatible CLI to integrate Zalo with OpenClaw",
   "type": "module",
   "bin": {