@lvce-editor/file-search-worker 7.4.0 → 7.6.0

package/dist/fileSearchWorkerMain.js

@@ -1,6 +1,3 @@
-const EditorWorker = 99;
-const RendererWorker = 1;
-
 const normalizeLine = line => {
   if (line.startsWith('Error: ')) {
     return line.slice('Error: '.length);
@@ -207,6 +204,14 @@ const create$b = rpcId => {
   };
 };
 
+const EditorWorker = 99;
+const RendererWorker = 1;
+
+const SetDom2 = 'Viewlet.setDom2';
+const SetPatches = 'Viewlet.setPatches';
+
+const FocusQuickPickInput = 20;
+
 const {
   invoke: invoke$2,
   set: set$2
@@ -273,42 +278,68 @@ const create$a = () => {
   const states = Object.create(null);
   const commandMapRef = {};
   return {
-    get(uid) {
-      return states[uid];
+    clear() {
+      for (const key of Object.keys(states)) {
+        delete states[key];
+      }
     },
-    set(uid, oldState, newState) {
-      states[uid] = {
-        oldState,
-        newState
-      };
+    diff(uid, modules, numbers) {
+      const {
+        newState,
+        oldState
+      } = states[uid];
+      const diffResult = [];
+      for (let i = 0; i < modules.length; i++) {
+        const fn = modules[i];
+        if (!fn(oldState, newState)) {
+          diffResult.push(numbers[i]);
+        }
+      }
+      return diffResult;
     },
     dispose(uid) {
       delete states[uid];
     },
+    get(uid) {
+      return states[uid];
+    },
+    getCommandIds() {
+      const keys = Object.keys(commandMapRef);
+      const ids = keys.map(toCommandId);
+      return ids;
+    },
     getKeys() {
       return Object.keys(states).map(key => {
-        return Number.parseInt(key);
+        return Number.parseFloat(key);
       });
     },
-    clear() {
-      for (const key of Object.keys(states)) {
-        delete states[key];
-      }
+    registerCommands(commandMap) {
+      Object.assign(commandMapRef, commandMap);
+    },
+    set(uid, oldState, newState) {
+      states[uid] = {
+        newState,
+        oldState
+      };
     },
     wrapCommand(fn) {
       const wrapped = async (uid, ...args) => {
         const {
-          oldState,
-          newState
+          newState,
+          oldState
         } = states[uid];
         const newerState = await fn(newState, ...args);
         if (oldState === newerState || newState === newerState) {
           return;
         }
-        const latest = states[uid];
+        const latestOld = states[uid];
+        const latestNew = {
+          ...latestOld.newState,
+          ...newerState
+        };
         states[uid] = {
-          oldState: latest.oldState,
-          newState: newerState
+          newState: latestNew,
+          oldState: latestOld.oldState
         };
       };
       return wrapped;
@@ -322,27 +353,36 @@ const create$a = () => {
       };
       return wrapped;
     },
-    diff(uid, modules, numbers) {
-      const {
-        oldState,
-        newState
-      } = states[uid];
-      const diffResult = [];
-      for (let i = 0; i < modules.length; i++) {
-        const fn = modules[i];
-        if (!fn(oldState, newState)) {
-          diffResult.push(numbers[i]);
+    wrapLoadContent(fn) {
+      const wrapped = async (uid, ...args) => {
+        const {
+          newState,
+          oldState
+        } = states[uid];
+        const result = await fn(newState, ...args);
+        const {
+          error,
+          state
+        } = result;
+        if (oldState === state || newState === state) {
+          return {
+            error
+          };
         }
-      }
-      return diffResult;
-    },
-    getCommandIds() {
-      const keys = Object.keys(commandMapRef);
-      const ids = keys.map(toCommandId);
-      return ids;
-    },
-    registerCommands(commandMap) {
-      Object.assign(commandMapRef, commandMap);
+        const latestOld = states[uid];
+        const latestNew = {
+          ...latestOld.newState,
+          ...state
+        };
+        states[uid] = {
+          newState: latestNew,
+          oldState: latestOld.oldState
+        };
+        return {
+          error
+        };
+      };
+      return wrapped;
     }
   };
 };
@@ -428,6 +468,7 @@ const create$8 = (uid, uri, listItemHeight, x, y, width, height, platform, args,
     cursorOffset: 0,
     height: 300,
     icons: [],
+    initial: true,
     maxVisibleItems: 12,
     picks: [],
     recentPickIds: Object.create(null),
@@ -458,28 +499,25 @@ const create$8 = (uid, uri, listItemHeight, x, y, width, height, platform, args,
 };
 
 const RenderItems = 1;
+const RenderIncremental = 10;
 const RenderFocus = 2;
 const RenderValue = 3;
 const RenderCursorOffset = 7;
 const RenderFocusedIndex = 8;
 const Height = 9;
 
-const diffType$4 = RenderFocus;
 const isEqual$4 = (oldState, newState) => {
   return oldState.focused === newState.focused;
 };
 
-const diffType$3 = RenderFocusedIndex;
 const isEqual$3 = (oldState, newState) => {
   return oldState.focusedIndex === newState.focusedIndex;
 };
 
-const diffType$2 = Height;
 const isEqual$2 = (oldState, newState) => {
   return oldState.items.length === newState.items.length;
 };
 
-const diffType$1 = RenderItems;
 const isEqual$1 = (oldState, newState) => {
   return oldState.items === newState.items && oldState.minLineY === newState.minLineY && oldState.maxLineY === newState.maxLineY && oldState.focusedIndex === newState.focusedIndex;
 };
@@ -490,7 +528,7 @@ const isEqual = (oldState, newState) => {
 };
 
 const modules = [isEqual$2, isEqual$1, isEqual, isEqual$3, isEqual$4];
-const numbers = [diffType$2, diffType$1, diffType, diffType$3, diffType$4];
+const numbers = [Height, RenderItems, diffType, RenderFocusedIndex, RenderFocus];
 
 const diff = (oldState, newState) => {
   const diffResult = [];
@@ -734,16 +772,6 @@ const focusPrevious = state => {
   return focusIndex(state, previousIndex);
 };
 
-const Div = 4;
-const Input = 6;
-const Span = 8;
-const Text = 12;
-const Img = 17;
-
-const SetDom2 = 'Viewlet.setDom2';
-
-const FocusQuickPickInput = 20;
-
 const Enter = 3;
 const Escape = 8;
 const PageUp = 10;
@@ -3133,6 +3161,7 @@ const loadContent = async state => {
     focused: true,
     focusedIndex: 0,
     icons,
+    initial: false,
     inputSource: Script,
     items,
     maxLineY,
@@ -3152,6 +3181,351 @@ const executeCallback = id => {
   fn();
 };
 
+const SetCursorOffset = 'setCursorOffset';
+const SetFocusedIndex = 'setFocusedIndex';
+const SetItemsHeight = 'setItemsHeight';
+
+const renderCursorOffset = (_oldState, newState) => {
+  return ['Viewlet.send', newState.uid, /* method */SetCursorOffset, /* cursorOffset */newState.cursorOffset];
+};
+
+const QuickPickInput = 'QuickPickInput';
+
+const renderFocus = (_oldState, _newState) => {
+  return ['Viewlet.focusElementByName', QuickPickInput];
+};
+
+const renderFocusedIndex = (oldState, newState) => {
+  const oldFocusedIndex = oldState.focusedIndex - oldState.minLineY;
+  const newFocusedIndex = newState.focusedIndex - newState.minLineY;
+  return ['Viewlet.send', newState.uid, /* method */SetFocusedIndex, /* oldFocusedIndex */oldFocusedIndex, /* newFocusedIndex */newFocusedIndex];
+};
+
+const renderHeight = (_oldState, newState) => {
+  const {
+    height,
+    uid
+  } = newState;
+  if (height === 0) {
+    return ['Viewlet.send', uid, /* method */SetItemsHeight, /* height */20];
+  }
+  return ['Viewlet.send', uid, /* method */SetItemsHeight, /* height */height];
+};
+
+const Div = 4;
+const Input = 6;
+const Span = 8;
+const Text = 12;
+const Img = 17;
+const Reference = 100;
+
+const mergeClassNames = (...classNames) => {
+  return classNames.filter(Boolean).join(' ');
+};
+
+const px = value => {
+  return `${value}px`;
+};
+const position = (x, y) => {
+  return `${x}px ${y}px`;
+};
+
+const text = data => {
+  return {
+    childCount: 0,
+    text: data,
+    type: Text
+  };
+};
+
+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) => {
+  const patches = [];
+  // 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;
+  }
+  // Handle reference nodes - special handling for uid changes
+  if (oldNode.type === Reference) {
+    if (oldNode.uid !== newNode.uid) {
+      patches.push({
+        type: SetReferenceNodeUid,
+        uid: newNode.uid
+      });
+    }
+    return patches;
+  }
+  // Handle text nodes
+  if (oldNode.type === Text && newNode.type === Text) {
+    if (oldNode.text !== newNode.text) {
+      patches.push({
+        type: SetText,
+        value: newNode.text
+      });
+    }
+    return patches;
+  }
+  // Compare attributes
+  const oldKeys = getKeys(oldNode);
+  const newKeys = getKeys(newNode);
+  // 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 (!(key in newNode)) {
+      patches.push({
+        type: RemoveAttribute,
+        key
+      });
+    }
+  }
+  return patches;
+};
+
+const treeToArray = node => {
+  const result = [node.node];
+  for (const child of node.children) {
+    result.push(...treeToArray(child));
+  }
+  return result;
+};
+
+const diffChildren = (oldChildren, newChildren, patches) => {
+  const maxLength = Math.max(oldChildren.length, newChildren.length);
+  // Track where we are: -1 means at parent, >= 0 means at child index
+  let currentChildIndex = -1;
+  // Collect indices of children to remove (we'll add these patches at the end in reverse order)
+  const indicesToRemove = [];
+  for (let i = 0; i < maxLength; i++) {
+    const oldNode = oldChildren[i];
+    const newNode = newChildren[i];
+    if (!oldNode && !newNode) {
+      continue;
+    }
+    if (!oldNode) {
+      // Add new node - we should be at the parent
+      if (currentChildIndex >= 0) {
+        // Navigate back to parent
+        patches.push({
+          type: NavigateParent
+        });
+        currentChildIndex = -1;
+      }
+      // Flatten the entire subtree so renderInternal can handle it
+      const flatNodes = treeToArray(newNode);
+      patches.push({
+        type: Add,
+        nodes: flatNodes
+      });
+    } else if (newNode) {
+      // Compare nodes to see if we need any patches
+      const nodePatches = compareNodes(oldNode.node, newNode.node);
+      // If nodePatches is null, the node types are incompatible - need to replace
+      if (nodePatches === null) {
+        // Navigate to this child
+        if (currentChildIndex === -1) {
+          patches.push({
+            type: NavigateChild,
+            index: i
+          });
+          currentChildIndex = i;
+        } else if (currentChildIndex !== i) {
+          patches.push({
+            type: NavigateSibling,
+            index: i
+          });
+          currentChildIndex = i;
+        }
+        // Replace the entire subtree
+        const flatNodes = treeToArray(newNode);
+        patches.push({
+          type: Replace,
+          nodes: flatNodes
+        });
+        // After replace, we're at the new element (same position)
+        continue;
+      }
+      // Check if we need to recurse into children
+      const hasChildrenToCompare = oldNode.children.length > 0 || newNode.children.length > 0;
+      // Only navigate to this element if we need to do something
+      if (nodePatches.length > 0 || hasChildrenToCompare) {
+        // Navigate to this child if not already there
+        if (currentChildIndex === -1) {
+          patches.push({
+            type: NavigateChild,
+            index: i
+          });
+          currentChildIndex = i;
+        } else if (currentChildIndex !== i) {
+          patches.push({
+            type: NavigateSibling,
+            index: i
+          });
+          currentChildIndex = i;
+        }
+        // Apply node patches (these apply to the current element, not children)
+        if (nodePatches.length > 0) {
+          patches.push(...nodePatches);
+        }
+        // Compare children recursively
+        if (hasChildrenToCompare) {
+          diffChildren(oldNode.children, newNode.children, patches);
+        }
+      }
+    } else {
+      // Remove old node - collect the index for later removal
+      indicesToRemove.push(i);
+    }
+  }
+  // Navigate back to parent if we ended at a child
+  if (currentChildIndex >= 0) {
+    patches.push({
+      type: NavigateParent
+    });
+    currentChildIndex = -1;
+  }
+  // Add remove patches in reverse order (highest index first)
+  // This ensures indices remain valid as we remove
+  for (let j = indicesToRemove.length - 1; j >= 0; j--) {
+    patches.push({
+      type: RemoveChild,
+      index: indicesToRemove[j]
+    });
+  }
+};
+const diffTrees = (oldTree, newTree, patches, path) => {
+  // At the root level (path.length === 0), we're already AT the element
+  // So we compare the root node directly, then compare its children
+  if (path.length === 0 && oldTree.length === 1 && newTree.length === 1) {
+    const oldNode = oldTree[0];
+    const newNode = newTree[0];
+    // Compare root nodes
+    const nodePatches = compareNodes(oldNode.node, newNode.node);
+    // If nodePatches is null, the root node types are incompatible - need to replace
+    if (nodePatches === null) {
+      const flatNodes = treeToArray(newNode);
+      patches.push({
+        type: Replace,
+        nodes: flatNodes
+      });
+      return;
+    }
+    if (nodePatches.length > 0) {
+      patches.push(...nodePatches);
+    }
+    // Compare children
+    if (oldNode.children.length > 0 || newNode.children.length > 0) {
+      diffChildren(oldNode.children, newNode.children, patches);
+    }
+  } else {
+    // Non-root level or multiple root elements - use the regular comparison
+    diffChildren(oldTree, newTree, patches);
+  }
+};
+
+const removeTrailingNavigationPatches = patches => {
+  // Find the last non-navigation patch
+  let lastNonNavigationIndex = -1;
+  for (let i = patches.length - 1; i >= 0; i--) {
+    const patch = patches[i];
+    if (patch.type !== NavigateChild && patch.type !== NavigateParent && patch.type !== NavigateSibling) {
+      lastNonNavigationIndex = i;
+      break;
+    }
+  }
+  // Return patches up to and including the last non-navigation patch
+  return lastNonNavigationIndex === -1 ? [] : patches.slice(0, lastNonNavigationIndex + 1);
+};
+
+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 getVisible$1 = (items, minLineY, maxLineY, icons) => {
   const range = items.slice(minLineY, maxLineY);
   const protoVisibleItems = range.map((item, index) => {
@@ -3226,7 +3600,7 @@ const getScrollBarOffset = (delta, finalDelta, size, scrollBarSize) => {
 };
 const getScrollBarY = getScrollBarOffset;
 
-const createQuickPickViewModel = (oldState, newState) => {
+const createQuickPickViewModel = newState => {
   const {
     cursorOffset,
     deltaY,
@@ -3246,7 +3620,6 @@ const createQuickPickViewModel = (oldState, newState) => {
   } = newState;
   const protoVisibleItems = getVisible$1(items, minLineY, maxLineY, icons);
   const visibleItems = getVisible(items.length, protoVisibleItems, minLineY, focusedIndex);
-  const oldFocusedIndex = oldState.focusedIndex - oldState.minLineY;
   const newFocusedIndex = focusedIndex - minLineY;
   const itemCount = items.length;
   const listHeight = getListHeight(itemCount, itemHeight, height);
@@ -3259,7 +3632,6 @@ const createQuickPickViewModel = (oldState, newState) => {
     focused,
     height,
     newFocusedIndex,
-    oldFocusedIndex,
     scrollBarHeight,
     scrollBarTop: roundedScrollBarY,
     uid,
@@ -3268,54 +3640,6 @@ const createQuickPickViewModel = (oldState, newState) => {
   };
 };
 
-const SetCursorOffset = 'setCursorOffset';
-const SetFocusedIndex = 'setFocusedIndex';
-const SetItemsHeight = 'setItemsHeight';
-
-const renderCursorOffset = newState => {
-  return ['Viewlet.send', newState.uid, /* method */SetCursorOffset, /* cursorOffset */newState.cursorOffset];
-};
-
-const QuickPickInput = 'QuickPickInput';
-
-const renderFocus = newState => {
-  return ['Viewlet.focusElementByName', QuickPickInput];
-};
-
-const renderFocusedIndex = newState => {
-  return ['Viewlet.send', newState.uid, /* method */SetFocusedIndex, /* oldFocusedIndex */newState.oldFocusedIndex, /* newFocusedIndex */newState.newFocusedIndex];
-};
-
-const renderHeight = newState => {
-  const {
-    height,
-    uid
-  } = newState;
-  if (height === 0) {
-    return ['Viewlet.send', uid, /* method */SetItemsHeight, /* height */20];
-  }
-  return ['Viewlet.send', uid, /* method */SetItemsHeight, /* height */height];
-};
-
-const mergeClassNames = (...classNames) => {
-  return classNames.filter(Boolean).join(' ');
-};
-
-const px = value => {
-  return `${value}px`;
-};
-const position = (x, y) => {
-  return `${x}px ${y}px`;
-};
-
-const text = data => {
-  return {
-    childCount: 0,
-    text: data,
-    type: Text
-  };
-};
-
 const ComboBox = 'combobox';
 const ListBox = 'listbox';
 const None = 'none';
@@ -3536,17 +3860,32 @@ const getQuickPickVirtualDom = (visibleItems, scrollBarHeight, scrollBarTop) =>
   }, ...getQuickPickItemsVirtualDom(visibleItems), ...getScrollBarVirtualDom(scrollBarHeight, scrollBarTop)];
 };
 
-const renderItems = newState => {
+const getItemsDom = newState => {
+  const viewModel = createQuickPickViewModel(newState);
   const {
     scrollBarHeight,
     scrollBarTop,
     visibleItems
-  } = newState;
+  } = viewModel;
   const dom = getQuickPickVirtualDom(visibleItems, scrollBarHeight, scrollBarTop);
+  return dom;
+};
+const renderItems = (_oldState, newState) => {
+  const dom = getItemsDom(newState);
   return [SetDom2, dom];
 };
 
-const renderValue = newState => {
+const renderIncremental = (oldState, newState) => {
+  const oldDom = getItemsDom(oldState);
+  const newDom = getItemsDom(newState);
+  if (oldState.initial) {
+    return [SetDom2, newState.uid, newDom];
+  }
+  const patches = diffTree(oldDom, newDom);
+  return [SetPatches, newState.uid, patches];
+};
+
+const renderValue = (_oldState, newState) => {
   return ['Viewlet.setValueByName', QuickPickInput, /* value */newState.value];
 };
 
@@ -3560,6 +3899,8 @@ const getRenderer = diffType => {
       return renderFocus;
     case RenderFocusedIndex:
       return renderFocusedIndex;
+    case RenderIncremental:
+      return renderIncremental;
     case RenderItems:
       return renderItems;
     case RenderValue:
@@ -3571,7 +3912,6 @@ const getRenderer = diffType => {
 
 const applyRender = (oldState, newState, diffResult) => {
   const commands = [];
-  const viewModel = createQuickPickViewModel(oldState, newState);
   for (const item of diffResult) {
     if (item === Height) {
       continue;
@@ -3580,7 +3920,7 @@ const applyRender = (oldState, newState, diffResult) => {
       continue;
     }
     const fn = getRenderer(item);
-    commands.push(fn(viewModel));
+    commands.push(fn(oldState, newState));
   }
   return commands;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/file-search-worker",
-  "version": "7.4.0",
+  "version": "7.6.0",
   "keywords": [
     "text-search"
   ],
@@ -11,8 +11,5 @@
   "license": "MIT",
   "author": "Lvce Editor",
   "type": "module",
-  "main": "dist/fileSearchWorkerMain.js",
-  "dependencies": {
-    "@lvce-editor/constants": "^2.9.0"
-  }
+  "main": "dist/fileSearchWorkerMain.js"
 }