acp-kernel 0.0.67-pr.271.131 → 0.0.67-pr.274.133

package/dist/index.js

@@ -3827,8 +3827,7 @@ function parseObjectValue(value, callId, diag) {
   } else if (typeof content === "string") {
     const parsed = parseContentArray(content);
     if (parsed === null || parsed.entries.length === 0 && content.trim().length > 0) {
-      const bare = stripJsonWrapperResidue(content);
-      const entries2 = splitLineEntries(bare);
+      const entries2 = splitLineEntries(content);
       const { ranges: ranges2, invalid: invalid2, reasons: reasons2 } = validateEntries(entries2, callId);
       if (ranges2.length > 0) {
         diag.invalidItems = invalid2;
@@ -3956,17 +3955,9 @@ function deriveTopicFromSummary(summary) {
   return text.length > 60 ? text.slice(0, 60).trimEnd() : text;
 }
 function splitLineEntries(content) {
-  const parts = content.split(/\n(?=\s*(?:["']\s*,\s*)?["']?\s*[mb]\d{1,7}\s*(?:[-\u2013\u2014\u2026~]|\.\.\.|to)\s*[mb]\d{1,7}\b)/i).map((p) => p.trim().replace(/^(?:["']\s*,?\s*)+/, "").replace(/["']\s*$/, "")).filter((p) => p.length > 0);
+  const parts = content.split(/\n(?=[mb]\d{1,7}\s*(?:[-\u2013\u2014\u2026~]|\.\.\.|to)\s*[mb]\d{1,7}\b)/i).map((p) => p.trim()).filter((p) => p.length > 0);
   return parts.length > 0 ? parts : [content.trim()];
 }
-function stripJsonWrapperResidue(s) {
-  let t = s.trim();
-  if (t.startsWith("[")) t = t.replace(/^\[+\s*/, "");
-  t = t.replace(/^"/, "");
-  if (t.endsWith("]")) t = t.replace(/\s*\]+$/, "");
-  t = t.replace(/"$/, "");
-  return t.trim();
-}
 function validateEntry(entry, callId) {
   if (typeof entry === "string") return parseLineEntry(entry, callId);
   if (entry === null || typeof entry !== "object" || Array.isArray(entry)) return { reason: "not an object" };
@@ -4009,15 +4000,49 @@ function tryParseLenient(s) {
     } catch {
     }
   }
-  const ctrlFixed = repairAtParserPositions(noTrailingCommas);
-  if (ctrlFixed !== noTrailingCommas) {
+  return repairByParserPosition(noTrailingCommas);
+}
+function repairByParserPosition(s) {
+  let cur = s;
+  for (let i = 0; i <= cur.length; i++) {
     try {
-      return JSON.parse(ctrlFixed);
-    } catch {
+      return JSON.parse(cur);
+    } catch (e) {
+      const msg = e instanceof Error ? e.message : String(e);
+      const posMatch = /position (\d+)/.exec(msg);
+      if (posMatch === null) return void 0;
+      const pos = Number(posMatch[1]);
+      if (/Bad control character/.test(msg)) {
+        const cp = cur.codePointAt(pos);
+        if (cp === void 0) return void 0;
+        const adv = cp > 65535 ? 2 : 1;
+        cur = cur.slice(0, pos) + escapeControlChar(cp) + cur.slice(pos + adv);
+      } else if (/Bad escaped character/.test(msg)) {
+        if (pos < 1 || cur.charAt(pos - 1) !== "\\") return void 0;
+        cur = cur.slice(0, pos - 1) + "\\" + cur.slice(pos - 1);
+      } else {
+        return void 0;
+      }
     }
   }
   return void 0;
 }
+function escapeControlChar(cp) {
+  switch (cp) {
+    case 8:
+      return "\\b";
+    case 9:
+      return "\\t";
+    case 10:
+      return "\\n";
+    case 12:
+      return "\\f";
+    case 13:
+      return "\\r";
+    default:
+      return "\\u" + cp.toString(16).padStart(4, "0");
+  }
+}
 function normalizeSingleQuotes(raw) {
   if (!raw.includes("'") || !raw.includes("{") && !raw.includes("[")) return void 0;
   let out = "";
@@ -4156,40 +4181,6 @@ function escapeRawNewlinesInStrings(s) {
   }
   return out;
 }
-function repairAtParserPositions(s) {
-  let cur = s;
-  for (let i = 0; i < 500; i++) {
-    let err;
-    try {
-      JSON.parse(cur);
-      return cur;
-    } catch (e) {
-      err = e;
-    }
-    const msg = err instanceof Error ? err.message : String(err);
-    const posMatch = /position (\d+)/.exec(msg);
-    if (posMatch === null) return cur;
-    const pos = Number(posMatch[1]);
-    if (!Number.isInteger(pos) || pos < 0 || pos >= cur.length) return cur;
-    if (/control character/i.test(msg)) {
-      const ch = cur.charAt(pos);
-      let esc;
-      if (ch === "\n") esc = "\\n";
-      else if (ch === "\r") esc = "\\r";
-      else if (ch === "	") esc = "\\t";
-      else if (ch.charCodeAt(0) < 32) esc = "\\u" + ch.charCodeAt(0).toString(16).padStart(4, "0");
-      if (esc === void 0) return cur;
-      cur = cur.slice(0, pos) + esc + cur.slice(pos + 1);
-    } else if (/Bad escaped character/i.test(msg)) {
-      const b = cur.charAt(pos - 1) === "\\" ? pos - 1 : cur.charAt(pos) === "\\" ? pos : -1;
-      if (b < 0) return cur;
-      cur = cur.slice(0, b) + "\\\\" + cur.slice(b + 1);
-    } else {
-      return cur;
-    }
-  }
-  return cur;
-}
 function looksTruncated(s) {
   let depth = 0;
   let inString = false;