@lvce-editor/file-search-worker 7.5.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),
@@ -465,22 +506,18 @@ 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;
 };
@@ -491,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 = [];
@@ -735,17 +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 SetPatches = 'Viewlet.setPatches';
-
-const FocusQuickPickInput = 20;
-
 const Enter = 3;
 const Escape = 8;
 const PageUp = 10;
@@ -3135,6 +3161,7 @@ const loadContent = async state => {
     focused: true,
     focusedIndex: 0,
     icons,
+    initial: false,
     inputSource: Script,
     items,
     maxLineY,
@@ -3154,141 +3181,27 @@ const executeCallback = id => {
   fn();
 };
 
-const getVisible$1 = (items, minLineY, maxLineY, icons) => {
-  const range = items.slice(minLineY, maxLineY);
-  const protoVisibleItems = range.map((item, index) => {
-    return {
-      ...item,
-      fileIcon: icons[index]
-    };
-  });
-  return protoVisibleItems;
-};
-
-const getScrollBarSize = (size, contentSize, minimumSliderSize) => {
-  if (size >= contentSize) {
-    return 0;
-  }
-  return Math.max(Math.round(size ** 2 / contentSize), minimumSliderSize);
-};
-
-const emptyHighlightSections = [];
-
-const getHighlightSections = (highlights, label) => {
-  if (highlights.length === 0) {
-    return emptyHighlightSections;
-  }
-  const sections = [];
-  let position = 0;
-  for (let i = 0; i < highlights.length; i += 2) {
-    const highlightStart = highlights[i];
-    const highlightEnd = highlights[i + 1];
-    if (position < highlightStart) {
-      const beforeText = label.slice(position, highlightStart);
-      sections.push({
-        highlighted: false,
-        text: beforeText
-      });
-    }
-    const highlightText = label.slice(highlightStart, highlightEnd);
-    sections.push({
-      highlighted: true,
-      text: highlightText
-    });
-    position = highlightEnd;
-  }
-  if (position < label.length) {
-    const afterText = label.slice(position);
-    sections.push({
-      highlighted: false,
-      text: afterText
-    });
-  }
-  return sections;
-};
-
-const getVisible = (setSize, protoVisibleItems, minLineY, focusedIndex) => {
-  const visibleItems = protoVisibleItems.map((visibleItem, i) => {
-    const highlights = visibleItem.matches.slice(1);
-    const sections = getHighlightSections(highlights, visibleItem.label);
-    return {
-      ...visibleItem,
-      highlights: sections,
-      isActive: i === focusedIndex,
-      posInSet: minLineY + i + 1,
-      setSize
-    };
-  });
-  return visibleItems;
-};
-
-const getScrollBarOffset = (delta, finalDelta, size, scrollBarSize) => {
-  const scrollBarOffset = delta / finalDelta * (size - scrollBarSize);
-  return scrollBarOffset;
-};
-const getScrollBarY = getScrollBarOffset;
-
-const createQuickPickViewModel = (oldState, newState) => {
-  const {
-    cursorOffset,
-    deltaY,
-    finalDeltaY,
-    focused,
-    focusedIndex,
-    headerHeight,
-    height,
-    icons,
-    itemHeight,
-    items,
-    maxLineY,
-    minimumSliderSize,
-    minLineY,
-    uid,
-    value
-  } = 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);
-  const contentHeight = itemCount * itemHeight;
-  const scrollBarHeight = getScrollBarSize(listHeight, contentHeight, minimumSliderSize);
-  const scrollBarY = getScrollBarY(deltaY, finalDeltaY, height - headerHeight, scrollBarHeight);
-  const roundedScrollBarY = Math.round(scrollBarY);
-  return {
-    cursorOffset,
-    focused,
-    height,
-    newFocusedIndex,
-    oldFocusedIndex,
-    scrollBarHeight,
-    scrollBarTop: roundedScrollBarY,
-    uid,
-    value,
-    visibleItems
-  };
-};
-
 const SetCursorOffset = 'setCursorOffset';
 const SetFocusedIndex = 'setFocusedIndex';
 const SetItemsHeight = 'setItemsHeight';
 
-const renderCursorOffset = newState => {
+const renderCursorOffset = (_oldState, newState) => {
   return ['Viewlet.send', newState.uid, /* method */SetCursorOffset, /* cursorOffset */newState.cursorOffset];
 };
 
 const QuickPickInput = 'QuickPickInput';
 
-const renderFocus = newState => {
+const renderFocus = (_oldState, _newState) => {
   return ['Viewlet.focusElementByName', QuickPickInput];
 };
 
-const renderFocusedIndex = newState => {
-  return ['Viewlet.send', newState.uid, /* method */SetFocusedIndex, /* oldFocusedIndex */newState.oldFocusedIndex, /* newFocusedIndex */newState.newFocusedIndex];
+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 = newState => {
+const renderHeight = (_oldState, newState) => {
   const {
     height,
     uid
@@ -3299,6 +3212,13 @@ const renderHeight = newState => {
   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(' ');
 };
@@ -3327,6 +3247,7 @@ const NavigateChild = 7;
 const NavigateParent = 8;
 const RemoveChild = 9;
 const NavigateSibling = 10;
+const SetReferenceNodeUid = 11;
 
 const isKey = key => {
   return key !== 'type' && key !== 'childCount';
@@ -3394,6 +3315,16 @@ const compareNodes = (oldNode, newNode) => {
   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) {
@@ -3595,6 +3526,120 @@ const diffTree = (oldNodes, newNodes) => {
   return removeTrailingNavigationPatches(patches);
 };
 
+const getVisible$1 = (items, minLineY, maxLineY, icons) => {
+  const range = items.slice(minLineY, maxLineY);
+  const protoVisibleItems = range.map((item, index) => {
+    return {
+      ...item,
+      fileIcon: icons[index]
+    };
+  });
+  return protoVisibleItems;
+};
+
+const getScrollBarSize = (size, contentSize, minimumSliderSize) => {
+  if (size >= contentSize) {
+    return 0;
+  }
+  return Math.max(Math.round(size ** 2 / contentSize), minimumSliderSize);
+};
+
+const emptyHighlightSections = [];
+
+const getHighlightSections = (highlights, label) => {
+  if (highlights.length === 0) {
+    return emptyHighlightSections;
+  }
+  const sections = [];
+  let position = 0;
+  for (let i = 0; i < highlights.length; i += 2) {
+    const highlightStart = highlights[i];
+    const highlightEnd = highlights[i + 1];
+    if (position < highlightStart) {
+      const beforeText = label.slice(position, highlightStart);
+      sections.push({
+        highlighted: false,
+        text: beforeText
+      });
+    }
+    const highlightText = label.slice(highlightStart, highlightEnd);
+    sections.push({
+      highlighted: true,
+      text: highlightText
+    });
+    position = highlightEnd;
+  }
+  if (position < label.length) {
+    const afterText = label.slice(position);
+    sections.push({
+      highlighted: false,
+      text: afterText
+    });
+  }
+  return sections;
+};
+
+const getVisible = (setSize, protoVisibleItems, minLineY, focusedIndex) => {
+  const visibleItems = protoVisibleItems.map((visibleItem, i) => {
+    const highlights = visibleItem.matches.slice(1);
+    const sections = getHighlightSections(highlights, visibleItem.label);
+    return {
+      ...visibleItem,
+      highlights: sections,
+      isActive: i === focusedIndex,
+      posInSet: minLineY + i + 1,
+      setSize
+    };
+  });
+  return visibleItems;
+};
+
+const getScrollBarOffset = (delta, finalDelta, size, scrollBarSize) => {
+  const scrollBarOffset = delta / finalDelta * (size - scrollBarSize);
+  return scrollBarOffset;
+};
+const getScrollBarY = getScrollBarOffset;
+
+const createQuickPickViewModel = newState => {
+  const {
+    cursorOffset,
+    deltaY,
+    finalDeltaY,
+    focused,
+    focusedIndex,
+    headerHeight,
+    height,
+    icons,
+    itemHeight,
+    items,
+    maxLineY,
+    minimumSliderSize,
+    minLineY,
+    uid,
+    value
+  } = newState;
+  const protoVisibleItems = getVisible$1(items, minLineY, maxLineY, icons);
+  const visibleItems = getVisible(items.length, protoVisibleItems, minLineY, focusedIndex);
+  const newFocusedIndex = focusedIndex - minLineY;
+  const itemCount = items.length;
+  const listHeight = getListHeight(itemCount, itemHeight, height);
+  const contentHeight = itemCount * itemHeight;
+  const scrollBarHeight = getScrollBarSize(listHeight, contentHeight, minimumSliderSize);
+  const scrollBarY = getScrollBarY(deltaY, finalDeltaY, height - headerHeight, scrollBarHeight);
+  const roundedScrollBarY = Math.round(scrollBarY);
+  return {
+    cursorOffset,
+    focused,
+    height,
+    newFocusedIndex,
+    scrollBarHeight,
+    scrollBarTop: roundedScrollBarY,
+    uid,
+    value,
+    visibleItems
+  };
+};
+
 const ComboBox = 'combobox';
 const ListBox = 'listbox';
 const None = 'none';
@@ -3815,24 +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 renderIncremental = newState => {
-  const oldDom = renderItems(newState)[1];
-  const newDom = renderItems(newState)[1];
+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 = newState => {
+const renderValue = (_oldState, newState) => {
   return ['Viewlet.setValueByName', QuickPickInput, /* value */newState.value];
 };
 
@@ -3859,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;
@@ -3868,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.5.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"
 }