@lvce-editor/text-search-view 1.7.0 → 1.9.0

package/dist/textSearchViewMain.js

@@ -1135,7 +1135,7 @@ const createMockRpc = ({
 };
 
 const rpcs = Object.create(null);
-const set$5 = (id, rpc) => {
+const set$7 = (id, rpc) => {
   rpcs[id] = rpc;
 };
 const get$1 = id => {
@@ -1168,7 +1168,7 @@ const create$3 = rpcId => {
       const mockRpc = createMockRpc({
         commandMap
       });
-      set$5(rpcId, mockRpc);
+      set$7(rpcId, mockRpc);
       // @ts-ignore
       mockRpc[Symbol.dispose] = () => {
         remove$2(rpcId);
@@ -1177,7 +1177,7 @@ const create$3 = rpcId => {
       return mockRpc;
     },
     set(rpc) {
-      set$5(rpcId, rpc);
+      set$7(rpcId, rpc);
     }
   };
 };
@@ -1445,6 +1445,7 @@ const LeftClick = 0;
 
 const DialogWorker = 7014;
 const IconThemeWorker = 7009;
+const RendererProcess = 1670;
 const RendererWorker = 1;
 const TextSearchWorker = 7010;
 
@@ -1475,30 +1476,35 @@ const FocusToggleDetails = 1010;
 const FocusToggleReplace = 1020;
 
 const {
-  invoke: invoke$3,
-  set: set$4
+  invoke: invoke$5,
+  set: set$6
 } = create$3(DialogWorker);
 
 const {
-  invoke: invoke$2,
-  set: set$3
+  invoke: invoke$4,
+  set: set$5
 } = create$3(IconThemeWorker);
 const getIcons = async iconRequests => {
   // @ts-ignore
-  return invoke$2('IconTheme.getIcons', iconRequests);
+  return invoke$4('IconTheme.getIcons', iconRequests);
 };
 
 const {
-  invoke: invoke$1,
+  invoke: invoke$3,
+  set: set$4
+} = create$3(RendererProcess);
+
+const {
+  invoke: invoke$2,
   invokeAndTransfer,
-  set: set$2
+  set: set$3
 } = create$3(RendererWorker);
 const showContextMenu2 = async (uid, menuId, x, y, args) => {
   number(uid);
   number(menuId);
   number(x);
   number(y);
-  await invoke$1('ContextMenu.show2', uid, menuId, x, y, args);
+  await invoke$2('ContextMenu.show2', uid, menuId, x, y, args);
 };
 const sendMessagePortToTextSearchWorker = async (port, rpcId) => {
   const command = 'HandleMessagePort.handleMessagePort';
@@ -1513,30 +1519,30 @@ const sendMessagePortToIconThemeWorker = async (port, rpcId) => {
   await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToIconThemeWorker', port, command, rpcId);
 };
 const handleWorkspaceRefresh = async () => {
-  return invoke$1('Layout.handleWorkspaceRefresh');
+  return invoke$2('Layout.handleWorkspaceRefresh');
 };
 const writeClipBoardText = async text => {
-  await invoke$1('ClipBoard.writeText', /* text */text);
+  await invoke$2('ClipBoard.writeText', /* text */text);
 };
 const getPreference = async key => {
-  return await invoke$1('Preferences.get', key);
+  return await invoke$2('Preferences.get', key);
 };
 const openUri$1 = async (uri, focus, options) => {
-  await invoke$1('Main.openUri', uri, focus, options);
+  await invoke$2('Main.openUri', uri, focus, options);
 };
 
 const {
-  invoke,
-  set: set$1
+  invoke: invoke$1,
+  set: set$2
 } = create$3(TextSearchWorker);
 const getIncrementalResults = async (searchId, minLineY, maxLineY) => {
-  return invoke('TextSearch.getIncrementalResults', searchId, minLineY, maxLineY);
+  return invoke$1('TextSearch.getIncrementalResults', searchId, minLineY, maxLineY);
 };
 const search$1 = async (...args) => {
-  return invoke('TextSearch.search', ...args);
+  return invoke$1('TextSearch.search', ...args);
 };
 const searchIncremental = async (...args) => {
-  return invoke('TextSearch.searchIncremental', ...args);
+  return invoke$1('TextSearch.searchIncremental', ...args);
 };
 
 const toCommandId = key => {
@@ -2361,7 +2367,7 @@ const writeText = async text => {
   await writeClipBoardText(text);
 };
 const readText = async () => {
-  return await invoke$1('ClipBoard.readText');
+  return await invoke$2('ClipBoard.readText');
 };
 
 const getActualIndex$1 = state => {
@@ -2439,7 +2445,7 @@ const {
   get,
   getCommandIds,
   registerCommands,
-  set,
+  set: set$1,
   wrapAsyncCommand,
   wrapCommand,
   wrapGetter
@@ -2552,7 +2558,7 @@ const create = (uid, x, y, width, height, workspacePath, assetDir, itemHeight, v
     viewMode: List,
     workspacePath: workspacePath
   };
-  set(uid, state, state);
+  set$1(uid, state, state);
   return state;
 };
 
@@ -3516,7 +3522,7 @@ const openSearchEditor = async state => {
 
 const getSearchExcludes = async (fallback = []) => {
   try {
-    const value = await invoke$1('Preferences.get', 'search.exclude');
+    const value = await invoke$2('Preferences.get', 'search.exclude');
     if (!value || typeof value !== 'object' || Array.isArray(value)) {
       return [];
     }
@@ -3593,7 +3599,7 @@ const getProtocol = uri => {
 };
 
 const measureTextHeight = (text, fontFamily, fontSize, lineHeight, width) => {
-  return invoke$1('MeasureTextHeight.measureTextBlockHeight', text, fontFamily, fontSize, `${lineHeight}px`, width);
+  return invoke$2('MeasureTextHeight.measureTextBlockHeight', text, fontFamily, fontSize, `${lineHeight}px`, width);
 };
 
 const SearchWarningFontFamily = 'system-ui';
@@ -3633,7 +3639,7 @@ const textSearch = async (root, query, options, assetDir, platform, searchId, ui
   if (!hasOpenEditors(options.flags)) {
     return search$1(root, query, options, assetDir, platform, searchId, uid);
   }
-  const openEditorUris = await invoke$1('GetActiveEditor.getOpenEditorUris');
+  const openEditorUris = await invoke$2('GetActiveEditor.getOpenEditorUris');
   return search$1(root, query, {
     ...options,
     openEditorUris
@@ -3778,9 +3784,9 @@ const textSearchIncremental = async (root, query, options, assetDir, platform, s
       maxLineY: visible.length,
       minLineY: 0
     };
-    set(uid, latest2.oldState, updatedState2);
+    set$1(uid, latest2.oldState, updatedState2);
     // @ts-ignore
-    await invoke$1('Search.rerender');
+    await invoke$2('Search.rerender');
     await waitForNextFrame();
   }
   await resultPromise;
@@ -3817,7 +3823,7 @@ const handleUpdateIncremental = async (state, update) => {
     ...partialNewState,
     searchId
   };
-  set(uid, latest1.oldState, updatedState1);
+  set$1(uid, latest1.oldState, updatedState1);
 
   // TODO await promise?
   void textSearchIncremental(root, value, {
@@ -3859,7 +3865,7 @@ const handleUpdatePullBased = async (state, update) => {
     searchId,
     searchResults: []
   };
-  set(previousUid, state, partialNewState);
+  set$1(previousUid, state, partialNewState);
   const {
     assetDir,
     contextLines,
@@ -4034,7 +4040,7 @@ const noop = state => {
 };
 
 const applyBulkReplacement = async bulkEdits => {
-  await invoke$1('BulkReplacement.applyBulkReplacement', bulkEdits);
+  await invoke$2('BulkReplacement.applyBulkReplacement', bulkEdits);
 };
 
 const getReplacedMessage = (fileCount, replaceCount, replacement) => {
@@ -4095,12 +4101,12 @@ const getReplacingMessage = (fileCount, replaceCount) => {
 const missingDialogWorkerRelay = 'Command "SendMessagePortToExtensionHostWorker.sendMessagePortToDialogWorker" not found';
 const prompt = async (text, options) => {
   try {
-    return await invoke$3('ConfirmPrompt.prompt', text, options);
+    return await invoke$5('ConfirmPrompt.prompt', text, options);
   } catch (error) {
     if (!String(error).includes(missingDialogWorkerRelay)) {
       throw error;
     }
-    return invoke$1('ConfirmPrompt.prompt', text, options);
+    return invoke$2('ConfirmPrompt.prompt', text, options);
   }
 };
 
@@ -4301,7 +4307,7 @@ const replaceAllWithProgress = async context => {
     ...latestState,
     message
   }));
-  await invoke$1('Search.rerender');
+  await invoke$2('Search.rerender');
   const updatedState = await replaceAllConfirmed(context.getState(), fileIndex);
   await context.updateState(() => updatedState);
 };
@@ -4800,6 +4806,41 @@ const handleListFocus = async state => {
   };
 };
 
+const state = {
+  connected: false
+};
+const isConnected = () => {
+  const {
+    connected
+  } = state;
+  return connected;
+};
+const invoke = (method, ...params) => {
+  return invoke$3(method, ...params);
+};
+const set = rpc => {
+  set$4(rpc);
+  state.connected = true;
+};
+
+const handleMessagePort = async (port, viewletCommandMap) => {
+  const executeViewletCommand = async (uid, command, ...args) => {
+    const fn = viewletCommandMap[`TextSearch.${command}`];
+    if (typeof fn !== 'function') {
+      throw new TypeError(`Viewlet command not found: ${command}`);
+    }
+    await fn(uid, ...args);
+    await invoke$2('Viewlet.requestRender', uid);
+  };
+  const rpc = await create$7({
+    commandMap: {
+      'Viewlet.executeViewletCommand': executeViewletCommand
+    },
+    messagePort: port
+  });
+  set(rpc);
+};
+
 const handlePullResultsFound = async (state, resultSearchId, newResults) => {
   const {
     fileIconCache,
@@ -4849,8 +4890,8 @@ const handlePullResultsFound = async (state, resultSearchId, newResults) => {
     scrollBarHeight
   };
   const oldState = latest ? latest.oldState : state;
-  set(uid, oldState, updatedState);
-  await invoke$1('Search.rerender');
+  set$1(uid, oldState, updatedState);
+  await invoke$2('Search.rerender');
   return state;
 };
 
@@ -4933,7 +4974,7 @@ const launchIconThemeWorker = async () => {
 
 const initializeIconThemeWorker = async () => {
   const rpc = await launchIconThemeWorker();
-  set$3(rpc);
+  set$5(rpc);
 };
 
 const commandMap$1 = {
@@ -4952,7 +4993,7 @@ const launchTextSearchWorker = async () => {
 
 const initializeTextSearchWorker = async () => {
   const rpc = await launchTextSearchWorker();
-  set$1(rpc);
+  set$2(rpc);
 };
 
 const initialize = async () => {
@@ -6633,14 +6674,23 @@ const applyRender = (oldState, newState, diffResult) => {
   return commands;
 };
 
+const renderDirect = async (uid, commands) => {
+  const rendererWorkerCommands = commands.filter(command => command[0] === SetFocusContext);
+  const rendererProcessCommands = commands.filter(command => command[0] !== SetFocusContext);
+  const transactionId = await invoke('Viewlet.queueCommands', uid, rendererProcessCommands);
+  return [...rendererWorkerCommands, ['Viewlet.commitPending', uid, transactionId]];
+};
 const render2 = (uid, diffResult) => {
   const {
     newState,
     oldState
   } = get(uid);
-  set(uid, newState, newState);
+  set$1(uid, newState, newState);
   const commands = applyRender(oldState, newState, diffResult);
-  return commands;
+  if (!isConnected()) {
+    return commands;
+  }
+  return renderDirect(uid, commands);
 };
 
 const Button = 1;
@@ -6983,7 +7033,7 @@ const handleContextMenuMouseAt = async (state, eventX, eventY) => {
     newState,
     oldState
   } = get(uid);
-  set(uid, oldState, {
+  set$1(uid, oldState, {
     ...newState,
     focusedIndex: index,
     listFocusedIndex: index
@@ -7010,6 +7060,7 @@ const handleContextMenu = async (state, button, x, y) => {
   return newState;
 };
 
+const handleDirectMessagePort = port => handleMessagePort(port, commandMap);
 const commandMap = {
   'TextSearch.clearSearchResults': wrapCommand(clearSearchResults$1),
   'TextSearch.collapseAll': wrapCommand(collapseAll$1),
@@ -7076,6 +7127,7 @@ const commandMap = {
   'TextSearch.handleListBlur': wrapCommand(handleListBlur),
   'TextSearch.handleListFocus': wrapCommand(handleListFocus),
   'TextSearch.handleListPointerDown': wrapCommand(handleListPointerDown),
+  'TextSearch.handleMessagePort': handleDirectMessagePort,
   'TextSearch.handlePullResultsFound': wrapCommand(handlePullResultsFound),
   'TextSearch.handleReplaceInput': wrapCommand(handleReplaceInput),
   'TextSearch.handleResize': wrapCommand(handleResize),
@@ -7126,12 +7178,12 @@ const listen = async () => {
   const rpc = await create$4({
     commandMap: commandMap
   });
-  set$2(rpc);
+  set$3(rpc);
   const dialogRpc = await create$5({
     commandMap: {},
     send: sendMessagePortToDialogWorker
   });
-  set$4(dialogRpc);
+  set$6(dialogRpc);
 };
 
 const main = async () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/text-search-view",
-  "version": "1.7.0",
+  "version": "1.9.0",
   "description": "Text Search View",
   "keywords": [
     "text-search"