@liveblocks/core 3.5.1 → 3.5.2

package/dist/index.js

@@ -6,7 +6,7 @@ var __export = (target, all) => {
 
 // src/version.ts
 var PKG_NAME = "@liveblocks/core";
-var PKG_VERSION = "3.5.1";
+var PKG_VERSION = "3.5.2";
 var PKG_FORMAT = "esm";
 
 // src/dupe-detection.ts
@@ -3817,99 +3817,174 @@ function parseAuthToken(rawTokenString) {
   };
 }
 
-// src/lib/parsePartialJsonObject.ts
-function parsePartialJsonObject(partial) {
-  partial = partial.trimStart();
-  if (partial.charAt(0) !== "{") {
-    return {};
-  }
-  if (partial.trimEnd().endsWith("}")) {
-    const quickCheck = tryParseJson(partial);
-    if (quickCheck) {
-      return quickCheck;
-    }
-  }
-  let result = partial;
-  let quoteCount = 0;
-  let escaped = false;
-  for (let i = 0; i < result.length; i++) {
-    const char = result[i];
-    if (escaped) {
-      escaped = false;
-    } else if (char === "\\") {
-      escaped = true;
-    } else if (char === '"') {
-      quoteCount++;
-    }
-  }
-  if (quoteCount % 2 === 1) {
-    result += '"';
-  }
-  result = result.trimEnd();
-  if (result.endsWith(",")) {
-    result = result.slice(0, -1);
-  }
-  if (result.endsWith(".")) {
-    result = result.slice(0, -1);
-  }
-  const stack = [];
-  let inString = false;
-  escaped = false;
-  for (let i = 0; i < result.length; i++) {
-    const char = result[i];
-    if (inString) {
-      if (escaped) {
-        escaped = false;
-      } else if (char === "\\") {
-        escaped = true;
-      } else if (char === '"') {
-        inString = false;
-      }
-    } else {
-      if (char === '"') {
-        inString = true;
-      } else if (char === "{") {
-        stack.push("}");
-      } else if (char === "[") {
-        stack.push("]");
-      } else if (char === "}" && stack.length > 0 && stack[stack.length - 1] === "}") {
-        stack.pop();
-      } else if (char === "]" && stack.length > 0 && stack[stack.length - 1] === "]") {
-        stack.pop();
+// src/lib/IncrementalJsonParser.ts
+var EMPTY_OBJECT = Object.freeze({});
+var NULL_KEYWORD_CHARS = Array.from(new Set("null"));
+var TRUE_KEYWORD_CHARS = Array.from(new Set("true"));
+var FALSE_KEYWORD_CHARS = Array.from(new Set("false"));
+var ALL_KEYWORD_CHARS = Array.from(new Set("nulltruefalse"));
+function stripChar(str, chars) {
+  const lastChar = str[str.length - 1];
+  if (chars.includes(lastChar)) {
+    return str.slice(0, -1);
+  }
+  return str;
+}
+var IncrementalJsonParser = class {
+  // Input
+  #sourceText = "";
+  // Output
+  #cachedJson;
+  /** How much we've already parsed */
+  #scanIndex = 0;
+  /** Whether the last char processed was a backslash */
+  #escaped = false;
+  /**
+   * Start position of the last unterminated string, -1 if we're not inside
+   * a string currently.
+   *
+   * Example: '{"a": "foo'
+   *                 ^
+   */
+  #lastUnterminatedString = -1;
+  /**
+   * Start position of the last fully terminated string we've seen.
+   *
+   * Example: '{"a": "foo'
+   *            ^
+   */
+  #lastTerminatedString = -1;
+  /** The bracket stack of expected closing chars. For input '{"a": ["foo', the stack would be ['}', ']']. */
+  #stack = [];
+  constructor(text = "") {
+    this.append(text);
+  }
+  get source() {
+    return this.#sourceText;
+  }
+  get json() {
+    if (this.#cachedJson === void 0) {
+      this.#cachedJson = this.#parse();
+    }
+    return this.#cachedJson;
+  }
+  /** Whether we're currently inside an unterminated string, e.g. '{"hello' */
+  get #inString() {
+    return this.#lastUnterminatedString >= 0;
+  }
+  append(delta) {
+    if (delta) {
+      if (this.#sourceText === "") {
+        delta = delta.trimStart();
       }
+      this.#sourceText += delta;
+      this.#cachedJson = void 0;
     }
   }
-  const suffix = stack.reverse().join("");
-  {
-    const attempt = tryParseJson(result + suffix);
-    if (attempt) {
-      return attempt;
-    }
-  }
-  if (result.endsWith(":")) {
-    result = result.slice(0, -1);
-  }
-  if (result.endsWith('"')) {
-    let pos = result.length - 2;
-    escaped = false;
-    while (pos >= 0) {
-      if (escaped) {
-        escaped = false;
-      } else if (result[pos] === "\\") {
-        escaped = true;
-      } else if (result[pos] === '"') {
-        result = result.slice(0, pos);
-        break;
+  #autocompleteTail(output) {
+    if (this.#inString) {
+      return "";
+    }
+    const lastChar = output.charAt(output.length - 1);
+    if (lastChar === "") return "";
+    if (lastChar === "-") {
+      return "0";
+    }
+    if (!ALL_KEYWORD_CHARS.includes(lastChar)) return "";
+    if (NULL_KEYWORD_CHARS.includes(lastChar)) {
+      if (output.endsWith("nul")) return "l";
+      if (output.endsWith("nu")) return "ll";
+      if (output.endsWith("n")) return "ull";
+    }
+    if (TRUE_KEYWORD_CHARS.includes(lastChar)) {
+      if (output.endsWith("tru")) return "e";
+      if (output.endsWith("tr")) return "ue";
+      if (output.endsWith("t")) return "rue";
+    }
+    if (FALSE_KEYWORD_CHARS.includes(lastChar)) {
+      if (output.endsWith("fals")) return "e";
+      if (output.endsWith("fal")) return "se";
+      if (output.endsWith("fa")) return "lse";
+      if (output.endsWith("f")) return "alse";
+    }
+    return "";
+  }
+  /**
+   * Updates the internal parsing state by processing any new content
+   * that has been appended since the last parse. This updates the state with
+   * facts only. Any interpretation is left to the #parse() method.
+   */
+  #catchup() {
+    const newContent = this.#sourceText.slice(this.#scanIndex);
+    for (let i = 0; i < newContent.length; i++) {
+      const ch = newContent[i];
+      const absolutePos = this.#scanIndex + i;
+      if (this.#inString) {
+        if (this.#escaped) {
+          this.#escaped = false;
+        } else if (ch === "\\") {
+          this.#escaped = true;
+        } else if (ch === '"') {
+          this.#lastTerminatedString = this.#lastUnterminatedString;
+          this.#lastUnterminatedString = -1;
+        }
+      } else {
+        if (ch === '"') {
+          this.#lastUnterminatedString = absolutePos;
+        } else if (ch === "{") {
+          this.#stack.push("}");
+        } else if (ch === "[") {
+          this.#stack.push("]");
+        } else if (ch === "}" && this.#stack.length > 0 && this.#stack[this.#stack.length - 1] === "}") {
+          this.#stack.pop();
+        } else if (ch === "]" && this.#stack.length > 0 && this.#stack[this.#stack.length - 1] === "]") {
+          this.#stack.pop();
+        }
       }
-      pos--;
     }
+    this.#scanIndex = this.#sourceText.length;
   }
-  if (result.endsWith(",")) {
-    result = result.slice(0, -1);
+  #parse() {
+    this.#catchup();
+    let result = this.#sourceText;
+    if (result.charAt(0) !== "{") {
+      return EMPTY_OBJECT;
+    }
+    if (result.endsWith("}")) {
+      const quickCheck = tryParseJson(result);
+      if (quickCheck) {
+        return quickCheck;
+      }
+    }
+    if (this.#inString) {
+      if (this.#escaped) {
+        result = result.slice(0, -1);
+      }
+      result += '"';
+    }
+    result = result.trimEnd();
+    result = stripChar(result, ",.");
+    result = result + this.#autocompleteTail(result);
+    const suffix = this.#stack.reduceRight((acc, ch) => acc + ch, "");
+    {
+      const attempt = tryParseJson(result + suffix);
+      if (attempt) {
+        return attempt;
+      }
+    }
+    if (this.#inString) {
+      result = result.slice(0, this.#lastUnterminatedString);
+    } else {
+      result = stripChar(result, ":");
+      if (result.endsWith('"')) {
+        result = result.slice(0, this.#lastTerminatedString);
+      }
+    }
+    result = stripChar(result, ",");
+    result += suffix;
+    return tryParseJson(result) ?? EMPTY_OBJECT;
   }
-  result += suffix;
-  return tryParseJson(result) ?? {};
-}
+};
 
 // src/types/ai.ts
 function patchContentWithDelta(content, delta) {
@@ -3933,28 +4008,16 @@ function patchContentWithDelta(content, delta) {
       }
       break;
     case "tool-stream": {
-      let _cacheKey = "";
-      let _cachedArgs = {};
-      const toolInvocation = {
-        type: "tool-invocation",
-        stage: "receiving",
-        invocationId: delta.invocationId,
-        name: delta.name,
-        partialArgsText: "",
-        get partialArgs() {
-          if (this.partialArgsText !== _cacheKey) {
-            _cachedArgs = parsePartialJsonObject(this.partialArgsText);
-            _cacheKey = this.partialArgsText;
-          }
-          return _cachedArgs;
-        }
-      };
+      const toolInvocation = createReceivingToolInvocation(
+        delta.invocationId,
+        delta.name
+      );
       content.push(toolInvocation);
       break;
     }
     case "tool-delta": {
       if (lastPart?.type === "tool-invocation" && lastPart.stage === "receiving") {
-        lastPart.partialArgsText += delta.delta;
+        lastPart.__appendDelta?.(delta.delta);
       }
       break;
     }
@@ -3974,6 +4037,25 @@ function patchContentWithDelta(content, delta) {
       return assertNever(delta, "Unhandled case");
   }
 }
+function createReceivingToolInvocation(invocationId, name, partialArgsText = "") {
+  const parser = new IncrementalJsonParser(partialArgsText);
+  return {
+    type: "tool-invocation",
+    stage: "receiving",
+    invocationId,
+    name,
+    get partialArgsText() {
+      return parser.source;
+    },
+    get partialArgs() {
+      return parser.json;
+    },
+    // Internal method to append deltas
+    __appendDelta(delta) {
+      parser.append(delta);
+    }
+  };
+}
 
 // src/ai.ts
 var DEFAULT_REQUEST_TIMEOUT = 4e3;
@@ -4425,6 +4507,28 @@ function createAi(config) {
     toolsStore,
     knowledge: new KnowledgeStack()
   };
+  const DELTA_THROTTLE = 25;
+  let pendingDeltas = [];
+  let deltaBatchTimer = null;
+  function flushPendingDeltas() {
+    const currentQueue = pendingDeltas;
+    pendingDeltas = [];
+    if (deltaBatchTimer !== null) {
+      clearTimeout(deltaBatchTimer);
+      deltaBatchTimer = null;
+    }
+    batch(() => {
+      for (const { id, delta } of currentQueue) {
+        context.messagesStore.addDelta(id, delta);
+      }
+    });
+  }
+  function enqueueDelta(id, delta) {
+    pendingDeltas.push({ id, delta });
+    if (deltaBatchTimer === null) {
+      deltaBatchTimer = setTimeout(flushPendingDeltas, DELTA_THROTTLE);
+    }
+  }
   let lastTokenKey;
   function onStatusDidChange(_newStatus) {
     const authValue = managedSocket.authValue;
@@ -4464,6 +4568,7 @@ function createAi(config) {
   function onDidConnect() {
   }
   function onDidDisconnect() {
+    flushPendingDeltas();
   }
   function handleServerMessage(event) {
     if (typeof event.data !== "string")
@@ -4478,50 +4583,51 @@ function createAi(config) {
       return;
     }
     if ("event" in msg) {
-      switch (msg.event) {
-        case "cmd-failed":
-          pendingCmd?.reject(new Error(msg.error));
-          break;
-        case "delta": {
-          const { id, delta } = msg;
-          context.messagesStore.addDelta(id, delta);
-          break;
-        }
-        case "settle": {
-          context.messagesStore.upsert(msg.message);
-          break;
-        }
-        case "warning":
-          warn(msg.message);
-          break;
-        case "error":
-          error2(msg.error);
-          break;
-        case "rebooted":
-          context.messagesStore.failAllPending();
-          break;
-        case "sync":
-          batch(() => {
-            for (const m of msg["-messages"] ?? []) {
-              context.messagesStore.remove(m.chatId, m.id);
-            }
-            for (const chatId of msg["-chats"] ?? []) {
-              context.chatsStore.markDeleted(chatId);
-              context.messagesStore.removeByChatId(chatId);
-            }
-            for (const chatId of msg.clear ?? []) {
-              context.messagesStore.removeByChatId(chatId);
-            }
-            if (msg.chats) {
-              context.chatsStore.upsertMany(msg.chats);
-            }
-            if (msg.messages) {
-              context.messagesStore.upsertMany(msg.messages);
+      if (msg.event === "delta") {
+        const { id, delta } = msg;
+        enqueueDelta(id, delta);
+      } else {
+        batch(() => {
+          flushPendingDeltas();
+          switch (msg.event) {
+            case "cmd-failed":
+              pendingCmd?.reject(new Error(msg.error));
+              break;
+            case "settle": {
+              context.messagesStore.upsert(msg.message);
+              break;
             }
-          });
-          break;
-        default:
-          return assertNever(msg, "Unhandled case");
+            case "warning":
+              warn(msg.message);
+              break;
+            case "error":
+              error2(msg.error);
+              break;
+            case "rebooted":
+              context.messagesStore.failAllPending();
+              break;
+            case "sync":
+              for (const m of msg["-messages"] ?? []) {
+                context.messagesStore.remove(m.chatId, m.id);
+              }
+              for (const chatId of msg["-chats"] ?? []) {
+                context.chatsStore.markDeleted(chatId);
+                context.messagesStore.removeByChatId(chatId);
+              }
+              for (const chatId of msg.clear ?? []) {
+                context.messagesStore.removeByChatId(chatId);
+              }
+              if (msg.chats) {
+                context.chatsStore.upsertMany(msg.chats);
+              }
+              if (msg.messages) {
+                context.messagesStore.upsertMany(msg.messages);
+              }
+              break;
+            default:
+              return assertNever(msg, "Unhandled case");
+          }
+        });
       }
     } else {
       switch (msg.cmd) {