@lvce-editor/editor-worker 19.55.2 → 19.55.4

package/dist/editorWorkerMain.js

@@ -1198,175 +1198,9 @@ const create$a = rpcId => {
   };
 };
 
-const Audio = 0;
-const Button$3 = 1;
-const Col = 2;
-const ColGroup = 3;
-const Div$1 = 4;
-const H1 = 5;
-const Input$1 = 6;
-const Kbd = 7;
-const Span$1 = 8;
-const Table = 9;
-const TBody = 10;
-const Td = 11;
-const Text$1 = 12;
-const Th = 13;
-const THead = 14;
-const Tr = 15;
-const I = 16;
-const Img = 17;
-const Root = 0;
-const Ins = 20;
-const Del = 21;
-const H2 = 22;
-const H3 = 23;
-const H4 = 24;
-const H5 = 25;
-const H6 = 26;
-const Article = 27;
-const Aside = 28;
-const Footer = 29;
-const Header = 30;
-const Nav$1 = 40;
-const Section = 41;
-const Search = 42;
-const Dd = 43;
-const Dl = 44;
-const Figcaption = 45;
-const Figure = 46;
-const Hr = 47;
-const Li = 48;
-const Ol = 49;
-const P = 50;
-const Pre = 51;
-const A = 53;
-const Abbr = 54;
-const Br = 55;
-const Cite = 56;
-const Data = 57;
-const Time = 58;
-const Tfoot = 59;
-const Ul = 60;
-const Video = 61;
-const TextArea$1 = 62;
-const Select = 63;
-const Option = 64;
-const Code$1 = 65;
-const Label = 66;
-const Dt = 67;
-const Iframe = 68;
-const Main = 69;
-const Strong = 70;
-const Em = 71;
-const Style = 72;
-const Html = 73;
-const Head = 74;
-const Title = 75;
-const Meta = 76;
-const Canvas = 77;
-const Form = 78;
-const BlockQuote = 79;
-const Quote = 80;
-const Circle = 81;
-const Defs = 82;
-const Ellipse = 83;
-const G = 84;
-const Line = 85;
-const Path = 86;
-const Polygon = 87;
-const Polyline = 88;
-const Rect = 89;
-const Svg = 90;
-const Use = 91;
+const Text = 12;
 const Reference = 100;
 
-const VirtualDomElements = {
-  __proto__: null,
-  A,
-  Abbr,
-  Article,
-  Aside,
-  Audio,
-  BlockQuote,
-  Br,
-  Button: Button$3,
-  Canvas,
-  Circle,
-  Cite,
-  Code: Code$1,
-  Col,
-  ColGroup,
-  Data,
-  Dd,
-  Defs,
-  Del,
-  Div: Div$1,
-  Dl,
-  Dt,
-  Ellipse,
-  Em,
-  Figcaption,
-  Figure,
-  Footer,
-  Form,
-  G,
-  H1,
-  H2,
-  H3,
-  H4,
-  H5,
-  H6,
-  Head,
-  Header,
-  Hr,
-  Html,
-  I,
-  Iframe,
-  Img,
-  Input: Input$1,
-  Ins,
-  Kbd,
-  Label,
-  Li,
-  Line,
-  Main,
-  Meta,
-  Nav: Nav$1,
-  Ol,
-  Option,
-  P,
-  Path,
-  Polygon,
-  Polyline,
-  Pre,
-  Quote,
-  Rect,
-  Reference,
-  Root,
-  Search,
-  Section,
-  Select,
-  Span: Span$1,
-  Strong,
-  Style,
-  Svg,
-  TBody,
-  THead,
-  Table,
-  Td,
-  Text: Text$1,
-  TextArea: TextArea$1,
-  Tfoot,
-  Th,
-  Time,
-  Title,
-  Tr,
-  Ul,
-  Use,
-  Video
-};
-
 const AltKey = 'event.altKey';
 const Button$2 = 'event.button';
 const ClientX = 'event.clientX';
@@ -1645,7 +1479,8 @@ const create$9 = () => {
   const commandQueues = new Map();
   const generations = Object.create(null);
   const states = Object.create(null);
-  const commandMapRef = {};
+  const commandMapRef = Object.create(null);
+  const commandsById = Object.create(null);
   const getGeneration = uid => generations[uid] || 0;
   const isCurrentGeneration = (uid, generation) => {
     return states[uid] !== undefined && getGeneration(uid) === generation;
@@ -1707,6 +1542,18 @@ const create$9 = () => {
         delete states[key];
       }
     },
+    createDirectEventCommandMap(requestRender) {
+      return {
+        async 'Viewlet.executeViewletCommand'(uid, command, ...args) {
+          const fn = commandsById[command];
+          if (!fn) {
+            throw new Error(`Viewlet command not found: ${command}`);
+          }
+          await fn(uid, ...args);
+          await requestRender(uid);
+        }
+      };
+    },
     diff(uid, modules, numbers) {
       const {
         oldState,
@@ -1738,6 +1585,9 @@ const create$9 = () => {
     },
     registerCommands(commandMap) {
       Object.assign(commandMapRef, commandMap);
+      for (const [key, fn] of Object.entries(commandMap)) {
+        commandsById[toCommandId(key)] = fn;
+      }
     },
     set(uid, oldState, newState, scheduledState) {
       const current = states[uid];
@@ -5750,10 +5600,14 @@ const diff = (oldState, newState) => {
 };
 
 const diff2 = uid => {
+  const editor = get$8(uid);
+  if (!editor) {
+    return [];
+  }
   const {
     newState,
     oldState
-  } = get$8(uid);
+  } = editor;
   const result = diff(oldState, newState);
   return result;
 };
@@ -12818,7 +12672,6 @@ const Button$1 = 1;
 const Div = 4;
 const Input = 6;
 const Span = 8;
-const Text = 12;
 const Nav = 40;
 const TextArea = 62;
 
@@ -12830,141 +12683,401 @@ const text = data => {
   };
 };
 
-const getLineInfoVirtualDom = lineInfo => {
-  const dom = [{
-    childCount: lineInfo.length / 2,
-    className: HoverEditorRow,
-    type: Div
-  }];
-  for (let i = 0; i < lineInfo.length; i += 2) {
-    const tokenText = lineInfo[i];
-    const tokenClass = lineInfo[i + 1];
-    dom.push({
-      childCount: 1,
-      className: tokenClass,
-      type: Span
-    }, text(tokenText));
-  }
-  return dom;
-};
-const getLineInfosVirtualDom = lineInfos => {
-  const dom = lineInfos.flatMap(getLineInfoVirtualDom);
-  return dom;
-};
+const SetText = 1;
+const Replace = 2;
+const SetAttribute = 3;
+const RemoveAttribute = 4;
+const Add = 6;
+const NavigateChild = 7;
+const NavigateParent = 8;
+const RemoveChild = 9;
+const NavigateSibling = 10;
+const SetReferenceNodeUid = 11;
 
-const mergeClassNames = (...classNames) => {
-  return classNames.filter(Boolean).join(' ');
+const isKey = key => {
+  return key !== 'type' && key !== 'childCount';
 };
 
-const hoverProblemMessage = {
-  childCount: 1,
-  className: HoverProblemMessage,
-  type: Span
-};
-const hoverProblemDetail = {
-  childCount: 1,
-  className: HoverProblemDetail,
-  type: Span
-};
-const hoverDocumentationNode = {
-  childCount: 1,
-  className: HoverDocumentation,
-  type: Div
-};
-const hoverSashNode = {
-  childCount: 0,
-  className: mergeClassNames('Sash', 'SashVertical', 'SashResize'),
-  onPointerDown: HandleSashPointerDown,
-  type: Div
+const getKeys$1 = node => {
+  const keys = Object.keys(node).filter(isKey);
+  return keys;
 };
-const getChildCount = (lineInfos, documentation, diagnostics) => {
-  const documentationCount = documentation ? 1 : 0;
-  const diagnosticsCount = diagnostics && diagnostics.length > 0 ? 1 : 0;
-  return lineInfos.length + documentationCount + diagnosticsCount;
+
+const arrayToTree = nodes => {
+  const result = [];
+  let i = 0;
+  while (i < nodes.length) {
+    const node = nodes[i];
+    const {
+      children,
+      nodesConsumed
+    } = getChildrenWithCount(nodes, i + 1, node.childCount || 0);
+    result.push({
+      node,
+      children
+    });
+    i += 1 + nodesConsumed;
+  }
+  return result;
 };
-const getEditorHoverClassName = (lineInfos, documentation, diagnostics) => {
-  const isDiagnosticOnly = diagnostics?.length === 1 && lineInfos.length === 0 && !documentation;
-  return mergeClassNames('Viewlet', 'EditorHover', isDiagnosticOnly ? EditorHoverDiagnosticOnly : '');
+const getChildrenWithCount = (nodes, startIndex, childCount) => {
+  if (childCount === 0) {
+    return {
+      children: [],
+      nodesConsumed: 0
+    };
+  }
+  const children = [];
+  let i = startIndex;
+  let remaining = childCount;
+  let totalConsumed = 0;
+  while (remaining > 0 && i < nodes.length) {
+    const node = nodes[i];
+    const nodeChildCount = node.childCount || 0;
+    const {
+      children: nodeChildren,
+      nodesConsumed
+    } = getChildrenWithCount(nodes, i + 1, nodeChildCount);
+    children.push({
+      node,
+      children: nodeChildren
+    });
+    const nodeSize = 1 + nodesConsumed;
+    i += nodeSize;
+    totalConsumed += nodeSize;
+    remaining--;
+  }
+  return {
+    children,
+    nodesConsumed: totalConsumed
+  };
 };
-const getHoverVirtualDom = (lineInfos, documentation, diagnostics) => {
-  const dom = [];
-  dom.push({
-    childCount: getChildCount(lineInfos, documentation, diagnostics) + 1,
-    className: getEditorHoverClassName(lineInfos, documentation, diagnostics),
-    type: Div
-  });
-  if (diagnostics && diagnostics.length > 0) {
-    dom.push({
-      childCount: diagnostics.length * 2,
-      className: mergeClassNames(HoverDisplayString, HoverProblem),
-      type: Div
+
+const compareNodes = (oldNode, newNode) => {
+  // Check if node type changed - return null to signal incompatible nodes
+  // (caller should handle this with a Replace operation)
+  if (oldNode.type !== newNode.type) {
+    return null;
+  }
+  const patches = [];
+  // Handle reference nodes - special handling for uid changes
+  if (oldNode.type === Reference && oldNode.uid !== newNode.uid) {
+    patches.push({
+      type: SetReferenceNodeUid,
+      uid: newNode.uid
     });
-    for (const diagnostic of diagnostics) {
-      dom.push(hoverProblemMessage, text(diagnostic.message), hoverProblemDetail, text(getDiagnosticHoverDetail(diagnostic)));
+  }
+  // Handle text nodes
+  if (oldNode.type === Text && newNode.type === Text) {
+    if (oldNode.text !== newNode.text) {
+      patches.push({
+        type: SetText,
+        value: newNode.text
+      });
     }
+    return patches;
   }
-  if (lineInfos.length > 0) {
-    const lineInfosDom = getLineInfosVirtualDom(lineInfos);
-    dom.push({
-      childCount: lineInfos.length,
-      className: HoverDisplayString,
-      type: Div
-    }, ...lineInfosDom);
+  // Compare attributes
+  const oldKeys = getKeys$1(oldNode).filter(key => oldNode.type !== Reference || key !== 'uid');
+  const newKeys = getKeys$1(newNode).filter(key => newNode.type !== Reference || key !== 'uid');
+  // Check for attribute changes
+  for (const key of newKeys) {
+    if (oldNode[key] !== newNode[key]) {
+      patches.push({
+        type: SetAttribute,
+        key,
+        value: newNode[key]
+      });
+    }
   }
-  if (documentation) {
-    dom.push(hoverDocumentationNode, text(documentation));
+  // Check for removed attributes
+  for (const key of oldKeys) {
+    if (!Object.hasOwn(newNode, key)) {
+      patches.push({
+        type: RemoveAttribute,
+        key
+      });
+    }
   }
-  dom.push(hoverSashNode);
-  return dom;
+  return patches;
 };
 
-const renderHoverDom = {
-  apply(oldState, newState) {
-    const dom = getHoverVirtualDom(newState.lineInfos, newState.documentation, newState.diagnostics);
-    return [/* method */SetDom2, dom];
-  },
-  isEqual: (oldState, newState) => oldState.lineInfos === newState.lineInfos && oldState.documentation === newState.documentation && oldState.diagnostics === newState.diagnostics
-};
-const renderBounds$2 = {
-  apply(oldState, newState) {
-    const {
-      height,
-      width,
-      x,
-      y
-    } = newState;
-    return [SetBounds, x, y, width, height];
-  },
-  isEqual: (oldState, newState) => oldState.x === newState.x && oldState.y === newState.y
-};
-const render$a = [renderHoverDom, renderBounds$2];
-const renderHover = (oldState, newState) => {
-  const commands = [];
-  for (const item of render$a) {
-    if (!item.isEqual(oldState, newState)) {
-      commands.push(item.apply(oldState, newState));
+const treeToArray = node => {
+  const result = [];
+  const stack = [node];
+  while (stack.length > 0) {
+    const current = stack.pop();
+    result.push(current.node);
+    for (let i = current.children.length - 1; i >= 0; i--) {
+      stack.push(current.children[i]);
     }
   }
-  return commands;
+  return result;
 };
 
-const commandsToForward$3 = [SetDom2, SetCss, SetBounds2, RegisterEventListeners, SetSelectionByName, SetValueByName, SetFocusContext, SetUid, 'Viewlet.focusSelector'];
-const render$9 = widget => {
-  const commands = renderFull$3(widget.oldState, widget.newState);
-  const wrappedCommands = [];
-  const {
-    uid
-  } = widget.newState;
-  for (const command of commands) {
-    if (commandsToForward$3.includes(command[0])) {
-      wrappedCommands.push(command);
-    } else {
-      wrappedCommands.push(['Viewlet.send', uid, ...command]);
-    }
+const navigateToChild = (patches, currentChildIndex, index) => {
+  if (currentChildIndex === -1) {
+    patches.push({
+      type: NavigateChild,
+      index
+    });
+    return index;
   }
-  return wrappedCommands;
+  if (currentChildIndex !== index) {
+    patches.push({
+      type: NavigateSibling,
+      index
+    });
+  }
+  return index;
 };
-const add$6 = widget => {
+const navigateToParent = (patches, currentChildIndex) => {
+  if (currentChildIndex >= 0) {
+    patches.push({
+      type: NavigateParent
+    });
+  }
+  return -1;
+};
+const addTree = (newNode, patches) => {
+  patches.push({
+    type: Add,
+    nodes: treeToArray(newNode)
+  });
+};
+const replaceTree = (newNode, patches) => {
+  patches.push({
+    type: Replace,
+    nodes: treeToArray(newNode)
+  });
+};
+const diffExistingChild = (oldNode, newNode, patches, currentChildIndex, index) => {
+  const nodePatches = compareNodes(oldNode.node, newNode.node);
+  if (nodePatches === null) {
+    const nextChildIndex = navigateToChild(patches, currentChildIndex, index);
+    replaceTree(newNode, patches);
+    return nextChildIndex;
+  }
+  const hasChildrenToCompare = oldNode.children.length > 0 || newNode.children.length > 0;
+  if (nodePatches.length === 0 && !hasChildrenToCompare) {
+    return currentChildIndex;
+  }
+  const nextChildIndex = navigateToChild(patches, currentChildIndex, index);
+  if (nodePatches.length > 0) {
+    patches.push(...nodePatches);
+  }
+  if (hasChildrenToCompare) {
+    diffChildren(oldNode.children, newNode.children, patches);
+  }
+  return nextChildIndex;
+};
+const diffRootNode = (oldNode, newNode, patches) => {
+  const nodePatches = compareNodes(oldNode.node, newNode.node);
+  if (nodePatches === null) {
+    replaceTree(newNode, patches);
+    return;
+  }
+  if (nodePatches.length > 0) {
+    patches.push(...nodePatches);
+  }
+  if (oldNode.children.length > 0 || newNode.children.length > 0) {
+    diffChildren(oldNode.children, newNode.children, patches);
+  }
+};
+const diffChildren = (oldChildren, newChildren, patches) => {
+  const maxLength = Math.max(oldChildren.length, newChildren.length);
+  let currentChildIndex = -1;
+  const indicesToRemove = [];
+  for (let i = 0; i < maxLength; i++) {
+    const oldNode = oldChildren[i];
+    const newNode = newChildren[i];
+    if (!oldNode && !newNode) {
+      continue;
+    }
+    if (!oldNode) {
+      currentChildIndex = navigateToParent(patches, currentChildIndex);
+      addTree(newNode, patches);
+      continue;
+    }
+    if (!newNode) {
+      indicesToRemove.push(i);
+      continue;
+    }
+    currentChildIndex = diffExistingChild(oldNode, newNode, patches, currentChildIndex, i);
+  }
+  navigateToParent(patches, currentChildIndex);
+  for (let j = indicesToRemove.length - 1; j >= 0; j--) {
+    patches.push({
+      type: RemoveChild,
+      index: indicesToRemove[j]
+    });
+  }
+};
+const diffTrees = (oldTree, newTree, patches, path) => {
+  if (path.length === 0 && oldTree.length === 1 && newTree.length === 1) {
+    diffRootNode(oldTree[0], newTree[0], patches);
+    return;
+  }
+  diffChildren(oldTree, newTree, patches);
+};
+
+const removeTrailingNavigationPatches = patches => {
+  while (patches.length > 0) {
+    const patch = patches.at(-1);
+    if (patch.type !== NavigateChild && patch.type !== NavigateParent && patch.type !== NavigateSibling) {
+      break;
+    }
+    patches.pop();
+  }
+  return patches;
+};
+
+const diffTree = (oldNodes, newNodes) => {
+  // Step 1: Convert flat arrays to tree structures
+  const oldTree = arrayToTree(oldNodes);
+  const newTree = arrayToTree(newNodes);
+  // Step 3: Compare the trees
+  const patches = [];
+  diffTrees(oldTree, newTree, patches, []);
+  // Remove trailing navigation patches since they serve no purpose
+  return removeTrailingNavigationPatches(patches);
+};
+
+const getLineInfoVirtualDom = lineInfo => {
+  const dom = [{
+    childCount: lineInfo.length / 2,
+    className: HoverEditorRow,
+    type: Div
+  }];
+  for (let i = 0; i < lineInfo.length; i += 2) {
+    const tokenText = lineInfo[i];
+    const tokenClass = lineInfo[i + 1];
+    dom.push({
+      childCount: 1,
+      className: tokenClass,
+      type: Span
+    }, text(tokenText));
+  }
+  return dom;
+};
+const getLineInfosVirtualDom = lineInfos => {
+  const dom = lineInfos.flatMap(getLineInfoVirtualDom);
+  return dom;
+};
+
+const mergeClassNames = (...classNames) => {
+  return classNames.filter(Boolean).join(' ');
+};
+
+const hoverProblemMessage = {
+  childCount: 1,
+  className: HoverProblemMessage,
+  type: Span
+};
+const hoverProblemDetail = {
+  childCount: 1,
+  className: HoverProblemDetail,
+  type: Span
+};
+const hoverDocumentationNode = {
+  childCount: 1,
+  className: HoverDocumentation,
+  type: Div
+};
+const hoverSashNode = {
+  childCount: 0,
+  className: mergeClassNames('Sash', 'SashVertical', 'SashResize'),
+  onPointerDown: HandleSashPointerDown,
+  type: Div
+};
+const getChildCount = (lineInfos, documentation, diagnostics) => {
+  const documentationCount = documentation ? 1 : 0;
+  const diagnosticsCount = diagnostics && diagnostics.length > 0 ? 1 : 0;
+  return lineInfos.length + documentationCount + diagnosticsCount;
+};
+const getEditorHoverClassName = (lineInfos, documentation, diagnostics) => {
+  const isDiagnosticOnly = diagnostics?.length === 1 && lineInfos.length === 0 && !documentation;
+  return mergeClassNames('Viewlet', 'EditorHover', isDiagnosticOnly ? EditorHoverDiagnosticOnly : '');
+};
+const getHoverVirtualDom = (lineInfos, documentation, diagnostics) => {
+  const dom = [];
+  dom.push({
+    childCount: getChildCount(lineInfos, documentation, diagnostics) + 1,
+    className: getEditorHoverClassName(lineInfos, documentation, diagnostics),
+    type: Div
+  });
+  if (diagnostics && diagnostics.length > 0) {
+    dom.push({
+      childCount: diagnostics.length * 2,
+      className: mergeClassNames(HoverDisplayString, HoverProblem),
+      type: Div
+    });
+    for (const diagnostic of diagnostics) {
+      dom.push(hoverProblemMessage, text(diagnostic.message), hoverProblemDetail, text(getDiagnosticHoverDetail(diagnostic)));
+    }
+  }
+  if (lineInfos.length > 0) {
+    const lineInfosDom = getLineInfosVirtualDom(lineInfos);
+    dom.push({
+      childCount: lineInfos.length,
+      className: HoverDisplayString,
+      type: Div
+    }, ...lineInfosDom);
+  }
+  if (documentation) {
+    dom.push(hoverDocumentationNode, text(documentation));
+  }
+  dom.push(hoverSashNode);
+  return dom;
+};
+
+const renderHoverDom = {
+  apply(oldState, newState) {
+    const dom = getHoverVirtualDom(newState.lineInfos, newState.documentation, newState.diagnostics);
+    return [/* method */SetDom2, dom];
+  },
+  isEqual: (oldState, newState) => oldState.lineInfos === newState.lineInfos && oldState.documentation === newState.documentation && oldState.diagnostics === newState.diagnostics
+};
+const renderBounds$2 = {
+  apply(oldState, newState) {
+    const {
+      height,
+      width,
+      x,
+      y
+    } = newState;
+    return [SetBounds, x, y, width, height];
+  },
+  isEqual: (oldState, newState) => oldState.x === newState.x && oldState.y === newState.y
+};
+const render$a = [renderHoverDom, renderBounds$2];
+const renderHover = (oldState, newState) => {
+  const commands = [];
+  for (const item of render$a) {
+    if (!item.isEqual(oldState, newState)) {
+      commands.push(item.apply(oldState, newState));
+    }
+  }
+  return commands;
+};
+
+const commandsToForward$3 = [SetDom2, SetCss, SetBounds2, RegisterEventListeners, SetSelectionByName, SetValueByName, SetFocusContext, SetUid, 'Viewlet.focusSelector'];
+const render$9 = widget => {
+  const commands = renderFull$3(widget.oldState, widget.newState);
+  const wrappedCommands = [];
+  const {
+    uid
+  } = widget.newState;
+  for (const command of commands) {
+    if (commandsToForward$3.includes(command[0])) {
+      wrappedCommands.push(command);
+    } else {
+      wrappedCommands.push(['Viewlet.send', uid, ...command]);
+    }
+  }
+  return wrappedCommands;
+};
+const add$6 = widget => {
   return addWidget(widget, 'EditorRename', render$9);
 };
 const remove$5 = widget => {
@@ -13214,6 +13327,7 @@ const closeWidget2 = async (editorUid, widgetId, widgetName, unsetAdditionalFocu
   const newWidgets = [...widgets.slice(0, index), ...widgets.slice(index + 1)];
   const newEditor = {
     ...editor,
+    additionalFocus: unsetAdditionalFocus$1 ? 0 : editor.additionalFocus,
     decorations: widgetId === Rename$1 ? editor.decorations.slice(0, -4) : editor.decorations,
     focused: true,
     widgetRevision,
@@ -13659,7 +13773,7 @@ const getKeyBindings = () => {
   }];
 };
 
-const getKeys$1 = () => {
+const getKeys = () => {
   return getKeys$2();
 };
 
@@ -14721,280 +14835,14 @@ const renderFocusContext$1 = (oldState, newState) => {
   return [SetFocusContext$1, newState.uid, newState.focus];
 };
 
-new Set(Object.values(VirtualDomElements));
-
-const SetText = 1;
-const Replace = 2;
-const SetAttribute = 3;
-const RemoveAttribute = 4;
-const Add = 6;
-const NavigateChild = 7;
-const NavigateParent = 8;
-const RemoveChild = 9;
-const NavigateSibling = 10;
-const SetReferenceNodeUid = 11;
-
-const isKey = key => {
-  return key !== 'type' && key !== 'childCount';
-};
-
-const getKeys = node => {
-  const keys = Object.keys(node).filter(isKey);
-  return keys;
-};
-
-const arrayToTree = nodes => {
-  const result = [];
-  let i = 0;
-  while (i < nodes.length) {
-    const node = nodes[i];
-    const {
-      children,
-      nodesConsumed
-    } = getChildrenWithCount(nodes, i + 1, node.childCount || 0);
-    result.push({
-      node,
-      children
-    });
-    i += 1 + nodesConsumed;
-  }
-  return result;
-};
-const getChildrenWithCount = (nodes, startIndex, childCount) => {
-  if (childCount === 0) {
-    return {
-      children: [],
-      nodesConsumed: 0
-    };
-  }
-  const children = [];
-  let i = startIndex;
-  let remaining = childCount;
-  let totalConsumed = 0;
-  while (remaining > 0 && i < nodes.length) {
-    const node = nodes[i];
-    const nodeChildCount = node.childCount || 0;
-    const {
-      children: nodeChildren,
-      nodesConsumed
-    } = getChildrenWithCount(nodes, i + 1, nodeChildCount);
-    children.push({
-      node,
-      children: nodeChildren
-    });
-    const nodeSize = 1 + nodesConsumed;
-    i += nodeSize;
-    totalConsumed += nodeSize;
-    remaining--;
-  }
-  return {
-    children,
-    nodesConsumed: totalConsumed
-  };
-};
-
-const compareNodes = (oldNode, newNode) => {
-  // Check if node type changed - return null to signal incompatible nodes
-  // (caller should handle this with a Replace operation)
-  if (oldNode.type !== newNode.type) {
-    return null;
-  }
-  const patches = [];
-  // Handle reference nodes - special handling for uid changes
-  if (oldNode.type === Reference && oldNode.uid !== newNode.uid) {
-    patches.push({
-      type: SetReferenceNodeUid,
-      uid: newNode.uid
-    });
-  }
-  // Handle text nodes
-  if (oldNode.type === Text$1 && newNode.type === Text$1) {
-    if (oldNode.text !== newNode.text) {
-      patches.push({
-        type: SetText,
-        value: newNode.text
-      });
-    }
-    return patches;
-  }
-  // Compare attributes
-  const oldKeys = getKeys(oldNode).filter(key => oldNode.type !== Reference || key !== 'uid');
-  const newKeys = getKeys(newNode).filter(key => newNode.type !== Reference || key !== 'uid');
-  // Check for attribute changes
-  for (const key of newKeys) {
-    if (oldNode[key] !== newNode[key]) {
-      patches.push({
-        type: SetAttribute,
-        key,
-        value: newNode[key]
-      });
-    }
-  }
-  // Check for removed attributes
-  for (const key of oldKeys) {
-    if (!Object.hasOwn(newNode, key)) {
-      patches.push({
-        type: RemoveAttribute,
-        key
-      });
-    }
-  }
-  return patches;
-};
-
-const treeToArray = node => {
-  const result = [];
-  const stack = [node];
-  while (stack.length > 0) {
-    const current = stack.pop();
-    result.push(current.node);
-    for (let i = current.children.length - 1; i >= 0; i--) {
-      stack.push(current.children[i]);
-    }
-  }
-  return result;
-};
-
-const navigateToChild = (patches, currentChildIndex, index) => {
-  if (currentChildIndex === -1) {
-    patches.push({
-      type: NavigateChild,
-      index
-    });
-    return index;
-  }
-  if (currentChildIndex !== index) {
-    patches.push({
-      type: NavigateSibling,
-      index
-    });
-  }
-  return index;
-};
-const navigateToParent = (patches, currentChildIndex) => {
-  if (currentChildIndex >= 0) {
-    patches.push({
-      type: NavigateParent
-    });
-  }
-  return -1;
-};
-const addTree = (newNode, patches) => {
-  patches.push({
-    type: Add,
-    nodes: treeToArray(newNode)
-  });
-};
-const replaceTree = (newNode, patches) => {
-  patches.push({
-    type: Replace,
-    nodes: treeToArray(newNode)
-  });
-};
-const diffExistingChild = (oldNode, newNode, patches, currentChildIndex, index) => {
-  const nodePatches = compareNodes(oldNode.node, newNode.node);
-  if (nodePatches === null) {
-    const nextChildIndex = navigateToChild(patches, currentChildIndex, index);
-    replaceTree(newNode, patches);
-    return nextChildIndex;
-  }
-  const hasChildrenToCompare = oldNode.children.length > 0 || newNode.children.length > 0;
-  if (nodePatches.length === 0 && !hasChildrenToCompare) {
-    return currentChildIndex;
-  }
-  const nextChildIndex = navigateToChild(patches, currentChildIndex, index);
-  if (nodePatches.length > 0) {
-    patches.push(...nodePatches);
-  }
-  if (hasChildrenToCompare) {
-    diffChildren(oldNode.children, newNode.children, patches);
-  }
-  return nextChildIndex;
-};
-const diffRootNode = (oldNode, newNode, patches) => {
-  const nodePatches = compareNodes(oldNode.node, newNode.node);
-  if (nodePatches === null) {
-    replaceTree(newNode, patches);
-    return;
-  }
-  if (nodePatches.length > 0) {
-    patches.push(...nodePatches);
-  }
-  if (oldNode.children.length > 0 || newNode.children.length > 0) {
-    diffChildren(oldNode.children, newNode.children, patches);
-  }
-};
-const diffChildren = (oldChildren, newChildren, patches) => {
-  const maxLength = Math.max(oldChildren.length, newChildren.length);
-  let currentChildIndex = -1;
-  const indicesToRemove = [];
-  for (let i = 0; i < maxLength; i++) {
-    const oldNode = oldChildren[i];
-    const newNode = newChildren[i];
-    if (!oldNode && !newNode) {
-      continue;
-    }
-    if (!oldNode) {
-      currentChildIndex = navigateToParent(patches, currentChildIndex);
-      addTree(newNode, patches);
-      continue;
-    }
-    if (!newNode) {
-      indicesToRemove.push(i);
-      continue;
-    }
-    currentChildIndex = diffExistingChild(oldNode, newNode, patches, currentChildIndex, i);
-  }
-  navigateToParent(patches, currentChildIndex);
-  for (let j = indicesToRemove.length - 1; j >= 0; j--) {
-    patches.push({
-      type: RemoveChild,
-      index: indicesToRemove[j]
-    });
-  }
-};
-const diffTrees = (oldTree, newTree, patches, path) => {
-  if (path.length === 0 && oldTree.length === 1 && newTree.length === 1) {
-    diffRootNode(oldTree[0], newTree[0], patches);
-    return;
-  }
-  diffChildren(oldTree, newTree, patches);
-};
-
-const removeTrailingNavigationPatches = patches => {
-  while (patches.length > 0) {
-    const patch = patches.at(-1);
-    if (patch.type !== NavigateChild && patch.type !== NavigateParent && patch.type !== NavigateSibling) {
-      break;
-    }
-    patches.pop();
-  }
-  return patches;
-};
-
-const diffTree = (oldNodes, newNodes) => {
-  // Step 1: Convert flat arrays to tree structures
-  const oldTree = arrayToTree(oldNodes);
-  const newTree = arrayToTree(newNodes);
-  // Step 3: Compare the trees
-  const patches = [];
-  diffTrees(oldTree, newTree, patches, []);
-  // Remove trailing navigation patches since they serve no purpose
-  return removeTrailingNavigationPatches(patches);
-};
-
-const True = 'true';
+const True = 'true';
 
 const Button = 'button';
 const Code = 'code';
 const TextBox = 'textbox';
 
 const getPathname = uri => {
-  try {
-    return decodeURIComponent(new URL(uri).pathname);
-  } catch {
-    return decodeURIComponent(uri);
-  }
+  return decodeURIComponent(URL.canParse(uri) ? new URL(uri).pathname : uri);
 };
 const getFileBreadcrumbs = (uri, workspaceUri) => {
   const path = getPathname(uri);
@@ -15769,10 +15617,14 @@ const applyRender = (oldState, newState, diffResult) => {
 };
 
 const render2 = (uid, diffResult) => {
+  const editor = get$8(uid);
+  if (!editor) {
+    return [];
+  }
   const {
     newState,
     oldState
-  } = get$8(uid);
+  } = editor;
   set$8(uid, newState, newState);
   const commands = applyRender(oldState, newState, diffResult);
   return commands;
@@ -16150,17 +16002,22 @@ const updateDiagnostics = async editor => {
   try {
     const diagnostics = await getDiagnostics(editor);
     const latest = get$8(editor.id);
-    if (!latest) {
+    if (!latest || !latest.newState.diagnosticsEnabled || latest.newState.lines !== editor.lines || latest.newState.uri !== editor.uri) {
       return editor;
     }
     const newEditor = await addDiagnostics(latest.newState, diagnostics);
     set$8(editor.id, latest.oldState, newEditor);
+    await invoke$7('Editor.renderPending', newEditor.id);
     await notifyDiagnosticsChange(newEditor.uri);
     return newEditor;
   } catch (error) {
     return handleError(error, editor);
   }
 };
+const requestDiagnostics = editor => {
+  void updateDiagnostics(editor);
+  return editor;
+};
 const updateDiagnosticsAll = async () => {
   for (const key of getKeys$2()) {
     const editor = get$8(Number(key))?.newState;
@@ -16224,6 +16081,9 @@ const saveAfterDelay = async (uid, token) => {
 
 const wrapCommand = (fn, preservesTypingCoalescing = false) => async (uid, ...args) => {
   const initialInstance = get$8(uid);
+  if (!initialInstance) {
+    return undefined;
+  }
   const queueKey = initialInstance?.newState.uri || uid;
   const previous = queues[queueKey];
   const {
@@ -16236,6 +16096,9 @@ const wrapCommand = (fn, preservesTypingCoalescing = false) => async (uid, ...ar
   }
   try {
     const oldInstance = get$8(uid);
+    if (!oldInstance) {
+      return undefined;
+    }
     const state = oldInstance.newState;
     const {
       cursorUndoStack,
@@ -16272,14 +16135,10 @@ const wrapCommand = (fn, preservesTypingCoalescing = false) => async (uid, ...ar
     }
     const newEditorWithDerivedState = await updateDerivedState(state, newEditor);
     set$8(uid, state, newEditorWithDerivedState);
-    let finalEditor = newEditorWithDerivedState;
     if (editorDiagnosticEffect.isActive(state, newEditorWithDerivedState)) {
-      finalEditor = await editorDiagnosticEffect.apply(newEditorWithDerivedState);
-      if (!get$8(uid)) {
-        return finalEditor;
-      }
-      set$8(uid, state, finalEditor);
+      void editorDiagnosticEffect.apply(newEditorWithDerivedState);
     }
+    const finalEditor = newEditorWithDerivedState;
     await notifyEditorStatusChange(state, finalEditor);
     if (!initial && uri === finalEditor.uri && (endOfLine !== finalEditor.endOfLine || insertSpaces !== finalEditor.insertSpaces || lines !== finalEditor.lines || modified !== finalEditor.modified || redoStack !== finalEditor.redoStack || undoStack !== finalEditor.undoStack)) {
       for (const key of getKeys$2()) {
@@ -16397,7 +16256,7 @@ const commandMap = {
   'Editor.getCommandIds': getCommandIds,
   'Editor.getDiagnostics': getDiagnostics$1,
   'Editor.getKeyBindings': getKeyBindings,
-  'Editor.getKeys': getKeys$1,
+  'Editor.getKeys': getKeys,
   'Editor.getLanguageId': getLanguageId,
   'Editor.getLines2': getLines2,
   'Editor.getMenuEntries': getMenuEntries,
@@ -16543,7 +16402,7 @@ const commandMap = {
   'Editor.unIndent': wrapCommand(editorUnindent),
   'Editor.updateColorPickerValue': wrapCommand(updateColorPickerValue$1),
   'Editor.updateDebugInfo': updateDebugInfo,
-  'Editor.updateDiagnostics': wrapCommand(updateDiagnostics),
+  'Editor.updateDiagnostics': wrapCommand(requestDiagnostics),
   'Editor.updateDiagnosticsAll': updateDiagnosticsAll,
   'EditorCompletion.close': close$3,
   'EditorCompletion.closeDetails': closeDetails$1,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/editor-worker",
-  "version": "19.55.2",
+  "version": "19.55.4",
   "repository": {
     "type": "git",
     "url": "git@github.com:lvce-editor/editor-worker.git"